arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-28 03:08:30 +00:00
Code Issues Releases Wiki Activity

fix selectFirstAvailableDevice

Browse Source 
Redirect only if first available device is not currently selected
fix #117
This commit is contained in:
Szymon Lesisz 2018-10-04 10:47:30 +02:00
parent 9a8ac01dcd
commit c3c3c10350
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/actions/RouterActions.js
View File

@ -250,10 +250,14 @@ export const selectDevice = (device: TrezorDevice | Device): ThunkAction => (dis
/* /*
* Redirect to first device or landing page * Redirect to first device or landing page
*/ */
export const selectFirstAvailableDevice = (): ThunkAction => (dispatch: Dispatch): void => { export const selectFirstAvailableDevice = (): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
const url = dispatch(getFirstAvailableDeviceUrl()); const url = dispatch(getFirstAvailableDeviceUrl());
if (url) { if (url) {
dispatch(goto(url)); const currentParams = getState().router.location.state;
const requestedParams = dispatch(pathToParams(url));
if (currentParams.device !== requestedParams.device || currentParams.deviceInstance !== requestedParams.deviceInstance) {
dispatch(goto(url));
}
} else { } else {
dispatch(gotoLandingPage()); dispatch(gotoLandingPage());
} }