chore(merge): merge dev

blockchain · Nov 19, 2021 · 6fe8abe · 6fe8abe
2 parents 0a9c30d + e826bee
commit 6fe8abe
Show file tree

Hide file tree

Showing 93 changed files with 4,405 additions and 2,149 deletions.
diff --git a/config/mocks/wallet-options-v4.json b/config/mocks/wallet-options-v4.json
@@ -16,53 +16,6 @@
       "sift": {
         "apiKey": "0ecd212038"
       },
-      "nfts": [
-        {
-          "opensea_slug": "doodles-official",
-          "display_name": "Doodles",
-          "image_url": "https://lh3.googleusercontent.com/7B0qai02OdHA8P_EOVK672qUliyjQdQDGNrACxs7WnTgZAkJa_wWURnIFKeOh5VTf8cfTqW3wQpozGedaC9mteKphEOtztls02RlWQ=s120"
-        },
-        {
-          "opensea_slug": "cryptopunks",
-          "display_name": "Cryptopunks",
-          "image_url": "https://lh3.googleusercontent.com/BdxvLseXcfl57BiuQcQYdJ64v-aI8din7WPk0Pgo3qQFhAUH-B6i-dCqqc_mCkRIzULmwzwecnohLhrcH8A9mpWIZqA7ygc52Sr81hE=s120"
-        },
-        {
-          "opensea_slug": "boredapeyachtclub",
-          "display_name": "Bored Ape Yacht Club",
-          "image_url": "https://lh3.googleusercontent.com/Ju9CkWtV-1Okvf45wo8UctR-M9He2PjILP0oOvxE89AyiPPGtrR3gysu1Zgy0hjd2xKIgjJJtWIc0ybj4Vd7wv8t3pxDGHoJBzDB=s120"
-        },
-        {
-          "opensea_slug": "parallelalpha",
-          "display_name": "Parallel Alpha",
-          "image_url": "https://lh3.googleusercontent.com/nxaymgd9aJIzLXb0r3oLO0VCMFi0Zex1ubTmEYekEKwOVq1YijOULDeT1qCjk71OTsQW47zmvZ2ZuycXorgu6WA6Wosc6CiOuVnAXGk=s120"
-        },
-        {
-          "opensea_slug": "theshiboshis",
-          "display_name": "The Shiboshis",
-          "image_url": "https://lh3.googleusercontent.com/9G_SbzGpWnId_ouP-rsTfv1UIeSaaayelyZVyo7eVETYp2uDXDXeH82Yvw4AchRHuKSrixHhGQ7ri5UUepQLaK9BpwhMH1yjImnXHA=s120"
-        },
-        {
-          "opensea_slug": "sandbox",
-          "display_name": "Sandbox",
-          "image_url": "https://lh3.googleusercontent.com/SXH8tW1siikB80rwCRnjm1a5xM_MwTg9Xl9Db6mioIk9HIlDM09pVoSR7GKJgS6ulSUpgW9BDtMk_ePX_NKgO9A=s60"
-        },
-        {
-          "opensea_slug": "cryptoadz-by-gremplin",
-          "display_name": "Cryptoadz",
-          "image_url": "https://lh3.googleusercontent.com/iofetZEyiEIGcNyJKpbOafb_efJyeo7QOYnTog8qcQJhqoBU-Vu9l3lXidZhXOAdu6dj4fzWW6BZDU5vLseC-K03rMMu-_j2LvwcbHo=s120"
-        },
-        {
-          "opensea_slug": "partydegenerates",
-          "display_name": "Party Degenerates",
-          "image_url": "https://lh3.googleusercontent.com/so2WQ5_GY72dOEffETYPsjc5Z1gv35qHITyikSRdqhtxYWaXqH4mRuBmxz1m0fFe-qGCPoCLZrND3zlpTi2OWWJipln9P66vVIGr=s120"
-        },
-        {
-          "opensea_slug": "cool-cats-nft",
-          "display_name": "Cool Cats",
-          "image_url": "https://lh3.googleusercontent.com/LIov33kogXOK4XZd2ESj29sqm_Hww5JSdO7AFn5wjt8xgnJJ0UpNV9yITqxra3s_LMEW1AnnrgOVB_hDpjJRA1uF4skI5Sdi_9rULi8=s120"
-        }
-      ],
       "featureFlags": {
         "nfts": true,
         "cEURRewards": true,

diff --git a/packages/blockchain-info-components/src/Footer/index.js b/packages/blockchain-info-components/src/Footer/index.js
@@ -388,7 +388,9 @@ class Footer extends PureComponent {
 
               <Column>
                 <BlueLogo name='blockchain-icon' height='44px' />
-                <Copyright>© {new Date().getFullYear()} BLOCKCHAIN LUXEMBOURG S.A.</Copyright>
+                <Copyright>
+                  © {new Date().getFullYear()} Blockchain Access (Ireland) Limited
+                </Copyright>
               </Column>
             </SiteNav>
             <LangNav>

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
@@ -347,7 +347,8 @@ type MessagesType = {
   'components.txlistitem.valueattime': 'Value When {type}'
   'components.txlistitem.watchonly': 'Non-Spendable'
   'copy.account': 'Account'
-  'copy.above_max': '{value} Maximum'
+  'copy.above_max': '{amount} Maximum'
+  'copy.above_max_amount': 'Amount is above Max'
   'copy.above_swap_max': 'You can swap up to {value}'
   'copy.above_swap_max_silver': 'Upgrade your profile to swap this amount.'
   'copy.actions': 'Actions'
@@ -375,7 +376,8 @@ type MessagesType = {
   'copy.bank_linked.name': 'Your {bankName} account is now linked to your Blockchain.com Wallet'
   'copy.bank_linked.title': 'Bank Linked!'
   'copy.below_swap_min': 'Minimum Swap is {value}'
-  'copy.below_min': '{value} Minimum'
+  'copy.below_min': '{amount} Minimum'
+  'copy.below_min_amount': 'Amount is below Min'
   'copy.buy_upgrade': 'Buy More Crypto'
   'copy.cancel': 'Cancel'
   'copy.canceled': 'Canceled'
@@ -771,6 +773,10 @@ type MessagesType = {
   'modals.brokerage.daily_limit': 'Daily Limit'
   'modals.brokerage.deposit_methods': 'Select a Deposit Method'
   'modals.brokerage.deposit_fiat': 'Deposit {fiat}'
+  'modals.brokerage.deposit_limit': 'Looks like your {bank} only allows deposits up to {maxAmount} at at time. To deposit {enterAmount}, split your deposit into multiple transactions.'
+  'modals.brokerage.withdraw_limit': 'Withdrawing from Trade Accounts cannot exceed {limit} a {time}. You have {remaining} remaining.'
+  'modals.brokerage.withdraw_limit_max': 'The maximum amount of {currency} you can withdraw from this account is {amount}'
+  'modals.brokerage.withdraw_limit_min': 'To offset fees, the minimum amount for any withdrawal is {amount} {currency}.'
   'modals.brokerage.ineligible_error': 'You are not eligible to make deposits and withdrawals with this currency.'
   'modals.brokerage.wire_fee': 'Wire Fee'
   'modals.brokerage.withdraw_fiat': 'Withdraw {fiat}'
@@ -1390,7 +1396,7 @@ type MessagesType = {
   '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.send.over_your_limit_and_period': 'Over your limit! Send up to {currency}{amount}. Now, your limit is {currency}{limit} a {period}.'
   '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.'
@@ -1441,6 +1447,11 @@ type MessagesType = {
   'modals.sendbtc.secondstep.send': 'Send Bitcoin'
   'modals.sendbtc.secondstep.to': 'To:'
   'modals.sendbtc.secontstep.sendtotal': 'Total:'
+  "modals.sendcrypto.coinselect.noaccounts": "Currently there are no accounts for the selected crypto.",
+  "modals.sendcrypto.coinselect.subtitle": "Select the wallet you want to send from.",
+  "modals.sendcrypto.coinselect.title": "Send Crypto",
+  "modals.sendcrypto.enteramount.title": "Send",
+  "modals.sendcrypto.enteramount.over_limits": "Sending from Trade Accounts cannot exceed {currency}{amount} a {period}. You have {currency}{remainingAmount} remaining.",
   'modals.sendeth.amountnotzeromessage': 'Invalid amount'
   'modals.sendeth.cointitle': 'Send {coinDisplayName}'
   'modals.sendeth.firststep.browserwarn': 'Sending Ether from Lockbox can only be done while using the Brave, Chrome, Firefox or Opera browsers.'
@@ -1549,11 +1560,15 @@ type MessagesType = {
   'modals.simplebuy.checkout.upgrade_to_gold': 'Trading limit reached. Upgrade to Gold'
   'modals.simplebuy.checkout.max_card_limit': 'Max Card Limit'
   'modals.simplebuy.checkout.belowmin': '{value} Minimum {orderType}'
+  'modals.simplebuy.checkout.buy.belowmin': 'To offset fees and market volatility, the minimum amount for any buy is {amount} {currency}.'
+  'modals.simplebuy.checkout.sell.belowmin': 'To offset fees and market volatility, the minimum amount for any sell is {amount} {currency}.'
+  'modals.simplebuy.checkout.buy.abovemax': 'The maximum amount of {coin} you can buy with your {currency} {amount}'
+  'modals.simplebuy.checkout.sell.abovemax': '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.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.sellmaxamount': 'You can buy up to {amount} per transaction. Upgrade to Gold & buy larger amounts with your bank or card.'
   'modals.simplebuy.checkout.payment_method': 'Payment Method'
   'modals.simplebuy.checkout.receive': 'Recipient Account'
   'modals.simplebuy.checkout.larger_amount.title': 'Want to buy larger amounts?'

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Flyout/Banners/UpgradeToGold.tsx b/packages/blockchain-wallet-v4-frontend/src/components/Flyout/Banners/UpgradeToGold.tsx
@@ -4,9 +4,9 @@ import styled from 'styled-components'
 
 import Currencies from '@core/exchange/currencies'
 import { formatFiat } from '@core/exchange/utils'
+import { CrossBorderLimits } from '@core/types'
 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'
 
@@ -146,6 +146,6 @@ const UpgradeToGoldBanner = ({ limits, verifyIdentity }: Props) => {
   )
 }
 
-type Props = { limits: SeamlessLimits; verifyIdentity: () => void }
+type Props = { limits: CrossBorderLimits; verifyIdentity: () => void }
 
 export default UpgradeToGoldBanner
diff --git a/...ges/blockchain-wallet-v4-frontend/src/components/Flyout/Brokerage/EnterAmount.stories.tsx b/...ges/blockchain-wallet-v4-frontend/src/components/Flyout/Brokerage/EnterAmount.stories.tsx
@@ -4,6 +4,7 @@ import { Provider } from 'react-redux'
 import { configureStore } from '@reduxjs/toolkit'
 import { ComponentMeta, ComponentStory } from '@storybook/react'
 import { combineReducers } from 'redux'
+import { FormErrors } from 'redux-form'
 
 import { SBPaymentTypes } from '@core/types'
 import form from 'data/form/reducers'
@@ -174,3 +175,37 @@ BankAccountWithdrawalNoAccount.args = {
   },
   withdrawableBalance: '5000'
 }
+
+export const WithdrawalError = Template.bind({})
+WithdrawalError.args = {
+  fee: '2500',
+  fiatCurrency: 'USD',
+  formErrors: { amount: 'errrrr' } as FormErrors,
+  handleBack: () => {},
+  handleMethodClick: () => {},
+  minWithdrawAmount: '1',
+  orderType: BrokerageOrderType.WITHDRAW,
+  paymentAccount: {
+    address: '******1234',
+    // @ts-ignore
+    agent: { account: '123456789' },
+
+    currency: 'USD',
+    fiat: true,
+    id: '1ce999d3-e7a9-4219-bb6d-59799993ab98',
+    name: 'Ralph K Jackson',
+    state: 'ACTIVE',
+    whitelisted: false
+  },
+  paymentMethod: {
+    currency: 'USD',
+    eligible: true,
+    limits: {
+      max: '2500000',
+      min: '500'
+    },
+    subTypes: [],
+    type: SBPaymentTypes.BANK_ACCOUNT
+  },
+  withdrawableBalance: '5000'
+}