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

merge devices holds instance name

Browse Source
This commit is contained in:
Szymon Lesisz 2018-05-15 19:47:40 +02:00
parent ed6450f3ef
commit 4fba9ee10d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,6 +126,7 @@ const mergeDevices = (current: TrezorDevice, upcoming: Object): TrezorDevice =>
remember: typeof upcoming.remember === 'boolean' ? upcoming.remember : current.remember, remember: typeof upcoming.remember === 'boolean' ? upcoming.remember : current.remember,
instance: current.instance, instance: current.instance,
instanceLabel, instanceLabel,
instanceName: typeof upcoming.instanceName === 'string' ? upcoming.instanceName : current.instanceName,
state: current.state, state: current.state,
acquiring: typeof upcoming.acquiring === 'boolean' ? upcoming.acquiring : current.acquiring, acquiring: typeof upcoming.acquiring === 'boolean' ? upcoming.acquiring : current.acquiring,
ts: typeof upcoming.ts === 'number' ? upcoming.ts : current.ts, ts: typeof upcoming.ts === 'number' ? upcoming.ts : current.ts,