diff options
| author | Vimal <vtiwari@coinswitch.co> | 2018-11-12 20:20:37 +0800 |
|---|---|---|
| committer | Vimal <vtiwari@coinswitch.co> | 2018-11-12 20:20:37 +0800 |
| commit | 6bb92a8672edf23465fb109c8966d2e56500ea86 (patch) | |
| tree | 6f5c4e348fb58fcf23b27278ffae1c1b912ad08e /ui/app/helpers/confirm-transaction/util.js | |
| parent | 82b11b69a5dea38a4a036096528354a5a291a447 (diff) | |
| parent | da1036f2c4b20748407b7fa89b60df5e321fcab7 (diff) | |
| download | tangerine-wallet-browser-6bb92a8672edf23465fb109c8966d2e56500ea86.tar.gz tangerine-wallet-browser-6bb92a8672edf23465fb109c8966d2e56500ea86.tar.zst tangerine-wallet-browser-6bb92a8672edf23465fb109c8966d2e56500ea86.zip | |
merging upstream branch
Diffstat (limited to 'ui/app/helpers/confirm-transaction/util.js')
| -rw-r--r-- | ui/app/helpers/confirm-transaction/util.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/helpers/confirm-transaction/util.js b/ui/app/helpers/confirm-transaction/util.js index bcac22500..eb334a4b8 100644 --- a/ui/app/helpers/confirm-transaction/util.js +++ b/ui/app/helpers/confirm-transaction/util.js @@ -55,6 +55,7 @@ export function addFiat (...args) { export function getValueFromWeiHex ({ value, + fromCurrency = 'ETH', toCurrency, conversionRate, numberOfDecimals, @@ -63,7 +64,7 @@ export function getValueFromWeiHex ({ return conversionUtil(value, { fromNumericBase: 'hex', toNumericBase: 'dec', - fromCurrency: 'ETH', + fromCurrency, toCurrency, numberOfDecimals, fromDenomination: 'WEI', @@ -74,6 +75,7 @@ export function getValueFromWeiHex ({ export function getTransactionFee ({ value, + fromCurrency = 'ETH', toCurrency, conversionRate, numberOfDecimals, @@ -82,7 +84,7 @@ export function getTransactionFee ({ fromNumericBase: 'BN', toNumericBase: 'dec', fromDenomination: 'WEI', - fromCurrency: 'ETH', + fromCurrency, toCurrency, numberOfDecimals, conversionRate, @@ -99,6 +101,7 @@ export function formatCurrency (value, currencyCode) { export function convertTokenToFiat ({ value, + fromCurrency = 'ETH', toCurrency, conversionRate, contractExchangeRate, @@ -108,6 +111,7 @@ export function convertTokenToFiat ({ return conversionUtil(value, { fromNumericBase: 'dec', toNumericBase: 'dec', + fromCurrency, toCurrency, numberOfDecimals: 2, conversionRate: totalExchangeRate, |