From 41e9904d9b6a6a9b828c02c7fe34b8eefb631374 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Thu, 7 Sep 2017 15:03:25 -0700
Subject: [PATCH] Convert icon to button.

---
 ui/app/components/pending-tx.js | 11 +++++++++++
 ui/app/conf-tx.js               | 19 +++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 65f64adfe..4e7eeaecf 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -318,6 +318,17 @@ PendingTx.prototype.render = function () {
             onClick: props.cancelTransaction,
           }, 'Reject'),
         ]),
+        h('.flex-row.flex-space-around.conf-buttons', {
+          style: {
+            display: 'flex',
+            justifyContent: 'flex-end',
+            margin: '14px 25px',
+          },
+        }, [
+          h('button.cancel.btn-red', {
+            onClick: props.cancelAllTransactions,
+          }, 'Reject All'),
+        ]),
       ]),
     ])
   )
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index d6ceb7ff5..8d819181f 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -89,18 +89,6 @@ 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({
@@ -117,6 +105,7 @@ ConfirmTxScreen.prototype.render = function () {
         buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress),
         sendTransaction: this.sendTransaction.bind(this),
         cancelTransaction: this.cancelTransaction.bind(this, txData),
+        cancelAllTransactions: this.cancelAllTransactions.bind(this, unconfTxList),
         signMessage: this.signMessage.bind(this, txData),
         signPersonalMessage: this.signPersonalMessage.bind(this, txData),
         cancelMessage: this.cancelMessage.bind(this, txData),
@@ -163,6 +152,12 @@ ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) {
   this.props.dispatch(actions.cancelTx(txData))
 }
 
+ConfirmTxScreen.prototype.cancelAllTransactions = function (unconfTxList, event) {
+  this.stopPropagation(event)
+  event.preventDefault()
+  this.props.dispatch(actions.cancelAllTx(unconfTxList))
+}
+
 ConfirmTxScreen.prototype.signMessage = function (msgData, event) {
   log.info('conf-tx.js: signing message')
   var params = msgData.msgParams