aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/hex-as-decimal-input.js
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-05-24 01:43:59 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-05-24 01:43:59 +0800
commit97d19f0f7970feb6fb3170fd85211d0c765cabea (patch)
tree3e25945bd50397cdb218b1b60a3290bdfb5fdacb /ui/app/components/hex-as-decimal-input.js
parent959038132a6780f1dd7a4db3696d3fdbaad83b88 (diff)
parent1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d (diff)
downloadtangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.gz
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.bz2
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.lz
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.xz
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.zst
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.zip
Merge branch 'master' into i1412-decimalizethegas
Diffstat (limited to 'ui/app/components/hex-as-decimal-input.js')
-rw-r--r--ui/app/components/hex-as-decimal-input.js2
1 files changed, 1 insertions, 1 deletions
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')
}