aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conversion-util.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-10-20 02:23:02 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-10-20 02:38:14 +0800
commitbd11e60b8c128dd69ba1bcf58d25fa9323d91a33 (patch)
tree646ec2072445e3bc55ae90dcd2f8f2272da33675 /ui/app/conversion-util.js
parentf01d119cc1a6237b88e543be821d91778bcbb128 (diff)
downloadtangerine-wallet-browser-bd11e60b8c128dd69ba1bcf58d25fa9323d91a33.tar
tangerine-wallet-browser-bd11e60b8c128dd69ba1bcf58d25fa9323d91a33.tar.gz
tangerine-wallet-browser-bd11e60b8c128dd69ba1bcf58d25fa9323d91a33.tar.bz2
tangerine-wallet-browser-bd11e60b8c128dd69ba1bcf58d25fa9323d91a33.tar.lz
tangerine-wallet-browser-bd11e60b8c128dd69ba1bcf58d25fa9323d91a33.tar.xz
tangerine-wallet-browser-bd11e60b8c128dd69ba1bcf58d25fa9323d91a33.tar.zst
tangerine-wallet-browser-bd11e60b8c128dd69ba1bcf58d25fa9323d91a33.zip
Amount field shows insufficient funds error based on amoutn + gas total.
Diffstat (limited to 'ui/app/conversion-util.js')
-rw-r--r--ui/app/conversion-util.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/ui/app/conversion-util.js b/ui/app/conversion-util.js
index 1ef276a39..e008ee1cb 100644
--- a/ui/app/conversion-util.js
+++ b/ui/app/conversion-util.js
@@ -132,12 +132,16 @@ const conversionUtil = (value, {
});
const addCurrencies = (a, b, options = {}) => {
- const { toNumericBase, numberOfDecimals } = options
- const value = (new BigNumber(a)).add(b);
+ const {
+ aBase,
+ bBase,
+ ...conversionOptions,
+ } = options
+ const value = (new BigNumber(a, aBase)).add(b, bBase);
+
return converter({
value,
- toNumericBase,
- numberOfDecimals,
+ ...conversionOptions,
})
}