1 files changed, 50 insertions, 30 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index ed0518184..51cc4dfbf 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -266,14 +266,18 @@ function tryUnlockMetamask (password) {
     dispatch(actions.showLoadingIndication())
     dispatch(actions.unlockInProgress())
     log.debug(`background.submitPassword`)
-    background.submitPassword(password, (err) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) {
-        dispatch(actions.unlockFailed(err.message))
-      } else {
-        dispatch(actions.transitionForward())
-        forceUpdateMetamaskState(dispatch)
-      }
+
+    return new Promise((resolve, reject) => {
+      background.submitPassword(password, err => {
+        dispatch(actions.hideLoadingIndication())
+
+        if (err) {
+          reject(err)
+        } else {
+          dispatch(actions.transitionForward())
+          return forceUpdateMetamaskState(dispatch).then(resolve)
+        }
+      })
     })
   }
 }
@@ -291,7 +295,7 @@ function transitionBackward () {
 }
 
 function confirmSeedWords () {
-  return (dispatch) => {
+  return dispatch => {
     dispatch(actions.showLoadingIndication())
     log.debug(`background.clearSeedWordCache`)
     return new Promise((resolve, reject) => {
@@ -299,7 +303,7 @@ function confirmSeedWords () {
         dispatch(actions.hideLoadingIndication())
         if (err) {
           dispatch(actions.displayWarning(err.message))
-          reject(err)
+          return reject(err)
         }
 
         log.info('Seed word cache cleared. ' + account)
@@ -344,14 +348,14 @@ function createNewVaultAndKeychain (password) {
           return reject(err)
         }
         log.debug(`background.placeSeedWords`)
+
         background.placeSeedWords((err) => {
           if (err) {
             dispatch(actions.displayWarning(err.message))
             return reject(err)
           }
           dispatch(actions.hideLoadingIndication())
-          forceUpdateMetamaskState(dispatch)
-          resolve()
+          forceUpdateMetamaskState(dispatch).then(resolve)
         })
       })
     })
@@ -696,16 +700,23 @@ function updateAndApproveTx (txData) {
   log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData))
   return (dispatch) => {
     log.debug(`actions calling background.updateAndApproveTx`)
-    background.updateAndApproveTransaction(txData, (err) => {
-      dispatch(actions.hideLoadingIndication())
-      dispatch(actions.updateTransactionParams(txData.id, txData.txParams))
-      dispatch(actions.clearSend())
-      if (err) {
-        dispatch(actions.txError(err))
-        dispatch(actions.goHome())
-        return log.error(err.message)
-      }
-      dispatch(actions.completedTx(txData.id))
+
+    return new Promise((resolve, reject) => {
+      background.updateAndApproveTransaction(txData, err => {
+        dispatch(actions.hideLoadingIndication())
+        dispatch(actions.updateTransactionParams(txData.id, txData.txParams))
+        dispatch(actions.clearSend())
+
+        if (err) {
+          dispatch(actions.txError(err))
+          dispatch(actions.goHome())
+          log.error(err.message)
+          reject(err)
+        }
+
+        dispatch(actions.completedTx(txData.id))
+        resolve(txData)
+      })
     })
   }
 }
@@ -751,10 +762,13 @@ function cancelTypedMsg (msgData) {
 }
 
 function cancelTx (txData) {
-  return (dispatch) => {
+  return dispatch => {
     log.debug(`background.cancelTransaction`)
-    background.cancelTransaction(txData.id, () => {
-      dispatch(actions.completedTx(txData.id))
+    return new Promise((resolve, reject) => {
+      background.cancelTransaction(txData.id, () => {
+        dispatch(actions.completedTx(txData.id))
+        resolve(txData)
+      })
     })
   }
 }
@@ -1585,11 +1599,17 @@ function callBackgroundThenUpdate (method, ...args) {
 
 function forceUpdateMetamaskState (dispatch) {
   log.debug(`background.getState`)
-  background.getState((err, newState) => {
-    if (err) {
-      return dispatch(actions.displayWarning(err.message))
-    }
-    dispatch(actions.updateMetamaskState(newState))
+
+  return new Promise((resolve, reject) => {
+    background.getState((err, newState) => {
+      if (err) {
+        reject(err)
+        return dispatch(actions.displayWarning(err.message))
+      }
+
+      dispatch(actions.updateMetamaskState(newState))
+      resolve(newState)
+    })
   })
 }