[Payment due @DylanDylann] [Odometer] Show discard changes modal when switching tabs by Julesssss · Pull Request #94899 · Expensify/App

Julesssss · 2026-06-29T20:08:01Z

CLONE OF THIS PR, CONTRIBUTOR LEFT SWM Tested by me and C+.

Explanation of Change

This PR adds a feature we agreed on in this discussion to show a Discard Changes confirmation modal when the user tries to switch away from the Odometer tab to another tab with unsaved changes.

The tab-switch guard is generic, not odometer-specific. A new TabSwitchGuardContext lets any tab screen register getHasUnsavedChanges / onDiscard / onCancel callbacks keyed by tab name, and OnyxTabNavigator intercepts tabPress to show the shared "Discard changes?" modal - on confirm it runs onDiscard and then jumps to the target tab (it always jumps, even if onDiscard fails, surfacing a Growl error rather than stranding the user). It's wired through the existing useDiscardChangesConfirmation hook via a new onTabSwitchDiscard option that self-disables outside a tab navigator, and both the nav-away and tab-switch paths render an identical modal from getDiscardChangesModalConfig. On the Odometer tab, confirming clears the readings/images (or restores the confirmation-edit backup when editing) before the tab switch.

The discard diff is hardened against false positives: image changes use a re-mint-invariant identity (getOdometerImageIdentity, name|size|lastModified) that survives the draft round-trip but still detects a real swap, and the resync / unsaved-changes branching is extracted into unit-tested pure predicates (odometerResync.ts, getOdometerHasUnsavedChanges) that won't re-hydrate readings the user intentionally cleared.

Fixed Issues

$ #89940
PROPOSAL: N/A

Tests

Start a new expense and open the Distance request flow, then switch to the Odometer tab.
Enter a start reading and/or end reading, and/or attach a start/end odometer image. Do not save.
Tap a different tab (Map, Manual, or GPS) and verify that a "Discard changes?" confirmation modal appears.
Tap Cancel and verify that you stay on the Odometer tab with your unsaved readings/images intact.
Tap a different tab again, then tap the danger/confirm button in the modal.
Verify that the modal closes, the Odometer tab is reset (readings cleared, images removed), and the app navigates to the tab you originally tapped.
Back on the Odometer tab with empty readings/images, switch tabs and verify that no modal is shown and the tab switch happens immediately.
Type a reading, then delete it so the field is empty. Verify the field stays empty (it does not snap back to the value you just cleared) and that switching tabs now shows no modal.
Regression check the shared navigator: open another OnyxTabNavigator-based flow that does not register a guard (e.g. the Map/Manual distance tabs with no unsaved odometer changes) and verify tab switches happen immediately with no modal.

Nav-away discard still works

With unsaved odometer changes, use the in-app back button or press outside the RHP to leave the flow.
Verify the existing "Discard changes?" modal still appears (this PR does not change nav-away behavior).

Save-for-later draft

With odometer readings/images entered, tap Save for later, then reopen the flow.
Switch tabs without making further edits and verify that NO modal appears (the hydrated draft equals the transaction, so it is not treated as an unsaved change).

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

untitled.webm

Android: mWeb Chrome

untitled2.webm

iOS: Native

Simulator.Screen.Recording.-.iPhone.16.Pro.Max.-.2026-06-16.at.23.05.25.mov

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.16.Pro.Max.-.2026-06-16.at.23.22.23.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-16.at.20.56.57.mov

…anges

…tion

…_modal_when_switching_tabs

Replace per-tab browser history for the distance-create tabs (UNSTABLE_router, web-only, allowlist-scoped) so browser-back closes the RHP instead of cycling tabs, and the existing discard guard fires. Gate the odometer step's discard hook to standalone screens to avoid a double modal.

…eterImageUri for image-change detection Ports two refinements from the earlier RHP-close work that were not carried into the browser-back rewrite: pass restoreLastInputFocus as the tab guard's onCancel so canceling the discard modal during a tab switch re-focuses the input, and compare odometer images via getOdometerImageUri in getHasUnsavedChanges.

- centralize RN tab-switch action types (JUMP_TO/NAVIGATE_DEPRECATED) in CONST.NAVIGATION.ACTION_TYPE and add a test guarding the JUMP_TO coupling - reuse goForwardInBrowserHistory util in useDiscardChangesConfirmation instead of inline window.history.go(1) - document DistanceTabGuardContext as a single-active-guard registry

Move the inline branching of IOURequestStepDistanceOdometer's "resync from transaction" effect into pure isExternalOdometerResync / shouldInitializeOdometerFromTransaction helpers and cover them with unit tests. The effect's side-effects and dependency array are unchanged - this is behavior-preserving, just making the subtle logic named and testable.

…_modal_when_switching_tabs

…causing double-restore

…identity

…n tab/back

…_modal_when_switching_tabs

…itch Removes the browser-Back-button discard mechanism introduced in 4ab9a73: the tab-history replacement router, goForwardInBrowserHistory helper, and the page-level useActiveTabGuardDiscardConfirmation hook. Restores the per-step useDiscardChangesConfirmation (header/hardware back) and keeps the core tab-switch discard modal and the resync guard untouched.

…gator

…text

…omments

codecov · 2026-06-29T20:57:33Z

Codecov Report

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

Files with missing lines	Coverage Δ
...hangesConfirmation/getDiscardChangesModalConfig.ts	`100.00% <100.00%> (ø)`
...ooks/useDiscardChangesConfirmation/index.native.ts	`100.00% <100.00%> (ø)`
src/hooks/useDiscardChangesConfirmation/index.ts	`95.45% <100.00%> (+0.10%)`	⬆️
src/hooks/useOdometerReceiptStitcher/index.ts	`94.11% <ø> (ø)`
...c/hooks/useRestartOnOdometerImagesFailure/index.ts	`92.85% <100.00%> (+92.85%)`	⬆️
src/libs/OdometerReceipt/deriveOdometerReceipt.ts	`100.00% <ø> (ø)`
src/libs/OdometerReceipt/stitchTask.ts	`100.00% <ø> (ø)`
src/libs/actions/TransactionEdit.ts	`75.25% <ø> (+17.52%)`	⬆️
src/libs/stitchOdometerImages/index.native.ts	`0.00% <ø> (ø)`
src/libs/stitchOdometerImages/index.ts	`0.00% <ø> (ø)`
... and 8 more
... and 93 files with indirect coverage changes

…er_show_discard_changes_modal_when_switching_tabs # Conflicts: # src/hooks/useDiscardChangesConfirmation/index.native.ts # src/hooks/useDiscardChangesConfirmation/index.ts # src/libs/Navigation/OnyxTabNavigator.tsx

Julesssss · 2026-06-29T22:19:58Z

OKAY so this PR has been in progress for a while, the contributor left SWM but the PR was approved by me and C+ for merge. However a merge conflict arose today and I can't write to that PR so had to clone it.

I will handle any issues here but essentially I have just merged main to resolve conflicts.

Julesssss · 2026-06-29T22:22:51Z

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 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)
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)
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.
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

github-actions · 2026-06-29T22:27:52Z

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

github-actions · 2026-06-29T22:34:14Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-84b100a1e20-638513b-01f93836099a6865d236f53a64458d07a80f89eb/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-84b100a-638513b-5b9b6cd9fe130ebe674245d65345bf96a64871cd/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-30T12:07:49Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.4.25-0 🚀

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

jponikarchuk · 2026-06-30T12:40:43Z

Deploy Blocker #94961 was identified to be related to this PR.

OSBotify · 2026-07-01T19:46:36Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.4.25-2 🚀

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

Bundle Size Analysis (Sentry):

Android

jakubkalinski0 added 30 commits May 13, 2026 10:51

feature: show discard modal when leaving odometer tab with unsaved ch…

6dabb95

…anges

fix: don't show discard modal when tapping the active distance tab

0e73202

fix: prevent distance tab switch while discard modal is opening

203f488

fix: catch tab-discard callback errors before jumping tabs

bb99470

fix: handle synchronous throws from tab discard callback

150381e

fix: prevent false discard modal after editing odometer from confirma…

196b7b7

…tion

fix: pull missing hasInitializedRefs ref into odometer step

fed845d

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

e6b1375

…_modal_when_switching_tabs

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

d1f2908

…_modal_when_switching_tabs

chore: prettier run

2f6636a

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

2c9bc31

…_modal_when_switching_tabs

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

6f54b10

…_modal_when_switching_tabs

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

8fabe0b

…_modal_when_switching_tabs

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

c76d61c

…_modal_when_switching_tabs

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

534b663

…_modal_when_switching_tabs

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

4b34bea

…_modal_when_switching_tabs

fix(odometer): remove duplicate edit-from-confirmation backup effect …

ebd7849

…causing double-restore

fix(odometer): make discard-changes diff re-mint-invariant via image …

3a95d0f

…identity

fix(odometer): guard resync from re-hydrating user-cleared readings o…

fd2a38e

…n tab/back

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

12269b9

…_modal_when_switching_tabs

chore: prettier run

abef5e3

chore: add reminted to cspell wordlist

08b5591

feat(navigation): add generic tab-switch discard guard to OnyxTabNavi…

572d2e7

…gator

refactor(odometer): adopt generic tab guard, drop DistanceTabGuardCon…

3ec31e7

…text

chore(odometer): typed test factories, drop lint suppressions, trim c…

fd2b2fb

…omments

Julesssss removed the request for review from flaviadefaria June 29, 2026 20:08

Expensify deleted a comment from github-actions Bot Jun 29, 2026

Julesssss force-pushed the jules-cloneOdometerShowDiscardModal branch 2 times, most recently from 41b9d7e to d1934f0 Compare June 29, 2026 20:52

Julesssss force-pushed the jules-cloneOdometerShowDiscardModal branch from d1934f0 to 5c1e679 Compare June 29, 2026 21:35

Julesssss mentioned this pull request Jun 29, 2026

[Due for payment 2026-07-08] [Odometer] Show discard changes modal when switching tabs with unsaved values #89940

Closed

annaweber830 mentioned this pull request Jun 29, 2026

[Due for payment 2026-08-03] [$250] iOS-Expense-The share screen does not close when swiping back #94908

Open

7 tasks

This comment was marked as resolved.

Sign in to view

Julesssss mentioned this pull request Jun 29, 2026

[Payment due @DylanDylann] [Odometer] Show discard changes modal when switching tabs #89612

Closed

52 tasks

Beamanator approved these changes Jun 29, 2026

View reviewed changes

Julesssss merged commit 84b100a into main Jun 29, 2026
38 of 39 checks passed

Julesssss deleted the jules-cloneOdometerShowDiscardModal branch June 29, 2026 22:25

This comment has been minimized.

Sign in to view

github-actions Bot mentioned this pull request Jun 29, 2026

Investigate workflow job failing on main: test / test (job 8) #94915

Closed

OSBotify mentioned this pull request Jun 30, 2026

Deploy Checklist: New Expensify 2026-06-30 #94951

Closed

60 tasks

MelvinBot mentioned this pull request Jun 30, 2026

[No QA] Docs updates for E/A#94899 Odometer tab-switch discard changes FAQ #94959

Closed

applause-bot Bot mentioned this pull request Jun 30, 2026

[Due for payment 2026-07-13] [$250 - payment 9th July] Distance - Odometer readings are auto cleared after switching tab despite saving for later #94961

Closed

7 tasks

TaduJR mentioned this pull request Jul 14, 2026

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

Merged

54 tasks

melvin-bot Bot mentioned this pull request Jul 18, 2026

[HOLD] [$250] Odometer - Manually entered start/end readings no longer shown in merchant line when reopening a mileage expense #96436

Closed

2 tasks

MelvinBot mentioned this pull request Jul 24, 2026

[Due for payment 2026-07-23] Expense - Different behavior of "Discard Changes" when using app´s or device´s back button. #94861

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Payment due @DylanDylann] [Odometer] Show discard changes modal when switching tabs - #94899

[Payment due @DylanDylann] [Odometer] Show discard changes modal when switching tabs#94899
Julesssss merged 61 commits into
mainfrom
jules-cloneOdometerShowDiscardModal

Julesssss commented Jun 29, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Jun 29, 2026 •

edited by github-actions Bot

Loading

Uh oh!

This comment was marked as resolved.

Julesssss commented Jun 29, 2026

Uh oh!

Julesssss commented Jun 29, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 29, 2026

Uh oh!

This comment has been minimized.

github-actions Bot commented Jun 29, 2026

Uh oh!

OSBotify commented Jun 30, 2026

Uh oh!

jponikarchuk commented Jun 30, 2026

Uh oh!

OSBotify commented Jul 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

Julesssss commented Jun 29, 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 Jun 29, 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!

This comment was marked as resolved.

Julesssss commented Jun 29, 2026

Uh oh!

Julesssss commented Jun 29, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

github-actions Bot commented Jun 29, 2026

Uh oh!

This comment has been minimized.

github-actions Bot commented Jun 29, 2026

Uh oh!

OSBotify commented Jun 30, 2026

Uh oh!

jponikarchuk commented Jun 30, 2026

Uh oh!

OSBotify commented Jul 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Julesssss commented Jun 29, 2026 •

edited

Loading

codecov Bot commented Jun 29, 2026 •

edited by github-actions Bot

Loading