@rash2x/bridge-widget 0.3.9 → 0.4.1

package/dist/evaa-bridge.mjs

@@ -24,8 +24,7 @@ import { Accordion, AccordionItem, AccordionTrigger, AccordionContent } from "@/
 import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";
 import { toast, Toaster } from "sonner";
 import { DialogDescription as DialogDescription$1 } from "@radix-ui/react-dialog";
-import { BrowserProvider, Contract, parseUnits } from "ethers";
-import { isAddress, formatUnits } from "viem";
+import { isAddress, formatUnits, parseUnits } from "viem";
 import { TronLinkAdapterName } from "@tronweb3/tronwallet-adapters";
 import { CardHeader, CardTitle, CardAction, Card, CardContent, CardFooter } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
@@ -409,16 +408,10 @@ function buildAssetMatrix(tokens) {
     if (!symbol) continue;
     (m[symbol] || (m[symbol] = {}))[t.chainKey] = t;
   }
-  const chainStats = {};
   Object.values(m).forEach((byChain) => {
     Object.keys(byChain).forEach((chainKey) => {
-      chainStats[chainKey] = (chainStats[chainKey] || 0) + 1;
     });
   });
-  console.log(
-    `[DEBUG] Asset matrix built: ${Object.keys(m).length} assets across chains:`,
-    chainStats
-  );
   return m;
 }
 function listAssetsForSelect(tokens) {
@@ -1527,12 +1520,6 @@ const useChainDerivations = () => {
     const byChain = assetMatrix[selectedAssetSymbol.toUpperCase()];
     const keys = new Set(Object.keys(byChain ?? {}));
     const result = chains.filter((c) => keys.has(c.chainKey));
-    console.log(
-      `[DEBUG] supportedFrom for ${selectedAssetSymbol}:`,
-      `${result.length} of ${chains.length} chains`,
-      result.map((c) => c.chainKey),
-      `| Has Arbitrum: ${result.some((c) => c.chainKey === "arbitrum")}`
-    );
     return result;
   }, [selectedAssetSymbol, assetMatrix, chains]);
   useEffect(() => {
@@ -1601,13 +1588,6 @@ const useChainDerivations = () => {
         if (fromChain?.chainKey) {
           list = list.filter((c) => c.chainKey !== fromChain.chainKey);
         }
-        console.log(
-          `[DEBUG] allowedToChains from ${fromChain?.chainKey}:`,
-          `${list.length} destinations`,
-          list.map((c) => c.chainKey),
-          `| Has Arbitrum: ${list.some((c) => c.chainKey === "arbitrum")}`,
-          `| API returned ${dest.length} tokens, filtered to ${filteredDest.length}`
-        );
         setAllowedToChains(list);
         if (!toChain || !list.some((c) => c.chainKey === toChain.chainKey)) {
           setToChain(list[0]);
@@ -1642,7 +1622,7 @@ const useChainDerivations = () => {
     isLoadingToChains
   };
 };
-function useBalances(chainKey, address, priorityTokenSymbol) {
+function useBalances(chainKey, address) {
   const { chainRegistry } = useChainStrategies();
   const { assetMatrix } = useTokensStore();
   const tokensOnChain = useMemo(() => {
@@ -1656,27 +1636,13 @@ function useBalances(chainKey, address, priorityTokenSymbol) {
     }
     return tokensList;
   }, [assetMatrix, chainKey]);
-  const priorityToken = useMemo(() => {
-    if (!priorityTokenSymbol || !chainKey || !assetMatrix) return void 0;
-    const normalizedSymbol = normalizeTickerSymbol$1(priorityTokenSymbol);
-    const token = assetMatrix[normalizedSymbol]?.[chainKey];
-    if (token && token.address && token.address.length > 2) {
-      return token;
-    }
-    return void 0;
-  }, [priorityTokenSymbol, chainKey, assetMatrix]);
   const query = useQuery({
-    queryKey: ["balances", chainKey, address, priorityTokenSymbol],
+    queryKey: ["balances", chainKey, address],
     queryFn: async () => {
       if (!address || !chainKey)
         return {};
       if (!isAddressValidForChain(chainKey, address)) return {};
-      return await chainRegistry.getBalances(
-        chainKey,
-        address,
-        tokensOnChain,
-        priorityToken
-      );
+      return await chainRegistry.getBalances(chainKey, address, tokensOnChain);
     },
     enabled: !!address && !!chainKey && !!assetMatrix && tokensOnChain.length > 0 && isAddressValidForChain(chainKey, address),
     staleTime: 6e4,
@@ -1715,13 +1681,11 @@ function useSwapModel() {
   const { allowedFromChains, allowedToChains, isLoadingToChains } = useChainDerivations();
   const srcBalances = useBalances(
     chainsStore.fromChain?.chainKey,
-    srcAddress,
-    tokensStore.selectedAssetSymbol
+    srcAddress
   );
   const dstBalances = useBalances(
     chainsStore.toChain?.chainKey,
-    dstAddress,
-    tokensStore.selectedAssetSymbol
+    dstAddress
   );
   const { loading } = useBridgeQuote();
   const { inputAmount, setInputAmount, resetWithIdle } = useBridgeQuoteStore();
@@ -2425,13 +2389,13 @@ const SearchInput = ({
   className
 }) => {
   return /* @__PURE__ */ jsxs("div", { className: cn("rounded-xs relative"), children: [
-    /* @__PURE__ */ jsx(SearchIcon, { className: "w-6 h-6 absolute left-5 top-0 bottom-0 my-auto text-foreground" }),
+    /* @__PURE__ */ jsx(SearchIcon, { className: "w-6 h-6 absolute z-10 left-5 top-0 bottom-0 my-auto text-foreground" }),
     /* @__PURE__ */ jsx(
       Input,
       {
         placeholder,
         className: cn(
-          "w-full outline-none px-5 py-4 relative z-10 pl-16 bg-input border transition-all border-transparent rounded-xs ring-0 leading-0 h-13 text-base focus-visible:border focus-visible:border-ring",
+          "w-full outline-none px-5 py-4 relative pl-16 bg-input border transition-all border-transparent rounded-xs ring-0 leading-0 h-13 text-base focus-visible:border focus-visible:border-ring",
           className
         ),
         value,
@@ -2648,15 +2612,15 @@ const EditIcon = (props) => {
       xmlns: "http://www.w3.org/2000/svg",
       ...props,
       children: [
-        /* @__PURE__ */ jsxs("g", { "clip-path": "url(#clip0_551_3851)", children: [
+        /* @__PURE__ */ jsxs("g", { clipPath: "url(#clip0_551_3851)", children: [
           /* @__PURE__ */ jsx(
             "path",
             {
               d: "M9.76159 5.01068L4.91742 9.85489C4.72585 10.0465 4.54793 10.4023 4.50687 10.6622L4.24687 12.5096C4.15108 13.1801 4.61636 13.6454 5.28688 13.5496L7.13425 13.2896C7.39425 13.2486 7.76372 13.0707 7.94161 12.8791L12.7858 8.03491C13.6206 7.20018 14.0174 6.2286 12.7858 4.99702C11.5679 3.77913 10.5963 4.17594 9.76159 5.01068Z",
               stroke: "currentColor",
-              "stroke-miterlimit": "10",
-              "stroke-linecap": "round",
-              "stroke-linejoin": "round"
+              strokeMiterlimit: "10",
+              strokeLinecap: "round",
+              strokeLinejoin: "round"
             }
           ),
           /* @__PURE__ */ jsx(
@@ -2664,9 +2628,9 @@ const EditIcon = (props) => {
             {
               d: "M9.0625 5.70312C9.47303 7.18102 10.6225 8.33049 12.1004 8.74101",
               stroke: "currentColor",
-              "stroke-miterlimit": "10",
-              "stroke-linecap": "round",
-              "stroke-linejoin": "round"
+              strokeMiterlimit: "10",
+              strokeLinecap: "round",
+              strokeLinejoin: "round"
             }
           )
         ] }),
@@ -3751,7 +3715,7 @@ function useSilentValidations(amountString) {
   ]);
   return validationResult;
 }
-const SubmitButton = () => {
+const MainButton = () => {
   const { t } = useBridgeTranslation();
   const { chainRegistry } = useChainStrategies();
   const { srcAddress, dstAddress } = useAddresses();
@@ -3829,11 +3793,11 @@ const SubmitButton = () => {
   ]);
   const handleClick = async () => {
     if (isBusy) return;
-    if (missingSrc && srcChainKey) {
+    if (missingSrc) {
       onOpen("src");
       return;
     }
-    if (missingDst && dstChainKey) {
+    if (missingDst) {
       onOpen("dst");
       return;
     }
@@ -3846,7 +3810,7 @@ const SubmitButton = () => {
       return;
     }
   };
-  const disabled = isBusy || amountNum <= 0 || status === "loading" || isBalanceLoading || hasInsufficientBalance || hasAmountTooLarge || !gas.hasEnoughGas || noRoute || !isValidForTransfer;
+  const disabled = isBusy || status === "loading" || !missingSrc && !missingDst && (amountNum <= 0 || isBalanceLoading || hasInsufficientBalance || hasAmountTooLarge || !gas.hasEnoughGas || noRoute || !isValidForTransfer);
   return /* @__PURE__ */ jsx("div", { className: "pt-4", children: /* @__PURE__ */ jsx(
     Button,
     {
@@ -4073,9 +4037,9 @@ const ProgressStep = ({
   icon = /* @__PURE__ */ jsx(Loader2, { className: "w-16 h-16 animate-spin" })
 }) => {
   const { t } = useBridgeTranslation();
-  return /* @__PURE__ */ jsx(DialogContent, { showCloseButton: false, children: /* @__PURE__ */ jsxs("div", { className: "flex relative flex-col gap-4 py-10 px-8 flex-1 items-center justify-start text-center noise bg-background", children: [
+  return /* @__PURE__ */ jsx(DialogContent, { showCloseButton: false, className: "overflow-hidden", children: /* @__PURE__ */ jsxs("div", { className: "flex relative flex-col gap-4 flex-1 items-center justify-start text-center noise bg-background", children: [
     icon,
-    /* @__PURE__ */ jsx(DialogHeader, { children: /* @__PURE__ */ jsx(DialogTitle, { children: t("transaction.inProgress") }) }),
+    /* @__PURE__ */ jsx(DialogHeader, { className: "pr-0", children: /* @__PURE__ */ jsx(DialogTitle, { children: t("transaction.inProgress") }) }),
     /* @__PURE__ */ jsx("div", { className: "relative mt-5 z-10", children: /* @__PURE__ */ jsx("div", { className: "absolute dot-vertical h-full left-5 top-0 bottom-0 z-0" }) })
   ] }) });
 };
@@ -4084,10 +4048,10 @@ const FailedStep = ({
 }) => {
   const { current, reset } = useTransactionStore();
   const { t } = useBridgeTranslation();
-  return /* @__PURE__ */ jsxs(DialogContent, { showCloseButton: false, children: [
-    /* @__PURE__ */ jsxs("div", { className: "flex flex-col relative gap-4 py-10 px-8 flex-1 items-center justify-start text-center noise", children: [
+  return /* @__PURE__ */ jsxs(DialogContent, { showCloseButton: true, className: "overflow-hidden", children: [
+    /* @__PURE__ */ jsxs("div", { className: "flex flex-col relative gap-4 flex-1 items-center justify-start text-center noise", children: [
       icon,
-      /* @__PURE__ */ jsxs(DialogHeader, { children: [
+      /* @__PURE__ */ jsxs(DialogHeader, { className: "pr-0", children: [
         /* @__PURE__ */ jsx(DialogTitle, { children: t("transaction.failed") }),
         current?.errorCode && /* @__PURE__ */ jsx(DialogDescription$1, { children: t(
           `errors.${current.errorCode}`,
@@ -4199,10 +4163,10 @@ const SuccessStep = ({
       openTransactionInExplorer(srcChainKey, srcTxHash);
     }
   };
-  return /* @__PURE__ */ jsxs(DialogContent, { showCloseButton: false, children: [
-    /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-4 pt-10 px-8 flex-1 justify-start items-center text-center noise bg-background", children: [
+  return /* @__PURE__ */ jsxs(DialogContent, { showCloseButton: true, className: "overflow-hidden", children: [
+    /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-4 flex-1 justify-start items-center text-center noise bg-background", children: [
       icon,
-      /* @__PURE__ */ jsx(DialogHeader, { children: /* @__PURE__ */ jsx(DialogTitle, { children: t("transaction.success") }) }),
+      /* @__PURE__ */ jsx(DialogHeader, { className: "pr-0", children: /* @__PURE__ */ jsx(DialogTitle, { children: t("transaction.success") }) }),
       /* @__PURE__ */ jsxs("div", { className: "w-full space-y-2 mt-4 relative z-10 pb-14", children: [
         metadata?.srcAmountHuman && /* @__PURE__ */ jsxs("div", { className: "flex justify-between items-center", children: [
           /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: t("transaction.bridged") }),
@@ -4250,7 +4214,7 @@ const SuccessStep = ({
         ] })
       ] })
     ] }),
-    /* @__PURE__ */ jsx("div", { className: "pb-10 px-8", children: /* @__PURE__ */ jsx(Button, { onClick: reset, className: "w-full", children: t("transaction.done") }) })
+    /* @__PURE__ */ jsx(DialogFooter, { children: /* @__PURE__ */ jsx(Button, { onClick: reset, className: "w-full", children: t("transaction.done") }) })
   ] });
 };
 const useCountdown = (initialSeconds) => {
@@ -4275,9 +4239,9 @@ const ConfirmStep = ({
 }) => {
   const { t } = useBridgeTranslation();
   const { formatTime } = useCountdown(90);
-  return /* @__PURE__ */ jsx(DialogContent, { showCloseButton: false, children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col relative gap-4 py-10 px-8 flex-1 items-center justify-start text-center noise", children: [
+  return /* @__PURE__ */ jsx(DialogContent, { showCloseButton: false, className: "overflow-hidden", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col relative gap-4 flex-1 items-center justify-start text-center noise", children: [
     icon,
-    /* @__PURE__ */ jsxs(DialogHeader, { children: [
+    /* @__PURE__ */ jsxs(DialogHeader, { className: "pr-0", children: [
       /* @__PURE__ */ jsx(DialogTitle, { children: t("transaction.confirm") }),
       /* @__PURE__ */ jsx(DialogDescription, { children: t("transaction.signTransaction") })
     ] }),
@@ -4287,7 +4251,7 @@ const ConfirmStep = ({
 const StatusStepsDialog = ({
   icons
 }) => {
-  const { current } = useTransactionStore();
+  const { current, reset } = useTransactionStore();
   const status = current?.status;
   if (!status || status === "idle") return null;
   let step = null;
@@ -4297,14 +4261,13 @@ const StatusStepsDialog = ({
   if (status === "processing") {
     step = /* @__PURE__ */ jsx(ProgressStep, { icon: icons?.progress });
   }
-  if (status === "failed") {
+  if (status === "completed") {
     step = /* @__PURE__ */ jsx(FailedStep, { icon: icons?.failed });
   }
-  if (status === "completed") {
+  if (status === "failed") {
     step = /* @__PURE__ */ jsx(SuccessStep, { icon: icons?.success });
   }
-  return /* @__PURE__ */ jsx(Dialog, { open: true, onOpenChange: () => {
-  }, children: step });
+  return /* @__PURE__ */ jsx(Dialog, { open: true, onOpenChange: () => reset(), children: step });
 };
 const useTokens = () => {
   const { setTokens, setSelectedToken, setSelectedAssetSymbol } = useTokensStore();
@@ -4356,10 +4319,6 @@ const useChains = () => {
   });
   useEffect(() => {
     if (query.isSuccess && query.data?.length) {
-      console.log(
-        `[DEBUG] Loaded ${query.data.length} chains from API:`,
-        query.data.map((c) => c.chainKey)
-      );
       setChains(query.data);
       if (!fromChain) {
         setFromChain(query.data[0]);
@@ -4401,10 +4360,10 @@ class ChainStrategyRegistry {
     const strategy = this.getStrategy(chainKey);
     return strategy?.isConnected() || false;
   }
-  async getBalances(chainKey, address, tokens, priorityToken) {
+  async getBalances(chainKey, address, tokens) {
     const strategy = this.getStrategy(chainKey);
     if (!strategy) return {};
-    return await strategy.getBalances(address, tokens, priorityToken);
+    return await strategy.getBalances(address, tokens);
   }
   isAddressValid(chainKey, address) {
     const strategy = this.getStrategy(chainKey);
@@ -4472,7 +4431,7 @@ function parseTonAddress(address) {
   }
   return Address$1.parse(address);
 }
-async function getEvmBalances(publicClient, address, tokens, priorityToken) {
+async function getEvmBalances(publicClient, address, tokens) {
   const balances = {};
   try {
     if (!address || !isAddress(address)) {
@@ -4484,56 +4443,8 @@ async function getEvmBalances(publicClient, address, tokens, priorityToken) {
     }
     const nativeTokens = tokens.filter((t) => isNativeAddress(t.address));
     const erc20Tokens = tokens.filter(
-      (t) => !isNativeAddress(t.address) && isAddress(t.address) && (!priorityToken || t.address !== priorityToken.address)
+      (t) => !isNativeAddress(t.address) && isAddress(t.address)
     );
-    if (priorityToken) {
-      try {
-        const isPriorityNative = isNativeAddress(priorityToken.address);
-        if (isPriorityNative) {
-          const ethBalance = await publicClient.getBalance({
-            address
-          });
-          const balance = parseFloat(
-            formatUnits(ethBalance, priorityToken.decimals)
-          );
-          if (balance > 0) {
-            balances[priorityToken.symbol] = { balance, address };
-          }
-        } else if (isAddress(priorityToken.address)) {
-          const tokenBalance = await publicClient.readContract({
-            address: priorityToken.address,
-            abi: [
-              {
-                name: "balanceOf",
-                type: "function",
-                stateMutability: "view",
-                inputs: [{ name: "owner", type: "address" }],
-                outputs: [{ name: "balance", type: "uint256" }]
-              }
-            ],
-            functionName: "balanceOf",
-            args: [address]
-          });
-          const balance = parseFloat(
-            formatUnits(tokenBalance, priorityToken.decimals)
-          );
-          if (balance > 0) {
-            balances[priorityToken.symbol] = { balance, address };
-          }
-        }
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        const isZeroDataError = errorMessage.includes(
-          'returned no data ("0x")'
-        );
-        if (!isZeroDataError) {
-          console.debug(
-            `Failed to get priority token balance for ${priorityToken.symbol}:`,
-            error
-          );
-        }
-      }
-    }
     for (const token of nativeTokens) {
       try {
         const ethBalance = await publicClient.getBalance({
@@ -4757,13 +4668,11 @@ const ERC20_ABI = [
 class EvmChainStrategy {
   constructor(config) {
     __publicField(this, "config");
-    __publicField(this, "provider");
+    __publicField(this, "walletClient");
     __publicField(this, "publicClient");
     this.config = config;
+    this.walletClient = config.walletClient;
     this.publicClient = config.publicClient;
-    if (config.walletClient) {
-      this.provider = new BrowserProvider(config.walletClient.transport);
-    }
   }
   canHandle(chainKey) {
     const key = chainKey.toLowerCase();
@@ -4799,9 +4708,9 @@ class EvmChainStrategy {
     return t("wallets.connectEvmWallet");
   }
   getClient() {
-    return this.provider;
+    return this.walletClient;
   }
-  async getBalances(address, tokens, priorityToken) {
+  async getBalances(address, tokens) {
     if (!this.publicClient) {
       console.warn("No publicClient available for balance query");
       return {};
@@ -4809,8 +4718,7 @@ class EvmChainStrategy {
     return await getEvmBalances(
       this.publicClient,
       address,
-      tokens,
-      priorityToken
+      tokens
     );
   }
   isAddressValid(address) {
@@ -4836,7 +4744,7 @@ class EvmChainStrategy {
     }
   }
   async executeSteps(steps, _context, onFirstHash) {
-    if (!this.isConnected() || !this.provider) {
+    if (!this.isConnected() || !this.walletClient) {
       throw new WalletNotConnectedError("evm");
     }
     this.validateSteps(steps);
@@ -4880,18 +4788,18 @@ class EvmChainStrategy {
   }
   async waitForCompletion(txHash) {
     try {
-      const provider = this.provider;
-      if (!provider) {
+      const publicClient = this.publicClient;
+      if (!publicClient) {
         throw new ProviderNotAvailableError("evm");
       }
       console.log(
         `Waiting for ${EVM_CONFIG.requiredConfirmations} confirmations for tx: ${txHash}`
       );
-      const receipt = await provider.waitForTransaction(
-        txHash,
-        EVM_CONFIG.requiredConfirmations,
-        EVM_CONFIG.timeout
-      );
+      const receipt = await publicClient.waitForTransactionReceipt({
+        hash: txHash,
+        confirmations: EVM_CONFIG.requiredConfirmations,
+        timeout: EVM_CONFIG.timeout
+      });
       if (!receipt) {
         const error = new TransactionTimeoutError("evm", txHash);
         return {
@@ -4899,7 +4807,7 @@ class EvmChainStrategy {
           error: error.message
         };
       }
-      if (receipt.status !== 1) {
+      if (receipt.status !== "success") {
         const error = new TransactionRevertedError("evm", txHash);
         return {
           completed: false,
@@ -4912,11 +4820,10 @@ class EvmChainStrategy {
       let actualFeeValue;
       try {
         const gasUsed = receipt.gasUsed;
-        const effectiveGasPrice = receipt.gasPrice;
+        const effectiveGasPrice = receipt.effectiveGasPrice;
         if (gasUsed && effectiveGasPrice) {
           const feeWei = gasUsed * effectiveGasPrice;
-          const { formatUnits: formatUnits2 } = await import("ethers");
-          const feeInNative = formatUnits2(feeWei, 18);
+          const feeInNative = formatUnits(feeWei, 18);
           actualFeeValue = feeInNative;
           console.log(`EVM transaction fee: ${feeInNative} (native token)`);
         }
@@ -4943,11 +4850,10 @@ class EvmChainStrategy {
             try {
               const receipt = error.receipt;
               const gasUsed = receipt.gasUsed;
-              const effectiveGasPrice = receipt.gasPrice || receipt.effectiveGasPrice;
+              const effectiveGasPrice = receipt.effectiveGasPrice;
               if (gasUsed && effectiveGasPrice) {
                 const feeWei = gasUsed * effectiveGasPrice;
-                const { formatUnits: formatUnits2 } = await import("ethers");
-                const feeInNative = formatUnits2(feeWei, 18);
+                const feeInNative = formatUnits(feeWei, 18);
                 actualFeeValue = feeInNative;
                 console.log(
                   `Replacement transaction fee: ${feeInNative} (native token)`
@@ -4981,8 +4887,10 @@ class EvmChainStrategy {
     }
   }
   async executeTransaction(step) {
-    const provider = this.provider;
-    const signer = await provider?.getSigner();
+    const walletClient = this.walletClient;
+    if (!walletClient) {
+      throw new WalletNotConnectedError("evm");
+    }
     if (!step.transaction) {
       throw new InvalidTransactionDataError(
         "evm",
@@ -4990,21 +4898,22 @@ class EvmChainStrategy {
       );
     }
     const tx = step.transaction;
-    const txRequest = {
+    const hash = await walletClient.sendTransaction({
       to: tx.to,
       data: tx.data,
-      from: tx.from || this.config.evmAddress
-    };
-    if (tx.value) {
-      txRequest.value = tx.value;
-    }
-    const txResponse = await signer?.sendTransaction(txRequest);
-    return txResponse?.hash || "";
+      account: tx.from || this.config.evmAddress,
+      value: tx.value ? BigInt(tx.value) : void 0,
+      chain: walletClient.chain
+    });
+    return hash;
   }
   async approveTransaction(step) {
     try {
-      const provider = this.provider;
-      const signer = await provider?.getSigner();
+      const walletClient = this.walletClient;
+      const publicClient = this.publicClient;
+      if (!walletClient || !publicClient) {
+        throw new WalletNotConnectedError("evm");
+      }
       if (!step.transaction) {
         throw new InvalidTransactionDataError(
           "evm",
@@ -5027,16 +4936,26 @@ class EvmChainStrategy {
         );
       }
       const spenderAddress = "0x" + data.slice(34, 74);
-      const amount = "0x" + data.slice(74, 138);
-      const tokenContract = new Contract(tokenAddress, ERC20_ABI, signer);
-      const currentAllowance = await tokenContract.allowance(
-        this.config.evmAddress,
-        spenderAddress
-      );
+      const amount = BigInt("0x" + data.slice(74, 138));
+      const currentAllowance = await publicClient.readContract({
+        address: tokenAddress,
+        abi: ERC20_ABI,
+        functionName: "allowance",
+        args: [this.config.evmAddress, spenderAddress]
+      });
       if (currentAllowance > 0n) {
         try {
-          const resetTx = await tokenContract.approve(spenderAddress, 0);
-          await resetTx.wait();
+          const resetHash = await walletClient.writeContract({
+            address: tokenAddress,
+            abi: ERC20_ABI,
+            functionName: "approve",
+            args: [spenderAddress, 0n],
+            account: this.config.evmAddress,
+            chain: walletClient.chain
+          });
+          await publicClient.waitForTransactionReceipt({
+            hash: resetHash
+          });
         } catch (resetError) {
           throw new TransactionFailedError(
             "evm",
@@ -5049,8 +4968,15 @@ class EvmChainStrategy {
         console.log("USDT allowance is 0, no reset needed");
       }
       try {
-        const approveTx = await tokenContract.approve(spenderAddress, amount);
-        return approveTx.hash;
+        const approveHash = await walletClient.writeContract({
+          address: tokenAddress,
+          abi: ERC20_ABI,
+          functionName: "approve",
+          args: [spenderAddress, amount],
+          account: this.config.evmAddress,
+          chain: walletClient.chain
+        });
+        return approveHash;
       } catch (approveError) {
         throw new TransactionFailedError(
           "evm",
@@ -5068,13 +4994,24 @@ class EvmChainStrategy {
   }
   async checkAllowance(tokenAddress, spenderAddress, amount) {
     try {
-      const provider = this.provider;
-      const tokenContract = new Contract(tokenAddress, ERC20_ABI, provider);
-      const allowance = await tokenContract.allowance(
-        this.config.evmAddress,
-        spenderAddress
-      );
-      const decimals = await tokenContract.decimals();
+      const publicClient = this.publicClient;
+      if (!publicClient) {
+        return false;
+      }
+      const allowance = await publicClient.readContract({
+        address: tokenAddress,
+        abi: ERC20_ABI,
+        functionName: "allowance",
+        args: [
+          this.config.evmAddress,
+          spenderAddress
+        ]
+      });
+      const decimals = await publicClient.readContract({
+        address: tokenAddress,
+        abi: ERC20_ABI,
+        functionName: "decimals"
+      });
       const requiredAmount = parseUnits(amount, decimals);
       return allowance >= requiredAmount;
     } catch (error) {
@@ -5095,11 +5032,13 @@ class EvmChainStrategy {
    */
   async checkFinality(blockNumber) {
     try {
-      const provider = this.provider;
-      if (!provider) {
+      const publicClient = this.publicClient;
+      if (!publicClient) {
         return false;
       }
-      const finalizedBlock = await provider.getBlock("finalized");
+      const finalizedBlock = await publicClient.getBlock({
+        blockTag: "finalized"
+      });
       if (!finalizedBlock) {
         console.debug(
           "Finalized block not available (pre-merge or unsupported)"
@@ -6883,7 +6822,7 @@ const EvaaBridgeContent = ({
               }
             ),
             /* @__PURE__ */ jsx(AnotherAddress, {}),
-            /* @__PURE__ */ jsx(SubmitButton, {})
+            /* @__PURE__ */ jsx(MainButton, {})
           ] }),
           /* @__PURE__ */ jsx(CardFooter, { className: "p-0", children: /* @__PURE__ */ jsx(Details, {}) })
         ]