fix(LinkContext): Correctly separate link params and deep link params

blockchain · Jul 24, 2019 · 0db52b2 · 0db52b2
1 parent 65f8eda
commit 0db52b2
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/VerifyEmailToken/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/VerifyEmailToken/index.js
@@ -34,19 +34,22 @@ class VerifyEmailToken extends React.PureComponent {
       ? 'https://blockchain.page.link/'
       : 'https://blockchainwalletstaging.page.link/'
 
-    const params = new URLSearchParams()
-    params.set('deep_link_path', PARAM_DEEP_LINK_PATH)
-    params.set('isi', PARAM_ISI)
-    params.set('ibi', PARAM_IBI)
-    params.set('apn', PARAM_APN)
+    const deepLinkParams = new URLSearchParams()
+    deepLinkParams.set('deep_link_path', PARAM_DEEP_LINK_PATH)
 
     if (VALID_CONTEXTS.indexOf(context) > -1) {
-      params.set('context', context)
+      deepLinkParams.set('context', context)
     }
 
-    const deepLinkComponent = `${window.location.origin}/login?${params}`
+    const deepLink = `${window.location.origin}/login?${deepLinkParams}`
+
+    const params = new URLSearchParams()
+    params.set('link', encodeURIComponent(deepLink))
+    params.set('isi', PARAM_ISI)
+    params.set('ibi', PARAM_IBI)
+    params.set('apn', PARAM_APN)
 
-    return link + '?link=' + encodeURIComponent(deepLinkComponent)
+    return `${link}?${params}`
   }
 
   render () {