Fix Discard Changes Modal, cannot discard changes using browser back button by tsa321 · Pull Request #76492 · Expensify/App

tsa321 · 2025-12-02T06:49:39Z

Explanation of Change

Fixed Issues

$ #75014
PROPOSAL: #75014 (comment)

Tests

Create an expense
Open the Description field and enter some text and don't save it
Tap the browser back button
Click Discard changes
Verify that the changes are discarded successfully and that the app returns to the previous page.

Verify that no errors appear in the JS console

Offline tests

QA Steps

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

Create an expense
Open the Description field and enter some text and don't save it
Tap the browser back button
Click Discard changes
Verify that the changes are discarded successfully and that the app returns to the previous page.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native_d.mp4

Android: mWeb Chrome

android_mweb_d.mp4

iOS: Native

ios_native_d.mp4

iOS: mWeb Safari

ios_msafari_d.mp4

MacOS: Chrome / Safari

macos_web_d.mp4

…button Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>

melvin-bot · 2025-12-02T06:49:45Z

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

codecov · 2025-12-02T06:58:05Z

Codecov Report

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

Files with missing lines	Coverage Δ
.../request/step/DiscardChangesConfirmation/index.tsx	`0.00% <0.00%> (ø)`
... and 7 files with indirect coverage changes

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>

joekaufmanexpensify

Fix makes sense 👍

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>

suneox · 2025-12-03T00:57:51Z

src/pages/iou/request/step/DiscardChangesConfirmation/index.tsx

+                isConfirmed.current = true;
                setIsVisible(false);
-                // eslint-disable-next-line @typescript-eslint/no-deprecated
-                InteractionManager.runAfterInteractions(() => {


@tsa321 Could you please include the screenshot to verify previous change after remove this one? to make sure issue #71945 do not happen again

This change set removes that logic, which will cause issue #71945 to happen again.

CleanShot.2025-12-03.at.08.05.45.mp4

@suneox Here is the testing video for #71945
after applying my PR:

test_d.mp4

The issue doesn't reoccur

test_d.mp4

@suneox I noticed there is some sluggishness only on the merchant page, and only when I discard the changes using Esc. So the issue happens specifically on the merchant page and only when dismissing the page with Esc.

Also, this sluggishness is different from the issue described in #71945
, where the merchant page slides back to the full left after almost closing. I will try to fixing this sluggishness issue.

I just finished to record before and after your change

CleanShot.2025-12-03.at.08.33.46__2.mp4

I will try to fix the issue

After some testing, adding type="markdown" to the InputWrapper on the merchant page fixes the issue. I will investigate why the default text input type causes this problem.

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>

tsa321 · 2025-12-03T06:24:46Z

@suneox When I use InteractionManager.runAfterInteractions, there is an issue on Android mWeb where the keyboard flashes (appears and disappears) when discarding changes using the Android back button:

keyboard_flashing_issue.mp4

So I'm using setNavigationActionToMicrotaskQueue instead. This also fixes the animation issue of the #71945 :

sluggish_animation_fix.mp4

tsa321 · 2025-12-04T09:29:01Z

@suneox this is ready for review again. Thanks

suneox · 2025-12-04T18:10:06Z

So I'm using setNavigationActionToMicrotaskQueue instead. This also fixes the animation issue of the #71945 :

Confirmed — using this approach can also resolve issue #71945. Overall the change set look good but @tsa321 Could you please try to merge main to resolve test & typecheck pipeline?

suneox · 2025-12-04T18:20:48Z

@tsa321 The “confirm discard changes” functionality is broken on mWeb/Android when using the device back button.

CleanShot.2025-12-05.at.01.14.03.mp4

tsa321 · 2025-12-04T20:36:50Z

@suneox for the search page, the bug is also happens in main and in production.

suneox · 2025-12-06T04:44:19Z

@suneox for the search page, the bug is also happens in main.

@tsa321 Oh, if that’s the case then we’re blocked from verifying this issue. Could you please investigate this bug further?

tsa321 · 2025-12-06T06:14:53Z

@suneox I think this is related to the navigation component, which I’m afraid I’m not very familiar with. Should I try to fix the issue here, or should I create a follow-up PR for it?

I think it’s a different issue, so a follow-up PR would be better.
cc @thienlnam

thienlnam · 2025-12-08T03:37:42Z

That seems fine, is there an existing issue for the search navigation bug?

tsa321 · 2025-12-08T04:16:45Z

@thienlnam In production, the confirm-discard modal is not displayed when the user presses the browser back button:

Bug video:

test_d.mp4

This happens because the transitionStart listener is never triggered:

App/src/pages/iou/request/step/DiscardChangesConfirmation/index.tsx

Lines 44 to 57 in ab58adc

    
           const unsubscribe = navigation.addListener('transitionStart', ({data: {closing}}) => { 
        
               // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing 
        
               if (!getHasUnsavedChanges()) { 
        
                   return; 
        
               } 
        
               shouldNavigateBack.current = true; 
        
               if (closing) { 
        
                   window.history.go(1); 
        
                   return; 
        
               } 
        
               // Navigation.navigate() rerenders the current page and resets its states 
        
               window.history.go(1); 
        
               navigateAfterInteraction(() => setIsVisible((prev) => !prev)); 
        
           });

As a result, the confirm-discard modal does not appear at all.

I don’t think this is caused by the search-navigation bug.

The transitionStart only fired/emitted only in stack-navigator screens. (based on the react navigation documentation)
So we need to listen to other event and also make it works on each combination of possible navigation i.e:

on RHP of money request
RHP of reports/search
Also test when user long press back button and choose the previous 5 or 6 history behind
when search modal (COMMAND +K) appear
when keyboard shortcut modal appear (COMMAND + J)
and make it also works in mobile navigation
Also test for other pages that use ConfirmDiscardModal

This make this is essentially a more complex and different than the original issue.

So I believe solving it on other issue/ PR will be better. What do you think, @thienlnam ? Thank you

thienlnam · 2025-12-09T07:51:57Z

Yeah we can treat that as a separate issue (for the transitionStart limitation)

tsa321 · 2025-12-09T09:52:40Z

cc @suneox Let's continue with the review, thanks

suneox · 2025-12-10T13:30:55Z

@tsa321 This issue is resolved on both browser and mWeb after merging the latest main. Please update this PR with the latest main.

suneox · 2025-12-10T13:32:18Z

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 there are no new alerts related to the canBeMissing param for useOnyx
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

CleanShot.2025-12-10.at.20.24.31.mp4

Android: mWeb Chrome

CleanShot.2025-12-10.at.20.23.33.mp4

iOS: HybridApp

CleanShot.2025-12-10.at.20.25.14.mp4

iOS: mWeb Safari

CleanShot.2025-12-10.at.19.56.28.mp4

MacOS: Chrome / Safari

CleanShot.2025-12-10.at.20.26.56.mp4

tsa321 · 2025-12-10T16:02:57Z

@suneox I have merged main

tsa321 · 2025-12-12T00:52:27Z

cc @thienlnam for PR review, thank you

thienlnam

Thanks!

OSBotify · 2025-12-15T15:00:46Z

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

OSBotify · 2025-12-16T22:46:52Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 9.2.79-0 🚀

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

OSBotify · 2025-12-17T12:24:34Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 9.2.81-0 🚀

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

OSBotify · 2025-12-18T18:46:03Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.81-5 🚀

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

OSBotify · 2025-12-18T21:09:27Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.81-5 🚀

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

Fix Discard Changes Modal, cannot discard changes using browser back …

5e5595d

…button Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>

tsa321 requested review from a team as code owners December 2, 2025 06:49

melvin-bot bot assigned tsa321 Dec 2, 2025

melvin-bot bot requested review from joekaufmanexpensify and suneox and removed request for a team December 2, 2025 06:49

melvin-bot bot removed the request for review from a team December 2, 2025 06:49

Fix lint error

834102c

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>

joekaufmanexpensify previously approved these changes Dec 2, 2025

View reviewed changes

tsa321 added 2 commits December 3, 2025 07:00

Merge branch 'main' into fixDiscardChanges

66c808f

reset isconfirmed value

8cb7333

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>

tsa321 dismissed joekaufmanexpensify’s stale review via 8cb7333 December 3, 2025 00:36

suneox reviewed Dec 3, 2025

View reviewed changes

tsa321 mentioned this pull request Dec 3, 2025

[Due for payment 2025-12-25] [$250] Expense: Unable to discard the filled description #75014

Closed

8 tasks

fix sluggish animation issue

b7655fc

Signed-off-by: Tsaqif <tsaiinkwa@yahoo.com>

tsa321 requested a review from suneox December 3, 2025 06:25

Merge branch 'main' into fixDiscardChanges

9bd89d4

Merge branch 'main' into fixDiscardChanges

d57c3b1

suneox approved these changes Dec 10, 2025

View reviewed changes

melvin-bot bot requested a review from thienlnam December 10, 2025 16:56

thienlnam approved these changes Dec 15, 2025

View reviewed changes

thienlnam merged commit a8610b8 into Expensify:main Dec 15, 2025
31 checks passed

OSBotify mentioned this pull request Dec 16, 2025

Deploy Checklist: New Expensify 2025-12-16 #77818

Closed

suneox mentioned this pull request Dec 25, 2025

mWeb - Incorrect navigation to confirm details page & discard changes popup briefly visible #67010

Merged

49 tasks

Conversation

tsa321 commented Dec 2, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Dec 2, 2025

Uh oh!

codecov bot commented Dec 2, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

suneox Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

suneox Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

tsa321 Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

tsa321 Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

suneox Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

tsa321 Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

tsa321 Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

tsa321 commented Dec 3, 2025

Uh oh!

tsa321 commented Dec 4, 2025

Uh oh!

suneox commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

suneox commented Dec 4, 2025

Uh oh!

tsa321 commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

suneox commented Dec 6, 2025

Uh oh!

tsa321 commented Dec 6, 2025

Uh oh!

thienlnam commented Dec 8, 2025

Uh oh!

tsa321 commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thienlnam commented Dec 9, 2025

Uh oh!

tsa321 commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

suneox commented Dec 10, 2025

Uh oh!

suneox commented Dec 10, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

tsa321 commented Dec 10, 2025

Uh oh!

tsa321 commented Dec 12, 2025

Uh oh!

thienlnam left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov bot commented Dec 2, 2025 •

edited by github-actions bot

Loading

suneox commented Dec 4, 2025 •

edited

Loading

tsa321 commented Dec 4, 2025 •

edited

Loading

tsa321 commented Dec 8, 2025 •

edited

Loading

tsa321 commented Dec 9, 2025 •

edited

Loading