chore(merge): release 4.61-2 to 4.62

blockchain · Dec 21, 2021 · 58fe4d9 · 58fe4d9
2 parents 04e95a7 + cfec98d
commit 58fe4d9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json
@@ -339,6 +339,7 @@
   "copy.below_min": "{value} Minimum",
   "copy.below_min_amount": "Amount is below Min",
   "copy.below_swap_min": "Minimum Swap is {value}",
+  "copy.blockchain_fee": "Blockchain.com Fee",
   "copy.buy": "Buy",
   "copy.buy_amount_change_disclaimer": "The amounts you send and receive may change slightly due to market activity. Once an order starts, we are unable to stop it.",
   "copy.buy_now_for": "Buy Now for {for}",
@@ -1381,6 +1382,7 @@
   "modals.simplebuy.confirm.network_fees": "Network fees are set by the {coin} network.",
   "modals.simplebuy.confirm.payment": "Payment Method",
   "modals.simplebuy.confirm.payment_card": "Credit Card",
+  "modals.simplebuy.confirm.purchase": "Purchase",
   "modals.simplebuy.confirm.rate": "Exchange Rate",
   "modals.simplebuy.confirm.sale_amount": "Sale Amount",
   "modals.simplebuy.confirm.sell_description": "Final amount may change due to market activity.{linebreak} By approving this Sell you agree to Blockchain.com’s {linebreak}<a>Refund Policy.</a>",
@@ -1402,6 +1404,7 @@
   "modals.simplebuy.expiry_date": "Expiry Date",
   "modals.simplebuy.failed": "ID Verification Failed",
   "modals.simplebuy.fiataccountineligible": "your region.",
+  "modals.simplebuy.flexible_pricing": "This fee is based on trade size, payment method and asset being purchased on Blockchain.com",
   "modals.simplebuy.goldupgrade.step2.desc": "Most applications are approved within minutes but some may take a few days to be reviewed.",
   "modals.simplebuy.goldupgrade.step2.title": "Get Approved",
   "modals.simplebuy.goldupgrade.step3.desc": "Buy, Sell, Swap crypto instantly and never miss another big day in the market.",

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/buySell/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/buySell/sagas.ts
@@ -276,11 +276,6 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
       selectors.core.walletOptions.getFlexiblePricingModel
     )).getOrElse(false)
     try {
-      let buyQuote
-
-      if (isFlexiblePricingModel) {
-        buyQuote = S.getBuyQuote(yield select()).getOrFail(NO_QUOTE)
-      }
       const pair = S.getBSPair(yield select())
 
       if (!values) throw new Error(NO_CHECKOUT_VALUES)
@@ -289,9 +284,13 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
 
       // since two screens use this order creation saga and they have different
       // forms, detect the order type and set correct form to submitting
+      let buyQuote
       if (orderType === OrderType.SELL) {
         yield put(actions.form.startSubmit(FORM_BS_PREVIEW_SELL))
       } else {
+        if (isFlexiblePricingModel) {
+          buyQuote = S.getBuyQuote(yield select()).getOrFail(NO_QUOTE)
+        }
         yield put(actions.form.startSubmit(FORM_BS_CHECKOUT))
       }
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/index.js b/packages/blockchain-wallet-v4-frontend/src/index.js
@@ -6,7 +6,13 @@ import ReactDOM from 'react-dom'
 import { BrowserRouter } from 'react-router-dom'
 import styled from 'styled-components'
 
-import { FontGlobalStyles, IconGlobalStyles, Text, TextGroup } from 'blockchain-info-components'
+import {
+  FontGlobalStyles,
+  IconGlobalStyles,
+  Image,
+  Text,
+  TextGroup
+} from 'blockchain-info-components'
 
 import App from './scenes/app.tsx'
 import configureStore from './store'
@@ -30,7 +36,15 @@ const Row = styled.div`
   justify-content: center;
   align-items: flex-start;
   width: 100%;
-  margin-bottom: 15px;
+`
+const BlockchainLogoImage = styled(Image)`
+  display: block;
+  height: 25px;
+  width: 200px;
+`
+const ErrorText = styled(Text)`
+  color: white;
+  font-weight: 400;
 `
 
 configureStore()
@@ -49,21 +63,17 @@ configureStore()
   .catch((e) => {
     ReactDOM.render(
       <ErrorWrapper>
-        <Row>
-          <Text size='24px' weight={400} color='blue900'>
-            We&rsquo;ll be back soon!
-          </Text>
-        </Row>
         <Row>
           <TextGroup>
-            <Text size='18px' weight={400} color='blue900'>
+            <ErrorText size='18px'>
               Sorry for the inconvenience but we&rsquo;re performing some maintenance at the moment.
-            </Text>
-            <Text size='18px' weight={400} color='blue900'>
-              &mdash; The Blockchain Team
-            </Text>
+              We&rsquo;ll be back online soon!
+            </ErrorText>
           </TextGroup>
         </Row>
+        <Row style={{ marginTop: '60px' }}>
+          <BlockchainLogoImage name='blockchain-logo' />
+        </Row>
       </ErrorWrapper>,
       document.getElementById('app')
     )