[Domain Control] [Release 4] Add `Expensify Card Preferred Workspace` Toggle to DomainGroupDetailsPage by jakubstec · Pull Request #88713 · Expensify/App

jakubstec · 2026-04-24T12:51:36Z

Explanation of Change

Add Expensify Card Preferred Workspace setting for Domain Security Group RHP.

Fixed Issues

$ #80133
PROPOSAL:

Tests

Preconditions:

User is a domain admin
Domain has an Expensify Card
User has at least one security group in his domain

Navigate to /domains/<domainAccountID>/groups
Open any security group
Set Expensify Card Preferred Workspace to true
Verify that it has been correctly changed and visible in security group list

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as Tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-05-06.at.11.14.50.mov

Screen.Recording.2026-05-06.at.11.23.51.mov

…tails-page' into jakubstec/domains/security-group-details-page-group-permissions4

melvin-bot · 2026-04-24T12:51:43Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

codecov · 2026-04-24T13:03:18Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/Domain.ts	`57.02% <ø> (ø)`
src/pages/domain/Groups/DomainGroupDetailsPage.tsx	`0.00% <0.00%> (ø)`
...c/pages/domain/Groups/PreferredWorkspaceToggle.tsx	`0.00% <0.00%> (ø)`
...n/Groups/ExpensifyCardPreferredWorkspaceToggle.tsx	`0.00% <0.00%> (ø)`
... and 13 files with indirect coverage changes

…urity-group-details-page-group-permissions4

…rred workspace

jakubstec · 2026-04-29T08:46:28Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d4238a4c01

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-04-29T08:59:21Z

+    const isDisabled = !isPreferredPolicyEnabled || !hasWorkspaceCard;
+    const isEnabled = !isDisabled && !!group?.overridePreferredPolicyWithCardPolicy;


Keep toggle state independent from disabled prerequisites

When prerequisites are missing (for example, a group had this setting enabled and later loses its preferred workspace/card eligibility), isDisabled becomes true and isEnabled is forced to false by !isDisabled && .... That makes ToggleSettingOptionRow render the switch as off even though group.overridePreferredPolicyWithCardPolicy may still be persisted as true, so the UI misrepresents the actual saved configuration. Use disabled only to prevent interaction, and derive isActive directly from the stored setting value.

Useful? React with 👍 / 👎.

…urity-group-details-page-group-permissions4

rayane-d · 2026-05-05T22:24:22Z

+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`, {
+        selector: filterInactiveCards,
+    });
+    const hasWorkspaceCard = !!preferredPolicy?.areExpensifyCardsEnabled && !isEmptyObject(cardsList);


We should check the cards associated with the domain (under the private_expensifyCardSettings_<domainAccountID> Onyx data key), rather than the cards associated with the policy.

A domain is considered to be using the Expensify Card as long as the domain card settings object is defined.

Pseudocode:

const cardSettings = useOnyx(`private_expensifyCardSettings_${domainAccountID}`); const isUsingExpensifyCard = !!cardSettings?.paymentBankAccountID;

Example:
Below is a screenshot of private_expensifyCardSettings_<domainAccountID> Onyx data returned from OpenDomainInitialPage API:

A domain is considered to be using the Expensify Card as long as the domain card settings object is defined.

So can we just do
const isUsingExpensifyCard = !!cardSettings? Because for NestedExpensifyCardSettings ,cardSettings.paymentBankAccountID is undefined ( it lives under e.g. US.paymentBankAccountID )so i think checking cardSettings is just enough

Agree, !!cardSettings is sufficient

…ecurity-group-details-page-group-permissions4

…locking modal for disabled toggle

jakubstec · 2026-05-06T10:13:27Z

@Expensify/design Hey, could you verify, what message do we want on blocking modal, when user tries to toggle disabled Expensify Card Preferred Workspace setting? It was concluded in the Slack discussion (link) that modal is okay, but it wasn't specified what message should it show. Thanks!

Screen.Recording.2026-05-06.at.11.23.51.mov

shawnborton · 2026-05-06T10:14:56Z

That would be more of a @Expensify/marketing @jamesdeanexpensify request.

melvin-bot · 2026-05-06T11:10:24Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 206f5f5e61

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-05-06T11:15:29Z

+                    subtitle={translate('domain.groups.expensifyCardPreferredWorkspaceDescription')}
+                    switchAccessibilityLabel={translate('domain.groups.expensifyCardPreferredWorkspace')}
+                    shouldPlaceSubtitleBelowSwitch
+                    disabled={isDisabled}


Allow disabling an already-enabled card override

When this override is already persisted as enabled and the group later loses a prerequisite (for example Preferred Workspace is turned off or the domain card settings disappear), this disables the switch entirely; Switch only runs disabledAction in that state, so admins can no longer turn the saved overridePreferredPolicyWithCardPolicy value off from this page and are left with a locked-on stale setting. Gate the disabled state only when trying to enable the setting (e.g. include !isActive) so an already-enabled override can still be cleared.

Useful? React with 👍 / 👎.

Should not be the case, because we will toggle off Expensify Card Preferred Workspace each time Preferred Workspace is set to false. But it might be a safe guard though.

…each time Preferred Workspace is set to false

trjExpensify

WN project. 👍

…urity-group-details-page-group-permissions4

situchan · 2026-05-07T06:45:17Z

+                    onCloseError={() => clearDomainSecurityGroupSettingError(domainAccountID, groupID, 'overridePreferredPolicyWithCardPolicyErrors')}
+                />
+            </View>
+            <ConfirmModal


use useConfirmModal hook

Totally agree!

fixed! I'll make the same change to PreferredWorkspaceToggle in follow-up PR regarding other matter, because it shares the same behavior

Screen.Recording.2026-05-07.at.10.18.50.mov

#89888
We will mark ConfirmModal as deprecated soon!

ZhenjaHorbach · 2026-05-07T07:19:55Z

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-05-07.11.19.11.mov

Android: mWeb Chrome

2026-05-07.11.19.11.mov

iOS: HybridApp

2026-05-07.11.10.52.mov

iOS: mWeb Safari

2026-05-07.11.15.24.mov

MacOS: Chrome / Safari

2026-05-07.09.39.04.mov

jakubstec · 2026-05-07T08:47:53Z

@ZhenjaHorbach i've applied fixes!

ZhenjaHorbach · 2026-05-07T09:20:41Z

LGTM!

…ecurity-group-details-page-group-permissions4

github-actions · 2026-05-07T11:00:31Z

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

github-actions · 2026-05-07T11:04:48Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-dfe7f59-8d97ded-7244d63ac1759650486c61ce71845fe39aded959/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-dfe7f59-8d97ded-cf624e7f3cd65975756430eb17e0ea50ed73299a/index.html

Web 🕸️
https://88713.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-07T11:08:40Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

jamesdeanexpensify · 2026-05-07T18:24:50Z

@Expensify/design for this, do we normally use a blocking modal or tooltip? Happy to give some feedback on the copy either way, just caught it a bit late.

shawnborton · 2026-05-07T19:20:18Z

I think in this case the group decided that an alert modal was most appropriate. Other times we simply use text below the locked toggle.

jamesdeanexpensify · 2026-05-07T23:04:55Z

How does this sound?

Expensify Card preferred workspace
To enable this setting, please first enable a preferred workspace and set up Expensify Cards on your domain.

mountiny · 2026-05-08T14:45:27Z

Thanks, that looks good to me, looking into that

OSBotify · 2026-05-08T15:41:16Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.69-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

mountiny · 2026-05-08T15:54:53Z

@jamesdeanexpensify PR with your suggestion is here #90005

jamesdeanexpensify · 2026-05-08T15:56:12Z

Thank you!

OSBotify · 2026-05-11T23:41:45Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.69-18 🚀

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

Per the marketing-approved copy in PR Expensify#88713, update the toggle label to sentence case and rewrite the disabled-state modal body so it clearly tells admins what they need to enable first. Co-authored-by: Cursor <cursoragent@cursor.com>

jakubstec added 3 commits March 17, 2026 13:51

feat: Add Expensify Card Preferred Workspace toggle

59d1c00

Merge remote-tracking branch 'origin/war-in/domains/security-group-de…

665cd5b

…tails-page' into jakubstec/domains/security-group-details-page-group-permissions4

resolve merge conflict

e53a2a9

melvin-bot Bot assigned jakubstec Apr 24, 2026

jakubstec added 2 commits April 29, 2026 10:05

Merge remote-tracking branch 'origin/main' into jakubstec/domains/sec…

adffbd1

…urity-group-details-page-group-permissions4

fix: disable toggle when there is no Expensify card in selected prefe…

d4238a4

…rred workspace

chatgpt-codex-connector Bot reviewed Apr 29, 2026

View reviewed changes

jakubstec added 3 commits April 29, 2026 13:16

Merge remote-tracking branch 'origin/main' into jakubstec/domains/sec…

8a569a8

…urity-group-details-page-group-permissions4

Merge remote-tracking branch 'origin/main' into jakubstec/domains/sec…

5d78564

…urity-group-details-page-group-permissions4

fix: codex review changes

10468a2

mountiny self-requested a review May 5, 2026 16:44

rayane-d suggested changes May 5, 2026

View reviewed changes

jakubstec added 2 commits May 6, 2026 09:16

Merge remote-tracking branch 'upstream/main' into jakubstec/domains/s…

890f084

…ecurity-group-details-page-group-permissions4

feat: change the way domain associated cards are being checked, add b…

829717a

…locking modal for disabled toggle

jakubstec added 2 commits May 6, 2026 12:41

fix: change translation entry to pascalCase

3866e61

fix: typecheck

206f5f5

jakubstec marked this pull request as ready for review May 6, 2026 11:10

jakubstec requested review from a team as code owners May 6, 2026 11:10

melvin-bot Bot requested review from situchan and trjExpensify and removed request for a team May 6, 2026 11:10

chatgpt-codex-connector Bot reviewed May 6, 2026

View reviewed changes

rayane-d approved these changes May 6, 2026

View reviewed changes

jakubstec added 2 commits May 6, 2026 14:40

fix: apply review change, disable Expensify Card Preferred Workspace …

3e15f59

…each time Preferred Workspace is set to false

fix: remove comment

7f1144a

trjExpensify previously approved these changes May 7, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into jakubstec/domains/sec…

f71bb4b

…urity-group-details-page-group-permissions4

situchan reviewed May 7, 2026

View reviewed changes

fix: use useConfirmModal instead of <ConfirmModal>

9d2e530

jakubstec dismissed trjExpensify’s stale review via 9d2e530 May 7, 2026 08:19

ZhenjaHorbach approved these changes May 7, 2026

View reviewed changes

Merge remote-tracking branch 'upstream/main' into jakubstec/domains/s…

8f17ddd

…ecurity-group-details-page-group-permissions4

mountiny approved these changes May 7, 2026

View reviewed changes

mountiny merged commit dfe7f59 into Expensify:main May 7, 2026
35 checks passed

mountiny mentioned this pull request May 8, 2026

Update Expensify Card preferred workspace modal copy #90005

Merged

52 tasks

OSBotify mentioned this pull request May 8, 2026

Deploy Checklist: New Expensify 2026-05-08 #90006

Closed

melvin-bot Bot mentioned this pull request May 11, 2026

[Due for payment 2026-05-18] [Due for payment 2026-05-13] [Due for payment 2026-05-12] [Due for payment 2026-05-11] [Due for payment 2026-05-07] [Domain Control] [Release 4] [FE] Create DomainSecurityGroupDetailsPage RHP #80133

Closed

		const isDisabled = !isPreferredPolicyEnabled \|\| !hasWorkspaceCard;
		const isEnabled = !isDisabled && !!group?.overridePreferredPolicyWithCardPolicy;

Conversation

jakubstec commented Apr 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Apr 24, 2026

Uh oh!

codecov Bot commented Apr 24, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jakubstec commented Apr 29, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 29, 2026

Choose a reason for hiding this comment

Uh oh!

rayane-d May 5, 2026

Choose a reason for hiding this comment

Uh oh!

jakubstec May 6, 2026

Choose a reason for hiding this comment

Uh oh!

rayane-d May 6, 2026

Choose a reason for hiding this comment

Uh oh!

jakubstec commented May 6, 2026

Uh oh!

shawnborton commented May 6, 2026

Uh oh!

melvin-bot Bot commented May 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 6, 2026

Choose a reason for hiding this comment

Uh oh!

jakubstec May 6, 2026

Choose a reason for hiding this comment

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

situchan May 7, 2026

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach May 7, 2026

Choose a reason for hiding this comment

Uh oh!

jakubstec May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

jakubstec commented May 7, 2026

Uh oh!

ZhenjaHorbach commented May 7, 2026

Uh oh!

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

jakubstec commented Apr 24, 2026 •

edited

Loading

codecov Bot commented Apr 24, 2026 •

edited by github-actions Bot

Loading

jakubstec May 7, 2026 •

edited

Loading

ZhenjaHorbach May 7, 2026 •

edited

Loading

ZhenjaHorbach commented May 7, 2026 •

edited

Loading