Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved

2 files changed, 23 insertions, 0 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index eebe65ba2..e793e6a21 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -104,6 +104,7 @@ var actions = {
   txError: txError,
   nextTx: nextTx,
   previousTx: previousTx,
+  cancelAllTx: cancelAllTx,
   viewPendingTx: viewPendingTx,
   VIEW_PENDING_TX: 'VIEW_PENDING_TX',
   // app messages
@@ -457,6 +458,16 @@ function cancelTx (txData) {
   }
 }
 
+function cancelAllTx (txsData) {
+  return (dispatch) => {
+    txsData.forEach((txData, i) => {
+      background.cancelTransaction(txData.id, () => {
+        dispatch(actions.completedTx(txData.id))
+        i === txsData.length - 1 ? dispatch(actions.goHome()) : null
+      })
+    })
+  }
+}
 //
 // initialize screen
 //
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 34727ff78..d6ceb7ff5 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -89,6 +89,18 @@ ConfirmTxScreen.prototype.render = function () {
         }),
       ]),
 
+      h('h3', {
+        style: {
+          alignSelf: 'flex-end',
+          display: unconfTxList.length > 1 ? 'block' : 'none',
+        },
+      }, [
+        h('i.fa.fa-trash.fa-lg.cursor-pointer', {
+          title: 'Cancel All Pending Transactions',
+          onClick: () => props.dispatch(actions.cancelAllTx(unconfTxList)),
+        }),
+      ]), 
+
       warningIfExists(props.warning),
 
       currentTxView({