Release/v4.98.8 (#6323)

* fix(balances): show balances when they are 0 (#6306) * chore(form): use error returned form BE if available (#6313) * chore(Release): v4.98.8
blockchain · Mar 5, 2024 · 83a9715 · 83a9715
1 parent 1a21f33
commit 83a9715
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.98.7",
+  "version": "4.98.8",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": {

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json
@@ -1370,7 +1370,7 @@
   "modals.mobilenumberchange.mobile": "Mobile number:",
   "modals.mobilenumberchange.update": "Update",
   "modals.mobilenumberverify.change": "change mobile number",
-  "modals.mobilenumberverify.explain": "We have sent an SMS message with a verification code to {number}.",
+  "modals.mobilenumberverify.explain": "We have sent an SMS message with a verification code to {mobileNumber}.",
   "modals.mobilenumberverify.explain2": "Enter code:",
   "modals.mobilenumberverify.getcode1": "Didn't get the code?",
   "modals.mobilenumberverify.getcode2": "or",

diff --git a/...n-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Balances/WalletBalance/Balance/index.tsx b/...n-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Balances/WalletBalance/Balance/index.tsx
@@ -15,6 +15,7 @@ const Balance = ({ coin, coinTicker }: Props) => {
   const { data, hasError, isLoading, isNotAsked } = useRemote(
     selectors.balances.getCoinTotalBalance(coin)
   )
+
   const handleRefresh = () => {
     if (window.coins?.[coin]?.coinfig?.type.erc20Address) {
       dispatch(fetchErc20Data(coin))
@@ -23,7 +24,7 @@ const Balance = ({ coin, coinTicker }: Props) => {
     }
   }
 
-  if (isLoading || isNotAsked || !data) {
+  if (isLoading || isNotAsked || typeof data !== 'number') {
     return <LoadingBalance coinTicker={coinTicker} />
   }
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Balances/model.tsx b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Balances/model.tsx
@@ -3,30 +3,13 @@ import { LinkContainer } from 'react-router-bootstrap'
 import styled from 'styled-components'
 
 import { SkeletonRectangle, Text } from 'blockchain-info-components'
-import CoinDisplay from 'components/Display/CoinDisplay'
-import FiatDisplay from 'components/Display/FiatDisplay'
 import SwitchableDisplay from 'components/Display/SwitchableDisplay'
 
-const CoinBalanceMain = styled.div`
-  display: inline-flex;
-  flex-direction: row;
-  align-items: center;
-  padding-right: 15px;
-  > div:last-child {
-    margin-left: 10px;
-    > div {
-      color: ${(props) => props.theme.blue900};
-    }
-  }
-`
 const CoinBalanceSwitchable = styled.div`
   display: flex;
   justify-content: space-between;
 `
 
-const BalanceSkeleton = styled.div`
-  margin-top: 4px;
-`
 const CoinSkeletonWrapper = styled.div`
   display: flex;
   align-items: center;

diff --git a/...-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/Steps/Failure.tsx b/...-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/Steps/Failure.tsx
@@ -13,7 +13,7 @@ import { Header } from '../Header'
 import { WIRE_BANK_FORM } from './constants'
 import { FinalStatusWrapper } from './StepsStyles'
 
-const Failure = ({ alreadyLinked }: { alreadyLinked: boolean }) => {
+const Failure = ({ message, title }: { message?: string; title?: string }) => {
   const dispatch = useDispatch()
   const openModals = useSelector(getModals)
 
@@ -32,12 +32,11 @@ const Failure = ({ alreadyLinked }: { alreadyLinked: boolean }) => {
         <Header />
         <Icon color='error' name='close-circle' size='3rem' />
         <Text size='20px' weight={600} color='grey900'>
-          Unable to add bank account
+          {title ?? 'Unable to add bank account'}
         </Text>
         <Text size='16px' weight={500} color='grey600'>
-          {alreadyLinked
-            ? 'This account number is already linked. Please try linking another account'
-            : 'There was a problem adding your bank account details. Please try to again or add a different payment method.'}
+          {message ??
+            'There was a problem adding your bank account details. Please try to again or add a different payment method.'}
         </Text>
       </FinalStatusWrapper>
       <FlyoutFooter collapsed>

diff --git a/...ockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/index.tsx b/...ockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/AddBankWireForm/index.tsx
@@ -59,7 +59,7 @@ const AddWireBank = () => {
     data: { api }
   } = useSelector(getDomains)
 
-  const alreadyLinked = useRef(false)
+  const errorInfo = useRef<{ message?: string; title?: string }>({})
 
   const resetForm = () => {
     dispatch(destroy(WIRE_BANK_FORM))
@@ -99,8 +99,8 @@ const AddWireBank = () => {
       })
       setStep('SUCCESS')
       dispatch(custodial.fetchCustodialBeneficiaries({ currency: fiatCurrency }))
-    } catch (error) {
-      alreadyLinked.current = error.dataFields.description.includes('already exists')
+    } catch ({ message, title }) {
+      errorInfo.current = { message, title }
       setStep('FAILURE')
     }
   }
@@ -124,7 +124,7 @@ const AddWireBank = () => {
       case 'SUCCESS':
         return <Success bankName={formValues?.bankName ?? ''} fiatCurrency={fiatCurrency} />
       case 'FAILURE':
-        return <Failure alreadyLinked={alreadyLinked.current} />
+        return <Failure title={errorInfo.current.title} message={errorInfo.current.message} />
       case 'USER_INFO':
       default: {
         const nextStep =