Merge pull request #84373 from Expensify/claude-filterPartiallySetupBankAccountsFromSettlement

Filter partially set up bank accounts from card settlement account list

Author: chuckdries

src/libs/CardUtils.ts

@@ -41,6 +41,7 @@ import type {
 } from '@src/types/onyx/CardFeeds';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
+import {isBankAccountPartiallySetup} from './BankAccountUtils';
 import {filterObject} from './ObjectUtils';
 import {arePersonalDetailsMissing, getDisplayNameOrDefault} from './PersonalDetailsUtils';
 import StringUtils from './StringUtils';
@@ -389,7 +390,10 @@ function getEligibleBankAccountsForCard(bankAccountsList: OnyxEntry<BankAccountL
     if (!bankAccountsList || isEmptyObject(bankAccountsList)) {
         return [];
     }
-    return Object.values(bankAccountsList).filter((bankAccount) => bankAccount?.accountData?.type === CONST.BANK_ACCOUNT.TYPE.BUSINESS && bankAccount?.accountData?.allowDebit);
+    return Object.values(bankAccountsList).filter(
+        (bankAccount) =>
+            bankAccount?.accountData?.type === CONST.BANK_ACCOUNT.TYPE.BUSINESS && bankAccount?.accountData?.allowDebit && !isBankAccountPartiallySetup(bankAccount?.accountData?.state),
+    );
 }
 
 function getEligibleBankAccountsForUkEuCard(bankAccountsList: OnyxEntry<BankAccountList>, outputCurrency?: string) {
@@ -400,6 +404,7 @@ function getEligibleBankAccountsForUkEuCard(bankAccountsList: OnyxEntry<BankAcco
         (bankAccount) =>
             bankAccount?.accountData?.type === CONST.BANK_ACCOUNT.TYPE.BUSINESS &&
             bankAccount?.accountData?.allowDebit &&
+            !isBankAccountPartiallySetup(bankAccount?.accountData?.state) &&
             bankAccount?.bankCurrency === outputCurrency &&
             (CONST.EXPENSIFY_UK_EU_SUPPORTED_COUNTRIES as unknown as string).includes(bankAccount?.bankCountry),
     );

tests/unit/CardUtilsTest.ts

@@ -34,6 +34,8 @@ import {
     getCustomOrFormattedFeedName,
     getDefaultExpensifyCardLimitType,
     getDisplayableExpensifyCards,
+    getEligibleBankAccountsForCard,
+    getEligibleBankAccountsForUkEuCard,
     getFeedNameForDisplay,
     getFeedType,
     getFilteredCardList,
@@ -60,7 +62,18 @@ import {
     splitCardFeedWithDomainID,
     splitMaskedCardNumber,
 } from '@src/libs/CardUtils';
-import type {Card, CardFeeds, CardList, CompanyCardFeed, CompanyCardFeedWithDomainID, ExpensifyCardSettings, PersonalDetailsList, Policy, WorkspaceCardsList} from '@src/types/onyx';
+import type {
+    BankAccountList,
+    Card,
+    CardFeeds,
+    CardList,
+    CompanyCardFeed,
+    CompanyCardFeedWithDomainID,
+    ExpensifyCardSettings,
+    PersonalDetailsList,
+    Policy,
+    WorkspaceCardsList,
+} from '@src/types/onyx';
 import type {CardFeedWithDomainID, CardFeedWithNumber, CompanyCardFeedWithNumber} from '@src/types/onyx/CardFeeds';
 import type IconAsset from '@src/types/utils/IconAsset';
 import {localeCompare, translateLocal} from '../utils/TestHelper';
@@ -3491,3 +3504,84 @@ describe('formatMaskedCardName', () => {
         expect(formatMaskedCardName('J. SMITH...4306')).toBe('J. SMITH...4306');
     });
 });
+
+describe('getEligibleBankAccountsForCard', () => {
+    const openBusinessAccount: BankAccountList = {
+        '1': {
+            accountData: {type: CONST.BANK_ACCOUNT.TYPE.BUSINESS, allowDebit: true, state: CONST.BANK_ACCOUNT.STATE.OPEN},
+            bankCurrency: 'USD',
+            bankCountry: 'US',
+        },
+    };
+
+    const setupBusinessAccount: BankAccountList = {
+        '2': {
+            accountData: {type: CONST.BANK_ACCOUNT.TYPE.BUSINESS, allowDebit: true, state: CONST.BANK_ACCOUNT.STATE.SETUP},
+            bankCurrency: 'USD',
+            bankCountry: 'US',
+        },
+    };
+
+    const verifyingBusinessAccount: BankAccountList = {
+        '3': {
+            accountData: {type: CONST.BANK_ACCOUNT.TYPE.BUSINESS, allowDebit: true, state: CONST.BANK_ACCOUNT.STATE.VERIFYING},
+            bankCurrency: 'USD',
+            bankCountry: 'US',
+        },
+    };
+
+    const pendingBusinessAccount: BankAccountList = {
+        '4': {
+            accountData: {type: CONST.BANK_ACCOUNT.TYPE.BUSINESS, allowDebit: true, state: CONST.BANK_ACCOUNT.STATE.PENDING},
+            bankCurrency: 'USD',
+            bankCountry: 'US',
+        },
+    };
+
+    it('includes bank accounts with OPEN state', () => {
+        expect(getEligibleBankAccountsForCard(openBusinessAccount)).toHaveLength(1);
+    });
+
+    it('excludes bank accounts with SETUP state', () => {
+        expect(getEligibleBankAccountsForCard(setupBusinessAccount)).toHaveLength(0);
+    });
+
+    it('excludes bank accounts with VERIFYING state', () => {
+        expect(getEligibleBankAccountsForCard(verifyingBusinessAccount)).toHaveLength(0);
+    });
+
+    it('excludes bank accounts with PENDING state', () => {
+        expect(getEligibleBankAccountsForCard(pendingBusinessAccount)).toHaveLength(0);
+    });
+
+    it('filters partially set up accounts from a mixed list', () => {
+        const mixedList: BankAccountList = {
+            ...openBusinessAccount,
+            ...setupBusinessAccount,
+            ...pendingBusinessAccount,
+        };
+        const result = getEligibleBankAccountsForCard(mixedList);
+        expect(result).toHaveLength(1);
+        expect(result.at(0)?.accountData?.state).toBe(CONST.BANK_ACCOUNT.STATE.OPEN);
+    });
+});
+
+describe('getEligibleBankAccountsForUkEuCard', () => {
+    it('excludes partially set up accounts', () => {
+        const bankAccounts: BankAccountList = {
+            '1': {
+                accountData: {type: CONST.BANK_ACCOUNT.TYPE.BUSINESS, allowDebit: true, state: CONST.BANK_ACCOUNT.STATE.OPEN},
+                bankCurrency: 'GBP',
+                bankCountry: 'GB',
+            },
+            '2': {
+                accountData: {type: CONST.BANK_ACCOUNT.TYPE.BUSINESS, allowDebit: true, state: CONST.BANK_ACCOUNT.STATE.SETUP},
+                bankCurrency: 'GBP',
+                bankCountry: 'GB',
+            },
+        };
+        const result = getEligibleBankAccountsForUkEuCard(bankAccounts, 'GBP');
+        expect(result).toHaveLength(1);
+        expect(result.at(0)?.accountData?.state).toBe(CONST.BANK_ACCOUNT.STATE.OPEN);
+    });
+});