Skip to content

Commit 47e8430

Browse files
authored
Merge pull request #6497 from blockchain/fix/reset-2fa-redirect
fix/reset-2fa-redirect: fixed reset 2fa redirect
2 parents 45c7ac0 + 5749f79 commit 47e8430

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

packages/blockchain-wallet-v4-frontend/src/scenes/app.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ const useFullPathForRedirect = [
111111
'/wallet-options-v4.json',
112112
'/#/prove',
113113
'/#/reset-two-factor',
114+
'/reset-two-factor',
114115
'/#/open',
115116
'/forgot-password',
116117
'/import-wallet',
@@ -305,11 +306,17 @@ const App = ({
305306

306307
if (availableUI) {
307308
// eslint-disable-next-line
308-
console.log('Redirecting to v5', fullPathCaseSensitive)
309+
console.log('xx', 'Redirecting to v5', fullPathCaseSensitive)
309310
// Using **WALLET_V5_LINK** as a fallback for webpack builder.
310311
if (useFullPathForRedirect.some((prefix) => fullPath.startsWith(prefix))) {
312+
console.log(
313+
'xx',
314+
`${window?.WALLET_V5_LINK + removeHash(fullPathCaseSensitive)}`,
315+
'using full path for redirect'
316+
)
311317
window.location.href = `${window?.WALLET_V5_LINK + removeHash(fullPathCaseSensitive)}`
312318
} else {
319+
console.log('xx', window?.WALLET_V5_LINK, 'not using full path for redirect')
313320
window.location.href = window?.WALLET_V5_LINK
314321
}
315322

packages/blockchain-wallet-v4-frontend/webpackBuilder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ const buildWebpackConfig = (envConfig, extraPluginsList) => ({
154154
// Note: using an obvious redirection issue
155155
replacement: process.env.WALLET_V5_LINK
156156
? process.env.WALLET_V5_LINK
157-
: 'https://google.com'
157+
: 'https://login-staging.blockchain.com/beta'
158158
},
159159
{
160160
pattern: '**APP_VERSION**',

0 commit comments

Comments
 (0)