aboutsummaryrefslogtreecommitdiffstats
path: root/old-ui/app/components
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-12-21 09:39:41 +0800
committerGitHub <noreply@github.com>2017-12-21 09:39:41 +0800
commit4ef71f036510da50566dad35a100529186b08bc9 (patch)
treecdb705c11731a59d59b8015918b260a07f159f8b /old-ui/app/components
parente7e1b7a95180597308bd167bd4a152bbbf53ff21 (diff)
parent021ac526be722c3386b01f2498120b803b76b275 (diff)
downloadtangerine-wallet-browser-4ef71f036510da50566dad35a100529186b08bc9.tar.gz
tangerine-wallet-browser-4ef71f036510da50566dad35a100529186b08bc9.tar.zst
tangerine-wallet-browser-4ef71f036510da50566dad35a100529186b08bc9.zip
Merge pull request #2785 from danjm/merge-master-to-newUI-flat-dec20
[NewUI] Merge master to NewUI-flat
Diffstat (limited to 'old-ui/app/components')
-rw-r--r--old-ui/app/components/pending-tx.js12
1 files changed, 11 insertions, 1 deletions
diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js
index 366121ce0..10208b5ce 100644
--- a/old-ui/app/components/pending-tx.js
+++ b/old-ui/app/components/pending-tx.js
@@ -38,6 +38,16 @@ PendingTx.prototype.render = function () {
const txMeta = this.gatherTxMeta()
const txParams = txMeta.txParams || {}
+ // Allow retry txs
+ const { lastGasPrice } = txMeta
+ let forceGasMin
+ if (lastGasPrice) {
+ const stripped = ethUtil.stripHexPrefix(lastGasPrice)
+ const lastGas = new BN(stripped, 16)
+ const priceBump = lastGas.divn('10')
+ forceGasMin = lastGas.add(priceBump)
+ }
+
// Account Details
const address = txParams.from || props.selectedAddress
const identity = props.identities[address] || { address: address }
@@ -199,7 +209,7 @@ PendingTx.prototype.render = function () {
precision: 9,
scale: 9,
suffix: 'GWEI',
- min: MIN_GAS_PRICE_BN,
+ min: forceGasMin || MIN_GAS_PRICE_BN,
style: {
position: 'relative',
top: '5px',