diff options
author | Chen Wei <chenwei@byzantine-lab.io> | 2019-07-03 14:12:31 +0800 |
---|---|---|
committer | Chen Wei <chenwei@byzantine-lab.io> | 2019-07-03 14:12:31 +0800 |
commit | 9063fba5314a18e057125efcaaac2441e7d13a74 (patch) | |
tree | d8758b40eea4ea8bd35aaa2e7255621fffdd702b /ui/app/helpers/utils | |
parent | dd139452d053496d79816c881dbb59ee4aded81b (diff) | |
download | tangerine-wallet-browser-9063fba5314a18e057125efcaaac2441e7d13a74.tar tangerine-wallet-browser-9063fba5314a18e057125efcaaac2441e7d13a74.tar.gz tangerine-wallet-browser-9063fba5314a18e057125efcaaac2441e7d13a74.tar.bz2 tangerine-wallet-browser-9063fba5314a18e057125efcaaac2441e7d13a74.tar.lz tangerine-wallet-browser-9063fba5314a18e057125efcaaac2441e7d13a74.tar.xz tangerine-wallet-browser-9063fba5314a18e057125efcaaac2441e7d13a74.tar.zst tangerine-wallet-browser-9063fba5314a18e057125efcaaac2441e7d13a74.zip |
Revert "part of replacing 'ETH'"
This reverts commit dd139452d053496d79816c881dbb59ee4aded81b.
Diffstat (limited to 'ui/app/helpers/utils')
-rw-r--r-- | ui/app/helpers/utils/confirm-tx.util.js | 8 | ||||
-rw-r--r-- | ui/app/helpers/utils/conversions.util.js | 2 | ||||
-rw-r--r-- | ui/app/helpers/utils/util.js | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ui/app/helpers/utils/confirm-tx.util.js b/ui/app/helpers/utils/confirm-tx.util.js index 0751247c0..853427b31 100644 --- a/ui/app/helpers/utils/confirm-tx.util.js +++ b/ui/app/helpers/utils/confirm-tx.util.js @@ -2,7 +2,7 @@ import currencyFormatter from 'currency-formatter' import currencies from 'currency-formatter/currencies' import ethUtil from 'ethereumjs-util' import BigNumber from 'bignumber.js' -import { ETH } from '../constants/common' + import { conversionUtil, addCurrencies, @@ -55,7 +55,7 @@ export function addFiat (...args) { export function getValueFromWeiHex ({ value, - fromCurrency = ETH, + fromCurrency = 'ETH', toCurrency, conversionRate, numberOfDecimals, @@ -75,7 +75,7 @@ export function getValueFromWeiHex ({ export function getTransactionFee ({ value, - fromCurrency = ETH, + fromCurrency = 'ETH', toCurrency, conversionRate, numberOfDecimals, @@ -101,7 +101,7 @@ export function formatCurrency (value, currencyCode) { export function convertTokenToFiat ({ value, - fromCurrency = ETH, + fromCurrency = 'ETH', toCurrency, conversionRate, contractExchangeRate, diff --git a/ui/app/helpers/utils/conversions.util.js b/ui/app/helpers/utils/conversions.util.js index 030c57b87..5e1c21ff7 100644 --- a/ui/app/helpers/utils/conversions.util.js +++ b/ui/app/helpers/utils/conversions.util.js @@ -105,7 +105,7 @@ export function decEthToConvertedCurrency (ethTotal, convertedCurrency, conversi return conversionUtil(ethTotal, { fromNumericBase: 'dec', toNumericBase: 'dec', - fromCurrency: ETH, + fromCurrency: 'ETH', toCurrency: convertedCurrency, numberOfDecimals: 2, conversionRate, diff --git a/ui/app/helpers/utils/util.js b/ui/app/helpers/utils/util.js index 5f9856965..94fa9ad42 100644 --- a/ui/app/helpers/utils/util.js +++ b/ui/app/helpers/utils/util.js @@ -137,7 +137,7 @@ function parseBalance (balance) { // Takes wei hex, returns an object with three properties. // Its "formatted" property is what we generally use to render values. -function formatBalance (balance, decimalsToKeep, needsParse = true, ticker = 'TAN') { +function formatBalance (balance, decimalsToKeep, needsParse = true, ticker = 'ETH') { var parsed = needsParse ? parseBalance(balance) : balance.split('.') var beforeDecimal = parsed[0] var afterDecimal = parsed[1] |