From f52ef5d49657d126a2575c91c83481209e8ef0ab Mon Sep 17 00:00:00 2001 From: davidp94 Date: Mon, 14 Aug 2017 21:51:39 -0700 Subject: [PATCH] fix goHome --- ui/app/actions.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/app/actions.js b/ui/app/actions.js index 3b6b87b00..a692267cb 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -473,8 +473,12 @@ function cancelTx (txData) { function cancelAllTx (txsData) { return (dispatch) => { - txsData.forEach((txData) => dispatch(actions.cancelTx(txData))) - dispatch(actions.goHome()) + txsData.forEach((txData, i) => { + background.cancelTransaction(txData.id, () => { + dispatch(actions.completedTx(txData.id)) + i === txsData.length - 1 ? dispatch(actions.goHome()) : null + }) + }) } } //