diff options
| author | Frankie <frankie.diamond@gmail.com> | 2017-02-02 04:03:42 +0800 |
|---|---|---|
| committer | Frankie <frankie.diamond@gmail.com> | 2017-02-02 04:03:42 +0800 |
| commit | ce0c3ed03c20eb0b7438cb9add7cbce490d7de64 (patch) | |
| tree | 7ac9686e82b938097c698b3b68ddc1e1b55598c8 /ui/app/reducers | |
| parent | e2e8a7cca06f7e6f41f417d86710227b0b5428d6 (diff) | |
| parent | 82578538198de74955d7bc5cfd3c9a02d1b69a6d (diff) | |
| download | tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.gz tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.bz2 tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.lz tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.xz tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.tar.zst tangerine-wallet-browser-ce0c3ed03c20eb0b7438cb9add7cbce490d7de64.zip | |
Merge branch 'dev' into messageManagerCleanUp
Diffstat (limited to 'ui/app/reducers')
| -rw-r--r-- | ui/app/reducers/app.js | 8 | ||||
| -rw-r--r-- | ui/app/reducers/metamask.js | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 3b960e4c1..de6536c2e 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -7,10 +7,10 @@ module.exports = reduceApp function reduceApp (state, action) { // clone and defaults - const selectedAccount = state.metamask.selectedAccount + const selectedAddress = state.metamask.selectedAddress const pendingTxs = hasPendingTxs(state) let name = 'accounts' - if (selectedAccount) { + if (selectedAddress) { name = 'accountDetail' } if (pendingTxs) { @@ -20,7 +20,7 @@ function reduceApp (state, action) { var defaultView = { name, detailView: null, - context: selectedAccount, + context: selectedAddress, } // confirm seed words @@ -331,7 +331,7 @@ function reduceApp (state, action) { warning: null, currentView: { name: 'accountDetail', - context: state.metamask.selectedAccount, + context: state.metamask.selectedAddress, }, accountDetail: { subview: 'transactions', diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 5cf249197..4f13c1ab1 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -50,7 +50,7 @@ function reduceMetamask (state, action) { return extend(metamaskState, { isUnlocked: true, isInitialized: true, - selectedAccount: action.value, + selectedAddress: action.value, }) case actions.LOCK_METAMASK: @@ -101,7 +101,7 @@ function reduceMetamask (state, action) { newState = extend(metamaskState, { isUnlocked: true, isInitialized: true, - selectedAccount: action.value, + selectedAddress: action.value, }) delete newState.seedWords return newState @@ -110,7 +110,7 @@ function reduceMetamask (state, action) { newState = extend(metamaskState, { isUnlocked: true, isInitialized: true, - selectedAccount: action.value, + selectedAddress: action.value, }) delete newState.seedWords return newState |