From 2a60023fd5d5be8bdd5956d1a7760fffbe0ae86f Mon Sep 17 00:00:00 2001 From: l1h3r Date: Fri, 16 Nov 2018 12:08:52 -0800 Subject: [PATCH] Update unit price on `new_rate` channel events --- .../block_scout_web/assets/js/lib/currency.js | 21 ++++++++++++++----- .../templates/address/_balance_card.html.eex | 2 +- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/apps/block_scout_web/assets/js/lib/currency.js b/apps/block_scout_web/assets/js/lib/currency.js index c9ed10317f..c537037f5a 100644 --- a/apps/block_scout_web/assets/js/lib/currency.js +++ b/apps/block_scout_web/assets/js/lib/currency.js @@ -5,11 +5,15 @@ import { BigNumber } from 'bignumber.js' import socket from '../socket' export function formatUsdValue (value) { - if (value === 0) return '$0.000000 USD' - if (value < 0.000001) return `${window.localized['Less than']} $0.000001 USD` - if (value < 1) return `$${numeral(value).format('0.000000')} USD` - if (value < 100000) return `$${numeral(value).format('0,0.00')} USD` - return `$${numeral(value).format('0,0')} USD` + return `${formatCurrencyValue(value)} USD` +} + +function formatCurrencyValue (value) { + if (value === 0) return '$0.000000' + if (value < 0.000001) return `${window.localized['Less than']} $0.000001` + if (value < 1) return `$${numeral(value).format('0.000000')}` + if (value < 100000) return `$${numeral(value).format('0,0.00')}` + return `$${numeral(value).format('0,0')}` } function weiToEther (wei) { @@ -34,8 +38,15 @@ function tryUpdateCalculatedUsdValues (el, usdExchangeRate = el.dataset.usdExcha const formattedUsd = formatUsdValue(usd) if (formattedUsd !== el.innerHTML) el.innerHTML = formattedUsd } + +function tryUpdateUnitPriceValues (el, usdUnitPrice = el.dataset.usdUnitPrice) { + const formattedValue = formatCurrencyValue(usdUnitPrice) + if (formattedValue !== el.innerHTML) el.innerHTML = formattedValue +} + export function updateAllCalculatedUsdValues (usdExchangeRate) { $('[data-usd-exchange-rate]').each((i, el) => tryUpdateCalculatedUsdValues(el, usdExchangeRate)) + $('[data-usd-unit-price]').each((i, el) => tryUpdateUnitPriceValues(el, usdExchangeRate)) } updateAllCalculatedUsdValues() diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_balance_card.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_balance_card.html.eex index 8da0cc370a..9f8159f73d 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/_balance_card.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_balance_card.html.eex @@ -9,7 +9,7 @@ data-wei-value="<%= if @address.fetched_coin_balance, do: @address.fetched_coin_balance.value %>" data-usd-exchange-rate="<%= @exchange_rate.usd_value %>"> - (@ <%= @exchange_rate.usd_value %>/<%= gettext("Ether") %>) + (@ /<%= gettext("Ether") %>)