[Due for payment 2025-09-19] [$250] Expense - The "Discard changes" popup closes automatically

[jponikarchuk]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Version Number: v9.2.0-0
Reproducible in staging?: Yes
Reproducible in production?: Yes
If this was caught during regression testing, add the test name, ID and link from TestRail: -
Email or phone of affected tester (no customers): gibethlehem@gmail.com
Issue reported by: Applause Internal Team
Device used: Windows / Chrome
App Component: Workspace Settings

Action Performed:

1. Login to any account
2. Go to WS chat
3. Click on + sign > enter amount > next
4. Go to Merchant > Write something
5. Click on esc button

Expected Result:

The "Discard changes" popup is not closed automatically

Actual Result:

The "Discard changes" popup closes automatically

Workaround:

Unknown

Platforms:

• Android: App
• Android: mWeb Chrome
• iOS: App
• iOS: mWeb Safari
• iOS: mWeb Chrome
• Windows: Chrome
• MacOS: Chrome / Safari
• MacOS: Desktop

Screenshots/Videos

bandicam.2025-08-28.12-18-11-197.mp4

View all open jobs on GitHub

Upwork Automation - Do Not Edit

• Upwork Job URL: https://www.upwork.com/jobs/~021961460832778507052
• Upwork Job ID: 1961460832778507052
• Last Price Increase: 2025-08-29

Issue Owner

Current Issue Owner: @zanyrenney

[melvin-bot]

Triggered auto assignment to @zanyrenney (Bug), see https://stackoverflow.com/c/expensify/questions/14418 for more details. Please add this bug to a GH project, as outlined in the SO.

[ryntgh]

Proposal

Please re-state the problem that we are trying to solve in this issue.

Expense - The "Discard changes" popup closes automatically

What is the root cause of that problem?

When a user presses the ESC key to dismiss the merchant input modal, the same ESC key press event is also being processed by the Discard changes confirmation modal that appears immediately after. This creates a timing issue where the ESC key press that triggers the navigation (showing the discard changes modal) is still being processed when the modal becomes visible, causing it to immediately close

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

Line 29 in ae5f666

navigateAfterInteraction(() => setIsVisible((prev) => !prev));

navigateAfterInteraction(() => setIsVisible((prev) => !prev)) shows the modal, but the ESC key event that triggered this is still active and immediately closes the modal

What changes do you think we should make in order to solve the problem?

We should prevent the modal from responding to ESC key presses until all interactions have completed

    const [canCloseWithEsc, setCanCloseWithEsc] = useState(false);
    ...
                navigateAfterInteraction(() => {
                    setIsVisible((prev) => !prev);
                    InteractionManager.runAfterInteractions(() => setCanCloseWithEsc(true));
                });

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

Line 29 in ae5f666

navigateAfterInteraction(() => setIsVisible((prev) => !prev));

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

Line 55 in ae5f666

navigateAfterInteraction(() => setIsVisible((prev) => !prev));

            onCancel={() => {
                if (!canCloseWithEsc) {
                    return;
                }
                setIsVisible(false);
                setCanCloseWithEsc(false);
                blockedNavigationAction.current = undefined;
                shouldNavigateBack.current = false;
            }}

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

Lines 80 to 84 in ae5f666

	onCancel={() => {
	setIsVisible(false);
	blockedNavigationAction.current = undefined;
	shouldNavigateBack.current = false;
	}}

What specific scenarios should we cover in automated tests to prevent reintroducing this issue in the future?

N/A


What alternative solutions did you explore? (Optional)

N/A


[lorretheboy]

Proposal

Please re-state the problem that we are trying to solve in this issue.

The "Discard changes" popup closes automatically

What is the root cause of that problem?

When a user presses the ESC key to dismiss the merchant input modal, the same ESC key press event is also being processed by the "Discard changes" confirmation modal that appears immediately after

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

Line 29 in 936239c

navigateAfterInteraction(() => setIsVisible((prev) => !prev));

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

Line 23 in 7083c03

setIsVisible(true);

What changes do you think we should make in order to solve the problem?

Update this to:

                // Add a small delay to ensure the ESC key event has finished processing
                // before showing the modal to prevent immediate dismissal
                navigateAfterInteraction(() => {
                    setTimeout(() => setIsVisible((prev) => !prev), 100);
                });

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

Line 29 in 936239c

navigateAfterInteraction(() => setIsVisible((prev) => !prev));

We can add the waiting 100 ms value to this config

App/src/CONST/index.ts

Lines 1506 to 1513 in 1cab2e3

	ANIMATION_TIMING: {
	DEFAULT_IN: 300,
	DEFAULT_OUT: 200,
	DEFAULT_RIGHT_DOCKED_IOS_IN: 500,
	DEFAULT_RIGHT_DOCKED_IOS_OUT: 400,
	FAB_IN: 350,
	FAB_OUT: 200,
	},

This is optional as it's quite rare for phone device users to use physical keyboard

      setTimeout(() => setIsVisible(true), 100);

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

Line 23 in 7083c03

setIsVisible(true);

What specific scenarios should we cover in automated tests to prevent reintroducing this issue in the future?

NA

What alternative solutions did you explore? (Optional)

We can add canCloseWithEsc state that:

• Starts as false when modal opens
• Becomes true only after InteractionManager.runAfterInteractions()
• Blocks onCancel until interactions complete
• Resets to false when modal closes

We should update in both native and non-native file

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

Line 29 in 936239c

navigateAfterInteraction(() => setIsVisible((prev) => !prev));

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

Line 23 in 7083c03

setIsVisible(true);

Reminder: Please use plain English, be brief and avoid jargon. Feel free to use images, charts or pseudo-code if necessary. Do not post large multi-line diffs or write walls of text. Do not create PRs unless you have been hired for this job.

[thelullabyy]

Proposal

Please re-state the problem that we are trying to solve in this issue.

• Expense - The "Discard changes" popup closes automatically

What is the root cause of that problem?

• When the user presses the ESC key, the following sequence occurs:

  1. The RHP screen—specifically the merchant screen in this case—closes first.
     This is triggered by the keydown event listener:
     

     App/src/libs/Navigation/AppNavigator/AuthScreens.tsx

     Line 314 in fb90063

     Navigation.dismissModal();

  2. The DiscardChangesConfirmation modal is then opened.
  3. Finally, on the keyup event, the DiscardChangesConfirmation modal is closed automatically:
     

     App/src/components/Modal/ReanimatedModal/index.tsx

     Line 81 in fb90063

     document.body.addEventListener('keyup', handleEscape, {capture: true});

• In summary, pressing the ESC key causes:

  • keydown: closes the RHP and opens the DiscardChangesConfirmation modal
  • keyup: immediately closes that modal

What changes do you think we should make in order to solve the problem?

• Update the event listener in the modal to use keydown instead of keyup here:

document.body.addEventListener('keydown', handleEscape, {capture: false});

• Also, update the corresponding cleanup logic to remove the keydown listener appropriately.

• Introduce a conditional flag prop so this behavior is applied only when rendering the DiscardChangesConfirmation modal. This ensures the change is scoped and doesn’t unintentionally affect other modal interactions.

What specific scenarios should we cover in automated tests to prevent reintroducing this issue in the future?

• N/A

What alternative solutions did you explore? (Optional)

[melvin-bot]

Job added to Upwork: https://www.upwork.com/jobs/~021961460832778507052

[melvin-bot]

Triggered auto assignment to Contributor-plus team member for initial proposal review - @suneox (External)

[zanyrenney]

defo seems like a simple enough fix @suneox please review the proposals and let me know which would be best to proceed with.