Skip to content

Conversation

@mkzie2
Copy link
Contributor

@mkzie2 mkzie2 commented Dec 22, 2025

Explanation of Change

This PR replaces the usage of useBeforeRemove with usePreventRemove in DiscardChangesConfirmation to prevent issue where the logics is not properly executed with IOS swipe back gesture

Fixed Issues

$ #76326
PROPOSAL: #76326 (comment)

Tests

  1. Start a chat with any user.
  2. Create an expense.
  3. In the description/merchant/distance odometer section, type any comments and swipe right to go back without saving your changes.
  4. Verify that: discard changes modal shows up, user can't go back.
  5. Click account -> Profile -> Click Avatar
  6. Choose a different avatar
  7. Swipe right to go back without saving changes
  8. Verify that: discard changes modal shows up, user can't go back.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Start a chat with any user.
  2. Create an expense.
  3. In the description/merchant/distance odometer section, type any comments and swipe right to go back without saving your changes.
  4. Verify that: discard changes modal shows up, user can't go back.
  5. Click account -> Profile -> Click Avatar
  6. Choose a different avatar
  7. Swipe right to go back without saving changes
  8. Verify that: discard changes modal shows up, user can't go back.
  • Verify that no errors appear in the JS console

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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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.
  • 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
Screen.Recording.2025-12-23.at.00.24.47.mov
Android: mWeb Chrome
Screen.Recording.2025-12-23.at.00.25.09.mov
iOS: Native
Screen.Recording.2025-12-23.at.00.23.46.mov
iOS: mWeb Safari
Screen.Recording.2025-12-23.at.00.25.31.mov
MacOS: Chrome / Safari
Screen.Recording.2025-12-23.at.00.22.11.mov

@codecov
Copy link

codecov bot commented Dec 22, 2025

@mkzie2 mkzie2 marked this pull request as ready for review December 22, 2025 17:27
@mkzie2 mkzie2 requested review from a team as code owners December 22, 2025 17:27
@melvin-bot melvin-bot bot requested review from DylanDylann and removed request for a team December 22, 2025 17:27
@melvin-bot
Copy link

melvin-bot bot commented Dec 22, 2025

@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 melvin-bot bot requested review from heyjennahay and removed request for a team December 22, 2025 17:27
@mkzie2
Copy link
Contributor Author

mkzie2 commented Dec 22, 2025

@DylanDylann oops looks like melvin bumped the wrong guy 💀 @sobitneupane should be reviewing this.

@mallenexpensify mallenexpensify removed the request for review from DylanDylann January 7, 2026 16:48
@mallenexpensify
Copy link
Contributor

Tried to assign @sobitneupane but they're OOO til Monday (and removed from the C+ GH team) so I can't. If this is timely, post in #contributor-plus for help

@heyjennahay
Copy link
Contributor

No product review required. Removing myself and unsubscribing

@heyjennahay heyjennahay removed their request for review January 8, 2026 10:24
@sobitneupane
Copy link
Contributor

Sorry for the delay. I was OOO. I’m back now and will try to review the PR by tomorrow.

@mkzie2
Copy link
Contributor Author

mkzie2 commented Jan 13, 2026

Asking for confirmation here before resolving conflicts

@mkzie2
Copy link
Contributor Author

mkzie2 commented Jan 15, 2026

Conflicts resolved.

@sobitneupane
Copy link
Contributor

Reviewing the PR...

Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please remove the console logs and any unnecessary changes?

@sobitneupane
Copy link
Contributor

@mkzie2 Could you please add tests to cover all the changes introduced in the PR? Current tests only cove.r the change in description.

@mkzie2
Copy link
Contributor Author

mkzie2 commented Jan 26, 2026

@sobitneupane I updated the test steps.

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.

4 participants