Merge pull request Expensify#89748 from Expensify/claude-restoreWorkspacesTabFromSessionStorage

Fix workspace tab restore from session storage after refresh

Author: puneetlath

src/hooks/useRestoreWorkspacesTabOnNavigate.ts

@@ -59,7 +59,9 @@ function useRestoreWorkspacesTabOnNavigate() {
             }
 
             // Fall back to session storage when no workspace route exists anywhere in the navigation tree.
-            const sessionRoute = getWorkspacesTabStateFromSessionStorage()
+            // getStateFromPath returns state rooted at TAB_NAVIGATOR, so we must drill into it first.
+            const sessionTabNavigatorRoute = getWorkspacesTabStateFromSessionStorage()?.routes?.findLast((route) => route.name === NAVIGATORS.TAB_NAVIGATOR);
+            const sessionRoute = getTabState(sessionTabNavigatorRoute)
                 ?.routes?.findLast((route) => route.name === NAVIGATORS.WORKSPACE_NAVIGATOR)
                 ?.state?.routes?.findLast((route) => isWorkspaceNavigatorRouteName(route.name));
             if (sessionRoute) {

tests/unit/hooks/useRestoreWorkspacesTabOnNavigate.test.ts

@@ -299,16 +299,23 @@ describe('useRestoreWorkspacesTabOnNavigate', () => {
         lastVisitedTabPathUtils.getWorkspacesTabStateFromSessionStorage.mockReturnValue({
             routes: [
                 {
-                    name: NAVIGATORS.WORKSPACE_NAVIGATOR,
+                    name: NAVIGATORS.TAB_NAVIGATOR,
                     state: {
                         routes: [
                             {
-                                name: NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR,
+                                name: NAVIGATORS.WORKSPACE_NAVIGATOR,
                                 state: {
-                                    index: 1,
                                     routes: [
-                                        {name: SCREENS.WORKSPACE.INITIAL, params: {policyID: fakePolicyID}},
-                                        {name: SCREENS.WORKSPACE.WORKFLOWS, params: {policyID: fakePolicyID}},
+                                        {
+                                            name: NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR,
+                                            state: {
+                                                index: 1,
+                                                routes: [
+                                                    {name: SCREENS.WORKSPACE.INITIAL, params: {policyID: fakePolicyID}},
+                                                    {name: SCREENS.WORKSPACE.WORKFLOWS, params: {policyID: fakePolicyID}},
+                                                ],
+                                            },
+                                        },
                                     ],
                                 },
                             },