Skip to content

Commit f1298a0

Browse files
committed
fix workspace navigation
1 parent 70a958d commit f1298a0

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/libs/Navigation/helpers/navigateToWorkspacesPage.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ const navigateToWorkspacesPage = ({currentUserLogin, shouldUseNarrowLayout, poli
5353
return;
5454
}
5555

56-
// Pop down to the older TAB_NAVIGATOR that still holds the user's workspace state.
56+
// Pop to the older TAB_NAVIGATOR holding the workspace state. Target the root stack
57+
// explicitly so POP bypasses SearchFullscreenNavigator's PUSH_PARAMS interceptor.
5758
// https://github.com/Expensify/App/issues/89009
5859
if (rootState) {
5960
const topRootIndex = rootState.index ?? rootState.routes.length - 1;
@@ -70,7 +71,7 @@ const navigateToWorkspacesPage = ({currentUserLogin, shouldUseNarrowLayout, poli
7071
return !!wsState?.routes?.length;
7172
});
7273
if (olderTabIdx !== -1) {
73-
navigationRef.dispatch(StackActions.pop(topRootIndex - olderTabIdx));
74+
navigationRef.dispatch({...StackActions.pop(topRootIndex - olderTabIdx), target: rootState.key});
7475
return;
7576
}
7677
}

0 commit comments

Comments
 (0)