diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
| commit | c651212025ab7cd0309d96be6687c1eba35ab9fa (patch) | |
| tree | fa5a6020daae332c5df47bdee3492e8a079375e3 /ui/app/helpers/confirm-transaction | |
| parent | 9c1b2108f69334884473eb95758e2d1c02c984d6 (diff) | |
| parent | 7f944923d170d6e7e04f6e238d2fd5f80abe3161 (diff) | |
| download | tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.gz tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.zst tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.zip | |
fix merge conflicts
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, |