Show non-USD bank accounts as incomplete instead of pending

Author: marufsharifi

src/libs/BankAccountUtils.ts

@@ -65,21 +65,38 @@ function hasBankAccountAllowDebit(accountData: AccountData | undefined): boolean
     return !!accountData.allowDebit;
 }
 
-function getBankAccountConnectionStatus(state: string | undefined): BankAccountConnectionStatus | undefined {
+function getIncompleteBankAccountStatus(): BankAccountConnectionStatus {
+    return {
+        labelKey: 'walletPage.bankAccountStatus.incomplete',
+        messageKey: 'walletPage.bankAccountStatus.finishAddingBankAccount',
+        actionKey: 'walletPage.bankAccountStatus.finish',
+        tone: 'danger',
+        brickRoadIndicator: CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR,
+    };
+}
+
+/**
+ * Only the USD flow has a test transaction step, and the backend puts non-USD accounts in PENDING while they are still
+ * being set up. So for those, PENDING means the setup is incomplete rather than waiting on the user to confirm test
+ * transactions.
+ *
+ * This keys off currency rather than country because currency is what selects the flow everywhere else — see
+ * ReimbursementAccountPage, which routes a PENDING account to the validation (test transaction) step only when the
+ * currency is USD. An absent currency is treated as USD, matching BankAccount.getCurrency().
+ */
+function getBankAccountConnectionStatus(state: string | undefined, currency?: string): BankAccountConnectionStatus | undefined {
+    if (state === CONST.BANK_ACCOUNT.STATE.PENDING && !!currency && currency !== CONST.CURRENCY.USD) {
+        return getIncompleteBankAccountStatus();
+    }
+
     switch (state) {
         case CONST.BANK_ACCOUNT.STATE.OPEN:
             return {
                 labelKey: 'walletPage.bankAccountStatus.active',
                 tone: 'success',
             };
         case CONST.BANK_ACCOUNT.STATE.SETUP:
-            return {
-                labelKey: 'walletPage.bankAccountStatus.incomplete',
-                messageKey: 'walletPage.bankAccountStatus.finishAddingBankAccount',
-                actionKey: 'walletPage.bankAccountStatus.finish',
-                tone: 'danger',
-                brickRoadIndicator: CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR,
-            };
+            return getIncompleteBankAccountStatus();
         case CONST.BANK_ACCOUNT.STATE.PENDING:
             return {
                 labelKey: 'walletPage.bankAccountStatus.pending',

src/pages/settings/Wallet/PaymentMethodList.tsx

@@ -580,7 +580,9 @@ function PaymentMethodList({
             };
             const existingBrickRoadIndicator = (paymentMethod as Partial<PaymentMethodItem>).brickRoadIndicator;
             const isMissingPersonalInfo = isPersonalBankAccountMissingInfo(paymentMethod.accountData);
-            const bankConnectionStatus = shouldShowConnectionStatus && !isMissingPersonalInfo ? getBankAccountConnectionStatus(getBankAccountState(paymentMethod.accountData)) : undefined;
+            const bankAccountCurrency = ('bankCurrency' in paymentMethod ? paymentMethod.bankCurrency : undefined) ?? paymentMethod.accountData?.additionalData?.currency;
+            const bankConnectionStatus =
+                shouldShowConnectionStatus && !isMissingPersonalInfo ? getBankAccountConnectionStatus(getBankAccountState(paymentMethod.accountData), bankAccountCurrency) : undefined;
             const paymentMethodPress = (e: GestureResponderEvent | KeyboardEvent | undefined) =>
                 pressHandler({
                     event: e,

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

@@ -484,7 +484,10 @@ function WorkspaceWorkflowsPage({policy, route}: WorkspaceWorkflowsPageProps) {
                     return undefined;
             }
         };
-        const bankConnectionStatus = canAccessWalletConnectionStatusFeatures ? getBankAccountConnectionStatus(state) : undefined;
+        // Read the currency off the same account `state` comes from, so a workspace whose currency no longer matches its
+        // connected account can't flip the status to the wrong one.
+        const bankAccountCurrency = bankAccountConnectedToWorkspace?.bankCurrency ?? bankAccountConnectedToWorkspace?.accountData?.additionalData?.currency;
+        const bankConnectionStatus = canAccessWalletConnectionStatusFeatures ? getBankAccountConnectionStatus(state, bankAccountCurrency) : undefined;
         const bankConnectionBrickRoadIndicator = bankConnectionStatus?.brickRoadIndicator ?? (hasReimburserError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined);
         const bankConnectionStatusAddon = bankConnectionStatus ? (
             <ConnectionStatusBadge

tests/unit/BankAccountUtilsTest.ts

@@ -322,6 +322,32 @@ describe('BankAccountUtils', () => {
             });
         });
 
+        it.each([CONST.CURRENCY.USD, undefined])('keeps the confirm action for a PENDING account in currency "%s"', (currency) => {
+            expect(getBankAccountConnectionStatus(CONST.BANK_ACCOUNT.STATE.PENDING, currency)).toEqual(
+                expect.objectContaining({
+                    labelKey: 'walletPage.bankAccountStatus.pending',
+                    actionKey: 'common.confirm',
+                }),
+            );
+        });
+
+        it.each(['GBP', 'EUR', 'AUD'])('maps a PENDING account in currency "%s" to Incomplete, since only USD accounts have test transactions', (currency) => {
+            expect(getBankAccountConnectionStatus(CONST.BANK_ACCOUNT.STATE.PENDING, currency)).toEqual({
+                labelKey: 'walletPage.bankAccountStatus.incomplete',
+                messageKey: 'walletPage.bankAccountStatus.finishAddingBankAccount',
+                actionKey: 'walletPage.bankAccountStatus.finish',
+                tone: 'danger',
+                brickRoadIndicator: CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR,
+            });
+        });
+
+        it.each([CONST.BANK_ACCOUNT.STATE.OPEN, CONST.BANK_ACCOUNT.STATE.SETUP, CONST.BANK_ACCOUNT.STATE.VERIFYING, CONST.BANK_ACCOUNT.STATE.LOCKED])(
+            'is unaffected by a non-USD currency in state "%s"',
+            (state) => {
+                expect(getBankAccountConnectionStatus(state, 'GBP')).toEqual(getBankAccountConnectionStatus(state));
+            },
+        );
+
         it.each([undefined, '', 'UNKNOWN'])('returns undefined for unsupported state "%s"', (state) => {
             expect(getBankAccountConnectionStatus(state)).toBeUndefined();
         });