feat(mobile auth): cleanup login page styles and merge development

config/mocks/wallet-options-v4.json

@@ -343,65 +343,18 @@
           "txListAppRoute": "/wdgld/transactions"
         }
       },
-      "sfox": {
-        "countries": ["US"],
-        "states": [
-          "AK",
-          "AZ",
-          "CA",
-          "CO",
-          "DE",
-          "ID",
-          "IL",
-          "IN",
-          "KY",
-          "LA",
-          "MA",
-          "MD",
-          "ME",
-          "MI",
-          "MO",
-          "MT",
-          "NE",
-          "NH",
-          "NJ",
-          "NV",
-          "OK",
-          "OH",
-          "PA",
-          "RI",
-          "TN",
-          "TX",
-          "UT",
-          "VA",
-          "WI",
-          "WV",
-          "WY"
-        ],
-        "config": {
-          "production": false,
-          "apiKey": "6CD61A0E965D48A7B1883A860490DC9E",
-          "plaid": "0b041cd9e9fbf1e7d93a0d5a39f5b9",
-          "plaidEnv": "sandbox",
-          "siftScience": "a19cc360a1"
-        }
-      },
       "sift": {
         "apiKey": "0ecd212038",
         "paymentKey": "4a0510ff14"
       }, 
       "mobile_auth": {
         "enabled": true
       }
-    },
-    "ios": {},
-    "android": {}
+    }
   },
   "domains": {
     "api": "https://api.blockchain.info",
     "bitpay": "https://bitpay.com",
-    "coinify": "https://app-api.coinify.com",
-    "coinifyPaymentDomain": "https://pay.coinify.com",
     "comRoot": "https://www.blockchain.com",
     "comWalletApp": "https://login.blockchain.com",
     "everypay": "https://igw-demo.every-pay.com",
@@ -410,7 +363,6 @@
     "ledger": "https://manager.api.live.ledger.com",
     "ledgerSocket": "wss://api.ledgerwallet.com",
     "root": "https://blockchain.info",
-    "thePit": "https://pit.blockchain.com",
     "veriff": "https://magic.veriff.me",
     "walletHelper": "https://wallet-helper.blockchain.com",
     "webSocket": "wss://ws.blockchain.info"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.47.27",
+  "version": "4.47.28",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": {

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

@@ -1294,14 +1294,16 @@
   "modals.tradinglimits.deposits_and_withdrawals": "Deposits & Withdrawals",
   "modals.tradinglimits.description": "Unlock features within your Blockchain.com Wallet. Some features may ask you to verify your identity.",
   "modals.tradinglimits.earn_interest": "Earn Interest",
-  "modals.tradinglimits.gold_description": "You’ll need to verify your identity by uploading an ID and a selfie. Requires Silver Tier Approval",
+  "modals.tradinglimits.gold_desc1": "You’ll need to verify your identity by uploading an ID and a selfie.",
+  "modals.tradinglimits.gold_desc2": "Requires Silver Tier approval.",
   "modals.tradinglimits.gold_subheader": "Earn Interest & trade up to {amount}/day.",
   "modals.tradinglimits.locked": "Locked",
   "modals.tradinglimits.receive_crypto": "Receive Crypto",
   "modals.tradinglimits.send_crypto": "Send Crypto",
-  "modals.tradinglimits.silver_description": "Please verify your email address, add your name, home address and date of birth.",
+  "modals.tradinglimits.silver_desc": "You’ll need to verify your email address, name, home address and date of birth.",
   "modals.tradinglimits.silver_subheader": "Trade up to {amount}/year.",
   "modals.tradinglimits.swap_crypto": "Swap Crypto",
+  "modals.tradinglimits.unlock_gold_tier": "Unlock Gold Tier ->",
   "modals.tradinglimits.unlocked": "Unlocked",
   "modals.transactions.report.download": "Download Report",
   "modals.transactions.report.enddate": "end date",
@@ -1612,7 +1614,7 @@
   "scenes.lockbox.welcome.trouble": "Having trouble? View our",
   "scenes.login.browserwarning": "Your browser is not supported. Please update to at least Chrome 45, Firefox 45, Safari 8, Edge, or Opera.",
   "scenes.login.clickhere": "click here.",
-  "scenes.login.findyourguid": "Your Wallet ID can be found at the bottom of any email we’ve ever sent you. Need a reminder?",
+  "scenes.login.forgotid": "Forgot your Wallet ID? Request a reminder via email.",
   "scenes.login.google": "Authenticator App Code",
   "scenes.login.guid": "Wallet ID",
   "scenes.login.guiderror": "Unknown Wallet ID. If you need a reminder",
@@ -1624,7 +1626,6 @@
   "scenes.login.needhelp": "Need some help?",
   "scenes.login.password": "Password",
   "scenes.login.resendsms": "Resend SMS",
-  "scenes.login.sendguid": "Send my Wallet ID",
   "scenes.login.simplebuy.header": "Buy Crypto With Credit Card",
   "scenes.login.version": "Version {version}",
   "scenes.login.wallet.link": "Dont have a wallet?",

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

@@ -2,9 +2,6 @@
 // Update MessagesType w/ new messages
 // en.json is updated ✨automatically ✨when releases are built
 
-import { FormattedMessage } from 'react-intl'
-import React from 'react'
-
 type MessagesType = {
   'bitpaycta.nowsupporting': 'Your {coin} wallet now supports'
   'borrow.amount.tooltip.description': 'This amount does not include the required collateral network fee.'
@@ -369,6 +366,7 @@ type MessagesType = {
   'copy.max': 'Max'
   'copy.in_review': 'In Review'
   'copy.min': 'Min'
+  'copy.most_popular': 'Most Popular'
   'copy.negative_incoming_swap': 'Amount is below withdrawal fee.'
   'copy.new': 'New'
   'copy.new_swap': 'New Swap'
@@ -1372,7 +1370,6 @@ type MessagesType = {
   'modals.simplebuy.interest_banner.title': 'Earn {interestRate}% on this {displayName} Purchase'
   'modals.simplebuy.interest_banner.description': 'Send your {amount}{currency} to your {displayName} Interest Account.'
   'modals.simplebuy.interest_banner.earn_now': 'Earn Now ->'
-  'modals.simplebuy.most_popular': 'Most Popular'
   'modals.simplebuy.select_crypto': 'Easily buy and sell Crypto straight from your Wallet.'
   'modals.simplebuy.selectcrypto.sell_banner_title': 'Want to sell from your other Wallets?'
   'modals.simplebuy.selectcrypto.sell_banner_description': 'Send crypto from your Wallets to your <b>Trading Wallet</b>s. Once that send completes, sell that crypto for cash.'
@@ -1494,8 +1491,9 @@ type MessagesType = {
   'modals.tradinglimits.approved': 'Approved'
   'modals.tradinglimits.description': 'Unlock features within your Blockchain.com Wallet. Some features may ask you to verify your identity.'
   'modals.tradinglimits.locked': 'Locked'
-  'modals.tradinglimits.silver_description': 'Please verify your email address, add your name, home address and date of birth.'
-  'modals.tradinglimits.gold_description': 'You’ll need to verify your identity by uploading an ID and a selfie. Requires Silver Tier Approval'
+  'modals.tradinglimits.silver_desc': 'You’ll need to verify your email address, name, home address and date of birth.'
+  'modals.tradinglimits.gold_desc1': 'You’ll need to verify your identity by uploading an ID and a selfie.'
+  'modals.tradinglimits.gold_desc2': 'Requires Silver Tier approval.'
   'modals.tradinglimits.gold_subheader': 'Earn Interest & trade up to {amount}/day.'
   'modals.tradinglimits.silver_subheader': 'Trade up to {amount}/year.'
   'modals.tradinglimits.unlocked': 'Unlocked'
@@ -1506,6 +1504,7 @@ type MessagesType = {
   'modals.tradinglimits.buy_with_a_card': 'Buy with a Card'
   'modals.tradinglimits.deposits_and_withdrawals': 'Deposits & Withdrawals'
   'modals.tradinglimits.earn_interest': 'Earn Interest'
+  'modals.tradinglimits.unlock_gold_tier': 'Unlock Gold Tier ->'
   'modals.twostepgoogleauthenticator.enable': 'Enable 2FA'
   'modals.twostepgoogleauthenticator.explain': 'Scan this QR code with your Google Authenticator app on your mobile phone (download for iOS or Android).'
   'modals.twostepgoogleauthenticator.explain2': 'Once scanned you will be presented with a random 6 digit number.'
@@ -1926,7 +1925,7 @@ type MessagesType = {
   'scenes.lockbox.welcome.trouble': 'Having trouble? View our'
   'scenes.login.browserwarning': 'Your browser is not supported. Please update to at least Chrome 45, Firefox 45, Safari 8, Edge, or Opera.'
   'scenes.login.clickhere': 'click here.'
-  'scenes.login.findyourguid': 'Your Wallet ID can be found at the bottom of any email we’ve ever sent you. Need a reminder?'
+  'scenes.login.needhelp': 'Need additional help logging in?'
   'scenes.login.google': 'Authenticator App Code'
   'scenes.login.guid': 'Wallet ID'
   'scenes.login.guiderror': 'Unknown Wallet ID. If you need a reminder '
@@ -1935,14 +1934,12 @@ type MessagesType = {
   'scenes.login.login': 'Log In'
   'scenes.login.loginmobile': 'Login via Mobile'
   'scenes.login.mobile': 'SMS Code'
-  'scenes.login.needhelp': 'Need help?'
+  'scenes.login.gethelp': 'Get Help'
   'scenes.login.version': 'Version {version}'
   'scenes.login.password': 'Password'
   'scenes.login.resendsms': 'Resend SMS'
-  'scenes.login.sendguid': 'Send my Wallet ID'
   'scenes.login.simplebuy.header': 'Buy Crypto With Credit Card'
   'scenes.login.wallet.link': "Don't have a wallet?"
-  'scenes.login.wallet.signup': 'Sign up Now'
   'scenes.login.wallet.message.sent': 'Message Sent'
   'scenes.login.wallet.connected.title': 'Mobile Device Connected'
   'scenes.login.wallet.connected.description_1': 'We sent your connected mobile device a notification. Open the app to auto-log in on the web.'
@@ -2437,7 +2434,15 @@ type MessagesType = {
   'swap.carousel.title.page4': 'You Control Your Key'
   'swap.carousel.title.page5': 'Manage Risk Better'
   'swap.getstarted.readytoswap.body': 'Complete your profile and start exchanging cryptocurrencies today.'
-  'swap.getstarted.readytoswap.title': 'Ready to Swap? '
+  'swap.getstarted.readytoswap.title': 'Ready to Swap?'
+  'swap.no_holdings.get_started': 'You’re all set to Swap but we don’t see any crypto in this Wallet. Below are 3 ways to get started.'
+  'swap.no_holdings.own_some_first': 'But you’ll need to own some first...'
+  'swap.no_holdings.buy_with_card.title': 'Buy with a Card'
+  'swap.no_holdings.buy_with_card.description': 'Instantly buy crypto with any Visa or Mastercard. You will need to verify your identiy to link a card'
+  'swap.no_holdings.buy_with_bank.title': 'Buy with a Bank Deposit'
+  'swap.no_holdings.buy_with_bank.description': 'Send cash directly from your bank. Once received, we’ll use use that balance to buy the crypto of your choice.'
+  'swap.no_holdings.receive_another_wallet.title': 'Receive from Another Wallet'
+  'swap.no_holdings.receive_another_wallet.description': 'Are you holding crypto on a different wallet? Does a friend want to send you some Bitcoin? Copy & paste or share your unique wallet addresses QR codes.'
   'tooltip.comingsoon': 'Coming soon.'
   'tooltip.copied': 'Copied!'
   'tooltip.transaction.pending.eth': 'Your transaction is currently pending. You can attempt to resend it with a higher fee.'

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

@@ -95,6 +95,7 @@ export type SBShowModalOriginType =
   | 'TransactionList'
   | 'WelcomeModal'
   | 'WithdrawModal'
+  | 'SwapNoHoldings'
 
 export enum SBCardStateEnum {
   PENDING,

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

@@ -38,6 +38,7 @@ export type SwapCoinType = CoinType
 export enum SwapStepType {
   'INIT_SWAP',
   'COIN_SELECTION',
+  'NO_HOLDINGS',
   'ENTER_AMOUNT',
   'UPGRADE_PROMPT',
   'PREVIEW_SWAP',
@@ -223,6 +224,10 @@ export type SwapStepPayload =
     }
   | { options: { side: 'BASE' | 'COUNTER' }; step: 'COIN_SELECTION' }
   | { options?: never; step: 'UPGRADE_PROMPT' }
+  | {
+      options?: never
+      step: 'NO_HOLDINGS'
+    }
 
 export type SwapActionTypes =
   | FetchCustodialEligibilityFailureActionType

packages/blockchain-wallet-v4-frontend/src/data/modals/types.ts

@@ -83,6 +83,7 @@ export type ModalOriginType =
   | 'SwapGetStarted'
   | 'SwapPrompt'
   | 'SwapLimitPrompt'
+  | 'SwapNoHoldings'
   | 'TheExchangePage'
   | 'TradingLimits'
   | 'TransactionList'

packages/blockchain-wallet-v4-frontend/src/layouts/Public/components/Footer/index.tsx

@@ -1,9 +1,8 @@
+import { FormattedMessage } from 'react-intl'
 import React from 'react'
+import styled from 'styled-components'
 
-import { FormattedMessage } from 'react-intl'
 import { Link } from 'blockchain-info-components'
-import { LinkContainer } from 'react-router-bootstrap'
-import styled from 'styled-components'
 
 const VersionWrapper = styled.span`
   margin-top: 4px;
@@ -33,14 +32,6 @@ const Footer = () => (
         />
       </Link>
     </VersionWrapper>
-    <LinkContainer to='/help'>
-      <Link size='16px' weight={500} color='grey400' data-e2e='loginGetHelp'>
-        <FormattedMessage
-          id='scenes.login.needhelp'
-          defaultMessage='Need help?'
-        />
-      </Link>
-    </LinkContainer>
   </>
 )