feat: use getAddress to sanitize address

osmosis-labs · Jul 2, 2024 · 56516a3 · 56516a3
1 parent f3a6347
commit 56516a3
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/packages/web/components/bridge/immersive/amount-and-confirmation-screen.tsx b/packages/web/components/bridge/immersive/amount-and-confirmation-screen.tsx
@@ -3,6 +3,7 @@ import { BridgeChain } from "@osmosis-labs/bridge";
 import { isNil } from "@osmosis-labs/utils";
 import { observer } from "mobx-react-lite";
 import { useState } from "react";
+import { getAddress } from "viem";
 
 import { AmountScreen } from "~/components/bridge/immersive/amount-screen";
 import { ImmersiveBridgeScreens } from "~/components/bridge/immersive/immersive-bridge";
@@ -60,13 +61,32 @@ export const AmountAndConfirmationScreen = observer(
           ? evmAddress
           : toChainCosmosAccount?.address,
       toChain: toChain,
-      toAsset: destinationAsset,
+      toAsset: destinationAsset
+        ? {
+            address:
+              toChain?.chainType === "evm"
+                ? getAddress(destinationAsset.address)
+                : destinationAsset.address,
+            decimals: destinationAsset.decimals,
+            denom: destinationAsset.denom,
+          }
+        : undefined,
       fromAddress:
         fromChain?.chainType === "evm"
           ? evmAddress
           : fromChainCosmosAccount?.address,
       fromChain: fromChain,
-      fromAsset: sourceAsset,
+      fromAsset: sourceAsset
+        ? {
+            address:
+              fromChain?.chainType === "evm"
+                ? getAddress(sourceAsset.address)
+                : sourceAsset.address,
+            decimals: sourceAsset.decimals,
+            denom: sourceAsset.denom,
+            amount: sourceAsset.amount,
+          }
+        : undefined,
       direction,
       onRequestClose: onClose,
       inputAmount: cryptoAmount,