Skip to content

Refactor ConfirmModal usage to useConfirmModal in workspace feature pages#86678

Merged
roryabraham merged 4 commits intoExpensify:mainfrom
lorretheboy:feat/76691-part-3
Apr 8, 2026
Merged

Refactor ConfirmModal usage to useConfirmModal in workspace feature pages#86678
roryabraham merged 4 commits intoExpensify:mainfrom
lorretheboy:feat/76691-part-3

Conversation

@lorretheboy
Copy link
Copy Markdown
Contributor

@lorretheboy lorretheboy commented Mar 30, 2026 •
edited
Loading

Refactored 4 pages:

ReportFieldsListValuesPage.tsx
AddNewCardPage.tsx
WorkspaceCompanyCardsSettingsPage.tsx
WorkspaceCompanyCardDetailsPage.tsx

Explanation of Change

Fixed Issues

$ #76691
PROPOSAL: #76691 (comment)

Tests

Test 1: ReportFieldsListValuesPage.tsx

  1. Go to WS --> Reports
  2. Enable Report Fields
  3. Create a List field
  4. Add values to List
  5. Try to delete 1-2 of them
  6. Verify that Modal will be shown and works correctly

Test 2: AddNewCardPage.tsx

  1. Login ND
  2. Go to WS settings
  3. Go to Company card
  4. Press Add new card --> Go through add new card flow --> In Plaid step, press exit
  5. Verify that Modal is shown and works proper

Test 3: WorkspaceCompanyCardsSettingsPage.tsx

  1. Login ND
  2. Go to WS settings
  3. Go to Company card
  4. Try to remove a card feed
  5. Verify that modal is shown and works proper

Test 4: WorkspaceCompanyCardDetailsPage.tsx

  1. Login ND
  2. Go to WS settings
  3. Go to Company card
  4. Click to view details an assigned card
  5. Try to un-assign it
  6. Verify that modal is shown and works proper
  • Verify that no errors appear in the JS console

Offline 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 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
Screen.Recording.2026-03-31.at.01.07.44.mov
Android: mWeb Chrome
Screen.Recording.2026-03-31.at.01.05.37.mov
iOS: Native
Screen.Recording.2026-03-31.at.00.51.29.mov
iOS: mWeb Safari
Screen.Recording.2026-03-31.at.00.50.03.mov
MacOS: Chrome / Safari
ReportFieldsListValuesPage-web.mov
WorkspaceCompanyCardDetailsPage.mov
AddNewCardPage.mov
WorkspaceCompanyCardsSettingsPage.mov

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 30, 2026 •
edited by github-actions bot
Loading

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...companyCards/WorkspaceCompanyCardsSettingsPage.tsx 0.00% <0.00%> (ø)
...s/workspace/reports/ReportFieldsListValuesPage.tsx 0.00% <0.00%> (ø)
...s/settings/Wallet/PersonalCards/AddNewCardPage.tsx 0.00% <0.00%> (ø)
...e/companyCards/WorkspaceCompanyCardDetailsPage.tsx 0.00% <0.00%> (ø)
... and 17 files with indirect coverage changes

@lorretheboy lorretheboy marked this pull request as ready for review March 30, 2026 18:08
@lorretheboy lorretheboy requested review from a team as code owners March 30, 2026 18:08
@melvin-bot melvin-bot bot requested review from ZhenjaHorbach and heyjennahay and removed request for a team March 30, 2026 18:08
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Mar 30, 2026

@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 melvin-bot bot removed the request for review from a team March 30, 2026 18:08
@ZhenjaHorbach
Copy link
Copy Markdown
Contributor

ZhenjaHorbach commented Mar 31, 2026 •
edited
Loading

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 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-03-31.13.21.34.mov
2026-03-31.13.24.31.mov
2026-03-31.13.25.38.mov
2026-03-31.13.26.00.mov
Android: mWeb Chrome
2026-03-31.13.21.34.mov
2026-03-31.13.24.31.mov
2026-03-31.13.25.38.mov
2026-03-31.13.26.00.mov
iOS: HybridApp
2026-03-31.13.03.57.mov
2026-03-31.13.06.58.mov
2026-03-31.13.07.54.mov
2026-03-31.13.08.39.mov
iOS: mWeb Safari
2026-03-31.12.54.25.mov
2026-03-31.12.56.13.mov
2026-03-31.12.58.00.mov
2026-03-31.13.00.11.mov
MacOS: Chrome / Safari
2026-03-31.12.03.04.mov
2026-03-31.12.07.39.mov
2026-03-31.12.22.02.mov
2026-03-31.12.25.31.mov

@ZhenjaHorbach
Copy link
Copy Markdown
Contributor

ZhenjaHorbach commented Mar 31, 2026

Not here page after unassign on iOS web

2026-03-31.12.57.11.mov

@ZhenjaHorbach
Copy link
Copy Markdown
Contributor

ZhenjaHorbach commented Mar 31, 2026

But overall changes look good!

@lorretheboy
Copy link
Copy Markdown
Contributor Author

lorretheboy commented Apr 1, 2026

Checking...

@lorretheboy
Copy link
Copy Markdown
Contributor Author

lorretheboy commented Apr 2, 2026

Looks like the issue is fixed after I merged main. Please check again @ZhenjaHorbach

Screen.Recording.2026-04-03.at.00.00.10.mov

@ZhenjaHorbach
Copy link
Copy Markdown
Contributor

ZhenjaHorbach commented Apr 2, 2026

Looks like the issue is fixed after I merged main. Please check again @ZhenjaHorbach

Screen.Recording.2026-04-03.at.00.00.10.mov

Oh
Good then
I will recheck then!

@ZhenjaHorbach
Copy link
Copy Markdown
Contributor

ZhenjaHorbach commented Apr 3, 2026 •
edited
Loading

Still can reproduce
But looks like it's a Safari-specific issue
On Chrome, I can't reproduce this

And on staging everything is good

Снимок экрана 2026-04-03 в 16 26 14

@lorretheboy
Copy link
Copy Markdown
Contributor Author

lorretheboy commented Apr 8, 2026

It is fixed @ZhenjaHorbach Kindly review again

@ZhenjaHorbach
Copy link
Copy Markdown
Contributor

ZhenjaHorbach commented Apr 8, 2026

Yeah
Now is good!

2026-04-08.15.38.24.mov

@melvin-bot melvin-bot bot requested a review from roryabraham April 8, 2026 13:58
@roryabraham roryabraham merged commit fd6f992 into Expensify:main Apr 8, 2026
32 checks passed
This was referenced Apr 8, 2026
Closed
Closed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 8, 2026

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 8, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-fd6f992-ea22b72-fa8996ee327d7dfc1c30c4710dcc06c2513e4005/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-fd6f992-ea22b72-c99f999354d7806892d54f86a220f47ed49c8820/index.html
Android iOS
Web 🕸️
https://86678.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

roryabraham added a commit that referenced this pull request Apr 8, 2026
@roryabraham
Fix typecheck: remove stale isModalVisible reference
d062d83 
The merge of #86678 (useConfirmModal refactor) left behind a reference
to `isModalVisible` that no longer exists after removing the useState
hook. The disableAutoFocus prop is no longer needed since useConfirmModal
manages modal visibility internally.

Made-with: Cursor
@roryabraham roryabraham mentioned this pull request Apr 8, 2026
Closed
52 tasks
@OSBotify OSBotify mentioned this pull request Apr 9, 2026
Open
61 tasks
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 9, 2026

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

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

MelvinBot commented Apr 9, 2026

⚠️ Something went wrong. This may be a transient issue — try again. If it persists, check status.anthropic.com.

Run details

@MelvinBot MelvinBot mentioned this pull request Apr 9, 2026
Open
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roryabraham roryabraham roryabraham approved these changes

@heyjennahay heyjennahay Awaiting requested review from heyjennahay

+1 more reviewer

@ZhenjaHorbach ZhenjaHorbach ZhenjaHorbach approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@lorretheboy lorretheboy

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@lorretheboy @ZhenjaHorbach @OSBotify @MelvinBot @roryabraham