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

Update RouterActions.js

Browse Source
This commit is contained in:
Szymon Lesisz 2019-04-12 17:27:24 +02:00
parent 6cfff6d598
commit 13b49c32b5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/actions/RouterActions.js
View File

@ -429,19 +429,13 @@ export const setInitialUrl = (): PayloadAction<boolean> => (
dispatch: Dispatch, dispatch: Dispatch,
getState: GetState getState: GetState
): boolean => { ): boolean => {
const { initialPathname } = getState().wallet;
if (typeof initialPathname !== 'string') return false;
// 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
const { selectedDevice } = getState().wallet; const { selectedDevice } = getState().wallet;
if ( if (selectedDevice && selectedDevice.type === 'acquired' && !selectedDevice.state) return true;
selectedDevice &&
selectedDevice.type === 'acquired' && const { initialPathname } = getState().wallet;
!selectedDevice.features.passphrase_protection && if (typeof initialPathname !== 'string') return false;
!selectedDevice.state
)
return true;
const valid = dispatch( const valid = dispatch(
getValidUrl({ getValidUrl({