Merge branch 'master' into cl/merge-v1.13.0-into-f-droid

Author: clangenb

.github/workflows/ios_integration_test.yml

@@ -29,16 +29,16 @@ jobs:
           - device: "iPhone 14 Pro Max"
             record_video: true
             # With this flag we can run the CI against different node versions to check compatibility.
-            docker_tag: "1.5.1"
+            docker_tag: "1.5.4"
           - device: "iPhone 8 Plus"
             record_video: false
-            docker_tag: "1.5.1"
+            docker_tag: "1.5.4"
           - device: "iPad Pro (12.9-inch) (6th generation)"
             record_video: false
-            docker_tag: "1.5.1"
+            docker_tag: "1.5.4"
           - device: "iPad Pro (12.9-inch) (2nd generation)"
             record_video: false
-            docker_tag: "1.5.1"
+            docker_tag: "1.5.4"
       fail-fast: false
     steps:
       # Setup Environment

app/lib/l10n/arb/app_de.arb

@@ -26,6 +26,7 @@
     "appSettings": "App-Einstellungen",
     "attestNotificationBody": "Wenn alle Teilnehmer die Attestierungen geschickt haben, kannst du versuchen das Einkommen zu erhalten.",
     "attestNotificationTitle": "Teilnehmer attestiert",
+    "available": "Verfügbar",
     "balance": "Kontostand",
     "balanceTooLowBody": "Du hast nicht genug Geld auf dem Konto. Du kannst nicht dein ganzes Geld schicken, weil du noch ein wenig für die Gebühren brauchst.",
     "balanceTooLowTitle": "Kontostand zu tief",
@@ -48,6 +49,7 @@
     "changeYourPin": "PIN ändern",
     "checkEmailApp": "Keine Email-App installiert",
     "chosenRightCommunity": "Die Daten sind für eine andere Community. Bitte wechsle die Community um Geld zu senden.",
+    "claim": "Einfordern",
     "claimRewardsNotificationBody": "Du hast dein Gemeinschaftseinkommen bereits erhalten.",
     "claimRewardsNotificationTitle": "Gemeinschaftseinkommen angefordert",
     "claimsScannedAlready": "bereits gescannter Antrag wurde aktualisiert",

app/lib/l10n/arb/app_en.arb

@@ -26,6 +26,7 @@
     "appSettings": "App settings",
     "attestNotificationBody": "If all participants have sent the attestations, you can try to claim the income.",
     "attestNotificationTitle": "Attested attendees",
+    "available": "Available",
     "balance": "Balance",
     "balanceTooLowBody": "You don't have sufficient funds in your account. You can't send all your money because you need some for the fees.",
     "balanceTooLowTitle": "Balance too low",
@@ -48,6 +49,7 @@
     "changeYourPin": "Change PIN",
     "checkEmailApp": "Check that you have downloaded the Email app",
     "chosenRightCommunity": "The data is for a different community. Please change the community to send funds.",
+    "claim": "Claim",
     "claimRewardsNotificationBody": "You have already received your community income!",
     "claimRewardsNotificationTitle": "Claimed the community income",
     "claimsScannedAlready": "Updated previously scanned claim",

app/lib/l10n/arb/app_fr.arb

@@ -26,6 +26,7 @@
     "appSettings": "Paramètres de l'app",
     "attestNotificationBody": "Une fois que tous les participants ont envoyé les attestations, tu peux essayer d'obtenir le revenu.",
     "attestNotificationTitle": "Participants attestés",
+    "available": "Disponible",
     "balance": "Solde du compte",
     "balanceTooLowBody": "Tu n'as pas assez d'argent sur ton compte. Tu ne peux pas envoyer tout ton argent, car il t'en faut encore un peu pour payer les frais.",
     "balanceTooLowTitle": "Solde trop bas",
@@ -48,12 +49,13 @@
     "changeYourPin": "Changer le NIP",
     "checkEmailApp": "Aucune application de Email installée",
     "chosenRightCommunity": "Les données sont destinées à une autre communauté. S'il te plaît, change la communauté pour envoyer le paiement.",
+    "claim": "Réclamer",
     "claimRewardsNotificationBody": "Tu as déjà reçu ton revenu communautaire.",
     "claimRewardsNotificationTitle": "Revenu communautaire demandé",
     "claimsScannedAlready": "La demande déjà scannée a été mise à jour",
     "claimsScannedDecodeFailed": "La demande scannée n'a pas pu être décodée. Ton vis-à-vis doit mettre à jour l'application.",
     "claimsScannedNew": "Nouvelle demande scannée",
-    "claimsSubmit": "Déposer une demande",
+    "claimsSubmit": "Déposer les demandes",
     "closeGathering": "Fermer la rencontre.",
     "communities": "Communautés",
     "communityChoose": "Choisis une communauté",

app/lib/l10n/arb/app_ru.arb

@@ -26,6 +26,7 @@
     "appSettings": "Настройки приложения",
     "attestNotificationBody": "Если все участники отправили свои подтверждения, можно попробовать получить доход.",
     "attestNotificationTitle": "Фаза Аттестации успешно завершена",
+    "available": "Доступно",
     "balance": "Баланс",
     "balanceTooLowBody": "У вас недостаточно средств на счету. Вы не можете отправить все свои деньги, так как часть нужна для оплаты комиссии.",
     "balanceTooLowTitle": "Недостаточно средств на счете",
@@ -48,6 +49,7 @@
     "changeYourPin": "Изменить PIN-код",
     "checkEmailApp": "Убедитесь, что вы загрузили приложение электронной почты",
     "chosenRightCommunity": "Данные относятся к другому сообществу. Пожалуйста, измените сообщество, чтобы отправить средства.",
+    "claim": "Заявление",
     "claimRewardsNotificationBody": "Ваш запрос на вознаграждение получен и будет обработан в кратчайшие сроки. Вы получили свой доход сообщества!",
     "claimRewardsNotificationTitle": "Доход сообщества запрошен",
     "claimsScannedAlready": "Ранее отсканированные заявления обновлены",

app/lib/page/profile/account/account_manage_page.dart

@@ -10,9 +10,9 @@ import 'package:encointer_wallet/common/components/logo/community_icon.dart';
 import 'package:encointer_wallet/theme/theme.dart';
 import 'package:encointer_wallet/config.dart';
 import 'package:encointer_wallet/utils/repository_provider.dart';
+import 'package:encointer_wallet/page/profile/account/benefits.dart';
 import 'package:encointer_wallet/page/profile/account/export_result_page.dart';
 import 'package:encointer_wallet/page/profile/contacts/account_share_page.dart';
-import 'package:encointer_wallet/page/profile/account/faucet_list_tile.dart';
 import 'package:encointer_wallet/service/log/log_service.dart';
 import 'package:encointer_wallet/service/substrate_api/api.dart';
 import 'package:encointer_wallet/modules/modules.dart';
@@ -52,7 +52,21 @@ class _AccountManagePageState extends State<AccountManagePage> {
   }
 
   Future<void> _init() async {
-    faucets = await webApi.encointer.getAllFaucetsWithAccount();
+    final allFaucets = await webApi.encointer.getAllFaucetsWithAccount();
+
+    // show faucets we have reputation for and faucets for `chosenCid`.
+    final relevantCids = _appStore.encointer.account!.reputations.values.map((e) => e.communityIdentifier).toSet()
+      ..add(_appStore.encointer.chosenCid!);
+
+    faucets = Map.fromEntries(allFaucets.entries.where((e) {
+      final whitelist = e.value.whitelist;
+      if (whitelist == null) {
+        // if the whitelist is null, all communities may access it.
+        return true;
+      } else {
+        return containsAny(whitelist, relevantCids.toList());
+      }
+    }));
     setState(() {});
   }
 
@@ -140,7 +154,6 @@ class _AccountManagePageState extends State<AccountManagePage> {
     final h3Grey = context.titleLarge.copyWith(fontSize: 19, color: AppColors.encointerGrey);
     final isKeyboard = MediaQuery.of(context).viewInsets.bottom != 0;
     final store = context.watch<AppStore>();
-    final appSettingsStore = context.watch<AppSettings>();
     final appConfig = RepositoryProvider.of<AppConfig>(context);
 
     final accountToBeEditedPubKey = ModalRoute.of(context)!.settings.arguments as String?;
@@ -152,28 +165,26 @@ class _AccountManagePageState extends State<AccountManagePage> {
     _nameCtrl!.selection = TextSelection.fromPosition(TextPosition(offset: _nameCtrl!.text.length));
 
     // Not an ideal practice, but we only release a dev-version of the faucet, and cleanup can be later.
-    List<Widget> benefits() {
-      return [
-        Text(l10n.benefits, style: h3Grey, textAlign: TextAlign.left),
-        if (faucets != null)
-          store.account.currentAccountPubKey! == accountToBeEditedPubKey
-              ? ListView.builder(
-                  shrinkWrap: true,
-                  itemCount: faucets!.length,
-                  itemBuilder: (BuildContext context, int index) {
-                    final faucetPubKeyHex = faucets!.keys.elementAt(index);
-                    return FaucetListTile(
-                      store,
-                      userAddress: addressSS58,
-                      faucet: faucets![faucetPubKeyHex]!,
-                      faucetPubKey: faucetPubKeyHex,
-                    );
-                  },
-                )
-              : Text(l10n.canUseFaucetOnlyWithCurrentAccount, style: h3Grey, textAlign: TextAlign.left)
-        else
-          appConfig.isIntegrationTest ? const SizedBox.shrink() : const CupertinoActivityIndicator(),
-      ];
+    Widget benefits() {
+      if (faucets == null) {
+        return appConfig.isIntegrationTest ? const SizedBox.shrink() : const CupertinoActivityIndicator();
+      }
+
+      if (store.account.currentAccountPubKey! != accountToBeEditedPubKey) {
+        return Column(children: [
+          Text(l10n.benefits, style: h3Grey, textAlign: TextAlign.left),
+          Text(l10n.canUseFaucetOnlyWithCurrentAccount, style: h3Grey, textAlign: TextAlign.left),
+        ]);
+      }
+
+      return Benefits(
+        store,
+        faucets: faucets!,
+        userAddress: Address(
+          pubkey: AddressUtils.pubKeyHexToPubKey(accountToBeEditedPubKey),
+          prefix: store.settings.endpoint.ss58!,
+        ),
+      );
     }
 
     return Observer(
@@ -260,8 +271,7 @@ class _AccountManagePageState extends State<AccountManagePage> {
                     addressSS58,
                   ),
                 ),
-                // spread the List<Widget> so that it does not create a nested list.
-                if (appSettingsStore.developerMode) ...benefits(),
+                benefits(),
                 const Spacer(),
                 DecoratedBox(
                   // width: double.infinity,
@@ -395,3 +405,13 @@ class CommunityIcon extends StatelessWidget {
     );
   }
 }
+
+/// Checks if any entry in list one is contained in another list.
+bool containsAny(List<dynamic> list1, List<dynamic> list2) {
+  for (final entry in list1) {
+    if (list2.contains(entry)) {
+      return true;
+    }
+  }
+  return false;
+}

app/lib/page/profile/account/benefits.dart

@@ -0,0 +1,69 @@
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:encointer_wallet/models/faucet/faucet.dart';
+import 'package:encointer_wallet/store/app.dart';
+import 'package:encointer_wallet/config/consts.dart';
+import 'package:encointer_wallet/l10n/l10.dart';
+import 'package:encointer_wallet/page/profile/account/faucet_list_tile.dart';
+import 'package:encointer_wallet/theme/theme.dart';
+import 'package:encointer_wallet/utils/format.dart';
+import 'package:ew_keyring/ew_keyring.dart';
+
+class Benefits extends StatelessWidget {
+  const Benefits(
+    this.store, {
+    required this.faucets,
+    required this.userAddress,
+    super.key,
+  });
+
+  final AppStore store;
+
+  final Address userAddress;
+  final Map<String, Faucet> faucets;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    final titleLarge = context.titleLarge.copyWith(fontSize: 19, color: AppColors.encointerGrey);
+    final titleMedium = context.titleMedium.copyWith(color: AppColors.encointerGrey);
+
+    return Column(
+      children: [
+        Text('KSM ${l10n.benefits}', style: titleLarge, textAlign: TextAlign.left),
+        Observer(
+          builder: (_) => Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                l10n.balance,
+                style: titleMedium,
+                textAlign: TextAlign.left,
+              ),
+              Text(
+                '${Fmt.token(store.assets.totalBalance, ertDecimals)} KSM',
+                style: titleMedium,
+                textAlign: TextAlign.left,
+              ),
+            ],
+          ),
+        ),
+        ListView.builder(
+          shrinkWrap: true,
+          itemCount: faucets.length,
+          itemBuilder: (BuildContext context, int index) {
+            final faucetPubKeyHex = faucets.keys.elementAt(index);
+            return FaucetListTile(
+              store,
+              userAddress: userAddress.encode(),
+              faucet: faucets[faucetPubKeyHex]!,
+              faucetPubKey: faucetPubKeyHex,
+            );
+          },
+        )
+      ],
+    );
+  }
+}

app/lib/page/profile/account/faucet_list_tile.dart

@@ -2,15 +2,16 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 import 'package:encointer_wallet/common/components/submit_button.dart';
-import 'package:encointer_wallet/config/consts.dart';
 import 'package:encointer_wallet/models/communities/community_identifier.dart';
 import 'package:encointer_wallet/models/faucet/faucet.dart';
 import 'package:encointer_wallet/service/tx/lib/src/submit_tx_wrappers.dart';
 import 'package:encointer_wallet/theme/theme.dart';
+import 'package:encointer_wallet/l10n/l10.dart';
+import 'package:encointer_wallet/config/consts.dart';
+import 'package:encointer_wallet/utils/format.dart';
 import 'package:encointer_wallet/gen/assets.gen.dart';
 import 'package:encointer_wallet/service/substrate_api/api.dart';
 import 'package:encointer_wallet/store/app.dart';
-import 'package:encointer_wallet/utils/format.dart';
 
 class FaucetListTile extends StatefulWidget {
   const FaucetListTile(
@@ -33,17 +34,19 @@ class FaucetListTile extends StatefulWidget {
 
 class _FaucetListTileState extends State<FaucetListTile> {
   late Future<Map<int, CommunityIdentifier>> future;
-  late Future<BigInt> nativeBalance;
+
+  int? remainingClaims;
 
   @override
   void initState() {
     super.initState();
     future = _getUncommittedReputationIds(widget.userAddress);
-    nativeBalance = getNativeFreeBalance(widget.userAddress);
   }
 
   @override
   Widget build(BuildContext context) {
+    final l10n = context.l10n;
+
     return ListTile(
       contentPadding: const EdgeInsets.symmetric(),
       leading: SizedBox(
@@ -60,16 +63,9 @@ class _FaucetListTileState extends State<FaucetListTile> {
       ),
       subtitle: Row(
         children: [
-          const Text('KSM: '),
-          FutureBuilder(
-              future: nativeBalance,
-              builder: (BuildContext context, AsyncSnapshot<BigInt> snapshot) {
-                if (snapshot.hasData) {
-                  return Text(Fmt.token(snapshot.data!, ertDecimals));
-                } else {
-                  return const CupertinoActivityIndicator();
-                }
-              })
+          Text('${l10n.available}: '),
+          if (remainingClaims != null) Text('$remainingClaims') else const CupertinoActivityIndicator(),
+          Text(' x ${Fmt.token(BigInt.from(widget.faucet.dripAmount), ertDecimals - 3)} mKSM')
         ],
       ),
       trailing: FutureBuilder(
@@ -85,13 +81,12 @@ class _FaucetListTileState extends State<FaucetListTile> {
                     widget.faucetPubKey,
                   );
                   future = _getUncommittedReputationIds(widget.userAddress);
-                  nativeBalance = getNativeFreeBalance(widget.userAddress);
                   setState(() {});
                 },
-                child: const Text('Claim'),
+                child: Text(l10n.claim),
               );
             } else {
-              return const SubmitButtonSmall(child: Text('No Claim'));
+              return SubmitButtonSmall(child: Text(l10n.claim));
             }
           } else {
             return const CupertinoActivityIndicator();
@@ -126,6 +121,10 @@ class _FaucetListTileState extends State<FaucetListTile> {
     );
 
     await Future.wait(futures);
+
+    remainingClaims = ids.length;
+    // update the text widgets with the remaining claims.
+    setState(() {});
     return ids;
   }
 
@@ -147,9 +146,4 @@ class _FaucetListTileState extends State<FaucetListTile> {
       txPaymentAsset: store.encointer.getTxPaymentAsset(store.encointer.chosenCid),
     );
   }
-
-  Future<BigInt> getNativeFreeBalance(String address) async {
-    final balance = await webApi.assets.getBalanceOf(address);
-    return balance.free;
-  }
 }

app/lib/service/substrate_api/api.dart

@@ -86,10 +86,10 @@ class Api {
 
     Log.d('Obtained basic network data: ${store.settings.endpoint.value!}', 'Api');
 
-    encointer.getCommunityData();
-
     // need to do this from here as we can't access instance fields in constructor.
     account.setFetchAccountData(fetchAccountData);
+
+    fetchAccountData();
   }
 
   Future<void> close() async {