aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-10-14 07:04:23 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-10-14 07:04:23 +0800
commit67eba9f542588f13d37aa5e10c659c93d6e58dc1 (patch)
treefae56393ba50ec01e368f8b835b72ee6fc34876d
parentb200f74d5f414408881fc56b44dc3c7c7bbb7996 (diff)
downloadtangerine-wallet-browser-67eba9f542588f13d37aa5e10c659c93d6e58dc1.tar
tangerine-wallet-browser-67eba9f542588f13d37aa5e10c659c93d6e58dc1.tar.gz
tangerine-wallet-browser-67eba9f542588f13d37aa5e10c659c93d6e58dc1.tar.bz2
tangerine-wallet-browser-67eba9f542588f13d37aa5e10c659c93d6e58dc1.tar.lz
tangerine-wallet-browser-67eba9f542588f13d37aa5e10c659c93d6e58dc1.tar.xz
tangerine-wallet-browser-67eba9f542588f13d37aa5e10c659c93d6e58dc1.tar.zst
tangerine-wallet-browser-67eba9f542588f13d37aa5e10c659c93d6e58dc1.zip
Specify base 10 in bignumber
-rw-r--r--app/scripts/lib/id-management.js2
-rw-r--r--ui/app/components/pending-tx-details.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/lib/id-management.js b/app/scripts/lib/id-management.js
index 002f03047..421f2105f 100644
--- a/app/scripts/lib/id-management.js
+++ b/app/scripts/lib/id-management.js
@@ -28,7 +28,7 @@ function IdManagement (opts) {
// calculate gas with custom gas multiplier
var gasMultiplier = this.configManager.getGasMultiplier() || 1
var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16)
- gasPrice = gasPrice.mul(new BN(gasMultiplier * 100)).div(new BN(100, 10))
+ gasPrice = gasPrice.mul(new BN(gasMultiplier * 100, 10)).div(new BN(100, 10))
txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber())
// normalize values
diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js
index 0f7e20613..545302098 100644
--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@@ -32,7 +32,7 @@ PTXP.render = function () {
var gasMultiplier = txData.gasMultiplier
var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txData.estimatedGas), 16)
var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16)
- gasPrice = gasPrice.mul(new BN(gasMultiplier * 100)).div(new BN(100, 10))
+ gasPrice = gasPrice.mul(new BN(gasMultiplier * 100), 10).div(new BN(100, 10))
var txFee = gasCost.mul(gasPrice)
var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16)
var maxCost = txValue.add(txFee)