Merge pull request Expensify#67520 from allgandalf/fixresetUSDBankAccount

Remove Onyx.connect() for the key: ONYXKEYS.BANK_ACCOUNT_LIST in src/libs/actions/ReimbursementAccount/resetUSDBankAccount.ts

Author: tgolen

src/libs/actions/ReimbursementAccount/resetUSDBankAccount.ts

@@ -1,27 +1,22 @@
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as API from '@libs/API';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/ReimbursementAccountForm';
 import type * as OnyxTypes from '@src/types/onyx';
+import type {ACHAccount} from '@src/types/onyx/Policy';
 import type {OnyxData} from '@src/types/onyx/Request';
 
-let allPolicies: OnyxCollection<OnyxTypes.Policy>;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY,
-    waitForCollectionCallback: true,
-    callback: (value) => (allPolicies = value),
-});
-
 /**
  * Reset user's USD reimbursement account. This will delete the bank account
  */
 function resetUSDBankAccount(
     bankAccountID: number | undefined,
     session: OnyxEntry<OnyxTypes.Session>,
     policyID: string | undefined,
+    achAccount: ACHAccount | undefined,
     lastUsedPaymentMethod?: OnyxTypes.LastPaymentMethodType,
 ) {
     if (!bankAccountID) {
@@ -31,7 +26,6 @@ function resetUSDBankAccount(
         throw new Error('Missing credentials when attempting to reset free plan bank account');
     }
 
-    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] ?? ({} as OnyxTypes.Policy);
     const isLastUsedPaymentMethodBBA = lastUsedPaymentMethod?.expense?.name === CONST.IOU.PAYMENT_TYPE.VBBA;
     const isPreviousLastUsedPaymentMethodBBA = lastUsedPaymentMethod?.lastUsed?.name === CONST.IOU.PAYMENT_TYPE.VBBA;
 
@@ -136,7 +130,7 @@ function resetUSDBankAccount(
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                 value: {
-                    achAccount: policy?.achAccount,
+                    achAccount,
                 },
             },
         ],

src/pages/workspace/WorkspaceResetBankAccountModal.tsx

@@ -69,7 +69,7 @@ function WorkspaceResetBankAccountModal({
                 setNonUSDBankAccountStep(null);
             }
         } else {
-            resetUSDBankAccount(bankAccountID, session, policyID, lastPaymentMethod);
+            resetUSDBankAccount(bankAccountID, session, policyID, policy?.achAccount, lastPaymentMethod);
 
             if (setShouldShowContinueSetupButton) {
                 setShouldShowContinueSetupButton(false);

tests/actions/ReimbursementAccountTest.ts

@@ -0,0 +1,64 @@
+import Onyx from 'react-native-onyx';
+import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
+import resetUSDBankAccount from '@src/libs/actions/ReimbursementAccount/resetUSDBankAccount';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {ACHAccount} from '@src/types/onyx/Policy';
+import type {MockFetch} from '../utils/TestHelper';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+const TEST_EMAIL = 'test@test.com';
+const TEST_ACCOUNT_ID = 1;
+const bankAccountID = 1;
+const policyID = '1234567890';
+const session = {email: TEST_EMAIL, accountID: TEST_ACCOUNT_ID};
+
+describe('ReimbursementAccount', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    let mockFetch: MockFetch;
+    beforeEach(() => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        mockFetch = fetch as MockFetch;
+        IntlStore.load(CONST.LOCALES.EN);
+        return Onyx.clear().then(waitForBatchedUpdates);
+    });
+    describe('resetUSDBankAccount', () => {
+        afterEach(() => {
+            mockFetch?.resume?.();
+        });
+
+        it('should reset the USDBankAccount', async () => {
+            (fetch as MockFetch)?.pause?.();
+            const achAccount: ACHAccount = {
+                bankAccountID,
+                addressName: 'Test Address',
+                bankName: 'Test Bank',
+                reimburser: TEST_EMAIL,
+                accountNumber: '1234567890',
+                routingNumber: '123456789',
+            };
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {achAccount});
+            resetUSDBankAccount(bankAccountID, session, policyID, achAccount);
+
+            return waitForBatchedUpdates().then(
+                () =>
+                    new Promise<void>((resolve) => {
+                        const connection = Onyx.connect({
+                            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                            callback: (policy) => {
+                                Onyx.disconnect(connection);
+                                expect(policy?.achAccount).toBeUndefined();
+                                resolve();
+                            },
+                        });
+                    }),
+            );
+        });
+    });
+});