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

pull/200/head
Vladimir Volek 6 years ago
commit 9e5a1706a9

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

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

Loading…
Cancel
Save