@embarkai/ui-kit 0.2.8 → 0.3.1

package/dist/index.cjs

@@ -877,6 +877,7 @@ var init_useLayoutDataStore = __esm({
       transitionPageHeight: DEFAULT_MAIN_MENU_HEIGHT,
       settingsNotifications: [],
       isWalletLinking: false,
+      pendingWalletLogin: null,
       setPageParams: (pageOptions) => set({ pageParams: pageOptions }),
       setPage: (page) => set((prev) => ({
         page,
@@ -898,7 +899,8 @@ var init_useLayoutDataStore = __esm({
         const filtered = prev.settingsNotifications.filter((n) => n.id !== notification.id);
         return { settingsNotifications: filtered };
       }),
-      setIsWalletLinking: (isWalletLinking) => set({ isWalletLinking })
+      setIsWalletLinking: (isWalletLinking) => set({ isWalletLinking }),
+      setPendingWalletLogin: (pendingWalletLogin) => set({ pendingWalletLogin })
     }));
   }
 });
@@ -1552,7 +1554,7 @@ var init_deploy_account = __esm({
 
 // src/internal/clients/account/register-smart-account-address.ts
 async function registerSmartAccountAddress(chainId, smartAccountAddress, factoryAddress) {
-  const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth19.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     console.warn("[Account] No access token available for Smart Account registration");
     return { success: true, chainId, smartAccountAddress, alreadySet: false };
@@ -1597,7 +1599,7 @@ async function registerSmartAccountAddress(chainId, smartAccountAddress, factory
   }
 }
 async function getAllSmartAccounts() {
-  const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth19.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     console.warn("[Account] No access token available");
     return [];
@@ -1624,7 +1626,7 @@ async function getAllSmartAccounts() {
   }
 }
 async function getSmartAccountForChain(chainId) {
-  const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth19.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     console.warn("[Account] No access token available");
     return null;
@@ -2174,7 +2176,7 @@ var init_httpClient = __esm({
           ...headers
         };
         if (requireAuth) {
-          const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+          const accessToken = import_auth19.jwtTokenManager.getAccessToken();
           if (accessToken) {
             requestHeaders["Authorization"] = `Bearer ${accessToken}`;
           }
@@ -2191,9 +2193,9 @@ var init_httpClient = __esm({
         try {
           const response = await fetch(url, requestConfig);
           if (response.status === 401 && requireAuth) {
-            const refreshSuccess = await import_auth18.jwtTokenManager.refreshAccessToken();
+            const refreshSuccess = await import_auth19.jwtTokenManager.refreshAccessToken();
             if (refreshSuccess) {
-              const newAccessToken = import_auth18.jwtTokenManager.getAccessToken();
+              const newAccessToken = import_auth19.jwtTokenManager.getAccessToken();
               if (newAccessToken) {
                 requestHeaders["Authorization"] = `Bearer ${newAccessToken}`;
                 requestConfig.headers = requestHeaders;
@@ -2568,6 +2570,8 @@ function useAutoConnect() {
         }
       } catch (e) {
         if (e?.code === "KEYSHARE_RECOVERY_NEEDED") {
+          setSession(null);
+          setAddress(null);
           setRecoveryUserId(userId);
           setError(null);
           setStatus("recovery_needed");
@@ -3973,7 +3977,7 @@ function PassKeyStep(props) {
     setPasskeyStatus("checking available passkeys...");
     setIsLoading(true);
     try {
-      import_auth18.jwtTokenManager.clearTokens();
+      import_auth19.jwtTokenManager.clearTokens();
       setPasskeyStatus("authenticating with passkey...");
       const result = await authenticateWithPasskey(
         void 0,
@@ -4463,8 +4467,8 @@ function Social(props) {
         const iframeManager = getIframeManager2();
         const finalizeSocialLogin = async (rawLoginResponse, providerKey, userData) => {
           let loginResponse2 = await normalizeSocialLoginResponse(rawLoginResponse, providerKey, userData);
-          const existingAccessToken = import_auth18.jwtTokenManager.getAccessToken();
-          const existingRefreshToken = import_auth18.jwtTokenManager.getRefreshToken();
+          const existingAccessToken = import_auth19.jwtTokenManager.getAccessToken();
+          const existingRefreshToken = import_auth19.jwtTokenManager.getRefreshToken();
           if (existingAccessToken && existingRefreshToken && !loginResponse2.accessToken) {
             console.log("[AuthModal] Using tokens already stored by iframe-manager");
             loginResponse2 = {
@@ -4493,7 +4497,7 @@ function Social(props) {
             setIsLoading(false);
             return;
           }
-          await import_auth18.jwtTokenManager.clearTokens();
+          await import_auth19.jwtTokenManager.clearTokens();
           if (!loginResponse2.accessToken || !loginResponse2.refreshToken) {
             console.warn(
               "[AuthModal] Authentication tokens were not issued; continuing with cookie-based session only."
@@ -4502,7 +4506,7 @@ function Social(props) {
           let tokensPersisted = false;
           const persistTokensIfAvailable = async () => {
             if (!tokensPersisted && loginResponse2.accessToken && loginResponse2.refreshToken) {
-              await import_auth18.jwtTokenManager.setTokens(loginResponse2);
+              await import_auth19.jwtTokenManager.setTokens(loginResponse2);
               tokensPersisted = true;
             }
           };
@@ -5015,7 +5019,7 @@ function useAuthMenuHandlers() {
       const iframeManager = getIframeManager2();
       await iframeManager.authenticate(userId, loginResponse.avatar, loginResponse.displayName);
       if (loginResponse.accessToken && loginResponse.refreshToken) {
-        await import_auth18.jwtTokenManager.setTokens(loginResponse);
+        await import_auth19.jwtTokenManager.setTokens(loginResponse);
       } else {
         console.warn("[ConnectWalletButton] Login response missing tokens; skipping jwtTokenManager.setTokens");
       }
@@ -5073,6 +5077,8 @@ function useAuthMenuHandlers() {
         console.warn("[AuthMenu] Keyshare recovery needed for user:", userId);
         pendingLoginResponseRef.current = null;
         setError(null);
+        setSession(null);
+        setAddress(null);
         setRecoveryUserId(userId);
         setStatus("recovery_needed");
         setTimeout(() => {
@@ -5080,7 +5086,7 @@ function useAuthMenuHandlers() {
         }, 100);
       } else {
         pendingLoginResponseRef.current = null;
-        await import_auth18.jwtTokenManager.clearTokens();
+        await import_auth19.jwtTokenManager.clearTokens();
         setStatus("error");
         setError(error?.message || String(error));
         setAlert({
@@ -5482,6 +5488,7 @@ var init_AuthMenu = __esm({
     init_SessionContext();
     import_lucide_react8 = require("lucide-react");
     import_react17 = require("react");
+    init_auth();
     init_constants();
     init_useLayoutDataStore();
     init_useLayoutStore();
@@ -5499,8 +5506,20 @@ var init_AuthMenu = __esm({
       const isIframeReady = useSession((st) => st.isIframeReady);
       const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
       const setTransitionPageHeight = useLayoutDataStore((st) => st.setTransitionPageHeight);
+      const pendingWalletLogin = useLayoutDataStore((st) => st.pendingWalletLogin);
+      const setPendingWalletLogin = useLayoutDataStore((st) => st.setPendingWalletLogin);
       const { step, alert: alert2, setStep, setPasskeyStatus, setEmail, setAlert } = useAuthStore();
       const { pendingLoginResponseRef, onAuthSuccess, goBackToSignIn } = useAuthMenuHandlers();
+      (0, import_react17.useEffect)(() => {
+        if (!pendingWalletLogin) return;
+        const loginResponse = pendingWalletLogin;
+        setPendingWalletLogin(null);
+        console.log("[AuthMenu] Processing wallet login response:", loginResponse);
+        import_auth19.jwtTokenManager.clearTokens().then(() => {
+          pendingLoginResponseRef.current = loginResponse;
+          onAuthSuccess();
+        });
+      }, [pendingWalletLogin]);
       (0, import_react17.useEffect)(() => {
         setTransitionPageHeight(DEFAULT_AUTH_MENU_HEIGHT);
         return () => {
@@ -6048,7 +6067,7 @@ var init_queryKeys = __esm({
 
 // src/internal/components/BuyMenu/binance/api.ts
 async function getLumiaNetworkQuery() {
-  const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth19.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     throw new Error("Access token is not available");
   }
@@ -6059,7 +6078,7 @@ async function getLumiaNetworkQuery() {
   return await iframeManager.sendMessage("BINANCE_GET_LUMIA_NETWORK_QUERY", { accessToken });
 }
 async function getPaymentMethodsQuery(payload) {
-  const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth19.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     throw new Error("Access token is not available");
   }
@@ -6073,7 +6092,7 @@ async function getPaymentMethodsQuery(payload) {
   });
 }
 async function getQuoteQuery(payload) {
-  const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth19.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     throw new Error("Access token is not available");
   }
@@ -6087,7 +6106,7 @@ async function getQuoteQuery(payload) {
   });
 }
 async function createPreorderMutation(payload) {
-  const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth19.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     throw new Error("Access token is not available");
   }
@@ -6389,7 +6408,7 @@ var init_binance = __esm({
 
 // src/internal/components/BuyMenu/rampnow/api.ts
 async function getRampnowConfigQuery() {
-  const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth19.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     throw new Error("Access token is not available");
   }
@@ -6400,7 +6419,7 @@ async function getRampnowConfigQuery() {
   return await iframeManager.sendMessage("RAMPNOW_GET_CONFIG", { accessToken });
 }
 async function getRampOrderQuoteQuery(payload) {
-  const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth19.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     throw new Error("Access token is not available");
   }
@@ -7649,9 +7668,9 @@ __export(passkey_exports2, {
   linkPasskeyWithWebAuthn: () => linkPasskeyWithWebAuthn
 });
 async function completePasskeyLinking(payload) {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth18.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/complete`, {
+  const response = await (0, import_auth19.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/complete`, {
     method: "POST",
     body: JSON.stringify(payload)
   });
@@ -7661,9 +7680,9 @@ async function completePasskeyLinking(payload) {
   }
 }
 async function beginPasskeyLinking() {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  let res = await (0, import_auth18.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/begin`, { method: "POST" });
+  let res = await (0, import_auth19.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/begin`, { method: "POST" });
   if (res.ok) {
     const begin2 = await res.json();
     const options2 = {
@@ -7678,7 +7697,7 @@ async function beginPasskeyLinking() {
     };
     return { challengeId: begin2.challengeId, options: options2 };
   }
-  res = await (0, import_auth18.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/options`, { method: "GET" });
+  res = await (0, import_auth19.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/options`, { method: "GET" });
   if (!res.ok) throw new Error("Failed to get passkey linking options");
   const begin = await res.json();
   const options = {
@@ -7697,7 +7716,7 @@ async function linkPasskeyWithWebAuthn(optionsOverride) {
   if (!("credentials" in navigator) || !("create" in navigator.credentials)) {
     throw new Error("WebAuthn not supported in this browser");
   }
-  const userId = import_auth18.jwtTokenManager.getUserId();
+  const userId = import_auth19.jwtTokenManager.getUserId();
   if (!userId) throw new Error("No authenticated user");
   let challengeId = null;
   let publicKeyOptions = null;
@@ -7999,7 +8018,8 @@ function useCreateBackup() {
       setIsDialogForced(true);
     }
   }, [hasServerVault, setIsDialogForced, setMethod]);
-  const passportUserId = session?.mpcUserId || "";
+  const recoveryUserId = useSession((st) => st.recoveryUserId);
+  const passportUserId = session?.mpcUserId || recoveryUserId || "";
   const onBackupSuccess = () => console.log("[ConnectWalletButton] Backup created successfully");
   const { mutate: createPasswordBackup, isPending: isPasswordBackupCreating } = (0, import_react_query10.useMutation)({
     mutationFn: async () => {
@@ -9709,9 +9729,9 @@ var init_LanguagesMenu2 = __esm({
 
 // src/internal/auth/providers/common.ts
 async function getLinkedProviders() {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth18.authenticatedFetch)(`${getTssUrl3()}/api/auth/providers`, { method: "GET" });
+  const response = await (0, import_auth19.authenticatedFetch)(`${getTssUrl3()}/api/auth/providers`, { method: "GET" });
   if (!response.ok) {
     const errorData = await response.json().catch(() => ({}));
     throw new Error(errorData.message || `Failed to fetch providers: ${response.statusText}`);
@@ -9720,11 +9740,11 @@ async function getLinkedProviders() {
   return data.providers;
 }
 async function unlinkProvider(providerType, externalId) {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
   let url = `${getTssUrl3()}/api/auth/unlink/${providerType}`;
   if (externalId) url += `?externalId=${encodeURIComponent(externalId)}`;
-  const response = await (0, import_auth18.authenticatedFetch)(url, { method: "DELETE" });
+  const response = await (0, import_auth19.authenticatedFetch)(url, { method: "DELETE" });
   if (!response.ok) {
     const errorData = await response.json().catch(() => ({}));
     throw new Error(errorData.message || `Failed to unlink provider: ${response.statusText}`);
@@ -9732,12 +9752,12 @@ async function unlinkProvider(providerType, externalId) {
   try {
     const data = await response.json();
     if (data?.accessToken && data?.refreshToken && data?.expiresIn) {
-      import_auth18.jwtTokenManager.setTokens({
+      import_auth19.jwtTokenManager.setTokens({
         accessToken: data.accessToken,
         refreshToken: data.refreshToken,
-        userId: import_auth18.jwtTokenManager.getUserId() || "",
+        userId: import_auth19.jwtTokenManager.getUserId() || "",
         expiresIn: data.expiresIn,
-        hasKeyshare: import_auth18.jwtTokenManager.getHasKeyshare() ?? false
+        hasKeyshare: import_auth19.jwtTokenManager.getHasKeyshare() ?? false
       });
     }
   } catch {
@@ -9834,7 +9854,7 @@ async function getLinkProfilesData() {
   });
   let avatar = null;
   try {
-    avatar = import_auth18.jwtTokenManager.getAvatar() || null;
+    avatar = import_auth19.jwtTokenManager.getAvatar() || null;
   } catch {
     avatar = null;
   }
@@ -10011,9 +10031,9 @@ var init_EmailForm = __esm({
 
 // src/internal/auth/providers/email.ts
 async function sendEmailLinkCode(email) {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth18.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/email/send-code`, {
+  const response = await (0, import_auth19.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/email/send-code`, {
     method: "POST",
     body: JSON.stringify({ email })
   });
@@ -10023,9 +10043,9 @@ async function sendEmailLinkCode(email) {
   }
 }
 async function verifyEmailLinkCode(email, code) {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth18.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/email/verify-code`, {
+  const response = await (0, import_auth19.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/email/verify-code`, {
     method: "POST",
     credentials: "include",
     body: JSON.stringify({ email, code })
@@ -10297,7 +10317,7 @@ var init_AddProvider = __esm({
 
 // src/internal/components/ManageWalletMenu/EmailNotConnectedWarning.tsx
 function EmailNotConnectedWarning() {
-  const providers = import_auth18.jwtTokenManager.getProviders();
+  const providers = import_auth19.jwtTokenManager.getProviders();
   const hasEmail = providers.includes("email");
   const { t } = useT();
   const config = useProviderConfig().config;
@@ -10358,11 +10378,11 @@ function useLinkSocial() {
           mode: "link"
         };
         try {
-          await (0, import_auth18.ensureValidToken)();
+          await (0, import_auth19.ensureValidToken)();
         } catch (tokenError) {
           console.warn("[ManageWallet] ensureValidToken failed before linking", tokenError);
         }
-        const accessToken = import_auth18.jwtTokenManager.getAccessToken();
+        const accessToken = import_auth19.jwtTokenManager.getAccessToken();
         if (accessToken) {
           authConfig.token = accessToken;
         }
@@ -10429,7 +10449,7 @@ var init_useLinkSocial = __esm({
 
 // src/internal/auth/providers/telegram.ts
 async function linkTelegram(telegramData) {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
   const formattedData = {
     id: telegramData.id,
@@ -10440,7 +10460,7 @@ async function linkTelegram(telegramData) {
   if (telegramData.last_name) formattedData.last_name = telegramData.last_name;
   if (telegramData.username) formattedData.username = telegramData.username;
   if (telegramData.photo_url) formattedData.photo_url = telegramData.photo_url;
-  const response = await (0, import_auth18.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/telegram`, {
+  const response = await (0, import_auth19.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/telegram`, {
     method: "POST",
     body: JSON.stringify(formattedData)
   });
@@ -12592,8 +12612,8 @@ function SecurityMenu() {
   const { t } = useT();
   const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const setPage = useLayoutDataStore((st) => st.setPage);
-  const userId = import_auth18.jwtTokenManager.getUserId();
-  const serverHasKeyshare = import_auth18.jwtTokenManager.getHasKeyshare() ?? false;
+  const userId = import_auth19.jwtTokenManager.getUserId();
+  const serverHasKeyshare = import_auth19.jwtTokenManager.getHasKeyshare() ?? false;
   const [isRemoving, setIsRemoving] = (0, import_react49.useState)(false);
   const [appToRemove, setAppToRemove] = (0, import_react49.useState)(null);
   const {
@@ -15503,7 +15523,7 @@ var init_usePageMapper = __esm({
 function useSettingsNotifications() {
   const address = useSession((st) => st.address);
   const setSettingsNotifications = useLayoutDataStore((st) => st.setSettingsNotifications);
-  const providers = import_auth18.jwtTokenManager.getProviders();
+  const providers = import_auth19.jwtTokenManager.getProviders();
   const hasEmail = providers.includes("email");
   const { data: userProfile = null } = (0, import_react_query38.useQuery)({
     retry: false,
@@ -15553,7 +15573,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.2.8",
+      version: "0.3.1",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -15591,51 +15611,52 @@ var init_package = __esm({
       },
       peerDependencies: {
         "@tanstack/react-query": ">=5.0.0",
+        i18next: "^25.8.0",
         react: ">=18",
         "react-dom": ">=18",
-        "tailwind-merge": ">=2.2.0",
-        i18next: "^25.8.0",
-        "react-i18next": "^16.5.3"
+        "react-i18next": "^16.5.3",
+        "tailwind-merge": ">=2.2.0"
       },
       dependencies: {
-        "@radix-ui/react-slot": ">=1.2.4",
+        "@embarkai/core": "workspace:*",
         "@radix-ui/react-checkbox": ">=1.3.3",
-        "@radix-ui/react-select": ">=2.2.6",
         "@radix-ui/react-dialog": ">=1.1.15",
-        "@embarkai/core": "workspace:*",
+        "@radix-ui/react-select": ">=2.2.6",
+        "@radix-ui/react-slot": ">=1.2.4",
         "@rainbow-me/rainbowkit": "^2.2.10",
         "@sentry/browser": "^10.22.0",
         "class-variance-authority": "^0.7.0",
-        "lodash-es": "^4.17.21",
         clsx: "^2.1.1",
+        dayjs: "^1.11.9",
         "dkls23-wasm": "^0.1.0",
+        "framer-motion": "^12.23.24",
+        "lodash-es": "^4.17.21",
         "lucide-react": "^0.454.0",
         qrcode: "^1.5.0",
-        zustand: "^5.0.8",
         viem: "^2.38.0",
         wagmi: "^2.17.5",
-        dayjs: "^1.11.9",
-        "framer-motion": "^12.23.24"
+        zustand: "^5.0.8"
       },
       devDependencies: {
         "@tailwindcss/typography": "^0.5.16",
         "@tanstack/react-query": "^5.90.2",
+        "@types/lodash-es": "^4.17.12",
         "@types/qrcode": "^1.5.0",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
         autoprefixer: "^10.4.20",
         dotenv: "^17.2.3",
+        i18next: "^25.8.0",
         postcss: "^8.4.47",
         react: "^18.3.1",
         "react-dom": "^18.3.1",
+        "react-i18next": "^16.5.3",
         "tailwind-merge": "^2.2.0",
-        "@types/lodash-es": "^4.17.12",
         tailwindcss: "^3.4.10",
         tsup: "^8.5.0",
         typescript: "^5.4.5",
         vite: "^5.0.0",
-        i18next: "^25.8.0",
-        "react-i18next": "^16.5.3"
+        vitest: "^4.0.18"
       },
       repository: {
         type: "git",
@@ -15665,7 +15686,7 @@ function Footer() {
       setError(null);
       setStatus("disconnecting");
       setIsLoading(true);
-      const userId = import_auth18.jwtTokenManager.getUserId() || null;
+      const userId = import_auth19.jwtTokenManager.getUserId() || null;
       const { logout: logout2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
       await logout2();
       return { disconnectedUserId: userId, disconnectAddress };
@@ -15802,8 +15823,8 @@ function Header() {
     queryKey: [QUERY_KEYS.userProfile, address],
     queryFn: getUserProfile
   });
-  const avatar = profile?.avatar || import_auth18.jwtTokenManager.getAvatar();
-  const displayName = profile?.nicknameDisplay || profile?.displayName || import_auth18.jwtTokenManager.getDisplayName();
+  const avatar = profile?.avatar || import_auth19.jwtTokenManager.getAvatar();
+  const displayName = profile?.nicknameDisplay || profile?.displayName || import_auth19.jwtTokenManager.getDisplayName();
   const ChainIcon = NETWORK_OPTIONS.find((net) => net.chainId === chainConfig.id)?.Icon || (() => /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("div", { className: "flex-none w-4 h-4 rounded-full flex items-center justify-center bg-[var(--ui-kit-primary)]", children: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("span", { className: "text-[var(--ui-kit-fg-inverted)] text-xs font-bold", children: chainConfig.name.charAt(0) }) }));
   return /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(
     "div",
@@ -16237,10 +16258,23 @@ var init_TssManager = __esm({
 });
 
 // src/internal/auth/providers/wallet.ts
+async function walletLogin(walletData) {
+  const response = await fetch(addProjectIdToUrl(`${getTssUrl3()}/api/auth/wallet/login`), {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    credentials: "include",
+    body: JSON.stringify(walletData)
+  });
+  if (!response.ok) {
+    const errorData = await response.json().catch(() => ({}));
+    throw new Error(errorData.message || `Wallet login failed: ${response.statusText}`);
+  }
+  return response.json();
+}
 async function linkWallet(walletData) {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth18.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/wallet`, {
+  const response = await (0, import_auth19.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/wallet`, {
     method: "POST",
     body: JSON.stringify(walletData)
   });
@@ -16250,9 +16284,9 @@ async function linkWallet(walletData) {
   }
 }
 async function unlinkWallet(address) {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth18.authenticatedFetch)(
+  const response = await (0, import_auth19.authenticatedFetch)(
     `${getTssUrl3()}/api/auth/unlink/wallet?address=${encodeURIComponent(address)}`,
     {
       method: "DELETE"
@@ -16289,9 +16323,23 @@ Timestamp: ${timestamp}
 
 Sign this message to link your wallet to ${projectName} Wallet`;
 }
+function createLoginMessage(address, projectName) {
+  const nonce = crypto.randomUUID();
+  const timestamp = Date.now();
+  return [
+    `${projectName} Wallet Login`,
+    "",
+    `Address: ${address}`,
+    `Nonce: ${nonce}`,
+    `Timestamp: ${timestamp}`,
+    "",
+    `Sign this message to login your wallet to ${projectName}`
+  ].join("\n");
+}
 var METADATA_API_URL, METADATA_CACHE_TTL, metadataCache;
 var init_wallet = __esm({
   "src/internal/auth/providers/wallet.ts"() {
+    init_projectId();
     init_auth();
     init_types();
     METADATA_API_URL = "https://dashboard.lumiapassport.com/api/public/project";
@@ -16351,6 +16399,7 @@ function WalletConnectHandler() {
   const walletMode = providerConfig?.wallet?.mode || "linked";
   const projectId = providerConfig?.projectId;
   const setExternalWallet = useExternalWalletStore((st) => st.setExternalWallet);
+  const setPendingWalletLogin = useLayoutDataStore((st) => st.setPendingWalletLogin);
   const onLinkingComplete = (0, import_react63.useCallback)(
     async (success) => {
       setIsWalletLinking(false);
@@ -16390,19 +16439,8 @@ function WalletConnectHandler() {
       });
       setHasStartedLinking(true);
       setProviderType(null);
-      if (isConnected) {
-        disconnect();
-        setTimeout(() => {
-          setPage(null);
-          if (openConnectModal) {
-            openConnectModal();
-          } else {
-            console.error("[WalletConnectHandler] openConnectModal is undefined!");
-            setIsWalletLinking(false);
-            setHasStartedLinking(false);
-          }
-        }, 500);
-      } else {
+      disconnect();
+      setTimeout(() => {
         setPage(null);
         if (openConnectModal) {
           openConnectModal();
@@ -16411,7 +16449,7 @@ function WalletConnectHandler() {
           setIsWalletLinking(false);
           setHasStartedLinking(false);
         }
-      }
+      }, 500);
     }
     if (!isWalletLinking && hasStartedLinking) {
       setHasStartedLinking(false);
@@ -16439,12 +16477,21 @@ function WalletConnectHandler() {
     if (isWalletLinking) {
       const timeout = setTimeout(() => {
         console.warn("[WalletConnectHandler] Wallet linking timed out, resetting state");
+        disconnect();
         setIsWalletLinking(false);
         setHasStartedLinking(false);
+        if (passportWalletAddress) {
+          setManageWalletLinkError("Wallet connection timed out. Please try again.");
+          setPage("manage-wallet" /* MANAGE_WALLET */);
+        } else {
+          setAuthError({ title: "Connection timed out", message: "Wallet did not respond. Please try again." });
+          setPage("auth" /* AUTH */);
+        }
       }, 12e4);
       return () => clearTimeout(timeout);
     }
-  }, [isWalletLinking, setIsWalletLinking]);
+  }, [isWalletLinking, setIsWalletLinking, disconnect]);
+  const isAuthFlow = !passportWalletAddress;
   const { mutate: handleWalletSign, isPending: isWalletSigning } = (0, import_react_query41.useMutation)({
     mutationFn: async (payload) => {
       const { chainId, signingWalletAddress } = payload;
@@ -16463,24 +16510,45 @@ function WalletConnectHandler() {
       }
       setLinkIsLoading(true);
       const projectName = projectId ? await fetchProjectName(projectId) : "EmbarkAI";
-      const message = createSignatureMessage(signingWalletAddress, projectName);
-      const signature = await signMessageAsync({ message, account: signingWalletAddress });
+      const message = isAuthFlow ? createLoginMessage(signingWalletAddress, projectName) : createSignatureMessage(signingWalletAddress, projectName);
+      const signature = await Promise.race([
+        signMessageAsync({ message, account: signingWalletAddress }),
+        new Promise(
+          (_, reject) => setTimeout(() => reject(new Error("Signature request timed out. Please try again.")), 6e4)
+        )
+      ]);
       if (!signature) {
         throw new Error("Failed to get signature");
       }
       const walletName = connector?.name || "Unknown Wallet";
       const walletType = connector?.id || "unknown";
-      return await linkWallet({
-        // chainId: chain.id,
+      const walletData = {
         chainId,
         address: signingWalletAddress,
         signature,
         message,
         walletName,
         walletType
-      });
+      };
+      if (isAuthFlow) {
+        const loginResponse = await walletLogin(walletData);
+        return loginResponse;
+      } else {
+        await linkWallet(walletData);
+        return void 0;
+      }
     },
-    onSuccess: () => {
+    onSuccess: (data) => {
+      if (isAuthFlow && data) {
+        console.log("[WalletConnectHandler] Wallet login successful, passing to AuthMenu");
+        disconnect();
+        setPendingWalletLogin(data);
+        setIsWalletLinking(false);
+        setHasStartedLinking(false);
+        setLinkIsLoading(false);
+        setPage("auth" /* AUTH */);
+        return;
+      }
       const shouldKeepConnected = walletMode === "direct" || walletMode === "both";
       if (shouldKeepConnected && walletAddress && chain?.id && connector) {
         setExternalWallet({
@@ -16501,7 +16569,7 @@ function WalletConnectHandler() {
       onLinkingComplete(false);
       setHasStartedLinking(false);
       setLinkIsLoading(false);
-      const errorMsg = err?.message || "Failed to link wallet";
+      const errorMsg = err?.message || (isAuthFlow ? "Wallet login failed" : "Failed to link wallet");
       if (errorMsg.includes("User rejected") || errorMsg.includes("User denied")) {
         if (passportWalletAddress) {
           setManageWalletLinkError("Signature request was cancelled");
@@ -17548,7 +17616,7 @@ var init_vaultClient = __esm({
 
 // src/internal/auth/keyshare.ts
 async function checkKeyshareStatusWithSync(userId) {
-  const serverHasKeyshare = await (0, import_auth18.syncKeyshareStatus)();
+  const serverHasKeyshare = await (0, import_auth19.syncKeyshareStatus)();
   return checkKeyshareStatus(userId, serverHasKeyshare);
 }
 async function checkKeyshareStatus(userId, serverHasKeyshare) {
@@ -17582,7 +17650,7 @@ async function ensureKeyshareForNewUser(userId, onProgress) {
   onProgress?.("Setting up secure key management...");
   const result = await ensureDkgAndGetOwner(userId);
   if (!result.ownerAddress) throw new Error("DKG completed but no owner address received");
-  await (0, import_auth18.syncKeyshareStatus)();
+  await (0, import_auth19.syncKeyshareStatus)();
   onProgress?.("Key management setup complete");
   return { ownerAddress: result.ownerAddress };
 }
@@ -17667,7 +17735,7 @@ var init_keyshare = __esm({
 
 // src/internal/auth/providers/x.ts
 async function linkX() {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
   throw new Error('Use openSocialAuthPopup("x") to link X account');
 }
@@ -17675,10 +17743,10 @@ async function loginWithX() {
   throw new Error('Use openSocialAuthPopup("x") to login with X account');
 }
 async function unlinkX(externalId) {
-  const hasValidToken = await (0, import_auth18.ensureValidToken)();
+  const hasValidToken = await (0, import_auth19.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
   const url = externalId ? `${getTssUrl3()}/api/auth/unlink/x?externalId=${encodeURIComponent(externalId)}` : `${getTssUrl3()}/api/auth/unlink/x`;
-  const response = await (0, import_auth18.authenticatedFetch)(url, {
+  const response = await (0, import_auth19.authenticatedFetch)(url, {
     method: "DELETE"
   });
   if (!response.ok) {
@@ -17709,9 +17777,9 @@ var init_providers = __esm({
 // src/internal/auth/index.ts
 var auth_exports = {};
 __export(auth_exports, {
-  JwtTokenManager: () => import_auth18.JwtTokenManager,
+  JwtTokenManager: () => import_auth19.JwtTokenManager,
   authenticateWithPasskey: () => authenticateWithPasskey,
-  authenticatedFetch: () => import_auth18.authenticatedFetch,
+  authenticatedFetch: () => import_auth19.authenticatedFetch,
   beginPasskeyAuthentication: () => beginPasskeyAuthentication,
   beginPasskeyLinking: () => beginPasskeyLinking,
   beginPasskeyRegistration: () => beginPasskeyRegistration,
@@ -17721,51 +17789,53 @@ __export(auth_exports, {
   completePasskeyAuthentication: () => completePasskeyAuthentication,
   completePasskeyLinking: () => completePasskeyLinking,
   completePasskeyRegistration: () => completePasskeyRegistration,
-  configureJwtModule: () => import_auth18.configureJwtModule,
+  configureJwtModule: () => import_auth19.configureJwtModule,
   createInitialAuthState: () => createInitialAuthState,
-  createJwtTokenManager: () => import_auth18.createJwtTokenManager,
+  createJwtTokenManager: () => import_auth19.createJwtTokenManager,
+  createLoginMessage: () => createLoginMessage,
   createPasskeyHelpers: () => createPasskeyHelpers,
   createSignatureMessage: () => createSignatureMessage,
   deriveDemoPrivateKey: () => deriveDemoPrivateKey,
   ensureKeyshare: () => ensureKeyshare,
-  ensureValidToken: () => import_auth18.ensureValidToken,
+  ensureValidToken: () => import_auth19.ensureValidToken,
   fetchProjectName: () => fetchProjectName,
   formatDate: () => formatDate,
   getKeyshareInfo: () => getKeyshareInfo,
   getLinkedProviders: () => getLinkedProviders,
   getProviderDisplayInfo: () => getProviderDisplayInfo,
   getTssUrl: () => getTssUrl3,
-  getValidTokens: () => import_auth18.getValidTokens,
+  getValidTokens: () => import_auth19.getValidTokens,
   hasAvailablePasskeys: () => hasAvailablePasskeys,
   hideTelegramWidget: () => hideTelegramWidget,
   initTelegramWidget: () => initTelegramWidget,
   isWebAuthnSupported: () => isWebAuthnSupported,
-  jwtTokenManager: () => import_auth18.jwtTokenManager,
+  jwtTokenManager: () => import_auth19.jwtTokenManager,
   linkPasskeyWithWebAuthn: () => linkPasskeyWithWebAuthn,
   linkTelegram: () => linkTelegram,
   linkWallet: () => linkWallet,
   linkX: () => linkX,
-  loginWithEmail: () => import_auth18.loginWithEmail,
-  loginWithTelegram: () => import_auth18.loginWithTelegram,
-  loginWithUserId: () => import_auth18.loginWithUserId,
+  loginWithEmail: () => import_auth19.loginWithEmail,
+  loginWithTelegram: () => import_auth19.loginWithTelegram,
+  loginWithUserId: () => import_auth19.loginWithUserId,
   loginWithX: () => loginWithX,
-  logout: () => import_auth18.logout,
+  logout: () => import_auth19.logout,
   mountTelegramLoginWidget: () => mountTelegramLoginWidget,
   registerPasskey: () => registerPasskey,
   resetWebAuthnFlags: () => resetWebAuthnFlags,
   sendEmailLinkCode: () => sendEmailLinkCode,
   showTelegramWidget: () => showTelegramWidget,
-  syncKeyshareStatus: () => import_auth18.syncKeyshareStatus,
+  syncKeyshareStatus: () => import_auth19.syncKeyshareStatus,
   unlinkProvider: () => unlinkProvider,
   unlinkWallet: () => unlinkWallet,
   unlinkX: () => unlinkX,
   verifyEmailLinkCode: () => verifyEmailLinkCode,
-  verifyToken: () => import_auth18.verifyToken
+  verifyToken: () => import_auth19.verifyToken,
+  walletLogin: () => walletLogin
 });
-var import_auth18, createInitialAuthState;
+var import_auth19, createInitialAuthState;
 var init_auth = __esm({
   "src/internal/auth/index.ts"() {
-    import_auth18 = require("@embarkai/core/auth");
+    import_auth19 = require("@embarkai/core/auth");
     init_passkeyAuth();
     init_telegram();
     init_passkey();
@@ -19023,10 +19093,9 @@ var init_iframe_manager = __esm({
 });
 
 // src/config/rainbowkit.ts
-var import_read13, import_rainbowkit2, import_wallets, import_chains, getProjectId, WALLET_MAP, createRainbowConfig, rainbowTheme;
+var import_rainbowkit2, import_wallets, import_chains, getProjectId, WALLET_MAP, createRainbowConfig, rainbowTheme;
 var init_rainbowkit = __esm({
   "src/config/rainbowkit.ts"() {
-    import_read13 = require("@embarkai/core/read");
     import_rainbowkit2 = require("@rainbow-me/rainbowkit");
     import_wallets = require("@rainbow-me/rainbowkit/wallets");
     import_chains = require("wagmi/chains");
@@ -19048,7 +19117,7 @@ var init_rainbowkit = __esm({
       const config = {
         appName: "EmbarkAI Wallet",
         projectId: getProjectId(opts.projectId),
-        chains: [import_read13.lumiaMainnetChain, import_read13.lumiaTestnetChain, import_chains.mainnet, import_chains.polygon, import_chains.bsc, import_chains.arbitrum, import_chains.optimism, import_chains.avalanche, import_chains.base, import_chains.zora],
+        chains: [import_chains.mainnet, import_chains.polygon, import_chains.bsc, import_chains.arbitrum, import_chains.optimism, import_chains.avalanche, import_chains.base, import_chains.zora],
         ssr: false
       };
       if (opts.allowedWallets && opts.allowedWallets.length > 0) {
@@ -19327,17 +19396,17 @@ function buildTransport(urls) {
     retryCount: 0
   });
 }
-var import_read14, import_viem17, import_wagmi5, wagmiConfig;
+var import_read13, import_viem17, import_wagmi5, wagmiConfig;
 var init_wagmi = __esm({
   "src/config/wagmi.ts"() {
-    import_read14 = require("@embarkai/core/read");
+    import_read13 = require("@embarkai/core/read");
     import_viem17 = require("viem");
     import_wagmi5 = require("wagmi");
     wagmiConfig = (0, import_wagmi5.createConfig)({
-      chains: [import_read14.lumiaMainnetChain, import_read14.lumiaTestnetChain],
+      chains: [import_read13.lumiaMainnetChain, import_read13.lumiaTestnetChain],
       transports: {
-        [import_read14.lumiaTestnetChain.id]: buildTransport(import_read14.lumiaTestnetChain.rpcUrls.default.http),
-        [import_read14.lumiaMainnetChain.id]: buildTransport(import_read14.lumiaMainnetChain.rpcUrls.default.http)
+        [import_read13.lumiaTestnetChain.id]: buildTransport(import_read13.lumiaTestnetChain.rpcUrls.default.http),
+        [import_read13.lumiaMainnetChain.id]: buildTransport(import_read13.lumiaMainnetChain.rpcUrls.default.http)
       }
     });
   }
@@ -19510,11 +19579,11 @@ function ConnectWalletButton(props) {
     queryKey: [QUERY_KEYS.userProfile, address],
     queryFn: getUserProfile
   });
-  const displayName = profile?.nicknameDisplay || profile?.displayName || import_auth18.jwtTokenManager.getDisplayName();
+  const displayName = profile?.nicknameDisplay || profile?.displayName || import_auth19.jwtTokenManager.getDisplayName();
   const indicators = (0, import_react68.useMemo)(() => {
     const userId = session?.mpcUserId;
     if (!userId) return { server: false, local: false, backup: false };
-    const server = import_auth18.jwtTokenManager.getHasKeyshare() ?? false;
+    const server = import_auth19.jwtTokenManager.getHasKeyshare() ?? false;
     const local = !!address;
     return { server, local, backup: hasServerVault };
   }, [session, address, hasServerVault]);
@@ -19811,7 +19880,7 @@ var init_LangToggle = __esm({
 // src/clients/bundler/getUserOperationByHash.ts
 async function getUserOperationByHash(userOpHash, chainId) {
   const targetChainId = chainId ?? requireActiveChainId();
-  const chainConfig = (0, import_read15.getChainConfig)(targetChainId);
+  const chainConfig = (0, import_read14.getChainConfig)(targetChainId);
   if (!chainConfig) {
     throw new Error(`Chain ${targetChainId} is not supported`);
   }
@@ -19839,19 +19908,19 @@ async function getUserOperationByHash(userOpHash, chainId) {
     return null;
   }
 }
-var import_core, import_read15;
+var import_core, import_read14;
 var init_getUserOperationByHash = __esm({
   "src/clients/bundler/getUserOperationByHash.ts"() {
     init_SessionContext();
     import_core = require("@embarkai/core");
-    import_read15 = require("@embarkai/core/read");
+    import_read14 = require("@embarkai/core/read");
   }
 });
 
 // src/clients/bundler/getUserOperationReceipt.ts
 async function getUserOperationReceipt(userOpHash, chainId) {
   const targetChainId = chainId ?? requireActiveChainId();
-  const chainConfig = (0, import_read16.getChainConfig)(targetChainId);
+  const chainConfig = (0, import_read15.getChainConfig)(targetChainId);
   if (!chainConfig) {
     throw new Error(`Chain ${targetChainId} is not supported`);
   }
@@ -19885,12 +19954,12 @@ async function getUserOperationReceipt(userOpHash, chainId) {
     return null;
   }
 }
-var import_core2, import_read16;
+var import_core2, import_read15;
 var init_getUserOperationReceipt = __esm({
   "src/clients/bundler/getUserOperationReceipt.ts"() {
     init_SessionContext();
     import_core2 = require("@embarkai/core");
-    import_read16 = require("@embarkai/core/read");
+    import_read15 = require("@embarkai/core/read");
   }
 });
 
@@ -20833,12 +20902,12 @@ function useLogout() {
     let userId = null;
     setIsLoading(true);
     try {
-      userId = import_auth20.jwtTokenManager.getUserId() || null;
+      userId = import_auth21.jwtTokenManager.getUserId() || null;
     } catch (error) {
       console.warn("[useLogout] Could not get userId:", error);
     }
     try {
-      await (0, import_auth20.logout)();
+      await (0, import_auth21.logout)();
     } catch (error) {
       console.warn("[useLogout] Core logout failed:", error);
     }
@@ -20858,10 +20927,10 @@ function useLogout() {
   }, [address, setAddress, setError, setSession, setStatus]);
   return { logout: logout2 };
 }
-var import_auth20, import_react75;
+var import_auth21, import_react75;
 var init_useLogout = __esm({
   "src/hooks/useLogout.ts"() {
-    import_auth20 = require("@embarkai/core/auth");
+    import_auth21 = require("@embarkai/core/auth");
     import_react75 = require("react");
     init_ProviderContext();
     init_SessionContext();
@@ -20922,7 +20991,7 @@ var init_clients2 = __esm({
 // src/modules/transactions.ts
 function useTransactions() {
   const chainId = requireActiveChainId();
-  const viemChain = (0, import_read17.getViemChain)(chainId);
+  const viemChain = (0, import_read16.getViemChain)(chainId);
   const publicClient = (0, import_wagmi10.usePublicClient)({ chainId });
   const { data: walletClient } = (0, import_wagmi10.useWalletClient)();
   const { address } = (0, import_wagmi10.useAccount)();
@@ -20980,11 +21049,11 @@ function useTransactions() {
     isConnected: !!address && !!walletClient
   };
 }
-var import_read17, import_viem20, import_wagmi10;
+var import_read16, import_viem20, import_wagmi10;
 var init_transactions = __esm({
   "src/modules/transactions.ts"() {
     init_SessionContext();
-    import_read17 = require("@embarkai/core/read");
+    import_read16 = require("@embarkai/core/read");
     import_viem20 = require("viem");
     import_wagmi10 = require("wagmi");
   }
@@ -21251,9 +21320,9 @@ __export(index_exports, {
   getUserOperationByHash: () => getUserOperationByHash,
   getUserOperationReceipt: () => getUserOperationReceipt,
   getUserProfile: () => getUserProfile,
-  getValidTokens: () => import_auth18.getValidTokens,
-  jwtTokenManager: () => import_auth18.jwtTokenManager,
-  logout: () => import_auth18.logout,
+  getValidTokens: () => import_auth19.getValidTokens,
+  jwtTokenManager: () => import_auth19.jwtTokenManager,
+  logout: () => import_auth19.logout,
   looksLikeNickname: () => looksLikeNickname,
   prepareUserOperation: () => prepareUserOperation,
   requireActiveChainId: () => requireActiveChainId,