From 8fff355a6b1d958f6e2c9459d8e5f6ad5cf1ba25 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Thu, 26 Sep 2024 15:38:12 +0200
Subject: [PATCH] Fix navigating from BottomTabAvatar when current route is
 WorkspaceInitialPage

---
 src/pages/home/sidebar/BottomTabAvatar.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/sidebar/BottomTabAvatar.tsx b/src/pages/home/sidebar/BottomTabAvatar.tsx
index d72d236797b8..5b852085234a 100644
--- a/src/pages/home/sidebar/BottomTabAvatar.tsx
+++ b/src/pages/home/sidebar/BottomTabAvatar.tsx
@@ -49,7 +49,15 @@ function BottomTabAvatar({isCreateMenuOpen = false, isSelected = false}: BottomT
         }
 
         if (route.name === SCREENS.WORKSPACE.INITIAL) {
-            Navigation.dismissModal();
+            const previousRoute = navigationRef.getRootState().routes.at(-2);
+
+            // If there is the settings split navigator we can dismiss safely
+            if (previousRoute?.name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR) {
+                Navigation.dismissModal();
+            } else {
+                // If not, we are going to replace this route with the settings route
+                Navigation.navigate(ROUTES.SETTINGS_WORKSPACES, CONST.NAVIGATION.ACTION_TYPE.REPLACE);
+            }
             return;
         }