feat(withdraw lock): added singularity for days

blockchain · Nov 25, 2020 · 49befed · 49befed
1 parent 083b41b
commit 49befed
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/index.d.ts b/packages/blockchain-wallet-v4-frontend/src/assets/locales/index.d.ts
@@ -1415,6 +1415,7 @@ type MessagesType = {
   'modals.wallet.welcome.sb.skip': 'Skip'
   'modals.wallet.welcome.sb.title': 'Own Crypto in a Few Minutes'
   'modals.wallet.welcome.sb.verifybuy': 'Verify your identity and buy crypto.'
+  'modals.withdraw.tooltip_info_day': 'The remaining balance will be available to be withdrawn within 1 day.'
   'modals.withdraw.tooltip_info': 'The remaining balance will be available to be withdrawn within {days} days.'
   'modals.withdraw.available_for_withdrawal': 'Available to Withdraw'
   'modals.withdraw.lock_description': "You have {locks} pending transactions. We’ll email you when these funds become available for withdrawal. <a href='https://support.blockchain.com/hc/en-us/articles/360048200392-Why-can-t-I-withdraw-my-crypto-' rel='noopener noreferrer' target='_blank'>Learn more.</a>"

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Alerts/messages.tsx b/packages/blockchain-wallet-v4-frontend/src/components/Alerts/messages.tsx
@@ -1159,11 +1159,18 @@ export const getAlertContent = (message, data = undefined) => {
       )
     case C.LOCKED_WITHDRAW_ERROR:
       return buildMessageTemplate(
-        <FormattedMessage
-          id='copy.error.locked_withdraw_error'
-          defaultMessage='Your crypto will be available to be withdrawn within {days} days.'
-          values={data}
-        />
+        data === 0 || data === 1 ? (
+          <FormattedMessage
+            id='modals.withdraw.tooltip_info_day'
+            defaultMessage='The remaining balance will be available to be withdrawn within 1 day.'
+          />
+        ) : (
+          <FormattedMessage
+            id='copy.error.locked_withdraw_error'
+            defaultMessage='Your crypto will be available to be withdrawn within {days} days.'
+            values={data}
+          />
+        )
       )
     default:
       return buildMessageTemplate(

diff --git a/...lockchain-wallet-v4-frontend/src/modals/Withdraw/EnterAmount/LockTimeTooltip/template.tsx b/...lockchain-wallet-v4-frontend/src/modals/Withdraw/EnterAmount/LockTimeTooltip/template.tsx
@@ -19,11 +19,18 @@ const LockTime = (props: Props) => {
         </TooltipHost>
       </TooltipWrapper>
       <Tooltip id='info_tooltip'>
-        <FormattedMessage
-          id='modals.withdraw.tooltip_info'
-          defaultMessage='The remaining balance will be available to be withdrawn within {days} days.'
-          values={{ days: lockTime }}
-        />
+        {lockTime === 0 || lockTime === 1 ? (
+          <FormattedMessage
+            id='modals.withdraw.tooltip_info_day'
+            defaultMessage='The remaining balance will be available to be withdrawn within 1 day.'
+          />
+        ) : (
+          <FormattedMessage
+            id='modals.withdraw.tooltip_info'
+            defaultMessage='The remaining balance will be available to be withdrawn within {days} days.'
+            values={{ days: lockTime }}
+          />
+        )}
       </Tooltip>
     </>
   )