From 8355f7ae03ff9ae94f561063f0ceb71dd6b182a0 Mon Sep 17 00:00:00 2001 From: Chloe <44501120+chloezxyy@users.noreply.github.com> Date: Mon, 22 Jul 2024 13:16:50 +0800 Subject: [PATCH] chore: rename to RenameToken.ts --- src/components/commons/token/PoolPairSymbol.tsx | 6 +++--- src/components/commons/token/PoolPairSymbolLocal.tsx | 6 +++--- src/components/commons/token/TokenSymbol.tsx | 4 ++-- src/components/index/LiquidityPoolList.tsx | 6 +++--- src/pages/address/_components/AddressBalances.tsx | 4 ++-- src/pages/auctions/_components/commons/BidAmountValue.tsx | 4 ++-- src/pages/dex/[poolpairId]/_components/PoolPairDetails.tsx | 4 ++-- .../dex/[poolpairId]/_components/PoolPairDetailsBar.tsx | 4 ++-- src/pages/dex/_components/TotalLiquidityInfo.tsx | 6 +++--- src/pages/proof-of-backing/_components/BackingCard.tsx | 4 ++-- src/pages/proof-of-backing/_components/BackingTable.tsx | 6 +++--- src/pages/tokens/[id].page.tsx | 4 ++-- src/pages/tokens/_components/TokenTable.tsx | 4 ++-- .../[vaultid]/_components/VaultIdCollateralDetails.tsx | 6 +++--- .../vaults/_components/commons/VaultAuctionDetails.tsx | 4 ++-- src/utils/commons/{TokenRename.ts => RenameToken.ts} | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) rename src/utils/commons/{TokenRename.ts => RenameToken.ts} (58%) diff --git a/src/components/commons/token/PoolPairSymbol.tsx b/src/components/commons/token/PoolPairSymbol.tsx index a256e4cbd..12bde8f1a 100644 --- a/src/components/commons/token/PoolPairSymbol.tsx +++ b/src/components/commons/token/PoolPairSymbol.tsx @@ -3,7 +3,7 @@ import classnames from "classnames"; import { useWhaleApiClient } from "@contexts/WhaleContext"; import { PoolPairData } from "@defichain/whale-api-client/dist/api/poolpairs"; import { getAssetIcon } from "@components/icons/assets/tokens"; -import { tokenSymbolRename } from "../../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../../utils/commons/RenameToken"; interface PoolPairSymbolProps { poolPairId: string | number; @@ -57,8 +57,8 @@ export function PoolPairSymbol(props: PoolPairSymbolProps): JSX.Element { const IconA = getAssetIcon(poolPairData.tokenA.symbol); const IconB = getAssetIcon(poolPairData.tokenB.symbol); - const tokenADisplay = tokenSymbolRename(poolPairData.tokenA.displaySymbol); - const tokenBDisplay = tokenSymbolRename(poolPairData.tokenB.displaySymbol); + const tokenADisplay = renameTokenSymbol(poolPairData.tokenA.displaySymbol); + const tokenBDisplay = renameTokenSymbol(poolPairData.tokenB.displaySymbol); return (
diff --git a/src/components/commons/token/PoolPairSymbolLocal.tsx b/src/components/commons/token/PoolPairSymbolLocal.tsx index 6211950bc..f625f3e12 100644 --- a/src/components/commons/token/PoolPairSymbolLocal.tsx +++ b/src/components/commons/token/PoolPairSymbolLocal.tsx @@ -1,6 +1,6 @@ import classnames from "classnames"; import { getAssetIcon } from "@components/icons/assets/tokens"; -import { tokenSymbolRename } from "../../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../../utils/commons/RenameToken"; interface PoolPairSymbolProps { tokenA: { @@ -24,8 +24,8 @@ export function PoolPairSymbolLocal(props: PoolPairSymbolProps): JSX.Element { const IconA = getAssetIcon(props.tokenA.symbol); const IconB = getAssetIcon(props.tokenB.symbol); - const tokenADisplaySymbol = tokenSymbolRename(props.tokenA.displaySymbol); - const tokenBDisplaySymbol = tokenSymbolRename(props.tokenB.displaySymbol); + const tokenADisplaySymbol = renameTokenSymbol(props.tokenA.displaySymbol); + const tokenBDisplaySymbol = renameTokenSymbol(props.tokenB.displaySymbol); return (
diff --git a/src/components/commons/token/TokenSymbol.tsx b/src/components/commons/token/TokenSymbol.tsx index e09d1e76b..8f4600e0e 100644 --- a/src/components/commons/token/TokenSymbol.tsx +++ b/src/components/commons/token/TokenSymbol.tsx @@ -4,7 +4,7 @@ import { TokenData } from "@defichain/whale-api-client/dist/api/tokens"; import classNames from "classnames"; import { getAssetIcon, getTokenIcon } from "@components/icons/assets/tokens"; import { EVMLinearGradient } from "@components/icons/assets/tokens/EVMLinearGradient"; -import { tokenSymbolRename } from "../../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../../utils/commons/RenameToken"; interface TokenSymbolProps { tokenId: number; @@ -70,7 +70,7 @@ export function TokenSymbol(props: TokenSymbolProps): JSX.Element { )} data-testid={props.testId} > - {tokenSymbolRename(tokenData.displaySymbol)} + {renameTokenSymbol(tokenData.displaySymbol)} {!tokenData.isDAT && `#${tokenData.id}`}
{(() => { diff --git a/src/components/index/LiquidityPoolList.tsx b/src/components/index/LiquidityPoolList.tsx index 268753ad9..ba02ec30d 100644 --- a/src/components/index/LiquidityPoolList.tsx +++ b/src/components/index/LiquidityPoolList.tsx @@ -3,7 +3,7 @@ import { PoolPairData } from "@defichain/whale-api-client/dist/api/poolpairs"; import { Link } from "@components/commons/link/Link"; import { NumericFormat } from "react-number-format"; import { PoolPairSymbol } from "@components/commons/token/PoolPairSymbol"; -import { tokenSymbolRename } from "../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../utils/commons/RenameToken"; export function LiquidityPoolList({ liquidityPools, @@ -33,8 +33,8 @@ export function LiquidityPoolList({ : "" } priceRatio={pool.priceRatio.ba} - tokenASymbol={tokenSymbolRename(pool.tokenA.displaySymbol)} - tokenBSymbol={tokenSymbolRename(pool.tokenB.displaySymbol)} + tokenASymbol={renameTokenSymbol(pool.tokenA.displaySymbol)} + tokenBSymbol={renameTokenSymbol(pool.tokenB.displaySymbol)} /> ); })} diff --git a/src/pages/address/_components/AddressBalances.tsx b/src/pages/address/_components/AddressBalances.tsx index 9a83f04ab..5be203894 100644 --- a/src/pages/address/_components/AddressBalances.tsx +++ b/src/pages/address/_components/AddressBalances.tsx @@ -6,7 +6,7 @@ import { CgSpinner } from "react-icons/cg"; import { PoolPairSymbol } from "@components/commons/token/PoolPairSymbol"; import { Link } from "@components/commons/link/Link"; import { EmptySection } from "@components/commons/sections/EmptySection"; -import { tokenSymbolRename } from "../../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../../utils/commons/RenameToken"; interface AddressBalancesProps { address: string; @@ -164,7 +164,7 @@ function TokenSymbolName(props: { token: AddressToken }): JSX.Element { > - {tokenSymbolRename(props.token.displaySymbol)} + {renameTokenSymbol(props.token.displaySymbol)} {!props.token.isDAT && `#${props.token.id}`} diff --git a/src/pages/auctions/_components/commons/BidAmountValue.tsx b/src/pages/auctions/_components/commons/BidAmountValue.tsx index 53a89dc7f..662607024 100644 --- a/src/pages/auctions/_components/commons/BidAmountValue.tsx +++ b/src/pages/auctions/_components/commons/BidAmountValue.tsx @@ -4,7 +4,7 @@ import React from "react"; import { LoanVaultLiquidationBatch } from "@defichain/whale-api-client/dist/api/loan"; import classNames from "classnames"; import { useTokenPrice } from "../../../vaults/hooks/TokenPrice"; -import { tokenSymbolRename } from "../../../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../../../utils/commons/RenameToken"; interface BidAmountValueProps { batch: LoanVaultLiquidationBatch; @@ -36,7 +36,7 @@ export function BidAmountValue(props: BidAmountValueProps): JSX.Element { value={minBidAmount.toFixed(8)} thousandSeparator decimalScale={8} - suffix={` ${tokenSymbolRename(props.batch.loan.displaySymbol)}`} + suffix={` ${renameTokenSymbol(props.batch.loan.displaySymbol)}`} displayType="text" data-testid="BidAmountValue.MinBidAmount" className="dark:text-gray-100" diff --git a/src/pages/dex/[poolpairId]/_components/PoolPairDetails.tsx b/src/pages/dex/[poolpairId]/_components/PoolPairDetails.tsx index 3575570a9..27386ccd0 100644 --- a/src/pages/dex/[poolpairId]/_components/PoolPairDetails.tsx +++ b/src/pages/dex/[poolpairId]/_components/PoolPairDetails.tsx @@ -1,7 +1,7 @@ import { PoolPairData } from "@defichain/whale-api-client/dist/api/poolpairs"; import { NumericFormat } from "react-number-format"; import { getAssetIcon } from "@components/icons/assets/tokens"; -import { tokenSymbolRename } from "../../../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../../../utils/commons/RenameToken"; export function PoolPairDetails(props: { poolpair: PoolPairData; @@ -91,7 +91,7 @@ function TokenDetailsItem(props: { > {" "} - {tokenSymbolRename(props.displaySymbol)} + {renameTokenSymbol(props.displaySymbol)} diff --git a/src/pages/dex/_components/TotalLiquidityInfo.tsx b/src/pages/dex/_components/TotalLiquidityInfo.tsx index 8bdab9ad1..6b4a4461b 100644 --- a/src/pages/dex/_components/TotalLiquidityInfo.tsx +++ b/src/pages/dex/_components/TotalLiquidityInfo.tsx @@ -1,6 +1,6 @@ import { NumericFormat } from "react-number-format"; import React from "react"; -import { tokenSymbolRename } from "../../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../../utils/commons/RenameToken"; interface TotalLiquidityInfoProps { tokenA: { @@ -31,7 +31,7 @@ export function TotalLiquidityInfo(
Total Liquidity
- {tokenSymbolRename(props.tokenA.displaySymbol)} + {renameTokenSymbol(props.tokenA.displaySymbol)}
- {tokenSymbolRename(props.tokenB.displaySymbol)} + {renameTokenSymbol(props.tokenB.displaySymbol)}
- {tokenSymbolRename(token.displaySymbol)} + {renameTokenSymbol(token.displaySymbol)}
- {tokenSymbolRename(token.displaySymbol)} + {renameTokenSymbol(token.displaySymbol)}
@@ -108,7 +108,7 @@ function TableRow({ displayType="text" thousandSeparator value={token.netSupply} - suffix={` ${tokenSymbolRename(token.displaySymbol)}`} + suffix={` ${renameTokenSymbol(token.displaySymbol)}`} className="break-all" data-testid={`netSupply-value-${token.displaySymbol}`} /> diff --git a/src/pages/tokens/[id].page.tsx b/src/pages/tokens/[id].page.tsx index b3f013d08..c3d67f0c7 100644 --- a/src/pages/tokens/[id].page.tsx +++ b/src/pages/tokens/[id].page.tsx @@ -24,7 +24,7 @@ import { import { getTokenName } from "../../utils/commons/token/getTokenName"; import { isAlphanumeric, isNumeric } from "../../utils/commons/StringValidator"; import { getAllTokens } from "./shared/getAllTokens"; -import { tokenSymbolRename } from "../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../utils/commons/RenameToken"; interface TokenAssetPageProps { token: TokenData; @@ -204,7 +204,7 @@ function ListLeft({ })()} - {tokenSymbolRename(token.displaySymbol)} + {renameTokenSymbol(token.displaySymbol)} {(() => { diff --git a/src/pages/tokens/_components/TokenTable.tsx b/src/pages/tokens/_components/TokenTable.tsx index 00943c8a6..d38496567 100644 --- a/src/pages/tokens/_components/TokenTable.tsx +++ b/src/pages/tokens/_components/TokenTable.tsx @@ -5,7 +5,7 @@ import { TokenData } from "@defichain/whale-api-client/dist/api/tokens"; import { getAssetIcon, getTokenIcon } from "@components/icons/assets/tokens"; import { Link } from "@components/commons/link/Link"; import { getTokenName } from "../../../utils/commons/token/getTokenName"; -import { tokenSymbolRename } from "../../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../../utils/commons/RenameToken"; export function TokenTable({ tokens }: { tokens: TokenData[] }): JSX.Element { return ( @@ -51,7 +51,7 @@ function TokenRow({ data }: { data: TokenData }): JSX.Element { return ; })()}
- {tokenSymbolRename(data.displaySymbol)} + {renameTokenSymbol(data.displaySymbol)} {!data.isDAT && `#${data.id}`}
diff --git a/src/pages/vaults/[vaultid]/_components/VaultIdCollateralDetails.tsx b/src/pages/vaults/[vaultid]/_components/VaultIdCollateralDetails.tsx index 2fc4c1927..dbc4c0195 100644 --- a/src/pages/vaults/[vaultid]/_components/VaultIdCollateralDetails.tsx +++ b/src/pages/vaults/[vaultid]/_components/VaultIdCollateralDetails.tsx @@ -14,7 +14,7 @@ import { EmptySection } from "@components/commons/sections/EmptySection"; import { IconTooltip } from "@components/commons/IconsTooltip"; import { getActivePrice } from "pages/vaults/utils/ActivePrice"; import { VaultNumberValues } from "../../_components/commons/VaultNumberValues"; -import { tokenSymbolRename } from "../../../../utils/commons/TokenRename"; +import { renameTokenSymbol } from "../../../../utils/commons/RenameToken"; export function VaultIdCollateralDetails(props: { totalCollateralValue: string; @@ -134,7 +134,7 @@ function CollateralCard(props: { data-testid="CollateralCard.displaySymbol" >
- {tokenSymbolRename(props.col.displaySymbol)} + {renameTokenSymbol(props.col.displaySymbol)}
{props.col.symbol === "DUSD" ? ( - {tokenSymbolRename(props.batch.loan.displaySymbol)} + {renameTokenSymbol(props.batch.loan.displaySymbol)}
diff --git a/src/utils/commons/TokenRename.ts b/src/utils/commons/RenameToken.ts similarity index 58% rename from src/utils/commons/TokenRename.ts rename to src/utils/commons/RenameToken.ts index 4c3297f5a..2fa18d412 100644 --- a/src/utils/commons/TokenRename.ts +++ b/src/utils/commons/RenameToken.ts @@ -1,3 +1,3 @@ -export function tokenSymbolRename(symbol: string): string { +export function renameTokenSymbol(symbol: string): string { return symbol.includes("dUSDT") ? symbol.replace("dUSDT", "ex_USDT") : symbol; }