Add `NAVIGATORS.WORKSPACE_NAVIGATOR` by WojtekBoman · Pull Request #86438 · Expensify/App

WojtekBoman · 2026-03-26T13:37:21Z

Explanation of Change

Previously, the Workspaces tab was modelled using three separate root-level screens/navigators pushed onto the root stack independently:

Old structure	What it represents
`SCREENS.WORKSPACES_LIST`	The workspace hub / list page
`NAVIGATORS.WORKSPACE_SPLIT_NAVIGATOR`	A single workspace settings view
`NAVIGATORS.DOMAIN_SPLIT_NAVIGATOR`	A single domain settings view

This caused a number of issues:

There was no genuine back stack: going from WorkspaceSplitNavigator → "back" to WorkspacesList required custom goBack logic, and on iOS the swipe gesture didn't work correctly because the list wasn't underneath the split navigator in the same stack.
Session-storage restoration of the last-visited tab route was fragile — it had to scan multiple disconnected routes to reconstruct context.
The entering animation of WorkspaceSplitNavigator was controlled by a mutable Set (workspaceOrDomainSplitsWithoutEnteringAnimation) which was shared global state and had to be cleaned up manually.
Deep-link / getAdaptedStateFromPath handling required special-cased logic to prepend WORKSPACES_LIST before workspace split navigators.

This PR introduces NAVIGATORS.WORKSPACE_NAVIGATOR, a dedicated persistent stack navigator that owns the full Workspaces tab hierarchy:

WorkspaceNavigator (root-level persistent screen)
  └── WorkspacesList          ← always at index 0 (back-stack base)
  └── WorkspaceSplitNavigator ← pushed when entering a specific workspace
  └── DomainSplitNavigator    ← pushed when entering a specific domain

This change is a prerequisite for #85234 — Root Tab Navigator, which introduces a bottom tab navigator for top-level navigation. Consolidating the Workspaces tab into a single persistent WorkspaceNavigator is a necessary step before that navigator can be treated as a first-class tab in the tab structure.

Fixed Issues

#85260 (partial)
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Prerequisites

A test account with at least one workspace and one domain (or use the staging environment which has pre-configured workspaces).

1. Workspaces List page renders correctly

Log in to the app.
Click the Workspaces tab in the bottom/left navigation bar.
Expected: The Workspaces List page loads and displays your workspaces.
Check the URL (web): it should be /workspaces.

2. Navigating into a workspace and back

On the Workspaces List page, tap/click any workspace row.
Expected (wide screen): The workspace settings split view opens to the right of the list — no animation, list stays visible in the sidebar.
Expected (narrow screen): The workspace settings screen slides in from the right with a SLIDE_FROM_RIGHT animation.
Press the back button (or swipe from left edge on iOS).
Expected: You are returned to the Workspaces List page.
Check the URL (web, wide): it should change to e.g. /workspaces/:policyID/overview.

3. iOS swipe-back gesture from workspace to list

On a narrow (mobile/iOS) screen, navigate into a workspace (step 2 above).
Swipe from the left edge of the screen.
Expected: The WorkspacesListPage is revealed underneath — the swipe gesture works correctly because the list is now part of the same stack.

4. Navigating into a domain and back

On the Workspaces List page, tap a domain row (if available).
Expected (narrow): Domain screen slides in from right.
Press back.
Expected: Returns to Workspaces List.

5. Tab switching preserves workspace state

Navigate into a workspace (e.g., go to the Members screen).
Switch to a different tab (e.g., Inbox).
Switch back to the Workspaces tab.
Expected: The same workspace screen (Members) is still visible — the navigator state is preserved.

6. Deep linking to a workspace screen

Navigate directly to a workspace URL, e.g. /workspaces/:policyID/members.
Expected: The app opens with WorkspaceNavigator on the stack, showing the Members screen, with WorkspacesList underneath in the back stack.
Press back.
Expected: Returns to WorkspacesList.

7. Deep linking to the workspaces list

Navigate directly to /workspaces.
Expected: The Workspaces List page is shown.
No back button / no stale route underneath.

8. Session storage restoration after reload

Navigate to a specific workspace screen (e.g., /workspaces/:policyID/tags).
Hard-reload the page (web) or force-close and reopen the app (mobile).
Expected: The app re-opens to the same workspace tags screen.
Press back.
Expected: Returns to WorkspacesList.

9. Tab bar highlight

Navigate to the Workspaces tab.
Open a specific workspace.
Expected: The Workspaces icon in the bottom/left navigation tab bar remains highlighted/active throughout.

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-03-27.at.10.16.17.mov

Android: mWeb Chrome

Screen.Recording.2026-03-27.at.11.11.14.mov

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-27.at.10.39.16.mov

codecov · 2026-03-26T13:47:10Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...avigationTabBar/SCREENS_WITH_NAVIGATION_TAB_BAR.ts	`100.00% <100.00%> (ø)`
src/libs/Navigation/AppNavigator/AuthScreens.tsx	`82.95% <100.00%> (+1.90%)`	⬆️
...n/AppNavigator/Navigators/DomainSplitNavigator.tsx	`0.00% <ø> (ø)`
...ppNavigator/Navigators/WorkspaceSplitNavigator.tsx	`0.00% <ø> (ø)`
src/libs/Navigation/NavigationRoot.tsx	`76.92% <100.00%> (ø)`
...ibs/Navigation/helpers/navigateToWorkspacesPage.ts	`80.00% <100.00%> (ø)`
...ation/linkingConfig/RELATIONS/TAB_TO_FULLSCREEN.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`76.92% <ø> (ø)`
src/pages/workspace/WorkspacesListPage.tsx	`72.00% <ø> (-0.67%)`	⬇️
...ion/AppNavigator/usePreloadFullScreenNavigators.ts	`0.00% <0.00%> (-14.93%)`	⬇️
... and 8 more
... and 226 files with indirect coverage changes

sumo-slonik

LGTM! 🚀

sumo-slonik · 2026-03-27T09:13:58Z

src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts

-    if (lastFullScreenRoute?.key) {
-        // If the user opened the workspace/domain split navigator from a different tab, we don't want to animate the entering transition.
-        // To make it feel like bottom tab navigator.
-        workspaceOrDomainSplitsWithoutEnteringAnimation.add(lastFullScreenRoute.key);


When entering the workspace from another screen, is the animation no longer shown? I think it should behave like the other tab navigators and not show it, but I just wanted to make sure

Currently it's nested in WorkspaceNavigator so we simplified this logic a lot, a now this screen has its own animation, when we switch between tabs it's not animated as WorkspaceNavigator doesn't have an entering animation

sumo-slonik · 2026-03-27T11:11:09Z

src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts

I think we no longer use this set

sumo-slonik · 2026-03-27T11:16:53Z

src/libs/Navigation/helpers/isNavigatorName.ts

 import SCREENS from '@src/SCREENS';

-const FULL_SCREENS_SET = new Set([...Object.values(SIDEBAR_TO_SPLIT), NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, SCREENS.WORKSPACES_LIST, SCREENS.HOME]);
+const FULL_SCREENS_SET = new Set([...Object.values(SIDEBAR_TO_SPLIT), NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, SCREENS.WORKSPACES_LIST, SCREENS.HOME, NAVIGATORS.WORKSPACE_NAVIGATOR]);


do we need SCREENS.WORKSPACES_LIST int this place

I believe we do! It's still a full screen page, but nested. We'll refactor it in #85234

sumo-slonik · 2026-03-27T11:18:17Z

src/libs/Navigation/AppNavigator/usePreloadFullScreenNavigators.ts

-    }
-    navigation.preload(SCREENS.WORKSPACES_LIST, {});
-}
+// Currently the Account tab is preloaded, while Search and Inbox are not preloaded due to their potential complexity.


I think we can just write that we simply preload the settings page, and the others are no longer needed due to updates and the architect, especially since the root tab navigator will be introduced soon.

melvin-bot · 2026-03-27T13:50:32Z

@Gonals Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

chatgpt-codex-connector

💡 Codex Review

App/src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts

Lines 145 to 147 in ccbf5d3

    
           const adjustedState = getStateWithFilteredPreloadedRoutes(state, navigatorName, targetScreen); 
        
           const stateWithNavigator = stackRouter.getStateForAction(adjustedState, action, configOptions);

Preserve WorkspacesList as base on generic workspace pushes

handlePushFullscreenAction() now forwards generic PUSH actions unchanged, so navigation paths like Navigation.navigate(ROUTES.WORKSPACE_INITIAL...) (for example from WorkspaceJoinUserPage) can create WORKSPACE_NAVIGATOR with only a split child and no SCREENS.WORKSPACES_LIST underneath. The new navigator design assumes the list is always the base route, and without it iOS back-swipe/back from workspace/domain screens can pop out of the tab instead of returning to Workspaces List. Please inject/rehydrate [WORKSPACES_LIST, <split>] for WORKSPACE_NAVIGATOR pushes, not only for OPEN_WORKSPACE_SPLIT / OPEN_DOMAIN_SPLIT and deep-link adaptation.

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

ZhenjaHorbach · 2026-03-27T16:02:39Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

ZhenjaHorbach · 2026-03-27T16:21:09Z

Looks like it's related to our changes
But I have visual glitches after opening the domain screen

2026-03-27.17.20.30.mov

ZhenjaHorbach · 2026-03-27T16:38:26Z

On the domain members screen
The back button doesn't work on iOS web

2026-03-27.17.37.18.mov

ZhenjaHorbach · 2026-03-27T16:43:20Z

For some reason, the bottom menu appears with a delay after opening the create domain screen and returning back
And everything is good with staging

But with the create workspace screen is the same situation

2026-03-27.17.41.35.mov

trjExpensify · 2026-03-27T20:08:32Z

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

melvin-bot bot assigned WojtekBoman Mar 26, 2026

WojtekBoman force-pushed the workspaces-navigator branch from f342827 to cb8cc63 Compare March 26, 2026 13:55

sumo-slonik mentioned this pull request Mar 26, 2026

[$250] Introduce a Bottom Tab Navigator for Top-Level Navigation #85260

Open

luacmartins self-requested a review March 26, 2026 20:23

Add NAVIGATORS.WORKSPACE_NAVIGATOR

52dca12

WojtekBoman force-pushed the workspaces-navigator branch from cb8cc63 to 1c3e00b Compare March 27, 2026 06:58

Switch to the correct workspace tab screen

9ab0bdb

WojtekBoman force-pushed the workspaces-navigator branch from 1c3e00b to 9ab0bdb Compare March 27, 2026 08:15

sumo-slonik reviewed Mar 27, 2026

View reviewed changes

WojtekBoman added 3 commits March 27, 2026 12:40

Fix workspaces navigator types and tests

2eafcc3

Fix goBack tests related to WorkspacesNavigator

b12c353

Remove useEnableBackAnimationWhenOpenedFromTabBar

fa3e67a

WojtekBoman changed the title ~~Workspaces navigator~~ Add NAVIGATORS.WORKSPACE_NAVIGATOR Mar 27, 2026

WojtekBoman added 2 commits March 27, 2026 14:30

Add comment to usePreloadFullScreenNavigators

6040f94

Rename WorkspacesNavigator to WorkspaceNavigator everywhere

ccbf5d3

WojtekBoman marked this pull request as ready for review March 27, 2026 13:49

WojtekBoman requested review from a team as code owners March 27, 2026 13:49

melvin-bot bot requested review from Gonals and trjExpensify and removed request for a team March 27, 2026 13:50

chatgpt-codex-connector bot reviewed Mar 27, 2026

View reviewed changes

luacmartins requested review from ZhenjaHorbach and removed request for Gonals March 27, 2026 15:57

trjExpensify removed their request for review March 27, 2026 20:08

	const adjustedState = getStateWithFilteredPreloadedRoutes(state, navigatorName, targetScreen);
	const stateWithNavigator = stackRouter.getStateForAction(adjustedState, action, configOptions);

Conversation

WojtekBoman commented Mar 26, 2026 • edited by luacmartins Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Prerequisites

1. Workspaces List page renders correctly

2. Navigating into a workspace and back

3. iOS swipe-back gesture from workspace to list

4. Navigating into a domain and back

5. Tab switching preserves workspace state

6. Deep linking to a workspace screen

7. Deep linking to the workspaces list

8. Session storage restoration after reload

9. Tab bar highlight

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Mar 26, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sumo-slonik left a comment

Choose a reason for hiding this comment

Uh oh!

sumo-slonik Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

WojtekBoman Mar 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sumo-slonik Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

sumo-slonik Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

WojtekBoman Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

sumo-slonik Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 27, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

ZhenjaHorbach commented Mar 27, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented Mar 27, 2026

Uh oh!

ZhenjaHorbach commented Mar 27, 2026

Uh oh!

ZhenjaHorbach commented Mar 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify commented Mar 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

WojtekBoman commented Mar 26, 2026 •

edited by luacmartins

Loading

codecov bot commented Mar 26, 2026 •

edited by github-actions bot

Loading

WojtekBoman Mar 27, 2026 •

edited

Loading

ZhenjaHorbach commented Mar 27, 2026 •

edited

Loading