@spicenet-io/spiceflow-ui 1.2.2 → 1.2.3

package/dist/index.cjs.js

@@ -2645,7 +2645,7 @@ const useWallet = () => {
   };
 };
 
-const RELAYER_API_URL = process.env.NEXT_PUBLIC_RELAYER_API_URL || "http://localhost:3005";
+const RELAYER_API_URL = process.env.NEXT_PUBLIC_RELAYER_API_URL || "https://tx-api.spicenet.io";
 class RelayerService {
   constructor() {
     this.baseUrl = RELAYER_API_URL;
@@ -6012,7 +6012,7 @@ const DepositModal = React.memo(
     const address = embeddedWalletAddress || embeddedWallet?.address;
     const sourceAddress = externalWalletAddress;
     const { data: externalWalletClient } = wagmi.useWalletClient();
-    wagmi.useSwitchChain();
+    const { switchChainAsync } = wagmi.useSwitchChain();
     const { chain: currentChain } = wagmi.useAccount();
     const currentChainRef = React.useRef(currentChain);
     React.useEffect(() => {
@@ -6181,11 +6181,6 @@ const DepositModal = React.memo(
       });
       setShowConfirmation(true);
     };
-    const isChainMismatchError = (error2) => {
-      const errorMessage = error2?.message || error2?.shortMessage || error2?.details || error2?.cause?.message || error2?.reason || String(error2 || "");
-      const errorString = errorMessage.toLowerCase();
-      return errorString.includes("does not match") || errorString.includes("current chain") || errorString.includes("expected chain") || errorString.includes("chain mismatch") || errorString.includes("target chain") || errorString.includes("the current chain of the wallet") || errorString.includes("chain of the wallet") || errorString.includes("chain") && errorString.includes("match") && errorString.includes("id") || error2?.code && error2.code === 4902 || error2?.name === "ChainMismatchError" || error2?.name === "ChainMismatch";
-    };
     const executeDeposit = async () => {
       const validAssets = selectedDepositAssets.filter(
         (a) => a.asset && a.amount && parseFloat(a.amount) > 0
@@ -6219,6 +6214,36 @@ const DepositModal = React.memo(
         if (!externalWalletClient) {
           throw new Error("External wallet not connected");
         }
+        if (currentChain?.id !== chainId) {
+          setError("Wrong chain selected. Switching network...");
+          try {
+            await switchChainAsync({ chainId });
+            let attempts = 0;
+            const maxAttempts = 20;
+            while (attempts < maxAttempts) {
+              await new Promise((resolve) => setTimeout(resolve, 100));
+              if (currentChainRef.current?.id === chainId) {
+                setError(null);
+                break;
+              }
+              attempts++;
+            }
+            if (currentChainRef.current?.id !== chainId) {
+              throw new Error(
+                `Failed to switch to chain ${chainId}. Please switch manually in your wallet.`
+              );
+            }
+            setError(null);
+          } catch (switchError) {
+            if (switchError.code === 4902 || switchError.name === "ChainNotConfiguredError") {
+              throw new Error(
+                `Chain ${chainId} is not configured in your wallet. Please add it manually.`
+              );
+            } else {
+              throw switchError;
+            }
+          }
+        }
         if (nonEip7702Mode) {
           if (!destinationChainId) {
             throw new Error(
@@ -6492,21 +6517,19 @@ const DepositModal = React.memo(
         }
       } catch (error2) {
         hasError = true;
-        const errorMsgText = error2?.message || error2?.shortMessage || error2?.details || error2?.cause?.message || String(error2 || "");
         let errorMessage = "Deposit failed";
-        if (isChainMismatchError(error2)) {
-          const chainId = validAssets[0]?.asset?.chainId;
-          const chainConfig = chainId ? getChainConfig(chainId) : null;
-          const chainName = chainConfig?.displayName || `Chain ${chainId}`;
-          errorMessage = `Wrong network selected. Please switch your wallet to ${chainName} and click the DEPOSIT button again.`;
-        } else if (error2?.code === 4001 || error2?.code === "ACTION_REJECTED") {
+        if (error2?.code === 4001 || error2?.code === "ACTION_REJECTED") {
           errorMessage = "Transaction rejected by user";
         } else if (error2?.code === -32603) {
           errorMessage = "Internal wallet error. Please try again.";
-        } else if (errorMsgText.toLowerCase().includes("insufficient funds")) {
+        } else if (error2?.message?.includes("insufficient funds")) {
           errorMessage = "Insufficient funds for transaction";
-        } else if (errorMsgText.toLowerCase().includes("user rejected")) {
+        } else if (error2?.message?.includes("User rejected")) {
+          errorMessage = "Transaction rejected by user";
+        } else if (error2?.message?.includes("user rejected")) {
           errorMessage = "Transaction rejected by user";
+        } else if (error2?.message?.includes("does not match the target chain") || error2?.message?.includes("Current Chain ID")) {
+          errorMessage = "Network mismatch detected. Please click the button again to proceed.";
         } else if (error2 instanceof Error) {
           errorMessage = error2.message;
         } else if (typeof error2 === "string") {

package/dist/index.js

@@ -2643,7 +2643,7 @@ const useWallet = () => {
   };
 };
 
-const RELAYER_API_URL = process.env.NEXT_PUBLIC_RELAYER_API_URL || "http://localhost:3005";
+const RELAYER_API_URL = process.env.NEXT_PUBLIC_RELAYER_API_URL || "https://tx-api.spicenet.io";
 class RelayerService {
   constructor() {
     this.baseUrl = RELAYER_API_URL;
@@ -6010,7 +6010,7 @@ const DepositModal = React.memo(
     const address = embeddedWalletAddress || embeddedWallet?.address;
     const sourceAddress = externalWalletAddress;
     const { data: externalWalletClient } = useWalletClient();
-    useSwitchChain();
+    const { switchChainAsync } = useSwitchChain();
     const { chain: currentChain } = useAccount();
     const currentChainRef = React.useRef(currentChain);
     React.useEffect(() => {
@@ -6179,11 +6179,6 @@ const DepositModal = React.memo(
       });
       setShowConfirmation(true);
     };
-    const isChainMismatchError = (error2) => {
-      const errorMessage = error2?.message || error2?.shortMessage || error2?.details || error2?.cause?.message || error2?.reason || String(error2 || "");
-      const errorString = errorMessage.toLowerCase();
-      return errorString.includes("does not match") || errorString.includes("current chain") || errorString.includes("expected chain") || errorString.includes("chain mismatch") || errorString.includes("target chain") || errorString.includes("the current chain of the wallet") || errorString.includes("chain of the wallet") || errorString.includes("chain") && errorString.includes("match") && errorString.includes("id") || error2?.code && error2.code === 4902 || error2?.name === "ChainMismatchError" || error2?.name === "ChainMismatch";
-    };
     const executeDeposit = async () => {
       const validAssets = selectedDepositAssets.filter(
         (a) => a.asset && a.amount && parseFloat(a.amount) > 0
@@ -6217,6 +6212,36 @@ const DepositModal = React.memo(
         if (!externalWalletClient) {
           throw new Error("External wallet not connected");
         }
+        if (currentChain?.id !== chainId) {
+          setError("Wrong chain selected. Switching network...");
+          try {
+            await switchChainAsync({ chainId });
+            let attempts = 0;
+            const maxAttempts = 20;
+            while (attempts < maxAttempts) {
+              await new Promise((resolve) => setTimeout(resolve, 100));
+              if (currentChainRef.current?.id === chainId) {
+                setError(null);
+                break;
+              }
+              attempts++;
+            }
+            if (currentChainRef.current?.id !== chainId) {
+              throw new Error(
+                `Failed to switch to chain ${chainId}. Please switch manually in your wallet.`
+              );
+            }
+            setError(null);
+          } catch (switchError) {
+            if (switchError.code === 4902 || switchError.name === "ChainNotConfiguredError") {
+              throw new Error(
+                `Chain ${chainId} is not configured in your wallet. Please add it manually.`
+              );
+            } else {
+              throw switchError;
+            }
+          }
+        }
         if (nonEip7702Mode) {
           if (!destinationChainId) {
             throw new Error(
@@ -6490,21 +6515,19 @@ const DepositModal = React.memo(
         }
       } catch (error2) {
         hasError = true;
-        const errorMsgText = error2?.message || error2?.shortMessage || error2?.details || error2?.cause?.message || String(error2 || "");
         let errorMessage = "Deposit failed";
-        if (isChainMismatchError(error2)) {
-          const chainId = validAssets[0]?.asset?.chainId;
-          const chainConfig = chainId ? getChainConfig(chainId) : null;
-          const chainName = chainConfig?.displayName || `Chain ${chainId}`;
-          errorMessage = `Wrong network selected. Please switch your wallet to ${chainName} and click the DEPOSIT button again.`;
-        } else if (error2?.code === 4001 || error2?.code === "ACTION_REJECTED") {
+        if (error2?.code === 4001 || error2?.code === "ACTION_REJECTED") {
           errorMessage = "Transaction rejected by user";
         } else if (error2?.code === -32603) {
           errorMessage = "Internal wallet error. Please try again.";
-        } else if (errorMsgText.toLowerCase().includes("insufficient funds")) {
+        } else if (error2?.message?.includes("insufficient funds")) {
           errorMessage = "Insufficient funds for transaction";
-        } else if (errorMsgText.toLowerCase().includes("user rejected")) {
+        } else if (error2?.message?.includes("User rejected")) {
+          errorMessage = "Transaction rejected by user";
+        } else if (error2?.message?.includes("user rejected")) {
           errorMessage = "Transaction rejected by user";
+        } else if (error2?.message?.includes("does not match the target chain") || error2?.message?.includes("Current Chain ID")) {
+          errorMessage = "Network mismatch detected. Please click the button again to proceed.";
         } else if (error2 instanceof Error) {
           errorMessage = error2.message;
         } else if (typeof error2 === "string") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spicenet-io/spiceflow-ui",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Spiceflow UI SDK",
   "type": "module",
   "main": "dist/index.cjs.js",