encointer · clangenb · Jun 19, 2023 · Jun 15, 2023 · Jun 16, 2023 · Jun 16, 2023
diff --git a/app/lib/config/prod_community.dart b/app/lib/config/prod_community.dart
@@ -34,6 +34,8 @@ enum Community {
   final String notificationSound;
   final ColorScheme colorScheme;
   final String cid;
+
+  String get name => switch (this) { Community.leu => 'LEU', Community.gbd => 'GBD' };
 }
 
 class Cids {

diff --git a/app/lib/l10n/arb/app_de.arb b/app/lib/l10n/arb/app_de.arb
@@ -172,6 +172,7 @@
     "importInvalidRawSeed": "Ungültigen raw seed eingegeben",
     "importMustNotBeEmpty": "Eingabe darf nicht leer sein",
     "importPrivateKeyUnsupported": "Konto importieren mit privatem Schlüssel wird noch nicht unterstützt",
+    "incomeIssuance": "Gemeinschaftseinkommen",
     "insufficientBalance": "Ungenügender Saldo",
     "insufficientFundsErrorBody": "Du hast nicht genügend Geld auf diesem Konto. Schaue auf der Webseite deiner lokalen Gemeinschaft, wie du welches bekommen kannst.",
     "insufficientFundsErrorTitle": "Zu wenig Guthaben",
@@ -354,6 +355,7 @@
     "txReady": "Transaktion bereit.",
     "txTooLowPriorityErrorBody": "Technischer Transaktionsfehler. Das kann passieren, wenn du zweimal innerhalb sehr kurzer Zeit eine Transaktion abschickst. Bitte warte einige Sekunden.",
     "txTooLowPriorityErrorTitle": "Transaktions Prioritätsfehler",
+    "unknown": "Unbekannt",
     "unknownAccount": "Unbekanntes Konto",
     "unknownError": "Es ist ein Fehler aufgetreten. Bitte überprüfe deine Internetverbindung und versuche es erneut.",
     "unlock": "Du musst deinen PIN eingeben um einen neuen Account hinzuzufügen",
@@ -403,5 +405,6 @@
     "youAreRegisteredAs": "Du hast dich für die nächste Versammlung als {participantType} registriert.",
     "youAreAssignedToAGatheringWithNParticipants": "Du bist einer Versammlung mit {participantsCount} Leuten zugewiesen.",
     "successfullySentNAttestations": "Du hast erfolgreich Bezeugungen für {participantsCount} andere Leute eingereicht.",
-    "tokenSend": "{symbol} senden"
+    "tokenSend": "{symbol} senden",
+    "communityWithName": "{name} Gemeinschaft"
 }
diff --git a/app/lib/l10n/arb/app_en.arb b/app/lib/l10n/arb/app_en.arb
@@ -172,6 +172,7 @@
     "importInvalidRawSeed": "Invalid raw seed supplied",
     "importMustNotBeEmpty": "Input must not be empty",
     "importPrivateKeyUnsupported": "Private key account import is not yet supported.",
+    "incomeIssuance": "Community income",
     "insufficientBalance": "Insufficient balance",
     "insufficientFundsErrorBody": "You do not have sufficient funds on this account. See on the website of your local community how to get some.",
     "insufficientFundsErrorTitle": "Insufficient Funds",
@@ -354,6 +355,7 @@
     "txReady": "Transaction is ready.",
     "txTooLowPriorityErrorBody": "Technical transaction priority error. This can happen if you tap twice on a submit button very quickly. Please wait for a few seconds.",
     "txTooLowPriorityErrorTitle": "Transaction priority error",
+    "unknown": "Unknown",
     "unknownAccount": "Unknown account",
     "unknownError": "An error occurred. Please check your internet connection and try again.",
     "unlock": "You need to enter your PIN to add a new account",
@@ -539,5 +541,14 @@
                 "example": "#"
             }
         }
+    },
+    "communityWithName": "{name} Community",
+    "@communityWithName": {
+        "placeholders": {
+            "name": {
+                "type": "String",
+                "example": "LEU"
+            }
+        }
     }
 }
diff --git a/app/lib/l10n/arb/app_fr.arb b/app/lib/l10n/arb/app_fr.arb
@@ -172,6 +172,7 @@
     "importInvalidRawSeed": "Raw seed invalide entré",
     "importMustNotBeEmpty": "L'entrée ne peut pas être vide",
     "importPrivateKeyUnsupported": "Le compte d'importation avec clé privée n'est pas encore pris en charge",
+    "incomeIssuance": "Revenu communautaire",
     "insufficientBalance": "Solde insuffisant",
     "insufficientFundsErrorBody": "Tu n'as pas assez d'argent sur ce compte. Regarde sur le site web de ta communauté locale pour savoir comment en obtenir.",
     "insufficientFundsErrorTitle": "Trop peu de crédit",
@@ -354,6 +355,7 @@
     "txReady": "La transaction est prête.",
     "txTooLowPriorityErrorBody": "Erreur technique de transaction. Cela peut arriver si tu envoies deux fois une transaction dans un laps de temps très court. Veuillez patienter quelques secondes'.",
     "txTooLowPriorityErrorTitle": "Erreur de priorité de transaction",
+    "unknown": "Inconnu",
     "unknownAccount": "Compte inconnu",
     "unknownError": "Une erreur est survenue. Vérifie ta connexion Internet et réessaye.",
     "unlock": "Tu dois saisir ton code NIP pour ajouter un nouveau compte.",
@@ -403,5 +405,6 @@
     "youAreRegisteredAs": "Tu t'es inscrit comme {participantType} a la prochain rencontre.",
     "youAreAssignedToAGatheringWithNParticipants": "Tu es assigné à une rencontre avec des personnes de {participantsCount}.",
     "successfullySentNAttestations": "Tu as soumis avec succès des attestations pour {participantsCount} autres personnes.",
-    "tokenSend": "Envoyer {symbol}"
+    "tokenSend": "Envoyer {symbol}",
+    "communityWithName": "Communauté {name}"
 }
diff --git a/app/lib/l10n/arb/app_ru.arb b/app/lib/l10n/arb/app_ru.arb
@@ -172,6 +172,7 @@
     "importInvalidRawSeed": "Предоставлен недопустимый raw seed",
     "importMustNotBeEmpty": "Входные данные не должны быть пустыми",
     "importPrivateKeyUnsupported": "Импорт аккаунта с помощью секретного ключа пока не поддерживается",
+    "incomeIssuance": "Доход сообщества",
     "insufficientBalance": "Недостаточный баланс",
     "insufficientFundsErrorBody": "У вас недостаточно средств на этом аккаунте. Посмотрите на веб-сайте вашего местного сообщества, как их получить.",
     "insufficientFundsErrorTitle": "Недостаточно средств",
@@ -354,6 +355,7 @@
     "txReady": "Транзакция готова.",
     "txTooLowPriorityErrorBody": "Техническая ошибка приоритета транзакции. Это может произойти, если вы быстро дважды нажмете на кнопку отправки. Пожалуйста, подождите несколько секунд.",
     "txTooLowPriorityErrorTitle": "Техническая ошибка приоритета транзакции",
+    "unknown": "Неизвестный",
     "unknownAccount": "Неизвестный аккаунт",
     "unknownError": "Извините, произошла ошибка. Пожалуйста, проверьте свое интернет-соединение и попробуйте еще раз.",
     "unlock": "Вам необходимо ввести свой PIN-код, чтобы добавить новую учетную запись",
@@ -403,5 +405,6 @@
     "youAreRegisteredAs": "На следующую встречу вы зарегистрированы в качестве {participantType}.",
     "youAreAssignedToAGatheringWithNParticipants": "Вы записаны на встречу вместе с {participantsCount} участниками.",
     "successfullySentNAttestations": "Вы успешно отправили аттестации {participantsCount} других людей.",
-    "tokenSend": "Отправить {symbol}"
+    "tokenSend": "Отправить {symbol}",
+    "communityWithName": "Сообщество {name}"
 }
diff --git a/app/lib/models/transfer/transfer_history.dart b/app/lib/models/transfer/transfer_history.dart
@@ -46,6 +46,11 @@ class Transaction {
     }
     return null;
   }
+
+  /// If the value of [counterParty] is 'ISSUANCE', the income has been distributed by the community.
+  /// If the income is provided by the community, the [name] should be displayed as
+  /// `{CommunityName} Community` and the [address] as `income issuance`.
+  bool get isIssuance => counterParty == 'ISSUANCE';
 }
 
 /// An enumeration of the transaction types.

diff --git a/app/lib/modules/transfer/widgets/transaction_card.dart b/app/lib/modules/transfer/widgets/transaction_card.dart
@@ -4,6 +4,8 @@ import 'package:provider/provider.dart';
 
 import 'package:encointer_wallet/common/components/address_icon.dart';
 import 'package:encointer_wallet/theme/custom/extension/theme_extension.dart';
+import 'package:encointer_wallet/config/prod_community.dart';
+import 'package:encointer_wallet/l10n/l10.dart';
 import 'package:encointer_wallet/theme/theme.dart';
 import 'package:encointer_wallet/models/index.dart';
 import 'package:encointer_wallet/utils/format.dart';
@@ -17,6 +19,7 @@ class TransactionCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final appStore = context.watch<AppStore>();
+    final l10n = context.l10n;
     return Card(
       margin: const EdgeInsets.only(top: 10),
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
@@ -30,7 +33,7 @@ class TransactionCard extends StatelessWidget {
             children: [
               Icon(
                 transaction.type == TransactionType.incoming ? Iconsax.receive_square_2 : Iconsax.send_sqaure_2,
-                color: context.colorScheme.primary,
+                color: transaction.type == TransactionType.incoming ? Colors.green : const Color(0xffD76D89),
                 size: 25,
               ),
               const SizedBox(width: 5),
@@ -48,11 +51,13 @@ class TransactionCard extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Text(
-                  transaction.getNameFromContacts(appStore.settings.contactList) ?? 'No Name',
+                  transaction.isIssuance
+                      ? l10n.communityWithName(Community.fromCid(appStore.encointer.community?.cid.toFmtString()).name)
+                      : transaction.getNameFromContacts(appStore.settings.contactList) ?? l10n.unknown,
                   style: context.textTheme.titleMedium!.copyWith(fontWeight: FontWeight.bold),
                 ),
                 const SizedBox(height: 4),
-                Text(Fmt.address(transaction.counterParty) ?? ''),
+                Text(transaction.isIssuance ? l10n.incomeIssuance : Fmt.address(transaction.counterParty) ?? ''),
               ],
             ),
             Column(