diff options
author | kumavis <aaron@kumavis.me> | 2017-01-31 07:08:31 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-01-31 07:08:31 +0800 |
commit | f9b31fe2c3a43339a4519761e4c8b2f3813e85e0 (patch) | |
tree | 123f368b533b374a89cb5e5da593d3babb5002e2 /ui/app/reducers | |
parent | b1de2cdefa2341eeab8d0269a1b14b349fdd5d16 (diff) | |
download | tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.gz tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.zst tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.zip |
rename selectedAccount to selectedAddress
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 6a2c93f78..4fe9352a7 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 8679ab062..dec247c82 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 |