diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-08 14:32:35 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-08 14:32:35 +0800 |
| commit | 2e0916d8ff17c89147005d22e8c100113aaf3360 (patch) | |
| tree | c65e20274296658c753e40619eb5cfe0062dc12d /ui/app/actions.js | |
| parent | ef9435e3d0036af1358bb2a5faec5ce69ef159e7 (diff) | |
| parent | aab6e366c5162a85ae7853f5da29321f3d767cf4 (diff) | |
| download | tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.gz tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.bz2 tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.lz tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.xz tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.zst tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/actions.js')
| -rw-r--r-- | ui/app/actions.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 3540f61a5..58b5d13d4 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -1509,11 +1509,12 @@ function showAccountDetail (address) { return (dispatch) => { dispatch(actions.showLoadingIndication()) log.debug(`background.setSelectedAddress`) - background.setSelectedAddress(address, (err) => { + background.setSelectedAddress(address, (err, tokens) => { dispatch(actions.hideLoadingIndication()) if (err) { return dispatch(actions.displayWarning(err.message)) } + dispatch(updateTokens(tokens)) dispatch({ type: actions.SHOW_ACCOUNT_DETAIL, value: address, |