Refactor ConfirmModal usage to useConfirmModal in Search pages by nkdengineer · Pull Request #77740 · Expensify/App

nkdengineer · 2025-12-16T09:15:31Z

Explanation of Change

Fixed Issues

$ #76694
PROPOSAL:

Tests

SplitExpensePage.tsx

Create an expense
Split the expense into 2 expenses
Move an expense to another report
Approve this report
Open the another one > Edit split
Click on the approved expense
Verify that the modal appears
Click on the button and verify that the modal is closed

SearchPage.tsx
Export in progress modal

Go Reports > Expense
Select some expense
Click on bulk button > Export > Report level
Verify that the modal appears
Click on the button and verify that the modal is closed

All matching export modal

Precondition: Has more than 50 expenses

Go Reports > Expense
Select all
Click on Select all matching items
Click on bulk button > Export > Basic export
Verify that the modal appears
Click on the confirm button
Verify that the list expenses is exported

DEW warning modal

Precondition: The approval mode of the workspace is DYNAMIC_EXTERNAL

Create an expense
Go Reports > Submit
Select the report
Click on bulk button > Submit
Verify that the warning modal appears
Click on the confirm button
Verify that the user redirects to OldDot

Verify that no errors appear in the JS console

Offline tests

Same

QA Steps

Same as test

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2025-12-16.at.16.13.24.mov

iOS: Native

Screen.Recording.2025-12-16.at.16.14.01.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-12-06.at.23.43.09.mov

Screen.Recording.2025-12-06.at.23.51.06.mov

Screen.Recording.2025-12-06.at.23.51.55.mov

Screen.Recording.2025-12-06.at.23.53.05.mov

Screen.Recording.2025-12-06.at.23.53.29.mov

codecov · 2025-12-16T09:24:30Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/pages/iou/SplitExpensePage.tsx	`0.00% <0.00%> (ø)`
src/pages/Search/SearchPage.tsx	`22.96% <5.55%> (-1.63%)`	⬇️
... and 7 files with indirect coverage changes

melvin-bot · 2025-12-16T09:26:36Z

@ZhenjaHorbach 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 · 2025-12-16T09:26:42Z

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

nkdengineer · 2025-12-16T09:27:16Z

The Android and IOS build is failing. Will update later.

trjExpensify · 2025-12-16T15:36:51Z

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

ZhenjaHorbach · 2025-12-17T16:29:16Z

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

2025-12-18.10.34.25.mov

2025-12-18.10.35.16.mov

Android: mWeb Chrome

2025-12-18.10.42.17.mov

2025-12-18.10.42.46.mov

iOS: HybridApp

2025-12-18.10.28.37.mov

2025-12-18.10.31.25.mov

iOS: mWeb Safari

2025-12-18.10.23.09.mov

2025-12-18.10.24.34.mov

2025-12-18.10.25.54.mov

MacOS: Chrome / Safari

2025-12-17.17.37.13.mov

2025-12-17.17.37.44.mov

2025-12-17.17.38.28.mov

2025-12-18.10.06.07.mov

ZhenjaHorbach · 2025-12-17T16:40:29Z

@nkdengineer

Precondition: Has more than 50 expenses

1. Go Reports > Expense
2. Select all
3. Click on Select all matching items
4. Click on bulk button > Export > Basic export
5. Verify that the modal appears
6. Click on the confirm button
7. Verify that the list expenses is exported

Do you have this modal?
I just downloaded all expenses without modal

nkdengineer · 2025-12-17T16:44:50Z

You can see my PR's record.

Screen.Recording.2025-12-06.at.23.51.55.mov

ZhenjaHorbach · 2025-12-17T16:48:14Z

Strange
On this branch, I don't see a modal
But on staging, everything is good

nkdengineer · 2025-12-18T07:49:08Z

@ZhenjaHorbach I got this case. Fixed now.

ZhenjaHorbach · 2025-12-18T09:50:41Z

Okay
Changes look good
Only we have this issue

But I hope @waterim will fix it soon
And then we can start merging PRs

waterim · 2025-12-19T00:07:49Z

@ZhenjaHorbach Was unable to fix it yet, hopefully tomorrow will be able to!
I was able to make as it was before (close modal+navigate), but only closing modal is a bit hacky as it requires changing native browser behaviour.

I think better option here(at least for now) will be just to fix the modal closing and stick to navigation+closing to be able to merge all these PRs we have now. And leave the idea of closing modal without the navigation for the future not to introduce any hacks to the code and not to spend too much time on it. What do you think?

(I have a lot on my plate now and only 3 days left before long vacations 😄)

waterim

Nice one!

ZhenjaHorbach · 2026-01-05T19:53:30Z

@nkdengineer
We merged the PR to fix this issue
Could you update this branch to the latest version of main?

nkdengineer · 2026-01-06T08:28:49Z

@ZhenjaHorbach Updated.

ZhenjaHorbach · 2026-01-06T11:01:23Z

Noticed that we don't have animation after pressing Got it on SplitExpensePage
But looks like it's a common issue and we need to fix it in the modal hook

2026-01-06.12.00.19.mov

ZhenjaHorbach · 2026-01-07T17:02:26Z

@nkdengineer
Could you please fix conflicts?
And we can merge this PR!

roryabraham · 2026-01-08T23:46:23Z

src/pages/Search/SearchPage.tsx

+                            // Translations copy for delete modal depends on amount of selected items,
+                            // We need to wait for modal to fully disappear before clearing them to avoid translation flicker between singular vs plural
+                            // eslint-disable-next-line @typescript-eslint/no-deprecated
+                            InteractionManager.runAfterInteractions(() => {


InteractionManager is deprecated, so we need to find another solution for this. The promise returned by showConfirmModal really should not resolve until the modal has fully disappeared.

This code is from the previous implementation of the modal
But probably yes
Now this code seems redundant

@nkdengineer bump on this comment - we need to address this before I can merge

@roryabraham I just move the previous logic to here. Remove the Interaction can cause the regression.

I see, you're right. I thought you had added a new usage, but it looks like you've just moved existing usages around. My mistake

src/pages/Search/SearchPage.tsx

OSBotify · 2026-01-12T21:23:39Z

✋ 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 · 2026-01-13T03:38:47Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.3.0-0 🚀

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

nlemma · 2026-01-13T09:10:19Z

DEW warning modal
Precondition: The approval mode of the workspace is DYNAMIC_EXTERNAL

@nkdengineer could you enable DEW for the account applausetester+rg_46@applause.expensifail.com so that we can test the last steps? It was enabled a while back here but seems like it is not working to test this PR.

nkdengineer · 2026-01-13T09:13:49Z

@nkdengineer could you enable DEW for the account applausetester+rg_46@applause.expensifail.com so that we can test the last steps

@nlemma I don't have a workspace with DEW enabled, I just hardcode DEW enabled to true when testing on dev.

Maybe @ZhenjaHorbach can help

OSBotify · 2026-01-14T02:55:06Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.3.0-8 🚀

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

Refactor ConfirmModal usage to useConfirmModal in Search pages

f97ef14

melvin-bot bot assigned nkdengineer Dec 16, 2025

nkdengineer marked this pull request as ready for review December 16, 2025 09:26

nkdengineer requested review from a team as code owners December 16, 2025 09:26

melvin-bot bot requested review from ZhenjaHorbach and trjExpensify December 16, 2025 09:26

melvin-bot bot requested review from a team and roryabraham and removed request for a team December 16, 2025 09:26

trjExpensify removed their request for review December 16, 2025 15:36

resolve conflict

8020837

nkdengineer added 2 commits December 18, 2025 14:39

resolve conflict

6799715

fix export modal

8217c19

waterim approved these changes Dec 19, 2025

View reviewed changes

resolve conflict

4cafbd2

resolve conflict

d9e3d45

nkdengineer added 2 commits January 8, 2026 14:16

resolve conflict

32e78e4

fix ts check

5db06c1

ZhenjaHorbach approved these changes Jan 8, 2026

View reviewed changes

roryabraham requested changes Jan 8, 2026

View reviewed changes

nkdengineer added 2 commits January 10, 2026 20:28

Merge branch 'main' into fix/76694-2

39d660c

use async await

912e81c

roryabraham approved these changes Jan 12, 2026

View reviewed changes

roryabraham merged commit c75d040 into Expensify:main Jan 12, 2026
34 checks passed

OSBotify mentioned this pull request Jan 13, 2026

Deploy Checklist: New Expensify 2026-01-13 #79402

Closed

91 tasks

mitarachim mentioned this pull request Jan 13, 2026

[Due for payment 2026-01-27] Reports- All Data - report level disappears after exporting report via All Data - report level #79404

Closed

7 tasks

luacmartins mentioned this pull request Jan 16, 2026

[Due for payment 2026-02-24] Deleting a draft report from search deletes the expenses as well. #79756

Closed

7 tasks

NJ-2020 mentioned this pull request Feb 1, 2026

[$250] Web - Expense - Deeplink to expense creation shows previous amount and participant chose #80749

Closed

7 tasks

Conversation

nkdengineer commented Dec 16, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Dec 16, 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!

melvin-bot bot commented Dec 16, 2025

Uh oh!

melvin-bot bot commented Dec 16, 2025

Uh oh!

nkdengineer commented Dec 16, 2025

Uh oh!

trjExpensify commented Dec 16, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Uh oh!

nkdengineer commented Dec 17, 2025

Uh oh!

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

Uh oh!

Uh oh!

nkdengineer commented Dec 18, 2025

Uh oh!

ZhenjaHorbach commented Dec 18, 2025

Uh oh!

waterim commented Dec 19, 2025

Uh oh!

waterim left a comment

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented Jan 5, 2026

Uh oh!

nkdengineer commented Jan 6, 2026

Uh oh!

ZhenjaHorbach commented Jan 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

roryabraham Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

roryabraham Jan 11, 2026

Choose a reason for hiding this comment

Uh oh!

nkdengineer Jan 11, 2026

Choose a reason for hiding this comment

Uh oh!

roryabraham Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

OSBotify commented Jan 12, 2026

Uh oh!

OSBotify commented Jan 13, 2026

Uh oh!

nlemma commented Jan 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nkdengineer commented Jan 13, 2026

codecov bot commented Dec 16, 2025 •

edited by github-actions bot

Loading

ZhenjaHorbach commented Dec 17, 2025 •

edited

Loading

ZhenjaHorbach commented Dec 17, 2025 •

edited

Loading

ZhenjaHorbach commented Dec 17, 2025 •

edited

Loading

ZhenjaHorbach commented Jan 6, 2026 •

edited

Loading

ZhenjaHorbach commented Jan 7, 2026 •

edited

Loading

ZhenjaHorbach Jan 9, 2026 •

edited

Loading

nlemma commented Jan 13, 2026 •

edited

Loading