Consolidate ConfirmModal instances into a global component v3 by sosek108 · Pull Request #71169 · Expensify/App

sosek108 · 2025-09-24T09:08:31Z

Explanation of Change

Currently the app suffers from component bloat in regards to ConfirmModal instances. Reduce the memory footprint and simplify working with modals by consolidating ConfirmModal instances into a single component instance.

Fixed Issues

$ #68799 (original task)
$ #69730 (deploy blocker)
$ #69711 (deploy blocker)
$ #70726 (deploy blocker)
$ #70728 (deploy blocker)
PROPOSAL:

This PR reintroduces changes from #70111 made by @zirgulis and fixes deploy blockers that were reported.

Tests

These test cases will require you to have several reports with various states: report without expenses; report with one and multiple expenses; report that are exported to integration (eg. NetSuite or Xero).

For each modal please validate:

Confirm action -> verify that action completes
Cancel action -> verify that nothing happens and modal disappear
Outside click -> verify that nothing happens and modal disappear
Back button (Android): verify that modal closes disappear and no action is performed

Cancel payment

Go to a report with pending payment
Click More -> Cancel payment
Verify that confirmation modal appears
Click Cancel payment
Verify that action is properly performed

Delete report without any expenses (empty)

Go to a report with zero expenses
Click More -> Delete
Verify that confirmation modal appears
Verify title and description are proper
Confirm action
Verify that report disappears and user is navigated back to proper view

Delete report with single expense

Go to a report with one expense
Click More -> Delete
Verify that confirmation modal appears
Verify title and description are proper
Confirm action
Verify that report disappears and user is navigated back to proper view

Delete report with multiple expenses

Go to a report with multiple expenses
Click More -> Delete
Verify that confirmation modal appears
Verify title and description are proper
Confirm action
Verify that report disappears and user is navigated back to proper view

Delete selected expenses from report

Go to a report with multiple expenses
Select one or more expenses
Click on bulk actions button -> Delete
Verify that confirmation modal appears
Verify title and description are proper
Confirm action
Verify that transactions are properly deleted and user is navigated to proper view

Export report with templates

Go to any report
Click Export -> Any export template
Verify that progress modal is displayed with Export in progress message
Verify modal cannot be cancelled

Export report again

Go to an report which is already exported to external integration
Click on More -> Export -> Export to XYZ
Verify that confirmation modal appears
Verify title and description are proper
Click on Cancel
Verify that modal disappears
Again Click on More -> Export -> Export to XYZ
Verify that confirmation modal appears
Confirm action
Verify action is properly performed

Reopen exported report

Go to closed and exported report
Click More -> Reopen report
Verify that confirmation modal appears
Verify title and description are proper
Confirm action
Verify that report is reopened properly

Unapprove exported report

Go to an approved and approved report
Click More -> Unapprove
Verify that confirmation modal appears
Verify title and description are proper
Confirm action
Verify that status of report is properly modified

Redirect to OldDot modal

Open New Dot
Ensure you have a workspace with DEW enabled
Open that WS chat and subimit manual expense
Click on Submit and check if modal redirecting to OD is shown up

Offline tests

Same as in Tests

QA Steps

Same as in Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-09-25T11:27:01Z

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

ZhenjaHorbach · 2025-10-07T20:35:44Z

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
- MacOS: Desktop
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-10-09.14.43.29.mov

Android: mWeb Chrome

2025-10-09.14.43.29.mov

iOS: HybridApp

2025-10-09.14.39.10.mov

iOS: mWeb Safari

2025-10-09.14.28.43.mov

MacOS: Chrome / Safari

2025-10-09.14.23.19.mov

MacOS: Desktop

2025-10-09.14.23.19.mov

src/components/Modal/Global/ConfirmModalWrapper.tsx

ZhenjaHorbach · 2025-10-07T20:51:13Z

As I can see, we don't have a close animation for the delete report modal
But it looks like there is no animation for all updated modals

2025-10-07.22.50.13.mov

codecov · 2025-10-09T09:17:59Z

Codecov Report

❌ Patch coverage is 11.36364% with 117 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/components/MoneyReportHeader.tsx	0.00%	87 Missing ⚠️
src/components/Modal/Global/ModalContext.tsx	39.39%	20 Missing ⚠️
...rc/components/Modal/Global/ConfirmModalWrapper.tsx	12.50%	7 Missing ⚠️
src/hooks/useConfirmModal.ts	25.00%	3 Missing ⚠️

Files with missing lines	Coverage Δ
src/App.tsx	`100.00% <ø> (ø)`
src/components/ConfirmModal.tsx	`100.00% <ø> (ø)`
src/hooks/useConfirmModal.ts	`25.00% <25.00%> (ø)`
...rc/components/Modal/Global/ConfirmModalWrapper.tsx	`12.50% <12.50%> (ø)`
src/components/Modal/Global/ModalContext.tsx	`39.39% <39.39%> (ø)`
src/components/MoneyReportHeader.tsx	`0.17% <0.00%> (-0.01%)`	⬇️

... and 10 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

sosek108 · 2025-10-09T09:20:30Z

As I can see, we don't have a close animation for the delete report modal But it looks like there is no animation for all updated modals

2025-10-07.22.50.13.mov

I think that there is no close animation on staging, too.

ZhenjaHorbach · 2025-10-09T09:43:47Z

As I can see, we don't have a close animation for the delete report modal But it looks like there is no animation for all updated modals
2025-10-07.22.50.13.mov

I think that there is no close animation on staging, too.

No
Everything is good with staging

2025-10-09.11.48.05.mov

sosek108 · 2025-10-09T10:31:48Z

@ZhenjaHorbach I've pushed commit with exit animations. Should work now

ZhenjaHorbach · 2025-10-09T12:36:36Z

@ZhenjaHorbach I've pushed commit with exit animations. Should work now

Now is good
Thanks !

ZhenjaHorbach · 2025-10-09T12:49:41Z

LGTM!

sosek108 · 2025-11-05T10:22:24Z

@nlemma I found the probable LOC that affected your story. Please check again but I have one question. Are you sure that you tested on exported expense?

Root cause: there was invalid if statement and we showed this modal when the report was NOT imported. So you did not see the integration name because the report was not exported so this would not know the name. This is fixed now, do please retest

nlemma · 2025-11-05T10:44:19Z

@sosek108 yes, I'm 100% sure we tested on an exported expense.

Do we have a new build to retest this on?

sosek108 · 2025-11-05T10:47:06Z

@MarioExpensify could you please trigger adhoc build?

sosek108 · 2025-11-05T11:26:20Z

@sosek108 yes, I'm 100% sure we tested on an exported expense.

On the screen attached by you I can see primary button Export to NetSuite. What are steps to enable this button on exported expense.

Or maybe there is some other (not related to this PR) issue with exporting capabilities?

github-actions · 2025-11-05T15:24:29Z

🚧 @mountiny has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2025-11-05T15:48:56Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
Built from App PR #71169.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/71169/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/71169/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/71169/NewExpensify.dmg	https://71169.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

MarioExpensify · 2025-11-06T00:44:55Z

@nlemma can we get a recheck here?

nlemma · 2025-11-06T17:41:55Z

@MarioExpensify the issue is no longer reproducible.

retest.MP4

sosek108 · 2025-11-07T09:52:23Z

I've resolved conflicts related to this PR #73232

MarioExpensify · 2025-11-07T16:50:43Z

Awesome, let's move forward then!

OSBotify · 2025-11-07T23:46:05Z

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

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

IuliiaHerets · 2025-11-08T15:21:56Z

@sosek108 @roryabraham can you please explain, how we can create workspace with DEW enabled?

roryabraham · 2025-11-08T15:36:24Z

@IuliiaHerets I'm not sure we have a way for you to enable DEW on staging, so for now you can skip that test step I suppose

OSBotify · 2025-11-10T12:00:39Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.2.47-1 🚀

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

dominictb · 2025-12-16T15:14:43Z

src/components/MoneyReportHeader.tsx

+                if (result.action !== ModalActions.CONFIRM) {
+                    return;
+                }
+                Navigation.goBack(route.params?.backTo);


backTo param is cleared when switching tab. Should have a fallback here. #74731

situchan · 2026-01-06T11:16:14Z

src/components/MoneyReportHeader.tsx

+                        // Money request should be deleted when interactions are done, to not show the not found page before navigating to goBackRoute
+                        // eslint-disable-next-line @typescript-eslint/no-deprecated
+                        InteractionManager.runAfterInteractions(() => {
+                            deleteTransactions([transaction.transactionID], duplicateTransactions, duplicateTransactionViolations, currentSearchHash, false);
+                            removeTransaction(transaction.transactionID);
+                        });
+                        goBackRoute = getNavigationUrlOnMoneyRequestDelete(transaction.transactionID, requestParentReportAction, iouReport, chatIOUReport, isChatIOUReportArchived, false);
+                    }
+
+                    if (goBackRoute) {
+                        Navigation.setNavigationActionToMicrotaskQueue(() => navigateOnDeleteExpense(goBackRoute));
+                    }


Coming from #77600: we should navigate before deleting the transaction.
More details: #77600 (comment)

situchan · 2026-02-20T17:33:53Z

src/components/MoneyReportHeader.tsx

+            if (transactions.filter((trans) => trans.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE).length === selectedTransactionIDs.length) {
+                const backToRoute = route.params?.backTo ?? (chatReport?.reportID ? ROUTES.REPORT_WITH_ID.getRoute(chatReport.reportID) : undefined);
+                Navigation.goBack(backToRoute);
+            }
+            handleDeleteTransactions();


The goBack and delete actions are executed simultaneously here. However, due to a race condition between them, the delete action might update the Onyx data faster, causing the empty report state to appear before the navigation completes.
Issue: #74569

Initial implementation of ModalProvider and ConfirmModalWrapper

cf40f3a

melvin-bot bot assigned sosek108 Sep 24, 2025

sosek108 added 4 commits September 24, 2025 15:27

Reaplication of useModalHook inside of MoneyReportHeader.tsx

9965b84

Change modal title when deleting report

6bc577c

Fixes for deploy blockers

7d4d79a

Linter fixes

690c88d

sosek108 marked this pull request as ready for review September 25, 2025 11:26

sosek108 requested a review from a team as a code owner September 25, 2025 11:26

melvin-bot bot requested review from alitoshmatov and removed request for a team September 25, 2025 11:26

sosek108 mentioned this pull request Sep 25, 2025

[Due for payment 2026-01-14] Consolidate ConfirmModals into a single, global component #68799

Closed

mountiny requested review from ZhenjaHorbach and removed request for alitoshmatov October 7, 2025 19:59

ZhenjaHorbach reviewed Oct 7, 2025

View reviewed changes

src/components/Modal/Global/ConfirmModalWrapper.tsx Outdated Show resolved Hide resolved

Merge branch 'main' into feat/single-modal-instance

f567b69

Add constants for modals action

4501413

sosek108 added 2 commits October 9, 2025 11:44

lint changes

32ca4b5

modals animations

263df67

ZhenjaHorbach approved these changes Oct 9, 2025

View reviewed changes

melvin-bot bot requested a review from MarioExpensify October 9, 2025 12:49

mountiny requested a review from roryabraham October 9, 2025 13:10

trjExpensify removed their request for review November 4, 2025 23:35

sosek108 added 2 commits November 5, 2025 11:04

Merge branch 'main' into feat/single-modal-instance

2e0be8c

Switch isExported check

a79f23f

Merge branch 'main' into feat/single-modal-instance

ba62b5a

MarioExpensify approved these changes Nov 7, 2025

View reviewed changes

roryabraham approved these changes Nov 7, 2025

View reviewed changes

roryabraham merged commit 4864e1f into Expensify:main Nov 7, 2025
27 checks passed

github-actions bot mentioned this pull request Nov 7, 2025

Investigate workflow job failing on main: test / test (job 2) #74603

Closed

OSBotify mentioned this pull request Nov 7, 2025

Deploy Checklist: New Expensify 2025-11-07 #74626

Closed

48 tasks

dominictb reviewed Dec 16, 2025

View reviewed changes

situchan reviewed Jan 6, 2026

View reviewed changes

situchan reviewed Feb 20, 2026

View reviewed changes

Conversation

sosek108 commented Sep 24, 2025 • 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!

melvin-bot bot commented Sep 25, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

sosek108 commented Oct 9, 2025

Uh oh!

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

Uh oh!

Uh oh!

sosek108 commented Oct 9, 2025

Uh oh!

ZhenjaHorbach commented Oct 9, 2025

Uh oh!

ZhenjaHorbach commented Oct 9, 2025

Uh oh!

sosek108 commented Nov 5, 2025

Uh oh!

nlemma commented Nov 5, 2025

Uh oh!

sosek108 commented Nov 5, 2025

Uh oh!

sosek108 commented Nov 5, 2025

Uh oh!

github-actions bot commented Nov 5, 2025

Uh oh!

github-actions bot commented Nov 5, 2025

Uh oh!

MarioExpensify commented Nov 6, 2025

Uh oh!

nlemma commented Nov 6, 2025

Uh oh!

sosek108 commented Nov 7, 2025

Uh oh!

MarioExpensify commented Nov 7, 2025

Uh oh!

Uh oh!

OSBotify commented Nov 7, 2025

Uh oh!

IuliiaHerets commented Nov 8, 2025

Uh oh!

roryabraham commented Nov 8, 2025

Uh oh!

OSBotify commented Nov 10, 2025

Uh oh!

dominictb Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

situchan Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

situchan Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

sosek108 commented Sep 24, 2025 •

edited

Loading

ZhenjaHorbach commented Oct 7, 2025 •

edited

Loading

ZhenjaHorbach commented Oct 7, 2025 •

edited

Loading

codecov bot commented Oct 9, 2025 •

edited

Loading

ZhenjaHorbach commented Oct 9, 2025 •

edited

Loading