fix kujira factory IBC tokens (#466)

* fix kujira factory IBC tokens * fix send back and use prefix to detect kujira
stationmoney · Jul 11, 2023 · a0736a3 · a0736a3
1 parent efee91d
commit a0736a3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/data/queries/ibc.ts b/src/data/queries/ibc.ts
@@ -97,6 +97,9 @@ export const useIBCBaseDenoms = (data: { denom: Denom; chainID: string }[]) => {
             ibcDenom: denom,
             baseDenom: base_denom.startsWith("cw20:")
               ? base_denom.replace("cw20:", "")
+              : // fix for kujira factory tokens
+              base_denom.startsWith("factory:")
+              ? base_denom.replaceAll(":", "/")
               : base_denom,
             chainIDs: chains,
             channels,
@@ -110,7 +113,10 @@ export const useIBCBaseDenoms = (data: { denom: Denom; chainID: string }[]) => {
 }
 
 export function calculateIBCDenom(baseDenom: string, path: string) {
-  if (!path) return baseDenom
+  if (!path)
+    return baseDenom.startsWith("factory:")
+      ? baseDenom.replaceAll(":", "/")
+      : baseDenom
 
   const assetString = [
     path,

diff --git a/src/pages/wallet/IbcSendBackTx.tsx b/src/pages/wallet/IbcSendBackTx.tsx
@@ -94,6 +94,7 @@ function IbcSendBackTx({ token, chainID }: Props) {
   const { errors } = formState
   const { input } = watch()
   const queryClient = useQueryClient()
+  const networks = useNetwork()
 
   const [step, setStep] = useState<number>(0)
   const [isLoading, setIsLoading] = useState<boolean>(false)
@@ -122,6 +123,8 @@ function IbcSendBackTx({ token, chainID }: Props) {
     }
   }
 
+  const isKujira = networks[ibcDetails?.chainIDs[0] ?? ""]?.prefix === "kujira"
+
   useEffect(() => {
     // around 3 minutes with a 10 seconds interval
     let maxIterations = 18
@@ -160,7 +163,9 @@ function IbcSendBackTx({ token, chainID }: Props) {
     () =>
       ibcDetails &&
       calculateIBCDenom(
-        ibcDetails.baseDenom,
+        isKujira
+          ? ibcDetails.baseDenom?.replaceAll("/", ":")
+          : ibcDetails.baseDenom,
         ibcDetails.channels
           .slice(0, ibcDetails.channels.length - step)
           .reduce(
@@ -171,7 +176,7 @@ function IbcSendBackTx({ token, chainID }: Props) {
             ""
           )
       ),
-    [step, ibcDetails]
+    [step, ibcDetails, isKujira]
   )
 
   const chains = useMemo(
@@ -234,7 +239,9 @@ function IbcSendBackTx({ token, chainID }: Props) {
     onChangeMax,
     onPost: () => {
       const nextDenom = calculateIBCDenom(
-        ibcDetails?.baseDenom ?? "",
+        (isKujira
+          ? ibcDetails?.baseDenom?.replaceAll("/", ":")
+          : ibcDetails?.baseDenom) ?? "",
         (ibcDetails?.channels ?? [])
           .slice(0, (ibcDetails?.channels.length ?? 0) - step - 1)
           .reduce(