arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-12-27 09:28:19 +00:00
Code Issues Releases Wiki Activity

Merge branch 'sign/verify' of github.com:satoshilabs/trezor-wallet into sign/verify

Browse Source
This commit is contained in:
Vladimir Volek 2018-11-22 16:19:33 +01:00
commit 9e5a1706a9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/modals/index.js
View File

@ -65,7 +65,7 @@ const ModalWindow = styled.div`
const getDeviceContextModal = (props: Props) => { const getDeviceContextModal = (props: Props) => {
const { modal, modalActions } = props; const { modal, modalActions } = props;
if (modal.context !== MODAL.CONTEXT_DEVICE) return null; if (modal.context !== MODAL.CONTEXT_DEVICE) return null;
console.log('modal.windowType', modal.windowType);
switch (modal.windowType) { switch (modal.windowType) {
case UI.REQUEST_PIN: case UI.REQUEST_PIN:
return ( return (

4
src/reducers/SignVerifyReducer.js
View File

@ -1,6 +1,7 @@
/* @flow */ /* @flow */
import type { Action } from 'flowtype'; import type { Action } from 'flowtype';
import * as ACCOUNT from 'actions/constants/account';
import * as ACTION from 'actions/constants/signVerify'; import * as ACTION from 'actions/constants/signVerify';
export type State = { export type State = {
@ -46,6 +47,9 @@ export default (state: State = initialState, action: Action): State => {
return { ...state, ...change }; return { ...state, ...change };
} }
case ACCOUNT.DISPOSE:
return initialState;
case ACTION.CLEAR_SIGN: case ACTION.CLEAR_SIGN:
return { return {
...state, ...state,