oraidex · trungbach · Dec 31, 2024 · Nov 4, 2024 · Nov 4, 2024 · Nov 4, 2024
diff --git a/packages/oraidex-common/src/network.ts b/packages/oraidex-common/src/network.ts
@@ -318,7 +318,6 @@ export const network: CustomChainInfo & NetworkConfig = {
 export const evmChains = chainInfos.filter((c) => c.networkType === "evm");
 export const cosmosChains: CustomChainInfo[] = chainInfos.filter((c) => c.networkType === "cosmos");
 
-
 // evm network
 export enum Networks {
   mainnet = 1,

diff --git a/packages/oraidex-common/src/token.ts b/packages/oraidex-common/src/token.ts
@@ -97,38 +97,33 @@ export const initOraiCommon = async () => {
     const tokenListSupports = supportedChainIns.supportedChainInfo;
 
     const tokenInfos = [];
+
+    // filter to get tokens that are supported by the network.
     for (const [chainId, coins] of Object.entries(tokenListSupports)) {
-      const orgTokenList = oraiCommon.tokenItems.getSpecificChainTokens(chainId);
-      const listCoinId = Object.values(coins);
+      const chainTokens = oraiCommon.tokenItems.getSpecificChainTokens(chainId);
+      const listSupportedTokenByChain = Object.values(coins);
 
-      const fmtTokens = listCoinId.reduce((acc, tk) => {
-        const findItem = orgTokenList.find((c) => [c.contractAddress, c.denom].includes(tk.denom));
+      const fmtTokens = listSupportedTokenByChain.reduce((acc, supportedToken) => {
+        const findItem = chainTokens.find((chainToken) =>
+          [chainToken.contractAddress, chainToken.denom].includes(supportedToken.denom)
+        );
 
         if (findItem) {
           acc.push({
             ...findItem,
-            coinGeckoId: tk.coingecko_id,
-            Icon: findItem.icon || tokenIconByCoingeckoId[tk.coingecko_id]?.Icon || "",
-            IconLight: findItem.icon || tokenIconByCoingeckoId[tk.coingecko_id]?.IconLight || ""
+            coinGeckoId: supportedToken.coingecko_id,
+            Icon: findItem.icon || tokenIconByCoingeckoId[supportedToken.coingecko_id]?.Icon || "",
+            IconLight: findItem.icon || tokenIconByCoingeckoId[supportedToken.coingecko_id]?.IconLight || ""
           });
         }
 
         return acc;
       }, []);
-
       tokenInfos.push(...fmtTokens);
     }
 
-    tokenConfig.oraichainTokens = tokenInfos.filter((tk) => tk.chainId === "Oraichain");
-    tokenConfig.otherChainTokens = tokenInfos.filter((tk) => tk.chainId !== "Oraichain");
-
-    const { chainInfos, tokenItems } = oraiCommon;
-
-    console.log({
-      chainInfos: chainInfos.chainInfos.length,
-      tokenItems: tokenItems.tokens.length,
-      tokenConfig
-    });
+    tokenConfig.oraichainTokens = tokenInfos.filter((token) => token.chainId === "Oraichain");
+    tokenConfig.otherChainTokens = tokenInfos.filter((token) => token.chainId !== "Oraichain");
   }
 
   return { tokenConfig, oraiCommon };
@@ -139,50 +134,34 @@ await initOraiCommon();
 export const oraichainTokens = tokenConfig.oraichainTokens;
 export const otherChainTokens = tokenConfig.otherChainTokens;
 export const chainInfosCommon = oraiCommon.chainInfos;
-
 export const tokens = [otherChainTokens, oraichainTokens];
-
 export const flattenTokens = flatten(tokens);
 export const tokenMap = Object.fromEntries(flattenTokens.map((c) => [c.denom, c]));
 export const assetInfoMap = Object.fromEntries(flattenTokens.map((c) => [c.contractAddress || c.denom, c]));
 export const cosmosTokens = uniqBy(
-  flattenTokens.filter(
-    (token) =>
-      // !token.contractAddress &&
-      token.denom && token.cosmosBased && token.coinGeckoId
-  ),
+  flattenTokens.filter((token) => token.denom && token.cosmosBased && token.coinGeckoId),
   (c) => c.denom
 );
-
 export const cw20Tokens = uniqBy(
   cosmosTokens.filter(
     // filter cosmos based tokens to collect tokens that have contract addresses
-    (token) =>
-      // !token.contractAddress &&
-      token.contractAddress
+    (token) => token.contractAddress
   ),
   (c) => c.denom
 );
-
 export const cw20TokenMap = Object.fromEntries(cw20Tokens.map((c) => [c.contractAddress, c]));
-
 export const evmTokens = uniqBy(
   flattenTokens.filter(
-    (token) =>
-      // !token.contractAddress &&
-      token.denom && !token.cosmosBased && token.coinGeckoId && token.chainId !== "kawaii_6886-1"
+    (token) => token.denom && !token.cosmosBased && token.coinGeckoId && token.chainId !== "kawaii_6886-1"
   ),
   (c) => c.denom
 );
-
 export const kawaiiTokens = uniqBy(
   cosmosTokens.filter((token) => token.chainId === "kawaii_6886-1"),
   (c) => c.denom
 );
-
 // mapped token with icon
 export const oraichainTokensWithIcon = mapListWithIcon(oraichainTokens, tokensIcon, "coinGeckoId");
 export const otherTokensWithIcon = mapListWithIcon(otherChainTokens, tokensIcon, "coinGeckoId");
-
 export const tokensWithIcon = [otherTokensWithIcon, oraichainTokensWithIcon];
 export const flattenTokensWithIcon = flatten(tokensWithIcon);