Merge pull request #6497 from blockchain/fix/reset-2fa-redirect

fix/reset-2fa-redirect: fixed reset 2fa redirect
blockchain · Oct 25, 2024 · 47e8430 · 47e8430
2 parents 45c7ac0 + 5749f79
commit 47e8430
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/app.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/app.tsx
@@ -111,6 +111,7 @@ const useFullPathForRedirect = [
   '/wallet-options-v4.json',
   '/#/prove',
   '/#/reset-two-factor',
+  '/reset-two-factor',
   '/#/open',
   '/forgot-password',
   '/import-wallet',
@@ -305,11 +306,17 @@ const App = ({
 
     if (availableUI) {
       // eslint-disable-next-line
-      console.log('Redirecting to v5', fullPathCaseSensitive)
+      console.log('xx', 'Redirecting to v5', fullPathCaseSensitive)
       // Using **WALLET_V5_LINK** as a fallback for webpack builder.
       if (useFullPathForRedirect.some((prefix) => fullPath.startsWith(prefix))) {
+        console.log(
+          'xx',
+          `${window?.WALLET_V5_LINK + removeHash(fullPathCaseSensitive)}`,
+          'using full path for redirect'
+        )
         window.location.href = `${window?.WALLET_V5_LINK + removeHash(fullPathCaseSensitive)}`
       } else {
+        console.log('xx', window?.WALLET_V5_LINK, 'not using full path for redirect')
         window.location.href = window?.WALLET_V5_LINK
       }
 

diff --git a/packages/blockchain-wallet-v4-frontend/webpackBuilder.js b/packages/blockchain-wallet-v4-frontend/webpackBuilder.js
@@ -154,7 +154,7 @@ const buildWebpackConfig = (envConfig, extraPluginsList) => ({
           // Note: using an obvious redirection issue
           replacement: process.env.WALLET_V5_LINK
             ? process.env.WALLET_V5_LINK
-            : 'https://google.com'
+            : 'https://login-staging.blockchain.com/beta'
         },
         {
           pattern: '**APP_VERSION**',