@embarkai/ui-kit 0.3.1 → 0.3.3

package/dist/index.js

@@ -15499,7 +15499,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.3.1",
+      version: "0.3.3",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -16319,6 +16319,7 @@ function WalletConnectHandler() {
   const setPage = useLayoutDataStore((st) => st.setPage);
   const setIsWalletLinking = useLayoutDataStore((st) => st.setIsWalletLinking);
   const setAuthError = useAuthStore((st) => st.setAlert);
+  const setAuthStep = useAuthStore((st) => st.setStep);
   const setManageWalletLinkError = useManageWalletStore((st) => st.setLinkError);
   const setLinkIsLoading = useManageWalletStore((st) => st.setLinkIsLoading);
   const setProviderType = useManageWalletStore((st) => st.setProviderType);
@@ -16357,6 +16358,8 @@ function WalletConnectHandler() {
     [qc, passportWalletAddress, setProviderType, setPage, setIsWalletLinking]
   );
   const [hasStartedLinking, setHasStartedLinking] = React8.useState(false);
+  const [modalWasOpened, setModalWasOpened] = React8.useState(false);
+  const [pendingModalOpen, setPendingModalOpen] = React8.useState(false);
   useEffect36(() => {
     if (isWalletLinking && !hasStartedLinking) {
       console.log("[WalletConnectHandler] Starting wallet link flow:", {
@@ -16366,20 +16369,22 @@ function WalletConnectHandler() {
       });
       setHasStartedLinking(true);
       setProviderType(null);
-      disconnect();
-      setTimeout(() => {
-        setPage(null);
-        if (openConnectModal) {
-          openConnectModal();
-        } else {
-          console.error("[WalletConnectHandler] openConnectModal is undefined!");
-          setIsWalletLinking(false);
-          setHasStartedLinking(false);
-        }
-      }, 500);
+      setPage(null);
+      if (isConnected) {
+        disconnect();
+        setPendingModalOpen(true);
+      } else if (openConnectModal) {
+        openConnectModal();
+      } else {
+        console.error("[WalletConnectHandler] openConnectModal is undefined!");
+        setIsWalletLinking(false);
+        setHasStartedLinking(false);
+      }
     }
     if (!isWalletLinking && hasStartedLinking) {
       setHasStartedLinking(false);
+      setModalWasOpened(false);
+      setPendingModalOpen(false);
       const shouldKeepConnected = walletMode === "direct" || walletMode === "both";
       if (isConnected && !shouldKeepConnected) disconnect();
     }
@@ -16394,12 +16399,24 @@ function WalletConnectHandler() {
     walletMode
   ]);
   useEffect36(() => {
-    if (hasStartedLinking && !connectModalOpen && !isConnected && isWalletLinking) {
+    if (pendingModalOpen && !isConnected && openConnectModal) {
+      setPendingModalOpen(false);
+      openConnectModal();
+    }
+  }, [pendingModalOpen, isConnected, openConnectModal]);
+  useEffect36(() => {
+    if (connectModalOpen && hasStartedLinking) {
+      setModalWasOpened(true);
+    }
+  }, [connectModalOpen, hasStartedLinking]);
+  useEffect36(() => {
+    if (modalWasOpened && !connectModalOpen && !isConnected && isWalletLinking) {
       console.log("[WalletConnectHandler] Modal closed without connecting");
       onLinkingComplete(false);
       setHasStartedLinking(false);
+      setModalWasOpened(false);
     }
-  }, [connectModalOpen, hasStartedLinking, isConnected, isWalletLinking]);
+  }, [connectModalOpen, modalWasOpened, isConnected, isWalletLinking]);
   useEffect36(() => {
     if (isWalletLinking) {
       const timeout = setTimeout(() => {
@@ -16414,7 +16431,7 @@ function WalletConnectHandler() {
           setAuthError({ title: "Connection timed out", message: "Wallet did not respond. Please try again." });
           setPage("auth" /* AUTH */);
         }
-      }, 12e4);
+      }, 3e5);
       return () => clearTimeout(timeout);
     }
   }, [isWalletLinking, setIsWalletLinking, disconnect]);
@@ -16441,7 +16458,7 @@ function WalletConnectHandler() {
       const signature = await Promise.race([
         signMessageAsync({ message, account: signingWalletAddress }),
         new Promise(
-          (_, reject) => setTimeout(() => reject(new Error("Signature request timed out. Please try again.")), 6e4)
+          (_, reject) => setTimeout(() => reject(new Error("Signature request timed out. Please try again.")), 12e4)
         )
       ]);
       if (!signature) {
@@ -16496,6 +16513,7 @@ function WalletConnectHandler() {
       onLinkingComplete(false);
       setHasStartedLinking(false);
       setLinkIsLoading(false);
+      setAuthStep("signin");
       const errorMsg = err?.message || (isAuthFlow ? "Wallet login failed" : "Failed to link wallet");
       if (errorMsg.includes("User rejected") || errorMsg.includes("User denied")) {
         if (passportWalletAddress) {
@@ -16520,11 +16538,15 @@ function WalletConnectHandler() {
     }
   });
   useEffect36(() => {
-    if (!!chain?.id && isConnected && walletAddress && isWalletLinking && hasStartedLinking) {
+    if (!!chain?.id && isConnected && walletAddress && isWalletLinking && hasStartedLinking && modalWasOpened && !pendingModalOpen) {
       console.log("[WalletConnectHandler] handleWalletSign triggered");
+      if (!passportWalletAddress) {
+        setPage("auth" /* AUTH */);
+        setAuthStep("loading");
+      }
       handleWalletSign({ chainId: chain.id, signingWalletAddress: walletAddress });
     }
-  }, [chain, isConnected, walletAddress, isWalletLinking, hasStartedLinking]);
+  }, [chain, isConnected, walletAddress, isWalletLinking, hasStartedLinking, modalWasOpened, pendingModalOpen]);
   useEffect36(() => {
     if (isConnected && !chain?.id && isWalletLinking && hasStartedLinking && !connectModalOpen && !isWalletSigning) {
       const timeout = setTimeout(() => {
@@ -19484,7 +19506,7 @@ function Provider(props) {
     [config, updateConfig, callbacks, updateCallbacks]
   );
   if (!!initialConfig?.wallet?.enabled)
-    return /* @__PURE__ */ jsx96(WagmiProvider2, { children: /* @__PURE__ */ jsx96(UIContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx96(RainbowKitProvider, { children: /* @__PURE__ */ jsx96(SessionProvider, { children }) }) }) });
+    return /* @__PURE__ */ jsx96(UIContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx96(RainbowKitProvider, { children: /* @__PURE__ */ jsx96(SessionProvider, { children }) }) });
   return /* @__PURE__ */ jsx96(WagmiProvider2, { children: /* @__PURE__ */ jsx96(UIContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx96(SessionProvider, { children }) }) });
 }
 var UIContext, useProviderConfig;