@embarkai/ui-kit 0.4.46 → 0.4.47

package/dist/index.cjs

@@ -1301,7 +1301,7 @@ var init_ChainSync2 = __esm({
 
 // src/internal/clients/account/register-smart-account-address.ts
 async function registerSmartAccountAddress(chainId, smartAccountAddress, factoryAddress) {
-  const accessToken = import_auth20.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth21.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     console.warn("[Account] No access token available for Smart Account registration");
     return { success: true, chainId, smartAccountAddress, alreadySet: false };
@@ -1346,7 +1346,7 @@ async function registerSmartAccountAddress(chainId, smartAccountAddress, factory
   }
 }
 async function getAllSmartAccounts() {
-  const accessToken = import_auth20.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth21.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     console.warn("[Account] No access token available");
     return [];
@@ -1373,7 +1373,7 @@ async function getAllSmartAccounts() {
   }
 }
 async function getSmartAccountForChain(chainId) {
-  const accessToken = import_auth20.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth21.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     console.warn("[Account] No access token available");
     return null;
@@ -1989,7 +1989,7 @@ var init_httpClient = __esm({
           ...headers
         };
         if (requireAuth) {
-          const accessToken = import_auth20.jwtTokenManager.getAccessToken();
+          const accessToken = import_auth21.jwtTokenManager.getAccessToken();
           if (accessToken) {
             requestHeaders["Authorization"] = `Bearer ${accessToken}`;
           }
@@ -2006,9 +2006,9 @@ var init_httpClient = __esm({
         try {
           const response = await fetch(url, requestConfig);
           if (response.status === 401 && requireAuth) {
-            const refreshSuccess = await import_auth20.jwtTokenManager.refreshAccessToken();
+            const refreshSuccess = await import_auth21.jwtTokenManager.refreshAccessToken();
             if (refreshSuccess) {
-              const newAccessToken = import_auth20.jwtTokenManager.getAccessToken();
+              const newAccessToken = import_auth21.jwtTokenManager.getAccessToken();
               if (newAccessToken) {
                 requestHeaders["Authorization"] = `Bearer ${newAccessToken}`;
                 requestConfig.headers = requestHeaders;
@@ -2441,15 +2441,11 @@ function useBackupStatusChanges() {
     onSuccess: ({ stats, detail }) => {
       const hasRecoveryData = stats && (!!stats.created || !!stats?.devices?.length);
       if (!!hasRecoveryData) {
-        console.log(
-          "[BACKUP STATUS] Recovery data found after backup status change.\n Redirect to main menu:",
-          detail?.navigateToMainMenu
-        );
         setHasServerVault(true);
-        if (!!detail?.navigateToMainMenu) {
-          setTimeout(() => setPage(null), 1e3);
+        if (!!detail?.navigateToNicknameMenu) {
+          console.log("[BACKUP STATUS] New user backup created, navigating to nickname settings");
+          setTimeout(() => setPage("nickname-settings" /* NICKNAME_SETTINGS */), 1e3);
         }
-        console.info("[BACKUP STATUS] Recovery data found in vault, marking as has-server-vault");
       } else {
         setHasServerVault(false);
         setPage("keysare-backup" /* KEYSARE_BACKUP */);
@@ -6640,7 +6636,7 @@ function PassKeyStep(props) {
     setPasskeyStatus("checking available passkeys...");
     setIsLoading(true);
     try {
-      import_auth20.jwtTokenManager.clearTokens();
+      import_auth21.jwtTokenManager.clearTokens();
       setPasskeyStatus("authenticating with passkey...");
       const result = await authenticateWithPasskey(
         void 0,
@@ -7131,8 +7127,8 @@ function Social(props) {
         const iframeManager = getIframeManager2();
         const finalizeSocialLogin = async (rawLoginResponse, providerKey, userData) => {
           let loginResponse2 = await normalizeSocialLoginResponse(rawLoginResponse, providerKey, userData);
-          const existingAccessToken = import_auth20.jwtTokenManager.getAccessToken();
-          const existingRefreshToken = import_auth20.jwtTokenManager.getRefreshToken();
+          const existingAccessToken = import_auth21.jwtTokenManager.getAccessToken();
+          const existingRefreshToken = import_auth21.jwtTokenManager.getRefreshToken();
           if (existingAccessToken && existingRefreshToken && !loginResponse2.accessToken) {
             console.log("[AuthModal] Using tokens already stored by iframe-manager");
             loginResponse2 = {
@@ -7161,7 +7157,7 @@ function Social(props) {
             setIsLoading(false);
             return;
           }
-          await import_auth20.jwtTokenManager.clearTokens();
+          await import_auth21.jwtTokenManager.clearTokens();
           if (!loginResponse2.accessToken || !loginResponse2.refreshToken) {
             console.warn(
               "[AuthModal] Authentication tokens were not issued; continuing with cookie-based session only."
@@ -7170,7 +7166,7 @@ function Social(props) {
           let tokensPersisted = false;
           const persistTokensIfAvailable = async () => {
             if (!tokensPersisted && loginResponse2.accessToken && loginResponse2.refreshToken) {
-              await import_auth20.jwtTokenManager.setTokens(loginResponse2);
+              await import_auth21.jwtTokenManager.setTokens(loginResponse2);
               tokensPersisted = true;
             }
           };
@@ -7607,25 +7603,15 @@ function useAuthMenuHandlers() {
   const { config, callbacksRef } = useProviderConfig();
   const qc = (0, import_react_query5.useQueryClient)();
   const pendingLoginResponseRef = (0, import_react15.useRef)(null);
-  const setPage = useLayoutDataStore((st) => st.setPage);
-  const setIsDialogForced = useLayoutStore((st) => st.setIsDialogForced);
   const [telegramCleanup, setTelegramCleanup] = (0, import_react15.useState)(null);
-  const {
-    usePaymaster,
-    publicClient,
-    activeChainId,
-    setError,
-    setStatus,
-    setSession,
-    setAddress,
-    setRecoveryUserId,
-    setHasServerVault,
-    setIsLoading
-  } = useSession();
+  const usePaymaster = useSession((st) => st.usePaymaster);
+  const publicClient = useSession((st) => st.publicClient);
+  const activeChainId = useSession((st) => st.activeChainId);
   const setStep = useAuthStore((st) => st.setStep);
   const setAlert = useAuthStore((st) => st.setAlert);
   const createSessionWithKeyshare = (0, import_react15.useCallback)(
     async (userId, hasServerKeyshare, isNewUser) => {
+      const { setStatus } = useSession.getState();
       try {
         try {
           callbacksRef.current?.onConnecting?.({ method: "wallet" });
@@ -7663,9 +7649,19 @@ function useAuthMenuHandlers() {
         throw error;
       }
     },
-    [setStatus, usePaymaster, activeChainId]
+    [usePaymaster, activeChainId]
   );
   const onAuthSuccess = (0, import_react15.useCallback)(async () => {
+    const {
+      //
+      setSession,
+      setAddress,
+      setStatus,
+      setIsLoading,
+      setError,
+      setHasServerVault,
+      setRecoveryUserId
+    } = useSession.getState();
     setIsLoading(true);
     setStep("loading");
     const loginResponse = pendingLoginResponseRef.current;
@@ -7683,7 +7679,7 @@ function useAuthMenuHandlers() {
       const iframeManager = getIframeManager2();
       await iframeManager.authenticate(userId, loginResponse.avatar, loginResponse.displayName);
       if (loginResponse.accessToken && loginResponse.refreshToken) {
-        await import_auth20.jwtTokenManager.setTokens(loginResponse);
+        await import_auth21.jwtTokenManager.setTokens(loginResponse);
       } else {
         console.warn("[ConnectWalletButton] Login response missing tokens; skipping jwtTokenManager.setTokens");
       }
@@ -7729,11 +7725,11 @@ function useAuthMenuHandlers() {
         if (!!jwt?.isNewUser || !hasKeyshareVaultBackup) {
           if (!!jwt?.isNewUser) console.log("[AuthMenu] New user detected - forcing backup flow");
           if (!hasKeyshareVaultBackup) console.log("[AuthMenu] No recovery data found - forcing backup flow");
-          setIsDialogForced(true);
-          setPage("keysare-backup" /* KEYSARE_BACKUP */);
+          useLayoutStore.getState().setIsDialogForced(true);
+          useLayoutDataStore.getState().setPage("keysare-backup" /* KEYSARE_BACKUP */);
         } else {
-          setIsDialogForced(false);
-          setPage(null);
+          useLayoutStore.getState().setIsDialogForced(false);
+          useLayoutDataStore.getState().setPage(null);
         }
       }, 100);
     } catch (error) {
@@ -7745,12 +7741,10 @@ function useAuthMenuHandlers() {
         setAddress(null);
         setRecoveryUserId(userId);
         setStatus("recovery_needed");
-        setTimeout(() => {
-          setPage("keyshare-restore" /* KEYSHARE_RESTORE */);
-        }, 100);
+        setTimeout(() => useLayoutDataStore.getState().setPage("keyshare-restore" /* KEYSHARE_RESTORE */), 100);
       } else {
         pendingLoginResponseRef.current = null;
-        await import_auth20.jwtTokenManager.clearTokens();
+        await import_auth21.jwtTokenManager.clearTokens();
         setStatus("error");
         setError(error?.message || String(error));
         setAlert({
@@ -7763,20 +7757,7 @@ function useAuthMenuHandlers() {
       setIsLoading(false);
       setStep("signin");
     }
-  }, [
-    qc,
-    setStep,
-    setPage,
-    setError,
-    setStatus,
-    setSession,
-    setAlert,
-    setAddress,
-    setRecoveryUserId,
-    setHasServerVault,
-    setIsDialogForced,
-    createSessionWithKeyshare
-  ]);
+  }, [qc, setStep, setAlert, createSessionWithKeyshare]);
   const goBackToSignIn = (0, import_react15.useCallback)(() => {
     setStep("signin");
     setAlert(null);
@@ -8209,7 +8190,7 @@ var init_AuthMenu = __esm({
         const loginResponse = pendingWalletLogin;
         setPendingWalletLogin(null);
         console.log("[AuthMenu] Processing wallet login response:", loginResponse);
-        import_auth20.jwtTokenManager.clearTokens().then(() => {
+        import_auth21.jwtTokenManager.clearTokens().then(() => {
           pendingLoginResponseRef.current = loginResponse;
           onAuthSuccess();
         });
@@ -9479,7 +9460,7 @@ var init_queryKeys = __esm({
 
 // src/internal/components/BuyMenu/binance/api.ts
 function iframe() {
-  const accessToken = import_auth20.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth21.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     throw new Error("Access token is not available");
   }
@@ -10391,7 +10372,7 @@ var init_binance = __esm({
 
 // src/internal/components/BuyMenu/finchpay/api.ts
 function iframe2() {
-  const accessToken = import_auth20.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth21.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     throw new Error("Access token is not available");
   }
@@ -11633,67 +11614,43 @@ var init_LumiaIcon2 = __esm({
   }
 });
 
-// src/config/networks.ts
-var import_read11, NETWORK_OPTIONS;
+// src/internal/assets/networks/index.ts
+var import_read11, NETWORKS_ICONS;
 var init_networks3 = __esm({
-  "src/config/networks.ts"() {
+  "src/internal/assets/networks/index.ts"() {
+    import_read11 = require("@embarkai/core/read");
     init_ArbitrumIcon();
     init_BaseIcon();
     init_BscIcon();
     init_EthereumIcon();
     init_LumiaIcon2();
-    import_read11 = require("@embarkai/core/read");
-    NETWORK_OPTIONS = [
-      {
-        chainId: import_read11.LUMIA_TESTNET_CHAIN_ID,
-        name: "Lumia Beam",
-        badge: "TESTNET",
-        Icon: LumiaIcon2,
-        isActive: true
-      },
-      {
-        chainId: import_read11.LUMIA_MAINNET_CHAIN_ID,
-        name: "Lumia Prism",
-        badge: "MAINNET",
-        Icon: LumiaIcon2,
-        isActive: true
-      },
-      {
-        chainId: import_read11.SEPOLIA_CHAIN_ID,
-        name: "Sepolia",
-        badge: "TESTNET",
-        Icon: EthereumIcon,
-        isActive: true
-      },
-      {
-        chainId: import_read11.BSC_TESTNET_CHAIN_ID,
-        name: "BSC Testnet",
-        badge: "TESTNET",
-        Icon: BSCIcon,
-        isActive: true
-      },
-      {
-        chainId: import_read11.ARBITRUM_SEPOLIA_CHAIN_ID,
-        name: "Arbitrum Sepolia",
-        badge: "TESTNET",
-        Icon: ArbitrumIcon,
-        isActive: true
-      },
-      {
-        chainId: import_read11.BASE_SEPOLIA_CHAIN_ID,
-        name: "Base Sepolia",
-        badge: "TESTNET",
-        Icon: BaseIcon,
-        isActive: true
-      },
-      {
-        chainId: import_read11.LUMIA_PULSAR_TESTNET_CHAIN_ID,
-        name: "Lumia Pulsar Testnet",
-        badge: "TESTNET",
-        Icon: LumiaIcon2,
-        isActive: true
-      }
-    ];
+    NETWORKS_ICONS = {
+      [import_read11.LUMIA_MAINNET_CHAIN_ID]: LumiaIcon2,
+      [import_read11.LUMIA_TESTNET_CHAIN_ID]: LumiaIcon2,
+      [import_read11.LUMIA_PULSAR_TESTNET_CHAIN_ID]: LumiaIcon2,
+      [import_read11.BASE_SEPOLIA_CHAIN_ID]: BaseIcon,
+      [import_read11.BSC_MAINNET_CHAIN_ID]: BSCIcon,
+      [import_read11.BSC_TESTNET_CHAIN_ID]: BSCIcon,
+      1: EthereumIcon,
+      [import_read11.ARBITRUM_SEPOLIA_CHAIN_ID]: ArbitrumIcon
+    };
+  }
+});
+
+// src/config/networks.ts
+var import_read12, NETWORK_OPTIONS;
+var init_networks4 = __esm({
+  "src/config/networks.ts"() {
+    init_networks3();
+    init_EmbarkIcon();
+    import_read12 = require("@embarkai/core/read");
+    NETWORK_OPTIONS = [...import_read12.SUPPORTED_CHAINS].map(([chainId, chain]) => ({
+      chainId,
+      name: chain.name,
+      badge: import_read12.SUPPORTED_MAINNETS.includes(chainId) ? "MAINNET" : "TESTNET",
+      Icon: NETWORKS_ICONS[chainId] || EmbarkIcon,
+      isActive: true
+    }));
   }
 });
 
@@ -11725,7 +11682,7 @@ var init_truncateMiddle = __esm({
 
 // src/internal/components/ChainsMenu/ChainsMenu.tsx
 function getPaymasterExplorerUrl(chainId, paymasterAddress) {
-  const chainConfig = (0, import_read12.getChainConfig)(chainId);
+  const chainConfig = (0, import_read13.getChainConfig)(chainId);
   const explorerUrl = chainConfig?.blockExplorerUrl;
   if (!explorerUrl) return paymasterAddress;
   return `${explorerUrl.replace(/\/$/, "")}/address/${paymasterAddress}`;
@@ -11742,7 +11699,7 @@ function ChainsMenu() {
   const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const setPage = useLayoutDataStore((st) => st.setPage);
   const visibleNetworks = NETWORK_OPTIONS.filter((option) => option.isActive);
-  const activeChainConfig = activeChainId ? (0, import_read12.getChainConfig)(activeChainId) : null;
+  const activeChainConfig = activeChainId ? (0, import_read13.getChainConfig)(activeChainId) : null;
   const activeDefaultPaymasterAddress = activeChainConfig?.paymasterAddress;
   const activePaymasterQuery = (0, import_react_query15.useQuery)({
     queryKey: ["chain-paymaster", config.current.projectId, activeChainId],
@@ -11883,15 +11840,15 @@ function ChainsMenu() {
     }
   );
 }
-var import_core2, import_read12, import_react_query15, import_lucide_react19, import_react29, import_jsx_runtime48;
+var import_core2, import_read13, import_react_query15, import_lucide_react19, import_react29, import_jsx_runtime48;
 var init_ChainsMenu = __esm({
   "src/internal/components/ChainsMenu/ChainsMenu.tsx"() {
-    init_networks3();
+    init_networks4();
     init_ProviderContext();
     init_SessionContext();
     init_useT();
     import_core2 = require("@embarkai/core");
-    import_read12 = require("@embarkai/core/read");
+    import_read13 = require("@embarkai/core/read");
     import_react_query15 = require("@tanstack/react-query");
     import_lucide_react19 = require("lucide-react");
     import_react29 = require("react");
@@ -11993,7 +11950,7 @@ function ChainSwitchRequest() {
 var import_lucide_react20, import_react30, import_react_i18next2, import_jsx_runtime49;
 var init_ChainSwitchRequest = __esm({
   "src/internal/components/ChainsMenu/ChainSwitchRequest.tsx"() {
-    init_networks3();
+    init_networks4();
     init_ProviderContext();
     init_SessionContext();
     init_useT();
@@ -13441,9 +13398,9 @@ __export(passkey_exports2, {
   linkPasskeyWithWebAuthn: () => linkPasskeyWithWebAuthn
 });
 async function completePasskeyLinking(payload) {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth20.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/complete`, {
+  const response = await (0, import_auth21.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/complete`, {
     method: "POST",
     body: JSON.stringify(payload)
   });
@@ -13453,9 +13410,9 @@ async function completePasskeyLinking(payload) {
   }
 }
 async function beginPasskeyLinking() {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  let res = await (0, import_auth20.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/begin`, { method: "POST" });
+  let res = await (0, import_auth21.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/begin`, { method: "POST" });
   if (res.ok) {
     const begin2 = await res.json();
     const options2 = {
@@ -13483,7 +13440,7 @@ async function beginPasskeyLinking() {
     };
     return { challengeId: begin2.challengeId, options: options2 };
   }
-  res = await (0, import_auth20.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/passkey/options`, { method: "GET" });
+  res = await (0, import_auth21.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 = {
@@ -13515,7 +13472,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_auth20.jwtTokenManager.getUserId();
+  const userId = import_auth21.jwtTokenManager.getUserId();
   if (!userId) throw new Error("No authenticated user");
   let challengeId = null;
   let publicKeyOptions = null;
@@ -13811,36 +13768,39 @@ function useCreateBackup() {
   const session = useSession((st) => st.session);
   const address = useSession((st) => st.address);
   const hasServerVault = useSession((st) => st.hasServerVault);
-  const setIsDialogForced = useLayoutStore((st) => st.setIsDialogForced);
-  const { usePasskey, restorePassword, selectedCloudProvider, setSuccess, setError, setMethod, setIsCreatingPasskey } = useRestoreStore();
+  const usePasskey = useRestoreStore((st) => st.usePasskey);
+  const restorePassword = useRestoreStore((st) => st.restorePassword);
+  const selectedCloudProvider = useRestoreStore((st) => st.selectedCloudProvider);
   (0, import_react36.useEffect)(() => {
     if (!hasServerVault) {
-      setMethod("server");
-      setIsDialogForced(true);
+      useRestoreStore.getState().setMethod("server");
+      useLayoutStore.getState().setIsDialogForced(true);
     }
-  }, [hasServerVault, setIsDialogForced, setMethod]);
+  }, [hasServerVault]);
   const recoveryUserId = useSession((st) => st.recoveryUserId);
   const passportUserId = session?.mpcUserId || recoveryUserId || "";
-  const onBackupSuccess = () => console.log("[ConnectWalletButton] Backup created successfully");
+  const onBackupSuccess = (0, import_react36.useCallback)(() => {
+    console.log("[EMBARKAI BACKUP] Backup created successfully");
+  }, [hasServerVault]);
   const { mutate: createPasswordBackup, isPending: isPasswordBackupCreating } = (0, import_react_query17.useMutation)({
     mutationFn: async () => {
       const iframeManager = getIframeManager();
       if (!iframeManager) {
         throw new Error("Iframe manager not initialized");
       }
-      const jwt = await Promise.resolve().then(() => (init_auth(), auth_exports)).then((m) => m.jwtTokenManager.getTokens());
+      const jwt = import_auth21.jwtTokenManager.getTokens();
       if (!usePasskey && !restorePassword) {
         throw new Error("Please provide a password for the backup");
       }
       const password = !usePasskey ? restorePassword : void 0;
-      const navigateToMainMenu = jwt.isNewUser || !hasServerVault;
-      console.log("[BACKUP STATUS] is new user:", jwt.isNewUser, !hasServerVault, "usePasskey:", usePasskey);
+      console.log("[BACKUP STATUS] is new user:", jwt.isNewUser);
       return {
         response: await iframeManager.createBackup(passportUserId, { method: "server", password }, jwt.accessToken),
-        navigateToMainMenu
+        isNewUser: jwt.isNewUser
       };
     },
-    onSuccess: async ({ response, navigateToMainMenu }) => {
+    onSuccess: async ({ response, isNewUser }) => {
+      const { setError, setSuccess } = useRestoreStore.getState();
       qc.invalidateQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY, address] });
       if (response.success) {
         setError("");
@@ -13848,7 +13808,11 @@ function useCreateBackup() {
         if (typeof window !== "undefined") {
           window.dispatchEvent(
             new CustomEvent("lumia-passport-backup-status-changed", {
-              detail: { method: "server", success: true, navigateToMainMenu }
+              detail: {
+                method: "server",
+                success: true,
+                navigateToNicknameMenu: !!isNewUser
+              }
             })
           );
         }
@@ -13856,9 +13820,10 @@ function useCreateBackup() {
       } else {
         setError(response.error || "Server backup failed");
       }
-      setIsDialogForced(false);
+      useLayoutStore.getState().setIsDialogForced(false);
     },
     onError: async (error) => {
+      const { setError, setSuccess } = useRestoreStore.getState();
       setSuccess("");
       if (error?.name === "NotAllowedError" || error?.message?.includes("timed out or was not allowed")) {
         setError("Passkey selection was cancelled. Please try again or create a new passkey.");
@@ -13887,7 +13852,7 @@ function useCreateBackup() {
     },
     onSuccess: async () => {
       qc.invalidateQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY, address] });
-      setSuccess("Backup file downloaded successfully");
+      useRestoreStore.getState().setSuccess("Backup file downloaded successfully");
       if (typeof window !== "undefined") {
         window.dispatchEvent(
           new CustomEvent("lumia-passport-backup-status-changed", {
@@ -13898,13 +13863,13 @@ function useCreateBackup() {
       onBackupSuccess();
     },
     onError: async (error) => {
-      setError(error?.message || "Backup creation failed");
+      useRestoreStore.getState().setError(error?.message || "Backup creation failed");
       qc.invalidateQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY, address] });
     }
   });
   const { mutate: createPasskey, isPending: isPasskeyCreating } = (0, import_react_query17.useMutation)({
     mutationFn: async () => {
-      setIsCreatingPasskey(true);
+      useRestoreStore.getState().setIsCreatingPasskey(true);
       const { linkPasskeyWithWebAuthn: linkPasskeyWithWebAuthn2 } = await Promise.resolve().then(() => (init_passkey2(), passkey_exports2));
       const { createPasskeyHelpers: createPasskeyHelpers2 } = await Promise.resolve().then(() => (init_passkey(), passkey_exports));
       const { credentialId, rawId } = await linkPasskeyWithWebAuthn2();
@@ -13914,11 +13879,13 @@ function useCreateBackup() {
       return { credentialId, rawId };
     },
     onSuccess: async () => {
+      const { setError, setSuccess, setIsCreatingPasskey } = useRestoreStore.getState();
       setIsCreatingPasskey(false);
       setError(null);
       setSuccess("Passkey created successfully. You can now create a backup.");
     },
     onError: async (error) => {
+      const { setError, setIsCreatingPasskey } = useRestoreStore.getState();
       setIsCreatingPasskey(false);
       if (error.name === "NotAllowedError") {
         setError("Passkey creation cancelled. Please try again.");
@@ -13951,7 +13918,7 @@ function useCreateBackup() {
     },
     onSuccess: async ({ provider, uploadResult }) => {
       console.log("[KeyshareBackup] Cloud backup upload result:", uploadResult);
-      setSuccess(`Successfully created cloud backup on ${provider.name}`);
+      useRestoreStore.getState().setSuccess(`Successfully created cloud backup on ${provider.name}`);
       qc.invalidateQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY, address] });
       if (typeof window !== "undefined") {
         window.dispatchEvent(
@@ -13963,7 +13930,7 @@ function useCreateBackup() {
       onBackupSuccess();
     },
     onError: async (error) => {
-      setError(error?.message || "Backup creation failed");
+      useRestoreStore.getState().setError(error?.message || "Backup creation failed");
       qc.invalidateQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY, address] });
     }
   });
@@ -13984,6 +13951,7 @@ var init_useCreateBackup = __esm({
     init_SessionContext();
     import_react_query17 = require("@tanstack/react-query");
     import_react36 = require("react");
+    init_auth();
     init_useLayoutStore();
     init_iframe_manager();
     init_constants4();
@@ -15093,23 +15061,14 @@ var init_KeyshareRestoreMenu = __esm({
       const qc = (0, import_react_query21.useQueryClient)();
       const { callbacksRef } = useProviderConfig();
       const { t } = useT();
-      const { address, setSession, setAddress, setStatus, setIsLoading } = useSession();
+      const address = useSession((st) => st.address);
       const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
-      const setIsDialogForced = useLayoutStore((st) => st.setIsDialogForced);
-      const setPage = useLayoutDataStore((st) => st.setPage);
-      const {
-        method: currentRestoreMethod,
-        error,
-        success,
-        setError,
-        setShowPassword,
-        setUsePasskey,
-        setRestoreFile,
-        setRestorePassword,
-        setSuccess,
-        setMethod
-      } = useRestoreStore();
+      const error = useRestoreStore((st) => st.error);
+      const success = useRestoreStore((st) => st.success);
+      const currentRestoreMethod = useRestoreStore((st) => st.method);
       (0, import_react43.useEffect)(() => {
+        const { setIsDialogForced } = useLayoutStore.getState();
+        const { setRestorePassword, setRestoreFile, setShowPassword, setUsePasskey, setMethod } = useRestoreStore.getState();
         setIsDialogForced(true);
         return () => {
           setRestorePassword("");
@@ -15136,14 +15095,17 @@ var init_KeyshareRestoreMenu = __esm({
       });
       const hasServerBackup = serverRecoveryStatus?.created || serverRecoveryStatus?.devices?.length > 0;
       (0, import_react43.useEffect)(() => {
-        if (!!hasServerBackup) setMethod("server");
+        if (!!hasServerBackup) useRestoreStore.getState().setMethod("server");
       }, [hasServerBackup]);
       const { mutate: disconnect, isPending: isDisconnecting } = (0, import_react_query21.useMutation)({
         mutationFn: async () => {
+          const { setStatus, setIsLoading } = useSession.getState();
+          const { setError, setMethod } = useRestoreStore.getState();
           setError(null);
           setMethod(null);
           setStatus("disconnecting");
           setIsLoading(true);
+          useLayoutStore.getState().setIsDialogForced(true);
           const { jwtTokenManager: jwtTokenManager4 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
           const userId = jwtTokenManager4.getUserId() || null;
           const { logout: logout2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
@@ -15152,20 +15114,22 @@ var init_KeyshareRestoreMenu = __esm({
         },
         onSuccess: async ({ disconnectedUserId }) => {
           await qc.resetQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY] });
+          const { setStatus, setIsLoading, setSession, setAddress } = useSession.getState();
           setSession(null);
           setAddress(null);
-          setError(null);
           setStatus("idle");
           setIsLoading(false);
-          setIsDialogForced(false);
+          useRestoreStore.getState().setError(null);
+          useLayoutStore.getState().setIsDialogForced(false);
           callbacksRef.current?.onDisconnect?.({ address: "0x", userId: disconnectedUserId });
-          setTimeout(() => setPage("auth" /* AUTH */), 50);
+          setTimeout(() => useLayoutDataStore.getState().setPage("auth" /* AUTH */), 50);
         },
         onError: (err) => {
-          setError(err.message || "An unknown error occurred during sign out");
+          const { setStatus, setIsLoading } = useSession.getState();
           setStatus("idle");
           setIsLoading(false);
-          setIsDialogForced(false);
+          useRestoreStore.getState().setError(err.message || "An unknown error occurred during sign out");
+          useLayoutStore.getState().setIsDialogForced(false);
         }
       });
       const RestoreComponent = currentRestoreMethod ? RESTORE_COMPONENTS[currentRestoreMethod] : null;
@@ -15199,6 +15163,7 @@ var init_KeyshareRestoreMenu = __esm({
                     labels: { checked: t("passport:common.standard"), unchecked: t("passport:common.advanced") },
                     checked: currentRestoreMethod !== "server",
                     onChange: () => {
+                      const { setError, setRestorePassword, setRestoreFile, setMethod } = useRestoreStore.getState();
                       if (!!error) setError(null);
                       if (currentRestoreMethod === "server") {
                         setRestorePassword("");
@@ -15228,6 +15193,15 @@ var init_KeyshareRestoreMenu = __esm({
                 size: "large",
                 variant: "ghost",
                 onClick: () => {
+                  const {
+                    setError,
+                    setShowPassword,
+                    setUsePasskey,
+                    setRestoreFile,
+                    setRestorePassword,
+                    setSuccess,
+                    setMethod
+                  } = useRestoreStore.getState();
                   setError(null);
                   setShowPassword(false);
                   setUsePasskey(false);
@@ -15270,20 +15244,11 @@ function KeyshareBackupMenu() {
   const { t } = useT();
   const setPage = useLayoutDataStore((st) => st.setPage);
   const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
-  const {
-    method: currentBackupMethod,
-    error,
-    success,
-    setSelectedCloudProvider,
-    setSuccess,
-    setError,
-    setRestorePassword,
-    setRestoreFile,
-    setShowPassword,
-    setUsePasskey,
-    setMethod
-  } = useRestoreStore();
+  const currentBackupMethod = useRestoreStore((st) => st.method);
+  const error = useRestoreStore((st) => st.error);
+  const success = useRestoreStore((st) => st.success);
   (0, import_react44.useEffect)(() => {
+    const { setSuccess, setError, setRestorePassword, setRestoreFile, setShowPassword, setUsePasskey, setMethod } = useRestoreStore.getState();
     return () => {
       setSuccess(null);
       setError(null);
@@ -15297,13 +15262,12 @@ function KeyshareBackupMenu() {
   const { data: serverRecoveryStatus, isLoading: isRecoveryLoading } = (0, import_react_query22.useQuery)({
     retry: false,
     enabled: !!address,
-    // Prevent query from running with undefined address
     queryKey: [CHECK_BACKUP_QUERY_KEY, address],
     queryFn: async () => await getShareRecoveryStats()
   });
   const hasRecoveryData = serverRecoveryStatus?.created || serverRecoveryStatus?.devices?.length > 0;
   (0, import_react44.useEffect)(() => {
-    if (!!hasRecoveryData) setMethod("server");
+    if (!!hasRecoveryData) useRestoreStore.getState().setMethod("server");
   }, [hasRecoveryData]);
   const {
     isPasswordBackupCreating,
@@ -15336,6 +15300,16 @@ function KeyshareBackupMenu() {
                 size: "icon",
                 title: "Back",
                 onClick: () => {
+                  const {
+                    setSuccess,
+                    setError,
+                    setRestorePassword,
+                    setRestoreFile,
+                    setShowPassword,
+                    setUsePasskey,
+                    setMethod,
+                    setSelectedCloudProvider
+                  } = useRestoreStore.getState();
                   setRestorePassword("");
                   setRestoreFile(null);
                   setShowPassword(false);
@@ -15358,6 +15332,7 @@ function KeyshareBackupMenu() {
               labels: { checked: t("passport:common.standard"), unchecked: t("passport:common.advanced") },
               checked: currentBackupMethod !== "server",
               onChange: () => {
+                const { setError, setRestorePassword, setRestoreFile, setMethod } = useRestoreStore.getState();
                 if (!!error) setError(null);
                 if (currentBackupMethod === "server") {
                   setRestorePassword("");
@@ -15390,21 +15365,12 @@ function KeyshareBackupMenu() {
           /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(import_lucide_react35.AlertCircle, { className: "h-4 w-4 flex-shrink-0" }),
           /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("span", { className: "block w-full flex-1", children: error })
         ] }),
-        success && /* @__PURE__ */ (0, import_jsx_runtime63.jsxs)(import_jsx_runtime63.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime63.jsxs)(Highlight, { type: "success", className: "flex gap-[var(--ui-kit-gap)]", children: [
+        success && /* @__PURE__ */ (0, import_jsx_runtime63.jsxs)(Highlight, { type: "success", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime63.jsxs)("div", { className: "w-full flex gap-[var(--ui-kit-gap)]", children: [
             /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(import_lucide_react35.CheckCircle2, { className: "h-4 w-4 flex-shrink-0" }),
             /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("span", { className: "block w-full flex-1", children: success })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
-            Button,
-            {
-              variant: "default",
-              size: "large",
-              className: "w-full",
-              onClick: () => setPage("settings" /* SETTINGS */),
-              children: "Done"
-            }
-          )
+          /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(Button, { variant: "default", size: "large", className: "w-full", onClick: () => setPage("settings" /* SETTINGS */), children: t("passport:common.continue") })
         ] })
       ] })
     }
@@ -15839,9 +15805,9 @@ var init_LanguagesMenu2 = __esm({
 
 // src/internal/auth/providers/common.ts
 async function getLinkedProviders() {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth20.authenticatedFetch)(`${getTssUrl3()}/api/auth/providers`, { method: "GET" });
+  const response = await (0, import_auth21.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}`);
@@ -15850,11 +15816,11 @@ async function getLinkedProviders() {
   return data.providers;
 }
 async function unlinkProvider(providerType, externalId) {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.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_auth20.authenticatedFetch)(url, { method: "DELETE" });
+  const response = await (0, import_auth21.authenticatedFetch)(url, { method: "DELETE" });
   if (!response.ok) {
     const errorData = await response.json().catch(() => ({}));
     throw new Error(errorData.message || `Failed to unlink provider: ${response.statusText}`);
@@ -15862,12 +15828,12 @@ async function unlinkProvider(providerType, externalId) {
   try {
     const data = await response.json();
     if (data?.accessToken && data?.refreshToken && data?.expiresIn) {
-      import_auth20.jwtTokenManager.setTokens({
+      import_auth21.jwtTokenManager.setTokens({
         accessToken: data.accessToken,
         refreshToken: data.refreshToken,
-        userId: import_auth20.jwtTokenManager.getUserId() || "",
+        userId: import_auth21.jwtTokenManager.getUserId() || "",
         expiresIn: data.expiresIn,
-        hasKeyshare: import_auth20.jwtTokenManager.getHasKeyshare() ?? false
+        hasKeyshare: import_auth21.jwtTokenManager.getHasKeyshare() ?? false
       });
     }
   } catch {
@@ -15970,7 +15936,7 @@ function useLinkedProfiles() {
       });
       let avatar2 = null;
       try {
-        avatar2 = import_auth20.jwtTokenManager.getAvatar() || null;
+        avatar2 = import_auth21.jwtTokenManager.getAvatar() || null;
       } catch {
         avatar2 = null;
       }
@@ -16135,9 +16101,9 @@ var init_EmailForm = __esm({
 
 // src/internal/auth/providers/email.ts
 async function sendEmailLinkCode(email) {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth20.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/email/send-code`, {
+  const response = await (0, import_auth21.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/email/send-code`, {
     method: "POST",
     body: JSON.stringify({ email })
   });
@@ -16147,9 +16113,9 @@ async function sendEmailLinkCode(email) {
   }
 }
 async function verifyEmailLinkCode(email, code) {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth20.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/email/verify-code`, {
+  const response = await (0, import_auth21.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/email/verify-code`, {
     method: "POST",
     credentials: "include",
     body: JSON.stringify({ email, code })
@@ -16435,7 +16401,7 @@ var init_AddProvider = __esm({
 
 // src/internal/components/ManageWalletMenu/EmailNotConnectedWarning.tsx
 function EmailNotConnectedWarning() {
-  const providers = import_auth20.jwtTokenManager.getProviders();
+  const providers = import_auth21.jwtTokenManager.getProviders();
   const hasEmail = providers.includes("email");
   const { t } = useT();
   const config = useProviderConfig().config;
@@ -16502,11 +16468,11 @@ function useLinkSocial() {
           mode: "link"
         };
         try {
-          await (0, import_auth20.ensureValidToken)();
+          await (0, import_auth21.ensureValidToken)();
         } catch (tokenError) {
           console.warn("[ManageWallet] ensureValidToken failed before linking", tokenError);
         }
-        const accessToken = import_auth20.jwtTokenManager.getAccessToken();
+        const accessToken = import_auth21.jwtTokenManager.getAccessToken();
         if (accessToken) {
           authConfig.token = accessToken;
         }
@@ -16573,7 +16539,7 @@ var init_useLinkSocial = __esm({
 
 // src/internal/auth/providers/telegram.ts
 async function linkTelegram(telegramData) {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
   const formattedData = {
     id: telegramData.id,
@@ -16584,7 +16550,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_auth20.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/telegram`, {
+  const response = await (0, import_auth21.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/telegram`, {
     method: "POST",
     body: JSON.stringify(formattedData)
   });
@@ -17604,7 +17570,7 @@ var init_NicknameMenu2 = __esm({
 function getCachedPublicClient(chainId) {
   const cachedClient = publicClientByChainId.get(chainId);
   if (cachedClient) return cachedClient;
-  const publicClient = (0, import_read13.createPublicClientForChain)(chainId);
+  const publicClient = (0, import_read14.createPublicClientForChain)(chainId);
   publicClientByChainId.set(chainId, publicClient);
   return publicClient;
 }
@@ -17616,7 +17582,7 @@ function useResolvedPublicClient(chainId, logScope = "useResolvedPublicClient")
   const shouldUseActiveClient = !chainId || chainId === activeChainId;
   const chainConfig = (0, import_react56.useMemo)(() => {
     if (shouldUseActiveClient) return activeChainConfig;
-    return (0, import_read13.getChainConfig)(chainId);
+    return (0, import_read14.getChainConfig)(chainId);
   }, [activeChainConfig, chainId, shouldUseActiveClient]);
   const publicClient = (0, import_react56.useMemo)(() => {
     if (shouldUseActiveClient) return activePublicClient;
@@ -17635,11 +17601,11 @@ function useResolvedPublicClient(chainId, logScope = "useResolvedPublicClient")
     resolvedChainId
   };
 }
-var import_read13, import_react56, publicClientByChainId;
+var import_read14, import_react56, publicClientByChainId;
 var init_useResolvedPublicClient = __esm({
   "src/internal/hooks/useResolvedPublicClient.ts"() {
     init_SessionContext();
-    import_read13 = require("@embarkai/core/read");
+    import_read14 = require("@embarkai/core/read");
     import_react56 = require("react");
     publicClientByChainId = /* @__PURE__ */ new Map();
   }
@@ -19095,8 +19061,8 @@ function SecurityMenu() {
   const { t } = useT();
   const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const setPage = useLayoutDataStore((st) => st.setPage);
-  const userId = import_auth20.jwtTokenManager.getUserId();
-  const serverHasKeyshare = import_auth20.jwtTokenManager.getHasKeyshare() ?? false;
+  const userId = import_auth21.jwtTokenManager.getUserId();
+  const serverHasKeyshare = import_auth21.jwtTokenManager.getHasKeyshare() ?? false;
   const [appToUntrust, untrustApp] = (0, import_react62.useState)(null);
   const { data: recoveryData, isLoading: isRecoveryLoading } = useKeyshareRecoveryStats();
   const localInfo = recoveryData?.keyshareInfo || {};
@@ -19217,9 +19183,9 @@ async function walletLogin(walletData) {
   return response.json();
 }
 async function linkWallet(walletData) {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth20.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/wallet`, {
+  const response = await (0, import_auth21.authenticatedFetch)(`${getTssUrl3()}/api/auth/link/wallet`, {
     method: "POST",
     body: JSON.stringify(walletData)
   });
@@ -19229,9 +19195,9 @@ async function linkWallet(walletData) {
   }
 }
 async function unlinkWallet(address) {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
-  const response = await (0, import_auth20.authenticatedFetch)(
+  const response = await (0, import_auth21.authenticatedFetch)(
     `${getTssUrl3()}/api/auth/unlink/wallet?address=${encodeURIComponent(address)}`,
     {
       method: "DELETE"
@@ -19325,23 +19291,23 @@ var init_useFlowSelector = __esm({
 });
 
 // src/internal/components/SendMenu/hyperbridge/lib/chains.ts
-var import_read14, import_chains, CHAINS_UI_META;
+var import_read15, import_chains, CHAINS_UI_META;
 var init_chains = __esm({
   "src/internal/components/SendMenu/hyperbridge/lib/chains.ts"() {
     init_EthereumIcon();
     init_LumiaIcon2();
     init_BscIcon();
-    import_read14 = require("@embarkai/core/read");
+    import_read15 = require("@embarkai/core/read");
     import_chains = require("wagmi/chains");
     CHAINS_UI_META = {
       lumiaprism: {
-        chainID: import_read14.lumiaMainnetChain.id,
-        chainLabel: import_read14.lumiaMainnetChain.name,
+        chainID: import_read15.lumiaMainnetChain.id,
+        chainLabel: import_read15.lumiaMainnetChain.name,
         chainName: "lumiaprism",
         // exact hyperlane registry chain name
         Icon: LumiaIcon2,
-        explorerUrl: import_read14.lumiaMainnetChain.blockExplorers.default.url,
-        chain: import_read14.lumiaMainnetChain
+        explorerUrl: import_read15.lumiaMainnetChain.blockExplorers.default.url,
+        chain: import_read15.lumiaMainnetChain
       },
       bsc: {
         chainID: import_chains.bsc.id,
@@ -19750,7 +19716,7 @@ var init_useAvailableSenders = __esm({
 
 // src/internal/components/SendMenu/hyperbridge/api.ts
 function iframe3() {
-  const accessToken = import_auth20.jwtTokenManager.getAccessToken();
+  const accessToken = import_auth21.jwtTokenManager.getAccessToken();
   if (!accessToken) {
     throw new Error("Access token is not available");
   }
@@ -19815,7 +19781,7 @@ var init_api3 = __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_read16.getChainConfig)(targetChainId);
   if (!chainConfig) {
     throw new Error(`Chain ${targetChainId} is not supported`);
   }
@@ -19843,19 +19809,19 @@ async function getUserOperationByHash(userOpHash, chainId) {
     return null;
   }
 }
-var import_core3, import_read15;
+var import_core3, import_read16;
 var init_getUserOperationByHash = __esm({
   "src/clients/bundler/getUserOperationByHash.ts"() {
     init_SessionContext();
     import_core3 = require("@embarkai/core");
-    import_read15 = require("@embarkai/core/read");
+    import_read16 = 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_read17.getChainConfig)(targetChainId);
   if (!chainConfig) {
     throw new Error(`Chain ${targetChainId} is not supported`);
   }
@@ -19889,12 +19855,12 @@ async function getUserOperationReceipt(userOpHash, chainId) {
     return null;
   }
 }
-var import_core4, import_read16;
+var import_core4, import_read17;
 var init_getUserOperationReceipt = __esm({
   "src/clients/bundler/getUserOperationReceipt.ts"() {
     init_SessionContext();
     import_core4 = require("@embarkai/core");
-    import_read16 = require("@embarkai/core/read");
+    import_read17 = require("@embarkai/core/read");
   }
 });
 
@@ -20062,7 +20028,7 @@ function isOririnChainEmbarkSupported(originChain) {
 var import_viem12;
 var init_utils8 = __esm({
   "src/internal/components/SendMenu/hyperbridge/utils.ts"() {
-    init_networks3();
+    init_networks4();
     import_viem12 = require("viem");
     init_chains();
   }
@@ -23313,27 +23279,27 @@ function getHistoryUrls(params) {
   }
   return getBlockscoutHistoryUrls(params);
 }
-var import_read17, ETHERSCAN_V2_API_URL, BLOCKSCOUT_API_URLS, CHAIN_SPECIFIC_API_URLS, ETHERSCAN_CHAINS, UNSUPPORTED_HISTORY_CHAINS, TX_HISTORY_URLS;
+var import_read18, ETHERSCAN_V2_API_URL, BLOCKSCOUT_API_URLS, CHAIN_SPECIFIC_API_URLS, ETHERSCAN_CHAINS, UNSUPPORTED_HISTORY_CHAINS, TX_HISTORY_URLS;
 var init_txUrls = __esm({
   "src/internal/components/TransactionsMenu/txUrls.ts"() {
-    import_read17 = require("@embarkai/core/read");
+    import_read18 = require("@embarkai/core/read");
     init_base();
     ETHERSCAN_V2_API_URL = "https://api.etherscan.io/v2/api";
     BLOCKSCOUT_API_URLS = {
-      [import_read17.ARBITRUM_SEPOLIA_CHAIN_ID]: "https://arbitrum-sepolia.blockscout.com/api",
-      [import_read17.BASE_SEPOLIA_CHAIN_ID]: "https://base-sepolia.blockscout.com/api"
+      [import_read18.ARBITRUM_SEPOLIA_CHAIN_ID]: "https://arbitrum-sepolia.blockscout.com/api",
+      [import_read18.BASE_SEPOLIA_CHAIN_ID]: "https://base-sepolia.blockscout.com/api"
     };
     CHAIN_SPECIFIC_API_URLS = {};
     ETHERSCAN_CHAINS = /* @__PURE__ */ new Set([
-      import_read17.SEPOLIA_CHAIN_ID,
-      import_read17.ARBITRUM_SEPOLIA_CHAIN_ID,
-      import_read17.BASE_SEPOLIA_CHAIN_ID
+      import_read18.SEPOLIA_CHAIN_ID,
+      import_read18.ARBITRUM_SEPOLIA_CHAIN_ID,
+      import_read18.BASE_SEPOLIA_CHAIN_ID
     ]);
     UNSUPPORTED_HISTORY_CHAINS = /* @__PURE__ */ new Set([
-      import_read17.BSC_TESTNET_CHAIN_ID
+      import_read18.BSC_TESTNET_CHAIN_ID
     ]);
     TX_HISTORY_URLS = {
-      [import_read17.LUMIA_TESTNET_CHAIN_ID]: (p) => {
+      [import_read18.LUMIA_TESTNET_CHAIN_ID]: (p) => {
         const result = getBlockscoutHistoryUrls(p);
         return {
           transactionsUrl: result.transactionsUrl,
@@ -23341,7 +23307,7 @@ var init_txUrls = __esm({
           tokenTransfersUrl: result.tokenTransfersUrl
         };
       },
-      [import_read17.LUMIA_MAINNET_CHAIN_ID]: (p) => {
+      [import_read18.LUMIA_MAINNET_CHAIN_ID]: (p) => {
         const result = getBlockscoutHistoryUrls(p);
         return {
           transactionsUrl: result.transactionsUrl,
@@ -24456,7 +24422,7 @@ var init_usePageMapper = __esm({
 function useSettingsNotifications() {
   const address = useSession((st) => st.address);
   const setSettingsNotifications = useLayoutDataStore((st) => st.setSettingsNotifications);
-  const providers = import_auth20.jwtTokenManager.getProviders();
+  const providers = import_auth21.jwtTokenManager.getProviders();
   const hasEmail = providers.includes("email");
   const { data: userProfile = null } = (0, import_react_query51.useQuery)({
     retry: false,
@@ -24506,7 +24472,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.46",
+      version: "0.4.47",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -24607,25 +24573,39 @@ var init_package = __esm({
 function Footer() {
   const qc = (0, import_react_query52.useQueryClient)();
   const { callbacksRef } = useProviderConfig();
-  const { address, setSession, setAddress, setStatus, setError, setIsLoading } = useSession();
-  const chainConfig = useSession((st) => st.chainConfig);
   const { t } = useT();
-  const setPage = useLayoutDataStore((st) => st.setPage);
-  const setIsDialogForced = useLayoutStore((st) => st.setIsDialogForced);
+  const address = useSession((st) => st.address);
+  const chainConfig = useSession((st) => st.chainConfig);
+  const directWalletAddress = useExternalWalletStore((st) => st.externalAddress);
+  const { disconnect: wagmiDisconnect } = (0, import_wagmi6.useDisconnect)({
+    mutation: {
+      onSuccess: () => {
+        useExternalWalletStore.getState().clearExternalWallet();
+        useExternalWalletStore.getState().setExternalChainId(null);
+        console.log("[ExternalWalletStore] Disconnected from external wallet");
+      },
+      onError: (err) => {
+        console.error("[ExternalWalletStore] Error disconnecting from external wallet:", err);
+      }
+    }
+  });
   const { mutate: disconnect, isPending: isDisconnecting } = (0, import_react_query52.useMutation)({
     mutationFn: async (disconnectAddress) => {
       if (!disconnectAddress) throw new Error("No address to disconnect");
-      setIsDialogForced(true);
+      const { setError, setStatus, setIsLoading } = useSession.getState();
+      useLayoutStore.getState().setIsDialogForced(true);
       setError(null);
       setStatus("disconnecting");
       setIsLoading(true);
-      const userId = import_auth20.jwtTokenManager.getUserId() || null;
+      const userId = import_auth21.jwtTokenManager.getUserId() || null;
       const { logout: logout2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
       await logout2();
       return { disconnectedUserId: userId, disconnectAddress };
     },
     onSuccess: async ({ disconnectAddress, disconnectedUserId }) => {
       await qc.resetQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY] });
+      if (!!directWalletAddress) wagmiDisconnect();
+      const { setError, setStatus, setIsLoading, setSession, setAddress } = useSession.getState();
       setSession(null);
       setAddress(null);
       setError(null);
@@ -24633,15 +24613,16 @@ function Footer() {
       setIsLoading(false);
       callbacksRef.current?.onDisconnect?.({ address: disconnectAddress, userId: disconnectedUserId });
       setTimeout(() => {
-        setPage("auth" /* AUTH */);
-        setIsDialogForced(false);
+        useLayoutDataStore.getState().setPage("auth" /* AUTH */);
+        useLayoutStore.getState().setIsDialogForced(false);
       }, 200);
     },
     onError: (err) => {
+      const { setError, setStatus, setIsLoading } = useSession.getState();
       setError(err.message || "An unknown error occurred during sign out");
       setStatus("idle");
       setIsLoading(false);
-      setIsDialogForced(false);
+      useLayoutStore.getState().setIsDialogForced(false);
     }
   });
   const ChainIcon = NETWORK_OPTIONS.find((net) => net.chainId === chainConfig.id)?.Icon || (() => /* @__PURE__ */ (0, import_jsx_runtime116.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_runtime116.jsx)("span", { className: "text-[var(--ui-kit-fg-inverted)] text-xs font-bold", children: chainConfig.name.charAt(0) }) }));
@@ -24694,21 +24675,23 @@ function Footer() {
     }
   );
 }
-var import_react_query52, import_lucide_react76, import_jsx_runtime116;
+var import_react_query52, import_lucide_react76, import_wagmi6, import_jsx_runtime116;
 var init_Footer = __esm({
   "src/internal/components/Footer/Footer.tsx"() {
     init_package();
-    init_networks3();
+    init_networks4();
     init_ProviderContext();
     init_SessionContext();
     init_i18n();
     import_react_query52 = require("@tanstack/react-query");
     import_lucide_react76 = require("lucide-react");
+    import_wagmi6 = require("wagmi");
     init_auth();
     init_base();
     init_useLayoutDataStore();
     init_useLayoutStore();
     init_utils2();
+    init_useExternalWalletStore();
     init_constants4();
     init_button();
     import_jsx_runtime116 = require("react/jsx-runtime");
@@ -24761,8 +24744,8 @@ function Header() {
     queryKey: [QUERY_KEYS.userProfile, address],
     queryFn: getUserProfile
   });
-  const avatar = profile?.avatar || import_auth20.jwtTokenManager.getAvatar();
-  const displayName = profile?.nicknameDisplay || profile?.displayName || import_auth20.jwtTokenManager.getDisplayName();
+  const avatar = profile?.avatar || import_auth21.jwtTokenManager.getAvatar();
+  const displayName = profile?.nicknameDisplay || profile?.displayName || import_auth21.jwtTokenManager.getDisplayName();
   const ChainIcon = NETWORK_OPTIONS.find((net) => net.chainId === chainConfig.id)?.Icon || (() => /* @__PURE__ */ (0, import_jsx_runtime117.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_runtime117.jsx)("span", { className: "text-[var(--ui-kit-fg-inverted)] text-xs font-bold", children: chainConfig.name.charAt(0) }) }));
   return /* @__PURE__ */ (0, import_jsx_runtime117.jsxs)(
     "div",
@@ -24841,7 +24824,7 @@ var import_react_query53, import_lucide_react77, import_react85, import_jsx_runt
 var init_Header = __esm({
   "src/internal/components/Header/Header.tsx"() {
     init_LumiaIcon3();
-    init_networks3();
+    init_networks4();
     init_ProviderContext();
     init_SessionContext();
     init_useT();
@@ -25181,10 +25164,10 @@ function WalletConnectHandler() {
   const qc = (0, import_react_query54.useQueryClient)();
   const { callbacksRef } = useProviderConfig();
   const passportWalletAddress = useSession((st) => st.address);
-  const { address: walletAddress, isConnected, chain, connector } = (0, import_wagmi6.useAccount)();
+  const { address: walletAddress, isConnected, chain, connector } = (0, import_wagmi7.useAccount)();
   const { openConnectModal, connectModalOpen } = (0, import_rainbowkit2.useConnectModal)();
-  const { disconnect } = (0, import_wagmi6.useDisconnect)();
-  const { signMessageAsync } = (0, import_wagmi6.useSignMessage)();
+  const { disconnect } = (0, import_wagmi7.useDisconnect)();
+  const { signMessageAsync } = (0, import_wagmi7.useSignMessage)();
   const isWalletLinking = useLayoutDataStore((st) => st.isWalletLinking);
   const setPage = useLayoutDataStore((st) => st.setPage);
   const setIsWalletLinking = useLayoutDataStore((st) => st.setIsWalletLinking);
@@ -25439,7 +25422,7 @@ function WalletConnectHandler() {
   ]);
   return null;
 }
-var import_rainbowkit2, import_react_query54, import_react89, import_wagmi6;
+var import_rainbowkit2, import_react_query54, import_react89, import_wagmi7;
 var init_WalletConnectHandler = __esm({
   "src/internal/components/WalletConnectHandler.tsx"() {
     init_ProviderContext();
@@ -25448,7 +25431,7 @@ var init_WalletConnectHandler = __esm({
     import_rainbowkit2 = require("@rainbow-me/rainbowkit");
     import_react_query54 = require("@tanstack/react-query");
     import_react89 = __toESM(require("react"), 1);
-    import_wagmi6 = require("wagmi");
+    import_wagmi7 = require("wagmi");
     init_wallet();
     init_AuthMenu2();
     init_useLayoutDataStore();
@@ -25460,7 +25443,7 @@ var init_WalletConnectHandler = __esm({
 // src/internal/components/DirectWalletHandler.tsx
 function DirectWalletHandler() {
   const walletMode = useProviderConfig().config.current?.wallet?.mode || "linked";
-  const { address, isConnected, chain, connector } = (0, import_wagmi7.useAccount)();
+  const { address, isConnected, chain, connector } = (0, import_wagmi8.useAccount)();
   const isExternalConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const externalAddress = useExternalWalletStore((st) => st.externalAddress);
   const setExternalWallet = useExternalWalletStore((st) => st.setExternalWallet);
@@ -25504,11 +25487,11 @@ function DirectWalletHandler() {
   }, [address, isConnected, isExternalConnected, externalAddress, chain?.id, connector, setExternalWallet]);
   return null;
 }
-var import_react90, import_wagmi7;
+var import_react90, import_wagmi8;
 var init_DirectWalletHandler = __esm({
   "src/internal/components/DirectWalletHandler.tsx"() {
     import_react90 = require("react");
-    import_wagmi7 = require("wagmi");
+    import_wagmi8 = require("wagmi");
     init_ProviderContext();
     init_useExternalWalletStore();
   }
@@ -25519,9 +25502,9 @@ function getChainParams(chainCfg) {
   return {
     activeChainId: chainCfg.id,
     chainConfig: chainCfg,
-    publicClient: (0, import_read18.createPublicClientForChain)(chainCfg.id),
-    bundlerClient: (0, import_read18.createBundlerClientForChain)(chainCfg.id),
-    viemChain: (0, import_read18.getViemChain)(chainCfg.id)
+    publicClient: (0, import_read19.createPublicClientForChain)(chainCfg.id),
+    bundlerClient: (0, import_read19.createBundlerClientForChain)(chainCfg.id),
+    viemChain: (0, import_read19.getViemChain)(chainCfg.id)
   };
 }
 function waitForStoreHydration() {
@@ -25547,10 +25530,10 @@ function SessionProvider({ children }) {
     /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Dialog2, {})
   ] });
 }
-var import_read18, import_react91, import_zustand13, import_middleware4, import_jsx_runtime121, useSession, requireActiveChainId;
+var import_read19, import_react91, import_zustand13, import_middleware4, import_jsx_runtime121, useSession, requireActiveChainId;
 var init_SessionContext = __esm({
   "src/context/SessionContext.tsx"() {
-    import_read18 = require("@embarkai/core/read");
+    import_read19 = require("@embarkai/core/read");
     import_react91 = require("react");
     import_zustand13 = require("zustand");
     import_middleware4 = require("zustand/middleware");
@@ -25622,7 +25605,7 @@ var init_SessionContext = __esm({
           // Set default chainId after hydration if not persisted
           onRehydrateStorage: () => (state) => {
             if (!state) return;
-            const hydartedChain = getChainParams((0, import_read18.getChainConfig)(state.activeChainId || import_read18.DEFAULT_CHAIN_ID));
+            const hydartedChain = getChainParams((0, import_read19.getChainConfig)(state.activeChainId || import_read19.DEFAULT_CHAIN_ID));
             state.activeChainId = hydartedChain.activeChainId;
             state.publicClient = hydartedChain.publicClient;
             state.bundlerClient = hydartedChain.bundlerClient;
@@ -25697,31 +25680,31 @@ function getExplorerUrl() {
   const paramUrl = typeof window !== "undefined" ? new URLSearchParams(window.location.search).get("explorerUrl") || void 0 : void 0;
   const net = getSelectedNetwork();
   const chainId = requireActiveChainId();
-  const chainConfig = (0, import_read19.getChainConfig)(chainId);
+  const chainConfig = (0, import_read20.getChainConfig)(chainId);
   console.log("[getExplorerUrl] ", paramUrl, chainConfig.blockExplorerUrl);
   return paramUrl || chainConfig.blockExplorerUrl;
 }
 function getBundlerClient() {
   const chainId = requireActiveChainId();
-  const chainConfig = (0, import_read19.getChainConfig)(chainId);
-  const viemChain = (0, import_read19.getViemChain)(chainId);
+  const chainConfig = (0, import_read20.getChainConfig)(chainId);
+  const viemChain = (0, import_read20.getViemChain)(chainId);
   return (0, import_account_abstraction2.createBundlerClient)({
     chain: viemChain,
     transport: (0, import_viem19.http)(chainConfig.bundlerUrl, { timeout: 1e4, retryCount: 0, fetchOptions: { mode: "cors" } })
   });
 }
-var import_read19, import_viem19, import_account_abstraction2, BUILD_NETWORK, lumiaBeamTestnet, lumiaPrisma, FUNDER_PK;
+var import_read20, import_viem19, import_account_abstraction2, BUILD_NETWORK, lumiaBeamTestnet, lumiaPrisma, FUNDER_PK;
 var init_base = __esm({
   "src/internal/clients/base.ts"() {
     init_initial();
     init_SessionContext();
-    import_read19 = require("@embarkai/core/read");
+    import_read20 = require("@embarkai/core/read");
     import_viem19 = require("viem");
     import_account_abstraction2 = require("viem/account-abstraction");
     init_env();
     BUILD_NETWORK = true ? "" : "";
-    lumiaBeamTestnet = import_read19.lumiaTestnetChain;
-    lumiaPrisma = import_read19.lumiaMainnetChain;
+    lumiaBeamTestnet = import_read20.lumiaTestnetChain;
+    lumiaPrisma = import_read20.lumiaMainnetChain;
     FUNDER_PK = getEnvVar("VITE_FUNDER_PK") || "";
   }
 });
@@ -26441,7 +26424,7 @@ var init_vaultClient = __esm({
 
 // src/internal/auth/keyshare.ts
 async function checkKeyshareStatusWithSync(userId) {
-  const serverHasKeyshare = await (0, import_auth20.syncKeyshareStatus)();
+  const serverHasKeyshare = await (0, import_auth21.syncKeyshareStatus)();
   return checkKeyshareStatus(userId, serverHasKeyshare);
 }
 async function checkKeyshareStatus(userId, serverHasKeyshare) {
@@ -26475,7 +26458,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_auth20.syncKeyshareStatus)();
+  await (0, import_auth21.syncKeyshareStatus)();
   onProgress?.("Key management setup complete");
   return { ownerAddress: result.ownerAddress };
 }
@@ -26560,7 +26543,7 @@ var init_keyshare = __esm({
 
 // src/internal/auth/providers/x.ts
 async function linkX() {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.ensureValidToken)();
   if (!hasValidToken) throw new Error("No authentication token available");
   throw new Error('Use openSocialAuthPopup("x") to link X account');
 }
@@ -26568,10 +26551,10 @@ async function loginWithX() {
   throw new Error('Use openSocialAuthPopup("x") to login with X account');
 }
 async function unlinkX(externalId) {
-  const hasValidToken = await (0, import_auth20.ensureValidToken)();
+  const hasValidToken = await (0, import_auth21.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_auth20.authenticatedFetch)(url, {
+  const response = await (0, import_auth21.authenticatedFetch)(url, {
     method: "DELETE"
   });
   if (!response.ok) {
@@ -26602,9 +26585,9 @@ var init_providers = __esm({
 // src/internal/auth/index.ts
 var auth_exports = {};
 __export(auth_exports, {
-  JwtTokenManager: () => import_auth20.JwtTokenManager,
+  JwtTokenManager: () => import_auth21.JwtTokenManager,
   authenticateWithPasskey: () => authenticateWithPasskey,
-  authenticatedFetch: () => import_auth20.authenticatedFetch,
+  authenticatedFetch: () => import_auth21.authenticatedFetch,
   beginPasskeyAuthentication: () => beginPasskeyAuthentication,
   beginPasskeyLinking: () => beginPasskeyLinking,
   beginPasskeyRegistration: () => beginPasskeyRegistration,
@@ -26614,53 +26597,53 @@ __export(auth_exports, {
   completePasskeyAuthentication: () => completePasskeyAuthentication,
   completePasskeyLinking: () => completePasskeyLinking,
   completePasskeyRegistration: () => completePasskeyRegistration,
-  configureJwtModule: () => import_auth20.configureJwtModule,
+  configureJwtModule: () => import_auth21.configureJwtModule,
   createInitialAuthState: () => createInitialAuthState,
-  createJwtTokenManager: () => import_auth20.createJwtTokenManager,
+  createJwtTokenManager: () => import_auth21.createJwtTokenManager,
   createLoginMessage: () => createLoginMessage,
   createPasskeyHelpers: () => createPasskeyHelpers,
   createSignatureMessage: () => createSignatureMessage,
   deriveDemoPrivateKey: () => deriveDemoPrivateKey,
   ensureKeyshare: () => ensureKeyshare,
-  ensureValidToken: () => import_auth20.ensureValidToken,
+  ensureValidToken: () => import_auth21.ensureValidToken,
   fetchProjectName: () => fetchProjectName,
   formatDate: () => formatDate,
   getKeyshareInfo: () => getKeyshareInfo,
   getLinkedProviders: () => getLinkedProviders,
   getProviderDisplayInfo: () => getProviderDisplayInfo,
   getTssUrl: () => getTssUrl3,
-  getValidTokens: () => import_auth20.getValidTokens,
+  getValidTokens: () => import_auth21.getValidTokens,
   hasAvailablePasskeys: () => hasAvailablePasskeys,
   hideTelegramWidget: () => hideTelegramWidget,
   initTelegramWidget: () => initTelegramWidget,
   isWebAuthnSupported: () => isWebAuthnSupported,
-  jwtTokenManager: () => import_auth20.jwtTokenManager,
+  jwtTokenManager: () => import_auth21.jwtTokenManager,
   linkPasskeyWithWebAuthn: () => linkPasskeyWithWebAuthn,
   linkTelegram: () => linkTelegram,
   linkWallet: () => linkWallet,
   linkX: () => linkX,
-  loginWithEmail: () => import_auth20.loginWithEmail,
-  loginWithTelegram: () => import_auth20.loginWithTelegram,
-  loginWithUserId: () => import_auth20.loginWithUserId,
+  loginWithEmail: () => import_auth21.loginWithEmail,
+  loginWithTelegram: () => import_auth21.loginWithTelegram,
+  loginWithUserId: () => import_auth21.loginWithUserId,
   loginWithX: () => loginWithX,
-  logout: () => import_auth20.logout,
+  logout: () => import_auth21.logout,
   mountTelegramLoginWidget: () => mountTelegramLoginWidget,
   registerPasskey: () => registerPasskey,
   resetWebAuthnFlags: () => resetWebAuthnFlags,
   sendEmailLinkCode: () => sendEmailLinkCode,
   showTelegramWidget: () => showTelegramWidget,
-  syncKeyshareStatus: () => import_auth20.syncKeyshareStatus,
+  syncKeyshareStatus: () => import_auth21.syncKeyshareStatus,
   unlinkProvider: () => unlinkProvider,
   unlinkWallet: () => unlinkWallet,
   unlinkX: () => unlinkX,
   verifyEmailLinkCode: () => verifyEmailLinkCode,
-  verifyToken: () => import_auth20.verifyToken,
+  verifyToken: () => import_auth21.verifyToken,
   walletLogin: () => walletLogin
 });
-var import_auth20, createInitialAuthState;
+var import_auth21, createInitialAuthState;
 var init_auth = __esm({
   "src/internal/auth/index.ts"() {
-    import_auth20 = require("@embarkai/core/auth");
+    import_auth21 = require("@embarkai/core/auth");
     init_passkeyAuth();
     init_telegram();
     init_passkey();
@@ -27962,13 +27945,13 @@ var init_iframe_manager = __esm({
 });
 
 // src/config/rainbowkit.ts
-var import_read20, import_rainbowkit3, import_wallets2, import_wagmi8, import_chains12, getProjectId2, WALLET_MAP, getWagmiStorageKey, buildRainbowChains, createRainbowConfig, rainbowTheme;
+var import_read21, import_rainbowkit3, import_wallets2, import_wagmi9, import_chains12, getProjectId2, WALLET_MAP, getWagmiStorageKey, buildRainbowChains, createRainbowConfig, rainbowTheme;
 var init_rainbowkit = __esm({
   "src/config/rainbowkit.ts"() {
-    import_read20 = require("@embarkai/core/read");
+    import_read21 = require("@embarkai/core/read");
     import_rainbowkit3 = require("@rainbow-me/rainbowkit");
     import_wallets2 = require("@rainbow-me/rainbowkit/wallets");
-    import_wagmi8 = require("wagmi");
+    import_wagmi9 = require("wagmi");
     import_chains12 = require("wagmi/chains");
     getProjectId2 = (configProjectId) => {
       if (configProjectId) return configProjectId;
@@ -27992,8 +27975,8 @@ var init_rainbowkit = __esm({
     };
     buildRainbowChains = (supportedChains, preferredChainId) => {
       const availableChains = [
-        import_read20.lumiaMainnetChain,
-        import_read20.lumiaTestnetChain,
+        import_read21.lumiaMainnetChain,
+        import_read21.lumiaTestnetChain,
         import_chains12.mainnet,
         import_chains12.polygon,
         import_chains12.bsc,
@@ -28019,7 +28002,7 @@ var init_rainbowkit = __esm({
         appName: "EmbarkAI Wallet",
         projectId: getProjectId2(opts.projectId),
         chains: buildRainbowChains(opts.supportedChains, opts.preferredChainId),
-        storage: (0, import_wagmi8.createStorage)({ key: getWagmiStorageKey(opts) }),
+        storage: (0, import_wagmi9.createStorage)({ key: getWagmiStorageKey(opts) }),
         ssr: false
       };
       if (opts.allowedWallets && opts.allowedWallets.length > 0) {
@@ -28249,14 +28232,14 @@ function RainbowKitProvider({ children }) {
     };
   }, [colorMode]);
   if (!config.current?.wallet?.enabled) return /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_jsx_runtime122.Fragment, { children });
-  return /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_wagmi9.WagmiProvider, { config: rainbowConfig, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_rainbowkit4.RainbowKitProvider, { theme: customTheme, modalSize: "compact", showRecentTransactions: true, children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_wagmi10.WagmiProvider, { config: rainbowConfig, children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(import_rainbowkit4.RainbowKitProvider, { theme: customTheme, modalSize: "compact", showRecentTransactions: true, children }) });
 }
-var import_rainbowkit4, import_react92, import_wagmi9, import_styles, import_jsx_runtime122;
+var import_rainbowkit4, import_react92, import_wagmi10, import_styles, import_jsx_runtime122;
 var init_RainbowKitContext = __esm({
   "src/context/RainbowKitContext.tsx"() {
     import_rainbowkit4 = require("@rainbow-me/rainbowkit");
     import_react92 = require("react");
-    import_wagmi9 = require("wagmi");
+    import_wagmi10 = require("wagmi");
     init_rainbowkit();
     init_useLayoutStore();
     init_ProviderContext();
@@ -28281,14 +28264,14 @@ var init_utils11 = __esm({
 });
 
 // src/context/WagmiContext.tsx
-var import_core7, import_wagmi10, import_jsx_runtime123, WagmiProvider2;
+var import_core7, import_wagmi11, import_jsx_runtime123, WagmiProvider2;
 var init_WagmiContext = __esm({
   "src/context/WagmiContext.tsx"() {
     import_core7 = require("@embarkai/core");
-    import_wagmi10 = require("wagmi");
+    import_wagmi11 = require("wagmi");
     import_jsx_runtime123 = require("react/jsx-runtime");
     WagmiProvider2 = ({ children }) => {
-      return /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(import_wagmi10.WagmiProvider, { config: import_core7.wagmiConfig, children });
+      return /* @__PURE__ */ (0, import_jsx_runtime123.jsx)(import_wagmi11.WagmiProvider, { config: import_core7.wagmiConfig, children });
     };
   }
 });
@@ -28480,9 +28463,9 @@ __export(index_exports, {
   getUserOperationByHash: () => getUserOperationByHash,
   getUserOperationReceipt: () => getUserOperationReceipt,
   getUserProfile: () => getUserProfile,
-  getValidTokens: () => import_auth20.getValidTokens,
-  jwtTokenManager: () => import_auth20.jwtTokenManager,
-  logout: () => import_auth20.logout,
+  getValidTokens: () => import_auth21.getValidTokens,
+  jwtTokenManager: () => import_auth21.jwtTokenManager,
+  logout: () => import_auth21.logout,
   looksLikeNickname: () => looksLikeNickname,
   prepareBatchUserOperation: () => prepareBatchUserOperation,
   prepareUserOperation: () => prepareUserOperation,
@@ -28677,11 +28660,11 @@ function ConnectWalletButton(props) {
     queryKey: [QUERY_KEYS.userProfile, address],
     queryFn: getUserProfile
   });
-  const displayName = profile?.nicknameDisplay || profile?.displayName || import_auth20.jwtTokenManager.getDisplayName();
+  const displayName = profile?.nicknameDisplay || profile?.displayName || import_auth21.jwtTokenManager.getDisplayName();
   const indicators = (0, import_react94.useMemo)(() => {
     const userId = session?.mpcUserId;
     if (!userId) return { server: false, local: false, backup: false };
-    const server = import_auth20.jwtTokenManager.getHasKeyshare() ?? false;
+    const server = import_auth21.jwtTokenManager.getHasKeyshare() ?? false;
     const local = !!address;
     return { server, local, backup: hasServerVault };
   }, [session, address, hasServerVault]);
@@ -29660,7 +29643,7 @@ function useWalletMode() {
 // src/hooks/useDirectWallet.ts
 var import_react98 = require("react");
 var import_rainbowkit6 = require("@rainbow-me/rainbowkit");
-var import_wagmi11 = require("wagmi");
+var import_wagmi12 = require("wagmi");
 init_useExternalWalletStore();
 init_useLayoutDataStore();
 function useDirectWallet() {
@@ -29669,7 +29652,7 @@ function useDirectWallet() {
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const connectorName = useExternalWalletStore((st) => st.connectorName);
   const clearExternalWallet = useExternalWalletStore((st) => st.clearExternalWallet);
-  const { disconnect: wagmiDisconnect } = (0, import_wagmi11.useDisconnect)();
+  const { disconnect: wagmiDisconnect } = (0, import_wagmi12.useDisconnect)();
   const { openConnectModal } = (0, import_rainbowkit6.useConnectModal)();
   const setIsWalletLinking = useLayoutDataStore((st) => st.setIsWalletLinking);
   const connect = (0, import_react98.useCallback)(() => {
@@ -29696,13 +29679,13 @@ function useDirectWallet() {
 // src/hooks/useSendDirectTransaction.ts
 var import_react99 = require("react");
 var import_viem20 = require("viem");
-var import_wagmi12 = require("wagmi");
+var import_wagmi13 = require("wagmi");
 init_useExternalWalletStore();
 function useSendDirectTransaction() {
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const externalChainId = useExternalWalletStore((st) => st.externalChainId);
-  const { sendTransactionAsync } = (0, import_wagmi12.useSendTransaction)();
-  const { switchChainAsync } = (0, import_wagmi12.useSwitchChain)();
+  const { sendTransactionAsync } = (0, import_wagmi13.useSendTransaction)();
+  const { switchChainAsync } = (0, import_wagmi13.useSwitchChain)();
   const [isPending, setIsPending] = (0, import_react99.useState)(false);
   const [error, setError] = (0, import_react99.useState)(null);
   const [txHash, setTxHash] = (0, import_react99.useState)(null);
@@ -29835,11 +29818,11 @@ function useTransferToLinkedWallet() {
 }
 
 // src/hooks/useNativeWalletSignature.ts
-var import_wagmi13 = require("wagmi");
+var import_wagmi14 = require("wagmi");
 init_providers();
 function useNativeWalletSignature() {
-  const signMessage = (0, import_wagmi13.useSignMessage)();
-  const signTypedMessage = (0, import_wagmi13.useSignTypedData)();
+  const signMessage = (0, import_wagmi14.useSignMessage)();
+  const signTypedMessage = (0, import_wagmi14.useSignTypedData)();
   return {
     signMessage,
     /** EIP-712 signature */
@@ -29849,27 +29832,43 @@ function useNativeWalletSignature() {
 }
 
 // src/hooks/useLogout.ts
-var import_auth22 = require("@embarkai/core/auth");
+var import_auth23 = require("@embarkai/core/auth");
 var import_react101 = require("react");
+var import_wagmi15 = require("wagmi");
 init_ProviderContext();
 init_SessionContext();
+init_useExternalWalletStore();
 function useLogout() {
-  const { setSession, setIsLoading, setAddress, setStatus, setError, address } = useSession();
   const { callbacksRef } = useProviderConfig();
+  const address = useSession((st) => st.address);
+  const { disconnect: wagmiDisconnect } = (0, import_wagmi15.useDisconnect)({
+    mutation: {
+      onSuccess: () => {
+        useExternalWalletStore.getState().clearExternalWallet();
+        useExternalWalletStore.getState().setExternalChainId(null);
+        console.log("[ExternalWalletStore] Disconnected from external wallet");
+      },
+      onError: (err) => {
+        console.error("[ExternalWalletStore] Error disconnecting from external wallet:", err);
+      }
+    }
+  });
   const logout2 = (0, import_react101.useCallback)(async () => {
+    const { setSession, setIsLoading, setAddress, setStatus, setError } = useSession.getState();
     const prevAddress = address;
     let userId = null;
     setIsLoading(true);
     try {
-      userId = import_auth22.jwtTokenManager.getUserId() || null;
+      userId = import_auth23.jwtTokenManager.getUserId() || null;
     } catch (error) {
       console.warn("[useLogout] Could not get userId:", error);
     }
     try {
-      await (0, import_auth22.logout)();
+      await (0, import_auth23.logout)();
     } catch (error) {
       console.warn("[useLogout] Core logout failed:", error);
     }
+    if (!!useExternalWalletStore.getState().externalAddress) wagmiDisconnect();
     setSession(null);
     setAddress(null);
     setStatus("idle");
@@ -29883,7 +29882,7 @@ function useLogout() {
     } catch (error) {
       console.warn("[useLogout] Callback error:", error);
     }
-  }, [address, setAddress, setError, setSession, setStatus]);
+  }, [address]);
   return { logout: logout2 };
 }
 
@@ -29906,15 +29905,15 @@ init_useBlockscoutAssets();
 
 // src/modules/transactions.ts
 init_SessionContext();
-var import_read21 = require("@embarkai/core/read");
+var import_read22 = require("@embarkai/core/read");
 var import_viem22 = require("viem");
-var import_wagmi14 = require("wagmi");
+var import_wagmi16 = require("wagmi");
 function useTransactions() {
   const chainId = requireActiveChainId();
-  const viemChain = (0, import_read21.getViemChain)(chainId);
-  const publicClient = (0, import_wagmi14.usePublicClient)({ chainId });
-  const { data: walletClient } = (0, import_wagmi14.useWalletClient)();
-  const { address } = (0, import_wagmi14.useAccount)();
+  const viemChain = (0, import_read22.getViemChain)(chainId);
+  const publicClient = (0, import_wagmi16.usePublicClient)({ chainId });
+  const { data: walletClient } = (0, import_wagmi16.useWalletClient)();
+  const { address } = (0, import_wagmi16.useAccount)();
   const sendTransaction = async (params) => {
     if (!walletClient) {
       throw new Error("Wallet not connected");
@@ -29974,7 +29973,7 @@ function useTransactions() {
 init_SessionContext();
 var import_react102 = __toESM(require("react"), 1);
 var import_viem23 = require("viem");
-var import_wagmi15 = require("wagmi");
+var import_wagmi17 = require("wagmi");
 var COMMON_TOKENS = [
   // Add real token addresses here when available
   // {
@@ -29991,7 +29990,7 @@ function useAssets(address) {
     data: nativeBalance,
     isLoading: nativeBalanceLoading,
     refetch: refetchNativeBalance
-  } = (0, import_wagmi15.useBalance)({
+  } = (0, import_wagmi17.useBalance)({
     address,
     chainId,
     query: {
@@ -30005,7 +30004,7 @@ function useAssets(address) {
     args: [address],
     chainId
   }));
-  const readContractsResult = (0, import_wagmi15.useReadContracts)({
+  const readContractsResult = (0, import_wagmi17.useReadContracts)({
     contracts: tokenContracts,
     query: {
       enabled: !!address && COMMON_TOKENS.length > 0
@@ -30086,7 +30085,7 @@ function useAssets(address) {
 }
 function useTokenInfo(tokenAddress) {
   const chainId = requireActiveChainId();
-  const readContractsResult = (0, import_wagmi15.useReadContracts)({
+  const readContractsResult = (0, import_wagmi17.useReadContracts)({
     contracts: [
       { address: tokenAddress, abi: import_viem23.erc20Abi, functionName: "name", chainId },
       { address: tokenAddress, abi: import_viem23.erc20Abi, functionName: "symbol", chainId },
@@ -30117,7 +30116,7 @@ function useTokenBalance(tokenAddress, userAddress) {
     data: balance,
     isLoading,
     refetch
-  } = (0, import_wagmi15.useReadContract)({
+  } = (0, import_wagmi17.useReadContract)({
     address: tokenAddress,
     abi: import_viem23.erc20Abi,
     functionName: "balanceOf",