aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-05-18 05:35:21 +0800
committerGitHub <noreply@github.com>2017-05-18 05:35:21 +0800
commitfae34c169f3a53053d6fbd471551015b5a0a4bb2 (patch)
treed4db40faa6d154060d75481fe6b3e12d24331575
parent965a72486ff8745e86cd81a93c880904416d4c58 (diff)
parent7e7ceab95edcf27a240da478a1f5da2d97cd5e85 (diff)
downloadtangerine-wallet-browser-fae34c169f3a53053d6fbd471551015b5a0a4bb2.tar.gz
tangerine-wallet-browser-fae34c169f3a53053d6fbd471551015b5a0a4bb2.tar.zst
tangerine-wallet-browser-fae34c169f3a53053d6fbd471551015b5a0a4bb2.zip
Merge pull request #1446 from MetaMask/DisallowDecimalsInHexInput
Fix bug where decimals in gas inputs gave strange results
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/components/hex-as-decimal-input.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 998219254..24ae4e781 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
- Fix bug where edited gas parameters would not take effect.
- Trim currency list.
- Fix event filter bug introduced by newer versions of Geth.
+- Fix bug where decimals in gas inputs could result in strange values.
## 3.6.4 2017-5-8
diff --git a/ui/app/components/hex-as-decimal-input.js b/ui/app/components/hex-as-decimal-input.js
index e37aaa8c3..4a71e9585 100644
--- a/ui/app/components/hex-as-decimal-input.js
+++ b/ui/app/components/hex-as-decimal-input.js
@@ -139,7 +139,7 @@ HexAsDecimalInput.prototype.constructWarning = function () {
}
function hexify (decimalString) {
- const hexBN = new BN(decimalString, 10)
+ const hexBN = new BN(parseInt(decimalString), 10)
return '0x' + hexBN.toString('hex')
}