notif: Ensure back navigation preserves target account context after …

…opening notification Fixes: #1210
zulip · Feb 22, 2025 · 509ba69 · 509ba69
1 parent a198f72
commit 509ba69
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/lib/notifications/display.dart b/lib/notifications/display.dart
@@ -17,6 +17,7 @@ import '../model/narrow.dart';
 import '../widgets/app.dart';
 import '../widgets/color.dart';
 import '../widgets/dialog.dart';
+import '../widgets/home.dart';
 import '../widgets/message_list.dart';
 import '../widgets/page.dart';
 import '../widgets/store.dart';
@@ -502,6 +503,18 @@ class NotificationDisplayManager {
     final route = routeForNotification(context: context, url: url);
     if (route == null) return; // TODO(log)
 
+    Route<dynamic>? topRoute;
+    navigator.popUntil((r) {
+      topRoute = r;
+      return true;
+    });
+
+    if (topRoute == null || topRoute is! AccountRoute
+        || (topRoute as AccountRoute).accountId != route.accountId) {
+      HomePage.navigate(context, accountId: route.accountId);
+      navigator = await ZulipApp.navigator;
+    }
+
     // TODO(nav): Better interact with existing nav stack on notif open
     unawaited(navigator.push(route));
   }

diff --git a/test/notifications/display_test.dart b/test/notifications/display_test.dart
@@ -1176,6 +1176,49 @@ void main() {
       takeStartingRoutes(account: accountB);
       matchesNavigation(check(pushedRoutes).single, accountB, message);
     });
+
+    testWidgets('back navigation after opening a notification will preserve target account context', (tester) async {
+      addTearDown(testBinding.reset);
+
+      final accountA = eg.selfAccount;
+      final accountB = eg.otherAccount;
+      final message = eg.streamMessage();
+
+      await testBinding.globalStore.add(accountA, eg.initialSnapshot());
+      await testBinding.globalStore.add(accountB, eg.initialSnapshot());
+
+      await prepare(tester, early: true);
+      await tester.pump();
+      takeStartingRoutes(account: accountA);
+
+      Route<dynamic>? topRoute;
+      final navigator = await ZulipApp.navigator;
+      navigator.popUntil((r) {
+        topRoute = r;
+        return true;
+      });
+      check(topRoute).isA<AccountRoute>().accountId.equals(accountA.id);
+      await openNotification(tester, accountB, message);
+
+      navigator.popUntil((r) {
+        topRoute = r;
+        return true;
+      });
+      check(topRoute).isA<MaterialAccountWidgetRoute>()
+        ..accountId.equals(accountB.id)
+        ..page.isA<MessageListPage>();
+
+      navigator.pop();
+      await tester.pumpAndSettle();
+
+      navigator.popUntil((r) {
+        topRoute = r;
+        return true;
+      });
+      check(topRoute).isA<MaterialAccountWidgetRoute>()
+        ..accountId.equals(accountB.id)
+        ..page.isA<HomePage>();
+    });
   });
 
   group('NotificationOpenPayload', () {