arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-06-03 22:58:48 +00:00
Code Issues Releases Wiki Activity

exclude landing page url fix

Browse Source
This commit is contained in:
Szymon Lesisz 2019-04-12 16:48:49 +02:00
parent 585c79a738
commit a797a52931
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/actions/RouterActions.js
View File

@ -434,7 +434,6 @@ export const setInitialUrl = (): PayloadAction<boolean> => (
// DEVICE.CONNECT race condition, "selectDevice" method was called but currently selectedDevice is in getState (auth) process // DEVICE.CONNECT race condition, "selectDevice" method was called but currently selectedDevice is in getState (auth) process
// if so, consume this action (return true) to break "selectDevice" process // if so, consume this action (return true) to break "selectDevice" process
// "setInitialUrl" will be called again after AUTH_DEVICE action
const { selectedDevice } = getState().wallet; const { selectedDevice } = getState().wallet;
if ( if (
selectedDevice && selectedDevice &&

15
src/services/WalletService.js
View File

@ -32,13 +32,12 @@ const WalletService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa
// exclude landing page url // exclude landing page url
const { pathname } = action.payload.location; const { pathname } = action.payload.location;
const isValidPath = !api.dispatch(RouterActions.isLandingPageUrl(pathname, true)); const isValidPath = !api.dispatch(RouterActions.isLandingPageUrl(pathname, true));
if (isValidPath) { api.dispatch({
api.dispatch({ type: WALLET.SET_INITIAL_URL,
type: WALLET.SET_INITIAL_URL, pathname: isValidPath ? pathname : null,
pathname: action.payload.location.pathname, state: {},
state: {}, });
});
}
// pass action and break process // pass action and break process
return next(action); return next(action);
} }
@ -48,7 +47,7 @@ const WalletService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa
switch (action.type) { switch (action.type) {
case WALLET.SET_INITIAL_URL: case WALLET.SET_INITIAL_URL:
if (action.pathname) { if (action.hasOwnProperty('pathname')) {
api.dispatch(LocalStorageActions.loadData()); api.dispatch(LocalStorageActions.loadData());
} }
break; break;