correct behavior when notification is closed when popup

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})))
   }
 }