arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-24 09:18:09 +00:00
Code Issues Releases Wiki Activity

goto to dashboard page when switching wallet type

Browse Source
This commit is contained in:
Szymon Lesisz 2018-10-08 15:52:24 +02:00
parent 61820272b6
commit 1a55f45d2d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/actions/RouterActions.js
View File

@ -258,12 +258,12 @@ 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, getState: GetState): void => { export const selectFirstAvailableDevice = (gotoRoot: boolean = false): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
const url = dispatch(getFirstAvailableDeviceUrl()); const url = dispatch(getFirstAvailableDeviceUrl());
if (url) { if (url) {
const currentParams = getState().router.location.state; const currentParams = getState().router.location.state;
const requestedParams = dispatch(pathToParams(url)); const requestedParams = dispatch(pathToParams(url));
if (currentParams.device !== requestedParams.device || currentParams.deviceInstance !== requestedParams.deviceInstance) { if (gotoRoot || currentParams.device !== requestedParams.device || currentParams.deviceInstance !== requestedParams.deviceInstance) {
dispatch(goto(url)); dispatch(goto(url));
} }
} else { } else {

2
src/services/WalletService.js
View File

@ -11,6 +11,7 @@ import * as TrezorConnectActions from 'actions/TrezorConnectActions';
import * as SelectedAccountActions from 'actions/SelectedAccountActions'; import * as SelectedAccountActions from 'actions/SelectedAccountActions';
import * as SendFormActionActions from 'actions/SendFormActions'; import * as SendFormActionActions from 'actions/SendFormActions';
import * as DiscoveryActions from 'actions/DiscoveryActions'; import * as DiscoveryActions from 'actions/DiscoveryActions';
import * as RouterActions from 'actions/RouterActions';
import type { import type {
Middleware, Middleware,
@ -109,6 +110,7 @@ const WalletService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa
api.dispatch(DiscoveryActions.restore()); api.dispatch(DiscoveryActions.restore());
break; break;
case CONNECT.RECEIVE_WALLET_TYPE: case CONNECT.RECEIVE_WALLET_TYPE:
api.dispatch(RouterActions.selectFirstAvailableDevice(true));
api.dispatch(TrezorConnectActions.authorizeDevice()); api.dispatch(TrezorConnectActions.authorizeDevice());
break; break;
default: break; default: break;