diff options
| author | hackyminer <hackyminer@gmail.com> | 2018-10-26 19:37:35 +0800 |
|---|---|---|
| committer | hackyminer <hackyminer@gmail.com> | 2018-10-26 19:37:35 +0800 |
| commit | bc7f8d0a5bf42b73ee1d1102362fc0a94dc80c0d (patch) | |
| tree | 96fc1c969b49c66081ff1a042a6e2e3e787723c7 /ui/app/helpers/confirm-transaction | |
| parent | b62d07f3a5bdfde7e295f17b7f601c6f2d5314ef (diff) | |
| parent | 54a8ade2669cb5f8f046509873bc2a9c25425847 (diff) | |
| download | tangerine-wallet-browser-bc7f8d0a5bf42b73ee1d1102362fc0a94dc80c0d.tar.gz tangerine-wallet-browser-bc7f8d0a5bf42b73ee1d1102362fc0a94dc80c0d.tar.zst tangerine-wallet-browser-bc7f8d0a5bf42b73ee1d1102362fc0a94dc80c0d.zip | |
Merge branch 'develop' into eth_chainid
Diffstat (limited to 'ui/app/helpers/confirm-transaction')
| -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, |