Merge pull request #11556 from Expensify/marco-fixWorkspaceBankAccoun…

…tStep2 [CP Staging] save routingNumber and accountNumber in connectBankAccountManually
Expensify · Oct 4, 2022 · 6c089c8 · 6c089c8
2 parents 93587b1 + 17a224b
commit 6c089c8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/libs/ReimbursementAccountUtils.js b/src/libs/ReimbursementAccountUtils.js
@@ -35,6 +35,7 @@ function getDefaultStateForField(props, fieldName, defaultValue = '') {
 function getBankAccountFields(props, fieldNames) {
     return {
         ..._.pick(lodashGet(props, 'reimbursementAccount.achData'), ...fieldNames),
+        ..._.pick(lodashGet(props, 'reimbursementAccountDraftValues'), ...fieldNames),
         ..._.pick(props.reimbursementAccountDraft, ...fieldNames),
     };
 }

diff --git a/src/libs/actions/FormActions.js b/src/libs/actions/FormActions.js
@@ -24,7 +24,16 @@ function setDraftValues(formID, draftValues) {
     Onyx.merge(`${formID}DraftValues`, draftValues);
 }
 
+/**
+ * @param {String} formID
+ * @returns {String}
+ */
+function getDraftValuesKey(formID) {
+    return `${formID}DraftValues`;
+}
+
 export {
+    getDraftValuesKey,
     setIsLoading,
     setErrors,
     setDraftValues,

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -26,6 +26,7 @@ import AddressForm from './AddressForm';
 import ReimbursementAccountForm from './ReimbursementAccountForm';
 import * as ReimbursementAccount from '../../libs/actions/ReimbursementAccount';
 import * as ReimbursementAccountUtils from '../../libs/ReimbursementAccountUtils';
+import * as FormActions from '../../libs/actions/FormActions';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -312,6 +313,9 @@ export default compose(
         reimbursementAccountDraft: {
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT,
         },
+        reimbursementAccountDraftValues: {
+            key: FormActions.getDraftValuesKey(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM),
+        },
         session: {
             key: ONYXKEYS.SESSION,
         },