diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 11d8c46b711a..2edb7912e58e 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -880,7 +880,6 @@ const CONST = { TRAVEL_INVOICING: 'travelInvoicing', EXPENSIFY_CARD_EU_UK: 'expensifyCardEuUk', EUR_BILLING: 'eurBilling', - UBER_FOR_BUSINESS: 'uberForBusiness', PAY_INVOICE_VIA_EXPENSIFY: 'payInvoiceViaExpensify', SUGGESTED_FOLLOWUPS: 'suggestedFollowups', GUSTO: 'gustoNewDot', diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx index 4596a45b418e..e3551ebc95f5 100644 --- a/src/pages/workspace/WorkspaceInitialPage.tsx +++ b/src/pages/workspace/WorkspaceInitialPage.tsx @@ -170,7 +170,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac [CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED]: policy?.areRulesEnabled, [CONST.POLICY.MORE_FEATURES.ARE_INVOICES_ENABLED]: policy?.areInvoicesEnabled, [CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED]: policy?.arePerDiemRatesEnabled && canPolicyAccessFeature(policy, CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED), - [CONST.POLICY.MORE_FEATURES.ARE_RECEIPT_PARTNERS_ENABLED]: isBetaEnabled(CONST.BETAS.UBER_FOR_BUSINESS) && (policy?.receiptPartners?.enabled ?? false), + [CONST.POLICY.MORE_FEATURES.ARE_RECEIPT_PARTNERS_ENABLED]: policy?.receiptPartners?.enabled ?? false, [CONST.POLICY.MORE_FEATURES.IS_TRAVEL_ENABLED]: policy?.isTravelEnabled, [CONST.POLICY.MORE_FEATURES.IS_TIME_TRACKING_ENABLED]: isTimeTrackingEnabled(policy), } as PolicyFeatureStates; diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx index 3b60d14fa0e2..0ae26abcb8eb 100644 --- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx +++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx @@ -475,41 +475,39 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro }, ]; - if (isBetaEnabled(CONST.BETAS.UBER_FOR_BUSINESS)) { - integrateItems.push({ - icon: illustrations.ReceiptPartners, - titleTranslationKey: 'workspace.moreFeatures.receiptPartners.title', - subtitleTranslationKey: 'workspace.moreFeatures.receiptPartners.subtitle', - isActive: policy?.receiptPartners?.enabled ?? false, - pendingAction: policy?.pendingFields?.receiptPartners, - disabledAction: () => { - if (!isUberConnected) { - return; - } - setIsReceiptPartnersWarningModalOpen(true); - }, - action: (isEnabled: boolean) => { - if (!policyID) { - return; - } - enablePolicyReceiptPartners(policyID, isEnabled); - }, - disabled: isUberConnected, - errors: getLatestErrorField(policy ?? {}, CONST.POLICY.MORE_FEATURES.ARE_RECEIPT_PARTNERS_ENABLED), - onCloseError: () => { - if (!policyID) { - return; - } - clearPolicyErrorField(policyID, CONST.POLICY.MORE_FEATURES.ARE_RECEIPT_PARTNERS_ENABLED); - }, - onPress: () => { - if (!policyID) { - return; - } - Navigation.navigate(ROUTES.WORKSPACE_RECEIPT_PARTNERS.getRoute(policyID)); - }, - }); - } + integrateItems.push({ + icon: illustrations.ReceiptPartners, + titleTranslationKey: 'workspace.moreFeatures.receiptPartners.title', + subtitleTranslationKey: 'workspace.moreFeatures.receiptPartners.subtitle', + isActive: policy?.receiptPartners?.enabled ?? false, + pendingAction: policy?.pendingFields?.receiptPartners, + disabledAction: () => { + if (!isUberConnected) { + return; + } + setIsReceiptPartnersWarningModalOpen(true); + }, + action: (isEnabled: boolean) => { + if (!policyID) { + return; + } + enablePolicyReceiptPartners(policyID, isEnabled); + }, + disabled: isUberConnected, + errors: getLatestErrorField(policy ?? {}, CONST.POLICY.MORE_FEATURES.ARE_RECEIPT_PARTNERS_ENABLED), + onCloseError: () => { + if (!policyID) { + return; + } + clearPolicyErrorField(policyID, CONST.POLICY.MORE_FEATURES.ARE_RECEIPT_PARTNERS_ENABLED); + }, + onPress: () => { + if (!policyID) { + return; + } + Navigation.navigate(ROUTES.WORKSPACE_RECEIPT_PARTNERS.getRoute(policyID)); + }, + }); if (isBetaEnabled(CONST.BETAS.GUSTO)) { integrateItems.push({ @@ -723,23 +721,21 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro confirmText={translate('workspace.moreFeatures.connectionsWarningModal.manageSettings')} cancelText={translate('common.cancel')} /> - {isBetaEnabled(CONST.BETAS.UBER_FOR_BUSINESS) && ( - { - if (!policyID) { - return; - } - setIsReceiptPartnersWarningModalOpen(false); - // TODO: Navigate to Receipt Partners settings page when it exists - // Navigation.navigate(ROUTES.POLICY_RECEIPT_PARTNERS.getRoute(policyID)); - }} - isVisible={isReceiptPartnersWarningModalOpen} - prompt={translate('workspace.moreFeatures.receiptPartnersWarningModal.disconnectText')} - confirmText={translate('workspace.moreFeatures.receiptPartnersWarningModal.confirmText')} - shouldShowCancelButton={false} - /> - )} + { + if (!policyID) { + return; + } + setIsReceiptPartnersWarningModalOpen(false); + // TODO: Navigate to Receipt Partners settings page when it exists + // Navigation.navigate(ROUTES.POLICY_RECEIPT_PARTNERS.getRoute(policyID)); + }} + isVisible={isReceiptPartnersWarningModalOpen} + prompt={translate('workspace.moreFeatures.receiptPartnersWarningModal.disconnectText')} + confirmText={translate('workspace.moreFeatures.receiptPartnersWarningModal.confirmText')} + shouldShowCancelButton={false} + />