diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index b419431bbbb3..9311c10d72fd 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -2630,7 +2630,7 @@ function enableExpensifyCard(policyID: string, enabled: boolean) { } } -function enableCompanyCards(policyID: string, enabled: boolean) { +function enableCompanyCards(policyID: string, enabled: boolean, disableRedirect = false) { const authToken = NetworkStore.getAuthToken(); const onyxData: OnyxData = { @@ -2675,7 +2675,7 @@ function enableCompanyCards(policyID: string, enabled: boolean) { API.write(WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS, parameters, onyxData); - if (enabled && getIsNarrowLayout()) { + if (enabled && getIsNarrowLayout() && !disableRedirect) { navigateWhenEnableFeature(policyID); } } diff --git a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx index 2a744ce4bd2d..2bec17e0c580 100644 --- a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx +++ b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx @@ -74,7 +74,7 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) { Policy.enablePolicyRules(policyID, true, true); break; case CONST.UPGRADE_FEATURE_INTRO_MAPPING.companyCards.id: - Policy.enableCompanyCards(policyID, true); + Policy.enableCompanyCards(policyID, true, true); break; default: }