Skip to content

76695: Refactor ConfirmModal usage to useConfirmModal in Report and H…#76808

Closed
abbasifaizan70 wants to merge 21 commits intoExpensify:mainfrom
abbasifaizan70:76695-refactored-confirmation-modal-in-report-and-home-page
Closed

76695: Refactor ConfirmModal usage to useConfirmModal in Report and H…#76808
abbasifaizan70 wants to merge 21 commits intoExpensify:mainfrom
abbasifaizan70:76695-refactored-confirmation-modal-in-report-and-home-page

Conversation

@abbasifaizan70
Copy link
Contributor

@abbasifaizan70 abbasifaizan70 commented Dec 5, 2025

Explanation of Change

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

ReportDetailsExportPage.tsx
PureReportActionItem.tsx
PopoverReportActionContextMenu.tsx
HeaderView.tsx
FloatingActionButtonAndPopover.tsx
ReportDetailsPage.tsx
ReportParticipantsPage.tsx
RoomMembersPage.tsx
RoomMemberDetailsPage.tsx
ReportParticipantDetailsPage.tsx
EditReportFieldPage.tsx
TravelTerms.tsx

Fixed Issues

$ #76695
PROPOSAL: #76695 (comment)

Tests

ReportDetailsExportPage.tsx

precondition: Connect to your accounting system (e.g., QuickBooks, Xero)

  1. Navigate to any workspace
  2. Go to Reports or Expenses
  3. Open any expense report (money request/IOU report)
  4. Find the three-dot menu (⋮) or Export button
  5. Click "Export" → Select "Export to [Integration Name]" (e.g., QuickBooks, Xero)
  6. Wait for the export to complete
  7. Click "Export" again → Select "Export to [Integration Name]"
  8. A confirmation modal should appear.

PureReportActionItem.tsx

precondition: Find a Report Action with Receipt Error

  1. Open any report (chat or expense report)
  2. Look for a report action (message/comment) that has a red error indicator
  3. The error should be related to receipt processing
  4. Click on the error indicator or the dismiss/error option
  5. A confirmation modal should appear asking to dismiss the receipt error

PopoverReportActionContextMenu.tsx

  1. Navigate to any report (chat, expense, group chat, etc.)
  2. Scroll to any message/comment/action in the report
  3. Right-click on the message/action
  4. A context menu should appear > Select Delete > Click "Delete" from the context menu
  5. A confirmation modal should appear asking to confirm deletion

HeaderView.tsx

This was dead code removal, so there's no modal to test. Just verify nothing broke.

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 an Expense Report
    • Navigate to an expense report (money request/IOU)
  2. Go to Report Details
  3. Click on report header or three-dot menu → Details
    • Look for "Delete" option in the details menu
    • Click "Delete"
  4. A confirmation modal should appear
Scenario 3
  1. Open a Task Report
    • Navigate to a task report
    • Click on report header or three-dot menu → Details
    • Look for "Delete" option
    • Click "Delete"
    • 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

RoomMemberDetailsPage.tsx

  1. Navigate to a workspace room
  2. Click on room header → DetailsMembers
  3. Click on any member's name/avatar to view their details
  4. Member details page should open
  5. Look for "Remove Room Member" button > - Click it
  6. A confirmation modal should appear.

ReportParticipantDetailsPage.tsx

  • Open a Group Chat
  • Go to Report Details → Members
  • Click on any member's name/avatar to view their details
  • Look for "Remove Group Member" button (only visible if you're an admin)
  • Click it
  • A confirmation modal should appear

EditReportFieldPage.tsx

  • Navigate to a report that has custom report fields
  • These are usually workspace-specific fields
  • Click on report header → Details
  • Look for custom report fields in the details
  • Click on a field that can be edited/deleted
  • Look for a three-dot menu (⋮) or edit option
  • Click it to see field options
  • Select "Delete" from the options
  • A confirmation modal should appear asking to confirm deletion

EditReportFieldPage.tsx

  1. Go to Workspaces → Reports
  2. Click on a Report Field
  3. In the "Report fields" section, click a field name (e.g., "Extra")
  4. Field details open in the right sidebar
  5. Click Delete Button
  6. Modal should appear: "Delete field" / "Are you sure you want to delete this report field?"

TravelTerms.tsx

  1. Open book travel from left FAB
  2. Navigate through the book travel acceptance flow
  3. If additional verification is required:
  4. After that Modal should appear "We're reviewing your request"
  • Verify that no errors appear in the JS console

Offline tests

same as test.

QA Steps

same as test.

  • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

PureReportActionItem.tsx

Screenshot 2025-12-05 at 3 16 25 PM

PopoverReportActionContextMenu.tsx

Screenshot 2025-12-05 at 3 17 50 PM

FloatingActionButtonAndPopover.tsx

Screenshot 2025-12-05 at 4 08 17 PM

ReportDetailsPage.tsx

Screenshot 2025-12-05 at 5 44 42 PM Screenshot 2025-12-05 at 5 53 25 PM Screenshot 2025-12-05 at 5 55 55 PM

ReportParticipantsPage.tsx

Screenshot 2025-12-05 at 5 58 42 PM

RoomMembersPage.tsx

Screenshot 2025-12-05 at 6 01 38 PM

RoomMemberDetailsPage.tsx

Screenshot 2025-12-05 at 6 04 09 PM

ReportParticipantDetailsPage.tsx

Screenshot 2025-12-05 at 6 08 41 PM

EditReportFieldPage.tsx

Screenshot 2025-12-05 at 6 17 49 PM

TravelTerms.tsx

Attached_image

@codecov
Copy link

codecov bot commented Dec 5, 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/pages/home/HeaderView.tsx 84.32% <100.00%> (+2.51%) ⬆️
src/pages/settings/InitialSettingsPage.tsx 0.59% <ø> (ø)
src/libs/getCurrentPosition/index.ts 5.55% <0.00%> (ø)
src/pages/EditReportFieldPage.tsx 0.00% <0.00%> (ø)
src/pages/home/report/PureReportActionItem.tsx 52.18% <16.66%> (+0.07%) ⬆️
src/pages/RoomMemberDetailsPage.tsx 0.00% <0.00%> (ø)
src/pages/ReportParticipantDetailsPage.tsx 0.00% <0.00%> (ø)
src/pages/RoomMembersPage.tsx 0.00% <0.00%> (ø)
src/pages/home/report/ReportDetailsExportPage.tsx 0.00% <0.00%> (ø)
src/pages/ReportDetailsPage.tsx 58.55% <13.33%> (-1.05%) ⬇️
... and 4 more
... and 54 files with indirect coverage changes

@abbasifaizan70 abbasifaizan70 marked this pull request as ready for review December 6, 2025 00:13
@abbasifaizan70 abbasifaizan70 requested review from a team as code owners December 6, 2025 00:13
@melvin-bot melvin-bot bot requested review from ZhenjaHorbach and joekaufmanexpensify and removed request for a team December 6, 2025 00:13
@melvin-bot
Copy link

melvin-bot bot commented Dec 6, 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]

@roryabraham roryabraham requested a review from waterim December 9, 2025 01:24
@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Dec 9, 2025

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
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@abbasifaizan70
Copy link
Contributor Author

@waterim @ZhenjaHorbach Soft remainder to have a look on this PR. Thanks

@ZhenjaHorbach
Copy link
Contributor

@abbasifaizan70
As I can see, you have 12 test cases
Let's split this PR into 3 parts if you don't mind?

@abbasifaizan70
Copy link
Contributor Author

@abbasifaizan70 As I can see, you have 12 test cases Let's split this PR into 3 parts if you don't mind?

May we just need to break this PR or we will create new issue as well and then inside we can use 4 test cases in each?

@ZhenjaHorbach
Copy link
Contributor

@abbasifaizan70 As I can see, you have 12 test cases Let's split this PR into 3 parts if you don't mind?

May we just need to break this PR or we will create new issue as well and then inside we can use 4 test cases in each?

We already have a separate issue for these ConfirmModals
Just to make testing easier and reduce the number of potential regressions
Let's create several PRs
Instead of just one

@abbasifaizan70
Copy link
Contributor Author

@abbasifaizan70 As I can see, you have 12 test cases Let's split this PR into 3 parts if you don't mind?

May we just need to break this PR or we will create new issue as well and then inside we can use 4 test cases in each?

We already have a separate issue for these ConfirmModals Just to make testing easier and reduce the number of potential regressions Let's create several PRs Instead of just one

Sure, let me do that and will you send here. Thanks

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Dec 15, 2025

@abbasifaizan70 As I can see, you have 12 test cases Let's split this PR into 3 parts if you don't mind?

May we just need to break this PR or we will create new issue as well and then inside we can use 4 test cases in each?

We already have a separate issue for these ConfirmModals Just to make testing easier and reduce the number of potential regressions Let's create several PRs Instead of just one

Sure, let me do that and will you send here. Thanks

You can close this PR
And just link new PRs to the current issue

@abbasifaizan70
Copy link
Contributor Author

split this PR into 3 parts

@ZhenjaHorbach Created three PR for easy testing. Please review, and I am closing this PR. Thanks

#77945
#77948
#77950

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.

2 participants