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 | |
| parent | 0ebdd73e027f62bb5d83f96fcbca85f4e9c9038c (diff) | |
| download | tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.gz tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.bz2 tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.lz tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.xz tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.zst tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.zip | |
fix merge conflicts
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/actions.js | 3 | ||||
| -rw-r--r-- | ui/app/first-time/init-menu.js | 2 |
2 files changed, 3 insertions, 2 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, diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js index c20ba2d77..e7bbfb225 100644 --- a/ui/app/first-time/init-menu.js +++ b/ui/app/first-time/init-menu.js @@ -130,7 +130,7 @@ class InitializeMenuScreen extends Component { textDecoration: 'underline', marginTop: '32px', }, - }, 'Use classic interface'), + }, this.context.t('classicInterface')), ]), ]) |