Merge pull request #88104 from Expensify/rodrigo-retry-cardprovisioning

blimpich · web-flow · commit d296b0e997ce · 2026-04-16T16:50:54.000-07:00
diff --git a/Mobile-Expensify b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 39d2ae225db9ccfb3f4c764dc001f3b36c0f73d1
+Subproject commit 4f35ca2a3d6b878e51f941f15329d058b49e7457
diff --git a/src/components/Domain/FormHelpMessageRowWithRetryButton.tsx b/src/components/Domain/FormHelpMessageRowWithRetryButton.tsx
@@ -15,25 +15,32 @@ type FormHelpMessageRowWithRetryButtonProps = {
 
     /** Whether the retry button's size should be "small". If not, then the size is "medium". */
     isButtonSmall?: boolean;
+
+    /** Whether the retry button should use danger styling. */
+    danger?: boolean;
+
+    /** Whether the retry button should stay next to the message instead of being pushed to the far edge. */
+    shouldAlignButtonToMessage?: boolean;
 };
 
-function FormHelpMessageRowWithRetryButton({message, isButtonSmall = false, onRetry}: FormHelpMessageRowWithRetryButtonProps) {
+function FormHelpMessageRowWithRetryButton({message, isButtonSmall = false, onRetry, danger = false, shouldAlignButtonToMessage = false}: FormHelpMessageRowWithRetryButtonProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
 
     return (
-        <View style={[styles.flexRow, styles.justifyContentBetween, styles.gap3]}>
+        <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap3, shouldAlignButtonToMessage ? styles.justifyContentStart : styles.justifyContentBetween]}>
             <FormHelpMessage
                 message={message}
-                style={[styles.mt0, styles.mb0, styles.flex1]}
+                style={[styles.mt0, styles.mb0, shouldAlignButtonToMessage ? styles.flexShrink1 : styles.flex1]}
             />
             <Button
                 small={isButtonSmall}
                 medium={!isButtonSmall}
                 text={translate('domain.retry')}
                 onPress={onRetry}
                 isDisabled={isOffline}
+                danger={danger}
             />
         </View>
     );
diff --git a/src/languages/de.ts b/src/languages/de.ts
@@ -5520,6 +5520,8 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
                             reduceLimitTitle: 'Reise-Ausgabelimit reduzieren?',
                             reduceLimitWarning:
                                 'Wenn Sie das Limit reduzieren, können Mitglieder, die diesen Betrag bereits überschritten haben, bis zum nächsten Monat keine neuen Reisebuchungen vornehmen.',
+                            provisioningError:
+                                'Wir konnten einige Mitglieder Ihres Arbeitsbereichs nicht für die zentrale Rechnungsstellung einrichten. Bitte versuchen Sie es später erneut oder wenden Sie sich für Unterstützung an Concierge.',
                         },
                     },
                     disableModal: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -5527,6 +5527,8 @@ const translations = {
                             monthlySpendLimitDescription: 'The maximum amount each member can spend on travel per month.',
                             reduceLimitTitle: 'Reduce travel spend limit?',
                             reduceLimitWarning: 'If you reduce the limit, members who have already spent more than this amount will be unable to make new travel bookings until next month.',
+                            provisioningError:
+                                "We weren't able to provision some of the members of your workspace for central invoicing. Please try again later or reach out to Concierge for assistance.",
                         },
                     },
                     disableModal: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -5373,6 +5373,8 @@ ${amount} para ${merchant} - ${date}`,
                             monthlySpendLimitDescription: 'El monto máximo que cada miembro puede gastar en viajes por mes.',
                             reduceLimitTitle: '¿Reducir el límite de gasto en viajes?',
                             reduceLimitWarning: 'Si reduces el límite, los miembros que ya hayan gastado más de este monto no podrán hacer nuevas reservas de viaje hasta el próximo mes.',
+                            provisioningError:
+                                'No pudimos aprovisionar a algunos de los miembros de tu espacio de trabajo para la facturación centralizada. Por favor, inténtalo de nuevo más tarde o contacta con Concierge para obtener ayuda.',
                         },
                     },
                     disableModal: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
@@ -5535,9 +5535,11 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
                                 'Fréquence à laquelle Expensify prélèvera sur votre compte bancaire professionnel pour régler les transactions récentes d’Expensify Travel.',
                             monthlySpendLimitLabel: 'Limite de dépenses mensuelle par membre',
                             monthlySpendLimitDescription: 'Le montant maximum que chaque membre peut dépenser en déplacements par mois.',
-                            reduceLimitTitle: 'Réduire la limite de dépenses de voyage\u00A0?',
+                            reduceLimitTitle: 'Réduire la limite de dépenses de voyage ?',
                             reduceLimitWarning:
                                 'Si vous réduisez la limite, les membres ayant déjà dépensé plus que ce montant ne pourront pas effectuer de nouvelles réservations de voyage avant le mois prochain.',
+                            provisioningError:
+                                'Nous n’avons pas pu configurer certains membres de votre espace de travail pour la facturation centralisée. Veuillez réessayer plus tard ou contacter Concierge pour obtenir de l’aide.',
                         },
                     },
                     disableModal: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
@@ -5509,6 +5509,8 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
                             reduceLimitTitle: 'Ridurre il limite di spesa per i viaggi?',
                             reduceLimitWarning:
                                 'Se riduci il limite, i membri che hanno già speso più di questo importo non potranno effettuare nuove prenotazioni di viaggio fino al mese prossimo.',
+                            provisioningError:
+                                'Non siamo riusciti a configurare alcuni membri del tuo spazio di lavoro per la fatturazione centralizzata. Riprova più tardi o contatta Concierge per assistenza.',
                         },
                     },
                     disableModal: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
@@ -5446,6 +5446,8 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
                             monthlySpendLimitDescription: '各メンバーが1か月に出張に使える最大金額。',
                             reduceLimitTitle: '出張支出上限を引き下げますか？',
                             reduceLimitWarning: 'この上限を引き下げると、すでにこの金額を超えて支出しているメンバーは、翌月まで新しい出張予約ができなくなります。',
+                            provisioningError:
+                                'ワークスペース内の一部メンバーを集中請求用にプロビジョニングできませんでした。時間をおいてもう一度お試しいただくか、サポートが必要な場合は Concierge までお問い合わせください。',
                         },
                     },
                     disableModal: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
@@ -5495,6 +5495,8 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
                             monthlySpendLimitDescription: 'Het maximale bedrag dat elk lid per maand aan reizen kan besteden.',
                             reduceLimitTitle: 'Reisbestedingslimiet verlagen?',
                             reduceLimitWarning: 'Als u het limiet verlaagt, kunnen leden die dit bedrag al hebben overschreden geen nieuwe reisboekingen maken tot volgende maand.',
+                            provisioningError:
+                                'We konden sommige leden van je workspace niet instellen voor centrale facturatie. Probeer het later opnieuw of neem contact op met Concierge voor hulp.',
                         },
                     },
                     disableModal: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
@@ -5483,6 +5483,8 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
                             reduceLimitTitle: 'Zmniejszyć limit wydatków na podróże?',
                             reduceLimitWarning:
                                 'Jeśli zmniejszysz limit, członkowie, którzy już wydali więcej niż ta kwota, nie będą mogli dokonywać nowych rezerwacji podróży do następnego miesiąca.',
+                            provisioningError:
+                                'Nie udało się skonfigurować części członków twojej przestrzeni roboczej do scentralizowanego fakturowania. Spróbuj ponownie później albo skontaktuj się z Concierge, żeby uzyskać pomoc.',
                         },
                     },
                     disableModal: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
@@ -5490,6 +5490,8 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
                             monthlySpendLimitDescription: 'O valor máximo que cada membro pode gastar em viagens por mês.',
                             reduceLimitTitle: 'Reduzir o limite de gastos com viagens?',
                             reduceLimitWarning: 'Se você reduzir o limite, os membros que já gastaram mais do que esse valor não poderão fazer novas reservas de viagem até o próximo mês.',
+                            provisioningError:
+                                'Não conseguimos provisionar alguns membros do seu workspace para faturamento centralizado. Tente novamente mais tarde ou entre em contato com o Concierge para obter ajuda.',
                         },
                     },
                     disableModal: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
@@ -5359,6 +5359,7 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
                             monthlySpendLimitDescription: '每位成员每月可用于出差的最高金额。',
                             reduceLimitTitle: '降低出差支出限额？',
                             reduceLimitWarning: '如果您降低限额，已超出该金额的成员将无法进行新的出差预订，直至下个月。',
+                            provisioningError: '我们无法为您工作区中的部分成员开通集中开票功能。请稍后重试或联系 Concierge 获得协助。',
                         },
                     },
                     disableModal: {title: '关闭差旅开票？', body: '即将到来的酒店和汽车租赁预订可能需要使用不同的付款方式重新预订，以避免被取消。', confirm: '关闭'},
diff --git a/src/libs/API/parameters/RetryTravelCardsProvisioningParams.ts b/src/libs/API/parameters/RetryTravelCardsProvisioningParams.ts
@@ -0,0 +1,5 @@
+type RetryTravelCardsProvisioningParams = {
+    readonly policyID: string;
+};
+
+export default RetryTravelCardsProvisioningParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
@@ -394,6 +394,7 @@ export type {default as SetTravelInvoicingSettlementAccountParams} from './SetTr
 export type {default as PayTravelInvoicingSpendParams} from './PayTravelInvoicingSpendParams';
 export type {default as UpdateTravelInvoicingMonthlyLimitParams} from './UpdateTravelInvoicingMonthlyLimitParams';
 export type {default as UpdateTravelInvoicingSettlementFrequencyParams} from './UpdateTravelInvoicingSettlementFrequencyParams';
+export type {default as RetryTravelCardsProvisioningParams} from './RetryTravelCardsProvisioningParams';
 export type {default as GetTravelInvoiceStatementPDFParams} from './GetTravelInvoiceStatementPDFParams';
 export type {default as ExportTravelInvoiceStatementCSVParams} from './ExportTravelInvoiceStatementCSVParams';
 export type {default as SetCompanyCardFeedName} from './SetCompanyCardFeedName';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
@@ -489,6 +489,7 @@ const WRITE_COMMANDS = {
     UPDATE_TRAVEL_INVOICE_SETTLEMENT_FREQUENCY: 'UpdateTravelInvoiceSettlementFrequency',
     UPDATE_TRAVEL_INVOICING_MONTHLY_LIMIT: 'UpdateTravelInvoicingMonthlyLimit',
     PAY_TRAVEL_INVOICING_SPEND: 'PayTravelInvoicingSpend',
+    RETRY_TRAVEL_CARDS_PROVISIONING: 'RetryTravelCardsProvisioning',
     UPDATE_XERO_IMPORT_TRACKING_CATEGORIES: 'UpdateXeroImportTrackingCategories',
     UPDATE_XERO_IMPORT_TAX_RATES: 'UpdateXeroImportTaxRates',
     UPDATE_XERO_TENANT_ID: 'UpdateXeroTenantID',
@@ -1100,6 +1101,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_TRAVEL_INVOICE_SETTLEMENT_FREQUENCY]: Parameters.UpdateTravelInvoicingSettlementFrequencyParams;
     [WRITE_COMMANDS.UPDATE_TRAVEL_INVOICING_MONTHLY_LIMIT]: Parameters.UpdateTravelInvoicingMonthlyLimitParams;
     [WRITE_COMMANDS.PAY_TRAVEL_INVOICING_SPEND]: Parameters.PayTravelInvoicingSpendParams;
+    [WRITE_COMMANDS.RETRY_TRAVEL_CARDS_PROVISIONING]: Parameters.RetryTravelCardsProvisioningParams;
     [WRITE_COMMANDS.SET_PERSONAL_DETAILS_AND_SHIP_EXPENSIFY_CARDS]: Parameters.SetPersonalDetailsAndShipExpensifyCardsParams;
     [WRITE_COMMANDS.SELF_TOUR_VIEWED]: null;
 
diff --git a/src/libs/actions/TravelInvoicing.ts b/src/libs/actions/TravelInvoicing.ts
@@ -8,6 +8,7 @@ import type {
     DeactivateTravelInvoicingParams,
     OpenPolicyTravelPageParams,
     PayTravelInvoicingSpendParams,
+    RetryTravelCardsProvisioningParams,
     SetTravelInvoicingSettlementAccountParams,
     UpdateTravelInvoicingMonthlyLimitParams,
     UpdateTravelInvoicingSettlementFrequencyParams,
@@ -396,6 +397,46 @@ function clearTravelInvoicingErrors(workspaceAccountID: number) {
     });
 }
 
+/**
+ * Retries travel card provisioning for workspace members that failed.
+ * Optimistically clears provisioning errors and restores the previous banner if the retry fails.
+ */
+function retryTravelCardsProvisioning(policyID: string, workspaceAccountID: number, currentProvisioningErrors: string[]) {
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`,
+            value: {
+                settings: {
+                    travelInvoicing: {
+                        errors: [],
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`,
+            value: {
+                settings: {
+                    travelInvoicing: {
+                        errors: [...currentProvisioningErrors],
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: RetryTravelCardsProvisioningParams = {
+        policyID,
+    };
+
+    API.write(WRITE_COMMANDS.RETRY_TRAVEL_CARDS_PROVISIONING, params, {optimisticData, failureData});
+}
+
 /**
  * Pays the outstanding Travel Invoicing balance for a workspace.
  * Optimistically sets the manual billing flag to true (payment queued state).
@@ -590,6 +631,7 @@ export {
     configureTravelInvoicingForPolicy,
     deactivateTravelInvoicing,
     clearTravelInvoicingErrors,
+    retryTravelCardsProvisioning,
     updateTravelInvoicingMonthlyLimit,
     clearTravelInvoicingMonthlyLimitErrors,
 };
diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx
@@ -2,6 +2,7 @@ import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
+import FormHelpMessageRowWithRetryButton from '@components/Domain/FormHelpMessageRowWithRetryButton';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -21,6 +22,7 @@ import {
     configureTravelInvoicingForPolicy,
     deactivateTravelInvoicing,
     payTravelInvoicingSpend,
+    retryTravelCardsProvisioning,
 } from '@libs/actions/TravelInvoicing';
 import {getLastFourDigits} from '@libs/BankAccountUtils';
 import {getCardSettings, getEligibleBankAccountsForCard} from '@libs/CardUtils';
@@ -80,6 +82,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
     const [reimbursementAccount] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT);
     const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
+    const [domainMemberData] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
 
     // Resolve travel-specific settings from the shared card settings key
     const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US);
@@ -138,6 +141,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec
     const isTravelInvoicingEnabled = getIsTravelInvoicingEnabled(travelSettings);
     const isOnWaitlist = !!cardOnWaitlist;
     const isLoading = !!cardSettings?.isLoading;
+    const hasTravelProvisioningErrors = isTravelInvoicingEnabled && !!domainMemberData?.settings?.travelInvoicing?.errors?.length;
 
     /**
      * Opens the pay balance confirmation modal.
@@ -276,6 +280,17 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec
 
     const centralInvoicingSubMenuItems = (
         <>
+            {hasTravelProvisioningErrors && (
+                <View style={styles.mt4}>
+                    <FormHelpMessageRowWithRetryButton
+                        message={translate('workspace.moreFeatures.travel.travelInvoicing.centralInvoicingSection.subsections.provisioningError')}
+                        isButtonSmall
+                        onRetry={() => retryTravelCardsProvisioning(policyID, workspaceAccountID, domainMemberData?.settings?.travelInvoicing?.errors ?? [])}
+                        danger
+                        shouldAlignButtonToMessage
+                    />
+                </View>
+            )}
             <View style={[styles.dFlex, styles.flexRow, styles.mt6, styles.gap4, styles.alignItemsCenter]}>
                 <View style={styles.flex1}>
                     <MenuItemWithTopDescription
diff --git a/src/types/onyx/CardFeeds.ts b/src/types/onyx/CardFeeds.ts
@@ -238,6 +238,12 @@ type CardFeeds = {
 
         /** List of member emails exempt from the domain's 2FA requirement */
         twoFactorAuthExemptEmails?: string[];
+
+        /** Travel invoicing provisioning data */
+        travelInvoicing?: {
+            /** Provisioning errors for workspace members */
+            errors?: string[];
+        };
     };
 } & CardFeedsStatus &
     DomainSettings;
diff --git a/tests/unit/TravelInvoicingTest.ts b/tests/unit/TravelInvoicingTest.ts
