Check policy feature flags instead of card feeds for require company … by MobileMage · Pull Request #83696 · Expensify/App

MobileMage · 2026-02-27T14:15:20Z

Explanation of Change

Check policy feature flags (areCompanyCardsEnabled / areExpensifyCardsEnabled) instead of checking for actual card feed entries when determining whether to lock the "Require company cards for all purchases" toggle. The toggle was locked because useCardFeeds returns an empty object until a card provider is actually connected, even though the user has enabled the card features in More Features.

Fixed Issues

$ #80999
PROPOSAL: #80999 (comment)

Tests

Go to a workspace
Go to More Features and enable Rules, Company cards, and Expensify Card
Go to Rules
Verify that the "Require company cards for all purchases" toggle is NOT locked and can be toggled on/off

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

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

Screenshots/Videos

Android: Native

Kapture.2026-03-10.at.16.38.34.mp4

Android: mWeb Chrome

Kapture.2026-03-10.at.16.42.35.mp4

iOS: Native

80999-native-ios.mp4

iOS: mWeb Safari

Kapture.2026-03-10.at.16.13.12.mp4

MacOS: Chrome / Safari

Kapture.2026-02-27.at.15.11.15.mp4

…card toggle The toggle was locked because it checked for actual card feed entries which only exist after connecting a card provider. Now checks the policy's areCompanyCardsEnabled/areExpensifyCardsEnabled flags instead.

melvin-bot · 2026-02-27T14:15:27Z

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

codecov · 2026-02-27T14:22:59Z

Codecov Report

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

Files with missing lines	Coverage Δ
.../workspace/rules/IndividualExpenseRulesSection.tsx	`0.00% <0.00%> (ø)`
... and 12 files with indirect coverage changes

JmillsExpensify

Testing steps in line with intended product behavior.

jjcoffee · 2026-03-02T08:58:49Z

@MobileMage Please add screenshots for all platforms.

jjcoffee

Please ensure the condition matches the behaviour requirement here, and add screenshots for all platforms.

jjcoffee · 2026-03-09T14:59:31Z

@MobileMage Could you address the review comments? Thanks!

MobileMage · 2026-03-09T15:05:00Z

On it

MobileMage · 2026-03-09T15:05:33Z

On it

jjcoffee · 2026-03-09T15:34:47Z

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-app-2026-03-09_16.58.17.mp4

Android: mWeb Chrome

android-chrome-2026-03-09_16.55.15.mp4

iOS: HybridApp

ios-app-2026-03-09_17.00.56.mp4

iOS: mWeb Safari

ios-safari-2026-03-09_17.06.01.mp4

MacOS: Chrome / Safari

desktop-chrome-2026-03-09_16.47.31.mp4

MobileMage · 2026-03-10T17:03:21Z

Recordings added and the requirement here is also met.

MobileMage · 2026-03-11T09:20:01Z

That's odd @jjcoffee , do I reupload?

jjcoffee · 2026-03-11T09:50:13Z

@MobileMage Ah thanks for that, for some reason it doesn't show up for me but it looks like I can download them, so no worries there!

jjcoffee

LGTM!

github-actions · 2026-03-13T07:06:01Z

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

github-actions · 2026-03-13T07:10:55Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-cd053be-59ef620-3cc896fc4855ef5ba40036734a4bc5345cddb27f/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-cd053be-59ef620-fc9867cb543d5054331d0806038591fe7b07c26c/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-16T10:31:13Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.3.38-0 🚀

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

OSBotify · 2026-03-17T11:27:19Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.38-4 🚀

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

MobileMage requested review from a team as code owners February 27, 2026 14:15

melvin-bot bot assigned MobileMage Feb 27, 2026

melvin-bot bot requested review from jjcoffee and removed request for a team February 27, 2026 14:15

melvin-bot bot requested review from JmillsExpensify and removed request for a team February 27, 2026 14:15

JmillsExpensify approved these changes Feb 28, 2026

View reviewed changes

jjcoffee suggested changes Mar 4, 2026

View reviewed changes

This comment was marked as resolved.

Sign in to view

jjcoffee approved these changes Mar 11, 2026

View reviewed changes

melvin-bot bot requested a review from youssef-lr March 11, 2026 09:51

youssef-lr approved these changes Mar 13, 2026

View reviewed changes

youssef-lr merged commit cd053be into Expensify:main Mar 13, 2026
33 of 35 checks passed

OSBotify mentioned this pull request Mar 16, 2026

Deploy Checklist: New Expensify 2026-03-16 #85347

Closed

74 tasks

melvin-bot bot mentioned this pull request Mar 17, 2026

[Due for payment 2026-03-24] Workspace settings - Require company cards for all purchases locked even though Company cards and Expensify Card enabled #80999

Open

7 tasks

Conversation

MobileMage commented Feb 27, 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 Feb 27, 2026

Uh oh!

codecov bot commented Feb 27, 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!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

jjcoffee commented Mar 2, 2026

Uh oh!

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

jjcoffee commented Mar 9, 2026

Uh oh!

MobileMage commented Mar 9, 2026

Uh oh!

MobileMage commented Mar 9, 2026

Uh oh!

jjcoffee commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

MobileMage commented Mar 10, 2026

Uh oh!

This comment was marked as resolved.

MobileMage commented Mar 11, 2026

Uh oh!

jjcoffee commented Mar 11, 2026

Uh oh!

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MobileMage commented Feb 27, 2026 •

edited

Loading

codecov bot commented Feb 27, 2026 •

edited by github-actions bot

Loading

jjcoffee commented Mar 9, 2026 •

edited

Loading