From 970b2e5b10caa7151c2e1c8e04ecd4f0be3a88c4 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:47:45 -0700 Subject: [PATCH 1/3] Clean up formatter --- .../complex/portfolio/allocation.tsx | 7 +++-- .../recent-activity-transaction-row.tsx | 8 ++---- .../transaction-details-content.tsx | 6 ++--- .../transactions/transaction-row.tsx | 7 +++-- .../transactions/transaction-utils.tsx | 26 ------------------- 5 files changed, 13 insertions(+), 41 deletions(-) diff --git a/packages/web/components/complex/portfolio/allocation.tsx b/packages/web/components/complex/portfolio/allocation.tsx index b9ee982292..1b7935f356 100644 --- a/packages/web/components/complex/portfolio/allocation.tsx +++ b/packages/web/components/complex/portfolio/allocation.tsx @@ -6,7 +6,6 @@ import { FunctionComponent, useEffect, useState } from "react"; import { Icon } from "~/components/assets"; import { AllocationTabs } from "~/components/complex/portfolio/allocation-tabs"; import { AllocationOptions } from "~/components/complex/portfolio/types"; -import { displayFiatPrice } from "~/components/transactions/transaction-utils"; import { EventName } from "~/config"; import { Breakpoint, @@ -15,6 +14,7 @@ import { useTranslation, useWindowSize, } from "~/hooks"; +import { formatFiatPrice } from "~/utils/formatter"; const COLORS: Record = { all: [ @@ -133,6 +133,9 @@ export const Allocation: FunctionComponent<{ {selectedList.map(({ key, percentage, fiatValue }, index) => { const colorClass = COLORS[selectedOption][index % COLORS[selectedOption].length]; + + console.log("fiatValue: ", fiatValue.toString()); + return (
@@ -147,7 +150,7 @@ export const Allocation: FunctionComponent<{ {percentage.maxDecimals(0).toString()}
-
{displayFiatPrice(fiatValue, "", t)}
+
{formatFiatPrice(fiatValue)}
); })} diff --git a/packages/web/components/transactions/recent-activity/recent-activity-transaction-row.tsx b/packages/web/components/transactions/recent-activity/recent-activity-transaction-row.tsx index 588131eb60..14c4b2aa25 100644 --- a/packages/web/components/transactions/recent-activity/recent-activity-transaction-row.tsx +++ b/packages/web/components/transactions/recent-activity/recent-activity-transaction-row.tsx @@ -2,9 +2,7 @@ import { FunctionComponent } from "react"; import { FallbackImg, Icon } from "~/components/assets"; import { TransactionRow } from "~/components/transactions/transaction-row"; -import { displayFiatPrice } from "~/components/transactions/transaction-utils"; -import { useTranslation } from "~/hooks"; - +import { formatFiatPrice } from "~/utils/formatter"; export type TransactionStatus = "pending" | "success" | "failed"; export const RecentActivityRow: FunctionComponent<{ @@ -26,13 +24,11 @@ export const SwapRow: FunctionComponent = ({ title, tokenConversion, }) => { - const { t } = useTranslation(); - const leftComponent = tokenConversion ? (

{title[status]}

- {displayFiatPrice(tokenConversion.tokenIn?.value, "", t)}{" "} + {formatFiatPrice(tokenConversion.tokenIn?.value)}{" "} {tokenConversion.tokenIn.amount.denom}{" "} {" "} {tokenConversion.tokenOut.amount.denom} diff --git a/packages/web/components/transactions/transaction-details/transaction-details-content.tsx b/packages/web/components/transactions/transaction-details/transaction-details-content.tsx index 9b10058ba8..804acac420 100644 --- a/packages/web/components/transactions/transaction-details/transaction-details-content.tsx +++ b/packages/web/components/transactions/transaction-details/transaction-details-content.tsx @@ -8,7 +8,6 @@ import { Icon } from "~/components/assets"; import { FallbackImg } from "~/components/assets"; import { CopyIconButton } from "~/components/buttons/copy-icon-button"; import { IconButton } from "~/components/buttons/icon-button"; -import { displayFiatPrice } from "~/components/transactions/transaction-utils"; import { Button } from "~/components/ui/button"; import { EventName } from "~/config"; import { @@ -18,6 +17,7 @@ import { } from "~/hooks"; import { theme } from "~/tailwind.config"; import { formatPretty } from "~/utils/formatter"; +import { formatFiatPrice } from "~/utils/formatter"; export const TransactionDetailsContent = ({ onRequestClose, @@ -142,7 +142,7 @@ export const TransactionDetailsContent = ({ {formatPretty(tokenIn.token, { maxDecimals: 6 }).split(" ")[0]}
- {displayFiatPrice(tokenIn?.usd, "", t)} + {formatFiatPrice(tokenIn?.usd, "", t)}
@@ -179,7 +179,7 @@ export const TransactionDetailsContent = ({ {formatPretty(tokenOut.token, { maxDecimals: 6 }).split(" ")[0]}
- {displayFiatPrice(tokenOut?.usd, "", t)} + {formatFiatPrice(tokenOut?.usd)}
diff --git a/packages/web/components/transactions/transaction-row.tsx b/packages/web/components/transactions/transaction-row.tsx index 0a64f5cdf2..0f7b1a1772 100644 --- a/packages/web/components/transactions/transaction-row.tsx +++ b/packages/web/components/transactions/transaction-row.tsx @@ -3,10 +3,9 @@ import classNames from "classnames"; import { FunctionComponent } from "react"; import { FallbackImg, Icon } from "~/components/assets"; -import { displayFiatPrice } from "~/components/transactions/transaction-utils"; import { useTranslation } from "~/hooks"; import { theme } from "~/tailwind.config"; -import { formatPretty } from "~/utils/formatter"; +import { formatFiatPrice, formatPretty } from "~/utils/formatter"; import { Spinner } from "../loaders"; @@ -150,7 +149,7 @@ const TokenConversion: FunctionComponent< )}
- {displayFiatPrice(tokenIn?.value, "-", t)} + {tokenIn.value && `- ${formatFiatPrice(tokenIn.value)}`}
)}
- {displayFiatPrice(tokenOut?.value, "+", t)} + {tokenOut.value && `+ ${formatFiatPrice(tokenOut.value)}`}
diff --git a/packages/web/components/transactions/transaction-utils.tsx b/packages/web/components/transactions/transaction-utils.tsx index 929ab8a4c0..74cb5f64ac 100644 --- a/packages/web/components/transactions/transaction-utils.tsx +++ b/packages/web/components/transactions/transaction-utils.tsx @@ -1,5 +1,3 @@ -import { PricePretty } from "@keplr-wallet/unit"; -import { Dec } from "@keplr-wallet/unit"; import { FormattedTransaction } from "@osmosis-labs/server"; import dayjs from "dayjs"; import isToday from "dayjs/plugin/isToday"; @@ -7,8 +5,6 @@ import isYesterday from "dayjs/plugin/isYesterday"; import relativeTime from "dayjs/plugin/relativeTime"; import { useTranslation } from "hooks"; -import { MultiLanguageT } from "~/hooks"; - dayjs.extend(relativeTime); dayjs.extend(isToday); dayjs.extend(isYesterday); @@ -47,25 +43,3 @@ export const useFormatDate = () => { return formatDate; }; - -export const displayFiatPrice = ( - value: PricePretty | undefined, - prefix: "-" | "+" | "", - t: MultiLanguageT -): string => { - if (value === undefined) return t("transactions.noPriceData"); - - const decValue = value.toDec(); - const symbol = value.symbol; - - if (decValue.lt(new Dec(0.01))) { - return `${prefix} <${symbol}0.01`; - } - - // Convert displayValue to a fixed 2-decimal place string - const formattedDisplayValue = `${prefix} ${symbol}${Number( - decValue.toString() - ).toFixed(2)}`; - - return formattedDisplayValue; -}; From 889881c92e509d9937a3ecce1179f1f23169fdcb Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:51:42 -0700 Subject: [PATCH 2/3] Remove log --- packages/web/components/complex/portfolio/allocation.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/web/components/complex/portfolio/allocation.tsx b/packages/web/components/complex/portfolio/allocation.tsx index 1b7935f356..c46714a1b9 100644 --- a/packages/web/components/complex/portfolio/allocation.tsx +++ b/packages/web/components/complex/portfolio/allocation.tsx @@ -134,8 +134,6 @@ export const Allocation: FunctionComponent<{ const colorClass = COLORS[selectedOption][index % COLORS[selectedOption].length]; - console.log("fiatValue: ", fiatValue.toString()); - return (
From 3cbe252f7b2ede7bca2f2cbadd323e897e9287b7 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Thu, 5 Sep 2024 10:21:50 -0700 Subject: [PATCH 3/3] update no price data --- packages/web/localizations/de.json | 1 - packages/web/localizations/en.json | 1 - packages/web/localizations/es.json | 1 - packages/web/localizations/fa.json | 1 - packages/web/localizations/fr.json | 1 - packages/web/localizations/gu.json | 1 - packages/web/localizations/hi.json | 1 - packages/web/localizations/ja.json | 1 - packages/web/localizations/ko.json | 1 - packages/web/localizations/pl.json | 1 - packages/web/localizations/pt-br.json | 1 - packages/web/localizations/ro.json | 1 - packages/web/localizations/ru.json | 1 - packages/web/localizations/tr.json | 1 - packages/web/localizations/zh-cn.json | 1 - packages/web/localizations/zh-hk.json | 1 - packages/web/localizations/zh-tw.json | 1 - 17 files changed, 17 deletions(-) diff --git a/packages/web/localizations/de.json b/packages/web/localizations/de.json index 82fb74ef53..7dcb0a5828 100644 --- a/packages/web/localizations/de.json +++ b/packages/web/localizations/de.json @@ -1158,7 +1158,6 @@ "transactionHash": "Transaktions-Hash", "viewOnExplorer": "Im Explorer anzeigen", "launchAlert": "Derzeit wird nur der Handelsverlauf angezeigt. Unterstützung für weitere Transaktionstypen folgt in Kürze.", - "noPriceData": "Preisdaten nicht verfügbar", "viewAll": "Alle ansehen", "history": "Geschichte", "orders": "Aufträge" diff --git a/packages/web/localizations/en.json b/packages/web/localizations/en.json index ef19e36ab9..1d36b948d3 100644 --- a/packages/web/localizations/en.json +++ b/packages/web/localizations/en.json @@ -1158,7 +1158,6 @@ "transactionHash": "Transaction Hash", "viewOnExplorer": "View on explorer", "launchAlert": "Currently only trade history is displayed. Support for more transaction types coming soon.", - "noPriceData": "Price data unavailable", "viewAll": "View all", "history": "History", "orders": "Orders" diff --git a/packages/web/localizations/es.json b/packages/web/localizations/es.json index 5a06d1fcc9..90028014ea 100644 --- a/packages/web/localizations/es.json +++ b/packages/web/localizations/es.json @@ -1158,7 +1158,6 @@ "transactionHash": "Hash de transacción", "viewOnExplorer": "Ver en el explorador", "launchAlert": "Actualmente solo se muestra el historial comercial. Próximamente soporte para más tipos de transacciones.", - "noPriceData": "Datos de precios no disponibles", "viewAll": "Ver todo", "history": "Historia", "orders": "Pedidos" diff --git a/packages/web/localizations/fa.json b/packages/web/localizations/fa.json index 70c9783676..c8d43d5328 100644 --- a/packages/web/localizations/fa.json +++ b/packages/web/localizations/fa.json @@ -1158,7 +1158,6 @@ "transactionHash": "هش تراکنش", "viewOnExplorer": "مشاهده در اکسپلورر", "launchAlert": "در حال حاضر فقط سابقه تجارت نمایش داده می شود. پشتیبانی از انواع تراکنش های بیشتر به زودی.", - "noPriceData": "اطلاعات قیمت در دسترس نیست", "viewAll": "مشاهده همه", "history": "تاریخ", "orders": "سفارشات" diff --git a/packages/web/localizations/fr.json b/packages/web/localizations/fr.json index 6ac60571e6..53f58ec2ee 100644 --- a/packages/web/localizations/fr.json +++ b/packages/web/localizations/fr.json @@ -1158,7 +1158,6 @@ "transactionHash": "Hachage des transactions", "viewOnExplorer": "Afficher sur l'explorateur", "launchAlert": "Actuellement, seul l'historique des échanges est affiché. Prise en charge d'autres types de transactions à venir.", - "noPriceData": "Données de prix indisponibles", "viewAll": "Voir tout", "history": "Histoire", "orders": "Ordres" diff --git a/packages/web/localizations/gu.json b/packages/web/localizations/gu.json index 0a5ebafc89..460702f9e4 100644 --- a/packages/web/localizations/gu.json +++ b/packages/web/localizations/gu.json @@ -1158,7 +1158,6 @@ "transactionHash": "ટ્રાન્ઝેક્શન હેશ", "viewOnExplorer": "એક્સપ્લોરર પર જુઓ", "launchAlert": "હાલમાં માત્ર વેપાર ઇતિહાસ પ્રદર્શિત થાય છે. વધુ વ્યવહાર પ્રકારો માટે સમર્થન ટૂંક સમયમાં આવી રહ્યું છે.", - "noPriceData": "કિંમત ડેટા ઉપલબ્ધ નથી", "viewAll": "બધુજ જુઓ", "history": "ઇતિહાસ", "orders": "ઓર્ડર" diff --git a/packages/web/localizations/hi.json b/packages/web/localizations/hi.json index 43272cf1d2..9539f01a02 100644 --- a/packages/web/localizations/hi.json +++ b/packages/web/localizations/hi.json @@ -1158,7 +1158,6 @@ "transactionHash": "लेनदेन हैश", "viewOnExplorer": "एक्सप्लोरर पर देखें", "launchAlert": "वर्तमान में केवल व्यापार इतिहास प्रदर्शित किया जाता है। जल्द ही अधिक लेनदेन प्रकारों के लिए सहायता उपलब्ध होगी।", - "noPriceData": "मूल्य डेटा उपलब्ध नहीं है", "viewAll": "सभी को देखें", "history": "इतिहास", "orders": "आदेश" diff --git a/packages/web/localizations/ja.json b/packages/web/localizations/ja.json index 582c5f6858..8732d7eed4 100644 --- a/packages/web/localizations/ja.json +++ b/packages/web/localizations/ja.json @@ -1158,7 +1158,6 @@ "transactionHash": "トランザクションハッシュ", "viewOnExplorer": "エクスプローラーで見る", "launchAlert": "現在は取引履歴のみが表示されます。他の取引タイプも近日中にサポートされる予定です。", - "noPriceData": "価格データは利用できません", "viewAll": "すべて表示", "history": "歴史", "orders": "注文" diff --git a/packages/web/localizations/ko.json b/packages/web/localizations/ko.json index aed9437328..aa7e77a0cb 100644 --- a/packages/web/localizations/ko.json +++ b/packages/web/localizations/ko.json @@ -1158,7 +1158,6 @@ "transactionHash": "거래 해시", "viewOnExplorer": "탐색기에서 보기", "launchAlert": "현재는 거래 내역만 표시됩니다. 더 많은 거래 유형이 곧 지원될 예정입니다.", - "noPriceData": "가격 데이터를 사용할 수 없습니다.", "viewAll": "모두보기", "history": "역사", "orders": "명령" diff --git a/packages/web/localizations/pl.json b/packages/web/localizations/pl.json index 2914d7807c..f4728d10fc 100644 --- a/packages/web/localizations/pl.json +++ b/packages/web/localizations/pl.json @@ -1158,7 +1158,6 @@ "transactionHash": "Hash transakcji", "viewOnExplorer": "Zobacz w eksploratorze", "launchAlert": "Obecnie wyświetlana jest tylko historia transakcji. Wkrótce obsługa większej liczby typów transakcji.", - "noPriceData": "Dane cenowe niedostępne", "viewAll": "Pokaż wszystkie", "history": "Historia", "orders": "Zamówienia" diff --git a/packages/web/localizations/pt-br.json b/packages/web/localizations/pt-br.json index a06b2a08b0..150883f909 100644 --- a/packages/web/localizations/pt-br.json +++ b/packages/web/localizations/pt-br.json @@ -1158,7 +1158,6 @@ "transactionHash": "Hash de transação", "viewOnExplorer": "Ver no explorador", "launchAlert": "Atualmente apenas o histórico de negociações é exibido. Suporte para mais tipos de transação em breve.", - "noPriceData": "Dados de preço indisponíveis", "viewAll": "Ver tudo", "history": "História", "orders": "Pedidos" diff --git a/packages/web/localizations/ro.json b/packages/web/localizations/ro.json index 69418213ee..de825da860 100644 --- a/packages/web/localizations/ro.json +++ b/packages/web/localizations/ro.json @@ -1158,7 +1158,6 @@ "transactionHash": "Hash de tranzacție", "viewOnExplorer": "Vizualizare pe explorer", "launchAlert": "Momentan este afișat doar istoricul comerțului. Asistență pentru mai multe tipuri de tranzacții în curând.", - "noPriceData": "Datele de preț nu sunt disponibile", "viewAll": "A vedea tot", "history": "Istorie", "orders": "Comenzi" diff --git a/packages/web/localizations/ru.json b/packages/web/localizations/ru.json index 7717f21908..e0472d1d3c 100644 --- a/packages/web/localizations/ru.json +++ b/packages/web/localizations/ru.json @@ -1158,7 +1158,6 @@ "transactionHash": "Хэш транзакции", "viewOnExplorer": "Посмотреть в проводнике", "launchAlert": "В настоящее время отображается только история торговли. Скоро появится поддержка большего количества типов транзакций.", - "noPriceData": "Данные о ценах недоступны.", "viewAll": "Посмотреть все", "history": "История", "orders": "Заказы" diff --git a/packages/web/localizations/tr.json b/packages/web/localizations/tr.json index 9c52f6ae8e..21d28da809 100644 --- a/packages/web/localizations/tr.json +++ b/packages/web/localizations/tr.json @@ -1158,7 +1158,6 @@ "transactionHash": "İşlem Karması", "viewOnExplorer": "Explorer'da görüntüle", "launchAlert": "Şu anda yalnızca ticaret geçmişi görüntüleniyor. Yakında daha fazla işlem türü için destek sunulacak.", - "noPriceData": "Fiyat verileri mevcut değil", "viewAll": "Hepsini gör", "history": "Tarih", "orders": "Emirler" diff --git a/packages/web/localizations/zh-cn.json b/packages/web/localizations/zh-cn.json index 004f1efa02..7492a59f56 100644 --- a/packages/web/localizations/zh-cn.json +++ b/packages/web/localizations/zh-cn.json @@ -1158,7 +1158,6 @@ "transactionHash": "交易哈希", "viewOnExplorer": "在资源管理器中查看", "launchAlert": "目前仅显示交易历史。即将支持更多交易类型。", - "noPriceData": "价格数据不可用", "viewAll": "查看全部", "history": "历史", "orders": "命令" diff --git a/packages/web/localizations/zh-hk.json b/packages/web/localizations/zh-hk.json index 4d01e5a91e..0220626ab2 100644 --- a/packages/web/localizations/zh-hk.json +++ b/packages/web/localizations/zh-hk.json @@ -1158,7 +1158,6 @@ "transactionHash": "交易哈希", "viewOnExplorer": "在資源管理器上查看", "launchAlert": "目前僅顯示交易歷史記錄。即將支援更多交易類型。", - "noPriceData": "價格數據不可用", "viewAll": "看全部", "history": "歷史", "orders": "命令" diff --git a/packages/web/localizations/zh-tw.json b/packages/web/localizations/zh-tw.json index 07cf11e00d..7c2d58a5f7 100644 --- a/packages/web/localizations/zh-tw.json +++ b/packages/web/localizations/zh-tw.json @@ -1158,7 +1158,6 @@ "transactionHash": "交易哈希", "viewOnExplorer": "在資源管理器上查看", "launchAlert": "目前僅顯示交易歷史記錄。即將支援更多交易類型。", - "noPriceData": "價格數據不可用", "viewAll": "看全部", "history": "歷史", "orders": "命令"