@volr/react-ui 0.1.80 → 0.1.82

package/dist/index.cjs

@@ -2089,12 +2089,30 @@ function SiweLoginScreen({
   const [walletConnector, setWalletConnector] = React10.useState(
     void 0
   );
+  const [hasWallet, setHasWallet] = React10.useState(null);
+  const waitForEthereum = (timeout = 2e3, interval = 100) => {
+    return new Promise((resolve) => {
+      if (typeof window !== "undefined" && window.ethereum) {
+        resolve(true);
+        return;
+      }
+      const startTime = Date.now();
+      const checkInterval = setInterval(() => {
+        if (typeof window !== "undefined" && window.ethereum) {
+          clearInterval(checkInterval);
+          resolve(true);
+        } else if (Date.now() - startTime >= timeout) {
+          clearInterval(checkInterval);
+          resolve(false);
+        }
+      }, interval);
+    });
+  };
   const detectWalletConnector = () => {
     if (typeof window === "undefined" || !window.ethereum) {
       return void 0;
     }
     const provider = window.ethereum;
-    console.log(provider.info);
     if (provider.info?.rdns) {
       return provider.info.rdns;
     }
@@ -2106,26 +2124,36 @@ function SiweLoginScreen({
     return "unknown";
   };
   React10.useEffect(() => {
-    if (typeof window !== "undefined" && window.ethereum) {
-      window.ethereum.request({ method: "eth_accounts" }).then((accounts) => {
-        if (accounts.length > 0) {
-          setAccount(accounts[0]);
-          setStep("sign");
-          setWalletConnector(detectWalletConnector());
+    const initWallet = async () => {
+      const walletAvailable = await waitForEthereum();
+      setHasWallet(walletAvailable);
+      if (walletAvailable && window.ethereum) {
+        try {
+          const accounts = await window.ethereum.request({
+            method: "eth_accounts"
+          });
+          if (accounts.length > 0) {
+            setAccount(accounts[0]);
+            setStep("sign");
+            setWalletConnector(detectWalletConnector());
+          }
+        } catch {
         }
-      }).catch(() => {
-      });
-    }
+      }
+    };
+    initWallet();
   }, []);
   const handleConnectWallet = async () => {
     setError(null);
     setIsLoading(true);
     try {
-      if (typeof window === "undefined" || !window.ethereum) {
+      const walletAvailable = await waitForEthereum(3e3, 100);
+      if (!walletAvailable || !window.ethereum) {
         throw new Error(
           "No Ethereum wallet found. Please install MetaMask or another wallet."
         );
       }
+      setHasWallet(true);
       const accounts = await window.ethereum.request({
         method: "eth_requestAccounts"
       });
@@ -2223,8 +2251,8 @@ Issued At: ${issuedAt}`;
         variant: "primary",
         fullWidth: true,
         onClick: handleConnectWallet,
-        disabled: isLoading,
-        children: isLoading ? t("common.loading") : t("login.wallet.connect")
+        disabled: isLoading || hasWallet === null,
+        children: isLoading || hasWallet === null ? t("common.loading") : t("login.wallet.connect")
       }
     ) : /* @__PURE__ */ jsxRuntime.jsx(
       Button,