fix cancelTransaction not reciving a callback

2 files changed, 8 insertions, 4 deletions

diff --git a/app/scripts/lib/nodeify.js b/app/scripts/lib/nodeify.js
index 299bfe624..832d6c6d3 100644
--- a/app/scripts/lib/nodeify.js
+++ b/app/scripts/lib/nodeify.js
@@ -1,9 +1,10 @@
 const promiseToCallback = require('promise-to-callback')
 
-module.exports = function(fn, context) {
+module.exports = function nodeify (fn, context) {
   return function(){
     const args = [].slice.call(arguments)
     const callback = args.pop()
+    if (typeof callback !== 'function') throw new Error('callback is not a function')
     promiseToCallback(fn.apply(context, args))(callback)
   }
 }
diff --git a/ui/app/actions.js b/ui/app/actions.js
index d99291e46..8ff8bbbdd 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -462,9 +462,12 @@ function cancelPersonalMsg (msgData) {
 }
 
 function cancelTx (txData) {
-  log.debug(`background.cancelTransaction`)
-  background.cancelTransaction(txData.id)
-  return actions.completedTx(txData.id)
+  return (dispatch) => {
+    log.debug(`background.cancelTransaction`)
+    background.cancelTransaction(txData.id, () => {
+      dispatch(actions.completedTx(txData.id))
+    })
+  }
 }
 
 //