@embarkai/ui-kit 0.4.47 → 0.4.48

package/dist/index.js

@@ -1168,52 +1168,48 @@ var init_helpers = __esm({
 });
 
 // src/internal/components/ChainSync/ChainSync.tsx
-import {
-  DEFAULT_CHAIN_ID,
-  getChainConfig,
-  isChainSupported
-} from "@embarkai/core/read";
+import { DEFAULT_CHAIN_ID, getChainConfig, isChainSupported } from "@embarkai/core/read";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { throttle } from "lodash-es";
 import { useCallback, useEffect as useEffect2, useRef } from "react";
 function ChainSync() {
   const { config, callbacksRef } = useProviderConfig();
   const qc = useQueryClient();
-  const setPage = useLayoutDataStore((st) => st.setPage);
-  const { address, session, activeChainId, setAddress, setSession, setActiveChain, setIsLoading, setStatus, setError } = useSession();
+  const address = useSession((st) => st.address);
+  const session = useSession((st) => st.session);
+  const activeChainId = useSession((st) => st.activeChainId);
   const prevChainId = useRef(null);
-  const isReverting = useRef(false);
   const { mutate: updateChain } = useMutation({
-    mutationFn: async (selectedChainId) => {
+    mutationFn: async (toChainId) => {
+      if (!toChainId) {
+        console.warn("[CHAIN_SYNC] No target chainId provided, skipping chain update");
+        return { skip: true };
+      }
+      console.warn("[CHAIN_SYNC] Attempting:", toChainId);
       if (!session?.ownerAddress) {
         console.warn("[CHAIN_SYNC] No session owner address, aborting chain update");
-        throw new Error("No session owner");
+        return { skip: true };
       }
-      if (prevChainId.current === activeChainId) {
-        console.info("[CHAIN_SYNC] Current chain:", activeChainId);
-        return { skip: true, targetChainId: activeChainId };
+      if (prevChainId.current === toChainId) {
+        console.info("[CHAIN_SYNC] Chain already selected:", toChainId);
+        return { skip: true };
       }
-      console.info("[CHAIN_SYNC]", prevChainId.current, "->", activeChainId);
-      setIsLoading(true);
+      console.info("[CHAIN_SYNC] syncing to: ", toChainId);
+      const { setIsLoading, setStatus } = useSession.getState();
       let targetChainId = null;
       switch (true) {
-        case (!!selectedChainId && !!isChainSupported(selectedChainId)):
-          targetChainId = selectedChainId;
+        case (!!toChainId && !!isChainSupported(toChainId)):
+          targetChainId = toChainId;
           break;
-        case (!!selectedChainId && !isChainSupported(selectedChainId)):
-          console.warn(`[EMBARKAI] Current activeChainId ${selectedChainId} is not supported. Checking for fallback`);
-        // no break, fallthrough to next case
-        case (!!config.current?.network?.chainId && !!isChainSupported(config.current.network.chainId)):
-          targetChainId = config.current.network.chainId;
-          console.info(`[EMBARKAI] Config chainId ${config.current.network.chainId} will be used.`);
+        case (!!toChainId && !isChainSupported(toChainId)):
+          console.warn(`[EMBARKAI] Chain  ${toChainId} is not supported. Checking for fallback`);
+          targetChainId = DEFAULT_CHAIN_ID;
           break;
-        case (!!config.current?.network?.chainId && !isChainSupported(config.current.network.chainId)):
-          console.warn(`No Fallback ChainID Found. Using default chain ${DEFAULT_CHAIN_ID} instead.`);
-        // no break, fallthrough to next case
         default:
           targetChainId = DEFAULT_CHAIN_ID;
           break;
       }
+      setIsLoading(true);
       setStatus(`Re-calculating address for chain ${targetChainId}...`);
       const chainConfig = getChainConfig(targetChainId);
       const chainParams = getChainParams(chainConfig);
@@ -1231,9 +1227,9 @@ function ChainSync() {
       };
     },
     onSuccess: async ({ skip, targetChainId, smartAccountAddress, chainParams }) => {
-      if (skip) return;
+      if (skip || !smartAccountAddress || !chainParams) return;
       const { chainConfig } = chainParams;
-      console.info("[CHAIN_SYNC] Address recalculated for chain", targetChainId, ":", smartAccountAddress);
+      const { setIsLoading, setStatus, setActiveChain, setAddress, setSession } = useSession.getState();
       setActiveChain(chainParams);
       setAddress(smartAccountAddress);
       setSession({
@@ -1242,45 +1238,52 @@ function ChainSync() {
         address: smartAccountAddress,
         factoryAddress: chainConfig.factoryAddress
       });
-      await callbacksRef.current?.onChainChange?.({
+      callbacksRef.current?.onChainChange?.({
         chainId: targetChainId,
         previousChainId: prevChainId.current
       });
-      if (!config.current?.network?.forceChain && targetChainId !== config.current?.network?.chainId) {
-        console.info("[CHAIN_SYNC] Dapp chain request:", targetChainId, "->", config.current?.network?.chainId);
-        setPage("chain-switch-request" /* CHAIN_SWITCH_REQUEST */);
-      }
       prevChainId.current = targetChainId;
-      await qc.invalidateQueries();
+      qc.invalidateQueries();
       setStatus("idle");
       setIsLoading(false);
     },
     onError: (error, selectedChainId) => {
       console.error("[CHAIN_SYNC] Failed to switch chain into ", selectedChainId, ":", error);
+      const { setIsLoading, setStatus, setError } = useSession.getState();
       setStatus("idle");
       setError(error.message);
       setIsLoading(false);
     }
   });
-  const updateChainRelaxed = useCallback(throttle(updateChain, 3e3), []);
+  const updateChainRelaxed = useCallback(throttle(updateChain, 2e3), []);
   useEffect2(() => {
-    if (!address) return;
-    if (prevChainId.current === activeChainId) return;
-    if (isReverting.current) {
-      isReverting.current = false;
-      return;
-    }
+    if (!address || !activeChainId) return;
     updateChainRelaxed(activeChainId);
   }, [address, activeChainId]);
+  useEffect2(() => {
+    if (!address || !activeChainId) return;
+    const shouldSwitchRequest = !config.current?.network?.forceChain && activeChainId !== config.current?.network?.chainId;
+    async function showSwitchChainRequest() {
+      const stats = await getShareRecoveryStats();
+      const hasRecoveryData = !!stats && (!!stats.created || stats.devices && stats.devices.length > 0);
+      const jwt = jwtTokenManager2.getTokens();
+      const isNewUser = !hasRecoveryData && !!jwt?.isNewUser;
+      if (isNewUser || !shouldSwitchRequest) return;
+      useLayoutDataStore.getState().setPage("chain-switch-request" /* CHAIN_SWITCH_REQUEST */);
+    }
+    showSwitchChainRequest();
+  }, [address, activeChainId]);
   return null;
 }
 var init_ChainSync = __esm({
   "src/internal/components/ChainSync/ChainSync.tsx"() {
     init_ProviderContext();
     init_SessionContext();
+    init_auth();
     init_constants2();
     init_helpers();
     init_useLayoutDataStore();
+    init_vaultClient();
   }
 });
 
@@ -2421,30 +2424,37 @@ var init_useAutoConnect = __esm({
 import { useMutation as useMutation2 } from "@tanstack/react-query";
 import { useEffect as useEffect4 } from "react";
 function useBackupStatusChanges() {
-  const setHasServerVault = useSession((st) => st.setHasServerVault);
-  const setPage = useLayoutDataStore((st) => st.setPage);
   const { mutate: handleBackupStatusChanged } = useMutation2({
     mutationFn: async (event) => {
       const customEvent = event;
       console.log("[BACKUP STATUS] changed:", customEvent?.detail);
-      return { stats: await getShareRecoveryStats(), detail: customEvent?.detail };
+      return {
+        stats: await getShareRecoveryStats(),
+        detail: customEvent?.detail
+      };
     },
     onSuccess: ({ stats, detail }) => {
+      const { setHasServerVault } = useSession.getState();
       const hasRecoveryData = stats && (!!stats.created || !!stats?.devices?.length);
       if (!!hasRecoveryData) {
         setHasServerVault(true);
-        if (!!detail?.navigateToNicknameMenu) {
-          console.log("[BACKUP STATUS] New user backup created, navigating to nickname settings");
-          setTimeout(() => setPage("nickname-settings" /* NICKNAME_SETTINGS */), 1e3);
+        const jwt = jwtTokenManager2.getTokens();
+        const isNewUserTouched = localStorage.getItem(NEW_USER_TOUCHED_KEY) === "true";
+        if (!isNewUserTouched && !!jwt?.isNewUser) {
+          localStorage.setItem(NEW_USER_TOUCHED_KEY, "true");
+          useLayoutDataStore.getState().setPage("nickname-settings" /* NICKNAME_SETTINGS */);
+        }
+        if (!!isNewUserTouched && !jwt?.isNewUser) {
+          localStorage.removeItem(NEW_USER_TOUCHED_KEY);
         }
       } else {
         setHasServerVault(false);
-        setPage("keysare-backup" /* KEYSARE_BACKUP */);
+        useLayoutDataStore.getState().setPage("keysare-backup" /* KEYSARE_BACKUP */);
         console.warn("[BACKUP STATUS] No recovery data found in vault, marking as no-server-vault");
       }
     },
     onError: (error) => {
-      setHasServerVault(false);
+      useSession.getState().setHasServerVault(false);
       console.warn("[BACKUP STATUS] Failed to fetch initial vault status:", error);
     }
   });
@@ -2455,11 +2465,14 @@ function useBackupStatusChanges() {
     };
   }, []);
 }
+var NEW_USER_TOUCHED_KEY;
 var init_useBackupStatusChanges = __esm({
   "src/internal/hooks/useBackupStatusChanges.ts"() {
     init_SessionContext();
+    init_auth();
     init_vaultClient();
     init_useLayoutDataStore();
+    NEW_USER_TOUCHED_KEY = "embarkai-is-new-user-touhced";
   }
 });
 
@@ -11830,7 +11843,6 @@ var init_ChainsMenu = __esm({
 
 // src/internal/components/ChainsMenu/ChainSwitchRequest.tsx
 import { ArrowLeft as ArrowLeft5, Info as Info2, Loader as Loader7 } from "lucide-react";
-import { useEffect as useEffect18, useRef as useRef12 } from "react";
 import { Trans } from "react-i18next";
 import { jsx as jsx49, jsxs as jsxs44 } from "react/jsx-runtime";
 function ChainSwitchRequest() {
@@ -11838,17 +11850,7 @@ function ChainSwitchRequest() {
   const config = useProviderConfig().config;
   const isLoading = useSession((st) => st.isLoading);
   const chainConfig = useSession((st) => st.chainConfig);
-  const setActiveChainId = useSession((st) => st.setActiveChainId);
-  const setPage = useLayoutDataStore((st) => st.setPage);
   const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
-  const changeTouchedRef = useRef12(false);
-  useEffect18(() => {
-    if (!changeTouchedRef.current || chainConfig?.id !== config.current?.network?.chainId) return;
-    setPage(null);
-    return () => {
-      changeTouchedRef.current = false;
-    };
-  }, [chainConfig, setPage]);
   const prefferedChain = NETWORK_OPTIONS.find((ch) => ch.chainId === config.current?.network?.chainId) || null;
   const PrefferedChainIcon = prefferedChain?.Icon || (() => null);
   return /* @__PURE__ */ jsx49(
@@ -11867,7 +11869,7 @@ function ChainSwitchRequest() {
               size: "icon",
               variant: "ghost",
               title: t("passport:common.back"),
-              onClick: () => setPage("settings" /* SETTINGS */),
+              onClick: () => useLayoutDataStore.getState().setPage("settings" /* SETTINGS */),
               children: /* @__PURE__ */ jsx49(ArrowLeft5, { className: "h-4 w-4" })
             }
           ),
@@ -11899,8 +11901,8 @@ function ChainSwitchRequest() {
             disabled: isLoading,
             onClick: () => {
               if (!config.current?.network?.chainId) return;
-              changeTouchedRef.current = true;
-              setActiveChainId(config.current.network.chainId);
+              useSession.getState().setActiveChainId(config.current.network.chainId);
+              useLayoutDataStore.getState().setPage("chain" /* CHAIN */);
             },
             children: [
               isLoading ? /* @__PURE__ */ jsx49(Loader7, { className: "w-6 h-6 animate-spin" }) : /* @__PURE__ */ jsx49(PrefferedChainIcon, { className: "w-6 h-6" }),
@@ -12598,7 +12600,7 @@ var init_guardian_backup = __esm({
 });
 
 // src/internal/components/DevicesMenu/DeviceManageScreen.tsx
-import { useCallback as useCallback14, useEffect as useEffect19, useRef as useRef13, useState as useState11 } from "react";
+import { useCallback as useCallback14, useEffect as useEffect18, useRef as useRef12, useState as useState11 } from "react";
 import { ArrowLeft as ArrowLeft7, Cpu, Download, HardDrive, Loader2 as Loader23, Trash2, Upload } from "lucide-react";
 import { Fragment as Fragment15, jsx as jsx51, jsxs as jsxs46 } from "react/jsx-runtime";
 function formatSize(bytes) {
@@ -12613,19 +12615,19 @@ function DeviceManageScreen() {
   const userId = session?.mpcUserId || "";
   const deviceId = pageParams?.deviceId;
   const deviceName = pageParams?.deviceName;
-  const guardianRef = useRef13(null);
+  const guardianRef = useRef12(null);
   const [screen, setScreen] = useState11({ step: "connecting" });
   const [actionState, setActionState] = useState11(null);
   const [password, setPassword] = useState11("");
   const [statusMessage, setStatusMessage] = useState11(null);
   const [errorMessage, setErrorMessage] = useState11(null);
   const [waitingConfirm, setWaitingConfirm] = useState11(false);
-  useEffect19(() => {
+  useEffect18(() => {
     if (!statusMessage) return;
     const t = setTimeout(() => setStatusMessage(null), 3e3);
     return () => clearTimeout(t);
   }, [statusMessage]);
-  useEffect19(() => {
+  useEffect18(() => {
     if (!deviceId || !isWebSerialAvailable()) {
       setScreen({ step: "error", message: "WebSerial not available" });
       return;
@@ -13144,12 +13146,43 @@ var init_DevicesMenu = __esm({
   }
 });
 
-// src/internal/components/KeyshareRestoreMenu/hooks/useRestoreStore.ts
+// src/internal/stores/useExternalWalletStore.ts
 import { create as create6 } from "zustand";
+var useExternalWalletStore;
+var init_useExternalWalletStore = __esm({
+  "src/internal/stores/useExternalWalletStore.ts"() {
+    useExternalWalletStore = create6((set) => ({
+      configMode: "linked",
+      activeMode: "linked",
+      externalAddress: null,
+      externalChainId: null,
+      isExternalConnected: false,
+      connectorName: null,
+      setConfigMode: (mode) => set({ configMode: mode }),
+      setActiveMode: (mode) => set({ activeMode: mode }),
+      setExternalWallet: ({ address, chainId, connectorName }) => set({
+        externalAddress: address,
+        externalChainId: chainId,
+        isExternalConnected: true,
+        connectorName
+      }),
+      clearExternalWallet: () => set({
+        externalAddress: null,
+        externalChainId: null,
+        isExternalConnected: false,
+        connectorName: null
+      }),
+      setExternalChainId: (chainId) => set({ externalChainId: chainId })
+    }));
+  }
+});
+
+// src/internal/components/KeyshareRestoreMenu/hooks/useRestoreStore.ts
+import { create as create7 } from "zustand";
 var useRestoreStore;
 var init_useRestoreStore = __esm({
   "src/internal/components/KeyshareRestoreMenu/hooks/useRestoreStore.ts"() {
-    useRestoreStore = create6((set) => ({
+    useRestoreStore = create7((set) => ({
       method: null,
       // recoveryData: null,
       showPassword: false,
@@ -13722,7 +13755,7 @@ var init_cloudStorage = __esm({
 
 // src/internal/components/KeyshareRestoreMenu/hooks/useCreateBackup.ts
 import { useMutation as useMutation9, useQueryClient as useQueryClient9 } from "@tanstack/react-query";
-import { useCallback as useCallback17, useEffect as useEffect20 } from "react";
+import { useCallback as useCallback17, useEffect as useEffect19 } from "react";
 function useCreateBackup() {
   const qc = useQueryClient9();
   const session = useSession((st) => st.session);
@@ -13731,7 +13764,7 @@ function useCreateBackup() {
   const usePasskey = useRestoreStore((st) => st.usePasskey);
   const restorePassword = useRestoreStore((st) => st.restorePassword);
   const selectedCloudProvider = useRestoreStore((st) => st.selectedCloudProvider);
-  useEffect20(() => {
+  useEffect19(() => {
     if (!hasServerVault) {
       useRestoreStore.getState().setMethod("server");
       useLayoutStore.getState().setIsDialogForced(true);
@@ -13753,13 +13786,11 @@ function useCreateBackup() {
         throw new Error("Please provide a password for the backup");
       }
       const password = !usePasskey ? restorePassword : void 0;
-      console.log("[BACKUP STATUS] is new user:", jwt.isNewUser);
       return {
-        response: await iframeManager.createBackup(passportUserId, { method: "server", password }, jwt.accessToken),
-        isNewUser: jwt.isNewUser
+        response: await iframeManager.createBackup(passportUserId, { method: "server", password }, jwt.accessToken)
       };
     },
-    onSuccess: async ({ response, isNewUser }) => {
+    onSuccess: async ({ response }) => {
       const { setError, setSuccess } = useRestoreStore.getState();
       qc.invalidateQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY, address] });
       if (response.success) {
@@ -13768,11 +13799,7 @@ function useCreateBackup() {
         if (typeof window !== "undefined") {
           window.dispatchEvent(
             new CustomEvent("lumia-passport-backup-status-changed", {
-              detail: {
-                method: "server",
-                success: true,
-                navigateToNicknameMenu: !!isNewUser
-              }
+              detail: { method: "server", success: true }
             })
           );
         }
@@ -14032,7 +14059,7 @@ var init_useRestoreAccount = __esm({
 });
 
 // src/internal/components/KeyshareRestoreMenu/hooks/useValidateFileBackup.ts
-import { useEffect as useEffect21 } from "react";
+import { useEffect as useEffect20 } from "react";
 function validateRestoreFileFormat(parsedData) {
   if (typeof parsedData !== "object" || parsedData === null) return false;
   const data = parsedData;
@@ -14042,7 +14069,7 @@ function useValidateFileBackup() {
   const restoreFile = useRestoreStore((st) => st.restoreFile);
   const setError = useRestoreStore((st) => st.setError);
   const setUsePasskey = useRestoreStore((st) => st.setUsePasskey);
-  useEffect21(() => {
+  useEffect20(() => {
     if (!restoreFile) {
       return;
     }
@@ -14168,7 +14195,7 @@ var init_MethodSelector = __esm({
 
 // src/internal/components/KeyshareRestoreMenu/components/PasswordPasskey.tsx
 import { ChevronRight as ChevronRight2, Eye, EyeOff, Info as Info3, Key as Key4, Loader as Loader8, Plus } from "lucide-react";
-import { useEffect as useEffect22, useRef as useRef14 } from "react";
+import { useEffect as useEffect21, useRef as useRef13 } from "react";
 import { Fragment as Fragment18, jsx as jsx55, jsxs as jsxs50 } from "react/jsx-runtime";
 function PasswordPasskey(props) {
   const { t } = useT();
@@ -14183,7 +14210,7 @@ function PasswordPasskey(props) {
     onCreatePasskey
   } = props;
   const hasServerVault = useSession((st) => st.hasServerVault);
-  const actionRef = useRef14(null);
+  const actionRef = useRef13(null);
   const {
     showPassword,
     restorePassword,
@@ -14197,7 +14224,7 @@ function PasswordPasskey(props) {
   } = useRestoreStore();
   const { config } = useProviderConfig();
   const isPasskeyEnabled = config.current.passkey.enabled;
-  useEffect22(() => {
+  useEffect21(() => {
     if (!isPasskeyEnabled && usePasskey) setUsePasskey(false);
   }, [isPasskeyEnabled, usePasskey]);
   return /* @__PURE__ */ jsxs50(Fragment18, { children: [
@@ -14525,7 +14552,7 @@ var init_File = __esm({
 import { useQueryClient as useQueryClient10 } from "@tanstack/react-query";
 import dayjs3 from "dayjs";
 import { Download as Download3, Key as Key5, Upload as Upload3 } from "lucide-react";
-import { useEffect as useEffect23 } from "react";
+import { useEffect as useEffect22 } from "react";
 import { Fragment as Fragment21, jsx as jsx58, jsxs as jsxs53 } from "react/jsx-runtime";
 function Server(props) {
   const { isLoading, mode = "restore", serverHandler, createPasskeyHandler } = props;
@@ -14535,7 +14562,7 @@ function Server(props) {
   const usePasskey = useRestoreStore((st) => st.usePasskey);
   const setUsePasskey = useRestoreStore((st) => st.setUsePasskey);
   const serverRecoveryStatus = qc.getQueryData([CHECK_BACKUP_QUERY_KEY, address]);
-  useEffect23(() => {
+  useEffect22(() => {
     if (mode === "backup" || !serverRecoveryStatus?.created?.encryptionMethod) return;
     setUsePasskey(serverRecoveryStatus.created.encryptionMethod === "passkey");
   }, [mode, serverRecoveryStatus, setUsePasskey]);
@@ -14558,7 +14585,7 @@ function Server(props) {
         ) : t("passport:backupMenu.vaultRestore")
       }
     ),
-    !!serverRecoveryStatus?.created?.at && /* @__PURE__ */ jsxs53(Highlight, { type: "success", className: "flex gap-[var(--ui-kit-gap)]", children: [
+    !!serverRecoveryStatus?.created?.at && /* @__PURE__ */ jsxs53(Highlight, { type: "info", className: "flex gap-[var(--ui-kit-gap)]", children: [
       serverRecoveryStatus.created.encryptionMethod === "password" ? /* @__PURE__ */ jsx58(OtpIcon, { className: "w-4 h-4" }) : /* @__PURE__ */ jsx58(Key5, { className: "w-4 h-4" }),
       /* @__PURE__ */ jsxs53("span", { className: "flex-1 block", children: [
         t("passport:backupMenu.vaultRecoveryStatus"),
@@ -14718,7 +14745,7 @@ var init_select = __esm({
 // src/internal/components/KeyshareRestoreMenu/methods/Cloud.tsx
 import { useQuery as useQuery6 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft10, CloudDownload, CloudUpload, Loader as Loader9 } from "lucide-react";
-import { useEffect as useEffect24 } from "react";
+import { useEffect as useEffect23 } from "react";
 import { Fragment as Fragment22, jsx as jsx60, jsxs as jsxs55 } from "react/jsx-runtime";
 function Cloud2(props) {
   const { isLoading, mode = "restore", cloudHandler } = props;
@@ -14739,7 +14766,7 @@ function Cloud2(props) {
       return availableProviders.map((p) => ({ id: p.id, name: p.name, available: p.isAvailable() }));
     }
   });
-  useEffect24(() => {
+  useEffect23(() => {
     if (isCloudProvidersLoading) return;
     if (!!cloudProvidersError) {
       console.error("[KeyshareBackup] Failed to load cloud providers:", cloudProvidersError);
@@ -14979,7 +15006,8 @@ var init_methods = __esm({
 // src/internal/components/KeyshareRestoreMenu/KeyshareRestoreMenu.tsx
 import { useMutation as useMutation11, useQuery as useQuery7, useQueryClient as useQueryClient11 } from "@tanstack/react-query";
 import { AlertCircle as AlertCircle2, CheckCircle2, CloudDownload as CloudDownload2, Loader as Loader10, UserCircle as UserCircle2 } from "lucide-react";
-import { useEffect as useEffect25 } from "react";
+import { useEffect as useEffect24 } from "react";
+import { useDisconnect } from "wagmi";
 import { Fragment as Fragment24, jsx as jsx62, jsxs as jsxs57 } from "react/jsx-runtime";
 var RESTORE_COMPONENTS, KeyshareRestoreMenu;
 var init_KeyshareRestoreMenu = __esm({
@@ -14989,6 +15017,7 @@ var init_KeyshareRestoreMenu = __esm({
     init_i18n();
     init_useLayoutDataStore();
     init_useLayoutStore();
+    init_useExternalWalletStore();
     init_vaultClient();
     init_Expandable2();
     init_button();
@@ -15014,7 +15043,7 @@ var init_KeyshareRestoreMenu = __esm({
       const error = useRestoreStore((st) => st.error);
       const success = useRestoreStore((st) => st.success);
       const currentRestoreMethod = useRestoreStore((st) => st.method);
-      useEffect25(() => {
+      useEffect24(() => {
         const { setIsDialogForced } = useLayoutStore.getState();
         const { setRestorePassword, setRestoreFile, setShowPassword, setUsePasskey, setMethod } = useRestoreStore.getState();
         setIsDialogForced(true);
@@ -15027,6 +15056,18 @@ var init_KeyshareRestoreMenu = __esm({
           setIsDialogForced(false);
         };
       }, []);
+      const { disconnect: wagmiDisconnect } = 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 { onRestoreSuccess } = useOnRestoreSuccess();
       const {
         restoreFromServer: restoreFromServer2,
@@ -15042,7 +15083,7 @@ var init_KeyshareRestoreMenu = __esm({
         queryFn: async () => await getShareRecoveryStats()
       });
       const hasServerBackup = serverRecoveryStatus?.created || serverRecoveryStatus?.devices?.length > 0;
-      useEffect25(() => {
+      useEffect24(() => {
         if (!!hasServerBackup) useRestoreStore.getState().setMethod("server");
       }, [hasServerBackup]);
       const { mutate: disconnect, isPending: isDisconnecting } = useMutation11({
@@ -15062,6 +15103,7 @@ var init_KeyshareRestoreMenu = __esm({
         },
         onSuccess: async ({ disconnectedUserId }) => {
           await qc.resetQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY] });
+          if (!!useExternalWalletStore.getState().externalAddress) wagmiDisconnect();
           const { setStatus, setIsLoading, setSession, setAddress } = useSession.getState();
           setSession(null);
           setAddress(null);
@@ -15188,7 +15230,7 @@ var init_KeyshareRestoreMenu = __esm({
 // src/internal/components/KeyshareRestoreMenu/KeyshareBackupMenu.tsx
 import { useQuery as useQuery8 } from "@tanstack/react-query";
 import { AlertCircle as AlertCircle3, ArrowLeft as ArrowLeft11, CheckCircle2 as CheckCircle22, Loader as Loader11, LockIcon } from "lucide-react";
-import { useEffect as useEffect26 } from "react";
+import { useEffect as useEffect25 } from "react";
 import { Fragment as Fragment25, jsx as jsx63, jsxs as jsxs58 } from "react/jsx-runtime";
 function KeyshareBackupMenu() {
   const address = useSession((st) => st.address);
@@ -15199,7 +15241,7 @@ function KeyshareBackupMenu() {
   const currentBackupMethod = useRestoreStore((st) => st.method);
   const error = useRestoreStore((st) => st.error);
   const success = useRestoreStore((st) => st.success);
-  useEffect26(() => {
+  useEffect25(() => {
     const { setSuccess, setError, setRestorePassword, setRestoreFile, setShowPassword, setUsePasskey, setMethod } = useRestoreStore.getState();
     return () => {
       setSuccess(null);
@@ -15218,7 +15260,7 @@ function KeyshareBackupMenu() {
     queryFn: async () => await getShareRecoveryStats()
   });
   const hasRecoveryData = serverRecoveryStatus?.created || serverRecoveryStatus?.devices?.length > 0;
-  useEffect26(() => {
+  useEffect25(() => {
     if (!!hasRecoveryData) useRestoreStore.getState().setMethod("server");
   }, [hasRecoveryData]);
   const {
@@ -15322,7 +15364,16 @@ function KeyshareBackupMenu() {
             /* @__PURE__ */ jsx63(CheckCircle22, { className: "h-4 w-4 flex-shrink-0" }),
             /* @__PURE__ */ jsx63("span", { className: "block w-full flex-1", children: success })
           ] }),
-          /* @__PURE__ */ jsx63(Button, { variant: "default", size: "large", className: "w-full", onClick: () => setPage("settings" /* SETTINGS */), children: t("passport:common.continue") })
+          /* @__PURE__ */ jsx63(
+            Button,
+            {
+              variant: "default",
+              size: "large",
+              className: "w-full",
+              onClick: () => useRestoreStore.getState().setSuccess(null),
+              children: t("passport:common.continue")
+            }
+          )
         ] })
       ] })
     }
@@ -15362,7 +15413,7 @@ var init_KeyshareRestoreMenu2 = __esm({
 });
 
 // src/hooks/useColorMode.ts
-import { useCallback as useCallback18, useEffect as useEffect27 } from "react";
+import { useCallback as useCallback18, useEffect as useEffect26 } from "react";
 function useColorMode() {
   const {
     config: { current: config }
@@ -15377,7 +15428,7 @@ function useColorMode() {
     },
     [handleStoreColorMode]
   );
-  useEffect27(() => {
+  useEffect26(() => {
     let targetColorMode = localStorage.getItem(LOCAL_COLOR_MODE_KEY);
     if (!targetColorMode && !preferedColorMode) {
       const systemMode = window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
@@ -15492,17 +15543,17 @@ var init_SumsubIframeManager = __esm({
 });
 
 // src/internal/components/KYC/useSumsubIframe.ts
-import { useEffect as useEffect28, useRef as useRef15, useState as useState16 } from "react";
+import { useEffect as useEffect27, useRef as useRef14, useState as useState16 } from "react";
 function useSumsubIframe({ iframeUrl }) {
   const config = useProviderConfig().config;
   const { colorMode } = useColorMode();
-  const iframeRef = useRef15(null);
+  const iframeRef = useRef14(null);
   const [isLoading, setIsLoading] = useState16(true);
   const [error, setError] = useState16(null);
   const [height, setHeight] = useState16(0);
   const [status, setStatus] = useState16("");
   const levelName = config.current?.kyc?.options?.levelName;
-  useEffect28(() => {
+  useEffect27(() => {
     setError(null);
     setIsLoading(true);
     setStatus("Preparing verification...");
@@ -15814,14 +15865,14 @@ var init_useProvidersList = __esm({
 
 // src/internal/components/MainMenu/MainMenu.tsx
 import { ChevronLeft, ChevronRight as ChevronRight3, DollarSign as DollarSign2, Wallet2 as Wallet23 } from "lucide-react";
-import { useEffect as useEffect29 } from "react";
+import { useEffect as useEffect28 } from "react";
 import { jsx as jsx68, jsxs as jsxs63 } from "react/jsx-runtime";
 function MainMenu() {
   const address = useSession((st) => st.address);
   const { t } = useT();
   const setPage = useLayoutDataStore((st) => st.setPage);
   const setTransitionPageHeight = useLayoutDataStore((st) => st.setTransitionPageHeight);
-  useEffect29(() => setTransitionPageHeight(DEFAULT_MAIN_MENU_HEIGHT), []);
+  useEffect28(() => setTransitionPageHeight(DEFAULT_MAIN_MENU_HEIGHT), []);
   useProvidersList();
   return /* @__PURE__ */ jsx68("div", { className: "w-full p-[var(--ui-kit-pd)] flex flex-col gap-[var(--ui-kit-gap)]", children: /* @__PURE__ */ jsx68("div", { className: "w-full grid grid-cols-4 gap-0 md:gap-[var(--ui-kit-gap)] py-[10px] md:py-1", children: MAIN_MENU_BUTTONS.map(({ id, label, icon: Icon2 }) => /* @__PURE__ */ jsxs63(
     Button,
@@ -15907,11 +15958,11 @@ var init_linkedProfiles = __esm({
 });
 
 // src/internal/components/ManageWalletMenu/hooks/useStore.ts
-import { create as create7 } from "zustand";
+import { create as create8 } from "zustand";
 var useManageWalletStore;
 var init_useStore = __esm({
   "src/internal/components/ManageWalletMenu/hooks/useStore.ts"() {
-    useManageWalletStore = create7((set) => ({
+    useManageWalletStore = create8((set) => ({
       alert: null,
       emailStep: "input",
       email: "",
@@ -16368,7 +16419,7 @@ var init_EmailNotConnectedWarning = __esm({
 
 // src/internal/components/ManageWalletMenu/hooks/useLinkSocial.ts
 import { useQueryClient as useQueryClient15 } from "@tanstack/react-query";
-import React5, { useEffect as useEffect30 } from "react";
+import React5, { useEffect as useEffect29 } from "react";
 function normalizeSocialLinkError(message) {
   if (message === "X_ALREADY_LINKED") {
     return "This X account is already linked to another account";
@@ -16444,7 +16495,7 @@ function useLinkSocial() {
     [config.social?.providers]
   );
   const [socialLinkStarted, setSocialLinkStarted] = React5.useState(false);
-  useEffect30(() => {
+  useEffect29(() => {
     const key = providerType?.toLowerCase();
     console.log("[useLinkSocial] Effect triggered:", { key, linkIsLoading, socialLinkStarted, isWalletLinking });
     if (isWalletLinking) {
@@ -16527,7 +16578,7 @@ var init_telegram2 = __esm({
 
 // src/internal/components/ManageWalletMenu/hooks/useLinkTelegram.ts
 import { useQueryClient as useQueryClient16 } from "@tanstack/react-query";
-import { useCallback as useCallback20, useEffect as useEffect31, useState as useState17 } from "react";
+import { useCallback as useCallback20, useEffect as useEffect30, useState as useState17 } from "react";
 function useLinkTelegram() {
   const {
     config: { current: config },
@@ -16586,7 +16637,7 @@ function useLinkTelegram() {
     }
   }, [config.social?.providers]);
   const [telegramLinkStarted, setTelegramLinkStarted] = useState17(false);
-  useEffect31(() => {
+  useEffect30(() => {
     console.log("[useLinkTelegram] Effect triggered:", {
       providerType,
       linkIsLoading,
@@ -16603,7 +16654,7 @@ function useLinkTelegram() {
       handleLinkTelegram();
     }
   }, [providerType, handleLinkTelegram, linkIsLoading, telegramLinkStarted, isWalletLinking]);
-  useEffect31(() => {
+  useEffect30(() => {
     if (providerType !== "telegram") {
       setTelegramLinkStarted(false);
     }
@@ -16903,48 +16954,17 @@ var init_ManageWallet = __esm({
   }
 });
 
-// src/internal/stores/useExternalWalletStore.ts
-import { create as create8 } from "zustand";
-var useExternalWalletStore;
-var init_useExternalWalletStore = __esm({
-  "src/internal/stores/useExternalWalletStore.ts"() {
-    useExternalWalletStore = create8((set) => ({
-      configMode: "linked",
-      activeMode: "linked",
-      externalAddress: null,
-      externalChainId: null,
-      isExternalConnected: false,
-      connectorName: null,
-      setConfigMode: (mode) => set({ configMode: mode }),
-      setActiveMode: (mode) => set({ activeMode: mode }),
-      setExternalWallet: ({ address, chainId, connectorName }) => set({
-        externalAddress: address,
-        externalChainId: chainId,
-        isExternalConnected: true,
-        connectorName
-      }),
-      clearExternalWallet: () => set({
-        externalAddress: null,
-        externalChainId: null,
-        isExternalConnected: false,
-        connectorName: null
-      }),
-      setExternalChainId: (chainId) => set({ externalChainId: chainId })
-    }));
-  }
-});
-
 // src/internal/components/ManageWalletMenu/UnlinkProviderMenu.tsx
 import { useMutation as useMutation15, useQueryClient as useQueryClient17 } from "@tanstack/react-query";
 import { Key as Key6, Loader as Loader15 } from "lucide-react";
 import { useState as useState18 } from "react";
-import { useDisconnect } from "wagmi";
+import { useDisconnect as useDisconnect2 } from "wagmi";
 import { jsx as jsx74, jsxs as jsxs69 } from "react/jsx-runtime";
 function UnlinkProviderMenu() {
   const qc = useQueryClient17();
   const address = useSession((st) => st.address);
   const { callbacksRef } = useProviderConfig();
-  const { disconnect: disconnectExternalWallet } = useDisconnect();
+  const { disconnect: disconnectExternalWallet } = useDisconnect2();
   const isExternalConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const { t } = useT();
   const setPage = useLayoutDataStore((st) => st.setPage);
@@ -17326,19 +17346,19 @@ var init_NicknameEditForm = __esm({
 
 // src/internal/components/NicknameMenu/useNickname.ts
 import { useQuery as useQuery12 } from "@tanstack/react-query";
-import { useEffect as useEffect32, useState as useState20 } from "react";
+import { useEffect as useEffect31, useState as useState20 } from "react";
 function useNicknameForm(currentNickname) {
   const [inputValue, setInputValue] = useState20("");
   const normalizedInputValue = normalizeNickname(inputValue);
   const validation = validateNickname(inputValue);
   const isValidForCheck = validation.valid && normalizedInputValue.length > 0;
-  useEffect32(() => {
+  useEffect31(() => {
     setInputValue(currentNickname);
   }, [currentNickname]);
   const [queryInputValue, setQueryInputValue] = useState20("");
   const isSameAsCurrentNickname = normalizedInputValue === currentNickname.toLowerCase();
   const shouldCheckAvailability = validation.valid && !isSameAsCurrentNickname && inputValue.length > 0;
-  useEffect32(() => {
+  useEffect31(() => {
     if (!isValidForCheck || !shouldCheckAvailability) {
       setQueryInputValue("");
       return;
@@ -17645,7 +17665,7 @@ var init_useWatchTokens = __esm({
 // src/internal/hooks/useBlockscoutAssets.ts
 import { createBlockscoutClient } from "@embarkai/core/clients";
 import { useQuery as useQuery15 } from "@tanstack/react-query";
-import { useCallback as useCallback22, useMemo as useMemo9, useRef as useRef16 } from "react";
+import { useCallback as useCallback22, useMemo as useMemo9, useRef as useRef15 } from "react";
 import { formatEther, formatUnits as formatUnits3 } from "viem";
 function resolveIpfsUri(uri) {
   if (!uri) return "";
@@ -17781,7 +17801,7 @@ function useBlockscoutAssets(options) {
     () => blockscoutApiUrl ? createBlockscoutClient({ baseUrl: blockscoutApiUrl }) : null,
     [blockscoutApiUrl]
   );
-  const lastRefreshRef = useRef16(0);
+  const lastRefreshRef = useRef15(0);
   const {
     assets: watchTokenAssets,
     isLoading: watchTokensLoading,
@@ -18411,7 +18431,7 @@ var init_nickname_fingerprint = __esm({
 // src/internal/components/ReceiveMenu/ReceiveMenu.tsx
 import { ArrowLeft as ArrowLeft17, CheckCircle2 as CheckCircle23, Copy as Copy3, Info as Info5, Loader as Loader21, Shield } from "lucide-react";
 import QRCode from "qrcode";
-import { useCallback as useCallback24, useEffect as useEffect33, useMemo as useMemo10, useState as useState23 } from "react";
+import { useCallback as useCallback24, useEffect as useEffect32, useMemo as useMemo10, useState as useState23 } from "react";
 import { Fragment as Fragment31, jsx as jsx81, jsxs as jsxs76 } from "react/jsx-runtime";
 function ReceiveMenu() {
   const session = useSession((st) => st.session);
@@ -18433,7 +18453,7 @@ function ReceiveMenu() {
       return null;
     }
   }, [session?.ownerAddress]);
-  useEffect33(() => {
+  useEffect32(() => {
     if (open && address) {
       QRCode.toDataURL(address, {
         width: 200,
@@ -19328,7 +19348,7 @@ var init_useBridgeStore = __esm({
 // src/internal/components/SendMenu/hyperbridge/components/SenderSelector.tsx
 import { useConnectModal } from "@rainbow-me/rainbowkit";
 import { useMutation as useMutation18 } from "@tanstack/react-query";
-import { useEffect as useEffect34, useRef as useRef17, useState as useState25 } from "react";
+import { useEffect as useEffect33, useRef as useRef16, useState as useState25 } from "react";
 import { useSignMessage } from "wagmi";
 import { jsx as jsx89, jsxs as jsxs84 } from "react/jsx-runtime";
 function SenderSelector(props) {
@@ -19339,12 +19359,12 @@ function SenderSelector(props) {
   const { openConnectModal } = useConnectModal();
   const directWalletAddress = useExternalWalletStore((st) => st.externalAddress);
   const directWalletIsConnected = useExternalWalletStore((st) => st.isExternalConnected);
-  const pendingWalletRef = useRef17(null);
+  const pendingWalletRef = useRef16(null);
   const originChain = useBridgeStore((st) => st.originChain);
   const bridgeSender = useBridgeStore((st) => st.bridgeSender);
   const bridgeSenders = useBridgeStore((st) => st.bridgeSenders);
   const [walletMessage, setWalletMessage] = useState25(null);
-  useEffect34(() => {
+  useEffect33(() => {
     useFlowSelectorStore.getState().setRenderKey(`sender-selected-${Date.now()}`);
   }, [walletMessage]);
   const { mutate: loginDirectWallet, isPending: isDirectWalletLoggingIn } = useMutation18({
@@ -19400,7 +19420,7 @@ function SenderSelector(props) {
       setWalletMessage(error instanceof Error ? error.message : "Wallet login failed. Please try again.");
     }
   });
-  useEffect34(() => {
+  useEffect33(() => {
     const pendingProfile = pendingWalletRef.current;
     if (!pendingProfile || !directWalletIsConnected || !directWalletAddress) return;
     if (directWalletAddress.toLowerCase() !== pendingProfile.externalId?.toLowerCase()) return;
@@ -19585,12 +19605,12 @@ var init_wallets = __esm({
 });
 
 // src/internal/components/SendMenu/hyperbridge/hooks/useAvailableSenders.ts
-import { useEffect as useEffect35, useRef as useRef18 } from "react";
+import { useEffect as useEffect34, useRef as useRef17 } from "react";
 function useAvailableSenders() {
   const address = useSession((st) => st.address);
   const { profiles } = useLinkedProfiles();
-  const lastCalcedSenders = useRef18([]);
-  useEffect35(() => {
+  const lastCalcedSenders = useRef17([]);
+  useEffect34(() => {
     const sendersAccumulator = [
       {
         type: "embarkai-wallet",
@@ -19953,7 +19973,7 @@ var init_utils8 = __esm({
 // src/internal/components/SendMenu/hyperbridge/hooks/useHyperlaneHistory.ts
 import { useInfiniteQuery as useInfiniteQuery3 } from "@tanstack/react-query";
 import { debounce as debounce6 } from "lodash-es";
-import { useCallback as useCallback25, useEffect as useEffect36, useMemo as useMemo11 } from "react";
+import { useCallback as useCallback25, useEffect as useEffect35, useMemo as useMemo11 } from "react";
 function useHyperlaneHistory() {
   const address = useSession((st) => st.address);
   const page = useLayoutDataStore((st) => st.page);
@@ -19979,7 +19999,7 @@ function useHyperlaneHistory() {
     }, 250),
     []
   );
-  useEffect36(() => {
+  useEffect35(() => {
     if (isBridgeTxHistoryLoading || txList.length === 0) return;
     updateExpandable();
   }, [isBridgeTxHistoryLoading, txList]);
@@ -20219,7 +20239,7 @@ var init_useBridge = __esm({
 
 // src/internal/components/SendMenu/hyperbridge/hooks/useHyperlaneRoutes.ts
 import { useQuery as useQuery19 } from "@tanstack/react-query";
-import { useEffect as useEffect37 } from "react";
+import { useEffect as useEffect36 } from "react";
 function useHyperlaneRoutes() {
   const address = useSession((st) => st.address);
   const page = useLayoutDataStore((st) => st.page);
@@ -20235,7 +20255,7 @@ function useHyperlaneRoutes() {
     queryKey: [HYPERLANE_WARP_ROUTES_QUERY_KEY, address],
     queryFn: async () => getHyperlaneWarpRoutes()
   });
-  useEffect37(() => {
+  useEffect36(() => {
     if (!errorWarpRoutes) return;
     useFlowSelectorStore.getState().setError(errorWarpRoutes.message);
     const { resetSelections, setRecipient, setOriginChain, setDestinationChain } = useBridgeStore.getState();
@@ -20244,7 +20264,7 @@ function useHyperlaneRoutes() {
     setOriginChain(null);
     setDestinationChain(null);
   }, [errorWarpRoutes]);
-  useEffect37(() => {
+  useEffect36(() => {
     if (!!hyperRoute || !hyperlaneWarpRoutes.length) return;
     const warpRouteToAutoSelect = hyperlaneWarpRoutes.find((route) => route.routeId === hyperRoute);
     if (!warpRouteToAutoSelect) return;
@@ -20277,13 +20297,13 @@ var init_useHyperlaneRoutes = __esm({
 });
 
 // src/internal/components/SendMenu/hyperbridge/hooks/useMenuTitle.ts
-import { useEffect as useEffect38 } from "react";
+import { useEffect as useEffect37 } from "react";
 function useMenuTitle(warpRoutes) {
   const { t } = useT();
   const bridgeStep = useBridgeStore((st) => st.bridgeStep);
   const hyperRoute = useBridgeStore((st) => st.hyperRoute);
   const hyperRouteMeta = warpRoutes?.length ? warpRoutes.find((route) => route.routeId === hyperRoute) : null;
-  useEffect38(() => {
+  useEffect37(() => {
     const updateMenuTitle = useFlowSelectorStore.getState().setMenuTitle;
     switch (true) {
       case bridgeStep === "sender-selector":
@@ -20335,7 +20355,7 @@ var init_ResolveChainIcon = __esm({
 // src/internal/components/SendMenu/hyperbridge/hooks/useBridgeBalance.ts
 import { CHAINS_BROWSERS_TRANSPORTS as CHAINS_BROWSERS_TRANSPORTS2 } from "@embarkai/core";
 import { useQuery as useQuery20, useQueryClient as useQueryClient23 } from "@tanstack/react-query";
-import { useCallback as useCallback27, useEffect as useEffect39 } from "react";
+import { useCallback as useCallback27, useEffect as useEffect38 } from "react";
 import { createPublicClient as createPublicClient2, erc20Abi as erc20Abi2, formatUnits as formatUnits7, http as http3 } from "viem";
 import { useSwitchChain as useSwitchChain2 } from "wagmi";
 function useBridgeBalance(hyperlaneWarpRoutes) {
@@ -20440,7 +20460,7 @@ function useBridgeBalance(hyperlaneWarpRoutes) {
     },
     [refreshBalances, qc]
   );
-  useEffect39(() => {
+  useEffect38(() => {
     if (!bridgeSender || !originChain) return;
     switch (bridgeSender) {
       case "embarkai-wallet":
@@ -21395,7 +21415,7 @@ var init_steps = __esm({
 });
 
 // src/internal/components/SendMenu/hyperbridge/HyperlaneBridge.tsx
-import { useEffect as useEffect40 } from "react";
+import { useEffect as useEffect39 } from "react";
 import { Fragment as Fragment38, jsx as jsx99, jsxs as jsxs91 } from "react/jsx-runtime";
 function HyperlaneBridge() {
   const bridgeStep = useBridgeStore((st) => st.bridgeStep);
@@ -21403,7 +21423,7 @@ function HyperlaneBridge() {
   const { hyperlaneWarpRoutes, isLoadingWarpRoutes } = useHyperlaneRoutes();
   const { directWalletProfile } = useAvailableSenders();
   useMenuTitle(hyperlaneWarpRoutes);
-  useEffect40(
+  useEffect39(
     () => () => {
       useBridgeStore.getState().resetSelections();
     },
@@ -21450,14 +21470,14 @@ var init_HyperlaneBridge = __esm({
 });
 
 // src/internal/components/SendMenu/hyperbridge/components/HistorySwitch.tsx
-import { useRef as useRef19 } from "react";
+import { useRef as useRef18 } from "react";
 import { jsx as jsx100 } from "react/jsx-runtime";
 function BridgeHistorySwitch(props) {
   const { disabled } = props;
   const selectorFlow = useFlowSelectorStore((st) => st.flow);
   const isUiLocked = useFlowSelectorStore((st) => st.isUiLocked);
   const bridgeStep = useBridgeStore((st) => st.bridgeStep);
-  const lastBridgeStepRef = useRef19(null);
+  const lastBridgeStepRef = useRef18(null);
   if (selectorFlow !== "bridge" || bridgeStep === "confirm" || bridgeStep === "success" || bridgeStep === "sender-selector" || bridgeStep === "select-token" || bridgeStep === "tx-history-details") {
     return null;
   }
@@ -21559,7 +21579,7 @@ var init_useErc3643Compliance = __esm({
 
 // src/hooks/useNicknameResolve.ts
 import { useQuery as useQuery21 } from "@tanstack/react-query";
-import { useState as useState28, useEffect as useEffect41, useMemo as useMemo13 } from "react";
+import { useState as useState28, useEffect as useEffect40, useMemo as useMemo13 } from "react";
 function looksLikeNickname(input) {
   if (!input) return false;
   if (input.startsWith("0x")) return false;
@@ -21573,7 +21593,7 @@ function useNicknameResolve(input, options) {
   const [isDebouncing, setIsDebouncing] = useState28(false);
   const normalized = normalizeNickname(input);
   const isNicknameInput = looksLikeNickname(input) && normalized.length >= 3;
-  useEffect41(() => {
+  useEffect40(() => {
     if (!isNicknameInput || !enabled) {
       setDebouncedInput("");
       setIsDebouncing(false);
@@ -22561,7 +22581,7 @@ var init_sendSteps = __esm({
 
 // src/internal/components/SendMenu/send/SendMenu.tsx
 import { CheckCircle2 as CheckCircle26, Loader as Loader31 } from "lucide-react";
-import { useEffect as useEffect42, useMemo as useMemo14 } from "react";
+import { useEffect as useEffect41, useMemo as useMemo14 } from "react";
 import { parseUnits as parseUnits2 } from "viem";
 import { Fragment as Fragment42, jsx as jsx107, jsxs as jsxs98 } from "react/jsx-runtime";
 function SendMenu() {
@@ -22583,10 +22603,10 @@ function SendMenu() {
     userOpHash,
     reset
   } = useSendTransaction();
-  useEffect42(() => {
+  useEffect41(() => {
     useFlowSelectorStore.getState().setIsUiLocked(isAssetsLoading || isTransactionPending);
   }, [isAssetsLoading, isTransactionPending]);
-  useEffect42(() => {
+  useEffect41(() => {
     useFlowSelectorStore.getState().setError(sendTransactionError || null);
   }, [sendTransactionError]);
   const {
@@ -22601,7 +22621,7 @@ function SendMenu() {
   } = useSendStore();
   const isNft = isNftAsset3(selectedAsset);
   const isSecurity = isSecurityToken2(selectedAsset);
-  useEffect42(
+  useEffect41(
     () => () => {
       setSelectedAsset(null);
       setRecipient("");
@@ -22611,7 +22631,7 @@ function SendMenu() {
     },
     []
   );
-  useEffect42(() => {
+  useEffect41(() => {
     const shouldSetNativeAsset = assets.length > 0 && !selectedAsset;
     if (!shouldSetNativeAsset) return;
     const native = assets.find((a) => a.type === "native");
@@ -22637,7 +22657,7 @@ function SendMenu() {
     enabled: isSecurity && !!effectiveAddress && !!complianceAmount,
     chainId: activeChainId
   });
-  useEffect42(() => {
+  useEffect41(() => {
     const updateMenuTitle = useFlowSelectorStore.getState().setMenuTitle;
     switch (true) {
       case txStep === "select-asset":
@@ -22730,7 +22750,7 @@ var init_send = __esm({
 
 // src/internal/components/SendMenu/SendFlowSelector.tsx
 import { ArrowLeft as ArrowLeft19, ArrowRightIcon as ArrowRightIcon2, ArrowRightLeftIcon as ArrowRightLeftIcon2, InfoIcon as InfoIcon5 } from "lucide-react";
-import { useEffect as useEffect43 } from "react";
+import { useEffect as useEffect42 } from "react";
 import { jsx as jsx108, jsxs as jsxs99 } from "react/jsx-runtime";
 function SelectorFlowButtons() {
   const { t } = useT();
@@ -22793,7 +22813,7 @@ function SendFlowSelector() {
   const error = useFlowSelectorStore((st) => st.error);
   const menuTitle = useFlowSelectorStore((st) => st.menuTitle);
   const selectorFlow = useFlowSelectorStore((st) => st.flow);
-  useEffect43(
+  useEffect42(
     () => () => {
       useFlowSelectorStore.getState().setError(null);
     },
@@ -22976,7 +22996,7 @@ var init_constants6 = __esm({
 // src/internal/components/SettingsMenu/SettingsMenu.tsx
 import { useQuery as useQuery22 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft20, HardDrive as HardDrive3 } from "lucide-react";
-import { useEffect as useEffect44 } from "react";
+import { useEffect as useEffect43 } from "react";
 import { jsx as jsx110, jsxs as jsxs100 } from "react/jsx-runtime";
 function useSettingsButtons() {
   const config = useProviderConfig().config;
@@ -22995,7 +23015,7 @@ function useSettingsButtons() {
   if (proMode) {
     settingsButtons.push({ id: "devices" /* DEVICES */, name: "Guardians", Icon: HardDrive3 });
   }
-  useEffect44(() => {
+  useEffect43(() => {
     const cssvEl = document.querySelector(".embarkai-ui-scope");
     if (!cssvEl || !window?.getComputedStyle) {
       return;
@@ -24264,7 +24284,7 @@ var init_PageMap = __esm({
 });
 
 // src/internal/hooks/usePageMapper.tsx
-import { useCallback as useCallback30, useEffect as useEffect45 } from "react";
+import { useCallback as useCallback30, useEffect as useEffect44 } from "react";
 import { jsx as jsx115 } from "react/jsx-runtime";
 function usePageMapper() {
   const page = useLayoutDataStore((st) => st.page);
@@ -24297,7 +24317,7 @@ function usePageMapper() {
     },
     [setDialogContent, setDialogDescription, setDialogTitle, setIsDialogOpen]
   );
-  useEffect45(() => {
+  useEffect44(() => {
     if (page === null) return closeDialog();
     const pageItem = PAGE_MAP[page];
     if (!pageItem) {
@@ -24321,7 +24341,7 @@ var init_usePageMapper = __esm({
 
 // src/internal/hooks/useSettingsNotifications.ts
 import { useQuery as useQuery24 } from "@tanstack/react-query";
-import { useEffect as useEffect46 } from "react";
+import { useEffect as useEffect45 } from "react";
 function useSettingsNotifications() {
   const address = useSession((st) => st.address);
   const setSettingsNotifications = useLayoutDataStore((st) => st.setSettingsNotifications);
@@ -24333,14 +24353,14 @@ function useSettingsNotifications() {
     queryKey: [QUERY_KEYS.userProfile, address],
     queryFn: getUserProfile
   });
-  useEffect46(() => {
+  useEffect45(() => {
     const isKYCVerified = userProfile?.kycDetails?.kycStatus === "verified";
     setSettingsNotifications({
       ...COMPLETE_KYC_PROGRESS,
       status: isKYCVerified ? "resolved" : "active"
     });
   }, [userProfile, setSettingsNotifications]);
-  useEffect46(() => {
+  useEffect45(() => {
     setSettingsNotifications({
       ...EMAIL_NOT_CONNECTED_NOTIFICATION,
       status: hasEmail ? "resolved" : "active"
@@ -24373,7 +24393,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.47",
+      version: "0.4.48",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -24473,7 +24493,7 @@ var init_package = __esm({
 // src/internal/components/Footer/Footer.tsx
 import { useMutation as useMutation20, useQueryClient as useQueryClient26 } from "@tanstack/react-query";
 import { Loader as Loader33, LogOut } from "lucide-react";
-import { useDisconnect as useDisconnect2 } from "wagmi";
+import { useDisconnect as useDisconnect3 } from "wagmi";
 import { jsx as jsx116, jsxs as jsxs105 } from "react/jsx-runtime";
 function Footer() {
   const qc = useQueryClient26();
@@ -24481,8 +24501,7 @@ function Footer() {
   const { t } = useT();
   const address = useSession((st) => st.address);
   const chainConfig = useSession((st) => st.chainConfig);
-  const directWalletAddress = useExternalWalletStore((st) => st.externalAddress);
-  const { disconnect: wagmiDisconnect } = useDisconnect2({
+  const { disconnect: wagmiDisconnect } = useDisconnect3({
     mutation: {
       onSuccess: () => {
         useExternalWalletStore.getState().clearExternalWallet();
@@ -24509,7 +24528,7 @@ function Footer() {
     },
     onSuccess: async ({ disconnectAddress, disconnectedUserId }) => {
       await qc.resetQueries({ queryKey: [CHECK_BACKUP_QUERY_KEY] });
-      if (!!directWalletAddress) wagmiDisconnect();
+      if (!!useExternalWalletStore.getState().externalAddress) wagmiDisconnect();
       const { setError, setStatus, setIsLoading, setSession, setAddress } = useSession.getState();
       setSession(null);
       setAddress(null);
@@ -24608,7 +24627,7 @@ var init_Footer2 = __esm({
 // src/internal/components/Header/Header.tsx
 import { useQuery as useQuery25 } from "@tanstack/react-query";
 import { Copy as Copy5, Loader as Loader34 } from "lucide-react";
-import { useCallback as useCallback31, useRef as useRef20, useState as useState32 } from "react";
+import { useCallback as useCallback31, useRef as useRef19, useState as useState32 } from "react";
 import { Fragment as Fragment44, jsx as jsx117, jsxs as jsxs106 } from "react/jsx-runtime";
 function formatAddress2(addr) {
   if (!addr) return "";
@@ -24622,8 +24641,8 @@ function Header() {
   const proMode = useProMode();
   const [proToast, setProToast] = useState32(false);
   const [copied, setCopied] = useState32(false);
-  const clickCountRef = useRef20(0);
-  const clickTimerRef = useRef20(null);
+  const clickCountRef = useRef19(0);
+  const clickTimerRef = useRef19(null);
   const handleAvatarClick = useCallback31(() => {
     clickCountRef.current += 1;
     if (clickTimerRef.current) {
@@ -24926,7 +24945,7 @@ var init_visually_hidden = __esm({
 
 // src/internal/components/Dialog/Dialog.tsx
 import { AnimatePresence, motion } from "framer-motion";
-import { useEffect as useEffect47 } from "react";
+import { useEffect as useEffect46 } from "react";
 import { jsx as jsx120, jsxs as jsxs108 } from "react/jsx-runtime";
 function Dialog2() {
   const config = useProviderConfig().config;
@@ -24938,7 +24957,7 @@ function Dialog2() {
   const isWalletLinking = useLayoutDataStore((st) => st.isWalletLinking);
   const setPage = useLayoutDataStore((st) => st.setPage);
   const { colorMode, isDialogOpen, dialogTitle, dialogDescription, dialogContent, isDialogForced, setIsSettings } = useLayoutStore();
-  useEffect47(() => setIsSettings(!!session), [session, setIsSettings]);
+  useEffect46(() => setIsSettings(!!session), [session, setIsSettings]);
   usePageMapper();
   useAutoConnect();
   useBackupStatusChanges();
@@ -25060,15 +25079,15 @@ var init_TssManager = __esm({
 // src/internal/components/WalletConnectHandler.tsx
 import { useConnectModal as useConnectModal2 } from "@rainbow-me/rainbowkit";
 import { useMutation as useMutation21, useQueryClient as useQueryClient27 } from "@tanstack/react-query";
-import React9, { useCallback as useCallback33, useEffect as useEffect48 } from "react";
-import { useAccount, useDisconnect as useDisconnect3, useSignMessage as useSignMessage2 } from "wagmi";
+import React9, { useCallback as useCallback33, useEffect as useEffect47 } from "react";
+import { useAccount, useDisconnect as useDisconnect4, useSignMessage as useSignMessage2 } from "wagmi";
 function WalletConnectHandler() {
   const qc = useQueryClient27();
   const { callbacksRef } = useProviderConfig();
   const passportWalletAddress = useSession((st) => st.address);
   const { address: walletAddress, isConnected, chain, connector } = useAccount();
   const { openConnectModal, connectModalOpen } = useConnectModal2();
-  const { disconnect } = useDisconnect3();
+  const { disconnect } = useDisconnect4();
   const { signMessageAsync } = useSignMessage2();
   const isWalletLinking = useLayoutDataStore((st) => st.isWalletLinking);
   const setPage = useLayoutDataStore((st) => st.setPage);
@@ -25115,7 +25134,7 @@ function WalletConnectHandler() {
   const [hasStartedLinking, setHasStartedLinking] = React9.useState(false);
   const [modalWasOpened, setModalWasOpened] = React9.useState(false);
   const [pendingModalOpen, setPendingModalOpen] = React9.useState(false);
-  useEffect48(() => {
+  useEffect47(() => {
     if (isWalletLinking && !hasStartedLinking) {
       console.log("[WalletConnectHandler] Starting wallet link flow:", {
         isConnected,
@@ -25153,18 +25172,18 @@ function WalletConnectHandler() {
     setProviderType,
     walletMode
   ]);
-  useEffect48(() => {
+  useEffect47(() => {
     if (pendingModalOpen && !isConnected && openConnectModal) {
       setPendingModalOpen(false);
       openConnectModal();
     }
   }, [pendingModalOpen, isConnected, openConnectModal]);
-  useEffect48(() => {
+  useEffect47(() => {
     if (connectModalOpen && hasStartedLinking) {
       setModalWasOpened(true);
     }
   }, [connectModalOpen, hasStartedLinking]);
-  useEffect48(() => {
+  useEffect47(() => {
     if (modalWasOpened && !connectModalOpen && !isConnected && isWalletLinking) {
       console.log("[WalletConnectHandler] Modal closed without connecting");
       onLinkingComplete(false);
@@ -25172,7 +25191,7 @@ function WalletConnectHandler() {
       setModalWasOpened(false);
     }
   }, [connectModalOpen, modalWasOpened, isConnected, isWalletLinking]);
-  useEffect48(() => {
+  useEffect47(() => {
     if (isWalletLinking) {
       const timeout = setTimeout(() => {
         console.warn("[WalletConnectHandler] Wallet linking timed out, resetting state");
@@ -25292,7 +25311,7 @@ function WalletConnectHandler() {
       setPage(passportWalletAddress ? "manage-wallet" /* MANAGE_WALLET */ : "auth" /* AUTH */);
     }
   });
-  useEffect48(() => {
+  useEffect47(() => {
     if (!!chain?.id && isConnected && walletAddress && isWalletLinking && hasStartedLinking && modalWasOpened && !pendingModalOpen) {
       console.log("[WalletConnectHandler] handleWalletSign triggered");
       if (!passportWalletAddress) {
@@ -25302,7 +25321,7 @@ function WalletConnectHandler() {
       handleWalletSign({ chainId: chain.id, signingWalletAddress: walletAddress });
     }
   }, [chain, isConnected, walletAddress, isWalletLinking, hasStartedLinking, modalWasOpened, pendingModalOpen]);
-  useEffect48(() => {
+  useEffect47(() => {
     if (isConnected && !chain?.id && isWalletLinking && hasStartedLinking && !connectModalOpen && !isWalletSigning) {
       const timeout = setTimeout(() => {
         console.warn("[WalletConnectHandler] Wallet connected but chain info missing, resetting");
@@ -25338,7 +25357,7 @@ var init_WalletConnectHandler = __esm({
 });
 
 // src/internal/components/DirectWalletHandler.tsx
-import { useEffect as useEffect49 } from "react";
+import { useEffect as useEffect48 } from "react";
 import { useAccount as useAccount2 } from "wagmi";
 function DirectWalletHandler() {
   const walletMode = useProviderConfig().config.current?.wallet?.mode || "linked";
@@ -25350,13 +25369,13 @@ function DirectWalletHandler() {
   const setExternalChainId = useExternalWalletStore((st) => st.setExternalChainId);
   const setConfigMode = useExternalWalletStore((st) => st.setConfigMode);
   const setActiveMode = useExternalWalletStore((st) => st.setActiveMode);
-  useEffect49(() => {
+  useEffect48(() => {
     setConfigMode(walletMode);
     if (walletMode !== "both") {
       setActiveMode(walletMode);
     }
   }, [walletMode, setConfigMode, setActiveMode]);
-  useEffect49(() => {
+  useEffect48(() => {
     if (isConnected && address && !isExternalConnected && connector && chain?.id) {
       setExternalWallet({
         address,
@@ -25365,17 +25384,17 @@ function DirectWalletHandler() {
       });
     }
   }, [isConnected, address, isExternalConnected, connector, chain?.id, setExternalWallet]);
-  useEffect49(() => {
+  useEffect48(() => {
     if (isExternalConnected && !isConnected) {
       clearExternalWallet();
     }
   }, [isConnected, isExternalConnected, clearExternalWallet]);
-  useEffect49(() => {
+  useEffect48(() => {
     if (isExternalConnected && isConnected && chain?.id) {
       setExternalChainId(chain.id);
     }
   }, [chain?.id, isConnected, isExternalConnected, setExternalChainId]);
-  useEffect49(() => {
+  useEffect48(() => {
     if (isExternalConnected && isConnected && address && address !== externalAddress && connector && chain?.id) {
       setExternalWallet({
         address,
@@ -28204,9 +28223,9 @@ import {
   createContext,
   useCallback as useCallback34,
   useContext,
-  useEffect as useEffect50,
+  useEffect as useEffect49,
   useMemo as useMemo16,
-  useRef as useRef21
+  useRef as useRef20
 } from "react";
 import { jsx as jsx124 } from "react/jsx-runtime";
 function clearLegacyWagmiStorage() {
@@ -28226,9 +28245,9 @@ function clearLegacyWagmiStorage() {
 }
 function Provider(props) {
   const { children, projectId, initialConfig = {}, callbacks } = props;
-  const callbacksRef = useRef21(callbacks);
-  useEffect50(() => notifyNoProjetctId(projectId), [projectId]);
-  const config = useRef21(merge3({}, DEFAULT_PROVIDER_CONFIG, { projectId }, initialConfig));
+  const callbacksRef = useRef20(callbacks);
+  useEffect49(() => notifyNoProjetctId(projectId), [projectId]);
+  const config = useRef20(merge3({}, DEFAULT_PROVIDER_CONFIG, { projectId }, initialConfig));
   const updateConfig = useCallback34((updates) => {
     const prev = config.current;
     const next = { ...prev };
@@ -28268,7 +28287,7 @@ function Provider(props) {
     const next = updates ? { ...prev, ...updates } : void 0;
     callbacksRef.current = next;
   }, []);
-  useEffect50(() => {
+  useEffect49(() => {
     if (typeof window === "undefined" || !projectId) return;
     const mergedConfig = merge3(DEFAULT_PROVIDER_CONFIG, initialConfig);
     updateConfig(mergedConfig);
@@ -28288,7 +28307,7 @@ function Provider(props) {
       useSession.getState().setActiveChainId(mergedConfig.network.chainId);
     }
   }, [projectId, initialConfig]);
-  useEffect50(() => {
+  useEffect49(() => {
     if (typeof window === "undefined" || !projectId) return;
     try {
       initSdkErrorTracking();
@@ -28470,7 +28489,7 @@ init_pro_mode();
 init_utils2();
 import { useQuery as useQuery26 } from "@tanstack/react-query";
 import { Cloud as Cloud4, Laptop as Laptop2, Loader as Loader35, Shield as Shield3 } from "lucide-react";
-import { useEffect as useEffect51, useMemo as useMemo17 } from "react";
+import { useEffect as useEffect50, useMemo as useMemo17 } from "react";
 import { Fragment as Fragment47, jsx as jsx126, jsxs as jsxs111 } from "react/jsx-runtime";
 function getFormattedStatus(label, status, showStatus) {
   const isStatus = showStatus && status && status !== "idle" && status !== "ready";
@@ -28490,7 +28509,7 @@ function ConnectWalletButton(props) {
   const colorMode = useLayoutStore((st) => st.colorMode);
   const { session, address, hasServerVault, isLoading, isIframeReady, status, setUsePaymaster } = useSession();
   const connectButtonLabel = getFormattedStatus(label || "Connect", status, isIframeReady);
-  useEffect51(() => setUsePaymaster(usePaymaster), [setUsePaymaster, usePaymaster]);
+  useEffect50(() => setUsePaymaster(usePaymaster), [setUsePaymaster, usePaymaster]);
   const { data: profile, isLoading: isProfileLoading } = useQuery26({
     retry: false,
     enabled: !!address,
@@ -29162,13 +29181,13 @@ var Hash = ({
 
 // src/internal/components/TransactionsMenu/TransactionsList.tsx
 init_base();
-import { useEffect as useEffect53, useState as useState36 } from "react";
+import { useEffect as useEffect52, useState as useState36 } from "react";
 import { jsx as jsx132, jsxs as jsxs115 } from "react/jsx-runtime";
 var TransactionsList = ({ address, itemsCount = 10 }) => {
   const [transactions, setTransactions] = useState36([]);
   const [loading, setLoading] = useState36(true);
   const [error, setError] = useState36(null);
-  useEffect53(() => {
+  useEffect52(() => {
     const fetchTransactions2 = async () => {
       try {
         setLoading(true);
@@ -29485,14 +29504,14 @@ init_useExternalWalletStore();
 init_useLayoutDataStore();
 import { useCallback as useCallback39 } from "react";
 import { useConnectModal as useConnectModal3 } from "@rainbow-me/rainbowkit";
-import { useDisconnect as useDisconnect4 } from "wagmi";
+import { useDisconnect as useDisconnect5 } from "wagmi";
 function useDirectWallet() {
   const address = useExternalWalletStore((st) => st.externalAddress);
   const chainId = useExternalWalletStore((st) => st.externalChainId);
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const connectorName = useExternalWalletStore((st) => st.connectorName);
   const clearExternalWallet = useExternalWalletStore((st) => st.clearExternalWallet);
-  const { disconnect: wagmiDisconnect } = useDisconnect4();
+  const { disconnect: wagmiDisconnect } = useDisconnect5();
   const { openConnectModal } = useConnectModal3();
   const setIsWalletLinking = useLayoutDataStore((st) => st.setIsWalletLinking);
   const connect = useCallback39(() => {
@@ -29677,11 +29696,11 @@ init_SessionContext();
 init_useExternalWalletStore();
 import { logout as coreLogout, jwtTokenManager as jwtTokenManager3 } from "@embarkai/core/auth";
 import { useCallback as useCallback42 } from "react";
-import { useDisconnect as useDisconnect5 } from "wagmi";
+import { useDisconnect as useDisconnect6 } from "wagmi";
 function useLogout() {
   const { callbacksRef } = useProviderConfig();
   const address = useSession((st) => st.address);
-  const { disconnect: wagmiDisconnect } = useDisconnect5({
+  const { disconnect: wagmiDisconnect } = useDisconnect6({
     mutation: {
       onSuccess: () => {
         useExternalWalletStore.getState().clearExternalWallet();