fix: Show discard changes modal on browser/device back in money-request flows by TaduJR · Pull Request #95076 · Expensify/App

TaduJR · 2026-07-01T18:04:02Z

Explanation of Change

This PR makes the "Discard changes" confirmation appear when a user leaves a money-request step that has unsaved input by pressing the browser back button or the Android device back button. Before this change those two back paths left the step and dropped the input with no prompt.

How it works

beforeRemove propagation into nested navigators. A patch to @react-navigation/core (useOnPreventRemove) makes shouldPreventRemove also recurse into a kept route whose nested state changed, instead of only checking routes removed by key. A browser back dispatches a RESET that keeps the outer RHP route but replaces its nested tab state, so without this patch the event never reached the focused tab screen and it could not prompt.
Web hook (useDiscardChangesConfirmation/index.ts). It intercepts that RESET through beforeRemove, shows the discard modal (configured not to add a browser history entry of its own), and restores the URL with history.go(1), because the browser entry has already moved by the time beforeRemove fires. It tracks this restore round-trip so the follow-up popstate event is not mistaken for a fresh back press.
Native hook (index.native.ts). It mirrors the web behavior with usePreventRemove, plus a BackHandler listener for the tab-switch hardware back, which is an index-only tab change that never fires beforeRemove.
backBehavior: 'none' on OnyxTabNavigator. Previously the navigator used 'initialRoute', so a back press returned to the initial tab before leaving. 'none' keeps the tab history at a single entry, so a back press leaves the whole flow directly, and it behaves the same on web and native.
Tab-switch guard (TabSwitchGuardContext and OnyxTabNavigator.handleTabPress). The odometer tab holds its reading in local state that a tab switch would drop, so switching away from it is intercepted and the same discard modal is shown. Other tabs share their draft or reset by design, so they have nothing to lose and stay unguarded.
Committed-baseline dirty predicates (MoneyRequestUtils). getAmountHasUnsavedChanges, getStringFieldHasUnsavedChanges, and getWaypointsHasUnsavedChanges decide whether a step is dirty by comparing the current value against the last committed value, which is empty when creating and the saved value when editing. That keeps the check correct in both the create and edit flows.

Deploy blockers fixed

[Due for payment 2026-07-23] Expense - Discard changes modal does not appear after proceeding to next page and exiting it #94844 (no modal after Next, then back). The check compared the typed value against the draft, but pressing Next writes the value into the draft, so afterward the value matched the draft and read as clean. It now compares against the committed baseline, which stays empty while creating, so a value that was saved forward still counts as unsaved.
[Due for payment 2026-07-23] Expense - Discard changes modal does not appear when amount is zero #94845 (no modal when the amount is zero). Emptiness was measured in backend units, where a typed "0" collapses to the same value as an empty field. It is now measured on the raw typed string, so a typed "0" counts as input.
[Due for payment 2026-07-23] Expense - "Discard Changes" modal not displayed after editing waypoints in distance expense. #94910 (no modal after editing waypoints). The waypoints check only ran while creating, so an edit skipped it and read as clean. An edit branch now compares the current waypoint addresses against the committed ones.
[Due for payment 2026-07-23] Expense - Different behavior of "Discard Changes" when using app´s or device´s back button. #94861 (device and app back behaved differently after Discard). On native the confirmed device back returned to the initial tab while the app back left the flow. Setting native backBehavior to 'none' makes both leave the flow.

Fixed Issues

$ #94844
$ #94845
$ #94910
$ #94861
$ #84246
PROPOSAL:

Tests

[Due for payment 2026-07-23] Expense - Discard changes modal does not appear after proceeding to next page and exiting it #94844 (no modal after Next, then back)
1. Open FAB > Create expense > Manual.
2. Enter an amount.
3. Click the RHP back button, verify the "Discard changes" modal appears, then click Cancel.
4. Click Next.
5. Click the RHP back button twice.
6. Verify the "Discard changes" modal appears.
[Due for payment 2026-07-23] Expense - Discard changes modal does not appear when amount is zero #94845 (no modal when the amount is zero)
1. Open FAB > Create expense > Manual.
2. Enter a non-zero amount.
3. Click the RHP back button, verify the "Discard changes" modal appears, then click Cancel.
4. Change the amount to 0.
5. Click the RHP back button.
6. Verify the "Discard changes" modal appears.
[Due for payment 2026-07-23] Expense - "Discard Changes" modal not displayed after editing waypoints in distance expense. #94910 (no modal after editing waypoints)
1. Open FAB > Track Distance > Map.
2. Enter start and stop waypoints.
3. Click the tab back button or the browser back button, verify the "Discard changes" modal appears, then dismiss it.
4. Click Next.
5. On the confirmation page, click the Distance field.
6. Edit any waypoint.
7. Click the tab back button or the browser back button.
8. Verify the "Discard changes" modal appears and the edit is not silently discarded back to the confirmation page.
[Due for payment 2026-07-23] Expense - Different behavior of "Discard Changes" when using app´s or device´s back button. #94861 (device and app back behave the same after Discard, Android)
1. Open the app on Android and tap FAB > Create Expense.
2. On the Manual tab (if already there, switch to another tab and back), enter an amount.
3. Press the device back button, then tap Discard changes.
4. Verify the expense creation flow closes completely.
5. Return to the Manual tab, enter an amount, and tap the in-app back button.
6. Tap Discard changes and verify the flow closes.
7. Verify both back methods behave the same, closing the flow rather than returning to a previous tab.

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

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

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android-Native.mp4

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

iOS-Safari.mp4

MacOS: Chrome / Safari

Mac-Chrome.mp4

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button

…RHP flows consistently

…redicates

…baseline is missing

melvin-bot · 2026-07-01T18:04:09Z

@jayeshmangwani 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

Here are some automated review suggestions for this pull request.

Reviewed commit: 4120f352ca

ℹ️ 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".

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button # Conflicts: # src/libs/MoneyRequestUtils.ts

codecov · 2026-07-01T18:16:17Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
...ooks/useDiscardChangesConfirmation/index.native.ts	`100.00% <100.00%> (ø)`
src/hooks/useDiscardChangesConfirmation/index.ts	`95.55% <100.00%> (+0.10%)`	⬆️
src/libs/MoneyRequestUtils.ts	`91.86% <100.00%> (+1.58%)`	⬆️
...rc/libs/Navigation/OnyxTabNavigatorConfig/index.ts	`100.00% <100.00%> (ø)`
src/libs/TransactionUtils/index.ts	`89.71% <ø> (ø)`
src/pages/iou/request/step/IOURequestStepHours.tsx	`81.08% <50.00%> (ø)`
...ges/settings/Agents/Fields/EditAgentAvatarPage.tsx	`0.00% <0.00%> (ø)`
...rc/pages/iou/request/step/IOURequestStepAmount.tsx	`87.38% <60.00%> (+0.90%)`	⬆️
.../iou/request/step/IOURequestStepDistanceManual.tsx	`0.00% <0.00%> (ø)`
...es/settings/Profile/Avatar/useProfileAvatarForm.ts	`0.00% <0.00%> (ø)`
... and 3 more
... and 18 files with indirect coverage changes

TaduJR · 2026-07-01T18:44:42Z

@codex review

chatgpt-codex-connector · 2026-07-01T18:56:00Z

Codex Review: Didn't find any major issues. Bravo.

Reviewed commit: 2c2beeadbd

ℹ️ 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".

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button

TaduJR · 2026-07-11T08:32:28Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5a0e627ef3

ℹ️ 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".

… a value

TaduJR · 2026-07-11T09:09:07Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f91d155095

ℹ️ 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".

MonilBhavsar

Looking good otherwise

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button

MonilBhavsar · 2026-07-13T11:52:49Z

Thanks!

github-actions · 2026-07-13T11:58:59Z

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

OSBotify · 2026-07-13T12:00:06Z

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

github-actions · 2026-07-13T12:04:18Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e287da00f85-fbc55b5-218d6e9464304c20bbb326202daf6ace9278b7fc/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e287da0-fbc55b5-a2aa1792c0981d50822b48a5096cf938f941bcc5/index.html

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

👀 View the workflow run that generated this build 👀

ZhenjaHorbach · 2026-07-14T11:24:09Z

We have a crash when we try to open Create expense or Track distance flow
I'm pretty sure it's related to this PR

@TaduJR
Can you check this, please?

2026-07-14.13.23.56.mov

OSBotify · 2026-07-14T11:36:36Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.4.34-0 🚀

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

MelvinBot · 2026-07-14T11:38:43Z

🤖 I reviewed the changes in this PR against Expensify's help site files under App/docs/articles.

No help site changes are required, and no draft docs PR was created.

This PR is a UX/navigation bug fix: it makes the existing Discard changes confirmation modal appear when a user leaves a money-request step that has unsaved input by pressing the browser back button or the Android device back button (plus the related dirty-check and backBehavior fixes for the linked deploy blockers). It does not add, rename, or remove any user-facing feature, tab, setting, or button, and it does not change any documented workflow.

Why no docs update is needed

No article in App/docs/articles documents back-button behavior, the "Discard changes" confirmation, or unsaved-input prompts in the expense-creation flow — I searched for discard, unsaved, back button, and confirmation modal and found no relevant references (the one "discard" hit in Distance-Expenses.md is about deleting a trip via the trash icon, unrelated to this change).
The expense-creation help articles describe what fields to fill in and how to create an expense, not the low-level navigation/confirmation micro-interactions this PR changes.
The discard-confirmation prompt is a standard, self-explanatory safety interaction; surfacing it consistently across back paths restores expected behavior rather than introducing something that needs to be explained.

If you feel a specific article should call out this behavior, let me know which one and I'll draft the update.

TaduJR · 2026-07-14T13:00:35Z

We have a crash when we try to open Create expense or Track distance flow
I'm pretty sure it's related to this PR
@TaduJR
Can you check this, please?

Checking

TaduJR · 2026-07-14T13:04:44Z

@ZhenjaHorbach

I think this is the PR that is causing it #94899. Got it from slack thread https://expensify.slack.com/archives/C01GTK53T8Q/p1784033901045039?thread_ts=1784033385.814129&cid=C01GTK53T8Q

OSBotify · 2026-07-16T05:13:14Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

OSBotify · 2026-07-16T06:04:07Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

Bundle Size Analysis (Sentry):

Android

TaduJR added 13 commits June 30, 2026 18:12

fix: use the committed baseline for money-request discard detection

e4ab982

Merge branch 'main' of https://github.com/TaduJR/App into fix-Discard…

d39bf4e

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button

fix: treat a typed zero as unsaved input on money-request create steps

d694324

fix: show the discard modal when editing waypoints on a distance expense

3f44c54

Merge branch 'main' of https://github.com/TaduJR/App into fix-Discard…

db81b47

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button

Merge branch 'main' of https://github.com/TaduJR/App into fix-Discard…

cda12bd

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button

fix: default native tab backBehavior to 'none' so back leaves tabbed …

30ed3c5

…RHP flows consistently

refactor: simplify discard-confirmation internals and money-request p…

63890c9

…redicates

fix: let the confirmed discard replay bypass the history-restore swallow

8e245f0

fix: don't prompt discard on a clean distance edit when the waypoint …

91abe19

…baseline is missing

fix: suppress the discard prompt on distance edit-save navigation

220acc5

fix: flag manual distance edits in the distance discard check

38c5cea

fix: treat a cleared manual distance as a discard-worthy edit

4120f35

TaduJR requested review from a team as code owners July 1, 2026 18:04

melvin-bot Bot assigned TaduJR Jul 1, 2026

melvin-bot Bot requested review from JmillsExpensify and jayeshmangwani and removed request for a team July 1, 2026 18:04

melvin-bot Bot removed the request for review from a team July 1, 2026 18:04

chatgpt-codex-connector Bot reviewed Jul 1, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/IOURequestStepDistanceMap.tsx Outdated

Merge branch 'main' of https://github.com/TaduJR/App into fix-Discard…

e1641ce

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button # Conflicts: # src/libs/MoneyRequestUtils.ts

TaduJR marked this pull request as draft July 1, 2026 18:10

refactor: make IOURequestStepDistanceMap honestly create-only

2c2beea

test: use a cspell-clean waypoint address in MoneyRequestUtilsTest

6be4c83

Merge branch 'main' of https://github.com/TaduJR/App into fix-Discard…

06a5ebe

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button

chatgpt-codex-connector Bot reviewed Jul 11, 2026

View reviewed changes

Comment thread src/libs/MoneyRequestUtils.ts Outdated

fix: flag cleared create fields as dirty when the draft already holds…

f91d155

… a value

chatgpt-codex-connector Bot reviewed Jul 11, 2026

View reviewed changes

Comment thread src/libs/Navigation/OnyxTabNavigatorConfig/index.ts

TaduJR requested a review from MonilBhavsar July 11, 2026 09:21

MonilBhavsar reviewed Jul 13, 2026

View reviewed changes

Comment thread src/libs/MoneyRequestUtils.ts Outdated

Comment thread src/libs/MoneyRequestUtils.ts Outdated

TaduJR added 2 commits July 13, 2026 14:29

Merge branch 'main' of https://github.com/TaduJR/App into fix-Discard…

a4d5bf0

…-changes-modal-doesnt-show-up-when-going-back-with-the-browser-back-button

style: make the money-request predicate JSDocs multiline

205a172

MonilBhavsar approved these changes Jul 13, 2026

View reviewed changes

MonilBhavsar merged commit e287da0 into Expensify:main Jul 13, 2026
34 checks passed

MelvinBot mentioned this pull request Jul 13, 2026

Pin initially-selected items to the top of long search filter lists #95986

Merged

53 tasks

OSBotify mentioned this pull request Jul 14, 2026

Deploy Checklist: New Expensify 2026-07-14 #96044

Closed

mkhutornyi mentioned this pull request Jul 14, 2026

Revert "fix: Show discard changes modal on browser/device back in money-request flows" #96046

Draft

Uh oh!

Conversation

TaduJR commented Jul 1, 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!

melvin-bot Bot commented Jul 1, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

codecov Bot commented Jul 1, 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!

TaduJR commented Jul 1, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 1, 2026

Uh oh!

TaduJR commented Jul 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

TaduJR commented Jul 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

MonilBhavsar commented Jul 13, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jul 13, 2026

Uh oh!

OSBotify commented Jul 13, 2026

Uh oh!

github-actions Bot commented Jul 13, 2026

Uh oh!

ZhenjaHorbach commented Jul 14, 2026

Uh oh!

OSBotify commented Jul 14, 2026

Uh oh!

MelvinBot commented Jul 14, 2026

Uh oh!

TaduJR commented Jul 14, 2026

Uh oh!

TaduJR commented Jul 14, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

TaduJR commented Jul 1, 2026 •

edited

Loading

codecov Bot commented Jul 1, 2026 •

edited by github-actions Bot

Loading