Skip to content

Fix card admin card flows#93478

Merged
flodnv merged 12 commits into
Expensify:mainfrom
ShridharGoel:ws1.4-fixes
Jun 15, 2026
Merged

Fix card admin card flows#93478
flodnv merged 12 commits into
Expensify:mainfrom
ShridharGoel:ws1.4-fixes

Conversation

@ShridharGoel

@ShridharGoel ShridharGoel commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This fixes a few card admin permission gaps in workspace card flows.

Card admins can no longer enable Expensify Card from the Company cards banner unless they can edit More features. The Expensify Card detail page no longer shows Edit spend rules when Rules are disabled. The issue card flow no longer offers card admins the option to invite a non-member.

Fixed Issues

$ #93508, #93506, #93501
PROPOSAL:

Tests

  1. As a card admin, open Workspace settings > Company cards on a workspace where Expensify Card is not enabled.
  2. Click Learn more on the Get the Expensify Card banner and verify Expensify Card is not enabled.
  3. As a card admin, open Workspace settings > Expensify Card > any card with Rules disabled.
  4. Verify Edit spend rules is not shown.
  5. As a card admin, click Issue card and search for an email that is not a workspace member.
  6. Verify the invite option is not shown and the Not here page does not open.
  • Verify that no errors appear in the JS console

Offline tests

  1. Open the same card admin pages while offline.
  2. Verify no new offline-only errors are shown and existing offline blocking behavior is unchanged.

QA Steps

  1. As a card admin, open Workspace settings > Company cards on a workspace where Expensify Card is not enabled.
  2. Click Learn more on the Get the Expensify Card banner and verify Expensify Card is not enabled.
  3. As a card admin, open Workspace settings > Expensify Card > any card with Rules disabled.
  4. Verify Edit spend rules is not shown.
  5. As a card admin, click Issue card and search for an email that is not a workspace member.
  6. Verify the invite option is not shown and the Not here page does not open.
  • 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
    • 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

MacOS: Chrome / Safari
Screen.Recording.2026-06-13.at.2.19.54.PM.mov

@codecov

codecov Bot commented Jun 12, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
...rkspaceCompanyCardExpensifyCardPromotionBanner.tsx 0.00% <0.00%> (ø)
...xpensifyCard/WorkspaceExpensifyCardDetailsPage.tsx 0.00% <0.00%> (ø)
.../workspace/expensifyCard/issueNew/AssigneeStep.tsx 0.00% <0.00%> (ø)
... and 177 files with indirect coverage changes

@melvin-bot

melvin-bot Bot commented Jun 12, 2026

Copy link
Copy Markdown

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:

  1. Look at the code and make sure there are no malicious changes.
  2. 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

@ShridharGoel ShridharGoel marked this pull request as ready for review June 12, 2026 22:22
@ShridharGoel ShridharGoel requested review from a team as code owners June 12, 2026 22:22
@melvin-bot melvin-bot Bot requested review from arosiclair and flaviadefaria and removed request for a team June 12, 2026 22:22
@melvin-bot

melvin-bot Bot commented Jun 12, 2026

Copy link
Copy Markdown

@arosiclair 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 June 12, 2026 22:23
@ShridharGoel ShridharGoel mentioned this pull request Jun 12, 2026
51 tasks
@ShridharGoel

Copy link
Copy Markdown
Contributor Author

@Pujan92

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4ab41f3031

ℹ️ 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".

Comment thread src/pages/workspace/companyCards/BankConnection/index.tsx Outdated
Comment thread src/pages/workspace/companyCards/BankConnection/index.native.tsx Outdated
Comment thread src/pages/workspace/companyCards/BankConnection/index.tsx Outdated
Comment thread src/pages/workspace/companyCards/BankConnection/index.native.tsx Outdated
Comment thread src/pages/workspace/companyCards/BankConnection/index.native.tsx Outdated
Comment thread src/pages/workspace/companyCards/BankConnection/index.tsx Outdated
@ShridharGoel

Copy link
Copy Markdown
Contributor Author

@codex review

const policyID = policy?.id;
const areExpensifyCardsEnabled = policy?.areExpensifyCardsEnabled;
const canUseLearnMore = areExpensifyCardsEnabled ? canWriteCompanyCards : canWriteMoreFeatures;
const handleReadOnlyAction = areExpensifyCardsEnabled ? onReadOnlyAction : showMoreFeaturesReadOnlyModal;

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.

Aren't both methods the same?

Also, earlier we decided to use

const canUseLearnMore = areExpensifyCardsEnabled && canWriteCompanyCards;

any issue with that?

@ShridharGoel ShridharGoel Jun 15, 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.

Also, earlier we decided to use
const canUseLearnMore = areExpensifyCardsEnabled && canWriteCompanyCards;
any issue with that?

areExpensifyCardsEnabled && canWriteCompanyCards -> false && true will give false.

So when Expensify Card is not enabled yet, nobody can use Learn more, even a workspace admin who has permission to enable it.

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.

Aren't both methods the same?

Yes, updated

@flodnv flodnv requested review from flodnv and removed request for arosiclair and flaviadefaria June 15, 2026 10:35

@Pujan92 Pujan92 left a comment

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.

LGTM!

@melvin-bot melvin-bot Bot requested a review from flodnv June 15, 2026 12:20
@flodnv

flodnv commented Jun 15, 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 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

@Pujan92

Pujan92 commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Oops, I forgot to fill the checklist. Thanks!

@flodnv flodnv merged commit 4f6abad into Expensify:main Jun 15, 2026
33 of 35 checks passed
@flodnv

flodnv commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

CP requested!

@github-actions

Copy link
Copy Markdown
Contributor

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

@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 Jun 15, 2026
Fix card admin card flows

(cherry picked from commit 4f6abad)

(cherry-picked to staging by puneetlath)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jun 15, 2026
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.4.7-2 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

I reviewed the changes in this PR against the help articles under docs/articles and confirmed that no updates to Expensify's help site are needed.

Why: This PR is a set of permission-gating bug fixes for card admins in the workspace card flows — it restricts actions that shouldn't have been available to that sub-role, rather than adding or changing any documented, user-facing workflow:

  • Company cards banner — Learn more / enabling Expensify Card is now gated behind More features write access.
  • Expensify Card details page — Edit spend rules is hidden when Rules is disabled.
  • Issue card flow — card admins without Members write access can no longer invite a non-member.

What I checked: The relevant help articles (Set-Up-and-Manage-the-Expensify-Card.md, Cardholder-Settings-and-Features.md, and the company card articles) are written for workspace admins with full permissions. They don't document the granular card-admin permission boundaries this PR refines, and none of them make claims that now contradict the new behavior — e.g. the Issue Expensify Cards steps say to "Select the employee" and never describe inviting a non-member.

Since no documentation changes are required, I did not create a draft help site PR.

@ShridharGoel, please confirm this assessment matches the intended behavior. If you believe a help article should be updated to call out these card-admin permission requirements, let me know and I'll draft a help site PR.

@IuliiaHerets

Copy link
Copy Markdown

v9.4.7-4
Windows 11 / Chrome
Step 7 has failed. tried with Mock bank, the newly opened window doesn't work properly. Also tried with another bank account and finished the Plaid flow, the add card flow is loading infinitely after navigating back to ND. Should I log this issue?

The other steps are passed

card.admin.mp4

@ShridharGoel

Copy link
Copy Markdown
Contributor Author

That will be a backend fix, removed those last 2 steps.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.7-4 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

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

Why:

This PR is a permission-gating bug fix. It restricts a narrower "card admin" role (a member granted Expensify Card write access but not More features or Members write access) from:

  • Using Learn more on the company cards Expensify Card promotion banner unless they can edit More features
  • Seeing Edit spend rules on the Expensify Card details page when Rules are disabled
  • Inviting a non-member during the Issue card flow

None of these behaviors are documented in the help site:

  • Every relevant article (e.g. Set-Up-and-Manage-the-Expensify-Card.md) is written from the Workspace Admin perspective with full access. A Workspace Admin's behavior is unchanged by this PR, so the documented flows remain accurate.
  • There is no article documenting the partial-permission "card admin" role (grep -rin "card admin" in docs/articles returns nothing).
  • The affected UI elements (the Edit spend rules menu item, the promotion banner gating, and inviting a non-member during issuance) are not described in any help article.

Since this only corrects who can perform existing actions — and doesn't add, remove, or rename any user-facing feature documented on the help site — no draft PR was created.

@ShridharGoel, if you believe a help article should still be updated (for example, to document the granular card admin permission model), let me know and I'll draft the PR.

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.8-3 🚀

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

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.

6 participants