diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2017-12-07 16:44:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 16:44:56 +0800 |
| commit | a2057a8d295f0c21bf3d459eaba6d205271c1753 (patch) | |
| tree | 185c3e82c54bc5ba9be9a88b10337f71a5add8b1 /ui/app/components/pending-tx.js | |
| parent | a78cc013d199547ba865a0d1c2fec9a328ce7e0b (diff) | |
| parent | 706a07d0e9f3a7cc443ba6b797bf548e19065496 (diff) | |
| download | tangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.tar.gz tangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.tar.zst tangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.zip | |
Merge pull request #2684 from MetaMask/RetryTransaction
Retry transaction
Diffstat (limited to 'ui/app/components/pending-tx.js')
| -rw-r--r-- | ui/app/components/pending-tx.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index 5b1b367c6..51e57dcd2 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -38,6 +38,14 @@ 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) + forceGasMin = new BN(stripped, 16).add(MIN_GAS_PRICE_BN) + } + // Account Details const address = txParams.from || props.selectedAddress const identity = props.identities[address] || { address: address } @@ -199,7 +207,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', |