@embarkai/ui-kit 0.4.45 → 0.4.47

package/dist/index.js

@@ -2432,15 +2432,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 */);
@@ -7586,25 +7582,15 @@ function useAuthMenuHandlers() {
   const { config, callbacksRef } = useProviderConfig();
   const qc = useQueryClient2();
   const pendingLoginResponseRef = useRef6(null);
-  const setPage = useLayoutDataStore((st) => st.setPage);
-  const setIsDialogForced = useLayoutStore((st) => st.setIsDialogForced);
   const [telegramCleanup, setTelegramCleanup] = useState2(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 = useCallback8(
     async (userId, hasServerKeyshare, isNewUser) => {
+      const { setStatus } = useSession.getState();
       try {
         try {
           callbacksRef.current?.onConnecting?.({ method: "wallet" });
@@ -7642,9 +7628,19 @@ function useAuthMenuHandlers() {
         throw error;
       }
     },
-    [setStatus, usePaymaster, activeChainId]
+    [usePaymaster, activeChainId]
   );
   const onAuthSuccess = useCallback8(async () => {
+    const {
+      //
+      setSession,
+      setAddress,
+      setStatus,
+      setIsLoading,
+      setError,
+      setHasServerVault,
+      setRecoveryUserId
+    } = useSession.getState();
     setIsLoading(true);
     setStep("loading");
     const loginResponse = pendingLoginResponseRef.current;
@@ -7708,11 +7704,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) {
@@ -7724,9 +7720,7 @@ 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 jwtTokenManager2.clearTokens();
@@ -7742,20 +7736,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 = useCallback8(() => {
     setStep("signin");
     setAlert(null);
@@ -9545,11 +9526,12 @@ var init_networks = __esm({
 });
 
 // src/internal/components/BuyMenu/binance/BinanceSummary.tsx
-import { useMutation as useMutation5 } from "@tanstack/react-query";
+import { useMutation as useMutation5, useQueryClient as useQueryClient3 } from "@tanstack/react-query";
 import { InfoIcon as InfoIcon3, LoaderIcon } from "lucide-react";
 import { jsx as jsx33, jsxs as jsxs29 } from "react/jsx-runtime";
 function BinanceSummary(props) {
   const { payment } = props;
+  const qc = useQueryClient3();
   const { t } = useT();
   const walletAddress = useSession((st) => st.address);
   const chainConfig = useSession((st) => st.chainConfig);
@@ -9568,10 +9550,10 @@ function BinanceSummary(props) {
         network: CHAIN_ID_TO_BINANCE_NETWORK_NAMES[chainConfig.id],
         payMethodCode: payment?.payMethodCode || void 0,
         payMethodSubCode: payment?.payMethodSubCode || void 0,
-        // redirectUrl: returnUrl,
-        // failRedirectUrl: returnUrl,
         // TODO: pass quote response to backend to create order with exact quote details (amount, fees, etc.)
         quote: quoteData
+        // redirectUrl: returnUrl,
+        // failRedirectUrl: returnUrl,
       });
     },
     onSuccess: (response) => {
@@ -9582,6 +9564,7 @@ function BinanceSummary(props) {
       } else {
         setTimeout(() => {
           setRedirecting(false);
+          qc.invalidateQueries({ queryKey: [QUERY_KEYS2.binanceTransactions] });
           window.open(link, "_blank", "noopener,noreferrer");
           useBuyMenuStore.getState().setError(null);
           useBuyMenuStore.getState().setIsTransactionHistory(true);
@@ -9591,6 +9574,7 @@ function BinanceSummary(props) {
     onError: (err) => {
       setRedirecting(false);
       console.error("[BINANCE] Create Checkout Order failed", err);
+      qc.invalidateQueries({ queryKey: [QUERY_KEYS2.binanceTransactions] });
     }
   });
   const isContinueDisabled = !!redirecting || !!isFundWalletOrderCheckouting || !quoteData;
@@ -9669,6 +9653,7 @@ var init_BinanceSummary = __esm({
     init_button();
     init_highlight();
     init_contants();
+    init_queryKeys();
     init_useBuyMenuStore();
     init_api();
     init_networks();
@@ -9917,31 +9902,40 @@ function BinanceTxHistoryItem(props) {
         /* @__PURE__ */ jsxs30("div", { className: "w-full flex items-start gap-[var(--ui-kit-gap)] mb-1", children: [
           /* @__PURE__ */ jsx35(TokenIcon, { className: "w-8 h-8" }),
           /* @__PURE__ */ jsxs30("div", { className: "w-full", children: [
+            Number(fiatAmount || "0") > 0 && /* @__PURE__ */ jsxs30("p", { className: "text-[10px] leading-3", children: [
+              formatPrice(Number(fiatAmount)),
+              " ",
+              fiatCurrency
+            ] }),
             /* @__PURE__ */ jsxs30("p", { className: "text-lg leading-5", children: [
               /* @__PURE__ */ jsx35("strong", { children: formatPrice(Number(cryptoAmount)) }),
               " ",
               cryptoCurrency
-            ] }),
-            Number(fiatAmount || "0") > 0 && /* @__PURE__ */ jsxs30("p", { className: "text-[10px] leading-4", children: [
-              formatPrice(Number(fiatAmount)),
-              " ",
-              fiatCurrency
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs30("div", { className: "flex items-center gap-[var(--ui-kit-gap)] justify-between mb-1", children: [
-          /* @__PURE__ */ jsxs30("span", { className: cn("text-[10px] leading-5 text-[var(--ui-kit-fg-muted)]"), children: [
+        /* @__PURE__ */ jsxs30("div", { className: "flex items-center gap-[var(--ui-kit-gap)] justify-between leading-4", children: [
+          /* @__PURE__ */ jsxs30("span", { className: "flex-none whitespace-nowrap text-[10px] text-[var(--ui-kit-fg-muted)]", children: [
             "ID: ",
             id
           ] }),
-          /* @__PURE__ */ jsx35("span", { className: "text-[10px] leading-5 text-[var(--ui-kit-fg-muted)]", children: dayjs(updatedAt || createdAt).format("MMM D YYYY [at] HH:mm") })
+          /* @__PURE__ */ jsx35(
+            "span",
+            {
+              className: cn(
+                "whitespace-nowrap overflow-hidden text-ellipsis",
+                "block flex-1 text-[10px] text-right text-[var(--ui-kit-fg-muted)]"
+              ),
+              children: dayjs(updatedAt || createdAt).format("MMM D YYYY [at] HH:mm")
+            }
+          )
         ] }),
         orderDetailLink && /* @__PURE__ */ jsxs30(
           Button,
           {
             variant: "outline",
             size: "medium",
-            className: "w-full",
+            className: "w-full mt-1",
             onClick: () => window.open(orderDetailLink, "_blank", "noopener,noreferrer"),
             children: [
               /* @__PURE__ */ jsx35(ExternalLinkIcon, { className: "w-4 h-4" }),
@@ -9991,7 +9985,7 @@ function BinanceTxHistory() {
     return /* @__PURE__ */ jsx35(Highlight, { children: t("passport:buyMenu.noItems.noTransactions") });
   }
   return /* @__PURE__ */ jsxs30("div", { className: "flex flex-col gap-[var(--ui-kit-gap)]", children: [
-    txList.map((tx) => /* @__PURE__ */ jsx35(BinanceTxHistoryItem, { ...tx }, tx.id)),
+    isTxDataLoading ? /* @__PURE__ */ jsx35("div", { className: "w-full flex items-center justify-center p-[var(--ui-kit-pd)]", children: /* @__PURE__ */ jsx35(LoaderIcon2, { className: "w-4 h-4 animate-spin" }) }) : txList.map((tx) => /* @__PURE__ */ jsx35(BinanceTxHistoryItem, { ...tx }, tx.id)),
     hasNextPage && /* @__PURE__ */ jsxs30(
       Button,
       {
@@ -10029,10 +10023,10 @@ var init_BinanceTxHistory = __esm({
 });
 
 // src/internal/components/BuyMenu/binance/useBinanceSseTracing.ts
-import { useQueryClient as useQueryClient3 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient4 } from "@tanstack/react-query";
 import { useEffect as useEffect12, useRef as useRef8 } from "react";
 function useBinanceSseTxTracing(walletAddress) {
-  const qc = useQueryClient3();
+  const qc = useQueryClient4();
   const debounceRef = useRef8(null);
   useEffect12(() => {
     if (!walletAddress) return;
@@ -10042,7 +10036,7 @@ function useBinanceSseTxTracing(walletAddress) {
       if (data?.type !== "ORDER_UPDATED") return;
       if (debounceRef.current) clearTimeout(debounceRef.current);
       debounceRef.current = setTimeout(() => {
-        qc.invalidateQueries({ queryKey: [QUERY_KEYS2.binanceTransactions, walletAddress] });
+        qc.invalidateQueries({ queryKey: [QUERY_KEYS2.binanceTransactions] });
       }, 500);
     }) || null;
     connectTxTracing({ walletAddress }).catch(
@@ -10074,7 +10068,7 @@ var init_utils6 = __esm({
 });
 
 // src/internal/components/BuyMenu/binance/Binance.tsx
-import { useMutation as useMutation6, useQuery as useQuery2, useQueryClient as useQueryClient4 } from "@tanstack/react-query";
+import { useMutation as useMutation6, useQuery as useQuery2, useQueryClient as useQueryClient5 } from "@tanstack/react-query";
 import { LoaderIcon as LoaderIcon3 } from "lucide-react";
 import { useEffect as useEffect13 } from "react";
 import { Fragment as Fragment11, jsx as jsx36, jsxs as jsxs31 } from "react/jsx-runtime";
@@ -10084,7 +10078,7 @@ function normalizeChainName(chainName) {
   return chainName.toUpperCase();
 }
 function Binance() {
-  const qc = useQueryClient4();
+  const qc = useQueryClient5();
   const { t, i18n } = useT();
   const resolvedLanguage = i18n.resolvedLanguage || "en";
   const chainConfig = useSession((st) => st.chainConfig);
@@ -10700,10 +10694,10 @@ var init_networks2 = __esm({
 });
 
 // src/internal/components/BuyMenu/finchpay/useFinchpaySseTxTracing.ts
-import { useQueryClient as useQueryClient5 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient6 } from "@tanstack/react-query";
 import { useEffect as useEffect14, useRef as useRef9 } from "react";
 function useFinchpaySseTxTracing(walletAddress) {
-  const qc = useQueryClient5();
+  const qc = useQueryClient6();
   const debounceRef = useRef9(null);
   useEffect14(() => {
     if (!walletAddress) return;
@@ -10752,12 +10746,12 @@ var init_utils7 = __esm({
 });
 
 // src/internal/components/BuyMenu/finchpay/FinchPay.tsx
-import { useQuery as useQuery3, useQueryClient as useQueryClient6 } from "@tanstack/react-query";
+import { useQuery as useQuery3, useQueryClient as useQueryClient7 } from "@tanstack/react-query";
 import { DollarSign, LoaderIcon as LoaderIcon5 } from "lucide-react";
 import { useEffect as useEffect15 } from "react";
 import { Fragment as Fragment12, jsx as jsx39, jsxs as jsxs34 } from "react/jsx-runtime";
 function FinchPay() {
-  const qc = useQueryClient6();
+  const qc = useQueryClient7();
   const { t, i18n } = useT();
   const resolvedLanguage = i18n.resolvedLanguage || "en";
   const chainConfig = useSession((st) => st.chainConfig);
@@ -11577,75 +11571,51 @@ var init_LumiaIcon2 = __esm({
   }
 });
 
-// src/config/networks.ts
+// src/internal/assets/networks/index.ts
 import {
   ARBITRUM_SEPOLIA_CHAIN_ID,
   BASE_SEPOLIA_CHAIN_ID,
+  BSC_MAINNET_CHAIN_ID,
   BSC_TESTNET_CHAIN_ID as BSC_TESTNET_CHAIN_ID3,
-  LUMIA_PULSAR_TESTNET_CHAIN_ID,
   LUMIA_MAINNET_CHAIN_ID as LUMIA_MAINNET_CHAIN_ID3,
-  LUMIA_TESTNET_CHAIN_ID as LUMIA_TESTNET_CHAIN_ID3,
-  SEPOLIA_CHAIN_ID
+  LUMIA_PULSAR_TESTNET_CHAIN_ID,
+  LUMIA_TESTNET_CHAIN_ID as LUMIA_TESTNET_CHAIN_ID3
 } from "@embarkai/core/read";
-var NETWORK_OPTIONS;
+var NETWORKS_ICONS;
 var init_networks3 = __esm({
-  "src/config/networks.ts"() {
+  "src/internal/assets/networks/index.ts"() {
     init_ArbitrumIcon();
     init_BaseIcon();
     init_BscIcon();
     init_EthereumIcon();
     init_LumiaIcon2();
-    NETWORK_OPTIONS = [
-      {
-        chainId: LUMIA_TESTNET_CHAIN_ID3,
-        name: "Lumia Beam",
-        badge: "TESTNET",
-        Icon: LumiaIcon2,
-        isActive: true
-      },
-      {
-        chainId: LUMIA_MAINNET_CHAIN_ID3,
-        name: "Lumia Prism",
-        badge: "MAINNET",
-        Icon: LumiaIcon2,
-        isActive: true
-      },
-      {
-        chainId: SEPOLIA_CHAIN_ID,
-        name: "Sepolia",
-        badge: "TESTNET",
-        Icon: EthereumIcon,
-        isActive: true
-      },
-      {
-        chainId: BSC_TESTNET_CHAIN_ID3,
-        name: "BSC Testnet",
-        badge: "TESTNET",
-        Icon: BSCIcon,
-        isActive: true
-      },
-      {
-        chainId: ARBITRUM_SEPOLIA_CHAIN_ID,
-        name: "Arbitrum Sepolia",
-        badge: "TESTNET",
-        Icon: ArbitrumIcon,
-        isActive: true
-      },
-      {
-        chainId: BASE_SEPOLIA_CHAIN_ID,
-        name: "Base Sepolia",
-        badge: "TESTNET",
-        Icon: BaseIcon,
-        isActive: true
-      },
-      {
-        chainId: LUMIA_PULSAR_TESTNET_CHAIN_ID,
-        name: "Lumia Pulsar Testnet",
-        badge: "TESTNET",
-        Icon: LumiaIcon2,
-        isActive: true
-      }
-    ];
+    NETWORKS_ICONS = {
+      [LUMIA_MAINNET_CHAIN_ID3]: LumiaIcon2,
+      [LUMIA_TESTNET_CHAIN_ID3]: LumiaIcon2,
+      [LUMIA_PULSAR_TESTNET_CHAIN_ID]: LumiaIcon2,
+      [BASE_SEPOLIA_CHAIN_ID]: BaseIcon,
+      [BSC_MAINNET_CHAIN_ID]: BSCIcon,
+      [BSC_TESTNET_CHAIN_ID3]: BSCIcon,
+      1: EthereumIcon,
+      [ARBITRUM_SEPOLIA_CHAIN_ID]: ArbitrumIcon
+    };
+  }
+});
+
+// src/config/networks.ts
+import { SUPPORTED_CHAINS, SUPPORTED_MAINNETS } from "@embarkai/core/read";
+var NETWORK_OPTIONS;
+var init_networks4 = __esm({
+  "src/config/networks.ts"() {
+    init_networks3();
+    init_EmbarkIcon();
+    NETWORK_OPTIONS = [...SUPPORTED_CHAINS].map(([chainId, chain]) => ({
+      chainId,
+      name: chain.name,
+      badge: SUPPORTED_MAINNETS.includes(chainId) ? "MAINNET" : "TESTNET",
+      Icon: NETWORKS_ICONS[chainId] || EmbarkIcon,
+      isActive: true
+    }));
   }
 });
 
@@ -11842,7 +11812,7 @@ function ChainsMenu() {
 }
 var init_ChainsMenu = __esm({
   "src/internal/components/ChainsMenu/ChainsMenu.tsx"() {
-    init_networks3();
+    init_networks4();
     init_ProviderContext();
     init_SessionContext();
     init_useT();
@@ -11946,7 +11916,7 @@ function ChainSwitchRequest() {
 }
 var init_ChainSwitchRequest = __esm({
   "src/internal/components/ChainsMenu/ChainSwitchRequest.tsx"() {
-    init_networks3();
+    init_networks4();
     init_ProviderContext();
     init_SessionContext();
     init_useT();
@@ -11967,7 +11937,7 @@ var init_ChainsMenu2 = __esm({
 });
 
 // src/internal/clients/devices.ts
-import { useMutation as useMutation8, useQuery as useQuery5, useQueryClient as useQueryClient7 } from "@tanstack/react-query";
+import { useMutation as useMutation8, useQuery as useQuery5, useQueryClient as useQueryClient8 } from "@tanstack/react-query";
 async function getDevices() {
   const response = await tssClient.get("/api/auth/devices", true);
   if (!response.success || !response.data) {
@@ -11999,7 +11969,7 @@ function useDevices() {
   });
 }
 function useLinkDevice() {
-  const qc = useQueryClient7();
+  const qc = useQueryClient8();
   return useMutation8({
     mutationFn: (code) => linkDevice(code),
     onSuccess: () => {
@@ -12008,7 +11978,7 @@ function useLinkDevice() {
   });
 }
 function useUnlinkDevice() {
-  const qc = useQueryClient7();
+  const qc = useQueryClient8();
   return useMutation8({
     mutationFn: (deviceId) => unlinkDevice(deviceId),
     onSuccess: () => {
@@ -13751,43 +13721,46 @@ var init_cloudStorage = __esm({
 });
 
 // src/internal/components/KeyshareRestoreMenu/hooks/useCreateBackup.ts
-import { useMutation as useMutation9, useQueryClient as useQueryClient8 } from "@tanstack/react-query";
-import { useEffect as useEffect20 } from "react";
+import { useMutation as useMutation9, useQueryClient as useQueryClient9 } from "@tanstack/react-query";
+import { useCallback as useCallback17, useEffect as useEffect20 } from "react";
 function useCreateBackup() {
-  const qc = useQueryClient8();
+  const qc = useQueryClient9();
   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);
   useEffect20(() => {
     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 = useCallback17(() => {
+    console.log("[EMBARKAI BACKUP] Backup created successfully");
+  }, [hasServerVault]);
   const { mutate: createPasswordBackup, isPending: isPasswordBackupCreating } = useMutation9({
     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 = jwtTokenManager2.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("");
@@ -13795,7 +13768,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
+              }
             })
           );
         }
@@ -13803,9 +13780,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.");
@@ -13834,7 +13812,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", {
@@ -13845,13 +13823,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 } = useMutation9({
     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();
@@ -13861,11 +13839,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.");
@@ -13898,7 +13878,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(
@@ -13910,7 +13890,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] });
     }
   });
@@ -13928,6 +13908,7 @@ function useCreateBackup() {
 var init_useCreateBackup = __esm({
   "src/internal/components/KeyshareRestoreMenu/hooks/useCreateBackup.ts"() {
     init_SessionContext();
+    init_auth();
     init_useLayoutStore();
     init_iframe_manager();
     init_constants4();
@@ -14541,7 +14522,7 @@ var init_File = __esm({
 });
 
 // src/internal/components/KeyshareRestoreMenu/methods/Server.tsx
-import { useQueryClient as useQueryClient9 } from "@tanstack/react-query";
+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";
@@ -14549,7 +14530,7 @@ import { Fragment as Fragment21, jsx as jsx58, jsxs as jsxs53 } from "react/jsx-
 function Server(props) {
   const { isLoading, mode = "restore", serverHandler, createPasskeyHandler } = props;
   const address = useSession((st) => st.address);
-  const qc = useQueryClient9();
+  const qc = useQueryClient10();
   const { t } = useT();
   const usePasskey = useRestoreStore((st) => st.usePasskey);
   const setUsePasskey = useRestoreStore((st) => st.setUsePasskey);
@@ -14996,7 +14977,7 @@ var init_methods = __esm({
 });
 
 // src/internal/components/KeyshareRestoreMenu/KeyshareRestoreMenu.tsx
-import { useMutation as useMutation11, useQuery as useQuery7, useQueryClient as useQueryClient10 } from "@tanstack/react-query";
+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 { Fragment as Fragment24, jsx as jsx62, jsxs as jsxs57 } from "react/jsx-runtime";
@@ -15025,26 +15006,17 @@ var init_KeyshareRestoreMenu = __esm({
       guardian: Guardian
     };
     KeyshareRestoreMenu = () => {
-      const qc = useQueryClient10();
+      const qc = useQueryClient11();
       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);
       useEffect25(() => {
+        const { setIsDialogForced } = useLayoutStore.getState();
+        const { setRestorePassword, setRestoreFile, setShowPassword, setUsePasskey, setMethod } = useRestoreStore.getState();
         setIsDialogForced(true);
         return () => {
           setRestorePassword("");
@@ -15071,14 +15043,17 @@ var init_KeyshareRestoreMenu = __esm({
       });
       const hasServerBackup = serverRecoveryStatus?.created || serverRecoveryStatus?.devices?.length > 0;
       useEffect25(() => {
-        if (!!hasServerBackup) setMethod("server");
+        if (!!hasServerBackup) useRestoreStore.getState().setMethod("server");
       }, [hasServerBackup]);
       const { mutate: disconnect, isPending: isDisconnecting } = useMutation11({
         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));
@@ -15087,20 +15062,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;
@@ -15134,6 +15111,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("");
@@ -15163,6 +15141,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);
@@ -15209,20 +15196,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);
   useEffect26(() => {
+    const { setSuccess, setError, setRestorePassword, setRestoreFile, setShowPassword, setUsePasskey, setMethod } = useRestoreStore.getState();
     return () => {
       setSuccess(null);
       setError(null);
@@ -15236,13 +15214,12 @@ function KeyshareBackupMenu() {
   const { data: serverRecoveryStatus, isLoading: isRecoveryLoading } = useQuery8({
     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;
   useEffect26(() => {
-    if (!!hasRecoveryData) setMethod("server");
+    if (!!hasRecoveryData) useRestoreStore.getState().setMethod("server");
   }, [hasRecoveryData]);
   const {
     isPasswordBackupCreating,
@@ -15275,6 +15252,16 @@ function KeyshareBackupMenu() {
                 size: "icon",
                 title: "Back",
                 onClick: () => {
+                  const {
+                    setSuccess,
+                    setError,
+                    setRestorePassword,
+                    setRestoreFile,
+                    setShowPassword,
+                    setUsePasskey,
+                    setMethod,
+                    setSelectedCloudProvider
+                  } = useRestoreStore.getState();
                   setRestorePassword("");
                   setRestoreFile(null);
                   setShowPassword(false);
@@ -15297,6 +15284,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("");
@@ -15329,21 +15317,12 @@ function KeyshareBackupMenu() {
           /* @__PURE__ */ jsx63(AlertCircle3, { className: "h-4 w-4 flex-shrink-0" }),
           /* @__PURE__ */ jsx63("span", { className: "block w-full flex-1", children: error })
         ] }),
-        success && /* @__PURE__ */ jsxs58(Fragment25, { children: [
-          /* @__PURE__ */ jsxs58(Highlight, { type: "success", className: "flex gap-[var(--ui-kit-gap)]", children: [
+        success && /* @__PURE__ */ jsxs58(Highlight, { type: "success", className: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
+          /* @__PURE__ */ jsxs58("div", { className: "w-full flex gap-[var(--ui-kit-gap)]", children: [
             /* @__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: "Done"
-            }
-          )
+          /* @__PURE__ */ jsx63(Button, { variant: "default", size: "large", className: "w-full", onClick: () => setPage("settings" /* SETTINGS */), children: t("passport:common.continue") })
         ] })
       ] })
     }
@@ -15383,7 +15362,7 @@ var init_KeyshareRestoreMenu2 = __esm({
 });
 
 // src/hooks/useColorMode.ts
-import { useCallback as useCallback17, useEffect as useEffect27 } from "react";
+import { useCallback as useCallback18, useEffect as useEffect27 } from "react";
 function useColorMode() {
   const {
     config: { current: config }
@@ -15391,7 +15370,7 @@ function useColorMode() {
   const preferedColorMode = config?.preferedColorMode;
   const colorMode = useLayoutStore((st) => st.colorMode);
   const handleStoreColorMode = useLayoutStore((st) => st.setColorMode);
-  const setColorMode = useCallback17(
+  const setColorMode = useCallback18(
     (mode) => {
       localStorage.setItem(LOCAL_COLOR_MODE_KEY, mode);
       handleStoreColorMode(mode);
@@ -15886,10 +15865,10 @@ var init_MainMenu2 = __esm({
 });
 
 // src/modules/linkedProfiles.ts
-import { useQuery as useQuery11, useQueryClient as useQueryClient11 } from "@tanstack/react-query";
-import { useCallback as useCallback18 } from "react";
+import { useQuery as useQuery11, useQueryClient as useQueryClient12 } from "@tanstack/react-query";
+import { useCallback as useCallback19 } from "react";
 function useLinkedProfiles() {
-  const qc = useQueryClient11();
+  const qc = useQueryClient12();
   const address = useSession((st) => st.address);
   const { data, isFetching, isLoading, error } = useQuery11({
     retry: false,
@@ -15911,7 +15890,7 @@ function useLinkedProfiles() {
     }
   });
   const { profiles = [], avatar = null } = data || {};
-  const refresh = useCallback18(async () => {
+  const refresh = useCallback19(async () => {
     await qc.invalidateQueries({ queryKey: [LINKED_PROFILES_QUERY_KEY, address] });
   }, [qc, address]);
   return { profiles, avatar, isLoading, isFetching, error, refresh };
@@ -16131,10 +16110,10 @@ var init_useSendVerificationCode = __esm({
 });
 
 // src/internal/components/ManageWalletMenu/hooks/useVerifyCode.ts
-import { useMutation as useMutation14, useQueryClient as useQueryClient12 } from "@tanstack/react-query";
+import { useMutation as useMutation14, useQueryClient as useQueryClient13 } from "@tanstack/react-query";
 function useVerifyCode() {
   const { callbacksRef } = useProviderConfig();
-  const qc = useQueryClient12();
+  const qc = useQueryClient13();
   const address = useSession((st) => st.address);
   const setIsLoading = useSession((st) => st.setIsLoading);
   const {
@@ -16198,7 +16177,7 @@ var init_useVerifyCode = __esm({
 });
 
 // src/internal/components/ManageWalletMenu/AddProvider.tsx
-import { useQueryClient as useQueryClient13 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient14 } from "@tanstack/react-query";
 import { Fragment as Fragment27, jsx as jsx70, jsxs as jsxs65 } from "react/jsx-runtime";
 function normalizePasskeyLinkError(msg) {
   const lower = msg.toLowerCase();
@@ -16211,7 +16190,7 @@ function normalizePasskeyLinkError(msg) {
   return msg;
 }
 function AddProvider() {
-  const qc = useQueryClient13();
+  const qc = useQueryClient14();
   const { callbacksRef } = useProviderConfig();
   const address = useSession((st) => st.address);
   const { t } = useT();
@@ -16388,7 +16367,7 @@ var init_EmailNotConnectedWarning = __esm({
 });
 
 // src/internal/components/ManageWalletMenu/hooks/useLinkSocial.ts
-import { useQueryClient as useQueryClient14 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient15 } from "@tanstack/react-query";
 import React5, { useEffect as useEffect30 } from "react";
 function normalizeSocialLinkError(message) {
   if (message === "X_ALREADY_LINKED") {
@@ -16397,7 +16376,7 @@ function normalizeSocialLinkError(message) {
   return message;
 }
 function useLinkSocial() {
-  const qc = useQueryClient14();
+  const qc = useQueryClient15();
   const address = useSession((st) => st.address);
   const {
     config: { current: config },
@@ -16547,19 +16526,19 @@ var init_telegram2 = __esm({
 });
 
 // src/internal/components/ManageWalletMenu/hooks/useLinkTelegram.ts
-import { useQueryClient as useQueryClient15 } from "@tanstack/react-query";
-import { useCallback as useCallback19, useEffect as useEffect31, useState as useState17 } from "react";
+import { useQueryClient as useQueryClient16 } from "@tanstack/react-query";
+import { useCallback as useCallback20, useEffect as useEffect31, useState as useState17 } from "react";
 function useLinkTelegram() {
   const {
     config: { current: config },
     callbacksRef
   } = useProviderConfig();
-  const qc = useQueryClient15();
+  const qc = useQueryClient16();
   const address = useSession((st) => st.address);
   const isWalletLinking = useLayoutDataStore((st) => st.isWalletLinking);
   const { providerType, linkIsLoading, setLinkIsLoading, setProviderType, setAlert } = useManageWalletStore();
   const setPage = useLayoutDataStore((st) => st.setPage);
-  const handleLinkTelegram = useCallback19(async () => {
+  const handleLinkTelegram = useCallback20(async () => {
     try {
       if (shouldBlockSocialAuthInTelegram("telegram")) {
         setAlert(buildTelegramBrowserRestriction("Telegram", "linking"));
@@ -16956,13 +16935,13 @@ var init_useExternalWalletStore = __esm({
 });
 
 // src/internal/components/ManageWalletMenu/UnlinkProviderMenu.tsx
-import { useMutation as useMutation15, useQueryClient as useQueryClient16 } from "@tanstack/react-query";
+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 { jsx as jsx74, jsxs as jsxs69 } from "react/jsx-runtime";
 function UnlinkProviderMenu() {
-  const qc = useQueryClient16();
+  const qc = useQueryClient17();
   const address = useSession((st) => st.address);
   const { callbacksRef } = useProviderConfig();
   const { disconnect: disconnectExternalWallet } = useDisconnect();
@@ -17197,9 +17176,9 @@ var init_nickname_validation = __esm({
 });
 
 // src/internal/components/NicknameMenu/NicknameEditForm.tsx
-import { useMutation as useMutation16, useQueryClient as useQueryClient17 } from "@tanstack/react-query";
+import { useMutation as useMutation16, useQueryClient as useQueryClient18 } from "@tanstack/react-query";
 import { AtSign, Check as Check2, ChevronRight as ChevronRight5, Copy as Copy2, Loader as Loader17 } from "lucide-react";
-import { useCallback as useCallback20, useState as useState19 } from "react";
+import { useCallback as useCallback21, useState as useState19 } from "react";
 import { Fragment as Fragment29, jsx as jsx76, jsxs as jsxs71 } from "react/jsx-runtime";
 function NicknameEditForm(props) {
   const {
@@ -17214,7 +17193,7 @@ function NicknameEditForm(props) {
     info
   } = props;
   const { handle: currentNickname, canChange } = info || { handle: "", canChange: false };
-  const qc = useQueryClient17();
+  const qc = useQueryClient18();
   const { t } = useT();
   const passportWalletAddress = useSession((st) => st.address);
   const { callbacksRef } = useProviderConfig();
@@ -17250,7 +17229,7 @@ function NicknameEditForm(props) {
       );
     }
   });
-  const handleInputChange = useCallback20(
+  const handleInputChange = useCallback21(
     (e) => {
       const value = e.target.value;
       setInputValue(value);
@@ -17264,7 +17243,7 @@ function NicknameEditForm(props) {
     },
     [clientError, isNicknameChangeError, isNicknameChangeSuccess, reset, t]
   );
-  const handleSubmit = useCallback20(
+  const handleSubmit = useCallback21(
     (e) => {
       if (!canChange) return;
       e.preventDefault();
@@ -17666,7 +17645,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 useCallback21, useMemo as useMemo9, useRef as useRef16 } from "react";
+import { useCallback as useCallback22, useMemo as useMemo9, useRef as useRef16 } from "react";
 import { formatEther, formatUnits as formatUnits3 } from "viem";
 function resolveIpfsUri(uri) {
   if (!uri) return "";
@@ -17973,7 +17952,7 @@ function useBlockscoutAssets(options) {
     if (!tokensError) return null;
     return createError(tokensError);
   }, [tokensError]);
-  const refreshBalances = useCallback21(async () => {
+  const refreshBalances = useCallback22(async () => {
     const now = Date.now();
     if (now - lastRefreshRef.current < BLOCKSCOUT_REFRESH_DEBOUNCE) {
       return;
@@ -17981,7 +17960,7 @@ function useBlockscoutAssets(options) {
     lastRefreshRef.current = now;
     await Promise.all([refetchNative(), refetchTokens(), refetchNfts(), refetchWatchTokens()]);
   }, [refetchNative, refetchTokens, refetchNfts, refetchWatchTokens]);
-  const getTokenBalance = useCallback21(
+  const getTokenBalance = useCallback22(
     (tokenAddress) => {
       return assets.find((a) => a.address?.toLowerCase() === tokenAddress.toLowerCase()) || null;
     },
@@ -18068,7 +18047,7 @@ var init_BalanceView2 = __esm({
 });
 
 // src/internal/components/PortfolioMenu/PortfolioItem.tsx
-import { useQuery as useQuery16, useQueryClient as useQueryClient18 } from "@tanstack/react-query";
+import { useQuery as useQuery16, useQueryClient as useQueryClient19 } from "@tanstack/react-query";
 import { Image as ImageIcon, Loader as Loader19, ShieldAlert, Sparkles } from "lucide-react";
 import { useState as useState22 } from "react";
 import { formatUnits as formatUnits5 } from "viem";
@@ -18161,7 +18140,7 @@ function PortfolioItem(props) {
   const { assets: projectAssets, showBalanceAs: showBalanceAsSymbol } = providerConfig.projectAssets || {};
   const customAssetRateQuery = providerConfig.portfolio?.assetRateQuery;
   const customAssetRateQueryKey = providerConfig.portfolio?.assetRateQueryKey;
-  const qc = useQueryClient18();
+  const qc = useQueryClient19();
   const { balanceQueryKey } = projectAssets?.find((a) => a.symbol === showBalanceAsSymbol) || {};
   const projectAssetBalance = !!balanceQueryKey ? qc.getQueryData(balanceQueryKey) : null;
   const isNft = isNftAsset(asset);
@@ -18255,14 +18234,14 @@ var init_PortfolioItem = __esm({
 });
 
 // src/internal/components/PortfolioMenu/PortfolioMenu.tsx
-import { useQueryClient as useQueryClient19 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient20 } from "@tanstack/react-query";
 import { AlertCircle as AlertCircle4, ArrowLeft as ArrowLeft16, Gem, Loader as Loader20, RefreshCw as RefreshCw2 } from "lucide-react";
-import { useCallback as useCallback22 } from "react";
+import { useCallback as useCallback23 } from "react";
 import { jsx as jsx80, jsxs as jsxs75 } from "react/jsx-runtime";
 function PortfolioMenu() {
   const { assets: projectAssets = [] } = useProviderConfig().config.current?.projectAssets || {};
   const { t } = useT();
-  const qc = useQueryClient19();
+  const qc = useQueryClient20();
   const address = useSession((st) => st.address);
   const setPage = useLayoutDataStore((st) => st.setPage);
   const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
@@ -18277,7 +18256,7 @@ function PortfolioMenu() {
     enabled: !!address
   });
   const shownProjectAssests = projectAssets.filter((asset) => !asset.hideInPortfolio);
-  const refreshAllAssetsBalances = useCallback22(() => {
+  const refreshAllAssetsBalances = useCallback23(() => {
     Promise.all(shownProjectAssests.map((asset) => qc.invalidateQueries({ queryKey: asset.balanceQueryKey })));
     refreshBlockscoutBalances();
   }, [qc, shownProjectAssests, refreshBlockscoutBalances]);
@@ -18432,7 +18411,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 useCallback23, useEffect as useEffect33, useMemo as useMemo10, useState as useState23 } from "react";
+import { useCallback as useCallback24, useEffect as useEffect33, 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);
@@ -18467,7 +18446,7 @@ function ReceiveMenu() {
       });
     }
   }, [open, address]);
-  const handleCopy = useCallback23(async () => {
+  const handleCopy = useCallback24(async () => {
     if (!address) return;
     try {
       await navigator.clipboard.writeText(address);
@@ -18477,7 +18456,7 @@ function ReceiveMenu() {
       console.error("Failed to copy address:", error);
     }
   }, [address]);
-  const handleCopyFingerprint = useCallback23(async () => {
+  const handleCopyFingerprint = useCallback24(async () => {
     if (!fingerprint) return;
     try {
       await navigator.clipboard.writeText(fingerprint);
@@ -19000,12 +18979,12 @@ var init_UntrustApplication = __esm({
 });
 
 // src/internal/components/SecurityMenu/SecurityMenu.tsx
-import { useMutation as useMutation17, useQueryClient as useQueryClient20 } from "@tanstack/react-query";
+import { useMutation as useMutation17, useQueryClient as useQueryClient21 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft18 } from "lucide-react";
 import { useState as useState24 } from "react";
 import { jsx as jsx88, jsxs as jsxs83 } from "react/jsx-runtime";
 function SecurityMenu() {
-  const qc = useQueryClient20();
+  const qc = useQueryClient21();
   const { t } = useT();
   const maxScrollHeight = useLayoutStore((st) => st.maxScrollHeight);
   const setPage = useLayoutDataStore((st) => st.setPage);
@@ -19966,7 +19945,7 @@ function isOririnChainEmbarkSupported(originChain) {
 }
 var init_utils8 = __esm({
   "src/internal/components/SendMenu/hyperbridge/utils.ts"() {
-    init_networks3();
+    init_networks4();
     init_chains();
   }
 });
@@ -19974,7 +19953,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 useCallback24, useEffect as useEffect36, useMemo as useMemo11 } from "react";
+import { useCallback as useCallback25, useEffect as useEffect36, useMemo as useMemo11 } from "react";
 function useHyperlaneHistory() {
   const address = useSession((st) => st.address);
   const page = useLayoutDataStore((st) => st.page);
@@ -19994,7 +19973,7 @@ function useHyperlaneHistory() {
     () => txHistoryData?.pages?.map((p) => p.data).flat(Infinity) || [],
     [txHistoryData]
   );
-  const updateExpandable = useCallback24(
+  const updateExpandable = useCallback25(
     debounce6(() => {
       useFlowSelectorStore.getState().setRenderKey(`hyperlane-history-loaded-${Date.now()}`);
     }, 250),
@@ -20035,16 +20014,16 @@ var init_useOperationHashesStore = __esm({
 });
 
 // src/internal/components/SendMenu/hyperbridge/hooks/useBridge.ts
-import { useMutation as useMutation19, useQueryClient as useQueryClient21 } from "@tanstack/react-query";
-import { useCallback as useCallback25 } from "react";
+import { useMutation as useMutation19, useQueryClient as useQueryClient22 } from "@tanstack/react-query";
+import { useCallback as useCallback26 } from "react";
 import { useSwitchChain, useWalletClient } from "wagmi";
 function useBridge() {
-  const qc = useQueryClient21();
+  const qc = useQueryClient22();
   const { t } = useT();
   const address = useSession((st) => st.address);
   const { data: walletClient } = useWalletClient();
   const { switchChainAsync } = useSwitchChain();
-  const swapDirection = useCallback25(() => {
+  const swapDirection = useCallback26(() => {
     const {
       bridgeStep,
       originChain,
@@ -20096,7 +20075,7 @@ function useBridge() {
       useFlowSelectorStore.getState().setError(error instanceof Error ? error.message : String(error));
     }
   });
-  const handleQuoteEstimation = useCallback25((amnt) => {
+  const handleQuoteEstimation = useCallback26((amnt) => {
     const { originChain, destinationChain, bridgeSender } = useBridgeStore.getState();
     if (!amnt || !Number(amnt)) {
       useBridgeStore.getState().setQuote(null);
@@ -20192,6 +20171,7 @@ function useBridge() {
     },
     onSuccess: (operationHashes) => {
       const { setBridgeStep, setBridgeTxStatus } = useBridgeStore.getState();
+      qc.invalidateQueries({ queryKey: [HYPERLANE_HISTORY_QUERY_KEY] });
       useOperationHashesStore.getState().setOperationHashes(operationHashes);
       useLayoutStore.getState().setIsDialogForced(false);
       useFlowSelectorStore.getState().setIsUiLocked(false);
@@ -20204,7 +20184,7 @@ function useBridge() {
       if (hyperlaneDbTx?.id) {
         patchInitiatedBridgeTxStatus({ txId: hyperlaneDbTx.id, txStatus: "REJECTED" }).then(({ ok }) => {
           console.log("[HYPERLANE SDK] initiated tx patched as REJECTED: ", hyperlaneDbTx.id, "ok: ", ok);
-          if (ok) qc.invalidateQueries({ queryKey: [HYPERLANE_HISTORY_QUERY_KEY, address, 1] });
+          if (ok) qc.invalidateQueries({ queryKey: [HYPERLANE_HISTORY_QUERY_KEY] });
         });
       }
       useLayoutStore.getState().setIsDialogForced(false);
@@ -20354,12 +20334,12 @@ 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 useQueryClient22 } from "@tanstack/react-query";
-import { useCallback as useCallback26, useEffect as useEffect39 } from "react";
+import { useQuery as useQuery20, useQueryClient as useQueryClient23 } from "@tanstack/react-query";
+import { useCallback as useCallback27, useEffect as useEffect39 } 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) {
-  const qc = useQueryClient22();
+  const qc = useQueryClient23();
   const { t } = useT();
   const address = useSession((st) => st.address);
   const directWalletAddress = useExternalWalletStore((st) => st.externalAddress);
@@ -20444,7 +20424,7 @@ function useBridgeBalance(hyperlaneWarpRoutes) {
       };
     }
   });
-  const refreshRouteTokenBalance = useCallback26(
+  const refreshRouteTokenBalance = useCallback27(
     (senderWallet) => {
       switch (true) {
         case senderWallet === "embarkai-wallet":
@@ -21019,7 +20999,7 @@ var init_SuccessStep = __esm({
 });
 
 // src/internal/components/SendMenu/hyperbridge/steps/HistoryStep.tsx
-import { useQueryClient as useQueryClient23 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient24 } from "@tanstack/react-query";
 import dayjs7 from "dayjs";
 import { ArrowRightIcon, DownloadIcon as DownloadIcon2, ExternalLinkIcon as ExternalLinkIcon3, InfoIcon as InfoIcon4, LoaderIcon as LoaderIcon10 } from "lucide-react";
 import { jsx as jsx97, jsxs as jsxs89 } from "react/jsx-runtime";
@@ -21140,7 +21120,7 @@ function HistoryItem(props) {
     txStatus
   } = props;
   const { t } = useT();
-  const qc = useQueryClient23();
+  const qc = useQueryClient24();
   const address = useSession((st) => st.address);
   const warpRoutes = qc.getQueryData([HYPERLANE_WARP_ROUTES_QUERY_KEY, address]);
   const assetWarpRoute = warpRoutes?.find((route) => {
@@ -21490,6 +21470,7 @@ function BridgeHistorySwitch(props) {
       onChange: () => {
         const { bridgeStep: bridgeStep2, setBridgeStep } = useBridgeStore.getState();
         if (bridgeStep2 !== "tx-history") lastBridgeStepRef.current = bridgeStep2;
+        useFlowSelectorStore.getState().setError(null);
         setBridgeStep(bridgeStep2 === "tx-history" ? lastBridgeStepRef.current || "select" : "tx-history");
       }
     }
@@ -21652,7 +21633,7 @@ var init_useNicknameResolve = __esm({
 });
 
 // src/hooks/useSendTransaction.ts
-import { useCallback as useCallback27, useState as useState29 } from "react";
+import { useCallback as useCallback28, useState as useState29 } from "react";
 import { encodeFunctionData as encodeFunctionData2, isAddress, parseEther as parseEther2, parseUnits } from "viem";
 function useSendTransaction() {
   const session = useSession((st) => st.session);
@@ -21660,7 +21641,7 @@ function useSendTransaction() {
   const [isLoading, setIsLoading] = useState29(false);
   const [error, setError] = useState29(null);
   const [userOpHash, setUserOpHash] = useState29(null);
-  const sendTransaction = useCallback27(
+  const sendTransaction = useCallback28(
     async (params) => {
       if (!session || !address) {
         setError("No active session");
@@ -21757,7 +21738,7 @@ function useSendTransaction() {
     },
     [session, address]
   );
-  const reset = useCallback27(() => {
+  const reset = useCallback28(() => {
     setError(null);
     setUserOpHash(null);
     setIsLoading(false);
@@ -23144,7 +23125,7 @@ import {
   BSC_TESTNET_CHAIN_ID as BSC_TESTNET_CHAIN_ID4,
   LUMIA_MAINNET_CHAIN_ID as LUMIA_MAINNET_CHAIN_ID4,
   LUMIA_TESTNET_CHAIN_ID as LUMIA_TESTNET_CHAIN_ID4,
-  SEPOLIA_CHAIN_ID as SEPOLIA_CHAIN_ID2
+  SEPOLIA_CHAIN_ID
 } from "@embarkai/core/read";
 function isTransactionHistorySupported(chainId) {
   return !UNSUPPORTED_HISTORY_CHAINS.has(chainId);
@@ -23214,7 +23195,7 @@ var init_txUrls = __esm({
     };
     CHAIN_SPECIFIC_API_URLS = {};
     ETHERSCAN_CHAINS = /* @__PURE__ */ new Set([
-      SEPOLIA_CHAIN_ID2,
+      SEPOLIA_CHAIN_ID,
       ARBITRUM_SEPOLIA_CHAIN_ID2,
       BASE_SEPOLIA_CHAIN_ID2
     ]);
@@ -24020,12 +24001,12 @@ var init_TransactionsGroup = __esm({
 });
 
 // src/internal/components/TransactionsMenu/TransactionsMenu.tsx
-import { useQuery as useQuery23, useQueryClient as useQueryClient24 } from "@tanstack/react-query";
+import { useQuery as useQuery23, useQueryClient as useQueryClient25 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft22, Loader as Loader32, RefreshCw as RefreshCw3, XCircle } from "lucide-react";
-import { useCallback as useCallback28, useState as useState31 } from "react";
+import { useCallback as useCallback29, useState as useState31 } from "react";
 import { jsx as jsx114, jsxs as jsxs104 } from "react/jsx-runtime";
 function TransactionsMenu() {
-  const qc = useQueryClient24();
+  const qc = useQueryClient25();
   const address = useSession((st) => st.address);
   const chainConfig = useSession((st) => st.chainConfig);
   const { t } = useT();
@@ -24044,7 +24025,7 @@ function TransactionsMenu() {
     queryKey: [TRANSACTIONS_HISTORY_QUERY_KEY, chainConfig.id, address],
     queryFn: () => getTransactionsListQuery({ address, chainConfig })
   });
-  const refreshTxHistory = useCallback28(
+  const refreshTxHistory = useCallback29(
     () => qc.invalidateQueries({ queryKey: [TRANSACTIONS_HISTORY_QUERY_KEY, chainConfig.id, address] }),
     [qc, chainConfig.id, address]
   );
@@ -24283,7 +24264,7 @@ var init_PageMap = __esm({
 });
 
 // src/internal/hooks/usePageMapper.tsx
-import { useCallback as useCallback29, useEffect as useEffect45 } from "react";
+import { useCallback as useCallback30, useEffect as useEffect45 } from "react";
 import { jsx as jsx115 } from "react/jsx-runtime";
 function usePageMapper() {
   const page = useLayoutDataStore((st) => st.page);
@@ -24295,7 +24276,7 @@ function usePageMapper() {
     setIsDialogOpen,
     setIsDialogClosing
   } = useLayoutStore();
-  const closeDialog = useCallback29(() => {
+  const closeDialog = useCallback30(() => {
     setIsDialogClosing(true);
     setTimeout(() => {
       setDialogContent(null);
@@ -24306,7 +24287,7 @@ function usePageMapper() {
       setIsDialogOpen(false);
     }, CLEAR_DIALOG_TIMEOUT);
   }, [setDialogContent, setDialogDescription, setDialogTitle, setIsDialogForced, setIsDialogOpen, setIsDialogClosing]);
-  const openDialog = useCallback29(
+  const openDialog = useCallback30(
     (pageItem) => {
       const PageContentComponent = pageItem.component;
       setDialogTitle(pageItem.title);
@@ -24392,7 +24373,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.45",
+      version: "0.4.47",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -24490,21 +24471,34 @@ var init_package = __esm({
 });
 
 // src/internal/components/Footer/Footer.tsx
-import { useMutation as useMutation20, useQueryClient as useQueryClient25 } from "@tanstack/react-query";
+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 { jsx as jsx116, jsxs as jsxs105 } from "react/jsx-runtime";
 function Footer() {
-  const qc = useQueryClient25();
+  const qc = useQueryClient26();
   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 } = useDisconnect2({
+    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 } = useMutation20({
     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);
@@ -24515,6 +24509,8 @@ function Footer() {
     },
     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);
@@ -24522,15 +24518,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__ */ jsx116("div", { className: "flex-none w-4 h-4 rounded-full flex items-center justify-center bg-[var(--ui-kit-primary)]", children: /* @__PURE__ */ jsx116("span", { className: "text-[var(--ui-kit-fg-inverted)] text-xs font-bold", children: chainConfig.name.charAt(0) }) }));
@@ -24586,7 +24583,7 @@ function Footer() {
 var init_Footer = __esm({
   "src/internal/components/Footer/Footer.tsx"() {
     init_package();
-    init_networks3();
+    init_networks4();
     init_ProviderContext();
     init_SessionContext();
     init_i18n();
@@ -24595,6 +24592,7 @@ var init_Footer = __esm({
     init_useLayoutDataStore();
     init_useLayoutStore();
     init_utils2();
+    init_useExternalWalletStore();
     init_constants4();
     init_button();
   }
@@ -24610,7 +24608,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 useCallback30, useRef as useRef20, useState as useState32 } from "react";
+import { useCallback as useCallback31, useRef as useRef20, 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 "";
@@ -24626,7 +24624,7 @@ function Header() {
   const [copied, setCopied] = useState32(false);
   const clickCountRef = useRef20(0);
   const clickTimerRef = useRef20(null);
-  const handleAvatarClick = useCallback30(() => {
+  const handleAvatarClick = useCallback31(() => {
     clickCountRef.current += 1;
     if (clickTimerRef.current) {
       clearTimeout(clickTimerRef.current);
@@ -24729,7 +24727,7 @@ function Header() {
 var init_Header = __esm({
   "src/internal/components/Header/Header.tsx"() {
     init_LumiaIcon3();
-    init_networks3();
+    init_networks4();
     init_ProviderContext();
     init_SessionContext();
     init_useT();
@@ -25006,7 +25004,7 @@ var init_Dialog2 = __esm({
 });
 
 // src/internal/components/TssManager.tsx
-import React8, { useCallback as useCallback31 } from "react";
+import React8, { useCallback as useCallback32 } from "react";
 var TssManagerWithRef;
 var init_TssManager = __esm({
   "src/internal/components/TssManager.tsx"() {
@@ -25021,7 +25019,7 @@ var init_TssManager = __esm({
       const setStatus = useSession((st) => st.setStatus);
       const setSession = useSession((st) => st.setSession);
       const setAddress = useSession((st) => st.setAddress);
-      const onSessionCreated = useCallback31(
+      const onSessionCreated = useCallback32(
         (session, address) => {
           setSession(session);
           setAddress(address);
@@ -25061,16 +25059,16 @@ var init_TssManager = __esm({
 
 // src/internal/components/WalletConnectHandler.tsx
 import { useConnectModal as useConnectModal2 } from "@rainbow-me/rainbowkit";
-import { useMutation as useMutation21, useQueryClient as useQueryClient26 } from "@tanstack/react-query";
-import React9, { useCallback as useCallback32, useEffect as useEffect48 } from "react";
-import { useAccount, useDisconnect as useDisconnect2, useSignMessage as useSignMessage2 } from "wagmi";
+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";
 function WalletConnectHandler() {
-  const qc = useQueryClient26();
+  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 } = useDisconnect2();
+  const { disconnect } = useDisconnect3();
   const { signMessageAsync } = useSignMessage2();
   const isWalletLinking = useLayoutDataStore((st) => st.isWalletLinking);
   const setPage = useLayoutDataStore((st) => st.setPage);
@@ -25085,7 +25083,7 @@ function WalletConnectHandler() {
   const projectId = providerConfig?.projectId;
   const setExternalWallet = useExternalWalletStore((st) => st.setExternalWallet);
   const setPendingWalletLogin = useLayoutDataStore((st) => st.setPendingWalletLogin);
-  const onLinkingComplete = useCallback32(
+  const onLinkingComplete = useCallback33(
     async (success) => {
       setIsWalletLinking(false);
       if (!success && !passportWalletAddress) {
@@ -28204,7 +28202,7 @@ import { initSdkErrorTracking } from "@embarkai/core/internal/error-tracking";
 import { merge as merge3 } from "lodash-es";
 import {
   createContext,
-  useCallback as useCallback33,
+  useCallback as useCallback34,
   useContext,
   useEffect as useEffect50,
   useMemo as useMemo16,
@@ -28231,7 +28229,7 @@ function Provider(props) {
   const callbacksRef = useRef21(callbacks);
   useEffect50(() => notifyNoProjetctId(projectId), [projectId]);
   const config = useRef21(merge3({}, DEFAULT_PROVIDER_CONFIG, { projectId }, initialConfig));
-  const updateConfig = useCallback33((updates) => {
+  const updateConfig = useCallback34((updates) => {
     const prev = config.current;
     const next = { ...prev };
     if (updates.projectId !== void 0) next.projectId = updates.projectId;
@@ -28265,7 +28263,7 @@ function Provider(props) {
     if (updates.translations) next.translations = { ...next.translations, ...updates.translations };
     config.current = next;
   }, []);
-  const updateCallbacks = useCallback33((updates) => {
+  const updateCallbacks = useCallback34((updates) => {
     const prev = callbacksRef.current;
     const next = updates ? { ...prev, ...updates } : void 0;
     callbacksRef.current = next;
@@ -28687,13 +28685,13 @@ var useHydrated = () => useSession((st) => st.hasHydrated);
 // src/hooks/useOpenPage.ts
 init_SessionContext();
 init_useLayoutDataStore();
-import { useCallback as useCallback34 } from "react";
+import { useCallback as useCallback35 } from "react";
 function useOpenPage() {
   const page = useLayoutDataStore((st) => st.page);
   const setPage = useLayoutDataStore((st) => st.setPage);
   const setPageParams = useLayoutDataStore((st) => st.setPageParams);
   const address = useSession((st) => st.address);
-  const open = useCallback34(
+  const open = useCallback35(
     (passportPage, params) => {
       if (!address) return setPage("auth" /* AUTH */);
       if (!!address && passportPage === "auth" /* AUTH */) return setPage("manage-wallet" /* MANAGE_WALLET */);
@@ -28702,7 +28700,7 @@ function useOpenPage() {
     },
     [setPage, setPageParams, address]
   );
-  const close = useCallback34(() => setPage(null), [setPage]);
+  const close = useCallback35(() => setPage(null), [setPage]);
   return { open, close, isOpen: page !== null };
 }
 
@@ -29462,12 +29460,12 @@ init_useErc3643Compliance();
 
 // src/hooks/useWalletMode.ts
 init_useExternalWalletStore();
-import { useCallback as useCallback37 } from "react";
+import { useCallback as useCallback38 } from "react";
 function useWalletMode() {
   const configMode = useExternalWalletStore((st) => st.configMode);
   const activeMode = useExternalWalletStore((st) => st.activeMode);
   const setActiveMode = useExternalWalletStore((st) => st.setActiveMode);
-  const switchMode = useCallback37(
+  const switchMode = useCallback38(
     (mode) => {
       if (configMode !== "both") return;
       setActiveMode(mode);
@@ -29485,25 +29483,25 @@ function useWalletMode() {
 // src/hooks/useDirectWallet.ts
 init_useExternalWalletStore();
 init_useLayoutDataStore();
-import { useCallback as useCallback38 } from "react";
+import { useCallback as useCallback39 } from "react";
 import { useConnectModal as useConnectModal3 } from "@rainbow-me/rainbowkit";
-import { useDisconnect as useDisconnect3 } from "wagmi";
+import { useDisconnect as useDisconnect4 } 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 } = useDisconnect3();
+  const { disconnect: wagmiDisconnect } = useDisconnect4();
   const { openConnectModal } = useConnectModal3();
   const setIsWalletLinking = useLayoutDataStore((st) => st.setIsWalletLinking);
-  const connect = useCallback38(() => {
+  const connect = useCallback39(() => {
     setIsWalletLinking(true);
   }, [setIsWalletLinking]);
-  const reconnect = useCallback38(() => {
+  const reconnect = useCallback39(() => {
     if (openConnectModal) openConnectModal();
   }, [openConnectModal]);
-  const disconnect = useCallback38(() => {
+  const disconnect = useCallback39(() => {
     wagmiDisconnect();
     clearExternalWallet();
   }, [wagmiDisconnect, clearExternalWallet]);
@@ -29520,7 +29518,7 @@ function useDirectWallet() {
 
 // src/hooks/useSendDirectTransaction.ts
 init_useExternalWalletStore();
-import { useCallback as useCallback39, useState as useState38 } from "react";
+import { useCallback as useCallback40, useState as useState38 } from "react";
 import { isAddress as isAddress3, parseEther as parseEther3 } from "viem";
 import { useSendTransaction as useWagmiSendTransaction, useSwitchChain as useSwitchChain3 } from "wagmi";
 function useSendDirectTransaction() {
@@ -29531,7 +29529,7 @@ function useSendDirectTransaction() {
   const [isPending, setIsPending] = useState38(false);
   const [error, setError] = useState38(null);
   const [txHash, setTxHash] = useState38(null);
-  const sendTransaction = useCallback39(
+  const sendTransaction = useCallback40(
     async (params) => {
       if (!isConnected) {
         setError("No external wallet connected");
@@ -29565,7 +29563,7 @@ function useSendDirectTransaction() {
     },
     [isConnected, externalChainId, sendTransactionAsync, switchChainAsync]
   );
-  const reset = useCallback39(() => {
+  const reset = useCallback40(() => {
     setError(null);
     setTxHash(null);
     setIsPending(false);
@@ -29577,7 +29575,7 @@ function useSendDirectTransaction() {
 init_SessionContext();
 init_account2();
 init_linkedProfiles();
-import { useCallback as useCallback40, useMemo as useMemo18, useState as useState39 } from "react";
+import { useCallback as useCallback41, useMemo as useMemo18, useState as useState39 } from "react";
 import { encodeFunctionData as encodeFunctionData3, isAddress as isAddress4, parseEther as parseEther4, parseUnits as parseUnits3 } from "viem";
 var ERC20_TRANSFER_ABI2 = [
   {
@@ -29600,7 +29598,7 @@ function useTransferToLinkedWallet() {
     () => (profiles || []).filter((p) => p.provider === "wallet" && p.externalId).map((p) => p.externalId),
     [profiles]
   );
-  const transfer = useCallback40(
+  const transfer = useCallback41(
     async (params) => {
       if (!session) {
         setError("No active session");
@@ -29651,7 +29649,7 @@ function useTransferToLinkedWallet() {
     },
     [session, linkedWallets]
   );
-  const reset = useCallback40(() => {
+  const reset = useCallback41(() => {
     setError(null);
     setUserOpHash(null);
     setIsPending(false);
@@ -29676,12 +29674,27 @@ function useNativeWalletSignature() {
 // src/hooks/useLogout.ts
 init_ProviderContext();
 init_SessionContext();
+init_useExternalWalletStore();
 import { logout as coreLogout, jwtTokenManager as jwtTokenManager3 } from "@embarkai/core/auth";
-import { useCallback as useCallback41 } from "react";
+import { useCallback as useCallback42 } from "react";
+import { useDisconnect as useDisconnect5 } from "wagmi";
 function useLogout() {
-  const { setSession, setIsLoading, setAddress, setStatus, setError, address } = useSession();
   const { callbacksRef } = useProviderConfig();
-  const logout2 = useCallback41(async () => {
+  const address = useSession((st) => st.address);
+  const { disconnect: wagmiDisconnect } = useDisconnect5({
+    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 = useCallback42(async () => {
+    const { setSession, setIsLoading, setAddress, setStatus, setError } = useSession.getState();
     const prevAddress = address;
     let userId = null;
     setIsLoading(true);
@@ -29695,6 +29708,7 @@ function useLogout() {
     } catch (error) {
       console.warn("[useLogout] Core logout failed:", error);
     }
+    if (!!useExternalWalletStore.getState().externalAddress) wagmiDisconnect();
     setSession(null);
     setAddress(null);
     setStatus("idle");
@@ -29708,7 +29722,7 @@ function useLogout() {
     } catch (error) {
       console.warn("[useLogout] Callback error:", error);
     }
-  }, [address, setAddress, setError, setSession, setStatus]);
+  }, [address]);
   return { logout: logout2 };
 }