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

TrezorConnect calls using new field "useEmptyPassphrase"

Browse Source
This commit is contained in:
Szymon Lesisz 2018-10-05 15:46:47 +02:00
parent 109c93aff8
commit 3183426137
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/actions/DiscoveryActions.js
View File

@ -142,7 +142,8 @@ const begin = (device: TrezorDevice, network: string): AsyncAction => async (dis
}, },
path: coinToDiscover.bip44, path: coinToDiscover.bip44,
keepSession: true, // acquire and hold session keepSession: true, // acquire and hold session
useEmptyPassphrase: !device.instance, //useEmptyPassphrase: !device.instance,
useEmptyPassphrase: device.useEmptyPassphrase,
}); });
// handle TREZOR response error // handle TREZOR response error
@ -264,7 +265,8 @@ const finish = (device: TrezorDevice, discoveryProcess: Discovery): AsyncAction
state: device.state, state: device.state,
}, },
keepSession: false, keepSession: false,
useEmptyPassphrase: !device.instance, // useEmptyPassphrase: !device.instance,
useEmptyPassphrase: device.useEmptyPassphrase,
}); });
await dispatch(BlockchainActions.subscribe(discoveryProcess.network)); await dispatch(BlockchainActions.subscribe(discoveryProcess.network));

3
src/actions/ReceiveActions.js
View File

@ -67,7 +67,8 @@ export const showAddress = (path: Array<number>): AsyncAction => async (dispatch
state: selected.state, state: selected.state,
}, },
path, path,
useEmptyPassphrase: !selected.instance, // useEmptyPassphrase: !selected.instance,
useEmptyPassphrase: selected.useEmptyPassphrase,
}); });
if (response && response.success) { if (response && response.success) {

3
src/actions/SendFormActions.js
View File

@ -458,7 +458,8 @@ export const onSend = (): AsyncAction => async (dispatch: Dispatch, getState: Ge
instance: selected.instance, instance: selected.instance,
state: selected.state, state: selected.state,
}, },
useEmptyPassphrase: !selected.instance, // useEmptyPassphrase: !selected.instance,
useEmptyPassphrase: selected.useEmptyPassphrase,
path: account.addressPath, path: account.addressPath,
transaction: txData, transaction: txData,
}); });

6
src/views/Wallet/components/LeftNavigation/components/DeviceMenu/components/MenuItems/index.js
View File

@ -58,14 +58,14 @@ class MenuItems extends Component {
if (!this.showDeviceMenu()) return null; if (!this.showDeviceMenu()) return null;
return ( return (
<Wrapper> <Wrapper>
<Item onClick={() => this.onDeviceMenuClick('settings', this.props.device)}> {/* <Item onClick={() => this.onDeviceMenuClick('settings', this.props.device)}>
<Icon <Icon
icon={icons.COG} icon={icons.COG}
size={25} size={25}
color={colors.TEXT_SECONDARY} color={colors.TEXT_SECONDARY}
/> />
<Label>Device settings</Label> <Label>Device settings</Label>
</Item> </Item> */}
<Item onClick={() => this.onDeviceMenuClick('forget', this.props.device)}> <Item onClick={() => this.onDeviceMenuClick('forget', this.props.device)}>
<Icon <Icon
icon={icons.EJECT} icon={icons.EJECT}
@ -81,7 +81,7 @@ class MenuItems extends Component {
size={25} size={25}
color={colors.TEXT_SECONDARY} color={colors.TEXT_SECONDARY}
/> />
<Label>Create hidden wallet</Label> <Label>Change wallet type</Label>
</Item> </Item>
)} )}
{this.showRenewSession() && ( {this.showRenewSession() && (