Skip to content

Check policy feature flags instead of card feeds for require company … #83696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youssef-lr merged 1 commit into from
Mar 13, 2026
+1 −3
Merged

Check policy feature flags instead of card feeds for require company … #83696

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/pages/workspace/rules/IndividualExpenseRulesSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
import OfflineWithFeedback from '@components/OfflineWithFeedback';
import RenderHTML from '@components/RenderHTML';
import Section from '@components/Section';
import useCardFeeds from '@hooks/useCardFeeds';
import useEnvironment from '@hooks/useEnvironment';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
Expand Down Expand Up @@ -73,7 +72,6 @@ function IndividualExpenseRulesSection({policyID}: IndividualExpenseRulesSection
const {translate} = useLocalize();
const styles = useThemeStyles();
const policy = usePolicy(policyID);
const [cardFeeds] = useCardFeeds(policyID);
const {environmentURL} = useEnvironment();
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);

Expand Down Expand Up @@ -211,7 +209,7 @@ function IndividualExpenseRulesSection({policyID}: IndividualExpenseRulesSection

const areEReceiptsEnabled = policy?.eReceipts ?? false;
const requireCompanyCardsEnabled = policy?.requireCompanyCardsEnabled ?? false;
const disableRequireCompanyCardToggle = Object.keys(cardFeeds ?? {}).length === 0;
const disableRequireCompanyCardToggle = !policy?.areCompanyCardsEnabled && !policy?.areExpensifyCardsEnabled;

// For backwards compatibility with Expensify Classic, we assume that Attendee Tracking is enabled by default on
// Control policies if the policy does not contain the attribute
Expand Down
Loading