TW-1902 fixed bottom navigation avatar sync

linagora · Sep 2, 2024 · 45957f0 · 45957f0
1 parent 5b92d12
commit 45957f0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
@@ -788,7 +788,6 @@ class ChatListController extends State<ChatList>
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       if (mounted) {
         Matrix.of(context).backgroundPush?.setupPush();
-        await matrixState.retrievePersistedActiveClient();
       }
     });
     _checkTorBrowser();

diff --git a/lib/widgets/layouts/adaptive_layout/app_adaptive_scaffold_body.dart b/lib/widgets/layouts/adaptive_layout/app_adaptive_scaffold_body.dart
@@ -155,11 +155,16 @@ class AppAdaptiveScaffoldBodyController extends State<AppAdaptiveScaffoldBody>
 
   @override
   void initState() {
+    super.initState();
     activeRoomIdNotifier.value = widget.activeRoomId;
     resetLocationPathWithLoginToken();
-    getCurrentProfile();
-    _handleProfileDataChange();
-    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      if (mounted) {
+        await matrix.retrievePersistedActiveClient();
+        getCurrentProfile();
+        _handleProfileDataChange();
+      }
+    });
   }
 
   @override

diff --git a/lib/widgets/layouts/enum/adaptive_destinations_enum.dart b/lib/widgets/layouts/enum/adaptive_destinations_enum.dart
@@ -98,8 +98,10 @@ enum AdaptiveDestinationEnum {
             profile: profile,
             isSelected: false,
           ),
-          activeIcon:
-              BottomNavigationAvatar(profile: profile, isSelected: true),
+          activeIcon: BottomNavigationAvatar(
+            profile: profile,
+            isSelected: true,
+          ),
           label: L10n.of(context)!.settings,
         );
       default: