From 65ad3ba9e60d270504d467489621ce5195f023f8 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 27 Apr 2020 16:36:19 -0300
Subject: [PATCH] Await `forceUpdateMetamaskState` (#8422)

`forceUpdateMetamaskState` was being called in various action creators
without `await`. Each action creator now waits for the state update to
complete before continuing.
---
 ui/app/store/actions.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
index f98de3cd5..870da6466 100644
--- a/ui/app/store/actions.js
+++ b/ui/app/store/actions.js
@@ -318,7 +318,7 @@ export function addNewAccount () {
     }
     const newAccountAddress = Object.keys(newIdentities).find((address) => !oldIdentities[address])
     dispatch(hideLoadingIndication())
-    forceUpdateMetamaskState(dispatch)
+    await forceUpdateMetamaskState(dispatch)
     return newAccountAddress
   }
 }
@@ -338,7 +338,7 @@ export function checkHardwareStatus (deviceName, hdPath) {
     }
 
     dispatch(hideLoadingIndication())
-    forceUpdateMetamaskState(dispatch)
+    await forceUpdateMetamaskState(dispatch)
     return unlocked
   }
 }
@@ -356,7 +356,7 @@ export function forgetDevice (deviceName) {
     }
 
     dispatch(hideLoadingIndication())
-    forceUpdateMetamaskState(dispatch)
+    await forceUpdateMetamaskState(dispatch)
   }
 }
 
@@ -374,7 +374,7 @@ export function connectHardware (deviceName, page, hdPath) {
       throw error
     }
     dispatch(hideLoadingIndication())
-    forceUpdateMetamaskState(dispatch)
+    await forceUpdateMetamaskState(dispatch)
 
     return accounts
   }
@@ -1074,7 +1074,7 @@ export function markPasswordForgotten () {
       // TODO: handle errors
       dispatch(hideLoadingIndication())
       dispatch(forgotPassword())
-      forceUpdateMetamaskState(dispatch)
+      await forceUpdateMetamaskState(dispatch)
     }
   }
 }