From 64b0f450f60e70c634be6a96ff5ab4fb72eaf1d0 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 26 Jul 2021 15:16:17 -0600 Subject: [PATCH] fix button text merge conflicts --- src/CONST.js | 1 + src/pages/workspace/WorkspaceCardPage.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CONST.js b/src/CONST.js index 1856c35f03a1..1365c3a35004 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -69,6 +69,7 @@ const CONST = { VERIFICATION_MAX_ATTEMPTS: 7, STATE: { VERIFYING: 'VERIFYING', + PENDING: 'PENDING', }, }, INCORPORATION_TYPES: { diff --git a/src/pages/workspace/WorkspaceCardPage.js b/src/pages/workspace/WorkspaceCardPage.js index 5a385e313440..0f156fe05bb1 100644 --- a/src/pages/workspace/WorkspaceCardPage.js +++ b/src/pages/workspace/WorkspaceCardPage.js @@ -74,6 +74,7 @@ const WorkspaceCardPage = ({ reimbursementAccount, }) => { const isVerifying = lodashGet(reimbursementAccount, 'achData.state', '') === BankAccount.STATE.VERIFYING; + const isPending = lodashGet(reimbursementAccount, 'achData.state', '') === BankAccount.STATE.PENDING; const isNotAutoProvisioned = !user.isUsingExpensifyCard && lodashGet(reimbursementAccount, 'achData.state', '') === BankAccount.STATE.OPEN; let buttonText; @@ -81,7 +82,7 @@ const WorkspaceCardPage = ({ buttonText = translate('workspace.card.addEmail'); } else if (user.isUsingExpensifyCard) { buttonText = translate('workspace.card.manageCards'); - } else if (isVerifying || isNotAutoProvisioned) { + } else if (isVerifying || isPending || isNotAutoProvisioned) { buttonText = translate('workspace.card.finishSetup'); } else { buttonText = translate('workspace.card.getStarted');