From 0f1edce403bd6fcb8a6efacf1fe537c0ca8f9134 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Sat, 31 Aug 2019 13:29:31 -0300 Subject: Fix BigNumber conversion error (#7088) In the case where the block gas limit in the MetaMask state is blank, an exception is sometimes thrown when that blank value is passed to `multiplyCurrencies` to be parsed as a hex number. Instead the minimum gas limit is now used instead whenever the block gas limit is falsy. This was already being done in one case anyway. --- ui/app/pages/send/send.utils.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/app/pages/send/send.utils.js b/ui/app/pages/send/send.utils.js index 1f9bc202a..32c293701 100644 --- a/ui/app/pages/send/send.utils.js +++ b/ui/app/pages/send/send.utils.js @@ -13,6 +13,7 @@ const { BASE_TOKEN_GAS_COST, INSUFFICIENT_FUNDS_ERROR, INSUFFICIENT_TOKENS_ERROR, + MIN_GAS_LIMIT_HEX, NEGATIVE_ETH_ERROR, ONE_GWEI_IN_WEI_HEX, SIMPLE_GAS_COST, @@ -202,7 +203,7 @@ function doesAmountErrorRequireUpdate ({ async function estimateGas ({ selectedAddress, selectedToken, - blockGasLimit, + blockGasLimit = MIN_GAS_LIMIT_HEX, to, value, data, @@ -242,7 +243,7 @@ async function estimateGas ({ } // if not, fall back to block gasLimit - paramsForGasEstimate.gas = ethUtil.addHexPrefix(multiplyCurrencies(blockGasLimit || '0x5208', 0.95, { + paramsForGasEstimate.gas = ethUtil.addHexPrefix(multiplyCurrencies(blockGasLimit, 0.95, { multiplicandBase: 16, multiplierBase: 10, roundDown: '0', -- cgit