Skip to content

Refactored ConfirmModal usage to useConfirmModal#77948

Merged
roryabraham merged 45 commits intoExpensify:mainfrom
abbasifaizan70:76695-refactored-confirmation-modal-PR-2
Jan 26, 2026
Merged

Refactored ConfirmModal usage to useConfirmModal#77948
roryabraham merged 45 commits intoExpensify:mainfrom
abbasifaizan70:76695-refactored-confirmation-modal-PR-2

Conversation

@abbasifaizan70
Copy link
Contributor

@abbasifaizan70 abbasifaizan70 commented Dec 17, 2025

Explanation of Change

This PR refactored ConfirmModal usage to useConfirmModal in the following files:

FloatingActionButtonAndPopover.tsx
ReportDetailsPage.tsx
ReportParticipantsPage.tsx
RoomMembersPage.tsx

Fixed Issues

$ #76695
PROPOSAL: #76695 (comment)

Tests

FloatingActionButtonAndPopover.tsx

Prerequisites: You need to be in a scenario where the app would redirect to Expensify Classic (usually for certain features or workspaces)

  1. Click the + (plus) button → "Create Expense" → Modal should appear
  2. Click the + button → "Track Distance" → Modal should appear
  3. Click the + button → "Create Report" → Modal should appear
  4. Click the + button → "Send Invoice" → Modal should appear
  5. Long-press the + button → "Scan Receipt" → Modal should appear

ReportDetailsPage.tsx

Scenario 1
  1. Navigate to a group chat
  2. Go to Report Details (click on report header) > Check Members section
  3. Verify you are the only member (or the last member who can leave)
  4. Try to Leave > In Report Details, find the "Leave" option > Click "Leave"
  5. A confirmation modal should appear warning about being the last member
Scenario 2
  1. Open a Task Report
  2. Navigate to a task report
  3. Click on report header or three-dot menu → Details
  4. Look for "Delete" option
  5. Click "Delete"
  6. A confirmation modal should appear

ReportParticipantsPage.tsx

  1. Navigate to any group chat (not a 1-on-1 chat)
  2. Click on report header → DetailsMembers
  3. OR use the three-dot menu → Members
  4. You should see a list of members
  5. Select one or more members using checkboxes
  6. Look for a bulk action button (usually appears when members are selected)
  7. Click the bulk action button → Select "Remove Members"
  8. A confirmation modal should appear showing:

RoomMembersPage.tsx

  1. Navigate to a workspace room (not a group chat)
  2. Rooms are usually workspace-specific chat rooms
  3. Click on room header → DetailsMembers
  4. OR use the three-dot menu → Members
  5. Select one or more members using checkboxes
  6. Look for a bulk action button
  7. Click the bulk action button → Select "Remove Members"
  8. A confirmation modal should appear
  • Verify that no errors appear in the JS console

Offline tests

same as tests.

QA Steps

same as tests.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

ReportDetailsPage.tsx

Screen.Recording.2026-01-07.at.5.28.58.PM.mov

Screen.Recording.2026-01-07.at.5.39.48.PM.mov

ReportParticipantsPage.tsx

Screen.Recording.2026-01-07.at.5.23.03.PM.mov

RoomMembersPage.tsx

Screen.Recording.2026-01-07.at.5.24.03.PM.mov
Android: mWeb Chrome

ReportDetailsPage.tsx

Screen.Recording.2026-01-07.at.5.54.50.PM.mov

Screen.Recording.2026-01-07.at.5.55.33.PM.mov

ReportParticipantsPage.tsx

Screen.Recording.2026-01-07.at.5.54.32.PM.mov

RoomMembersPage.tsx

iOS: Native

ReportDetailsPage.tsx

Screen.Recording.2026-01-07.at.3.16.48.PM.mov

Screen.Recording.2026-01-07.at.3.17.15.PM.mov

ReportParticipantsPage.tsx

Screen.Recording.2026-01-07.at.3.18.07.PM.mov

RoomMembersPage.tsx

Screen.Recording.2026-01-07.at.3.19.32.PM.mov
iOS: mWeb Safari

ReportDetailsPage.tsx

Screen.Recording.2026-01-07.at.3.44.53.PM.mov

Screen.Recording.2026-01-07.at.3.48.34.PM.mov

ReportParticipantsPage.tsx

Screen.Recording.2026-01-07.at.3.41.57.PM.mov

RoomMembersPage.tsx

Screen.Recording.2026-01-07.at.3.41.12.PM.mov
MacOS: Chrome / Safari

FloatingActionButtonAndPopover.tsx

Screenshot 2025-12-18 at 4 22 38 AM

ReportDetailsPage.tsx

Screen.Recording.2026-01-07.at.3.36.54.PM.mov

image

ReportParticipantsPage.tsx

Screenshot 2025-12-18 at 4 26 46 AM

RoomMembersPage.tsx

image

@codecov
Copy link

codecov bot commented Dec 17, 2025

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/libs/ReportActionsUtils.ts 54.51% <100.00%> (+0.10%) ⬆️
src/pages/RoomMembersPage.tsx 0.00% <0.00%> (ø)
...es/home/sidebar/FloatingActionButtonAndPopover.tsx 51.32% <14.28%> (+0.18%) ⬆️
src/pages/ReportDetailsPage.tsx 56.19% <15.00%> (-0.61%) ⬇️
src/pages/ReportParticipantsPage.tsx 0.00% <0.00%> (ø)
... and 31 files with indirect coverage changes

@melvin-bot
Copy link

melvin-bot bot commented Dec 18, 2025

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

Copy link
Contributor

@JmillsExpensify JmillsExpensify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Product review not strictly required.

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Jan 2, 2026

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-19.15.25.50.mov
2026-01-19.15.26.29.mov
2026-01-19.15.28.02.mov
2026-01-19.15.28.40.mov
Android: mWeb Chrome
iOS: HybridApp
2026-01-19.14.36.51.mov
2026-01-19.14.38.18.mov
2026-01-19.14.39.03.mov
2026-01-19.14.39.41.mov
2026-01-19.14.40.35.mov
iOS: mWeb Safari
2026-01-19.14.46.24.mov
2026-01-19.14.47.14.mov
2026-01-19.14.47.40.mov
2026-01-19.14.49.32.mov
MacOS: Chrome / Safari
2026-01-07.16.07.41.mov
2026-01-07.16.21.22.mov
2026-01-07.16.24.41.mov
2026-01-07.16.25.24.mov
2026-01-07.16.26.33.mov
2026-01-07.16.27.49.mov

@ZhenjaHorbach
Copy link
Contributor

@abbasifaizan70
Could you add videos or screenshots here, please?

@abbasifaizan70
Copy link
Contributor Author

@ZhenjaHorbach added videos for other platforms. Thanks

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Jan 7, 2026

Looks like after updating ModalProvider we have a long delay after pressing submit button
Which doesn't look very good

2026-01-07.16.34.36.mov

@abbasifaizan70
Copy link
Contributor Author

@ZhenjaHorbach may i revert my change?

@ZhenjaHorbach
Copy link
Contributor

@ZhenjaHorbach may i revert my change?

Yes
And If I understand, the only issue without your changes is only a warning on the mobile app?

clearUserSearchPhrase();
});
};
}, [selectedMembers, currentUserAccountID, report.reportID]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please
Check github after your changes

return;
}
navigateToTargetUrl();
deleteTransaction();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And just checked
Looks like now we have an issue that the useEffect fixed
@abbasifaizan70
Could you please experiment a little to see how we can fix this visual glitch?

2026-01-21.17.50.36.mov

Copy link
Contributor Author

@abbasifaizan70 abbasifaizan70 Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ZhenjaHorbach Can you check now

Screen.Recording.2026-01-22.at.1.58.10.AM.mov

@abbasifaizan70
Copy link
Contributor Author

@ZhenjaHorbach take a look. Thanks

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Jan 22, 2026

I still have an issue with Delete text before the modal is completely closed
You can check on mobile web
It's more noticeable there

2026-01-22.08.11.29.mov

@abbasifaizan70
Copy link
Contributor Author

@ZhenjaHorbach It looks fine to me.

Screen.Recording.2026-01-23.at.2.17.10.AM.mov

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Jan 23, 2026

@ZhenjaHorbach It looks fine to me.

Screen.Recording.2026-01-23.at.2.17.10.AM.mov

But never mind
I have the same issue on staging also
So it's probably my machine's issue

2026-01-23.11.25.20.mov

@melvin-bot melvin-bot bot requested a review from roryabraham January 23, 2026 10:24
@ZhenjaHorbach
Copy link
Contributor

LGTM!

@roryabraham roryabraham merged commit af8957e into Expensify:main Jan 26, 2026
29 checks passed
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

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

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

@IuliiaHerets
Copy link

Hi @abbasifaizan70 @roryabraham. How can we trigger ConfirmModal?
We can't test this part. Can it be tested internally?

image

@abbasifaizan70
Copy link
Contributor Author

Hi @abbasifaizan70 @roryabraham. How can we trigger ConfirmModal?
We can't test this part. Can it be tested internally?

image

@IuliiaHerets i test it locally through some code changes.

@OSBotify
Copy link
Contributor

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

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

}
Navigation.navigate(ROUTES.PROFILE.getRoute(item.accountID, Navigation.getActiveRoute()));
const pendingChatMember = pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
const pendingAction = pendingChatMember?.pendingAction ?? reportParticipants?.[accountID]?.pendingAction;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change caused issue

we should skip pending delete members when it isn't offline

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants