fix: #88963 - fallback to split navigator's default route when there's no `existingFirstRoute` by war-in · Pull Request #89080 · Expensify/App

war-in · 2026-04-28T10:40:27Z

Explanation of Change

When the app cold-starts via the native share intent, the placeholder REPORTS_SPLIT_NAVIGATOR tab has no nested routes. After sharing, revealRouteBeforeDismissingModal -> REPLACE_FULLSCREEN_UNDER_RHP produced a tab state of [REPORT] with nothing to pop back to, so the back button did nothing. In handleReplaceFullscreenUnderRHP we now fall back to the split navigator's default sidebar route (e.g. INBOX) via SPLIT_TO_SIDEBAR when the existing tab has no first route, restoring [INBOX, REPORT] and a working back button.

Fixed Issues

$ #88963
PROPOSAL: #88963 (comment)

Tests

Android & iOS only:

Fully close the Expensify app (force-quit so it cold-starts).
From the device gallery (or any other app), share an image to Expensify via the native share sheet.
On the Share tab, select any chat, then tap Share.
After the share completes, the chat (Report) screen is shown.
Tap the in-app back button in the header.
Verify that you are returned to the Inbox (LHN), not stuck on the Report screen.

Offline tests

N/A — change is purely navigation-state computation, no API/Onyx interaction.

QA Steps

Same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

Screen_Recording_20260428_125127_Expensify.Dev.mp4

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…en no existingFirstRoute

codecov · 2026-04-28T10:49:02Z

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 Δ
...ateRootStackNavigator/GetStateForActionHandlers.ts	`24.59% <0.00%> (-0.27%)`	⬇️
... and 18 files with indirect coverage changes

melvin-bot · 2026-04-28T12:15:21Z

@ZhenjaHorbach 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]

ZhenjaHorbach · 2026-04-28T12:29:08Z

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

2026-04-28.16.29.04.mov

Android: mWeb Chrome

NA

iOS: HybridApp

2026-04-28.16.29.04.mov

iOS: mWeb Safari

NA

MacOS: Chrome / Safari

NA

luacmartins

LGTM

ZhenjaHorbach · 2026-04-28T14:30:06Z

LGTM!

OSBotify · 2026-04-28T14:41:05Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

…e-share-back-button fix: #88963 - fallback to split navigator's default route when there's no `existingFirstRoute` (cherry picked from commit cfff715) (cherry-picked to staging by luacmartins)

github-actions · 2026-04-28T15:49:39Z

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

github-actions · 2026-04-28T15:54:10Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-cfff715-f5c1c69-a83f6f2c390d3c8c5492af3c552c07cc8fb5d9c3/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-cfff715-f5c1c69-29f317db697ed59d2a9b2d71406956e2195912e7/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-28T16:11:58Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.64-9 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-28T16:13:15Z

I reviewed the changes in this PR. It fixes a navigation bug where the back button didn't work after sharing an image via the native share sheet on a cold start. The change is purely internal — it adjusts navigation state computation in GetStateForActionHandlers.ts to fall back to the split navigator's default sidebar route when no existing first route is present.

No help site changes are required. This is a behind-the-scenes navigation fix with no impact on user-facing features, settings, terminology, or workflows documented in App/docs/articles.

OSBotify · 2026-04-28T17:09:40Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.64-10 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

fix: Expensify#88963 - fallback to split navigator's default route wh…

2ea1e8d

…en no existingFirstRoute

melvin-bot Bot assigned war-in Apr 28, 2026

war-in marked this pull request as ready for review April 28, 2026 12:15

war-in requested review from a team as code owners April 28, 2026 12:15

melvin-bot Bot requested review from ZhenjaHorbach and heyjennahay and removed request for a team April 28, 2026 12:15

melvin-bot Bot removed the request for review from a team April 28, 2026 12:15

luacmartins approved these changes Apr 28, 2026

View reviewed changes

ZhenjaHorbach approved these changes Apr 28, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny April 28, 2026 14:30

luacmartins merged commit cfff715 into Expensify:main Apr 28, 2026
54 of 56 checks passed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Apr 28, 2026

OSBotify mentioned this pull request Apr 28, 2026

Deploy Checklist: New Expensify 2026-04-23 #88633

Open

arosiclair mentioned this pull request Apr 29, 2026

PR checklist #89226

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: #88963 - fallback to split navigator's default route when there's no `existingFirstRoute`#89080

fix: #88963 - fallback to split navigator's default route when there's no `existingFirstRoute`#89080
luacmartins merged 1 commit intoExpensify:mainfrom
software-mansion-labs:war-in/fix-native-share-back-button

war-in commented Apr 28, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Apr 28, 2026 •

edited by github-actions Bot

Loading

Uh oh!

melvin-bot Bot commented Apr 28, 2026

Uh oh!

ZhenjaHorbach commented Apr 28, 2026 •

edited

Loading

Uh oh!

luacmartins left a comment

Uh oh!

ZhenjaHorbach commented Apr 28, 2026

Uh oh!

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

war-in commented Apr 28, 2026 • edited 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!

codecov Bot commented Apr 28, 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!

melvin-bot Bot commented Apr 28, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented Apr 28, 2026

Uh oh!

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

war-in commented Apr 28, 2026 •

edited

Loading

codecov Bot commented Apr 28, 2026 •

edited by github-actions Bot

Loading

ZhenjaHorbach commented Apr 28, 2026 •

edited

Loading