diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-20 03:35:39 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-20 03:35:39 +0800 |
commit | f1c097ab5c833d0e4bab639d65e5641211cb9753 (patch) | |
tree | 0e63ad5171608accdd2a0d669687a16cd8c17b95 /ui/app/conversion-util.js | |
parent | 332c7441b656ec82ebfba863e3feb4dbf365d67b (diff) | |
parent | c2880c4b8fe56f3b175d75b6ae8a84271dde3e28 (diff) | |
download | tangerine-wallet-browser-f1c097ab5c833d0e4bab639d65e5641211cb9753.tar.gz tangerine-wallet-browser-f1c097ab5c833d0e4bab639d65e5641211cb9753.tar.zst tangerine-wallet-browser-f1c097ab5c833d0e4bab639d65e5641211cb9753.zip |
Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-state
Diffstat (limited to 'ui/app/conversion-util.js')
-rw-r--r-- | ui/app/conversion-util.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/app/conversion-util.js b/ui/app/conversion-util.js index 50f903d9f..2f3fb1678 100644 --- a/ui/app/conversion-util.js +++ b/ui/app/conversion-util.js @@ -147,16 +147,16 @@ const addCurrencies = (a, b, options = {}) => { const multiplyCurrencies = (a, b, options = {}) => { const { - toNumericBase, - numberOfDecimals, multiplicandBase, multiplierBase, + ...conversionOptions, } = options + const value = (new BigNumber(a, multiplicandBase)).times(b, multiplierBase); + return converter({ value, - toNumericBase, - numberOfDecimals, + ...conversionOptions, }) } |