diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
| commit | 13820b6cc1801a420f39cdfecd7ccb5309dc597b (patch) | |
| tree | c79832d7077ab03e0afe0c322cb32b204865d8b5 /ui/app/conversion-util.js | |
| parent | eeecee01540fbad50c4c463a3b1a54142a63f168 (diff) | |
| parent | 07ab613d4c647e3fe554bc06eab8cfb833315a88 (diff) | |
| download | tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.gz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.bz2 tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.lz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.xz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.zst tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.zip | |
fix conflicts
Diffstat (limited to 'ui/app/conversion-util.js')
| -rw-r--r-- | ui/app/conversion-util.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/app/conversion-util.js b/ui/app/conversion-util.js index 38f5f1c50..f271b5683 100644 --- a/ui/app/conversion-util.js +++ b/ui/app/conversion-util.js @@ -35,6 +35,7 @@ BigNumber.config({ // Big Number Constants const BIG_NUMBER_WEI_MULTIPLIER = new BigNumber('1000000000000000000') const BIG_NUMBER_GWEI_MULTIPLIER = new BigNumber('1000000000') +const BIG_NUMBER_ETH_MULTIPLIER = new BigNumber('1') // Individual Setters const convert = R.invoker(1, 'times') @@ -52,10 +53,12 @@ const toBigNumber = { const toNormalizedDenomination = { WEI: bigNumber => bigNumber.div(BIG_NUMBER_WEI_MULTIPLIER), GWEI: bigNumber => bigNumber.div(BIG_NUMBER_GWEI_MULTIPLIER), + ETH: bigNumber => bigNumber.div(BIG_NUMBER_ETH_MULTIPLIER), } const toSpecifiedDenomination = { WEI: bigNumber => bigNumber.times(BIG_NUMBER_WEI_MULTIPLIER).round(), GWEI: bigNumber => bigNumber.times(BIG_NUMBER_GWEI_MULTIPLIER).round(9), + ETH: bigNumber => bigNumber.times(BIG_NUMBER_ETH_MULTIPLIER).round(9), } const baseChange = { hex: n => n.toString(16), |