diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-09 02:30:49 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-09 02:30:49 +0800 |
| commit | 286bde606f1c42a8edf2793b78042f5ef3271894 (patch) | |
| tree | c8beb87f4726385fa766bb5ccea185055a244acb /ui/app/actions.js | |
| parent | 0ebdd73e027f62bb5d83f96fcbca85f4e9c9038c (diff) | |
| download | tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.gz tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.zst tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.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 7a8d9667d..4f71d911b 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -1483,11 +1483,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, |