chore(conflicts): resolve conflicts

config/mocks/wallet-options-v4.json

@@ -72,6 +72,7 @@
         "showProveFlow": true,
         "showSilverRevamp": true,
         "showTermsAndConditions": false,
+        "sofiAssociateUserBeforeEmailVerification": true,
         "stakingPromoBanner": true,
         "stxSelfCustodyEnableAirdrop": true,
         "stxSelfCustodyEnableAll": true,

package.json

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

packages/blockchain-info-components/src/Images/Images.ts

@@ -121,8 +121,10 @@ import googlePay from './img/google-pay-icon.svg'
 import googlePlayBadge from './img/google-play-badge.svg'
 import greyVerified from './img/grey-verified.svg'
 import identification from './img/identification.svg'
-import identifcationCircle from './img/identification-circle.svg'
+import identificationCircle from './img/identification-circle.svg'
+import identificationCircleBlack from './img/identification-circle-black.svg'
 import identityVerification from './img/identity-verification.svg'
+import identityVerificationPending from './img/identity-verification-pending.svg'
 import instagram from './img/instagram.svg'
 import interest from './img/interest.svg'
 import introHand from './img/intro-hand.png'
@@ -147,6 +149,7 @@ import nftNothingHere from './img/nfts/nft-nothing-here.svg'
 import nftPurchase from './img/nfts/nft-purchase.svg'
 import nftnouns from './img/nfts/nouns.png'
 import nftpainthyperlink from './img/nfts/paint-hyperlink.png'
+import noBalance from './img/no-balance.svg'
 import offline from './img/offline.svg'
 import opensea from './img/opensea.png'
 import percentLightBlueCircle from './img/percent-light-blue-circle.svg'
@@ -169,6 +172,7 @@ import sendCrypto from './img/send-crypto.svg'
 import sendNoFundsPromo from './img/send-no-funds-promo.svg'
 import smartphone from './img/smartphone.png'
 import sofiBlockchainMigration from './img/sofi-blockchain-migration.svg'
+import sofiFinishMigration from './img/sofi-finish-migration.svg'
 import sofiMigrationPending from './img/sofi-migration-pending.svg'
 import sourceOfWealth from './img/source-of-wealth.svg'
 import ssBcLogo from './img/ss-bc-logo.svg'
@@ -311,8 +315,10 @@ const Images = {
   'google-play-badge': googlePlayBadge,
   'grey-verified': greyVerified,
   identification,
-  'identification-circle': identifcationCircle,
+  'identification-circle': identificationCircle,
+  'identification-circle-black': identificationCircleBlack,
   'identity-verification': identityVerification,
+  'identity-verification-pending': identityVerificationPending,
   instagram,
   interest,
   'intro-card': introCard,
@@ -332,6 +338,7 @@ const Images = {
   'nft-nouns': nftnouns,
   'nft-paint-hyperlink': nftpainthyperlink,
   'nft-purchase': nftPurchase,
+  'no-balance': noBalance,
   offline,
   'onboarding-active-rewards': onboardingActiveRewards,
   'onboarding-earn': onboardingEarn,
@@ -364,6 +371,7 @@ const Images = {
   'sesocio-to-blockchain-logo': ssBcLogo,
   smartphone,
   'sofi-blockchain-migration': sofiBlockchainMigration,
+  'sofi-finish-migration': sofiFinishMigration,
   'sofi-migration-pending': sofiMigrationPending,
   'source-of-wealth': sourceOfWealth,
   'subtract-check-circle': subtractCheckCircle,

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

@@ -2,6 +2,9 @@
   "addCardCheckoutDotCom.creditCardInfoCard.button": "Learn More",
   "addCardCheckoutDotCom.creditCardInfoCard.content": "Many credit cards don’t support crypto purchases. Debit cards usually work best.",
   "addCardCheckoutDotCom.creditCardInfoCard.title": "Did you know?",
+  "banners.sofi.migration.finish.button": "Finish Migration",
+  "banners.sofi.migration.finish.description": "One more thing before your migration is done.",
+  "banners.sofi.migration.finish.title": "Finish migrating from SoFi",
   "banners.sofi.migration.pending.description": "We are migrating your account. This process might take up to 24 hours.",
   "banners.sofi.migration.pending.title": "Migration in progress",
   "button.compare": "Compare",
@@ -45,9 +48,7 @@
   "buttons.edit": "Edit",
   "buttons.go": "Go",
   "buttons.go_back": "Go Back",
-  "buttons.go_back_to_bc_app": "Go back to Blockchain.com App",
   "buttons.go_to_my_portfolio": "Go To My Portfolio",
-  "buttons.go_to_sofi": "Go to SoFi account",
   "buttons.google_pay": "Google Pay",
   "buttons.hide": "Hide",
   "buttons.import_now": "Import Now",
@@ -61,6 +62,7 @@
   "buttons.next": "Next",
   "buttons.offer_submitted_for": "Offer Submitted For",
   "buttons.ok": "OK",
+  "buttons.open_app": "Open the Blockchain.com App",
   "buttons.password": "Password",
   "buttons.preview_buysell": "Preview {orderType}",
   "buttons.preview_swap": "Preview Swap",
@@ -85,6 +87,7 @@
   "buttons.show": "Show",
   "buttons.signup": "Sign Up",
   "buttons.signup_now": "Sign up Now ->",
+  "buttons.sofi_support": "Does something look wrong?",
   "buttons.submit": "Submit",
   "buttons.submitting_your_offer_for": "Submitting Your Offer For",
   "buttons.swap": "Swap",
@@ -96,6 +99,7 @@
   "buttons.verify": "Verify",
   "buttons.verify_id_now": "Verify My ID Now",
   "buttons.verify_now": "Verify Now",
+  "buttons.view_dashboard": "Go to dashboard",
   "buttons.view_my_account": "View my account",
   "buttons.volume": "Volume",
   "buttons.withdraw": "Withdraw",
@@ -2458,6 +2462,7 @@
   "scenes.security.advanced.secondpassword.enabled": "Enabled",
   "scenes.security.advanced.secondpassword.title": "Second Password",
   "scenes.security.email.changeemail.description": "<b>Note:</b> This will change your Blockchain.com Account's email address.",
+  "scenes.security.email.lowercase": "Please enter your email address using lowercase letters only.",
   "scenes.security.email.settings.updateform.change": "Change Email",
   "scenes.security.email.settings.updateform.resendemail": "Resend Email",
   "scenes.security.email.unverified.title": "Two-Factor Authentication",
@@ -2709,10 +2714,13 @@
   "scenes.signup.sofi.header": "Let’s get your account setup.",
   "scenes.signup.sofi.subtitle": "Create a password for your Blockchain.com account. Next, we’ll migrate your crypto from SoFi.",
   "scenes.sofi.continueonmobile.description1": "At this moment, the Blockchain.com Wallet is only available on mobile for your region.",
-  "scenes.sofi.continueonmobile.description2": "To keep enjoying your Blockchain.com experience, download the app.",
-  "scenes.sofi.login.success.mobile.title": "Your account has been successfully migrated. Download the Blockchain.com App now to continue your journey.",
+  "scenes.sofi.continueonmobile.description2": "To keep enjoying your Blockchain.com experience, please use the mobile app.",
+  "scenes.sofi.flyout.finishingmigration.body1": "We’re experiencing high volumes of migrations, and we’ll notify you of the status of your migration.",
+  "scenes.sofi.flyout.finishingmigration.title": "Finishing Migration",
+  "scenes.sofi.login.success.mobile.title": "Your account has been successfully migrated. Open the Blockchain.com App now to continue your journey.",
   "scenes.sofi.login.success.title": "Your account was successfully migrated. Your crypto balances have been imported.",
   "scenes.sofi.modal.migratedbalances.header": "You’re all set! 🎉",
+  "scenes.sofi.modal.migratedbalances.header.noassets": "No assets were migrated",
   "scenes.sofi.modal.migratedbalances.pending.header": "Migration in progress 🕔",
   "scenes.sofi.signup.continueonphone": "Continue on your phone",
   "scenes.sofi.signup.failure.expired.body": "Restart your crypto account migration from your account on the SoFi website.",
@@ -2728,7 +2736,9 @@
   "scenes.sofi.signup.welcome.existing": "Already have a Blockchain account?",
   "scenes.sofi.signup.welcome.new": "New to Blockchain.com?",
   "scenes.sofi.welcome.header": "Welcome to Blockchain.com!",
+  "scenes.sofi.welcome.modal.awaiting": "You`re almost there! We have just verify your SoFi account before the migration is finished.",
   "scenes.sofi.welcome.modal.body": "Congrats! You can now continue your crypto experience with Blockchain.com.",
+  "scenes.sofi.welcome.modal.body.noassets": "Your SoFi account had no assets to migrate.",
   "scenes.sofi.welcome.modal.body.pending": "Here’s a list of all the assets being migrated from your SoFi account.",
   "scenes.sofi.welcome.modal.pending": "We are migrating your account. This process might take up to 24 hours.",
   "scenes.swap.low_fees": "Low Fees",
@@ -2823,7 +2833,6 @@
   "scenes.verifyemailtoken.error.alreadyverified.title": "Your email is already verified.",
   "scenes.verifyemailtoken.error.tryagain": "Try logging in again or contact support.",
   "scenes.verifyemailtoken.loading": "We're verifying your email address. Please wait...",
-  "scenes.verifyemailtoken.return_mobile_new": "Return to the app to access your Blockchain.com Account.",
   "scenes.verifyemailtoken.return_new": "Return to the previous tab to access your Blockchain.com Account.",
   "scenes.verifyemailtoken.verified": "Your email is verified!",
   "scenes.wallet.menutop.balance.totalbalance": "Total Balance",