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

Author: clangenb

app/lib/common/components/logo/community_icon.dart

@@ -1,36 +1,21 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:provider/provider.dart';
 
-import 'package:encointer_wallet/config/consts.dart';
 import 'package:encointer_wallet/theme/theme.dart';
-import 'package:encointer_wallet/store/app.dart';
 
-class CommunityIconObserver extends StatelessWidget {
-  const CommunityIconObserver({super.key, double? radius}) : radius = radius ?? 10;
+class CommunityCircleAvatar extends StatelessWidget {
+  const CommunityCircleAvatar(this.icon, {super.key, double? radius}) : radius = radius ?? 10;
+
+  final SvgPicture icon;
 
   final double radius;
 
   @override
   Widget build(BuildContext context) {
-    final store = context.watch<AppStore>();
     return CircleAvatar(
       backgroundColor: context.colorScheme.background,
       radius: radius,
-      child: Observer(
-        builder: (_) {
-          if (store.encointer.community != null && store.encointer.community!.assetsCid != null) {
-            if (store.encointer.community!.communityIcon != null) {
-              return SvgPicture.string(store.encointer.community!.communityIcon!);
-            } else {
-              return SvgPicture.asset(fallBackCommunityIcon);
-            }
-          } else {
-            return SvgPicture.asset(fallBackCommunityIcon);
-          }
-        },
-      ),
+      child: icon,
     );
   }
 }

app/lib/page-encointer/common/community_chooser_panel.dart

@@ -6,6 +6,7 @@ import 'package:encointer_wallet/common/components/address_icon.dart';
 import 'package:encointer_wallet/common/components/logo/community_icon.dart';
 import 'package:encointer_wallet/store/app.dart';
 import 'package:encointer_wallet/utils/format.dart';
+import 'package:flutter_svg/svg.dart';
 
 /// the CombinedCommunityAndAccountAvatar should be wrapped in an InkWell to provide the callback on a click
 class CombinedCommunityAndAccountAvatar extends StatefulWidget {
@@ -42,7 +43,10 @@ class _CombinedCommunityAndAccountAvatarState extends State<CombinedCommunityAnd
                     shape: RoundedRectangleBorder(
                       borderRadius: BorderRadius.circular(widget.communityAvatarSize),
                     ),
-                    child: CommunityAvatar(avatarSize: widget.communityAvatarSize),
+                    child: CommunityAvatar(
+                      widget.store.encointer.communityIconOrDefault,
+                      avatarSize: widget.communityAvatarSize,
+                    ),
                   ),
                   Positioned(
                     bottom: 0,
@@ -72,7 +76,13 @@ class _CombinedCommunityAndAccountAvatarState extends State<CombinedCommunityAnd
 }
 
 class CommunityAvatar extends StatelessWidget {
-  const CommunityAvatar({super.key, this.avatarSize = 120});
+  const CommunityAvatar(
+    this.icon, {
+    super.key,
+    this.avatarSize = 120,
+  });
+
+  final SvgPicture icon;
 
   final double avatarSize;
 
@@ -81,7 +91,7 @@ class CommunityAvatar extends StatelessWidget {
     return SizedBox(
       width: avatarSize,
       height: avatarSize,
-      child: const CommunityIconObserver(),
+      child: CommunityCircleAvatar(icon),
     );
   }
 }

app/lib/page-encointer/meetup/ceremony_step3_finish.dart

@@ -41,7 +41,10 @@ class CeremonyStep3Finish extends StatelessWidget {
                   children: [
                     const CeremonyProgressBar(progress: 3),
                     const SizedBox(height: 48),
-                    const CommunityAvatar(avatarSize: 96),
+                    CommunityAvatar(
+                      store.encointer.communityIconOrDefault,
+                      avatarSize: 96,
+                    ),
                     Center(
                       child: Text(
                         l10n.thankYou,

app/lib/page/assets/announcement/widgets/announcement_card.dart

@@ -9,6 +9,7 @@ import 'package:encointer_wallet/page/assets/announcement/logic/announcement_car
 import 'package:encointer_wallet/models/announcement/announcement.dart';
 import 'package:encointer_wallet/config/consts.dart';
 import 'package:encointer_wallet/common/components/logo/community_icon.dart';
+import 'package:encointer_wallet/store/app.dart';
 import 'package:encointer_wallet/gen/assets.gen.dart';
 import 'package:encointer_wallet/theme/theme.dart';
 
@@ -19,6 +20,8 @@ class AnnouncementCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final store = context.read<AppStore>();
+
     final local = Localizations.localeOf(context);
     final cardStore = context.watch<AnnouncementCardStore>();
     return Padding(
@@ -39,7 +42,10 @@ class AnnouncementCard extends StatelessWidget {
                         radius: 8,
                         backgroundImage: Assets.images.public.app.provider(),
                       )
-                    : const CommunityIconObserver(radius: 8),
+                    : CommunityCircleAvatar(
+                        store.encointer.communityIconOrDefault,
+                        radius: 8,
+                      ),
               ),
               title: Align(
                 alignment: Alignment.centerRight,

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

@@ -104,12 +104,17 @@ class _AccountManagePageState extends State<AccountManagePage> {
 
     final community = _appStore.encointer.communityStores?[cidFmt];
 
-    if (community == null) {
+    if (community == null || community.applyDemurrage == null) {
       // Never happened, but we want to be defensive here to prevent a red screen.
       Log.e('[AccountManagePage] Communities is null, even though we have a balance entry for it. Fatal app error.');
       return Container();
     }
 
+    if ((community.applyDemurrage!(entry) ?? 0) <= 0.0001 && cidFmt != _appStore.encointer.chosenCid!.toFmtString()) {
+      Log.p("[AccountManagePage] Don't display community with 0 balance");
+      return Container();
+    }
+
     final isBootstrapper = _appStore.encointer.community!.bootstrappers != null &&
         _appStore.encointer.community!.bootstrappers!.contains(address);
 
@@ -120,7 +125,7 @@ class _AccountManagePageState extends State<AccountManagePage> {
       leading: CommunityIcon(
         store: _appStore,
         isBootstrapper: isBootstrapper,
-        icon: const CommunityIconObserver(),
+        icon: CommunityCircleAvatar(community.icon),
       ),
       title: Text(community.name!, style: h3),
       subtitle: Text(community.symbol!, style: h3),

app/lib/store/encointer/encointer.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:flutter_svg/svg.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:mobx/mobx.dart';
 
@@ -15,6 +16,7 @@ import 'package:encointer_wallet/store/encointer/sub_stores/bazaar_store/bazaar_
 import 'package:encointer_wallet/store/encointer/sub_stores/community_store/community_account_store/community_account_store.dart';
 import 'package:encointer_wallet/store/encointer/sub_stores/community_store/community_store.dart';
 import 'package:encointer_wallet/store/encointer/sub_stores/encointer_account_store/encointer_account_store.dart';
+import 'package:encointer_wallet/config/consts.dart';
 
 part 'encointer.g.dart';
 
@@ -176,6 +178,15 @@ abstract class _EncointerStore with Store {
     return applyDemurrage(communityBalanceEntry);
   }
 
+  @computed
+  SvgPicture get communityIconOrDefault {
+    if (community != null) {
+      return community!.icon;
+    } else {
+      return SvgPicture.asset(fallBackCommunityIcon);
+    }
+  }
+
   double? applyDemurrage(BalanceEntry? entry) {
     if (_rootStore.chain.latestHeaderNumber != null &&
         entry != null &&

app/lib/store/encointer/encointer.g.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:encointer_wallet/config/consts.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:mobx/mobx.dart';
 
@@ -79,13 +81,24 @@ abstract class _CommunityStore with Store {
   @observable
   String? communityIcon;
 
+  @computed
+  SvgPicture get icon {
+    if (communityIcon != null) {
+      return SvgPicture.string(communityIcon!);
+    } else {
+      return SvgPicture.asset(fallBackCommunityIcon);
+    }
+  }
+
   double? Function(BalanceEntry)? get applyDemurrage => _applyDemurrage;
 
   @action
   Future<String?> getCommunityIcon() async {
     try {
       if (assetsCid != null) {
+        Log.e('[getCommunityIcon] get icon with cid: $assetsCid');
         final maybeIcon = await webApi.ipfsApi.getCommunityIcon(assetsCid!);
+        Log.e('[getCommunityIcon]: got icon: $maybeIcon');
         if (maybeIcon != null) communityIcon = maybeIcon;
       }
     } catch (e) {

app/lib/store/encointer/sub_stores/community_store/community_store.dart

@@ -14,7 +14,7 @@ description: EncointerWallet made with Flutter.
 
 # bump version already while working on new release, bumping build number at the same time
 # bump build number even more, if needed to clarify what's deployed
-version: 1.13.0+880
+version: 1.13.1+881
 
 publish_to: none