aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-01-12 08:07:03 +0800
committerGitHub <noreply@github.com>2017-01-12 08:07:03 +0800
commitf9efb0817d884fee22817c9a622e6583ef08e5da (patch)
tree3b575d83c0d8a6ce05507b3c9d7495d5b44a51aa /ui
parent576e2ad64df293adcc8c2494a3648100ba4b28f5 (diff)
parentb23a24f61da808825975722e5493644856680daf (diff)
downloadtangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.gz
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.bz2
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.lz
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.xz
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.zst
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.zip
Merge branch 'dev' into integrateTxManagerUI
Diffstat (limited to 'ui')
-rw-r--r--ui/app/actions.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index d63d36f19..5a3968f82 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -263,9 +263,7 @@ function showInfoPage () {
}
function setSelectedAccount (address) {
- return (dispatch) => {
- background.setSelectedAccount(address)
- }
+ return callBackgroundThenUpdate(background.setSelectedAccount, address)
}
function setCurrentFiat (fiat) {
@@ -457,15 +455,16 @@ function lockMetamask () {
function showAccountDetail (address) {
return (dispatch) => {
dispatch(actions.showLoadingIndication())
- background.setSelectedAccount(address, (err, address) => {
+ background.setSelectedAccount(address, (err, newState) => {
dispatch(actions.hideLoadingIndication())
if (err) {
return dispatch(actions.displayWarning(err.message))
}
+ dispatch(actions.updateMetamaskState(newState))
dispatch({
type: actions.SHOW_ACCOUNT_DETAIL,
- value: address,
+ value: newState.selectedAccount,
})
})
}