chore(merge): development

.well-known/apple-app-site-association

@@ -5,42 +5,62 @@
         "appIDs": [ 
             "NZ6PH75U7K.com.rainydayapps.Blockchain",
             "NZ6PH75U7K.com.rainydayapps.Blockchain.staging",
-            "NZ6PH75U7K.com.rainydayapps.Blockchain.dev",
-            "NZ6PH75U7K.com.rainydayapps.Blockchain.alpha"
+            "NZ6PH75U7K.com.rainydayapps.Blockchain.dev"
          ],
         "components": [
           {
-            "/": "/login/*",
-            "comment": "Matches any URL whose path starts with /login/"
+            "/": "/deeplink/login/*",
+            "comment": "Matches any URL whose path starts with /deeplink/login/"
+          },
+          {
+            "/": "/deeplink/",
+            "#": "*login*",
+            "comment": "Matches any URL whose path starts with /deeplink/#/login/"
+          },
+          {
+            "/": "/deeplink/signup/*",
+            "comment": "Matches any URL whose path starts with /deeplink/signup/"
+          },
+          {
+            "/": "/deeplink/",
+            "#": "*signup*",
+            "comment": "Matches any URL whose path starts with /deeplink/#/signup/"
+          }
+        ]
+      },
+      {
+        "appIDs": [
+            "NZ6PH75U7K.com.rainydayapps.Blockchain.alpha"
+        ],
+        "components": [
+          {
+            "/": "/deeplink/alpha/login/*",
+            "comment": "Matches any URL whose path starts with /deeplink/alpha/login/"
           },
           {
-            "/": "/*",
+            "/": "/deeplink/alpha/",
             "#": "*login*",
-            "comment": "Matches any URL whose path starts with /#/login/"
+            "comment": "Matches any URL whose path starts with /deeplink/alpha/#/login/"
           },
           {
-            "/": "/signup/*",
-            "comment": "Matches any URL whose path starts with /signup/"
+            "/": "/deeplink/alpha/signup/*",
+            "comment": "Matches any URL whose path starts with /deeplink/alpha/signup/"
           },
           {
-            "/": "/*",
+            "/": "/deeplink/alpha/",
             "#": "*signup*",
-            "comment": "Matches any URL whose path starts with /#/signup/"
+            "comment": "Matches any URL whose path starts with /deeplink/alpha/#/signup/"
           }
         ]
       }
     ]
   },
   "webcredentials": {
-    "apps": [ 
+    "apps": [
         "NZ6PH75U7K.com.rainydayapps.Blockchain",
         "NZ6PH75U7K.com.rainydayapps.Blockchain.staging",
         "NZ6PH75U7K.com.rainydayapps.Blockchain.dev",
         "NZ6PH75U7K.com.rainydayapps.Blockchain.alpha"
     ]
   }
-}
-
-
-
-
+}

config/mocks/wallet-options-v4.json

@@ -43,4 +43,4 @@
     "webSocket": "wss://ws.blockchain.info",
     "yapilyCallbackUrl": "https://blockchain.com/brokerage-link-success"
   }
-}
+}

lang/en.json

@@ -379,6 +379,7 @@
     "copy.not_now": "Not Now",
     "copy.now": "Now",
     "copy.number_of_business_days": "{first} to {second} Business Days",
+    "copy.not_enough_coin": "Not Enough {coin}",
     "copy.on_chain_txs": "On-chain transactions only",
     "copy.oops": "Oops. Something went wrong.",
     "copy.or": "or",
@@ -1049,7 +1050,7 @@
     "modals.send.firststep.fromcustody2": "Please backup your Wallet before before sending crypto to it.",
     "modals.send.banner.title": "Uprade to Gold. Send More Crypto.",
     "modals.send.banner.description": "Verify your ID now and unlock Gold level trading. Send up to {dayCurrencySymbol}{dayAmount} a day.",
-    "modals.send.banner.get_started": "Get Stared",
+    "modals.send.banner.get_started": "Get Started",
     "modals.send.over_your_limit": "Over your limit! Send up to {currency}{amount}.",
     "modals.sendbch.amountnotzeromessage": "Invalid amount",
     "modals.sendBch.firststep.bitpay.insufficientfunds": "Insufficient funds to complete BitPay transaction",
@@ -1208,6 +1209,7 @@
     "modals.simplebuy.checkout.max_card_limit": "Max Card Limit",
     "modals.simplebuy.checkout.maxbuy": "Max Buy",
     "modals.simplebuy.checkout.maxbuysell": "{orderType} Max",
+    "modals.simplebuy.checkout.sellmaxamount": "The maximum amount of {coin} you can sell from this account is {amount}",
     "modals.simplebuy.checkout.not_enough_funds_for_sell": "Not Enough funds for Sell",
     "modals.simplebuy.checkout.payment_method": "Payment Method",
     "modals.simplebuy.checkout.receive": "Recipient Account",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.59.1",
+  "version": "4.59.8",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": {
@@ -171,12 +171,12 @@
     "express": "4.17.1",
     "favicons": "6.2.2",
     "favicons-webpack-plugin": "5.0.2",
-    "fork-ts-checker-webpack-plugin": "6.3.3",
+    "fork-ts-checker-webpack-plugin": "6.4.0",
     "futoin-hkdf": "1.4.2",
     "generate-changelog": "1.8.0",
     "hoist-non-react-statics": "3.3.2",
     "html-replace-webpack-plugin": "2.6.0",
-    "html-webpack-plugin": "5.3.2",
+    "html-webpack-plugin": "5.5.0",
     "husky": "3.0.5",
     "identity-obj-proxy": "3.0.0",
     "istanbul": "0.4.5",
@@ -212,10 +212,10 @@
     "ts-loader": "8.3.0",
     "typecov": "0.2.3",
     "typescript": "3.8.3",
-    "webpack": "5.53.0",
-    "webpack-bundle-analyzer": "4.4.2",
-    "webpack-cli": "4.8.0",
-    "webpack-dev-server": "4.2.1",
+    "webpack": "5.62.0",
+    "webpack-bundle-analyzer": "4.5.0",
+    "webpack-cli": "4.9.1",
+    "webpack-dev-server": "4.4.0",
     "wsrun": "5.2.4"
   }
 }

packages/blockchain-info-components/src/Images/Images.ts

@@ -7,6 +7,7 @@ import airdropWelcome2 from './img/airdrop-welcome@2x.png'
 import airdropWelcomeBanner from './img/airdrop-welcome-banner.png'
 import airdropWelcomeBanner2 from './img/airdrop-welcome-banner@2x.png'
 import alert from './img/alert.svg'
+import alertOrange from './img/alert-orange.svg'
 import allowCamera from './img/allow-camera.png'
 import allowCamera2 from './img/allow-camera@2x.png'
 import allowCamera3 from './img/allow-camera@3x.png'
@@ -171,6 +172,7 @@ const Images = {
   'airdrop-welcome-banner2': airdropWelcomeBanner2,
   'airdrop-welcome2': airdropWelcome2,
   alert,
+  'alert-orange': alertOrange,
   'allow-camera': allowCamera,
   'allow-camera2': allowCamera2,
   'allow-camera3': allowCamera3,

packages/blockchain-wallet-v4-frontend/package.json

@@ -146,6 +146,7 @@
     "redux-logger": "3.0.6",
     "redux-persist": "5.10.0",
     "redux-saga": "1.1.3",
+    "regenerator-runtime": "0.13.9",
     "reselect": "4.0.0",
     "resize-observer-polyfill": "1.5.1",
     "rxjs": "6.6.7",

packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json

@@ -365,6 +365,7 @@
   "copy.from": "From",
   "copy.got_it": "Got It",
   "copy.has_new_name": "has a new name",
+  "copy.held_until": "Held until",
   "copy.here": "here",
   "copy.holdings": "Holdings",
   "copy.home": "Home",
@@ -505,9 +506,6 @@
   "error.swap_eligibility": "User not eligible for Swap",
   "error.trading_disabled": "Trading is temporarily disabled",
   "exchange-side-nav-tooltip-connected": "connected",
-  "exchangepromo.pairs": "Access 20+ trading pairs on the Exchange.",
-  "exchangepromo.trade": "Trade",
-  "exchangepromo.upgradeaccount": "Upgrade your account to buy, sell, and trade.",
   "faq.tooltip.description": "Frequently Asked Questions",
   "formhelper.ageovereighteen": "Must be 18 or older",
   "formhelper.card_expired": "Card Expired",
@@ -1139,8 +1137,12 @@
   "modals.secondpassword.confirm": "Confirm",
   "modals.secondpassword.explain1": "Second Password",
   "modals.secondpassword.title1": "Enter Your Second Password",
+  "modals.send.banner.description": "Verify your ID now and unlock Gold level trading. Send up to {dayCurrencySymbol}{dayAmount} a day.",
+  "modals.send.banner.get_started": "Get Stared",
+  "modals.send.banner.title": "Uprade to Gold. Send More Crypto.",
   "modals.send.firststep.backupnow": "Backup now.",
   "modals.send.firststep.fromcustody2": "Please backup your Wallet before before sending crypto to it.",
+  "modals.send.over_your_limit": "Over your limit! Send up to {currency}{amount}.",
   "modals.sendBch.firststep.bitpay.insufficientfunds": "Insufficient funds to complete BitPay transaction",
   "modals.sendBch.firststep.currency": "Currency",
   "modals.sendBch.firststep.desc": "Description",
@@ -1735,14 +1737,13 @@
   "scenes.lockbox.welcome.subtitle": "Trade, send and receive straight from your offline hardware wallet. Blockchain Lockbox works seamlessly with your Blockchain Wallet.",
   "scenes.lockbox.welcome.title": "Secure Your Crypto Offline",
   "scenes.lockbox.welcome.trouble": "Having trouble? View our",
-  "scenes.login._device_verification_expired.copy": "Return to your original device to request a new one.",
+  "scenes.login._device_verification_expired.copy": "The device approval link has expired, please try again.",
   "scenes.login.account_signup": "Don't have a Blockchain Account?",
   "scenes.login.approve": "Approve your login",
   "scenes.login.authorize": "Authorize login",
   "scenes.login.browserwarning": "Your browser is not supported. Please update to at least Chrome 45, Firefox 45, Safari 8, Edge, or Opera.",
-  "scenes.login.device_verification_expired": "Verification link expired.",
   "scenes.login.checkemail": "If you have an account registered with this email address, you will receive an email with a link to verify your device.",
-  "scenes.login.device_verification_failed": "Device verification failed.",
+  "scenes.login.device_verification_expired": "Verification link expired.",
   "scenes.login.device_verification_rejected": "Device verification rejected.",
   "scenes.login.device_verified": "Your device is verified!",
   "scenes.login.device_verified.copy": "Return to previous browser to continue logging in.",

packages/blockchain-wallet-v4-frontend/src/assets/locales/index.d.ts

@@ -436,6 +436,7 @@ type MessagesType = {
   'copy.max': 'Max'
   'copy.min': 'Min'
   'copy.name': 'Name'
+  'copy.not_enough_coin': 'Not Enough {coin}'
   'copy.network_fee': 'Network Fee'
   'copy.next': 'Next'
   'copy.next_buy': 'Next Buy'
@@ -1370,6 +1371,10 @@ type MessagesType = {
   'modals.sendBch.firststep.networkfee': 'Network Fee'
   'modals.sendBch.firststep.share_tooltip': 'Add a note to remind yourself what this transaction relates to. This note will be private and only seen by you.'
   'modals.sendBch.firststep.towallet': 'To'
+  'modals.send.banner.title': 'Uprade to Gold. Send More Crypto.'
+  'modals.send.banner.description': 'Verify your ID now and unlock Gold level trading. Send up to {dayCurrencySymbol}{dayAmount} a day.'
+  'modals.send.banner.get_started': 'Get Started'
+  'modals.send.over_your_limit': 'Over your limit! Send up to {currency}{amount}.'
   'modals.sendbch.amountnotzeromessage': 'Invalid amount'
   'modals.sendbch.coin': 'Currency:'
   'modals.sendbch.firststep.blockbrowser': 'Sending Bitcoin Cash from Lockbox can only be done while using the Brave, Chrome, Firefox or Opera browsers.'
@@ -1532,6 +1537,7 @@ type MessagesType = {
   'modals.simplebuy.checkout.dailylimitexceeded': "You've reached your daily trading limit"
   'modals.simplebuy.checkout.buymax': 'Buy Max'
   'modals.simplebuy.checkout.buymin': 'Buy Min'
+  'modals.simplebuy.checkout.sellmaxamount': 'The maximum amount of {coin} you can sell from this account is {amount}'
   'modals.simplebuy.checkout.payment_method': 'Payment Method'
   'modals.simplebuy.checkout.receive': 'Recipient Account'
   'modals.simplebuy.checkout.larger_amount.title': 'Want to buy larger amounts?'
@@ -2279,6 +2285,7 @@ type MessagesType = {
   'scenes.login.qrcodelogin_failed': 'Login failed. Please refresh browser and try again.'
   'scenes.login.qrcodelogin_success': 'Success! Logging in...'
   'scenes.login.qrcodelogin_success_confirm': 'Please confirm the login on your mobile device.'
+  'scenes.login.qrcodelogin_refresh_code': 'Refresh Code'
   'scenes.login.recovery_options.title': 'Recovery Options'
   'scenes.login.recovery_options.cloud_backup.title': 'Recover Account with Cloud Backup'
   'scenes.login.recovery_options.cloud_backup': 'Restore your account using your phone and the cloud.'

packages/blockchain-wallet-v4-frontend/src/components/Exchange/index.tsx

@@ -18,6 +18,7 @@ export const Wrapper = styled.div`
 `
 export const AmountTextBox = styled(ResizeableFontInput(AutosizeTextBox))<{
   fiatActive: boolean
+  haveError: boolean
 }>`
   height: 86px;
   max-width: ${({ fiatActive }) => (fiatActive ? '100%' : '75%')};
@@ -43,7 +44,7 @@ export const AmountTextBox = styled(ResizeableFontInput(AutosizeTextBox))<{
     max-width: 100%;
     border: none;
     text-align: center;
-    color: ${(props) => props.theme.textBlack};
+    color: ${(props) => (props.haveError ? props.theme.red400 : props.theme.textBlack)};
     background-color: ${(props) => props.theme.white};
     font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
       Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif !important;

packages/blockchain-wallet-v4-frontend/src/components/Flyout/Banners/UpgradeToGold.tsx

@@ -5,7 +5,9 @@ import styled from 'styled-components'
 import Currencies from '@core/exchange/currencies'
 import { formatFiat } from '@core/exchange/utils'
 import { Button, Icon, Image, Text } from 'blockchain-info-components'
+import { convertBaseToStandard } from 'data/components/exchange/services'
 import { SeamlessLimits } from 'data/types'
+import { getEffectiveLimit } from 'services/custodial'
 import { media } from 'services/styles'
 
 const Wrapper = styled.div`
@@ -78,7 +80,6 @@ const CloseLink = styled.div`
 
 const UpgradeToGoldBanner = ({ limits, verifyIdentity }: Props) => {
   const [isBannerHidden, hideBanner] = useState(false)
-  const { suggestedUpgrade } = limits.globalLimit
 
   if (isBannerHidden) {
     return null
@@ -88,6 +89,13 @@ const UpgradeToGoldBanner = ({ limits, verifyIdentity }: Props) => {
     hideBanner((prevValue) => !prevValue)
   }
 
+  const effectiveLimit = getEffectiveLimit(limits)
+
+  // if there is no effective limit we can't show banner
+  if (!effectiveLimit) {
+    return null
+  }
+
   return (
     <Wrapper>
       <Column>
@@ -112,11 +120,10 @@ const UpgradeToGoldBanner = ({ limits, verifyIdentity }: Props) => {
               id='modals.send.banner.description'
               defaultMessage='Verify your ID now and unlock Gold level trading. Send up to {dayCurrencySymbol}{dayAmount} a day.'
               values={{
-                dayAmount: formatFiat(suggestedUpgrade.available.value, 0),
+                dayAmount: formatFiat(convertBaseToStandard('FIAT', effectiveLimit.limit.value), 0),
                 dayCurrencySymbol:
-                  Currencies[suggestedUpgrade.available.currency].units[
-                    suggestedUpgrade.available.currency
-                  ].symbol
+                  Currencies[effectiveLimit.limit.currency].units[effectiveLimit.limit.currency]
+                    .symbol
               }}
             />
           </Copy>
@@ -131,7 +138,7 @@ const UpgradeToGoldBanner = ({ limits, verifyIdentity }: Props) => {
             <FormattedMessage id='copy.not_now' defaultMessage='Not Now' />
           </BannerButton>
           <BannerButton onClick={verifyIdentity} data-e2e='continueToGold' nature='primary'>
-            <FormattedMessage id='modals.send.banner.get_started' defaultMessage='Get Stared' />
+            <FormattedMessage id='modals.send.banner.get_started' defaultMessage='Get Started' />
           </BannerButton>
         </Row>
       </Column>

packages/blockchain-wallet-v4-frontend/src/components/Flyout/Brokerage/OnHold.tsx

@@ -75,7 +75,7 @@ const OnHold = ({ fiatCurrency, handleHeaderClick, locks, totalLockedAmount }: P
                 unit: amount.currency as FiatType,
                 value: convertBaseToStandard('FIAT', amount.amount)
               })}
-              title={moment(expiresAt).format('MMMM Do')}
+              title={moment(expiresAt).format('MMMM Do YYYY')}
             />
           )
         })}

packages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxCoinAddresses/selectors.ts

@@ -83,7 +83,7 @@ export const getData = (
     includeInterest
       ? selectors.components.interest
           .getInterestAccountBalance(state)
-          .map((x) => x.DOGE)
+          .map((x) => x[coin])
           .map(toInterestDropdown)
           .map(toGroup('Rewards Account'))
       : Remote.of([])

packages/blockchain-wallet-v4-frontend/src/components/IdentityVerification/TierCard/index.tsx

@@ -189,7 +189,7 @@ export const TierCard = ({
               jumbo
               fullwidth
               nature='primary'
-              onClick={() => swapActions.showModal('SettingsProfile')}
+              onClick={() => swapActions.showModal({ origin: 'SettingsProfile' })}
               data-e2e='swapNowBtn'
             >
               <FormattedMessage

packages/blockchain-wallet-v4-frontend/src/data/components/actionTypes.ts

@@ -19,7 +19,6 @@ import * as sendBtc from './sendBtc/actionTypes'
 import * as sendEth from './sendEth/actionTypes'
 import * as sendXlm from './sendXlm/actionTypes'
 import * as signMessage from './signMessage/actionTypes'
-import * as swap from './swap/actionTypes'
 import * as uploadDocuments from './uploadDocuments/actionTypes'
 import * as veriff from './veriff/actionTypes'
 import * as withdraw from './withdraw/actionTypes'
@@ -47,7 +46,6 @@ export {
   sendEth,
   sendXlm,
   signMessage,
-  swap,
   uploadDocuments,
   veriff,
   withdraw,

packages/blockchain-wallet-v4-frontend/src/data/components/actions.ts

@@ -28,7 +28,7 @@ import * as sendXlm from './sendXlm/actions'
 import { actions as settings } from './settings/slice'
 import * as signMessage from './signMessage/actions'
 import { actions as buySell } from './simpleBuy/slice'
-import * as swap from './swap/actions'
+import { actions as swap } from './swap/slice'
 import * as uploadDocuments from './uploadDocuments/actions'
 import * as veriff from './veriff/actions'
 import * as withdraw from './withdraw/actions'