From 871c7a20e946bf5ef0bb657808ef1b1c23a7420b Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Mon, 7 Apr 2025 14:18:48 -0400 Subject: [PATCH] chore: fix off-center close button in level up notifications (#2382) --- lib/pages/chat_list/chat_list.dart | 27 +++++++++++++++---------- lib/pangea/analytics_misc/level_up.dart | 4 +++- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index d3d5ef57a..3713b72a3 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -485,17 +485,6 @@ class ChatListController extends State @override void initState() { - // #Pangea - WidgetsBinding.instance.addPostFrameCallback((_) { - final params = GoRouterState.of(context).uri.queryParameters; - if (!params.containsKey("filter") || params['filter'] != 'groups') return; - setActiveFilter( - AppConfig.separateChatTypes - ? ActiveFilter.groups - : ActiveFilter.allChats, - ); - }); - // Pangea# _initReceiveSharingIntent(); scrollController.addListener(_onScroll); @@ -654,6 +643,22 @@ class ChatListController extends State super.initState(); } + // #Pangea + @override + void didUpdateWidget(ChatList oldWidget) { + super.didUpdateWidget(oldWidget); + WidgetsBinding.instance.addPostFrameCallback((_) { + final params = GoRouterState.of(context).uri.queryParameters; + if (!params.containsKey("filter") || params['filter'] != 'groups') return; + setActiveFilter( + AppConfig.separateChatTypes + ? ActiveFilter.groups + : ActiveFilter.allChats, + ); + }); + } + // Pangea# + @override void dispose() { _intentDataStreamSubscription?.cancel(); diff --git a/lib/pangea/analytics_misc/level_up.dart b/lib/pangea/analytics_misc/level_up.dart index aed360642..36f33075d 100644 --- a/lib/pangea/analytics_misc/level_up.dart +++ b/lib/pangea/analytics_misc/level_up.dart @@ -130,7 +130,9 @@ class LevelUpAnimationState extends State { onPressed: () => Navigator.of(context).pop(), child: Text(L10n.of(context).close), ), - const SizedBox(width: 16), + if (widget.summaryStateEventId != null && + widget.analyticsRoomId != null) + const SizedBox(width: 16), if (widget.summaryStateEventId != null && widget.analyticsRoomId != null) // Show summary button