diff options
author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-09-26 00:50:25 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-26 00:50:25 +0800 |
commit | dfd6c99270d5d5f4293c6d99b88bb320c3b4d0a6 (patch) | |
tree | 50dfae0e7d66fa95fca69375281b9bc33cd7934b /ui/app/reducers/app.js | |
parent | bef7d7a867a5a5c7e228e39ca2c3231fa5c504b7 (diff) | |
parent | 49d518983fb24076e62ff698f6f0851f01310e36 (diff) | |
download | tangerine-wallet-browser-dfd6c99270d5d5f4293c6d99b88bb320c3b4d0a6.tar tangerine-wallet-browser-dfd6c99270d5d5f4293c6d99b88bb320c3b4d0a6.tar.gz tangerine-wallet-browser-dfd6c99270d5d5f4293c6d99b88bb320c3b4d0a6.tar.bz2 tangerine-wallet-browser-dfd6c99270d5d5f4293c6d99b88bb320c3b4d0a6.tar.lz tangerine-wallet-browser-dfd6c99270d5d5f4293c6d99b88bb320c3b4d0a6.tar.xz tangerine-wallet-browser-dfd6c99270d5d5f4293c6d99b88bb320c3b4d0a6.tar.zst tangerine-wallet-browser-dfd6c99270d5d5f4293c6d99b88bb320c3b4d0a6.zip |
Merge pull request #5346 from MetaMask/v4.11.1
v4.11.1
Diffstat (limited to 'ui/app/reducers/app.js')
-rw-r--r-- | ui/app/reducers/app.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 98d467163..c246e7904 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -67,6 +67,10 @@ function reduceApp (state, action) { isMouseUser: false, gasIsLoading: false, networkNonce: null, + defaultHdPaths: { + trezor: `m/44'/60'/0'/0`, + ledger: `m/44'/60'/0'/0/0`, + }, }, state.appState) switch (action.type) { @@ -525,6 +529,15 @@ function reduceApp (state, action) { warning: '', }) + case actions.SET_HARDWARE_WALLET_DEFAULT_HD_PATH: + const { device, path } = action.value + const newDefaults = {...appState.defaultHdPaths} + newDefaults[device] = path + + return extend(appState, { + defaultHdPaths: newDefaults, + }) + case actions.SHOW_LOADING: return extend(appState, { isLoading: true, |