Added logo to fetch token function

src/app/state/loop-strategy/queries/useFetchSimulateDeposit.ts

@@ -30,10 +30,10 @@ export const useFetchSimulateDeposit = (account: Address, amount: string, subStr
       enabled
         ? rest
         : {
-          ...rest,
-          // todo: solve this differently, review displayvalue component, and render loading state in different way.
-          isFetched: true,
-        },
+            ...rest,
+            // todo: solve this differently, review displayvalue component, and render loading state in different way.
+            isFetched: true,
+          },
     ]),
     data: {
       bigIntValue: data?.sharesToReceive,

src/app/statev3/common/meta-data-queries/useFullTokenData.ts

@@ -6,30 +6,17 @@ import { useReadContract } from "wagmi";
 import { strategyConfig } from "../../settings/config";
 import { AssetBaseConfig } from "../../settings/configTypes";
 import { assetsConfig } from "../../settings/landingMarketConfig";
+import { useToken } from "@shared";
 
 export interface FullAssetData extends Omit<AssetBaseConfig, "address"> {
   decimals?: number;
 }
 
 // todo rename hook
 export const useFullTokenData = (asset?: Address | undefined): FetchData<FullAssetData> => {
-  const config = asset
-    ? assetsConfig[asset] || strategyConfig[asset]
-    : undefined;
+  const config = asset ? assetsConfig[asset] || strategyConfig[asset] : undefined;
 
-  const { data: decimals, ...decimalRest } = useReadContract({
-    address: asset,
-    abi: erc20Abi,
-    functionName: "decimals",
-    query: { ...metadataQueryConfig, enabled: !!asset },
-  });
-
-  const { data: symbol, ...symbolRest } = useReadContract({
-    address: asset,
-    abi: erc20Abi,
-    functionName: "symbol",
-    query: { ...metadataQueryConfig, enabled: !!asset },
-  });
+  const { data, ...dataRest } = useToken(asset);
 
   const { data: name, ...nameRest } = useReadContract({
     address: asset,
@@ -39,12 +26,12 @@ export const useFullTokenData = (asset?: Address | undefined): FetchData<FullAss
   });
 
   return {
-    ...mergeQueryStates([decimalRest, symbolRest, nameRest]),
+    ...mergeQueryStates([dataRest, nameRest]),
     data: {
-      symbol,
       name,
-      decimals,
+      ...data,
       ...config,
+      logo: config?.logo || data?.logo,
     },
   };
 };

src/app/statev3/hooks/user-rewards-by-strategy/UserRewardsByStrategy.fetch.ts

@@ -2,9 +2,8 @@ import { Address } from "viem";
 import { rewardsControllerAddress, rewardsControllerAbi } from "@generated";
 import { getConfig, queryContract } from "../../../utils/queryContractUtils";
 import { cTotalRewards } from "./UserRewardsByStrategy.math";
-import { fetchTokenData } from "../../metadata/TokenData.fetch";
 import { fetchAssetPriceInBlock } from "../../queries/AssetPrice.hook";
-import { FetchBigInt, FetchBigIntStrict, formatFetchBigInt, formatUsdValue } from "@shared";
+import { FetchBigInt, FetchBigIntStrict, fetchToken, formatFetchBigInt, formatUsdValue } from "@shared";
 import { cValueInUsd } from "../../math/utils";
 import { heavyDataQueryConfig } from "../../settings/queryConfig";
 import { readContractQueryOptions } from "wagmi/query";
@@ -41,7 +40,7 @@ export async function fetchAllUserRewardsByStrategy({
   const rewardsInfo: FetchRewardsByStrategyInfo[] = await Promise.all(
     rewardsAddresses.map(async (address, index) => {
       const [{ decimals, symbol }, tokenPrice] = await Promise.all([
-        fetchTokenData(address),
+        fetchToken(address),
         fetchAssetPriceInBlock(address),
       ]);
 

src/app/statev3/hooks/user-strategy-profit/UserStrategyProfit.fetch.ts

@@ -2,8 +2,7 @@ import { Address, parseAbiItem } from "viem";
 import { getPublicClient } from "wagmi/actions";
 import { getExtensiveOperationsConfig } from "../../../utils/queryContractUtils";
 import { TransfersWithStrategyPrice, cUserStrategyProfit } from "./UserStrategyProfit.math";
-import { fetchTokenData } from "../../metadata/TokenData.fetch";
-import { FetchBigIntStrict, formatFetchBigInt, formatUsdValue } from "../../../../shared";
+import { FetchBigIntStrict, fetchToken, formatFetchBigInt, formatUsdValue } from "../../../../shared";
 import { fetchAssetPriceInBlock } from "../../queries/AssetPrice.hook";
 import { getQueryClient } from "../../../contexts/CustomQueryClientProvider";
 import { heavyDataQueryConfig } from "../../settings/queryConfig";
@@ -142,7 +141,7 @@ export async function fetchUserStrategyProfit(
 
   const [logs, { decimals: strategyDecimals, symbol: strategySymbol }] = await Promise.all([
     getStrategyEventLogsForUser({ strategy, user }),
-    fetchTokenData(strategy),
+    fetchToken(strategy),
   ]);
 
   const [transferWithStrategyPrice, currStrategyPrice] = await Promise.all([

src/app/statev3/metadata/FullStrategyData.all.ts

@@ -1,11 +1,11 @@
 import { Address } from "viem";
-import { fetchTokenData } from "./TokenData.fetch";
 import { fetchStrategyAssets } from "./StrategyAssets.fetch";
 import { useQuery } from "@tanstack/react-query";
 import { disableCacheQueryConfig } from "../settings/queryConfig";
-import { addressIconMap, strategyConfig } from "../settings/config";
+import { strategyConfig } from "../settings/config";
 import { TagType } from "../common/types/StateTypes";
-import { Displayable } from "../../../shared";
+import { Displayable, fetchToken } from "@shared";
+import { addressIconMap } from "@meta";
 
 export interface FullStrategyData {
   underlying?: Address;
@@ -16,22 +16,21 @@ export interface FullStrategyData {
   address?: Address;
   diagram?: string;
 
-  icon: string;
+  logo?: string;
   symbol?: string;
   decimals?: number;
   name: string;
 }
 
 export async function fetchFullStrategyData(strategy: Address): Promise<FullStrategyData> {
-  const [tokenData, assets] = await Promise.all([fetchTokenData(strategy), fetchStrategyAssets(strategy)]);
+  const [tokenData, assets] = await Promise.all([fetchToken(strategy), fetchStrategyAssets(strategy)]);
 
   const config = strategy ? strategyConfig[strategy] : undefined;
   if (!config) throw new Error(`No config found for ${strategy}`);
 
   return {
     ...tokenData,
     ...assets,
-    icon: strategy ? addressIconMap.get(strategy) || "" : "",
     address: strategy,
     ...config,
   };
@@ -53,7 +52,7 @@ export const useFetchFullStrategyData = (strategy?: Address): Displayable<FullSt
     data: {
       ...data,
       address: strategy,
-      icon: addressIconMap.get(strategy || "") || "",
+      logo: addressIconMap.get(strategy || "") || "",
       ...config,
     },
   };

src/app/statev3/queries/AssetBalance.hook.ts

@@ -1,6 +1,5 @@
 import { Address, erc20Abi } from "viem";
-import { FetchBigIntStrict } from "../../../shared";
-import { fetchTokenData } from "../metadata/TokenData.fetch";
+import { FetchBigIntStrict, fetchToken } from "@shared";
 import { getConfig, queryContract } from "../../utils/queryContractUtils";
 import { walletDataQueryConfig } from "../settings/queryConfig";
 import { readContractQueryOptions } from "wagmi/query";
@@ -21,7 +20,7 @@ export async function fetchAssetBalance({ account, asset }: FetchAssetBalanceInp
       }),
       ...walletDataQueryConfig,
     }),
-    fetchTokenData(asset),
+    fetchToken(asset),
   ]);
 
   return {

src/app/statev3/queries/AssetTotalSupply.hook.ts

@@ -1,7 +1,6 @@
 import { Address, erc20Abi } from "viem";
-import { FetchBigIntStrict } from "../../../shared";
+import { FetchBigIntStrict, fetchToken } from "../../../shared";
 import { getConfig, queryContract } from "../../utils/queryContractUtils";
-import { fetchTokenData } from "../metadata/TokenData.fetch";
 import { infiniteCacheQueryConfig, platformDataQueryConfig } from "../settings/queryConfig";
 import { readContractQueryOptions } from "wagmi/query";
 
@@ -26,7 +25,7 @@ export async function fetchAssetTotalSupplyInBlock({
       }),
       ...cacheConfig,
     }),
-    fetchTokenData(asset),
+    fetchToken(asset),
   ]);
 
   return {

src/app/statev3/queries/AvailableStrategyCap.hook.ts

@@ -1,10 +1,10 @@
 import { Address, zeroAddress } from "viem";
-import { fetchTokenData } from "../metadata/TokenData.fetch";
 import { loopStrategyAbi } from "../../generated";
 import {
   Displayable,
   FetchTokenAmountWithUsdValueStrict,
   ViewBigIntWithUsdValue,
+  fetchToken,
   formatFetchBigInt,
   formatFetchBigIntToViewBigInt,
   formatUsdValue,
@@ -29,6 +29,7 @@ export async function fetchMaxDeposit(strategy: Address): Promise<bigint> {
     ...infiniteCacheQueryConfig,
   }).catch((error) => {
     if (error.cause.reason === OVERFLOW_UNDERFLOW_REASON_MESSAGE) {
+      // eslint-disable-next-line no-console
       console.info(`Failed to fetch available strategy cap for strategy ${strategy}`, error);
       return 0n;
     }
@@ -49,7 +50,7 @@ export async function fetchAvailableStrategyCap(strategy: Address): Promise<Fetc
   ] = await Promise.all([
     fetchMaxDeposit(strategy),
     fetchAssetPriceInBlock(underlyingAsset),
-    fetchTokenData(underlyingAsset),
+    fetchToken(underlyingAsset),
   ]);
 
   return {

src/app/statev3/queries/Collateral.fetch.ts

@@ -3,8 +3,7 @@ import { getConfig, queryContract } from "../../utils/queryContractUtils";
 import { loopStrategyAbi } from "../../generated";
 import { fetchStrategyAssets } from "../metadata/StrategyAssets.fetch";
 import { fetchAssetPriceInBlock } from "./AssetPrice.hook";
-import { fetchTokenData } from "../metadata/TokenData.fetch";
-import { FetchTokenAmountWithUsdValueStrict, formatFetchBigInt, formatUsdValue } from "../../../shared";
+import { fetchToken, FetchTokenAmountWithUsdValueStrict, formatFetchBigInt, formatUsdValue } from "@shared";
 import { cValueFromUsd } from "../math/utils";
 import { platformDataQueryConfig } from "../settings/queryConfig";
 import { readContractQueryOptions } from "wagmi/query";
@@ -23,7 +22,7 @@ export async function fetchCollateral(strategy: Address): Promise<FetchTokenAmou
         ...platformDataQueryConfig,
       }),
       fetchAssetPriceInBlock(underlyingAsset),
-      fetchTokenData(underlyingAsset),
+      fetchToken(underlyingAsset),
     ]);
 
   return {

src/app/statev3/queries/Equity.hook.ts

@@ -1,21 +1,17 @@
 import { Address } from "viem";
-import { fetchTokenData } from "../metadata/TokenData.fetch";
 import { loopStrategyAbi } from "../../generated";
 import {
   Displayable,
   FetchTokenAmountWithUsdValueStrict,
   ViewBigIntWithUsdValue,
+  fetchToken,
   formatFetchBigInt,
   formatFetchBigIntToViewBigInt,
   formatUsdValue,
 } from "../../../shared";
 import { getConfig, queryContract } from "../../utils/queryContractUtils";
 import { useQuery } from "@tanstack/react-query";
-import {
-  disableCacheQueryConfig,
-  infiniteCacheQueryConfig,
-  platformDataQueryConfig,
-} from "../settings/queryConfig";
+import { disableCacheQueryConfig, infiniteCacheQueryConfig, platformDataQueryConfig } from "../settings/queryConfig";
 import { readContractQueryOptions } from "wagmi/query";
 
 export interface FetchEquityInBlockInput {
@@ -29,7 +25,7 @@ export async function fetchEquityInBlock({
 }: FetchEquityInBlockInput): Promise<FetchTokenAmountWithUsdValueStrict> {
   const cacheConfig = blockNumber ? infiniteCacheQueryConfig : platformDataQueryConfig;
 
-  const { symbol, decimals } = await fetchTokenData(strategy);
+  const { symbol, decimals } = await fetchToken(strategy);
 
   const [equity, equityUsd] = await Promise.all([
     queryContract({

src/app/statev3/queries/MetadataLoader.hook.ts

@@ -1,12 +1,12 @@
 import { fetchStrategies } from "./Strategies.hook";
-import { fetchTokenData, TokenData } from "../metadata/TokenData.fetch";
 import { useQuery } from "@tanstack/react-query";
 import { disableCacheQueryConfig } from "../settings/queryConfig";
+import { fetchToken, Token } from "@shared";
 
-export async function fetchAllStrategyTokenData(): Promise<TokenData[]> {
+export async function fetchAllStrategyTokenData(): Promise<Token[]> {
   const strategies = await fetchStrategies();
 
-  const allStrategyData = await Promise.all(strategies.map((strategy) => fetchTokenData(strategy)));
+  const allStrategyData = await Promise.all(strategies.map((strategy) => fetchToken(strategy)));
 
   return allStrategyData;
 }

src/app/statev3/queries/StrategyCap.hook.ts

@@ -3,14 +3,14 @@ import {
   Displayable,
   FetchTokenAmountWithUsdValueStrict,
   ViewBigIntWithUsdValue,
+  fetchToken,
   formatFetchBigInt,
   formatFetchBigIntToViewBigInt,
   formatUsdValue,
 } from "@shared";
 import { fetchStrategyAssets } from "../metadata/StrategyAssets.fetch";
 import { getConfig, queryContract } from "../../utils/queryContractUtils";
 import { fetchAssetPriceInBlock } from "./AssetPrice.hook";
-import { fetchTokenData } from "../metadata/TokenData.fetch";
 import { loopStrategyAbi } from "../../generated";
 import { cValueInUsd } from "../math/utils";
 import { useQuery } from "@tanstack/react-query";
@@ -31,7 +31,7 @@ export async function fetchStrategyCap(strategy: Address): Promise<FetchTokenAmo
         ...infiniteCacheQueryConfig,
       }),
       fetchAssetPriceInBlock(underlying),
-      fetchTokenData(underlying),
+      fetchToken(underlying),
     ]);
 
   return {