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

START/STOP_ACQUIRING (Acquire page)

Browse Source
This commit is contained in:
Szymon Lesisz 2018-05-23 11:46:57 +02:00
parent 369ca892c0
commit 2b4592343e
4 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/js/actions/TrezorConnectActions.js
View File

@ -74,6 +74,10 @@ export type TrezorConnectAction = {
} | {
type: typeof CONNECT.DEVICE_FROM_STORAGE,
payload: Array<TrezorDevice>
} | {
type: typeof CONNECT.START_ACQUIRING,
} | {
type: typeof CONNECT.STOP_ACQUIRING,
};
@ -366,6 +370,10 @@ export function acquire(): AsyncAction {
const selected: ?TrezorDevice = getState().wallet.selectedDevice;
if (!selected) return;
dispatch({
type: CONNECT.START_ACQUIRING,
})
const response = await TrezorConnect.getFeatures({
device: {
path: selected.path,
@ -381,17 +389,21 @@ export function acquire(): AsyncAction {
title: 'Acquire device error',
message: response.payload.error,
cancelable: true,
actions: [
{
label: 'Try again',
callback: () => {
dispatch(acquire())
}
}
]
// actions: [
// {
// label: 'Try again',
// callback: () => {
// dispatch(acquire())
// }
// }
// ]
}
})
}
dispatch({
type: CONNECT.STOP_ACQUIRING,
})
}
}

5
src/js/actions/constants/TrezorConnect.js
View File

@ -22,4 +22,7 @@ export const REMEMBER: 'connect__remember' = 'connect__remember';
export const TRY_TO_DUPLICATE: 'connect__try_to_duplicate' = 'connect__try_to_duplicate';
export const DUPLICATE: 'connect__duplicate' = 'connect__duplicate';
export const DEVICE_STATE_EXCEPTION: 'connect__device_state_exception' = 'connect__device_state_exception';
export const DEVICE_STATE_EXCEPTION: 'connect__device_state_exception' = 'connect__device_state_exception';
export const START_ACQUIRING: 'connect__start_acquiring' = 'connect__start_acquiring';
export const STOP_ACQUIRING: 'connect__stop_acquiring' = 'connect__stop_acquiring';

6
src/js/components/wallet/pages/Acquire.js
View File

@ -9,13 +9,13 @@ import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions';
import type { State, Dispatch } from '~/flowtype';
type Props = {
connect: $ElementType<State, 'connect'>,
acquiring: boolean;
acquireDevice: typeof TrezorConnectActions.acquire
}
const Acquire = (props: Props) => {
const actions = [
const actions = props.acquiring ? [] : [
{
label: 'Acquire device',
callback: () => {
@ -40,7 +40,7 @@ const Acquire = (props: Props) => {
export default connect(
(state: State) => {
return {
log: state.log
acquiring: state.connect.acquiring
};
},
(dispatch: Dispatch) => {

15
src/js/reducers/TrezorConnectReducer.js
View File

@ -30,6 +30,7 @@ export type State = {
// mobile: boolean;
// } | {};
browserState: any;
acquiring: boolean;
}
@ -39,7 +40,8 @@ const initialState: State = {
discoveryComplete: false,
error: null,
transport: null,
browserState: {}
browserState: {},
acquiring: false,
};
@ -55,6 +57,17 @@ export default function connect(state: State = initialState, action: Action): St
browserState: action.payload.browser
}
case CONNECT.START_ACQUIRING :
return {
...state,
acquiring: true
}
case CONNECT.STOP_ACQUIRING :
return {
...state,
acquiring: false
}
case CONNECT.INITIALIZATION_ERROR :
return {