aboutsummaryrefslogtreecommitdiffstats
path: root/old-ui
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-03-30 07:54:00 +0800
committerkumavis <aaron@kumavis.me>2018-03-30 07:54:00 +0800
commitb49ad750dd87232553a72663af94bb2840c2f2ad (patch)
tree71e4002e6bc28c42ea227299752814d6f1f10486 /old-ui
parent93c123c6f52b28b525658492ce93fbcc30fc1e7c (diff)
parent9d4be1842e7c56e3bfde529ff555dcae8dec3dbd (diff)
downloadtangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.gz
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.bz2
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.lz
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.xz
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.tar.zst
tangerine-wallet-browser-b49ad750dd87232553a72663af94bb2840c2f2ad.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts
Diffstat (limited to 'old-ui')
-rw-r--r--old-ui/app/components/pending-tx.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js
index 720df2243..7f63d9fdf 100644
--- a/old-ui/app/components/pending-tx.js
+++ b/old-ui/app/components/pending-tx.js
@@ -62,8 +62,8 @@ PendingTx.prototype.render = function () {
const gasBn = hexToBn(gas)
// default to 8MM gas limit
const gasLimit = new BN(parseInt(blockGasLimit) || '8000000')
- const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20)
- const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20)
+ const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 99, 100)
+ const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 98, 100)
const safeGasLimit = safeGasLimitBN.toString(10)
// Gas Price
@@ -311,7 +311,7 @@ PendingTx.prototype.render = function () {
style: {
fontSize: '0.9em',
},
- }, 'Gas limit set dangerously high. Approving this transaction is likely to fail.')
+ }, 'Gas limit set dangerously high. Approving this transaction is liable to fail.')
: null,
]),