From deaa04865670087e0e7ab92b57c9685ef12958ae Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Fri, 6 Aug 2021 14:53:48 -0600 Subject: [PATCH 1/4] fix manage card button --- src/libs/actions/BankAccounts.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js index b3f016ac3ab4..f678a299db06 100644 --- a/src/libs/actions/BankAccounts.js +++ b/src/libs/actions/BankAccounts.js @@ -10,6 +10,7 @@ import BankAccount from '../models/BankAccount'; import promiseAllSettled from '../promiseAllSettled'; import Growl from '../Growl'; import {translateLocal} from '../translate'; +import Navigation from '../Navigation/Navigation'; /** * List of bank accounts. This data should not be stored in Onyx since it contains unmasked PANs. @@ -554,7 +555,12 @@ function validateBankAccount(bankAccountID, validateCode) { API.User_IsUsingExpensifyCard() .then(({isUsingExpensifyCard}) => { Onyx.merge(ONYXKEYS.USER, {isUsingExpensifyCard}); - Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, error: ''}); + if (isUsingExpensifyCard) { + Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, error: '', achData: {state: BankAccount.STATE.OPEN}}); + Navigation.dismissModal(); + } else { + Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, error: '', achData: {state: BankAccount.STATE.OPEN, currentStep: CONST.BANK_ACCOUNT.STEP.ENABLE}}); + } }); return; } From c778197d2f01e8b7074fd0e84d841b56b83d0d2b Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Fri, 6 Aug 2021 15:17:59 -0600 Subject: [PATCH 2/4] refactor --- src/libs/actions/BankAccounts.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js index f678a299db06..36aa041930e3 100644 --- a/src/libs/actions/BankAccounts.js +++ b/src/libs/actions/BankAccounts.js @@ -555,11 +555,12 @@ function validateBankAccount(bankAccountID, validateCode) { API.User_IsUsingExpensifyCard() .then(({isUsingExpensifyCard}) => { Onyx.merge(ONYXKEYS.USER, {isUsingExpensifyCard}); + Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, error: '', achData: {state: BankAccount.STATE.OPEN}}); + if (isUsingExpensifyCard) { - Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, error: '', achData: {state: BankAccount.STATE.OPEN}}); Navigation.dismissModal(); } else { - Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, error: '', achData: {state: BankAccount.STATE.OPEN, currentStep: CONST.BANK_ACCOUNT.STEP.ENABLE}}); + Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {achData: {currentStep: CONST.BANK_ACCOUNT.STEP.ENABLE}}); } }); return; From c099fe368ae548da7fb0c03ab55d353bf062abad Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Fri, 6 Aug 2021 15:45:23 -0600 Subject: [PATCH 3/4] fix js style --- src/libs/actions/BankAccounts.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js index 36aa041930e3..7b0dde968115 100644 --- a/src/libs/actions/BankAccounts.js +++ b/src/libs/actions/BankAccounts.js @@ -555,12 +555,18 @@ function validateBankAccount(bankAccountID, validateCode) { API.User_IsUsingExpensifyCard() .then(({isUsingExpensifyCard}) => { Onyx.merge(ONYXKEYS.USER, {isUsingExpensifyCard}); - Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, error: '', achData: {state: BankAccount.STATE.OPEN}}); + Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, { + loading: false, + error: '', + achData: {state: BankAccount.STATE.OPEN}, + }); if (isUsingExpensifyCard) { Navigation.dismissModal(); } else { - Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {achData: {currentStep: CONST.BANK_ACCOUNT.STEP.ENABLE}}); + Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, { + achData: {currentStep: CONST.BANK_ACCOUNT.STEP.ENABLE}, + }); } }); return; From e6ee1fed40198108e52a531c4b5ef75a273a3946 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 9 Aug 2021 11:00:04 -0600 Subject: [PATCH 4/4] refactor --- src/libs/actions/BankAccounts.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js index 7b0dde968115..f2306da9d298 100644 --- a/src/libs/actions/BankAccounts.js +++ b/src/libs/actions/BankAccounts.js @@ -554,20 +554,20 @@ function validateBankAccount(bankAccountID, validateCode) { Growl.show('Bank Account successfully validated!', CONST.GROWL.SUCCESS, 3000); API.User_IsUsingExpensifyCard() .then(({isUsingExpensifyCard}) => { - Onyx.merge(ONYXKEYS.USER, {isUsingExpensifyCard}); - Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, { + const reimbursementAccount = { loading: false, error: '', achData: {state: BankAccount.STATE.OPEN}, - }); + }; if (isUsingExpensifyCard) { Navigation.dismissModal(); } else { - Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, { - achData: {currentStep: CONST.BANK_ACCOUNT.STEP.ENABLE}, - }); + reimbursementAccount.achData.currentStep = CONST.BANK_ACCOUNT.STEP.ENABLE; } + + Onyx.merge(ONYXKEYS.USER, {isUsingExpensifyCard}); + Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, reimbursementAccount); }); return; }