aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/actions.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-31 07:08:31 +0800
committerkumavis <aaron@kumavis.me>2017-01-31 07:08:31 +0800
commitf9b31fe2c3a43339a4519761e4c8b2f3813e85e0 (patch)
tree123f368b533b374a89cb5e5da593d3babb5002e2 /ui/app/actions.js
parentb1de2cdefa2341eeab8d0269a1b14b349fdd5d16 (diff)
downloadtangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.gz
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.bz2
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.lz
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.xz
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.tar.zst
tangerine-wallet-browser-f9b31fe2c3a43339a4519761e4c8b2f3813e85e0.zip
rename selectedAccount to selectedAddress
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r--ui/app/actions.js13
1 files changed, 3 insertions, 10 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index a0fed265f..fa1e0deb5 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -90,7 +90,6 @@ var actions = {
TRANSACTION_ERROR: 'TRANSACTION_ERROR',
NEXT_TX: 'NEXT_TX',
PREVIOUS_TX: 'PREV_TX',
- setSelectedAccount: setSelectedAccount,
signMsg: signMsg,
cancelMsg: cancelMsg,
sendTx: sendTx,
@@ -287,7 +286,7 @@ function importNewAccount (strategy, args) {
dispatch(actions.updateMetamaskState(newState))
dispatch({
type: actions.SHOW_ACCOUNT_DETAIL,
- value: newState.selectedAccount,
+ value: newState.selectedAddress,
})
})
}
@@ -309,10 +308,6 @@ function showInfoPage () {
}
}
-function setSelectedAccount (address) {
- return callBackgroundThenUpdate(background.setSelectedAccount, address)
-}
-
function setCurrentFiat (fiat) {
return (dispatch) => {
dispatch(this.showLoadingIndication())
@@ -508,16 +503,14 @@ function lockMetamask () {
function showAccountDetail (address) {
return (dispatch) => {
dispatch(actions.showLoadingIndication())
- background.setSelectedAccount(address, (err, newState) => {
+ background.setSelectedAddress(address, (err) => {
dispatch(actions.hideLoadingIndication())
if (err) {
return dispatch(actions.displayWarning(err.message))
}
-
- dispatch(actions.updateMetamaskState(newState))
dispatch({
type: actions.SHOW_ACCOUNT_DETAIL,
- value: newState.selectedAccount,
+ value: address,
})
})
}