Skip to content

Revert useConfirmModal to use ConfirmModal for DeleteWorkspaceFlow - #97318

Merged
Gonals merged 2 commits into
Expensify:mainfrom
ZhenjaHorbach:fix/96369-delete-workspace-error-modal
Aug 3, 2026
Merged

Gonals merged 2 commits into
Expensify:mainfrom
ZhenjaHorbach:fix/96369-delete-workspace-error-modal

Conversation

@ZhenjaHorbach

@ZhenjaHorbach ZhenjaHorbach commented Jul 29, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #96369
PROPOSAL:

Tests

Precondition:

  • Login with new expensifail account
  • Create new workspace
  • Set Expensify card to Enable
  • Add Expensify card

Steps:

  1. Open Expensify App on iOS
  2. Login with account from Precondition
  3. Go to Account > Troubleshoot > Clear cache and restart > Reset and refresh.
  4. Go to Workspaces tab.
  5. Click 3-dot menu on the workspace with Expensify Card > Delete workspace > Delete.
  6. Verify that the error modal shows "Your company still has Expensify Cards. Please reach out to Concierge to remove them."
  7. Open workspace settings > Expensify Cards.
  8. Go to Workspaces tab again
  9. Click 3-dot menu on the workspace with Expensify Card > Delete workspace > Delete.
  10. Verify that "Delete" button works correctly if pressed again after a workspace deletion error occurs.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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 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 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)
  • 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)
  • 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.
  • 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
2026-07-29.12.16.48.mov
Android: mWeb Chrome
2026-07-29.12.16.48.mov
iOS: Native
2026-07-29.12.10.10.mov
iOS: mWeb Safari
2026-07-29.12.12.29.mov
MacOS: Chrome / Safari
2026-07-29.11.45.27.mov

@ZhenjaHorbach
ZhenjaHorbach requested review from a team as code owners July 29, 2026 09:42
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and shubham1206agra and removed request for a team and JmillsExpensify July 29, 2026 09:42
@melvin-bot

melvin-bot Bot commented Jul 29, 2026

Copy link
Copy Markdown

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

ZhenjaHorbach commented Jul 29, 2026 •

Copy link
Copy Markdown
Contributor Author

@shubham1206agra
As discussed before
Reverted useConfirmModal to use ConfirmModal as a temporary solution
And will create a new fix by the end of the week

@codecov

codecov Bot commented Jul 29, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
.../workspace/deleteWorkspace/DeleteWorkspaceFlow.tsx 0.00% <0.00%> (ø)
... and 484 files with indirect coverage changes

@shubham1206agra

shubham1206agra commented Jul 30, 2026 •

Copy link
Copy Markdown
Contributor

@ZhenjaHorbach Can you revert 8d3d912 exactly? Slight modifications are fine

@ZhenjaHorbach

ZhenjaHorbach commented Jul 30, 2026 •

Copy link
Copy Markdown
Contributor Author

@ZhenjaHorbach Can you revert 8d3d912 exactly? Slight modifications are fine

But what's the point? 😅
I think it's better to revert based on current changes and not the state of two months ago

// TODO: temporary fix for https://github.com/Expensify/App/issues/96369 - the error modal is kept as a locally controlled ConfirmModal
// instead of the global useConfirmModal one, because closing the loading delete confirmation modal and immediately pushing another
// global modal leaves the flow latched on iOS, so a second delete attempt never restarts the flow.
const [deleteWorkspaceErrorMessage, setDeleteWorkspaceErrorMessage] = useState<string>();

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@ZhenjaHorbach FYI, This is not locale agnostic. Not sure if this is even a realistic worry. Probably not.

@ZhenjaHorbach ZhenjaHorbach Jul 30, 2026 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It's okay
The previous version resolved translate() at show-time too
But probably yes, cheap to fix, so I updated it and the state now holds the translation key, and translate() runs at render time

@shubham1206agra

Copy link
Copy Markdown
Contributor

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 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)
  • 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)
  • 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.
  • 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

Screen.Recording.2026-07-30.at.9.02.14.PM.mov
Screen.Recording.2026-07-30.at.9.12.46.PM.mov

@melvin-bot

melvin-bot Bot commented Jul 30, 2026

Copy link
Copy Markdown

We did not find an internal engineer to review this PR, trying to assign a random engineer to #96369 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot
melvin-bot Bot requested a review from Gonals July 30, 2026 15:44
@shubham1206agra

Copy link
Copy Markdown
Contributor

@Gonals
Gonals merged commit 1490f68 into Expensify:main Aug 3, 2026
33 checks passed
@OSBotify

OSBotify commented Aug 3, 2026

Copy link
Copy Markdown
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.

@github-actions

github-actions Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify mentioned this pull request Aug 3, 2026
77 tasks done
@OSBotify

OSBotify commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/Gonals in version: 9.4.49-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR against the help site files under docs/articles.

No help site changes are required.

This PR reverts the workspace-deletion error modal from the global useConfirmModal to a locally controlled ConfirmModal in DeleteWorkspaceFlow.tsx to fix a bug where the Delete workspace button stopped working after a deletion error on iOS (#96369). It's an internal implementation fix:

  • No user-facing copy changed — the same error messages (workspace.common.deleteOpenExpensifyCardsError, workspace.common.deleteTravelInvoicingError) still display.
  • No change to the documented delete flow (three-dot menu → Delete workspace → confirm).
  • The existing Delete a Workspace article still accurately reflects the behavior.

Since this is a bug fix that restores existing behavior rather than adding or changing anything user-facing, there's nothing to update on the help site, so I did not create a docs PR.

@ZhenjaHorbach, please confirm you agree no help site changes are needed. If you think a doc update is warranted, let me know what behavior changed and I'll create the draft PR.

@OSBotify

OSBotify commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/arosiclair in version: 9.4.49-3 🚀

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

Bundle Size Analysis (Sentry):

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.

6 participants