aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-09-12 05:12:35 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-09-12 05:12:35 +0800
commit27ba7f6ed3b0c55f6f5d7fa7e3829bdc06e0df9f (patch)
treeed46605e46452f1b2b484b11eea79044ece70ec4
parent06889377c89099cad411f4b142c8803484a225f7 (diff)
downloadtangerine-wallet-browser-27ba7f6ed3b0c55f6f5d7fa7e3829bdc06e0df9f.tar
tangerine-wallet-browser-27ba7f6ed3b0c55f6f5d7fa7e3829bdc06e0df9f.tar.gz
tangerine-wallet-browser-27ba7f6ed3b0c55f6f5d7fa7e3829bdc06e0df9f.tar.bz2
tangerine-wallet-browser-27ba7f6ed3b0c55f6f5d7fa7e3829bdc06e0df9f.tar.lz
tangerine-wallet-browser-27ba7f6ed3b0c55f6f5d7fa7e3829bdc06e0df9f.tar.xz
tangerine-wallet-browser-27ba7f6ed3b0c55f6f5d7fa7e3829bdc06e0df9f.tar.zst
tangerine-wallet-browser-27ba7f6ed3b0c55f6f5d7fa7e3829bdc06e0df9f.zip
Show reject all only when tx count is > 1
-rw-r--r--ui/app/components/pending-tx.js5
-rw-r--r--ui/app/conf-tx.js3
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 4e7eeaecf..3e53d47f9 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -67,6 +67,7 @@ PendingTx.prototype.render = function () {
const balanceBn = hexToBn(balance)
const insufficientBalance = balanceBn.lt(maxCost)
const buyDisabled = insufficientBalance || !this.state.valid || !isValidAddress || this.state.submitting
+ const showRejectAll = props.unconfTxListLength > 1
this.inputs = []
@@ -318,7 +319,7 @@ PendingTx.prototype.render = function () {
onClick: props.cancelTransaction,
}, 'Reject'),
]),
- h('.flex-row.flex-space-around.conf-buttons', {
+ showRejectAll ? h('.flex-row.flex-space-around.conf-buttons', {
style: {
display: 'flex',
justifyContent: 'flex-end',
@@ -328,7 +329,7 @@ PendingTx.prototype.render = function () {
h('button.cancel.btn-red', {
onClick: props.cancelAllTransactions,
}, 'Reject All'),
- ]),
+ ]) : null,
]),
])
)
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 8d819181f..1ee4166f7 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -52,6 +52,8 @@ ConfirmTxScreen.prototype.render = function () {
log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`)
if (unconfTxList.length === 0) return h(Loading, { isLoading: true })
+ const unconfTxListLength = unconfTxList.length
+
return (
h('.flex-column.flex-grow', [
@@ -101,6 +103,7 @@ ConfirmTxScreen.prototype.render = function () {
conversionRate,
currentCurrency,
blockGasLimit,
+ unconfTxListLength,
// Actions
buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress),
sendTransaction: this.sendTransaction.bind(this),