Skip to content

[Odometer] Improvement to DiscardChangesConfirmation usage#87269

Draft
jakubkalinski0 wants to merge 4 commits intoExpensify:mainfrom
software-mansion-labs:jakubkalinski0/Odometer_add_discard_changes_for_editing_from_confirmation
Draft

[Odometer] Improvement to DiscardChangesConfirmation usage#87269
jakubkalinski0 wants to merge 4 commits intoExpensify:mainfrom
software-mansion-labs:jakubkalinski0/Odometer_add_discard_changes_for_editing_from_confirmation

Conversation

@jakubkalinski0
Copy link
Copy Markdown
Contributor

@jakubkalinski0 jakubkalinski0 commented Apr 7, 2026

Explanation of Change

Refactored discard-navigation hooks to always attach listeners and moved enable/focus checks into screen callbacks. This fixes unsaved-change prompts for odometer edits from confirmation, bypasses prompts after save/skip-confirmation submit, and avoids extra cancel prompts in MFA authorize when the transaction is unavailable or a deny outcome screen is shown.

Fixed Issues

$
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console
  1. Navigate to any report and create a new distance request using the odometer flow.
  2. Continue to the confirmation page, tap the Distance field to edit odometer values, and change either start or end reading.
  3. Tap back.
  4. Verify that a discard-changes confirmation modal appears; choose Cancel and verify that you stay on the odometer page with the unsaved value still visible.

  1. From the odometer edit-from-confirmation screen, modify at least one odometer reading.
  2. Tap Next to save and return to confirmation.
  3. Verify that navigation returns to confirmation without showing the discard-changes modal.
  4. Verify that the updated distance values remain applied (the original values are not restored).

  1. Open a pending 3DS authorize-transaction request (MFA review transaction flow).
  2. Tap back and verify that the cancel confirmation modal appears; dismiss it with Cancel.
  3. Tap Deny, wait for the deny outcome screen, and then leave that screen.
  4. Verify that leaving the deny outcome screen is not blocked by an additional cancel/discard confirmation modal.

Offline tests

  1. Disable network connectivity.
  2. Repeat Test 1 (edit odometer values from confirmation, then tap back).
  3. Verify that the same discard-changes modal appears and that Cancel keeps edits while Discard exits the page.

QA Steps

  • Verify that no errors appear in the JS console

Same as tests.

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

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 7, 2026

Codecov Report

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

Files with missing lines Coverage Δ
...ooks/useDiscardChangesConfirmation/index.native.ts 0.00% <ø> (ø)
src/hooks/useBeforeRemove.tsx 33.33% <50.00%> (+8.33%) ⬆️
...rAuthentication/AuthorizeTransactionPage/index.tsx 0.00% <0.00%> (ø)
src/hooks/useDiscardChangesConfirmation/index.ts 0.00% <0.00%> (ø)
...ou/request/step/IOURequestStepDistanceOdometer.tsx 0.00% <0.00%> (ø)
... and 63 files with indirect coverage changes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant