Skip to content

Revert "fix: block removing a workspace member who holds an active Expensify Card" - #97511

Merged
deetergp merged 1 commit into
mainfrom
revert/96267-expensify-card-removal-guard
Jul 30, 2026
Merged

Revert "fix: block removing a workspace member who holds an active Expensify Card"#97511
deetergp merged 1 commit into
mainfrom
revert/96267-expensify-card-removal-guard

Conversation

@deetergp

@deetergp deetergp commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Reverts #96267 to unblock the 9.4.46 deploy.

The Expensify Card removal guard reads WORKSPACE_CARDS_LIST from Onyx, but nothing in the Members flow fetches it — only the Expensify Card page and Workflows do. With no card data, hasActiveExpensifyCardAssigned returns false and the modal never shows. A People Admin has no EXPENSIFY_CARD permission, so they can never load it at all.

Rolling forward needs a backend change (return the flag on OpenPolicyMemberProfilePage, or enforce on DELETE_MEMBERS_FROM_WORKSPACE), so reverting for now. This reopens #94622.

Conflicts resolved to keep the RuleBot guard and getReimburserEmail changes that landed after #96267. Needs CP Staging.

Fixed Issues

$ #97500
PROPOSAL: N/A — revert.

Tests

  1. As a workspace owner on a Control workspace, issue an Expensify Card to member B.
  2. Go to Workspace > Members, click B, and click Remove from workspace.
  3. Verify the standard red "Are you sure you want to remove B?" confirmation appears, with no "You can't remove…" card modal.
  4. As a People Admin, repeat steps 2-3 and verify the same.
  5. Verify the reimburser, approver, technical contact, and preferred exporter prompts still appear as before.
  • Verify that no errors appear in the JS console

Offline tests

  1. Go offline.
  2. Remove a member holding an Expensify Card.
  3. Verify the standard confirmation appears and the removal queues, then syncs when back online.

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

N/A — revert, no new UI.

…pensify Card"

This reverts the merge of #96267
(commit 3433903) to unblock the 9.4.46
deploy.

The Expensify Card removal guard is derived from workspace card data in
Onyx that the Members flow never fetches. When that data is absent,
getAllCardsForWorkspace returns an empty list and the guard evaluates to
false, so it silently fails to block instead of showing the modal.

Conflicts resolved in WorkspaceMembersPage and WorkspaceMemberDetailsPage
to preserve the RuleBot guard and getReimburserEmail changes that landed
after the reverted PR.

Co-authored-by: Claude <claude@anthropic.com>
@codecov

codecov Bot commented Jul 30, 2026

Copy link
Copy Markdown

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/CardUtils.ts 83.75% <ø> (-0.06%) ⬇️
src/pages/workspace/WorkspaceMembersPage.tsx 61.65% <ø> (-0.59%) ⬇️
...s/workspace/members/WorkspaceMemberDetailsPage.tsx 73.00% <50.00%> (+2.61%) ⬆️
... and 15 files with indirect coverage changes

@deetergp
deetergp marked this pull request as ready for review July 30, 2026 21:39
@deetergp
deetergp requested review from a team as code owners July 30, 2026 21:39
@deetergp deetergp added the CP Staging marks PRs that have been CP'd to staging label Jul 30, 2026
@melvin-bot
melvin-bot Bot requested review from eVoloshchak and removed request for a team July 30, 2026 21:39
@melvin-bot

melvin-bot Bot commented Jul 30, 2026

Copy link
Copy Markdown

@eVoloshchak 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 requested review from flaviadefaria and removed request for a team July 30, 2026 21:39
@NicolasBonet

NicolasBonet commented Jul 30, 2026

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

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@deetergp
deetergp merged commit 6bbb8a3 into main Jul 30, 2026
49 checks passed
@deetergp
deetergp deleted the revert/96267-expensify-card-removal-guard branch July 30, 2026 22:05
@OSBotify

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.

OSBotify pushed a commit that referenced this pull request Jul 30, 2026
…removal-guard

Revert "fix: block removing a workspace member who holds an active Expensify Card"

(cherry picked from commit 6bbb8a3)

(cherry-picked to staging by marcaaron)
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/marcaaron in version: 9.4.46-10 🚀

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

@github-actions

Copy link
Copy Markdown
Contributor

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

This PR reverts #96267, which had added a guard blocking removal of a workspace member who holds an active Expensify Card. As the PR description notes, that guard never actually fired in production (the modal never showed), so reverting it restores the standard member-removal behavior — exactly what the help site already documents.

The relevant article, Managing-Workspace-Members.md, describes removing a member as: click Remove from Workspace → confirm by clicking Remove, with no mention of an Expensify Card exception. That matches the reverted-to behavior, and no article anywhere in App/docs/articles documents a card-holder removal block. There is nothing to update.

The other changed files are language strings (src/languages/*.ts), CardUtils, and the Members pages — all internal code with no help-site-facing surface.

Since no docs are out of date, I did not create a draft help site PR.

@IuliiaHerets

Copy link
Copy Markdown

v9.4.46-10
Windows 11 / Chrome
pass

bandicam.2026-07-31.13-45-34-386.mp4

@IuliiaHerets

Copy link
Copy Markdown

Android and iOS passed as well, build v9.4.46-10

ecard.andro.mp4
remove.member.ios.MP4

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.4.46-10 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/marcaaron in version: 9.4.47-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required — no draft PR created.

This PR reverts #96267, which had added a guard blocking removal of a workspace member who holds an active Expensify Card. Per the PR description, that guard never actually fired in production (the modal never showed), so reverting it restores the standard member-removal behavior — exactly what the help site already documents.

I checked every article under App/docs/articles:

  • Managing-Workspace-Members.md describes removal as Remove from Workspace → confirm Remove, with no Expensify Card exception. That matches the reverted-to behavior.
  • No article anywhere in App/docs/articles documents a card-holder removal block, so nothing is now out of date.

The remaining changed files — language strings (src/languages/*.ts), CardUtils, and the Members pages — are internal code with no help-site-facing surface.

Since no docs are out of date, there's nothing to write, so I did not create a draft help site PR.

@OSBotify

OSBotify commented Aug 1, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.4.47-7 🚀

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

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants