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

nkdengineer · 2026-01-19T15:44:50Z

Explanation of Change

Refactor ConfirmModal usage to useConfirmModal in Search pages 2

Fixed Issues

$ #76694
PROPOSAL:

Tests

EmptySearchView.tsx

Precondition: Has at least one group workspace and the policy expense chat is disabled, and doesn't have any transaction

Go Reports > Expense
Click on Create expense
Verify that the modal appears
Click on the confirm button
Verify that the user redirects to OldDot

Search/index.tsx

Precondition: The approval mode of the workspace is DYNAMIC_EXTERNAL

Create an expense
Go Reports > Submit
Find the expense report above and click on submit button
Verify that the DEW warning modal appears
Click on the confirm button
Verify that the user redirects to OldDot

useDeleteSavedSearch.tsx

Precondition: Have some saved searches

Go Reports
Click on three-dot icon of a saved search
Click Delete
Verify that the confirm modal appears
Click on the confirm button
Verify that the saved search is deleted

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as test

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-01-19.at.22.53.46.mov

Android: mWeb Chrome

Screen.Recording.2026-01-19.at.22.51.59.mov

iOS: Native

Screen.Recording.2026-01-19.at.22.54.32.mov

iOS: mWeb Safari

Screen.Recording.2026-01-19.at.22.48.12.mov

MacOS: Chrome / Safari

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

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

Screen.Recording.2025-12-07.at.00.00.24.mov

codecov · 2026-01-19T15:54:56Z

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 Δ
.../Search/SearchPageHeader/SearchTypeMenuPopover.tsx	`100.00% <ø> (ø)`
src/hooks/useSearchTypeMenu.tsx	`70.12% <100.00%> (ø)`
src/hooks/useDeleteSavedSearch.tsx	`50.00% <50.00%> (-38.89%)`	⬇️
src/pages/Search/EmptySearchView.tsx	`70.83% <66.66%> (-0.04%)`	⬇️
src/pages/Search/SearchTypeMenu.tsx	`0.00% <0.00%> (ø)`
src/components/Search/index.tsx	`35.47% <20.00%> (ø)`
... and 46 files with indirect coverage changes

melvin-bot · 2026-01-19T15:57:54Z

@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 · 2026-01-19T15:58:00Z

@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 · 2026-01-19T15:59:41Z

For EmptySearchView.tsx and useDeleteSavedSearch.tsx, I used the promise to avoid unnecessary error.

EmptySearchView: the showConfirmodal is wrapped inside another function
useDeleteSavedSearch: showDeleteModal is called in other utils

src/pages/Search/EmptySearchView.tsx

github-actions · 2026-01-19T16:03:27Z

src/components/Search/index.tsx

                    selectedTransactions={selectedTransactions}
                    shouldPreventLongPressRow={isChat || isTask}
-                    onDEWModalOpen={handleDEWModalOpen}
+                    onDEWModalOpen={() => {


❌ CONSISTENCY-3 (docs)

Unnecessary wrapper function creates code duplication. handleDEWModalOpen can be passed directly.

Suggested fix:

onDEWModalOpen={handleDEWModalOpen}

Can we fix it?

Use this will cause the error since handleDEWModalOpen type is () => Promise.

I think we should fix this one - because Search/index.tsx isn't compiled this is changing from a stable value to a non-stable value, which will re-render the SearchList subtree on every render, even if memoized.

Easiest would be to change the handleDEWModalOpen prop type

@roryabraham Another approach is use Promise instead of async/await inside handleDEWModalOpen. What do you think?

yeah that's fine

@roryabraham I updated.

joekaufmanexpensify · 2026-01-19T21:38:52Z

No product considerations, removing my review

ZhenjaHorbach · 2026-01-21T17:04:30Z

src/pages/Search/EmptySearchView.tsx

    // Default 'Folder' lottie animation, along with its background styles
    const defaultViewItemHeader = useSearchEmptyStateIllustration();

+    // eslint-disable-next-line react-hooks/preserve-manual-memoization


Could you please update the branch to the latest version of main and try to remove this line?

ZhenjaHorbach · 2026-01-21T17:04:50Z

src/pages/Search/SearchTypeMenu.tsx

-                                        can play its exit animation instead of removing it instantly. */}
-                                        {DeleteConfirmModal}
-                                    </>
+                                    <>{renderSavedSearchesSection(savedSearchesMenuItems)}</>


Do we need <> here?

ZhenjaHorbach · 2026-01-22T10:45:50Z

src/pages/Search/EmptySearchView.tsx

+    const handleCreateExpense = () => {
+        interceptAnonymousUser(() => {
+            if (shouldRedirectToExpensifyClassic) {
+                handleRedirectToExpensifyClassic();
+                return;
+            }
+            startMoneyRequest(CONST.IOU.TYPE.CREATE, generateReportID());
+        });


These are two almost identical functions
Let's just create a new function and pass IOU.TYPE parameter

@ZhenjaHorbach I updated.

ZhenjaHorbach · 2026-01-22T10:47:31Z

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

2026-01-22.12.35.27.mov

2026-01-22.12.36.00.mov

2026-01-22.12.36.46.mov

Android: mWeb Chrome

2026-01-22.12.41.49.mov

2026-01-22.12.42.34.mov

2026-01-22.12.43.10.mov

iOS: HybridApp

2026-01-22.12.26.08.mov

2026-01-22.12.26.26.mov

2026-01-22.12.27.04.mov

iOS: mWeb Safari

2026-01-22.12.22.14.mov

2026-01-22.12.22.50.mov

2026-01-22.12.23.18.mov

MacOS: Chrome / Safari

2026-01-22.12.08.00.mov

2026-01-22.12.17.26.mov

2026-01-22.12.18.16.mov

ZhenjaHorbach · 2026-01-22T11:44:15Z

But changes work well!
Only few comments left

nkdengineer · 2026-01-23T09:10:54Z

The test is flaky since we don't change anything related to the test function.

ZhenjaHorbach · 2026-01-23T09:55:37Z

LGTM!

ZhenjaHorbach · 2026-01-23T10:40:10Z

The test is flaky since we don't change anything related to the test function.

Yeah
Agree
But let's try to update the branch to the latest version of main after a few hours

ZhenjaHorbach · 2026-01-26T12:54:46Z

@nkdengineer
Friendly bump

roryabraham

otherwise LGTM 👍🏼

roryabraham · 2026-01-26T16:07:22Z

src/components/Search/index.tsx

                    selectedTransactions={selectedTransactions}
                    shouldPreventLongPressRow={isChat || isTask}
-                    onDEWModalOpen={handleDEWModalOpen}
+                    onDEWModalOpen={() => {


I think we should fix this one - because Search/index.tsx isn't compiled this is changing from a stable value to a non-stable value, which will re-render the SearchList subtree on every render, even if memoized.

Easiest would be to change the handleDEWModalOpen prop type

OSBotify · 2026-01-27T18:06:07Z

✋ 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-27T20:12:03Z

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

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

IuliiaHerets · 2026-01-27T20:35:34Z

@nkdengineer or @roryabraham, could you please advise how to set up the preconditions for the first two scenarios?

nkdengineer · 2026-01-28T07:25:12Z

@IuliiaHerets For test 1: after creating a new workspace of new account, don't create any expense, go to OldDot and run this script to disable policy expense chat

p = Policy.getCurrent();
p.policy.isPolicyExpenseChatEnabled = false;
p.save();

Screen.Recording.2026-01-28.at.14.23.12.mov

For test 2: @ZhenjaHorbach can help

ZhenjaHorbach · 2026-01-28T08:46:39Z

Screen.Recording.2026-01-28.at.14.23.12.mov
For test 2: @ZhenjaHorbach can help

Unfortunately, I tested locally using mocks

IuliiaHerets · 2026-01-28T09:04:18Z

@ZhenjaHorbach can we skip test 2?

nkdengineer · 2026-01-28T11:15:56Z

@ZhenjaHorbach can we skip test 2?

I think we can skip this since we just refactor the logic and we verified it works on dev.

OSBotify · 2026-01-28T22:57:16Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.10-6 🚀

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

Refactor ConfirmModal usage to useConfirmModal in Search pages 2

124ecab

melvin-bot bot assigned nkdengineer Jan 19, 2026

nkdengineer marked this pull request as ready for review January 19, 2026 15:57

nkdengineer requested review from a team as code owners January 19, 2026 15:57

melvin-bot bot requested review from ZhenjaHorbach and joekaufmanexpensify January 19, 2026 15:57

melvin-bot bot requested review from a team and roryabraham and removed request for a team January 19, 2026 15:57

github-actions bot reviewed Jan 19, 2026

View reviewed changes

src/pages/Search/EmptySearchView.tsx Show resolved Hide resolved

github-actions bot reviewed Jan 19, 2026

View reviewed changes

joekaufmanexpensify removed their request for review January 19, 2026 21:38

ZhenjaHorbach reviewed Jan 21, 2026

View reviewed changes

resolve conflict

4baa72f

ZhenjaHorbach reviewed Jan 22, 2026

View reviewed changes

nkdengineer added 2 commits January 23, 2026 15:53

resolve conflict

db06237

merge two function into one

e01e18d

ZhenjaHorbach approved these changes Jan 23, 2026

View reviewed changes

Merge branch 'main' into fix/76694-v3

9ed3ed9

roryabraham requested changes Jan 26, 2026

View reviewed changes

nkdengineer added 2 commits January 28, 2026 00:39

Merge branch 'main' into fix/76694-v3

380be46

change handleDEWModalOpen to use promise

c106798

roryabraham approved these changes Jan 27, 2026

View reviewed changes

roryabraham merged commit 375e430 into Expensify:main Jan 27, 2026
28 checks passed

OSBotify mentioned this pull request Jan 27, 2026

Deploy Checklist: New Expensify 2026-01-27 #80656

Closed

70 tasks

jponikarchuk mentioned this pull request Jan 28, 2026

iOS- Tap the Switch to Expensify Classic on Coming soon modal is redirected to browser #80732

Open

7 tasks

Conversation

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

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Jan 19, 2026 • 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 Jan 19, 2026

Uh oh!

melvin-bot bot commented Jan 19, 2026

Uh oh!

nkdengineer commented Jan 19, 2026

Uh oh!

Uh oh!

github-actions bot Jan 19, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-3 (docs)

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify commented Jan 19, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach Jan 22, 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!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Uh oh!

nkdengineer commented Jan 23, 2026

Uh oh!

ZhenjaHorbach commented Jan 23, 2026

Uh oh!

ZhenjaHorbach commented Jan 23, 2026

Uh oh!

ZhenjaHorbach commented Jan 26, 2026

Uh oh!

roryabraham left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jan 27, 2026

Uh oh!

OSBotify commented Jan 27, 2026

Uh oh!

nkdengineer commented Jan 19, 2026 •

edited

Loading

codecov bot commented Jan 19, 2026 •

edited by github-actions bot

Loading

ZhenjaHorbach Jan 22, 2026 •

edited

Loading

ZhenjaHorbach commented Jan 22, 2026 •

edited

Loading

ZhenjaHorbach commented Jan 22, 2026 •

edited

Loading

IuliiaHerets commented Jan 28, 2026 •

edited

Loading

nkdengineer commented Jan 28, 2026 •

edited

Loading