diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-04 03:41:18 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-04 03:41:18 +0800 |
| commit | 3837c2ddd7b3ea7a301f9296176273ac84d90480 (patch) | |
| tree | 6fe1c61c73d6999cd62637e4a0a2fb4eea48617f /ui/app/conversion-util.js | |
| parent | 3290421e2f16bd0ea1b13ba3f3d93fc4d233c750 (diff) | |
| parent | e467eda4f720fa89141ded2e709566102402479b (diff) | |
| download | tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.tar.gz tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.tar.zst tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/conversion-util.js')
| -rw-r--r-- | ui/app/conversion-util.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/conversion-util.js b/ui/app/conversion-util.js index 337763067..a7a226cc5 100644 --- a/ui/app/conversion-util.js +++ b/ui/app/conversion-util.js @@ -140,7 +140,7 @@ const addCurrencies = (a, b, options = {}) => { bBase, ...conversionOptions } = options - const value = (new BigNumber(a, aBase)).add(b, bBase) + const value = (new BigNumber(a.toString(), aBase)).add(b.toString(), bBase) return converter({ value, |