From 45957f0371e88e0b9426ba9270d252211d7c9251 Mon Sep 17 00:00:00 2001
From: "khaled.njim" <knjim@linagora.com>
Date: Mon, 2 Sep 2024 15:07:16 +0100
Subject: [PATCH] TW-1902 fixed bottom navigation avatar sync

---
 lib/pages/chat_list/chat_list.dart                    |  1 -
 .../adaptive_layout/app_adaptive_scaffold_body.dart   | 11 ++++++++---
 .../layouts/enum/adaptive_destinations_enum.dart      |  6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index b3511394dc..1d222ed917 100644
--- 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
index 5ed048d058..3ae5234bf1 100644
--- 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
index 02175db127..4cf2ee8137 100644
--- 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: