Merge pull request #6396 from blockchain/chore/dynamic-routing

chore(dynamic-routing): remove dynamic routing and only use threshold
blockchain · Jul 1, 2024 · 43c290e · 43c290e
2 parents 19e2828 + 35acd0c
commit 43c290e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 28 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/index.html b/packages/blockchain-wallet-v4-frontend/src/index.html
@@ -34,7 +34,6 @@
       window.SARDINE_CLIENT_ID = '**SARDINE_CLIENT_ID**'
       window.SARDINE_ENVIRONMENT = '**SARDINE_ENVIRONMENT**'
       window.WALLET_V5_LINK = '**WALLET_V5_LINK**'
-      window.DYNAMIC_ROUTING_WALLET_V5 = '**DYNAMIC_ROUTING_WALLET_V5**'
       window.nonce = '**CSP_NONCE**'
     </script>
     <script nonce="**CSP_NONCE**">

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/app.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/app.tsx
@@ -110,9 +110,19 @@ const App = ({
   const [isDynamicRoutingInProgress, setDynamicRoutingState] = useState<boolean>(true)
 
   useEffect(() => {
-    if (window?.DYNAMIC_ROUTING_WALLET_V5 !== 'true') {
+    // OBTAIN THE THRESHOLD - STATICALLY SET, DECIDED BY TEAM.
+    const THRESHOLD = 5
+
+    // GET REFERENCE TO BROWSER COOKIES
+    const cookies = new Cookies()
+
+    // THE DYNAMIC ROUTING IS DISABLED, SEND TO V4
+    // @ts-ignore
+    // eslint-disable-next-line
+    if (THRESHOLD === 0) {
+      cookies.set('wallet_v5_ui_available', 'false', { domain: '.blockchain.com', path: '/' })
       // eslint-disable-next-line
-      console.log('Setting state to false')
+      console.log('[ROUTING_DEBUG]: Threshold was not set, assuming v5 is disabled.')
       setDynamicRoutingState(false)
       return
     }
@@ -124,9 +134,6 @@ const App = ({
     const pathSegments = fullPath.split('/').filter(Boolean)
     const firstSegment = pathSegments[0]?.toLowerCase()
 
-    // GET REFERENCE TO BROWSER COOKIES
-    const cookies = new Cookies()
-
     // IF LANGUAGE EXISTS, REMOVE IT FROM THE PATH, NOT NEEDED FOR DYNAMIC ROUTING.
     if (languages.some((lang) => lang.language.toLowerCase() === firstSegment)) {
       // UPDATE LANGUAGE COOKIE SO THAT V5 LOADS THE CORRECT LANGUAGE
@@ -169,20 +176,6 @@ const App = ({
       cookies.set('canary_position', `${canaryPosition}`, { domain: '.blockchain.com', path: '/' })
     }
 
-    // OBTAIN THE THRESHOLD - STATICALLY SET, DECIDED BY TEAM.
-    const THRESHOLD = 5
-
-    // THE DYNAMIC ROUTING IS DISABLED, SEND TO V4
-    // @ts-ignore
-    // eslint-disable-next-line
-    if (THRESHOLD === 0) {
-      cookies.set('wallet_v5_ui_available', 'false', { domain: '.blockchain.com', path: '/' })
-      // eslint-disable-next-line
-      console.log('[ROUTING_DEBUG]: Threshold was not set, assuming v5 is disabled.')
-      setDynamicRoutingState(false)
-      return
-    }
-
     // IF THE USER HAS REQUESTED TO STAY IN V4.
     const reversionRequested = cookies.get('opt_out_wallet_v5_ui') === 'true'
     const availableUI = canaryPosition <= THRESHOLD

diff --git a/packages/blockchain-wallet-v4-frontend/webpackBuilder.js b/packages/blockchain-wallet-v4-frontend/webpackBuilder.js
@@ -156,13 +156,6 @@ const buildWebpackConfig = (envConfig, extraPluginsList) => ({
             ? process.env.WALLET_V5_LINK
             : 'https://google.com'
         },
-        {
-          pattern: '**DYNAMIC_ROUTING_WALLET_V5**',
-          // Note: using an obvious redirection issue
-          replacement: process.env.DYNAMIC_ROUTING_WALLET_V5
-            ? process.env.DYNAMIC_ROUTING_WALLET_V5
-            : envConfig.DYNAMIC_ROUTING_WALLET_V5
-        },
         {
           pattern: '**APP_VERSION**',
           replacement: require(CONFIG_PATH.pkgJson).version

diff --git a/typings/window.d.ts b/typings/window.d.ts
@@ -24,7 +24,6 @@ declare global {
     _Sardine: any // Sardine integration
     _SardineContext: any // Sardine integration
     WALLET_V5_LINK: string
-    DYNAMIC_ROUTING_WALLET_V5: string
     coins: Coins
     grecaptcha: any // google recaptcha sets this on window
     history?: {