Merge pull request #5964 from blockchain/release/v4.89

Release/v4.89

.release-it.json

@@ -14,9 +14,9 @@
     "changelog": "changelog -t $(git describe --abbrev=0 --tags) -f -",
     "commitMessage": "chore(Release): v${version}",
     "tagName": "v${version}",
-    "tagAnnotation": "Release v${version}",
-    "pushArgs": "--no-verify"
+    "tagAnnotation": "Release v${version}"
   },
+
   "github": {
     "release": true,
     "preRelease": true,

package.json

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

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

@@ -825,6 +825,9 @@
   "dex.customSlippage.placeholder": "Enter a percent",
   "dex.enter-swap-details.button.insufficient": "Insufficient {token}",
   "dex.enter-swap-details.deposit-more": "Deposit more {token}",
+  "dex.noTokenBalances.description": "Transfer from your Blockchain.com Account, send from any exchange, or ask a friend!",
+  "dex.noTokenBalances.receive-cta": "Receive Ethereum",
+  "dex.noTokenBalances.title": "To get started, transfer ETH to your wallet",
   "dex.onboarding.funds.title": "Keep control of your funds",
   "dex.onboarding.notEligible.description": "The DEX is not yet available in your account.",
   "dex.onboarding.notEligible.learnMoreAction": "Learn more",
@@ -1560,10 +1563,10 @@
   "modals.quote.countdown": "New quote in:",
   "modals.quote.soon": "soon",
   "modals.recoveryphrase.backupyourwallet.content.one": "1. Write down the 12 word phrase on the next screen in the exact order it appears.",
-  "modals.recoveryphrase.backupyourwallet.content.subheader": "In crypto, when you hold the private keys, you're in control of the funds in your Private Key Wallet. The downside is that WHOEVER holds your private keys can control your Private Key Wallet.",
+  "modals.recoveryphrase.backupyourwallet.content.subheader": "In crypto, when you hold the private keys, you're in control of the funds in your DeFi Wallet. The downside is that WHOEVER holds your private keys can control your DeFi Wallet.",
   "modals.recoveryphrase.backupyourwallet.content.three_update": "3. NEVER share your Secret Private Key Recovery Phrase with anyone.",
   "modals.recoveryphrase.backupyourwallet.content.two": "2. Keep it safe, ideally on a securely stored piece of paper (in other words, not a digital copy).",
-  "modals.recoveryphrase.backupyourwallet.content.warning": "Warning: If someone has your Secret Private Key Recovery Phrase they will have access to your Private Key Wallet and can withdraw funds.",
+  "modals.recoveryphrase.backupyourwallet.content.warning": "Warning: If someone has your Secret Private Key Recovery Phrase they will have access to your DeFi Wallet and can withdraw funds.",
   "modals.recoveryphrase.backupyourwallet.content.warningtwo_new": "Blockchain.com will never ask to view or receive your Secret Private Key Recovery Phrase.",
   "modals.recoveryphrase.backupyourwallet.content.youmust": "So you must:",
   "modals.recoveryphrase.backupyourwallet.later": "Do This Later",
@@ -1714,7 +1717,7 @@
   "modals.sendeth.insufficientfundsmessage": "Insufficient funds",
   "modals.sendeth.lowbalancewarning.title": "Running low!",
   "modals.sendeth.lowethwarningforerc20.explain1": "You'll need ETH to send your ERC20 Tokens",
-  "modals.sendeth.lowethwarningforerc20.title1": "Not Enough ETH in Private Key Wallet",
+  "modals.sendeth.lowethwarningforerc20.title1": "Not Enough ETH in DeFi Wallet",
   "modals.sendeth.maximumamountlink.maximum": "maximum",
   "modals.sendeth.maximumamountmessage": "Not enough funds. Use",
   "modals.sendeth.maximumfeelink.userecupperlimit": "Use our recommended upper limit.",
@@ -2214,7 +2217,7 @@
   "scenes.earn.active-rewards-learn.faq.required.answer": "You can transfer as little as $1 to an Active Rewards Account to start earning.",
   "scenes.earn.active-rewards-learn.faq.required.question": "What is the minimum amount required for Active Rewards?",
   "scenes.earn.active-rewards-learn.faq.title": "Frequently asked questions",
-  "scenes.earn.active-rewards-learn.faq.transfer.answer": "Transfers can be made from both Trading Accounts and Private Key Wallets. Transferring your funds from a Private Key Wallet includes a network fee determined by the asset’s network. Funds you transfer during the week will be included in the following week’s strategy.",
+  "scenes.earn.active-rewards-learn.faq.transfer.answer": "Transfers can be made from both Trading Accounts and DeFi Wallets. Transferring your funds from a DeFi Wallet includes a network fee determined by the asset’s network. Funds you transfer during the week will be included in the following week’s strategy.",
   "scenes.earn.active-rewards-learn.faq.transfer.question": "How do transfers work?",
   "scenes.earn.active-rewards-learn.faq.withdrawals.answer": "You can request a full withdrawal of your funds at any time. Your funds will be transferred to your Trading Account once the active strategy ends and rewards payouts are made.",
   "scenes.earn.active-rewards-learn.faq.withdrawals.question": "How do withdrawals work?",
@@ -2351,7 +2354,7 @@
   "scenes.login.phishingwarning": "Please check that you are visiting the correct URL",
   "scenes.login.recovery_options.cloud_backup": "Restore your account using your phone and the cloud.",
   "scenes.login.recovery_options.cloud_backup.title": "Recover Account with Cloud Backup",
-  "scenes.login.recovery_options.recovery_phrase": "Recover your private key wallet + trading accounts.",
+  "scenes.login.recovery_options.recovery_phrase": "Recover your DeFi wallet + trading accounts.",
   "scenes.login.recovery_options.recovery_phrase.title": "Use your recovery phrase",
   "scenes.login.recovery_options.standard_recovery": "Recover your trading accounts.",
   "scenes.login.recovery_options.standard_recovery.title": "Standard account recovery",

packages/blockchain-wallet-v4-frontend/src/scenes/Dex/Swap/components/BaseRateAndFees/BaseRateAndFees.tsx

@@ -92,7 +92,7 @@ export const BaseRateAndFees = ({
   return props.swapQuote ? (
     <Wrapper>
       <Text variant='paragraph2' color={SemanticColors.title}>
-        1 {buySymbol} = ~{counterPrice} {sellSymbol}
+        1 {sellSymbol} = ~{counterPrice} {buySymbol}
       </Text>
       {!isQuoteLocked && currentChain && (
         <Flex alignItems='center'>