m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 08:09:15 +01:00
Code

fix cancelTransaction not reciving a callback

Browse Source
This commit is contained in:
frankiebee 2017-08-03 21:20:01 -04:00
parent 8a9d0073b1
commit 7de58c8709
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/scripts/lib/nodeify.js
View File

@ -1,9 +1,10 @@
const promiseToCallback = require('promise-to-callback') const promiseToCallback = require('promise-to-callback')
module.exports = function(fn, context) { module.exports = function nodeify (fn, context) {
return function(){ return function(){
const args = [].slice.call(arguments) const args = [].slice.call(arguments)
const callback = args.pop() const callback = args.pop()
if (typeof callback !== 'function') throw new Error('callback is not a function')
promiseToCallback(fn.apply(context, args))(callback) promiseToCallback(fn.apply(context, args))(callback)
} }
} }

9
ui/app/actions.js
View File

@ -462,9 +462,12 @@ function cancelPersonalMsg (msgData) {
} }
function cancelTx (txData) { function cancelTx (txData) {
log.debug(`background.cancelTransaction`) return (dispatch) => {
background.cancelTransaction(txData.id) log.debug(`background.cancelTransaction`)
return actions.completedTx(txData.id) background.cancelTransaction(txData.id, () => {
dispatch(actions.completedTx(txData.id))
})
}
} }
// //