diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-11-02 09:29:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 09:29:45 +0800 |
| commit | 337a4e1b4ea7a560d773bc262b2adffd1617a39b (patch) | |
| tree | f3c2f9b33642ef9be901645645734129686e6c6e /ui/app/helpers/conversions.util.js | |
| parent | c2f97717c0fbf9a64cf527891f7a1f35049fb023 (diff) | |
| parent | de231c7a6191ca869308b6d27ca9cd4b020e59aa (diff) | |
| download | tangerine-wallet-browser-337a4e1b4ea7a560d773bc262b2adffd1617a39b.tar.gz tangerine-wallet-browser-337a4e1b4ea7a560d773bc262b2adffd1617a39b.tar.zst tangerine-wallet-browser-337a4e1b4ea7a560d773bc262b2adffd1617a39b.zip | |
Merge pull request #5649 from MetaMask/develop
Version 4.17.0
Diffstat (limited to 'ui/app/helpers/conversions.util.js')
| -rw-r--r-- | ui/app/helpers/conversions.util.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/app/helpers/conversions.util.js b/ui/app/helpers/conversions.util.js index 777537e1e..cb5e1b90b 100644 --- a/ui/app/helpers/conversions.util.js +++ b/ui/app/helpers/conversions.util.js @@ -20,8 +20,8 @@ export function decimalToHex (decimal) { }) } -export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDecimals = 6 }) { - const denominations = [ETH, GWEI, WEI] +export function getEthConversionFromWeiHex ({ value, fromCurrency = ETH, conversionRate, numberOfDecimals = 6 }) { + const denominations = [fromCurrency, GWEI, WEI] let nonZeroDenomination @@ -29,7 +29,8 @@ export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDec const convertedValue = getValueFromWeiHex({ value, conversionRate, - toCurrency: ETH, + fromCurrency, + toCurrency: fromCurrency, numberOfDecimals, toDenomination: denominations[i], }) @@ -45,6 +46,7 @@ export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDec export function getValueFromWeiHex ({ value, + fromCurrency = ETH, toCurrency, conversionRate, numberOfDecimals, @@ -53,7 +55,7 @@ export function getValueFromWeiHex ({ return conversionUtil(value, { fromNumericBase: 'hex', toNumericBase: 'dec', - fromCurrency: ETH, + fromCurrency, toCurrency, numberOfDecimals, fromDenomination: WEI, |