specific assethub prefix

galacticcouncil · Dec 20, 2024 · cc0b4f1 · cc0b4f1
1 parent 9981e19
commit cc0b4f1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/sections/deposit/steps/DepositAsset.tsx b/src/sections/deposit/steps/DepositAsset.tsx
@@ -138,7 +138,7 @@ export const DepositAsset: React.FC<DepositAssetProps> = ({
           />
           <AccountBox
             {...account}
-            ss58Format={chain && isAnyParachain(chain) ? chain.ss58Format : 0}
+            ss58Format={getAddressPrefix(dstChain)}
             error={
               !isAccountAllowed
                 ? t("deposit.cex.account.evmError", {
@@ -177,3 +177,12 @@ export const DepositAsset: React.FC<DepositAssetProps> = ({
     </div>
   )
 }
+
+function getAddressPrefix(chainKey: string) {
+  const chain = chainsMap.get(chainKey)
+  if (chain && isAnyParachain(chain)) {
+    return chain.key === "assethub" ? 0 : chain.ss58Format
+  }
+
+  return 0
+}
diff --git a/src/sections/deposit/steps/DepositTransfer.tsx b/src/sections/deposit/steps/DepositTransfer.tsx
@@ -17,6 +17,7 @@ import { useZodSchema } from "sections/deposit/steps/DepositTransfer.utills"
 import { WalletTransferAccountInput } from "sections/wallet/transfer/WalletTransferAccountInput"
 import { useAccount } from "sections/web3-connect/Web3Connect.utils"
 import { BN_NAN } from "utils/constants"
+import { H160, isEvmAddress } from "utils/evm"
 import { FormValues } from "utils/helpers"
 
 export type DepositTransferProps = {
@@ -91,11 +92,13 @@ export const DepositTransfer: React.FC<DepositTransferProps> = ({
     if (!asset) return
 
     await sendTx({
-      asset: asset.data.asset.key,
       wallet,
+      asset: asset.data.asset.key,
       amount: values.amount,
-      srcAddr: address,
-      dstAddr: dstAddress,
+      srcAddr: isEvmAddress(address) ? new H160(address).toAccount() : address,
+      dstAddr: isEvmAddress(dstAddress)
+        ? new H160(dstAddress).toAccount()
+        : dstAddress,
       srcChain: srcChain,
       dstChain: "hydration",
     })