aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-09-08 06:03:25 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-09-08 06:03:25 +0800
commit41e9904d9b6a6a9b828c02c7fe34b8eefb631374 (patch)
tree5076cd7e26da07d2d3ae6c5e4aeb9d173e709e97 /ui/app/conf-tx.js
parent3a87a30912e8c5e212f7d0cc5e01ed1f873bfe33 (diff)
downloadtangerine-wallet-browser-41e9904d9b6a6a9b828c02c7fe34b8eefb631374.tar
tangerine-wallet-browser-41e9904d9b6a6a9b828c02c7fe34b8eefb631374.tar.gz
tangerine-wallet-browser-41e9904d9b6a6a9b828c02c7fe34b8eefb631374.tar.bz2
tangerine-wallet-browser-41e9904d9b6a6a9b828c02c7fe34b8eefb631374.tar.lz
tangerine-wallet-browser-41e9904d9b6a6a9b828c02c7fe34b8eefb631374.tar.xz
tangerine-wallet-browser-41e9904d9b6a6a9b828c02c7fe34b8eefb631374.tar.zst
tangerine-wallet-browser-41e9904d9b6a6a9b828c02c7fe34b8eefb631374.zip
Convert icon to button.
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js19
1 files changed, 7 insertions, 12 deletions
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