From 1d14646a4cb5d35753943b9c8cc8dfe2fb3e7769 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 29 Mar 2019 12:47:58 -0230 Subject: Revert to providing inline defaults in getHexGasTotal and increaseLastGasPrice (#6361) --- ui/app/helpers/utils/confirm-tx.util.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/app/helpers/utils/confirm-tx.util.js b/ui/app/helpers/utils/confirm-tx.util.js index 224560f5a..853427b31 100644 --- a/ui/app/helpers/utils/confirm-tx.util.js +++ b/ui/app/helpers/utils/confirm-tx.util.js @@ -12,8 +12,8 @@ import { import { unconfirmedTransactionsCountSelector } from '../../selectors/confirm-transaction' -export function increaseLastGasPrice (lastGasPrice = '0x0') { - return ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, { +export function increaseLastGasPrice (lastGasPrice) { + return ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice || '0x0', 1.1, { multiplicandBase: 16, multiplierBase: 10, toNumericBase: 'hex', @@ -27,8 +27,8 @@ export function hexGreaterThan (a, b) { ) } -export function getHexGasTotal ({ gasLimit = '0x0', gasPrice = '0x0' }) { - return ethUtil.addHexPrefix(multiplyCurrencies(gasLimit, gasPrice, { +export function getHexGasTotal ({ gasLimit, gasPrice }) { + return ethUtil.addHexPrefix(multiplyCurrencies(gasLimit || '0x0', gasPrice || '0x0', { toNumericBase: 'hex', multiplicandBase: 16, multiplierBase: 16, -- cgit