diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-01-25 07:39:33 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-25 07:39:33 +0800 |
commit | 70b8e640f0170281b92ac610e063351a74d5333d (patch) | |
tree | b87831b7cf4acb06a0bca115b12e8be64210f455 /ui/app/conf-tx.js | |
parent | 463a56ff54b0d850c86348e260e5f7c17b138ccb (diff) | |
parent | 23c2b0b9a5d3f222bfeba7bcff5cf5a57367ffc8 (diff) | |
download | tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.gz tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.bz2 tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.lz tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.xz tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.zst tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.zip |
Merge branch 'dev' into i#1048
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index a6e03c3ed..1bd69f7d9 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -134,7 +134,7 @@ ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) { var address = txData.txParams.from || state.selectedAccount var account = state.accounts[address] var balance = account ? account.balance : '0x0' - var maxCost = new BN(txData.maxCost) + var maxCost = new BN(txData.maxCost, 16) var balanceBn = new BN(ethUtil.stripHexPrefix(balance), 16) return maxCost.gt(balanceBn) |