[Odometer] Show discard changes modal when switching tabs by jakubkalinski0 · Pull Request #89612 · Expensify/App

jakubkalinski0 · 2026-05-05T15:27:01Z

Explanation of Change

This PR adds a feature we agreed on in this discussion to show Discard Changes Confirmation modal when user tries to switch away from Odometer Tab to another tab without saved changes.

Introduces a DistanceTabGuardContext so any distance tab can register getHasUnsavedChanges / onDiscard callbacks. DistanceRequestStartPage intercepts tabPress to show the modal and reset odometer state on confirm. Also hardens OdometerReceiptStitcher and ReceiptFileValidator against a receipt flicker on the confirmation step.

Fixed Issues

$ #89940
PROPOSAL: N/A

Tests

Start a new expense and open the Distance request flow.
Switch to the Odometer tab.
Enter a start reading and/or end reading, and/or attach a start/end odometer image.
Without saving, tap a different tab (Map, Manual, or GPS).
Verify that a "Discard changes?" confirmation modal appears.
Tap Cancel and verify that you stay on the Odometer tab with your unsaved values intact.
Repeat steps 2-4, 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.
On the Odometer tab, leave readings/images empty and switch tabs.
Verify that no modal is shown and the tab switch happens immediately.
Enter readings/images on the Odometer tab, proceed all the way to the confirmation step.
Verify that the stitched odometer receipt renders on the confirmation page without flickering, disappearing, or redirecting back to the start step.
From the confirmation step, tap the Distance to edit it, change a reading or image, and save.
Verify that the confirmation step shows the updated receipt with no flicker and no redirect to the start of the flow.
DONT create the expense -> just go back to the odometer tab using back button.
Tap a different tab and verify that modal is shown (if you had an odometer draft created then the modal will not show because saving on the confirmation edit saves changes also into draft).

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

output.mp4

codecov · 2026-05-05T15:37:00Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/iou/request/DistanceTabGuardContext.tsx	`0.00% <0.00%> (ø)`
...ou/request/step/IOURequestStepDistanceOdometer.tsx	`0.00% <0.00%> (ø)`
src/pages/iou/request/DistanceRequestStartPage.tsx	`0.00% <0.00%> (ø)`
... and 9 files with indirect coverage changes

jakubkalinski0 · 2026-05-11T15:23:34Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4a624d5330

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

jakubkalinski0 · 2026-05-11T15:50:57Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 31b9b37c2f

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

jakubkalinski0 · 2026-05-11T16:20:48Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b2690b40a8

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

jakubkalinski0 · 2026-05-11T16:40:02Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b2690b40a8

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

jakubkalinski0 · 2026-05-11T16:57:27Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: bd1d392ced

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

jakubkalinski0 · 2026-05-11T17:15:55Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f9086f72ef

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

jakubkalinski0 · 2026-05-11T17:49:58Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4f59a798f4

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

jakubkalinski0 · 2026-05-11T18:14:43Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 62149d8334

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

jakubkalinski0 · 2026-05-11T18:43:06Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 62149d8334

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

jakubkalinski0 · 2026-05-11T18:52:57Z

@codex review

chatgpt-codex-connector · 2026-05-11T19:02:23Z

Codex Review: Didn't find any major issues. Hooray!

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

melvin-bot · 2026-05-11T21:27:18Z

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

melvin-bot · 2026-05-11T21:27:25Z

@Julesssss 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: 68c8e74dc3

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

chatgpt-codex-connector · 2026-05-11T21:33:01Z

+        if (!userHasUnsavedTypingRef.current && !!odometerDraft && !isOdometerDraftPendingHydration(odometerDraft, currentTransaction?.comment)) {
+            return false;


Preserve image-change checks when draft exists

Do not return early solely because odometerDraft is "not pending hydration" here. isOdometerDraftPendingHydration() only compares image presence (not URI/content), so if a saved draft already has images and the user replaces one image on the Odometer tab, this condition still evaluates as hydrated and getHasUnsavedChanges() returns false. In that flow (no typing, image-only edit), tab switching bypasses the discard confirmation and the new image change is kept/discarded without the expected prompt.

Useful? React with 👍 / 👎.

Working on that right now

DylanDylann · 2026-05-12T09:57:22Z

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

DylanDylann · 2026-05-12T10:51:17Z

Also hardens OdometerReceiptStitcher and ReceiptFileValidator against a receipt flicker on the confirmation step.

@jakubkalinski0 Could you provide more details about this problem? I'm a bit confused by the changes. If you don't mind, could you create a separate PR to fix it?

jakubkalinski0 · 2026-05-12T11:05:34Z

@DylanDylann I just noticed an issue that three async writers race on transaction.receipt after Onyx restores a backup transaction:

useOdometerDraftHydrator rewrites comment.odometerStartImage/EndImage (new object identity, same URI),
OdometerReceiptStitcher re-stitches and writes a new receipt.source,
ReceiptFileValidator validates the old receipt.source it captured at the start of its Promise.all.

If the validator's fetch finishes after the stitch lands, it would clear the fresh receipt - that created flickering of receipt on confirmation screen. The patch (4a624d5 and bd1d392):

makes the validator detect that the source it validated is no longer the live source and skip the clear/navigate,
gives the stitcher a self-heal path when an external writer wipes the receipt,
and keeps the validator from clearing odometer receipts while the source images are still alive.

This seems separable so we could go ahead and do that

…anges

…tion

…_modal_when_switching_tabs

jakubkalinski0 · 2026-05-22T15:16:32Z

Still holding on #90445 -> good progress being done there

jakubkalinski0 · 2026-05-26T10:25:58Z

We are close to getting #90445 merged. After that, work on this issue will be resumed

Julesssss · 2026-05-27T16:13:28Z

Removed hold from PR which was just merged. Ready for review I think? @jakubkalinski0

jakubkalinski0 · 2026-05-28T09:55:36Z

@Julesssss I will merge new main and verify if everything works correctly but in general yes. If nothing pops up then this PR should be ready for review today

…_modal_when_switching_tabs

melvin-bot Bot assigned jakubkalinski0 May 5, 2026

Julesssss mentioned this pull request May 7, 2026

[Odometer] Show discard changes modal when switching tabs with unsaved values #89940

Open

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

Comment thread src/pages/iou/request/DistanceRequestStartPage.tsx

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

Comment thread src/pages/iou/request/DistanceRequestStartPage.tsx

Comment thread src/pages/iou/request/step/confirmation/ReceiptFileValidator.tsx Outdated

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/confirmation/OdometerReceiptStitcher.tsx Outdated

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/confirmation/ReceiptFileValidator.tsx Outdated

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

Comment thread src/pages/iou/request/DistanceRequestStartPage.tsx Outdated

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

Comment thread src/pages/iou/request/DistanceRequestStartPage.tsx Outdated

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx

jakubkalinski0 marked this pull request as ready for review May 11, 2026 21:27

jakubkalinski0 requested review from a team as code owners May 11, 2026 21:27

melvin-bot Bot requested review from DylanDylann and heyjennahay and removed request for a team and heyjennahay May 11, 2026 21:27

melvin-bot Bot requested review from a team, Julesssss and heyjennahay and removed request for a team May 11, 2026 21:27

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

jakubkalinski0 added 7 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

jakubkalinski0 force-pushed the jakubkalinski0/Odometer_show_discard_changes_modal_when_switching_tabs branch from c68b760 to fed845d Compare May 13, 2026 09:16

jakubkalinski0 added 3 commits May 13, 2026 14:09

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

jakubkalinski0 changed the title ~~[Odometer] Show discard changes modal when switching tabs~~ [HOLD on https://github.com/Expensify/App/pull/89612] [Odometer] Show discard changes modal when switching tabs May 13, 2026

jakubkalinski0 changed the title ~~[HOLD on https://github.com/Expensify/App/pull/89612] [Odometer] Show discard changes modal when switching tabs~~ [HOLD on https://github.com/Expensify/App/pull/90445] [Odometer] Show discard changes modal when switching tabs May 13, 2026

Julesssss changed the title ~~[HOLD on https://github.com/Expensify/App/pull/90445] [Odometer] Show discard changes modal when switching tabs~~ [Odometer] Show discard changes modal when switching tabs May 27, 2026

Merge branch 'main' into jakubkalinski0/Odometer_show_discard_changes…

2c9bc31

…_modal_when_switching_tabs

		if (!userHasUnsavedTypingRef.current && !!odometerDraft && !isOdometerDraftPendingHydration(odometerDraft, currentTransaction?.comment)) {
		return false;

Conversation

jakubkalinski0 commented May 5, 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 May 5, 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!

jakubkalinski0 commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jakubkalinski0 commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

jakubkalinski0 commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jakubkalinski0 commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jakubkalinski0 commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jakubkalinski0 commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jakubkalinski0 commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jakubkalinski0 commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jakubkalinski0 commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jakubkalinski0 commented May 11, 2026

jakubkalinski0 commented May 5, 2026 •

edited

Loading

codecov Bot commented May 5, 2026 •

edited by github-actions Bot

Loading

jakubkalinski0 commented May 26, 2026 •

edited

Loading