diff --git a/apps/extension/src/ui/apps/dashboard/routes/Portfolio/PortfolioAsset.tsx b/apps/extension/src/ui/apps/dashboard/routes/Portfolio/PortfolioAsset.tsx
index 601cb5f70a..c3a968e0f0 100644
--- a/apps/extension/src/ui/apps/dashboard/routes/Portfolio/PortfolioAsset.tsx
+++ b/apps/extension/src/ui/apps/dashboard/routes/Portfolio/PortfolioAsset.tsx
@@ -11,7 +11,6 @@ import { Statistics } from "@ui/domains/Portfolio/Statistics"
import { useDisplayBalances } from "@ui/domains/Portfolio/useDisplayBalances"
import { useTokenBalancesSummary } from "@ui/domains/Portfolio/useTokenBalancesSummary"
import { useAnalytics } from "@ui/hooks/useAnalytics"
-import { useSelectedCurrency } from "@ui/hooks/useCurrency"
import { useSendFundsPopup } from "@ui/hooks/useSendFundsPopup"
import { useCallback, useEffect, useMemo } from "react"
import { useTranslation } from "react-i18next"
@@ -21,8 +20,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "talisman-ui"
const PageContent = ({ balances, symbol }: { balances: Balances; symbol: string }) => {
const navigate = useNavigate()
const balancesToDisplay = useDisplayBalances(balances)
- const currency = useSelectedCurrency()
- const { token, rates, summary } = useTokenBalancesSummary(balancesToDisplay)
+ const { token, rate, summary } = useTokenBalancesSummary(balancesToDisplay)
const { open: openCopyAddressModal } = useCopyAddressModal()
const { genericEvent } = useAnalytics()
const { account } = useSelectedAccount()
@@ -61,7 +59,7 @@ const PageContent = ({ balances, symbol }: { balances: Balances; symbol: string
{token?.symbol}
- {rates &&
}
+ {rate &&
}
diff --git a/apps/extension/src/ui/apps/popup/pages/Portfolio/PortfolioAsset.tsx b/apps/extension/src/ui/apps/popup/pages/Portfolio/PortfolioAsset.tsx
index 87cd87a82b..a14a5bf317 100644
--- a/apps/extension/src/ui/apps/popup/pages/Portfolio/PortfolioAsset.tsx
+++ b/apps/extension/src/ui/apps/popup/pages/Portfolio/PortfolioAsset.tsx
@@ -19,7 +19,7 @@ const PageContent = ({ balances, symbol }: { balances: Balances; symbol: string
const navigate = useNavigate()
const balancesToDisplay = useDisplayBalances(balances)
const currency = useSelectedCurrency()
- const { token, rates } = useTokenBalancesSummary(balancesToDisplay)
+ const { token, rate } = useTokenBalancesSummary(balancesToDisplay)
const handleBackBtnClick = useCallback(() => navigate(-1), [navigate])
@@ -45,7 +45,7 @@ const PageContent = ({ balances, symbol }: { balances: Balances; symbol: string
{t("Total")}
- {rates &&
}
+ {rate &&
}
diff --git a/apps/extension/src/ui/domains/Portfolio/AssetsTable/DashboardAssetsTable.tsx b/apps/extension/src/ui/domains/Portfolio/AssetsTable/DashboardAssetsTable.tsx
index 15f4f345f2..2965bb8124 100644
--- a/apps/extension/src/ui/domains/Portfolio/AssetsTable/DashboardAssetsTable.tsx
+++ b/apps/extension/src/ui/domains/Portfolio/AssetsTable/DashboardAssetsTable.tsx
@@ -5,7 +5,6 @@ import { classNames } from "@talismn/util"
import Fiat from "@ui/domains/Asset/Fiat"
import { useAnalytics } from "@ui/hooks/useAnalytics"
import { useBalancesStatus } from "@ui/hooks/useBalancesStatus"
-import { useSelectedCurrency } from "@ui/hooks/useCurrency"
import { FC, useCallback } from "react"
import { Trans, useTranslation } from "react-i18next"
import { useNavigate } from "react-router-dom"
@@ -58,8 +57,7 @@ const AssetRow = ({ balances }: AssetRowProps) => {
const status = useBalancesStatus(balances)
- const currency = useSelectedCurrency()
- const { token, rates, summary } = useTokenBalancesSummary(balances)
+ const { token, rate, summary } = useTokenBalancesSummary(balances)
const { showNomPoolBanner, dismissNomPoolBanner } = useNomPoolStakingBanner()
const showBanner = showNomPoolBanner({
chainId: token?.chain?.id,
@@ -148,9 +146,7 @@ const AssetRow = ({ balances }: AssetRowProps) => {
)}
- {rates !== undefined && (
-
- )}
+ {rate !== undefined && }
diff --git a/apps/extension/src/ui/domains/Portfolio/AssetsTable/PopupAssetsTable.tsx b/apps/extension/src/ui/domains/Portfolio/AssetsTable/PopupAssetsTable.tsx
index f2ba088e12..77285363ad 100644
--- a/apps/extension/src/ui/domains/Portfolio/AssetsTable/PopupAssetsTable.tsx
+++ b/apps/extension/src/ui/domains/Portfolio/AssetsTable/PopupAssetsTable.tsx
@@ -88,8 +88,7 @@ const AssetRow = ({ balances, locked }: AssetRowProps) => {
const { account } = useSearchParamsSelectedAccount()
const status = useBalancesStatus(balances)
- const currency = useSelectedCurrency()
- const { token, summary, rates } = useTokenBalancesSummary(balances)
+ const { token, summary, rate } = useTokenBalancesSummary(balances)
const { showNomPoolBanner, dismissNomPoolBanner } = useNomPoolStakingBanner()
const showBanner = showNomPoolBanner({
chainId: token?.chain?.id,
@@ -168,9 +167,7 @@ const AssetRow = ({ balances, locked }: AssetRowProps) => {
)}
- {rates !== undefined && (
-
- )}
+ {rate !== undefined && }
{
return {
token,
- rates: token?.id !== undefined ? tokenBalanceRates[token?.id] : undefined,
+ rate: token?.id !== undefined ? tokenBalanceRates[token?.id]?.[currency] : undefined,
summary,
tokenBalances,
tokenBalanceRates,