Introduce a Bottom Tab Navigator for Top-Level Navigation by WojtekBoman · Pull Request #85234 · Expensify/App

WojtekBoman · 2026-03-13T14:01:42Z

Explanation of Change

Fixed Issues

$ #85260
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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 new assets were added or existing ones were modified, I verified that:
- The assets are optimized and compressed (for SVG files, run npm run compress-svg)
- The assets load correctly across all supported platforms.
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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…vigationTabBar

…rapper

…vigationTabBar

…-freeze Root tab navigator freeze

…vigationTabBar

github-actions · 2026-03-13T14:01:54Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

github-actions · 2026-03-13T14:42:53Z

🚧 @luacmartins has triggered a test Expensify/App build. You can view the workflow run here.

mountiny · 2026-03-13T17:44:30Z

on ios native, the bottom padding and composer padding is not right

mountiny · 2026-03-13T17:45:57Z

its replicating

mountiny · 2026-03-13T17:46:43Z

another variation

mountiny · 2026-03-13T17:48:22Z

BUG: The bottom tabs remain on the chat screen when they should be hidden

mountiny · 2026-03-13T17:48:53Z

BUG: Navigating to the Workspaces tab and then to specific workspace on ios native

no animation
unable to go back to the workspace chat list with < or gesture

sumo-slonik · 2026-03-16T07:52:28Z

its replicating

I already have a fix ready on my branch for the duplicated bottom tab navigation bar. Along with this fix, we’ll also add a simplification to eliminate redundant re-renders of the navigation bar. I’ll let you know once it becomes part of this PR.

…te-after-dismiss-rhp Tab nav/fix navigate after dismiss rhp

# Conflicts: # package-lock.json # package.json # patches/react-navigation/@react-navigation+core+7.16.1+003+fix-clearing-preloaded-routes-after-logout.patch # patches/react-navigation/details.md # src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx # src/libs/Navigation/helpers/linkTo/index.ts # tests/ui/SearchPageTest.tsx

… page, back button returns Home

…orkspace

With the TabNavigator, usePreloadFullScreenNavigators was removed from HomePage. That hook was the incidental trigger for OnboardingGuard — its preload actions went through getStateForAction where the guard would intercept and redirect to onboarding. Fix: explicitly call startOnboardingFlow from useOnboardingFlowRouter when isOnboardingCompleted === false. Uses resetRoot (bypasses guard) wrapped in waitForProtectedRoutes (handles fresh login timing). Also removes the now-dead "redirect TO onboarding" logic from OnboardingGuard. The guard retains its two remaining responsibilities: blocking navigation away from onboarding, and redirecting completed users away from onboarding routes (deep links).

sumo-slonik · 2026-04-09T08:01:38Z

I’m testing all the issues one last time, and I think we’ll be able to start another round of testing today. I’ll let you know when we’re ready for the second round.

…t-tab-navigator

…es-1 Tab navigator issues 1

…b-navigator

sumo-slonik · 2026-04-09T11:47:21Z

@mountiny @luacmartins The issues no longer reproduce, and we’re ready for the next round of testing. We can run ad hoc builds here.

luacmartins · 2026-04-09T14:47:24Z

Cool, I'm running an adhoc and will ask QA to test this again

github-actions · 2026-04-09T14:48:16Z

🚧 @luacmartins has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-04-09T14:54:58Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #85234.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-af8a32f-b0990c7-6d19a789025720ce9b279fd461cca7e90674add1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-af8a32f-b0990c7-0e7f8edcb2016e2ad2a060795a3b064c6244659b/index.html

Web 🕸️
https://85234.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

luacmartins · 2026-04-09T15:05:10Z

Requested retest https://expensify.slack.com/archives/C09V78U42D8/p1775747088925419

lanitochka17 · 2026-04-09T17:12:21Z

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

Security - 2FA - Blue boarder shown in two factor authentication back button

Version Number: 9.3.54-1 PR:85234
Reproducible in staging?: N
Reproducible in production?: N
If this was caught during regression testing, add the test name, ID and link from TestRail: N/A
Issue reported by: Applause - Internal Team

Action Performed:

Log in using https://85234.pr-testing.expensify.com/
Go to security and add 2FA if not set already
Navigate to Two-factor authentication again
Tap Replace device
Enter the current 6-digit code from your authenticator app
Add this new secret/QR code to your authenticator app (creating a new entry)
Enter the 6-digit code generated by the new entry

Expected Result:

In the success screen page there is no Blue boarder shown in two factor authentication back button.

Actual Result:

success screen page there is Blue boarder shown in two factor authentication back button.
Same when disabling 2FA

Workaround:

Unknown

Platforms:

Which of our officially supported platforms is this issue occurring on?

Screenshots/Videos

Bug7126067_1775753742251.bandicam_2026-04-09_19-48-10-805.mp4

Upwork Automation - Do Not Edit

lanitochka17 · 2026-04-09T17:30:09Z

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

Troubleshoot- Unable to close the troubleshoot after opening in Log in page using CTRL+D

Version Number: 9.3.54-1 PR:85234
Reproducible in staging?: N
Reproducible in production?: N
If this was caught during regression testing, add the test name, ID and link from TestRail: N/A
Issue reported by: Applause - Internal Team

Action Performed:

Navigate to https://85234.pr-testing.expensify.com/
In log in page click CTRL+D to open troubleshoot page
Try to go out from the page by clicking outside or ESC button

Expected Result:

User can close the troubleshoot page

Actual Result:

Unable to close troubleshoot page

Workaround:

Unknown

Platforms:

Which of our officially supported platforms is this issue occurring on?

Screenshots/Videos

Bug7126089_1775754889075.bandicam_2026-04-09_20-06-16-248.mp4

Upwork Automation - Do Not Edit

lanitochka17 · 2026-04-09T18:00:19Z

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

Web-Subscription- Background page changed to workspace list when clicking add payment card

Version Number: 9.3.54-1 PR:85234
Reproducible in staging?: N
Reproducible in production?: N
If this was caught during regression testing, add the test name, ID and link from TestRail: N/A
Issue reported by: Applause - Internal Team

Action Performed:

Log in using https://85234.pr-testing.expensify.com/
Go to accounts > subscription > click add payment card

Expected Result:

The background doesnt change to other page

Actual Result:

Background page changed to workspace list when clicking add payment card

Workaround:

Unknown

Platforms:

Which of our officially supported platforms is this issue occurring on?

Screenshots/Videos

Bug7126104_1775755929961.bandicam_2026-04-09_20-31-45-121.mp4

Upwork Automation - Do Not Edit

lanitochka17 · 2026-04-09T20:02:39Z

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

iOS - App doesn't return to home page with swipe back gesture when report is opened from For you

Version Number: 9.3.54-1 PR:85234
Reproducible in staging?: N
Reproducible in production?: N
If this was caught during regression testing, add the test name, ID and link from TestRail: N/A
Issue reported by: Applause - Internal Team

Action Performed:

Precondition:
Have a report containing one expense in draft state.

Launch adhoc app.
Go to Home
Tap Begin under For you section.
Use the iPhone swipe gesture (left to right) to navigate back

Expected Result:

The user is navigated back to the Home page

Actual Result:

The user is navigated to the Inbox page instead

Workaround:

Unknown

Platforms:

Which of our officially supported platforms is this issue occurring on?

Screenshots/Videos

Bug7126189_1775762953717.video_2026-04-09_22-26-53.mp4

Upwork Automation - Do Not Edit

WojtekBoman and others added 16 commits March 11, 2026 14:36

Add NAVIGATORS.ROOT_TAB_NAVIGATOR

a33543b

fixing bottom tab navigator bar

6e9f335

Adjust getAdaptedState to tab navigator

a726a95

Move WorkspacesSplitNavigator to Tab navigator

9ecb0d0

fixing the bottom tab navigator bar by adding tab recognition

8cad633

fixing the bottom tab navigator bar by adding tab recognition

0024b6d

fixing the bottom tab navigator bar by adding tab recognition

9a58952

Merge branch 'root-tab-navigator' into feature/kuba-nowakowski/fix_na…

6de7718

…vigationTabBar

remove the top-level navigation bar

596dd42

Push new screens when navigating to Report or Search pages

8dcd6ad

Wrap SearchFullscreenNavigator and ReportsSplitNavigator with FreezeW…

a07a9ec

…rapper

Merge branch 'root-tab-navigator' into feature/kuba-nowakowski/fix_na…

3feaffe

…vigationTabBar

Add white bg to loading indicator

601f804

Merge pull request #306 from software-mansion-labs/root-tab-navigator…

1072bd2

…-freeze Root tab navigator freeze

remove the top-level navigation bar

45f6734

Merge branch 'root-tab-navigator' into feature/kuba-nowakowski/fix_na…

8e5fd29

…vigationTabBar

melvin-bot bot assigned WojtekBoman Mar 13, 2026

Fix bg color of loading view

790d2eb

This comment has been minimized.

Sign in to view

mountiny mentioned this pull request Mar 13, 2026

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

Open

mountiny requested review from ZhenjaHorbach and mountiny March 13, 2026 18:42

WojtekBoman and others added 3 commits April 7, 2026 13:20

Save RightModalNavigator state to preservedState

fd24c82

prevent duplicate tab history on TAB_NAVIGATOR push with nested screen

7bfab98

Merge pull request #328 from software-mansion-labs/tab-nav/fix-naviga…

7badc26

…te-after-dismiss-rhp Tab nav/fix navigate after dismiss rhp

sumo-slonik force-pushed the root-tab-navigator branch 3 times, most recently from 6420bb8 to 6d82574 Compare April 8, 2026 10:34

sumo-slonik added 2 commits April 8, 2026 13:48

fix patch and update lock file

6adf096

sumo-slonik force-pushed the root-tab-navigator branch from 00df49f to 6adf096 Compare April 8, 2026 12:10

sumo-slonik and others added 6 commits April 8, 2026 14:12

remove empty patch

44b3ce3

fix bottom padding

f7ad378

Fix issue: After inviting member from Overview, bottom tab on Members…

ac43c87

… page, back button returns Home

Fix issue: Android - App back button returns to Home after creating w…

32b9fce

…orkspace

fix: expense creation navigation to Search on narrow and wide

3e37bbe

sumo-slonik and others added 5 commits April 9, 2026 10:23

Merge remote-tracking branch 'origin/tab-navigator-issues-1' into roo…

532d503

…t-tab-navigator

Refactor createWorkspaceWithPolicyDraftAndNavigateToIt

c29723d

Merge pull request #330 from software-mansion-labs/tab-navigator-issu…

ad2d8e4

…es-1 Tab navigator issues 1

fix undefined report issue

4179f4b

Merge remote-tracking branch 'origin/root-tab-navigator' into root-ta…

af8a32f

…b-navigator

Conversation

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

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

This comment has been minimized.

mountiny commented Mar 13, 2026

Uh oh!

mountiny commented Mar 13, 2026

Uh oh!

mountiny commented Mar 13, 2026

Uh oh!

mountiny commented Mar 13, 2026

Uh oh!

mountiny commented Mar 13, 2026

Uh oh!

sumo-slonik commented Mar 16, 2026

Uh oh!

sumo-slonik commented Apr 9, 2026

Uh oh!

sumo-slonik commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

luacmartins commented Apr 9, 2026

Uh oh!

github-actions bot commented Apr 9, 2026

Uh oh!

github-actions bot commented Apr 9, 2026

Uh oh!

luacmartins commented Apr 9, 2026

Uh oh!

lanitochka17 commented Apr 9, 2026

Security - 2FA - Blue boarder shown in two factor authentication back button

Action Performed:

Expected Result:

Actual Result:

Workaround:

Platforms:

Screenshots/Videos

Uh oh!

lanitochka17 commented Apr 9, 2026

Troubleshoot- Unable to close the troubleshoot after opening in Log in page using CTRL+D

Action Performed:

Expected Result:

Actual Result:

Workaround:

Platforms:

Screenshots/Videos

Uh oh!

lanitochka17 commented Apr 9, 2026

Web-Subscription- Background page changed to workspace list when clicking add payment card

Action Performed:

Expected Result:

Actual Result:

Workaround:

Platforms:

Screenshots/Videos

Uh oh!

lanitochka17 commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

iOS - App doesn't return to home page with swipe back gesture when report is opened from For you

Action Performed:

Expected Result:

Actual Result:

Workaround:

Platforms:

Screenshots/Videos

Uh oh!

Reviewers

Assignees

WojtekBoman commented Mar 13, 2026 •

edited by mountiny

Loading

sumo-slonik commented Apr 9, 2026 •

edited

Loading

lanitochka17 commented Apr 9, 2026 •

edited

Loading