Fix readNativeDenom

stationmoney · Aug 25, 2023 · be83cfe · be83cfe
1 parent 3d0ce49
commit be83cfe
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 16 deletions.
diff --git a/src/components/form/AssetSelector.tsx b/src/components/form/AssetSelector.tsx
@@ -64,7 +64,11 @@ const AssetSelector = ({
         <ArrowDropDownIcon style={{ fontSize: 20 }} className={styles.caret} />
       </button>
       {open && (
-        <AssetList list={assetList} onChange={handleSelection} value={value} />
+        <AssetList
+          list={assetList.filter(({ balance }) => !!Number(balance))}
+          onChange={handleSelection}
+          value={value}
+        />
       )}
     </div>
   )

diff --git a/src/data/token.tsx b/src/data/token.tsx
@@ -83,6 +83,13 @@ export const WithTokenItem = ({ token, chainID, children }: Props) => {
 /* helpers */
 export const getIcon = (path: string) => `${ASSETS}/icon/svg/${path}`
 
+export enum TokenType {
+  IBC = "ibc",
+  GAMM = "gamm",
+  FACTORY = "factory",
+  STRIDE = "stride",
+}
+
 export const useNativeDenoms = () => {
   const { whitelist, ibcDenoms } = useWhitelist()
   const { list: cw20 } = useCustomTokensCW20()
@@ -98,48 +105,56 @@ export const useNativeDenoms = () => {
   ): TokenItem & { isNonWhitelisted?: boolean } {
     let tokenType = ""
     if (denom.startsWith("ibc/")) {
-      tokenType = "ibc"
+      tokenType = TokenType.IBC
     } else if (denom.startsWith("factory/")) {
-      tokenType = "factory"
+      tokenType = TokenType.FACTORY
     } else if (denom.startsWith("gamm/")) {
-      tokenType = "gamm"
+      tokenType = TokenType.GAMM
       decimals = GAMM_TOKEN_DECIMALS
+    } else if (
+      denom.startsWith("stu") &&
+      (!chainID || chainID === "stride-1")
+    ) {
+      tokenType = TokenType.STRIDE
     }
 
     let fixedDenom = ""
     switch (tokenType) {
-      case "ibc":
+      case TokenType.IBC:
         fixedDenom = `${readDenom(denom).substring(0, 5)}...`
         break
 
-      case "gamm":
+      case TokenType.GAMM:
         fixedDenom = gammTokens.get(denom) ?? readDenom(denom)
         break
 
-      case "factory": {
+      case TokenType.FACTORY:
         const factoryParts = denom.split(/[/:]/)
         let tokenAddress = ""
         if (factoryParts.length >= 2) {
           tokenAddress = factoryParts.slice(2).join(" ")
         }
         fixedDenom = tokenAddress
         break
-      }
+
+      case TokenType.STRIDE:
+        fixedDenom = `st${denom.replace("stu", "").toUpperCase()}`
+        break
 
       default:
-        fixedDenom = readDenom(denom)
+        fixedDenom = readDenom(denom) || denom
     }
 
     let factoryIcon
-    if (tokenType === "factory") {
+    if (tokenType === TokenType.FACTORY) {
       const tokenAddress = denom.split(/[/:]/)[1]
       const chainID = getChainIDFromAddress(tokenAddress, networks)
       if (chainID) {
         factoryIcon = networks[chainID].icon
       }
     }
 
-    if (tokenType === "gamm") {
+    if (tokenType === TokenType.GAMM) {
       factoryIcon = OSMO_ICON
     }
 
@@ -170,6 +185,7 @@ export const useNativeDenoms = () => {
     ) {
       return {
         ...whitelist[networkName][ibcToken?.token],
+        type: tokenType,
         // @ts-expect-error
         chains: [ibcToken?.chainID],
       }
@@ -197,6 +213,10 @@ export const useNativeDenoms = () => {
       }
     }
 
+    const CHAIN_ICON =
+      networks[chainID ?? ""]?.icon ||
+      "https://assets.terra.dev/icon/svg/Terra.svg"
+
     return (
       cw20.find(({ token }) => denom === token) ?? {
         // default token icon
@@ -205,11 +225,12 @@ export const useNativeDenoms = () => {
         name: fixedDenom,
         type: tokenType,
         icon:
-          tokenType === "ibc"
+          (tokenType === TokenType.IBC
             ? "https://assets.terra.dev/icon/svg/IBC.svg"
-            : tokenType === "factory" || tokenType === "gamm"
-            ? factoryIcon
-            : "https://assets.terra.dev/icon/svg/Terra.svg",
+            : tokenType === TokenType.STRIDE
+            ? "https://station-assets.terra.dev/img/chains/Stride.png"
+            : (tokenType === TokenType.FACTORY || TokenType.GAMM) &&
+              factoryIcon) || CHAIN_ICON,
         decimals,
         isNonWhitelisted: true,
       }

diff --git a/src/pages/wallet/SendPage.tsx b/src/pages/wallet/SendPage.tsx
@@ -68,7 +68,7 @@ const SendPage = () => {
     () =>
       Object.values(
         (balances ?? []).reduce((acc, { denom, amount, chain }) => {
-          const data = readNativeDenom(denom)
+          const data = readNativeDenom(denom, chain)
           // TODO: resolve ibc lun(a|c) balances better at balance fetch
           // then update max / balance / messaging to translate lun(a|c)
           // for now, check if token is LUNC and network isn't classic, discard if so