diff --git a/src/languages/de.ts b/src/languages/de.ts index 98c4c3d8d97a..774fb1f37745 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -2768,6 +2768,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute: string) => `Bitte beheben Sie diese Verbindung in Firmenkarten`, askAdminToFixConnection: 'Bitte bitten Sie eine(n) Admin, diese Verbindung zu reparieren', reconnectBank: 'Ihre Bankverbindung muss erneut authentifiziert werden', + pending: 'Ausstehend', }, bankAccountStatus: { active: 'Aktiv', diff --git a/src/languages/el.ts b/src/languages/el.ts index bb06f389c27e..fe40a0eb172d 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -2826,6 +2826,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute: string) => `Παρακαλούμε διορθώστε αυτήν τη σύνδεση στις εταιρικές κάρτες`, askAdminToFixConnection: 'Παρακαλούμε ζητήστε από έναν διαχειριστή να διορθώσει αυτήν τη σύνδεση', reconnectBank: 'Η σύνδεσή σας με την τράπεζα χρειάζεται επαναπιστοποίηση', + pending: 'Σε εκκρεμότητα', }, bankAccountStatus: { active: 'Ενεργό', diff --git a/src/languages/en.ts b/src/languages/en.ts index 66a041a63f90..4a6d47b59953 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -2840,6 +2840,7 @@ const translations = { cardStatus: { active: 'Active', inactive: 'Inactive', + pending: 'Pending', fixConnection: 'Please fix this connection', fixConnectionIn: (companyCardsRoute: string) => `Please fix this connection in company cards`, askAdminToFixConnection: 'Please ask an admin to fix this connection', diff --git a/src/languages/es.ts b/src/languages/es.ts index e4b5f48f814a..fea7bac9814c 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -2688,6 +2688,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute) => `Por favor, corrige esta conexión en tarjetas de la empresa`, askAdminToFixConnection: 'Pídele a un administrador que solucione esta conexión', reconnectBank: 'Tu conexión bancaria necesita volver a autenticarse', + pending: 'Pendiente', }, bankAccountStatus: { active: 'Activo', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index e134bdbd6dc7..67be1b9db5f0 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -2774,6 +2774,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute: string) => `Veuillez corriger cette connexion dans cartes d’entreprise`, askAdminToFixConnection: 'Veuillez demander à un administrateur de corriger cette connexion', reconnectBank: 'Votre connexion bancaire doit être réauthentifiée', + pending: 'En attente', }, bankAccountStatus: { active: 'Actif', diff --git a/src/languages/it.ts b/src/languages/it.ts index a8a4651a443b..eeee633f1d5e 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -2758,6 +2758,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute: string) => `Correggi questa connessione in carte aziendali`, askAdminToFixConnection: 'Chiedi a un amministratore di correggere questa connessione', reconnectBank: 'La connessione con la tua banca deve essere nuovamente autenticata', + pending: 'In sospeso', }, bankAccountStatus: { active: 'Attiva', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 2f1660e46af6..10cd1158e1b2 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -2736,6 +2736,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute: string) => `この接続を会社カードで修正してください`, askAdminToFixConnection: '管理者にこの接続の修正を依頼してください', reconnectBank: '銀行連携の再認証が必要です', + pending: '保留中', }, bankAccountStatus: { active: 'アクティブ', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 416aed362a28..bbfac9877fbf 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -2761,6 +2761,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute: string) => `Repareer deze verbinding in bedrijfskaarten`, askAdminToFixConnection: 'Vraag een/beheerder om deze verbinding te herstellen', reconnectBank: 'Je bankverbinding moet opnieuw worden geverifieerd', + pending: 'In behandeling', }, bankAccountStatus: { active: 'Actief', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 8a04e87cbe79..be5e425e8e84 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -2795,6 +2795,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute: string) => `Napraw to połączenie w firmowe karty`, askAdminToFixConnection: 'Poproś administratora o naprawienie tego połączenia', reconnectBank: 'Twoje połączenie z bankiem wymaga ponownego uwierzytelnienia', + pending: 'Oczekujące', }, bankAccountStatus: { active: 'Aktywne', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 283c4ecb5cf4..1a2a6a8338a2 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -2753,6 +2753,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute: string) => `Corrija esta conexão em cartões corporativos`, askAdminToFixConnection: 'Peça para um administrador corrigir essa conexão', reconnectBank: 'Sua conexão bancária precisa ser autenticada novamente', + pending: 'Pendente', }, bankAccountStatus: { active: 'Ativo', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 2fc7a5ca7435..c5f3c418c8a5 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -2663,6 +2663,7 @@ const translations: TranslationDeepObject = { fixConnectionIn: (companyCardsRoute: string) => `请在公司卡中修复此连接`, askAdminToFixConnection: '请联系管理员修复此连接', reconnectBank: '您的银行连接需要重新验证', + pending: '待处理', }, bankAccountStatus: { active: '活跃', diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts index c5d12a1cc785..a30236e64bbc 100644 --- a/src/libs/CardUtils.ts +++ b/src/libs/CardUtils.ts @@ -136,6 +136,7 @@ type CardConnectionStatusDisplayParams = { isCardBroken: boolean; shouldShowRBR: boolean; isCardInactive: boolean; + isCardPending: boolean; isExpensifyCard: boolean; isPersonalCard: boolean; isAdminForCardPolicy: boolean; @@ -1439,6 +1440,7 @@ function getCardConnectionStatusDisplay({ isCardBroken, shouldShowRBR, isCardInactive: isCardInactiveStatus, + isCardPending: isCardPendingStatus, isExpensifyCard: isExpensifyCardStatus, isPersonalCard: isPersonalCardStatus, isAdminForCardPolicy, @@ -1454,10 +1456,15 @@ function getCardConnectionStatusDisplay({ // is right for it in any state. It still reports its status so the row keeps the background, hover and press // styling every other row in the list gets, which hangs off the status being present rather than the message. if (isExpensifyCardStatus) { - return { - statusKey: isCardInactiveStatus ? 'walletPage.cardStatus.inactive' : 'walletPage.cardStatus.active', - statusTone: isCardInactiveStatus ? 'default' : 'success', - }; + if (isCardInactiveStatus) { + return {statusKey: 'walletPage.cardStatus.inactive', statusTone: 'default'}; + } + // A card waiting to be issued or activated cannot be spent on yet. It shares the tone with a pending bank + // account, so the wallet reads the same way whichever kind of row the status is on. + if (isCardPendingStatus) { + return {statusKey: 'walletPage.cardStatus.pending', statusTone: 'danger'}; + } + return {statusKey: 'walletPage.cardStatus.active', statusTone: 'success'}; } const shouldShowMessage = isCardBroken || shouldShowRBR || isCardInactiveStatus; @@ -1724,6 +1731,22 @@ function isCardPendingActivate(card?: Card) { return card?.state === CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED; } +/** The two states a card passes through before it can be spent on, whether or not the cardholder can act on them. */ +function isCardPendingIssueOrActivation(card?: Card) { + return isCardPendingIssue(card) || isCardPendingActivate(card); +} + +/** + * True when an Expensify Card is waiting to be issued or activated and so cannot be spent on yet. + * + * Those two states describe a physical card on its way to the cardholder. A virtual card is issued and spendable as + * soon as it is assigned and has no activation step, so it is never waiting on either, which is why + * `isExpensifyCardPendingAction` leaves virtual cards out as well. + */ +function isExpensifyCardPending(card?: Card) { + return card?.bank === CONST.EXPENSIFY_CARD.BANK && !card.nameValuePairs?.isVirtual && isCardPendingIssueOrActivation(card); +} + /** True when this card has a wallet addition waiting for the cardholder to confirm or deny. */ function isCardPendingDigitalWalletApproval(card?: Card) { return !!card?.nameValuePairs?.pendingDigitalWalletApproval; @@ -1772,7 +1795,7 @@ function isCardWithPotentialFraud(card: Card): boolean { function isCardPendingReplace(card?: Card) { return ( - (isCardPendingActivate(card) || isCardPendingIssue(card)) && + isCardPendingIssueOrActivation(card) && !!card?.nameValuePairs?.terminationReason && card?.nameValuePairs?.statusChanges?.at(-1)?.status === CONST.EXPENSIFY_CARD.STATE.STATE_DEACTIVATED ); @@ -1795,7 +1818,7 @@ function isExpensifyCardPendingAction(card?: Card, privatePersonalDetails?: Priv return ( card?.bank === CONST.EXPENSIFY_CARD.BANK && !card.nameValuePairs?.isVirtual && - (isCardPendingIssue(card) || isCardPendingActivate(card) || isCardPendingReplace(card) || arePersonalDetailsMissing(privatePersonalDetails)) && + (isCardPendingIssueOrActivation(card) || isCardPendingReplace(card) || arePersonalDetailsMissing(privatePersonalDetails)) && (!card.lastScrapeResult || CONST.COMPANY_CARDS.BROKEN_CONNECTION_IGNORED_STATUSES.includes(card.lastScrapeResult)) ); } @@ -2318,6 +2341,7 @@ export { getPersonalBankCardDetailsImage, isCardPendingIssue, isCardPendingActivate, + isExpensifyCardPending, isCardPendingDigitalWalletApproval, isActiveExpensifyCard, hasActiveExpensifyCard, diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx index 0f35671bbd76..63a76087b9bb 100644 --- a/src/pages/settings/Wallet/PaymentMethodList.tsx +++ b/src/pages/settings/Wallet/PaymentMethodList.tsx @@ -30,6 +30,7 @@ import { isCardInactive, isCardPendingDigitalWalletApproval, isExpensifyCard, + isExpensifyCardPending, isExpensifyCardPendingAction, isExpiredCard, isLastScrapePastDismissThreshold, @@ -322,6 +323,7 @@ function PaymentMethodList({ isCardBroken, shouldShowRBR, isCardInactive: isCardInactiveState, + isCardPending: isExpensifyCardPending(card), isExpensifyCard: isUserExpensifyCard, isPersonalCard: isUserPersonalCard, isAdminForCardPolicy, diff --git a/tests/unit/CardUtilsTest.ts b/tests/unit/CardUtilsTest.ts index f7c640b3e5ea..6e9b1fed8d30 100644 --- a/tests/unit/CardUtilsTest.ts +++ b/tests/unit/CardUtilsTest.ts @@ -77,6 +77,7 @@ import { isCardPendingDigitalWalletApproval, isExpensifyCard, isExpensifyCardFullySetUp, + isExpensifyCardPending, isExpiredCard, isMatchingCard, isPersonalCard, @@ -4886,6 +4887,7 @@ describe('getCardConnectionStatusDisplay', () => { isCardBroken: false, shouldShowRBR: false, isCardInactive: false, + isCardPending: false, isExpensifyCard: false, isPersonalCard: false, isAdminForCardPolicy: false, @@ -4971,6 +4973,29 @@ describe('getCardConnectionStatusDisplay', () => { }); }); + // A card waiting to be issued or activated is not spendable yet, so it reads neither Active nor Inactive. + it('reports a pending status for an Expensify Card waiting to be issued or activated', () => { + expect(getCardConnectionStatusDisplay({...defaultParams, isExpensifyCard: true, isCardPending: true})).toEqual({ + statusKey: 'walletPage.cardStatus.pending', + statusTone: 'danger', + }); + }); + + // Suspended outranks pending, so a card the back end turned off never reads as merely waiting. + it('keeps an inactive Expensify Card inactive even while it is pending', () => { + expect(getCardConnectionStatusDisplay({...defaultParams, isExpensifyCard: true, isCardPending: true, isCardInactive: true})).toEqual({ + statusKey: 'walletPage.cardStatus.inactive', + statusTone: 'default', + }); + }); + + it('leaves a non-pending Expensify Card active', () => { + expect(getCardConnectionStatusDisplay({...defaultParams, isExpensifyCard: true})).toEqual({ + statusKey: 'walletPage.cardStatus.active', + statusTone: 'success', + }); + }); + it('does not show a company-cards link without a policy ID', () => { expect(getCardConnectionStatusDisplay({...defaultParams, shouldShowRBR: true, isAdminForCardPolicy: true})).toEqual({ statusKey: 'walletPage.cardStatus.inactive', @@ -5124,6 +5149,41 @@ describe('isCardPendingDigitalWalletApproval', () => { }); }); +describe('isExpensifyCardPending', () => { + it('is true for a card waiting to be issued', () => { + expect(isExpensifyCardPending(createRandomExpensifyCard(1, {state: CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED}))).toBe(true); + }); + + it('is true for a card waiting to be activated', () => { + expect(isExpensifyCardPending(createRandomExpensifyCard(1, {state: CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED}))).toBe(true); + }); + + // Those two states describe a physical card on its way to the cardholder. A virtual card is spendable as soon as + // it is assigned, so reading it as pending would tell the cardholder to wait for something that never arrives. + it('is false for a virtual card in either of those states', () => { + const card: Card = { + ...createRandomExpensifyCard(1, {state: CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED}), + nameValuePairs: createMock({isVirtual: true}), + }; + expect(isExpensifyCardPending(card)).toBe(false); + }); + + // A company card's states mean something else entirely, so the Expensify Card states must not be read off one. + it('is false for a company card in one of those states', () => { + const companyCard: Card = {...createRandomCompanyCard(1), state: CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED}; + + expect(isExpensifyCardPending(companyCard)).toBe(false); + }); + + it('is false for a card that has been issued and activated', () => { + expect(isExpensifyCardPending(createRandomExpensifyCard(1, {state: CONST.EXPENSIFY_CARD.STATE.OPEN}))).toBe(false); + }); + + it('is false when there is no card', () => { + expect(isExpensifyCardPending(undefined)).toBe(false); + }); +}); + describe('hasActiveExpensifyCard', () => { it('is true when the user holds an active Expensify Card', () => { const cardList: CardList = {'1': createRandomExpensifyCard(1, {state: CONST.EXPENSIFY_CARD.STATE.OPEN})};