Improve LUNC/LUNA IBC detection

src/data/token.tsx

@@ -84,7 +84,7 @@ export const WithTokenItem = ({ token, chainID, children }: Props) => {
 export const getIcon = (path: string) => `${ASSETS}/icon/svg/${path}`
 
 export const useNativeDenoms = () => {
-  const { whitelist, ibcDenoms, legacyWhitelist } = useWhitelist()
+  const { whitelist, ibcDenoms } = useWhitelist()
   const { list: cw20 } = useCustomTokensCW20()
   const networkName = useNetworkName()
   const networks = useNetwork()
@@ -158,46 +158,43 @@ export const useNativeDenoms = () => {
 
     // ibc token
     let ibcToken = ibcDenoms[networkName]?.[denom]?.token
-    const chainOrigin = ibcDenoms[networkName]?.[denom]?.chainID
-    const ibcLunc =
-      chainOrigin &&
-      ["phoenix-1:uluna", "pisco-1:uluna"].includes(ibcToken) &&
-      networkName !== "classic" &&
-      ibcDenoms["classic"]?.[denom]
-    if (ibcLunc) {
-      ibcToken = ibcDenoms["classic"]?.[denom]?.token
-      return {
-        ...whitelist["classic"][ibcToken],
-        // @ts-expect-error
-        chains: [ibcDenoms["classic"]?.[denom]?.chainID],
-      }
-    } else if (ibcToken && whitelist[networkName][ibcToken]) {
+
+    if (
+      ibcToken &&
+      whitelist[networkName][ibcToken] &&
+      (!chainID || ibcDenoms[networkName][denom].chainID === chainID)
+    ) {
       return {
         ...whitelist[networkName][ibcToken],
         // @ts-expect-error
-        chains: [ibcDenoms[networkName][denom].chain],
+        chains: [ibcDenoms[networkName][denom].chainID],
       }
     }
 
-    // Assuming terra-utils returns "Luna" for LUNC.
-    if (fixedDenom === "Luna" && networkName !== "classic") {
-      return {
-        token: denom,
-        symbol: "LUNC",
-        name: "Luna Classic",
-        icon: "https://assets.terra.money/icon/svg/LUNC.svg",
-        decimals: 6,
-        isNonWhitelisted: false,
+    if (denom === "uluna") {
+      if (chainID === "columbus-5" || (!chainID && networkName === "classic")) {
+        return {
+          token: denom,
+          symbol: "LUNC",
+          name: "Luna Classic",
+          icon: "https://assets.terra.money/icon/svg/LUNC.svg",
+          decimals: 6,
+          isNonWhitelisted: false,
+        }
+      } else if (chainID === "phoenix-1" || chainID === "pisco-1") {
+        return {
+          token: denom,
+          symbol: "LUNA",
+          name: "Luna",
+          icon: "https://assets.terra.money/icon/svg/Luna.svg",
+          decimals: 6,
+          isNonWhitelisted: false,
+        }
       }
     }
 
     return (
-      legacyWhitelist[denom] ??
-      cw20.find(({ token }) => denom === token) ??
-      // that's needed for axl tokens
-      Object.values(whitelist[networkName] ?? {}).find(
-        (t) => t.token === denom
-      ) ?? {
+      cw20.find(({ token }) => denom === token) ?? {
         // default token icon
         token: denom,
         symbol: fixedDenom,

src/pages/wallet/AssetList.tsx

@@ -42,8 +42,8 @@ const AssetList = () => {
   const unknownIBCDenomsData = useIBCBaseDenoms(
     coins
       .map(({ denom, chain }) => ({ denom, chainID: chain }))
-      .filter(({ denom }) => {
-        const data = readNativeDenom(denom)
+      .filter(({ denom, chainID }) => {
+        const data = readNativeDenom(denom, chainID)
         return denom.startsWith("ibc/") && data.symbol.endsWith("...")
       })
   )
@@ -52,7 +52,9 @@ const AssetList = () => {
       data
         ? {
             ...acc,
-            [data.ibcDenom]: {
+            [[data.ibcDenom, data.chainIDs[data.chainIDs.length - 1]].join(
+              "*"
+            )]: {
               baseDenom: data.baseDenom,
               chainID: data?.chainIDs[0],
               chainIDs: data?.chainIDs,
@@ -71,13 +73,15 @@ const AssetList = () => {
         ...Object.values(
           coins.reduce((acc, { denom, amount, chain }) => {
             const data = readNativeDenom(
-              unknownIBCDenoms[denom]?.baseDenom ?? denom,
-              unknownIBCDenoms[denom]?.chainID ?? chain
+              unknownIBCDenoms[[denom, chain].join("*")]?.baseDenom ?? denom,
+              unknownIBCDenoms[[denom, chain].join("*")]?.chainIDs[0] ?? chain
             )
 
             const key = [
-              // @ts-expect-error
-              unknownIBCDenoms[denom]?.chainID ?? data?.chainID ?? chain,
+              unknownIBCDenoms[[denom, chain].join("*")]?.chainIDs[0] ??
+                // @ts-expect-error
+                data?.chainID ??
+                chain,
               data.token,
             ].join("*")
 
@@ -119,7 +123,9 @@ const AssetList = () => {
                   id: key,
                   whitelisted: !(
                     data.isNonWhitelisted ||
-                    unknownIBCDenoms[denom]?.chainIDs.find((c) => !networks[c])
+                    unknownIBCDenoms[[denom, chain].join("*")]?.chainIDs.find(
+                      (c) => !networks[c]
+                    )
                   ),
                 },
               }
@@ -168,8 +174,9 @@ const AssetList = () => {
             <Asset
               denom={denom}
               {...readNativeDenom(
-                unknownIBCDenoms[denom]?.baseDenom ?? denom,
-                unknownIBCDenoms[denom]?.chainID ?? chainID
+                unknownIBCDenoms[[denom, chainID].join("*")]?.baseDenom ??
+                  denom,
+                unknownIBCDenoms[[denom, chainID].join("*")]?.chainID ?? chainID
               )}
               id={id}
               {...item}

src/pages/wallet/AssetPage.tsx

@@ -42,8 +42,8 @@ const AssetPage = () => {
   const unknownIBCDenomsData = useIBCBaseDenoms(
     balances
       .map(({ denom, chain }) => ({ denom, chainID: chain }))
-      .filter(({ denom }) => {
-        const data = readNativeDenom(denom)
+      .filter(({ denom, chainID }) => {
+        const data = readNativeDenom(denom, chainID)
         return denom.startsWith("ibc/") && data.symbol.endsWith("...")
       })
   )
@@ -53,7 +53,9 @@ const AssetPage = () => {
       data
         ? {
             ...acc,
-            [data.ibcDenom]: {
+            [[data.ibcDenom, data.chainIDs[data.chainIDs.length - 1]].join(
+              "*"
+            )]: {
               baseDenom: data.baseDenom,
               chains: data?.chainIDs,
             },
@@ -64,21 +66,21 @@ const AssetPage = () => {
 
   const filteredBalances = balances.filter((b) => {
     return (
-      readNativeDenom(b.denom).token === token &&
-      readNativeDenom(b.denom).symbol === symbol
+      readNativeDenom(b.denom, b.chain).token === token &&
+      readNativeDenom(b.denom, b.chain).symbol === symbol
     )
   })
 
   const filteredUnsupportedBalances = balances.filter((b) => {
     // only return unsupported token if the current chain is found in the ibc path
     if (chain) {
       return (
-        unknownIBCDenoms[b.denom]?.baseDenom === token &&
-        unknownIBCDenoms[b.denom]?.chains?.includes(chain)
+        unknownIBCDenoms[[b.denom, b.chain].join("*")]?.baseDenom === token &&
+        unknownIBCDenoms[[b.denom, b.chain].join("*")]?.chains?.[0] === chain
       )
     }
 
-    return unknownIBCDenoms[b.denom]?.baseDenom === token
+    return unknownIBCDenoms[[b.denom, b.chain].join("*")]?.baseDenom === token
   })
 
   const totalBalance = [
@@ -146,7 +148,9 @@ const AssetPage = () => {
                       token={token}
                       denom={b.denom}
                       decimals={decimals}
-                      path={unknownIBCDenoms[b.denom]?.chains}
+                      path={
+                        unknownIBCDenoms[[b.denom, b.chain].join("*")]?.chains
+                      }
                       ibcDenom={b.denom}
                     />
                   </div>