Fix some back button issues (thunder-app#977)

Niranjan-Dorage · Dec 15, 2023 · f42b1c5 · f42b1c5
1 parent 2603ba7
commit f42b1c5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/lib/feed/view/feed_page.dart b/lib/feed/view/feed_page.dart
@@ -418,8 +418,10 @@ class _FeedViewState extends State<FeedView> {
   }
 
   FutureOr<bool> _handleBack(bool stopDefaultButtonEvent, RouteInfo info) async {
+    final bool topOfNavigationStack = ModalRoute.of(context)?.isCurrent ?? false;
+
     // If the sidebar is open, close it
-    if (showCommunitySidebar) {
+    if (topOfNavigationStack && showCommunitySidebar) {
       setState(() => showCommunitySidebar = false);
       return true;
     }

diff --git a/lib/user/pages/user_page_success.dart b/lib/user/pages/user_page_success.dart
@@ -550,14 +550,21 @@ class _UserPageSuccessState extends State<UserPageSuccess> with TickerProviderSt
   FutureOr<bool> _handleBack(bool stopDefaultButtonEvent, RouteInfo info) async {
     final bool topOfNavigationStack = ModalRoute.of(context)?.isCurrent ?? false;
 
-    if (topOfNavigationStack && savedToggle!.value) {
-      setState(() {
-        selectedUserOption = 0;
-        _selectedUserOption![0] = true;
-        _selectedUserOption![1] = false;
-        savedToggle!.value = false;
-      });
-      return true;
+    if (topOfNavigationStack) {
+      if (_displaySidebar) {
+        setState(() {
+          _displaySidebar = false;
+        });
+        return true;
+      } else if (savedToggle!.value) {
+        setState(() {
+          selectedUserOption = 0;
+          _selectedUserOption![0] = true;
+          _selectedUserOption![1] = false;
+          savedToggle!.value = false;
+        });
+        return true;
+      }
     }
 
     return false;