fix(translations): fix dup keys and messages

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

@@ -10,6 +10,7 @@
   "borrow.validation.belowmin": "The amount you entered is below the minimum amount.",
   "borrow.validation.belowmin.safe": "You must enter an amount greater than {minFiat}.",
   "borrowhistory.model.pending": "Pending",
+  "buttons.ok": "OK",
   "buy.accountendingwith": "ending with",
   "buy.output_method.title.buy": "I want to buy",
   "buy.output_method.title.sell": "I want to sell",
@@ -255,9 +256,6 @@
   "components.alerts.verify_email_sent_error": "Error sending verification email. Please try again later.",
   "components.alerts.wallet_loading_error": "Could not retrieve essential data. Try again later.",
   "components.alerts.wallet_session_error": "Error establishing the session",
-  "components.alerts.wallet_tour_header": "Wallet Intro Tour",
-  "components.alerts.wallet_tour_info": "We've saved your Intro Tour under the What's New tab in case you ever want to revisit.",
-  "components.alerts.wallet_tour_start": "Start Tour",
   "components.alerts.wallet_upgrade_error": "Failed to upgrade to HD and save wallet.",
   "components.alerts.xlm_address_incorrect": "Invalid Stellar Address.",
   "components.alerts.yubikey_enable_error": "Failed to update Yubikey 2FA",
@@ -411,6 +409,7 @@
   "formhelper.unacceptedterms": "You must agree to the terms and conditions",
   "formhelper.uniquedevicename": "Device name is already in use.",
   "formhelper.uniquewalletname": "Wallet name is already taken.",
+  "home.balances.error.refresh": "Refresh {curr} Data",
   "identityverification.failure.button": "Start Trading",
   "identityverification.failure.content-1": "We're sorry we can't verify you for Gold. This can be for a number of reasons, for example your country might not be supported right now.",
   "identityverification.failure.content-2": "If you're Silver verified you can trade your crypto in Swap",
@@ -526,6 +525,7 @@
   "layouts.wallet.menuleft.navigation.blockchain-exchange-1": "Exchange",
   "layouts.wallet.menuleft.navigation.borrow": "Borrow",
   "layouts.wallet.menuleft.navigation.borrow.new": "New",
+  "layouts.wallet.menuleft.navigation.buycrypto": "Buy Crypto",
   "layouts.wallet.menuleft.navigation.buysell": "Buy & Sell",
   "layouts.wallet.menuleft.navigation.dashboard": "Dashboard",
   "layouts.wallet.menuleft.navigation.hardware": "Hardware",
@@ -1009,6 +1009,7 @@
   "modals.sendBch.firststep.continue": "Continue",
   "modals.sendBch.firststep.currency": "Currency",
   "modals.sendBch.firststep.desc": "Description",
+  "modals.sendBch.firststep.fromcustody.withdrawal": "Withdrawals from your Trading Wallet will be enabled soon.",
   "modals.sendBch.firststep.fromwallet": "From",
   "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.",
@@ -1048,6 +1049,7 @@
   "modals.sendbtc.firststep.estimated2": "Estimated confirmation time 0-60 minutes",
   "modals.sendbtc.firststep.fee.priority": "Priority",
   "modals.sendbtc.firststep.fee.regular": "Regular",
+  "modals.sendbtc.firststep.fromcustody.withdrawal": "Withdrawals from your Trading Wallet will be enabled soon.",
   "modals.sendbtc.firststep.fromwallet": "From",
   "modals.sendbtc.firststep.lockboxwarn": "You will need to connect your Lockbox to complete this transaction.",
   "modals.sendbtc.firststep.networkfee": "Network Fee",
@@ -1085,6 +1087,7 @@
   "modals.sendeth.firststep.description": "Add a note to remind yourself what this transaction relates to. This note will be private and only seen by you.",
   "modals.sendeth.firststep.fee.priority": "Priority",
   "modals.sendeth.firststep.fee.regular": "Regular",
+  "modals.sendeth.firststep.fromcustoday.withdrawal": "Withdrawals from your Trading Wallet will be enabled soon.",
   "modals.sendeth.firststep.lockboxwarn": "You will need to connect your Lockbox to complete this transaction.",
   "modals.sendeth.firststep.networkfee": "Network Fee",
   "modals.sendeth.firststep.sendamount": "Amount",
@@ -1120,6 +1123,7 @@
   "modals.sendxlm.firststep.currency": "Currency",
   "modals.sendxlm.firststep.desc": "Description",
   "modals.sendxlm.firststep.fee": "Transaction Fee:",
+  "modals.sendxlm.firststep.fromcustoday.withdrawal": "Withdrawals from your Trading Wallet will be enabled soon.",
   "modals.sendxlm.firststep.fromwallet": "From",
   "modals.sendxlm.firststep.lockboxwarn": "You will need to connect your Lockbox to complete this transaction.",
   "modals.sendxlm.firststep.memotooltip": "Memos are used to communicate optional information to the recipient.",
@@ -1189,6 +1193,72 @@
   "modals.signmessage.secondstep.message": "Message:",
   "modals.signmessage.secondstep.signature": "Signature:",
   "modals.signmessage.title": "Sign Message",
+  "modals.simplebuy.buycrypto": "Buy Crypto",
+  "modals.simplebuy.canceled": "Trade Canceled",
+  "modals.simplebuy.cancelorder.areyousure": "Are you sure?",
+  "modals.simplebuy.cancelorder.cancel": "Yes. Cancel Order",
+  "modals.simplebuy.cancelorder.goback": "No. Go Back",
+  "modals.simplebuy.cancelorder.outcome": "Cancelling this {pair} Buy will remove your order. You can always create a new order from the menu if you cancel now.",
+  "modals.simplebuy.checkingeligiblity": "Checking Eligibility...",
+  "modals.simplebuy.checkout.abovemax": "{value} Maximum {orderType}",
+  "modals.simplebuy.checkout.belowmin": "{value} Minimum {orderType}",
+  "modals.simplebuy.checkout.buymax": "Buy Max",
+  "modals.simplebuy.checkout.buymin": "Buy Min",
+  "modals.simplebuy.checkoutconfirm": "Checkout",
+  "modals.simplebuy.confirm.activity": "Your final amount may change due to market activity.",
+  "modals.simplebuy.confirm.confirm": "Confirm Order",
+  "modals.simplebuy.confirm.fee": "Fees",
+  "modals.simplebuy.confirm.payment": "Payment Method",
+  "modals.simplebuy.confirm.rate": "Exchange Rate",
+  "modals.simplebuy.confirm.total": "Total",
+  "modals.simplebuy.continue": "Continue",
+  "modals.simplebuy.doingwork": "Doing Some Work...",
+  "modals.simplebuy.eligible.failure": "Oops. Something went wrong on our side. Please try again.",
+  "modals.simplebuy.eligible.tryagain": "Try Again",
+  "modals.simplebuy.error": "Trade Failed",
+  "modals.simplebuy.failed": "ID Verification Failed",
+  "modals.simplebuy.fiataccountineligible": "your region.",
+  "modals.simplebuy.fiatregion": "your region",
+  "modals.simplebuy.gatheringinfo": "Gathering Some Info...",
+  "modals.simplebuy.localcurrency": "Select the local currency for your wallet.",
+  "modals.simplebuy.ordersummary": "Buy Order Summary",
+  "modals.simplebuy.pending": "Pending",
+  "modals.simplebuy.refresh": "Refresh",
+  "modals.simplebuy.selectcurrency": "Select Your Currency",
+  "modals.simplebuy.setupaccount": "Next, we'll set up your account.",
+  "modals.simplebuy.success": "Trade Complete",
+  "modals.simplebuy.summary.cancelbuy": "Cancel Buy",
+  "modals.simplebuy.summary.created": "Created",
+  "modals.simplebuy.summary.paymentmethod": "Payment Method",
+  "modals.simplebuy.summary.purchasing": "Purchasing",
+  "modals.simplebuy.summary.txid": "Transaction ID",
+  "modals.simplebuy.summary.viewtransferdets": "View Bank Transfer Details",
+  "modals.simplebuy.transactionfeed.canceled": "{type} Canceled",
+  "modals.simplebuy.transactionfeed.complete": "{type} Completed",
+  "modals.simplebuy.transactionfeed.failed": "{type} Failed",
+  "modals.simplebuy.transactionfeed.pending": "Pending {type}",
+  "modals.simplebuy.transactionfeed.unknown": "Unknown Status",
+  "modals.simplebuy.transactionfeed.waitingondepo": "Pending Deposit",
+  "modals.simplebuy.transactionlist.viewdetails": "View Details",
+  "modals.simplebuy.transferdetails": "Transfer Details",
+  "modals.simplebuy.transferdetails.IBAN": "IBAN",
+  "modals.simplebuy.transferdetails.account": "Account Number",
+  "modals.simplebuy.transferdetails.address": "Address",
+  "modals.simplebuy.transferdetails.amount": "Amount to Send",
+  "modals.simplebuy.transferdetails.bankname": "Bank Name",
+  "modals.simplebuy.transferdetails.info": "Securely transfer {fiatCurrency} from your bank account to Blockchain.com. Depending on the transfer method and availability of funds, this may take up to 1 business day.",
+  "modals.simplebuy.transferdetails.recipient": "Recipient",
+  "modals.simplebuy.transferdetails.routingnumber": "Routing Number",
+  "modals.simplebuy.transferdetails.sendfundsfrom": "Only send funds from a bank account in your name. If not, your deposit could be delayed or rejected.",
+  "modals.simplebuy.transferdetails.sendfundsfromok": "OK",
+  "modals.simplebuy.transferdetails.sortcode": "Sort Code",
+  "modals.simplebuy.transferdetails.swift": "Bank Code (SWIFT / BIC)",
+  "modals.simplebuy.underreview": "ID Verification Pending",
+  "modals.simplebuy.unknown": "Unknown Status",
+  "modals.simplebuy.unsupported-subcontent-1": "Well this is awkward. We don't support buying crypto yet for",
+  "modals.simplebuy.unsupported-subcontent-2": "We'll send you an update when we do.",
+  "modals.simplebuy.unsupported-title": "Buy Crypto Coming Soon for",
+  "modals.simplebuy.waitingondepo": "Waiting on Funds",
   "modals.sunriverlinkerror.airdrop_not_available": "We're sorry, the airdrop program is currently not available where you are.",
   "modals.sunriverlinkerror.already_received": "Looks like you've already received your airdrop!",
   "modals.sunriverlinkerror.campaign_has_expired": "We're sorry, this specific airdrop is over. Completing your profile will still give you access to higher Swap limits and future airdrops.",
@@ -1271,14 +1341,11 @@
   "modals.wallet.showxpub.close": "Close",
   "modals.wallet.showxpub.title": "Extended Public Key",
   "modals.wallet.showxpub.warning": "Don't share your Extended Public Key (xPub) with an untrusted source. Anyone with access to this key can keep track of your payments and may be able to disrupt access to your wallet.",
-  "modals.wallet.tour.buy-sell": "Buy & Sell",
-  "modals.wallet.tour.desc": "Discover your Wallet's tools and features by taking a quick tour.",
-  "modals.wallet.tour.later-button": "Maybe Later",
-  "modals.wallet.tour.securely-store": "Securely Store",
-  "modals.wallet.tour.sendrequest": "Send/Request",
-  "modals.wallet.tour.take-tour-button": "Take The Tour",
-  "modals.wallet.tour.trade": "Trade",
   "modals.wallet.tour.wallet.tour": "Welcome to Blockchain!",
+  "modals.wallet.welcome.sb.button": "Buy Crypto Now",
+  "modals.wallet.welcome.sb.skip": "Skip",
+  "modals.wallet.welcome.sb.title": "Own Crypto in a Few Minutes",
+  "modals.wallet.welcome.sb.verify": "Verify your identity and buy crypto with a bank transfer ",
   "modals.xlmairdropwelcome.inprogress.completenow": "Complete Now",
   "modals.xlmairdropwelcome.inprogress.subtitle2": "Complete your profile to start instantly trading crypto from the security of your wallet and become eligible for our Airdrop Program.",
   "modals.xlmairdropwelcome.inprogress.title2": "Go for Gold",
@@ -1805,9 +1872,12 @@
   "scenes.home.balance.hardware": "Hardware",
   "scenes.home.balance.total": "Total",
   "scenes.home.balance.wallet": "Wallet",
-  "scenes.home.banners.exchangebanner.content1": "We built our own exchange that links to your Wallet.",
-  "scenes.home.banners.exchangebanner.content3": "Instantly access more cryptos and deposit/withdraw cash.",
-  "scenes.home.banners.exchangebanner.getstarted": "Get Started",
+  "scenes.home.banner.finishsigningup": "Finish Signing Up",
+  "scenes.home.banner.kyc": "Continue",
+  "scenes.home.banner.pendingbuy": "Pending Buy",
+  "scenes.home.banner.receivetransfer": "Once we receive your bank transfer, your buy order will complete.",
+  "scenes.home.banner.sborder.details": "View Details",
+  "scenes.home.banner.signupapprove": "Once you finish and get approved, start buying crypto.",
   "scenes.home.banners.kycresubmit.resubmit": "Resubmit Now",
   "scenes.home.banners.kycresubmit.subtitle": "We had some issues with the documents you've supplied.  Please try uploading the documents again to continue with your verification.",
   "scenes.home.banners.kycresubmit.title": "Documents Needed",
@@ -1951,12 +2021,12 @@
   "scenes.priceindexseries.timefilters.month": "Month",
   "scenes.priceindexseries.timefilters.week": "Week",
   "scenes.priceindexseries.timefilters.year": "Year",
-  "scenes.profile.identityverification.pagetitle": "Swap Limits",
   "scenes.profile.identityverification.swaplimit.airdrops.learnmore": "Learn more.",
   "scenes.profile.identityverification.swaplimit.goldcompleteairdropeligible-1": "By completing the Gold Level requirements you are automatically eligible for our airdrop programs extended to your region.",
-  "scenes.profile.identityverification.swaplimit.learn_more_limits": "We’ve put together an article on Swap Limits. <a href='https://blockchain.zendesk.com/hc/en-us/articles/360018353031-Exchange-Limit-Amounts' rel='noopener noreferrer' target='_blank'>Learn more.</a>",
-  "scenes.profile.identityverification.swaplimit.sawp_limit": "Your Swap Limit is how much crypto you can trade each day. Swap Limits are necessary for compliance and fraud prevention.",
+  "scenes.profile.identityverification.swaplimit.learnmorelimits": "We’ve put together an article on Trading Limits. <a href='https://blockchain.zendesk.com/hc/en-us/articles/360018353031-Exchange-Limit-Amounts' rel='noopener noreferrer' target='_blank'>Learn more.</a>",
+  "scenes.profile.identityverification.swaplimit.tradelimit": "Your trading limits are how much you can trade each day. That includes Swap and Buy transactions. Limits are necessary for compliance and fraud prevention.",
   "scenes.profile.identityverification.swaplimit.wanttolearnmore": "Want to learn more?",
+  "scenes.profile.identityverification.tradingtitle": "Trading Limits",
   "scenes.profile.idv.swaplimit.airdropdisclaimer1": "Gold verification is currently under review. Once verified you'll be able to use Swap (trading up to {tier2Limit}) and also be eligible for future crypto airdrops!",
   "scenes.recover.firststep.back": "Go Back",
   "scenes.recover.firststep.continue": "Continue",
@@ -2316,30 +2386,15 @@
   "scenes.settings.tor.description": "Enable the following option to prevent IP addresses that are known to be part of the Tor anonymizing network from accessing your wallet.",
   "scenes.settings.tor.description2": "The Tor network is frequently used by hackers attempting to access Blockchain users wallets.",
   "scenes.settings.tor.title": "Wallet Access via Tor",
-  "scenes.transaction.content.empty.airdropready": "Airdrop Ready",
-  "scenes.transaction.content.empty.completeprofile": "Complete Profile",
-  "scenes.transaction.content.empty.freestx": "Complete your profile and get $10 for free.",
-  "scenes.transaction.content.empty.getstarted.explanation": "We've put together a page explaining all of this.",
   "scenes.transaction.content.empty.getstarted.learnmore": "Learn More",
-  "scenes.transaction.content.empty.getstarted.newcoinrequest": "Get {coin}",
-  "scenes.transaction.content.empty.getstarted.newcoinswap": "Swap {coin}",
-  "scenes.transaction.content.empty.ineligibleforairdrop": "Ineligible for Airdrop",
   "scenes.transaction.content.empty.newcoinbuy": "Buy {coin}",
   "scenes.transaction.content.empty.newcoinswap": "Send, Request and Swap {coinName} ({coinCode}) directly from your Blockchain Wallet.",
-  "scenes.transaction.content.empty.newcoinwallet": "Your {coin} Wallet",
-  "scenes.transaction.content.empty.pax.fact1.1": "Store Value",
-  "scenes.transaction.content.empty.pax.fact1.2": "in a stable, USD-backed account.",
-  "scenes.transaction.content.empty.pax.fact2.1": "Send",
-  "scenes.transaction.content.empty.pax.fact2.2": "to anyone in the world — anywhere, anytime.",
-  "scenes.transaction.content.empty.pax.fact3.1": "Trade",
-  "scenes.transaction.content.empty.pax.fact3.2": "into other cryptos and manage risk.",
-  "scenes.transaction.content.empty.pax.signupcta1": "Swap for USD Digital Now",
-  "scenes.transaction.content.empty.pax.subtitle1": "USD Digital is a crypto asset 100% backed by funds held in regulated US banks. 1 USD-D equals 1 US Dollar.",
-  "scenes.transaction.content.empty.pax.swapcta1": "Swap for USD Digital Now",
-  "scenes.transaction.content.empty.pax.title1": "A Digital US Dollar in",
-  "scenes.transaction.content.empty.pax.title2": "Your Wallet",
-  "scenes.transaction.content.empty.stxnew": "Blockstack apps protect your digital rights and are powered by the {displayName} ({coinCode}) blockchain.",
-  "scenes.transaction.content.empty.xlm.subtitle2": "XLM is a token that enables quick, low cost global transactions. Send, receive, and trade XLM from your Wallet today.",
+  "scenes.transaction.content.empty.transactions": "Transactions",
+  "scenes.transaction.headertext.explainer.bch": "Bitcoin Cash (BCH) is a fork of Bitcoin built for everday transactions.",
+  "scenes.transaction.headertext.explainer.btc": "Bitcoin (BTC) is the orginal crypto and the internet’s digital currency.",
+  "scenes.transaction.headertext.explainer.eth": "Ethereum (ETH) is a currency and computing platform. Built for developers and apps.",
+  "scenes.transaction.headertext.explainer.usdd": "The USD Digital coin (USD-D) is backed by the US Dollar, making it a Stablecoin.",
+  "scenes.transaction.headertext.explainer.xlm": "The Stellar Lumen (XLM) connects banks, payments and you to the Stellar Payment network.",
   "scenes.transactions.bitcoin.content.list.listitem.status.received": "Received",
   "scenes.transactions.bitcoin.content.list.listitem.status.sent": "Sent",
   "scenes.transactions.bitcoin.content.list.listitem.status.transferred": "Transferred",
@@ -2356,6 +2411,7 @@
   "scenes.transactions.performance.prices.day": "today",
   "scenes.transactions.performance.prices.price": "Current Price",
   "scenes.transactions.performance.prices.week": "this week",
+  "scenes.transactions.performance.request": "Request {coinTicker} Now",
   "scenes.transactions.walletbalancedropdown.balance": "Balance",
   "scenes.uploaddoc.browse": "or browse",
   "scenes.uploaddoc.browsecomputer": "Browse my computer",

packages/blockchain-wallet-v4-frontend/src/modals/SimpleBuy/EnterAmount/template.unsupported.tsx

@@ -92,13 +92,13 @@ const Unsupported: React.FC<Props> = props => {
             props.fiatCurrency
           ) : (
             <FormattedMessage
-              id='modals.simplebuy.fiataccountineligible'
+              id='modals.simplebuy.fiatregion'
               defaultMessage='your region'
             />
           )}
           {'. '}
           <FormattedMessage
-            id='modals.simplebuy.unsupported-subcontent-1'
+            id='modals.simplebuy.unsupported-subcontent-2'
             defaultMessage="We'll send you an update when we do."
           />
         </Subcontent>

packages/blockchain-wallet-v4-frontend/src/modals/SimpleBuy/TransferDetails/template.success.tsx

@@ -190,7 +190,7 @@ const Success: React.FC<Props> = props => {
           onClick={() => props.handleClose()}
         >
           <FormattedMessage
-            id='modals.simplebuy.transferdetails.sendfundsfrom'
+            id='modals.simplebuy.transferdetails.sendfundsfromok'
             defaultMessage='OK'
           />
         </Button>

packages/blockchain-wallet-v4-frontend/src/scenes/Home/Banners/SBOrderBanner/index.tsx

@@ -113,7 +113,7 @@ class SBOrderBanner extends PureComponent<Props> {
             </Text>
             <Copy size='16px' color='grey600' weight={500}>
               <FormattedMessage
-                id='scenes.home.banner.pendingbuy'
+                id='scenes.home.banner.receivetransfer'
                 defaultMessage='Once we receive your bank transfer, your buy order will complete.'
               />
             </Copy>

packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/template.headerexplainer.tsx

@@ -67,7 +67,7 @@ export const getHeaderExplainer = coinModel => {
       return (
         <ExplainerText>
           <FormattedMessage
-            id='scenes.transaction.headertext.explainer.eth'
+            id='scenes.transaction.headertext.explainer.bch'
             defaultMessage='Bitcoin Cash (BCH) is a fork of Bitcoin built for everday transactions.'
           />
           <LearnMoreLink