fix: 65912 NIT fixes

src/components/KYCWall/BaseKYCWall.tsx

@@ -55,7 +55,6 @@ function KYCWall({
     source,
     shouldShowPersonalBankAccountOption = false,
     ref,
-    currency,
 }: KYCWallProps) {
     const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET, {canBeMissing: true});
     const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS, {canBeMissing: true});
@@ -124,10 +123,10 @@ function KYCWall({
         setPositionAddPaymentMenu(position);
     }, [getAnchorPosition]);
 
-    const canLinkExistingBusinessBankAccount = getEligibleExistingBusinessBankAccounts(bankAccountList, currency, true).length > 0;
-
     const selectPaymentMethod = useCallback(
         (paymentMethod?: PaymentMethod, policy?: Policy) => {
+            const canLinkExistingBusinessBankAccount = getEligibleExistingBusinessBankAccounts(bankAccountList, policy?.outputCurrency, true).length > 0;
+
             if (paymentMethod) {
                 onSelectPaymentMethod(paymentMethod);
             }
@@ -201,22 +200,22 @@ function KYCWall({
             }
         },
         [
+            bankAccountList,
             onSelectPaymentMethod,
             iouReport,
             addDebitCardRoute,
             reimbursementAccount?.achData?.state,
-            canLinkExistingBusinessBankAccount,
             addBankAccountRoute,
             chatReport,
             policies,
-            introSelected,
-            formatPhoneNumber,
-            lastPaymentMethod,
             reportPreviewAction,
             currentUserEmail,
             employeeEmail,
             reportTransactions,
             isCustomReportNamesBetaEnabled,
+            introSelected,
+            formatPhoneNumber,
+            lastPaymentMethod,
         ],
     );
 

src/components/KYCWall/types.ts

@@ -77,9 +77,6 @@ type KYCWallProps = {
 
     /** Reference to the KYCWall component */
     ref: ForwardedRef<KYCWallRef>;
-
-    /** Currency associated with the payment */
-    currency?: string;
 };
 
 type KYCWallRef = {

src/components/SettlementButton/index.tsx

@@ -611,7 +611,6 @@ function SettlementButton({
             policy={lastPaymentPolicy}
             anchorAlignment={kycWallAnchorAlignment}
             shouldShowPersonalBankAccountOption={shouldShowPersonalBankAccountOption}
-            currency={currency}
         >
             {(triggerKYCFlow, buttonRef) => (
                 <ButtonWithDropdownMenu<string>

src/libs/actions/Search.ts

@@ -1145,7 +1145,7 @@ function handleBulkPayItemSelected(params: {
         showDelegateNoAccessModal,
         confirmPayment,
     } = params;
-    const {paymentType, selectedPolicy, shouldSelectPaymentMethod} = getActivePaymentType(item.key, activeAdminPolicies, latestBankItems);
+    const {paymentType, selectedPolicy, shouldSelectPaymentMethod} = getActivePaymentType(item.key, activeAdminPolicies, latestBankItems, policy?.id);
     // Policy id is also a last payment method so we shouldn't early return here for that case.
     if (!isValidBulkPayOption(item) && !selectedPolicy) {
         return;

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

@@ -415,6 +415,8 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy, navigation}:
             case CONST.BANK_ACCOUNT.STEP.VALIDATION:
                 if ([CONST.BANK_ACCOUNT.STATE.VERIFYING, CONST.BANK_ACCOUNT.STATE.SETUP].some((value) => value === achData?.state)) {
                     goToWithdrawalAccountSetupStep(CONST.BANK_ACCOUNT.STEP.ACH_CONTRACT);
+                } else if (CONST.BANK_ACCOUNT.STATE.PENDING === achData?.state) {
+                    Navigation.closeRHPFlow();
                 } else {
                     Navigation.goBack();
                 }

src/pages/workspace/ConnectExistingBusinessBankAccountPage.tsx

@@ -42,6 +42,7 @@ function ConnectExistingBusinessBankAccountPage({route}: ConnectExistingBusiness
         if (policyID === undefined) {
             return;
         }
+
         const newReimburserEmail = policy?.achAccount?.reimburser ?? policy?.owner ?? '';
         setWorkspaceReimbursement({
             policyID,

tests/unit/PaymentUtilsTest.ts

@@ -1,9 +1,11 @@
 import type {OnyxEntry} from 'react-native-onyx';
+import type {BankAccountMenuItem} from '@components/Search/types';
 import Navigation from '@libs/Navigation/Navigation';
-import {handleUnvalidatedAccount} from '@libs/PaymentUtils';
+import {getActivePaymentType, handleUnvalidatedAccount} from '@libs/PaymentUtils';
 import CONST from '@src/CONST';
 import {calculateWalletTransferBalanceFee} from '@src/libs/PaymentUtils';
 import type {Report} from '@src/types/onyx';
+import createRandomPolicy from '../utils/collections/policies';
 
 jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
@@ -58,4 +60,74 @@ describe('PaymentUtils', () => {
             expect(mockNavigate).toHaveBeenCalledWith(expectedRoute);
         });
     });
+
+    describe('getActivePaymentType', () => {
+        const randomPolicyA = createRandomPolicy(1);
+        const randomPolicyB = createRandomPolicy(2);
+        const bankItem = {
+            text: 'Bank Account',
+            description: 'Test bank',
+            methodID: 1,
+            value: CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT,
+        } as BankAccountMenuItem;
+
+        it('should return EXPENSIFY payment type when paymentMethod is PERSONAL_BANK_ACCOUNT', () => {
+            const result = getActivePaymentType(CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT, [], undefined);
+
+            expect(result.paymentType).toBe(CONST.IOU.PAYMENT_TYPE.EXPENSIFY);
+            expect(result.shouldSelectPaymentMethod).toBe(true);
+            expect(result.selectedPolicy).toBeUndefined();
+        });
+
+        it('should return VBBA payment type when paymentMethod is BUSINESS_BANK_ACCOUNT', () => {
+            const result = getActivePaymentType(CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT, [], undefined);
+
+            expect(result.paymentType).toBe(CONST.IOU.PAYMENT_TYPE.VBBA);
+            expect(result.shouldSelectPaymentMethod).toBe(true);
+            expect(result.selectedPolicy).toBeUndefined();
+        });
+
+        it('should return ELSEWHERE payment type when paymentMethod is DEBIT_CARD', () => {
+            const result = getActivePaymentType(CONST.PAYMENT_METHODS.DEBIT_CARD, [], undefined);
+
+            expect(result.paymentType).toBe(CONST.IOU.PAYMENT_TYPE.ELSEWHERE);
+            expect(result.shouldSelectPaymentMethod).toBe(true);
+            expect(result.selectedPolicy).toBeUndefined();
+        });
+
+        it('should return ELSEWHERE payment type when paymentMethod is undefined', () => {
+            const result = getActivePaymentType(undefined, [], undefined);
+
+            expect(result.paymentType).toBe(CONST.IOU.PAYMENT_TYPE.ELSEWHERE);
+            expect(result.shouldSelectPaymentMethod).toBe(false);
+            expect(result.selectedPolicy).toBeUndefined();
+        });
+
+        it('should set shouldSelectPaymentMethod to true when latestBankItems is not empty', () => {
+            const result = getActivePaymentType(undefined, [], [bankItem]);
+
+            expect(result.paymentType).toBe(CONST.IOU.PAYMENT_TYPE.ELSEWHERE);
+            expect(result.shouldSelectPaymentMethod).toBe(true);
+        });
+
+        it('should find selectedPolicy by policyID', () => {
+            const result = getActivePaymentType(undefined, [randomPolicyA, randomPolicyB], undefined, randomPolicyA.id);
+
+            expect(result.selectedPolicy).toEqual(randomPolicyA);
+        });
+
+        it('should find selectedPolicy by paymentMethod when it matches policy id (Pay via workspace scenario)', () => {
+            const result = getActivePaymentType(randomPolicyB.id, [randomPolicyA, randomPolicyB], undefined);
+
+            expect(result.selectedPolicy).toEqual(randomPolicyB);
+            expect(result.paymentType).toBe(CONST.IOU.PAYMENT_TYPE.ELSEWHERE);
+            expect(result.shouldSelectPaymentMethod).toBe(false);
+        });
+
+        it('should return undefined selectedPolicy when no matching policy is found', () => {
+            const result = getActivePaymentType(undefined, [randomPolicyA], undefined, 'non-existent-policy');
+
+            expect(result.selectedPolicy).toBeUndefined();
+        });
+    });
 });