diff --git a/ui/app/pages/swaps/main-quote-summary/main-quote-summary.js b/ui/app/pages/swaps/main-quote-summary/main-quote-summary.js index a034ed731..0af388c8f 100644 --- a/ui/app/pages/swaps/main-quote-summary/main-quote-summary.js +++ b/ui/app/pages/swaps/main-quote-summary/main-quote-summary.js @@ -8,6 +8,7 @@ import { toPrecisionWithoutTrailingZeros } from '../../../helpers/utils/util' import Tooltip from '../../../components/ui/tooltip' import SunCheckIcon from '../../../components/ui/icon/sun-check-icon.component' import ExchangeRateDisplay from '../exchange-rate-display' +import { formatSwapsValueForDisplay } from '../swaps.util' import QuoteBackdrop from './quote-backdrop' function getFontSizes (fontSizeScore) { @@ -60,10 +61,7 @@ export default function MainQuoteSummary ({ const sourceAmount = toPrecisionWithoutTrailingZeros(calcTokenAmount(sourceValue, sourceDecimals).toString(10), 12) const destinationAmount = calcTokenAmount(destinationValue, destinationDecimals) - let amountToDisplay = toPrecisionWithoutTrailingZeros(destinationAmount, 12) - if (amountToDisplay.match(/e[+-]/u)) { - amountToDisplay = (new BigNumber(amountToDisplay)).toFixed() - } + const amountToDisplay = formatSwapsValueForDisplay(destinationAmount) const fontSizeScore = getFontSizeScore(amountToDisplay, destinationSymbol) const [numberFontSize, symbolFontSize] = getFontSizes(fontSizeScore) const lineHeight = getLineHeight(fontSizeScore) diff --git a/ui/app/pages/swaps/select-quote-popover/sort-list/sort-list.js b/ui/app/pages/swaps/select-quote-popover/sort-list/sort-list.js index e4cc24f10..2339da5b8 100644 --- a/ui/app/pages/swaps/select-quote-popover/sort-list/sort-list.js +++ b/ui/app/pages/swaps/select-quote-popover/sort-list/sort-list.js @@ -122,7 +122,7 @@ export default function SortList ({ >
{isBestQuote && } -
{destinationTokenValue}
+
{destinationTokenValue}
{ quoteSource === 'RFQ' && {t('swapZeroSlippage')} } diff --git a/ui/app/pages/swaps/swaps.util.js b/ui/app/pages/swaps/swaps.util.js index fb6173101..26825073e 100644 --- a/ui/app/pages/swaps/swaps.util.js +++ b/ui/app/pages/swaps/swaps.util.js @@ -345,7 +345,7 @@ export function quotesToRenderableData (quotes, gasPrice, conversionRate, curren amountReceiving: `${destinationValue} ${destinationTokenInfo.symbol}`, destinationTokenDecimals: destinationTokenInfo.decimals, destinationTokenSymbol: destinationTokenInfo.symbol, - destinationTokenValue: destinationValue, + destinationTokenValue: formatSwapsValueForDisplay(destinationValue), isBestQuote: quote.isBestQuote, liquiditySourceKey, metaMaskFee, @@ -402,3 +402,11 @@ export function getSwapsTokensReceivedFromTxMeta (tokenSymbol, txMeta, tokenAddr } return null } + +export function formatSwapsValueForDisplay (destinationAmount) { + let amountToDisplay = toPrecisionWithoutTrailingZeros(destinationAmount, 12) + if (amountToDisplay.match(/e[+-]/u)) { + amountToDisplay = (new BigNumber(amountToDisplay)).toFixed() + } + return amountToDisplay +}