diff options
author | Esteban MIno <efmino@uc.cl> | 2018-08-17 07:19:19 +0800 |
---|---|---|
committer | Esteban MIno <efmino@uc.cl> | 2018-08-17 07:19:19 +0800 |
commit | bb868f58348962d4a85415380d11f72892a2e28c (patch) | |
tree | 0ee1d9a6da025379fd0ca5e81febdb15dbec34f2 /ui/app/actions.js | |
parent | 2ace30bcd1d8280b440a4ce2a7156f94cf4f78f2 (diff) | |
download | tangerine-wallet-browser-bb868f58348962d4a85415380d11f72892a2e28c.tar.gz tangerine-wallet-browser-bb868f58348962d4a85415380d11f72892a2e28c.tar.zst tangerine-wallet-browser-bb868f58348962d4a85415380d11f72892a2e28c.zip |
correct behavior when notification is closed when popup
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r-- | ui/app/actions.js | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 4e3c87756..0760377c2 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -1626,16 +1626,21 @@ function addTokens (tokens) { function removeSuggestedTokens () { return (dispatch) => { dispatch(actions.showLoadingIndication()) - background.removeSuggestedTokens((err) => { - dispatch(actions.hideLoadingIndication()) - if (err) { - dispatch(actions.displayWarning(err.message)) - } - dispatch(actions.clearPendingTokens()) - if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION) { - return global.platform.closeCurrentWindow() - } + return new Promise((resolve, reject) => { + background.removeSuggestedTokens((err, suggestedTokens) => { + dispatch(actions.hideLoadingIndication()) + if (err) { + dispatch(actions.displayWarning(err.message)) + } + dispatch(actions.clearPendingTokens()) + if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION) { + return global.platform.closeCurrentWindow() + } + resolve(suggestedTokens) + }) }) + .then(() => updateMetamaskStateFromBackground()) + .then(suggestedTokens => dispatch(actions.updateMetamaskState({...suggestedTokens}))) } } |