diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-08 04:20:14 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-08 04:20:14 +0800 |
| commit | 34e7bb50157462d0f0284f2df0fd116e5aff6840 (patch) | |
| tree | 4ad7da3d4d4df5eb03d94e6641f025defc40e3ee /ui/app/conf-tx.js | |
| parent | a27a7e22f2dde983301a2bfb58a6bd7bae985f86 (diff) | |
| parent | f52ef5d49657d126a2575c91c83481209e8ef0ab (diff) | |
| download | tangerine-wallet-browser-34e7bb50157462d0f0284f2df0fd116e5aff6840.tar.gz tangerine-wallet-browser-34e7bb50157462d0f0284f2df0fd116e5aff6840.tar.zst tangerine-wallet-browser-34e7bb50157462d0f0284f2df0fd116e5aff6840.zip | |
Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved
Diffstat (limited to 'ui/app/conf-tx.js')
| -rw-r--r-- | ui/app/conf-tx.js | 12 |
1 files changed, 12 insertions, 0 deletions
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({ |