@embarkai/ui-kit 0.4.113 → 0.4.115

package/dist/index.js

@@ -11605,12 +11605,6 @@ var init_AuthMenu = __esm({
           setAlert(null);
         };
       }, []);
-      if (!isIframeReady) {
-        return /* @__PURE__ */ jsxs20(Expandable, { isExpanded: true, className: "w-full p-8 flex flex-col justify-center items-center gap-[var(--ui-kit-gap)]", children: [
-          /* @__PURE__ */ jsx26(Loader4, { className: "w-4 h-4 animate-spin" }),
-          /* @__PURE__ */ jsx26("span", { className: "text-sm text-[var(--ui-kit-fg-muted)]", children: "Initializing wallet..." })
-        ] });
-      }
       const stepContent = useMemo2(
         () => ({
           "loading": /* @__PURE__ */ jsx26(LoadingStep, {}),
@@ -11628,6 +11622,12 @@ var init_AuthMenu = __esm({
         }),
         [onAuthSuccess, goBackToSignIn]
       );
+      if (!isIframeReady) {
+        return /* @__PURE__ */ jsxs20(Expandable, { isExpanded: true, className: "w-full p-8 flex flex-col justify-center items-center gap-[var(--ui-kit-gap)]", children: [
+          /* @__PURE__ */ jsx26(Loader4, { className: "w-4 h-4 animate-spin" }),
+          /* @__PURE__ */ jsx26("span", { className: "text-sm text-[var(--ui-kit-fg-muted)]", children: "Initializing wallet..." })
+        ] });
+      }
       return /* @__PURE__ */ jsxs20(Expandable, { isExpanded: true, contentClassName: "w-full flex flex-col gap-[var(--ui-kit-gap)]", children: [
         stepContent[step],
         alert2 && /* @__PURE__ */ jsxs20(Highlight, { type: "error", children: [
@@ -15693,6 +15693,67 @@ var init_wallets = __esm({
   }
 });
 
+// src/internal/lib/disconnect-guard.ts
+function waitForReconnect(config) {
+  if (config.state.status !== "reconnecting") return Promise.resolve();
+  return new Promise((resolve) => {
+    const unsubscribe = config.subscribe(
+      (state) => state.status,
+      (status) => {
+        if (status === "reconnecting") return;
+        unsubscribe();
+        resolve();
+      }
+    );
+  });
+}
+function hasUnusableCurrentConnector(config) {
+  const { current, connections } = config.state;
+  if (!current) return false;
+  const connector = connections.get(current)?.connector;
+  return !!connector && typeof connector.disconnect !== "function";
+}
+var init_disconnect_guard = __esm({
+  "src/internal/lib/disconnect-guard.ts"() {
+  }
+});
+
+// src/internal/hooks/useSafeDisconnect.ts
+import { useCallback as useCallback15 } from "react";
+import { useConfig, useDisconnect } from "wagmi";
+function useSafeDisconnect(options) {
+  const config = useConfig();
+  const mutation = useDisconnect(options);
+  const { mutateAsync } = mutation;
+  const disconnectAsync = useCallback15(
+    async (parameters) => {
+      await waitForReconnect(config);
+      if (!parameters?.connector && hasUnusableCurrentConnector(config)) return;
+      await mutateAsync(parameters);
+    },
+    [config, mutateAsync]
+  );
+  const disconnect = useCallback15(
+    (parameters) => {
+      disconnectAsync(parameters).catch(() => {
+      });
+    },
+    [disconnectAsync]
+  );
+  return {
+    ...mutation,
+    mutate: disconnect,
+    mutateAsync: disconnectAsync,
+    disconnect,
+    disconnectAsync
+  };
+}
+var init_useSafeDisconnect = __esm({
+  "src/internal/hooks/useSafeDisconnect.ts"() {
+    init_disconnect_guard();
+  }
+});
+
 // src/internal/lib/connect-errors.ts
 function someInErrorChain(error, predicate) {
   let current = error;
@@ -15802,7 +15863,7 @@ var init_common = __esm({
 
 // src/modules/linkedProfiles.ts
 import { useQuery as useQuery7, useQueryClient as useQueryClient8 } from "@tanstack/react-query";
-import { useCallback as useCallback15 } from "react";
+import { useCallback as useCallback16 } from "react";
 function useLinkedProfiles() {
   const qc = useQueryClient8();
   const address = useSession((st) => st.address);
@@ -15826,7 +15887,7 @@ function useLinkedProfiles() {
     }
   });
   const { profiles = [], avatar = null } = data || {};
-  const refresh = useCallback15(async () => {
+  const refresh = useCallback16(async () => {
     await qc.invalidateQueries({ queryKey: [LINKED_PROFILES_QUERY_KEY, address] });
   }, [qc, address]);
   return { profiles, avatar, isLoading, isFetching, error, refresh };
@@ -16706,7 +16767,7 @@ var init_telegram2 = __esm({
 
 // src/internal/components/ManageWalletMenu/hooks/useLinkTelegram.ts
 import { useQueryClient as useQueryClient12 } from "@tanstack/react-query";
-import { useCallback as useCallback16, useEffect as useEffect25, useState as useState12 } from "react";
+import { useCallback as useCallback17, useEffect as useEffect25, useState as useState12 } from "react";
 function useLinkTelegram() {
   const {
     config: { current: config },
@@ -16716,7 +16777,7 @@ function useLinkTelegram() {
   const address = useSession((st) => st.address);
   const { providerType, linkIsLoading, setLinkIsLoading, setProviderType, setAlert } = useManageWalletStore();
   const setPage = useLayoutDataStore((st) => st.setPage);
-  const handleLinkTelegram = useCallback16(async () => {
+  const handleLinkTelegram = useCallback17(async () => {
     try {
       if (shouldBlockSocialAuthInTelegram("telegram")) {
         setAlert(buildTelegramBrowserRestriction("Telegram", "linking"));
@@ -17147,13 +17208,12 @@ var init_ManageWallet = __esm({
 import { useMutation as useMutation9, useQueryClient as useQueryClient13 } from "@tanstack/react-query";
 import { Key as Key4, Loader as Loader10 } from "lucide-react";
 import { useState as useState13 } from "react";
-import { useDisconnect } from "wagmi";
 import { jsx as jsx73, jsxs as jsxs64 } from "react/jsx-runtime";
 function UnlinkProviderMenu() {
   const qc = useQueryClient13();
   const address = useSession((st) => st.address);
   const { callbacksRef } = useProviderConfig();
-  const { disconnect: disconnectExternalWallet } = useDisconnect();
+  const { disconnect: disconnectExternalWallet } = useSafeDisconnect();
   const isExternalConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const { t } = useT();
   const setPage = useLayoutDataStore((st) => st.setPage);
@@ -17246,6 +17306,7 @@ var init_UnlinkProviderMenu = __esm({
     init_ProviderContext();
     init_SessionContext();
     init_useT();
+    init_useSafeDisconnect();
     init_linkedProfiles();
     init_auth();
     init_useExternalWalletStore();
@@ -17327,13 +17388,13 @@ var init_useHasInjectedWallet = __esm({
 // src/internal/components/ConnectExternalWalletMenu/ConnectExternalWalletMenu.tsx
 import { useMutation as useMutation10, useQuery as useQuery9, useQueryClient as useQueryClient14 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft8, Loader as Loader11, Wallet2Icon as Wallet2Icon2 } from "lucide-react";
-import { useCallback as useCallback17, useMemo as useMemo9, useState as useState14 } from "react";
+import { useCallback as useCallback18, useMemo as useMemo9, useState as useState14 } from "react";
 import {
-  useConfig,
+  useChains,
+  useConfig as useConfig2,
   useConnect,
   useConnections as useConnections2,
   useConnectors,
-  useDisconnect as useDisconnect2,
   useSignMessage,
   useSwitchChain,
   useSwitchConnection
@@ -17356,9 +17417,10 @@ function ConnectExternalWalletMenu() {
   const menuParams = useConnectExternalWalletMenuParams();
   const connectors = useConnectors();
   const hasInjectedWallet2 = useHasInjectedWallet();
-  const wagmiConfig3 = useConfig();
+  const wagmiConfig3 = useConfig2();
+  const chains = useChains();
   const connections = useConnections2();
-  const { mutate: disconnect, mutateAsync: disconnectAsync } = useDisconnect2();
+  const { mutate: disconnect, mutateAsync: disconnectAsync } = useSafeDisconnect();
   const { mutateAsync: signMessageAsync } = useSignMessage();
   const { mutateAsync: switchChainAsync } = useSwitchChain();
   const { mutateAsync: switchConnectionAsync } = useSwitchConnection();
@@ -17367,7 +17429,8 @@ function ConnectExternalWalletMenu() {
     const { connector, account, message } = params;
     const signOnce = async (viaFallback = false) => {
       let chainId = await connector.getChainId();
-      if (viaFallback) {
+      const isUnsupportedMetaMaskChain = connector.type === "metaMask" && !chains.some((chain) => chain.id === chainId);
+      if (viaFallback || isUnsupportedMetaMaskChain) {
         await switchChainAsync({ connector, chainId: SIGN_FALLBACK_CHAIN_ID });
         chainId = SIGN_FALLBACK_CHAIN_ID;
       }
@@ -17560,7 +17623,7 @@ function ConnectExternalWalletMenu() {
       (connector) => allowed.includes(connector.id.toLowerCase()) || allowed.includes(connector.name.toLowerCase())
     );
   }, [connectors, allowedWallets, hasInjectedWallet2]);
-  const getInstructionSteps = useCallback17(() => {
+  const getInstructionSteps = useCallback18(() => {
     const connectFlowType = getConnectFlowType({
       isEmbarkAI: !!embarkAiAddress,
       connectFlow: menuParams.current?.connectFlowType || "auth"
@@ -17676,6 +17739,7 @@ var init_ConnectExternalWalletMenu = __esm({
     init_useOpenPage();
     init_i18n();
     init_wallets();
+    init_useSafeDisconnect();
     init_connect_errors();
     init_linkedProfiles();
     init_common();
@@ -17695,29 +17759,28 @@ var init_ConnectExternalWalletMenu = __esm({
 
 // src/internal/components/ConnectExternalWalletMenu/useExternalWalletConnect.ts
 import { omit as omit2 } from "lodash-es";
-import { useCallback as useCallback18 } from "react";
+import { useCallback as useCallback19 } from "react";
 import {
-  useConfig as useConfig2,
+  useConfig as useConfig3,
   useConnect as useConnect2,
   useConnections as useConnections3,
-  useConnectors as useConnectors2,
-  useDisconnect as useDisconnect3
+  useConnectors as useConnectors2
 } from "wagmi";
 function useExternalWalletConnnect(options) {
   const { onSuccess, onError } = options || {};
   const { config } = useProviderConfig();
   const walletMode = config.current?.wallet?.mode;
-  const wagmiConfig3 = useConfig2();
+  const wagmiConfig3 = useConfig3();
   const connectors = useConnectors2();
   const connections = useConnections3();
   const { mutate: connect, mutateAsync: connectAsync, ...restUseConnect } = useConnect2();
-  const { mutateAsync: disconnectAsync } = useDisconnect3();
-  const disconnectExternalWallet = useCallback18(async () => {
+  const { mutateAsync: disconnectAsync } = useSafeDisconnect();
+  const disconnectExternalWallet = useCallback19(async () => {
     await disconnectAsync();
     const { externalAddress, clearExternalWallet } = useExternalWalletStore.getState();
     if (!!externalAddress) clearExternalWallet();
   }, [disconnectAsync]);
-  const connectExternalWallet = useCallback18(
+  const connectExternalWallet = useCallback19(
     async (walletConnectorType) => {
       const connector = connectors.find((c) => c.id === walletConnectorType);
       if (!connector) {
@@ -17774,6 +17837,7 @@ function useExternalWalletConnnect(options) {
 var init_useExternalWalletConnect = __esm({
   "src/internal/components/ConnectExternalWalletMenu/useExternalWalletConnect.ts"() {
     init_ProviderContext();
+    init_useSafeDisconnect();
     init_useLayoutStore();
     init_connect_errors();
     init_useExternalWalletStore();
@@ -18441,7 +18505,7 @@ var init_guardian_backup = __esm({
 
 // src/internal/components/DevicesMenu/DeviceManageScreen.tsx
 import { ArrowLeft as ArrowLeft10, Cpu, Download, HardDrive, Loader2 as Loader23, Trash2, Upload } from "lucide-react";
-import { useCallback as useCallback19, useEffect as useEffect27, useRef as useRef14, useState as useState16 } from "react";
+import { useCallback as useCallback20, useEffect as useEffect27, useRef as useRef14, useState as useState16 } from "react";
 import { Fragment as Fragment20, jsx as jsx76, jsxs as jsxs67 } from "react/jsx-runtime";
 function formatSize(bytes) {
   if (bytes < 1024) return `${bytes} B`;
@@ -18498,7 +18562,7 @@ function DeviceManageScreen() {
       guardianRef.current?.close();
     };
   }, [deviceId]);
-  const refreshList = useCallback19(async () => {
+  const refreshList = useCallback20(async () => {
     const guardian = guardianRef.current;
     if (!guardian || screen.step !== "connected") return;
     try {
@@ -18507,7 +18571,7 @@ function DeviceManageScreen() {
     } catch {
     }
   }, [screen]);
-  const handleBackup = useCallback19(async () => {
+  const handleBackup = useCallback20(async () => {
     const guardian = guardianRef.current;
     const iframe6 = getIframeManager();
     if (!guardian || !iframe6 || !userId) return;
@@ -18531,7 +18595,7 @@ function DeviceManageScreen() {
       setActionState(null);
     }
   }, [password, userId, refreshList]);
-  const handleOverwrite = useCallback19(async () => {
+  const handleOverwrite = useCallback20(async () => {
     const guardian = guardianRef.current;
     const iframe6 = getIframeManager();
     if (!guardian || !iframe6 || !userId) return;
@@ -18551,7 +18615,7 @@ function DeviceManageScreen() {
       setActionState(null);
     }
   }, [password, userId, refreshList]);
-  const handleDelete = useCallback19(
+  const handleDelete = useCallback20(
     async (keyshareId) => {
       const guardian = guardianRef.current;
       if (!guardian) return;
@@ -18751,7 +18815,7 @@ var init_DeviceManageScreen = __esm({
 
 // src/internal/components/DevicesMenu/DeviceRestoreScreen.tsx
 import { AlertTriangle as AlertTriangle2, ArrowLeft as ArrowLeft11, Download as Download2, Loader2 as Loader24 } from "lucide-react";
-import { useCallback as useCallback20, useState as useState17 } from "react";
+import { useCallback as useCallback21, useState as useState17 } from "react";
 import { Fragment as Fragment21, jsx as jsx77, jsxs as jsxs68 } from "react/jsx-runtime";
 function DeviceRestoreScreen() {
   const setPage = useLayoutDataStore((s) => s.setPage);
@@ -18765,7 +18829,7 @@ function DeviceRestoreScreen() {
   const [isWorking, setIsWorking] = useState17(false);
   const [statusMessage, setStatusMessage] = useState17(null);
   const [errorMessage, setErrorMessage] = useState17(null);
-  const handleRestore = useCallback20(async () => {
+  const handleRestore = useCallback21(async () => {
     if (!password || !keyshareId || !userId) return;
     const iframe6 = getIframeManager();
     if (!iframe6) {
@@ -19016,7 +19080,7 @@ var init_useRestoreStore = __esm({
 });
 
 // src/internal/components/KeyshareRestoreMenu/hooks/useOnRestoreSuccess.ts
-import { useCallback as useCallback21 } from "react";
+import { useCallback as useCallback22 } from "react";
 function useOnRestoreSuccess() {
   const { config, callbacksRef } = useProviderConfig();
   const setIsDialogForced = useLayoutStore((st) => st.setIsDialogForced);
@@ -19032,7 +19096,7 @@ function useOnRestoreSuccess() {
     setStatus
   } = useSession();
   const { setError, setSuccess } = useRestoreStore();
-  const createSessionWithKeyshare = useCallback21(
+  const createSessionWithKeyshare = useCallback22(
     async (userId, hasServerKeyshare, isNewUser) => {
       try {
         try {
@@ -19073,7 +19137,7 @@ function useOnRestoreSuccess() {
     },
     [setStatus, usePaymaster, activeChainId, publicClient]
   );
-  const onRestoreSuccess = useCallback21(async () => {
+  const onRestoreSuccess = useCallback22(async () => {
     const { verifyToken: verifyToken2, jwtTokenManager: jwtTokenManager4 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
     const verify = await verifyToken2();
     const hasServerKeyshare = verify?.hasKeyshare ?? jwtTokenManager4.getHasKeyshare() ?? false;
@@ -19398,7 +19462,7 @@ var init_cloudStorage = __esm({
 
 // src/internal/components/KeyshareRestoreMenu/hooks/useCreateBackup.ts
 import { useMutation as useMutation12, useQueryClient as useQueryClient16 } from "@tanstack/react-query";
-import { useCallback as useCallback22, useEffect as useEffect28 } from "react";
+import { useCallback as useCallback23, useEffect as useEffect28 } from "react";
 function useCreateBackup() {
   const qc = useQueryClient16();
   const session = useSession((st) => st.session);
@@ -19415,7 +19479,7 @@ function useCreateBackup() {
   }, [hasServerVault]);
   const recoveryUserId = useSession((st) => st.recoveryUserId);
   const passportUserId = session?.mpcUserId || recoveryUserId || "";
-  const onBackupSuccess = useCallback22((method) => {
+  const onBackupSuccess = useCallback23((method) => {
     console.log(`[EMBARKAI BACKUP] ${method} backup created successfully`);
     if (method !== "server") return;
     const { setIsDialogForced } = useLayoutStore.getState();
@@ -20786,7 +20850,6 @@ var init_methods = __esm({
 import { useMutation as useMutation14, useQuery as useQuery12, useQueryClient as useQueryClient18 } from "@tanstack/react-query";
 import { AlertCircle as AlertCircle2, CheckCircle2 as CheckCircle22, CloudDownload as CloudDownload2, Loader as Loader14, UserCircle as UserCircle2 } from "lucide-react";
 import { useEffect as useEffect33 } from "react";
-import { useDisconnect as useDisconnect4 } from "wagmi";
 import { Fragment as Fragment29, jsx as jsx87, jsxs as jsxs78 } from "react/jsx-runtime";
 var RESTORE_COMPONENTS, KeyshareRestoreMenu;
 var init_KeyshareRestoreMenu = __esm({
@@ -20794,6 +20857,7 @@ var init_KeyshareRestoreMenu = __esm({
     init_ProviderContext();
     init_SessionContext();
     init_i18n();
+    init_useSafeDisconnect();
     init_useLayoutDataStore();
     init_useLayoutStore();
     init_useExternalWalletStore();
@@ -20834,7 +20898,7 @@ var init_KeyshareRestoreMenu = __esm({
           setIsDialogForced(false);
         };
       }, []);
-      const { mutate: wagmiDisconnect } = useDisconnect4({
+      const { mutate: wagmiDisconnect } = useSafeDisconnect({
         mutation: {
           onSuccess: () => {
             useExternalWalletStore.getState().clearExternalWallet();
@@ -21838,7 +21902,7 @@ var init_utils9 = __esm({
 // src/internal/hooks/useBlockscoutAssets/useBlockscoutAssets.ts
 import { createBlockscoutClient as createBlockscoutClient2, nonBlockscoutClient } from "@embarkai/core";
 import { useQuery as useQuery17, useQueryClient as useQueryClient19 } from "@tanstack/react-query";
-import { useCallback as useCallback23, useMemo as useMemo13, useRef as useRef17 } from "react";
+import { useCallback as useCallback24, useMemo as useMemo13, useRef as useRef17 } from "react";
 function useBlockscoutAssets(options) {
   const { address, chainId, enabled = true, detectSecurityTokens = true } = options;
   const qc = useQueryClient19();
@@ -22076,7 +22140,7 @@ function useBlockscoutAssets(options) {
     if (!blockscoutError) return null;
     return createError(blockscoutError);
   }, [blockscoutError]);
-  const refreshBalances = useCallback23(async () => {
+  const refreshBalances = useCallback24(async () => {
     const now = Date.now();
     if (now - lastRefreshRef.current < BLOCKSCOUT_REFRESH_DEBOUNCE) {
       return;
@@ -22092,7 +22156,7 @@ function useBlockscoutAssets(options) {
       qc.invalidateQueries({ queryKey: [WATCH_TOKENS_QUERY_KEY] })
     ]);
   }, [qc, customTokenBalancesQueryKey]);
-  const getTokenBalance = useCallback23(
+  const getTokenBalance = useCallback24(
     (tokenAddress) => {
       return assets.find((a) => a.address?.toLowerCase() === tokenAddress.toLowerCase()) || null;
     },
@@ -22413,7 +22477,7 @@ var init_PortfolioItem = __esm({
 // src/internal/components/PortfolioMenu/PortfolioMenu.tsx
 import { useQueryClient as useQueryClient20 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft17, Gem, Loader as Loader16, RefreshCw as RefreshCw2 } from "lucide-react";
-import { useCallback as useCallback24 } from "react";
+import { useCallback as useCallback25 } from "react";
 import { jsx as jsx95, jsxs as jsxs86 } from "react/jsx-runtime";
 function PortfolioMenu() {
   const { assets: projectAssets = [] } = useProviderConfig().config.current?.projectAssets || {};
@@ -22432,7 +22496,7 @@ function PortfolioMenu() {
     enabled: !!address
   });
   const shownProjectAssets = projectAssets.filter((asset) => !asset.hideInPortfolio);
-  const refreshAllAssetsBalances = useCallback24(() => {
+  const refreshAllAssetsBalances = useCallback25(() => {
     Promise.all(shownProjectAssets.map((asset) => qc.invalidateQueries({ queryKey: asset.balanceQueryKey })));
     refreshBlockscoutBalances();
   }, [qc, shownProjectAssets, refreshBlockscoutBalances]);
@@ -22790,7 +22854,7 @@ var init_useNicknameStore = __esm({
 // src/internal/components/NicknameMenu/useNicknameAvailability.ts
 import { useMutation as useMutation15 } from "@tanstack/react-query";
 import { debounce as debounce4 } from "lodash-es";
-import { useCallback as useCallback25, useEffect as useEffect36 } from "react";
+import { useCallback as useCallback26, useEffect as useEffect36 } from "react";
 function useNicknameAvailability(currentNickname) {
   const { t } = useT();
   const nicknameValue = useNicknameStore((st) => st.nicknameValue);
@@ -22815,7 +22879,7 @@ function useNicknameAvailability(currentNickname) {
       useNicknameStore.getState().setError(error?.message || "Failed to check nickname availability");
     }
   });
-  const debouncedCheckAvailability = useCallback25(debounce4(checkAvailability, DEBOUNCE_MS), [checkAvailability]);
+  const debouncedCheckAvailability = useCallback26(debounce4(checkAvailability, DEBOUNCE_MS), [checkAvailability]);
   useEffect36(() => {
     if (!currentNickname) return;
     const normalizedInputValue = normalizeNickname(nicknameValue);
@@ -22845,7 +22909,7 @@ var init_useNicknameAvailability = __esm({
 // src/internal/components/NicknameMenu/NicknameEditForm.tsx
 import { useMutation as useMutation16, useQueryClient as useQueryClient21 } from "@tanstack/react-query";
 import { AtSignIcon, CopyIcon as CopyIcon2, LoaderIcon as LoaderIcon12, SaveIcon } from "lucide-react";
-import { useCallback as useCallback26, useEffect as useEffect37, useRef as useRef18, useState as useState23 } from "react";
+import { useCallback as useCallback27, useEffect as useEffect37, useRef as useRef18, useState as useState23 } from "react";
 import { Fragment as Fragment34, jsx as jsx98, jsxs as jsxs89 } from "react/jsx-runtime";
 function NicknameEditForm(props) {
   const { isInitialUser, nicknameInfo } = props;
@@ -22894,7 +22958,7 @@ function NicknameEditForm(props) {
       );
     }
   });
-  const handleNicknameInputChange = useCallback26(
+  const handleNicknameInputChange = useCallback27(
     (e) => {
       const { error, setError, setNicknameValue } = useNicknameStore.getState();
       const nextInputValue = e.target.value;
@@ -22908,7 +22972,7 @@ function NicknameEditForm(props) {
     },
     [t]
   );
-  const handleSubmit = useCallback26(
+  const handleSubmit = useCallback27(
     (e) => {
       const { nicknameValue: nicknameValue2, setError } = useNicknameStore.getState();
       if (!canChange) {
@@ -24146,14 +24210,14 @@ var init_useUserAssetsPolicies = __esm({
 // src/internal/components/SecurityMenu/UserPolicies/PolicyForm.tsx
 import { useMutation as useMutation18, useQueryClient as useQueryClient23 } from "@tanstack/react-query";
 import { ChevronRightIcon as ChevronRightIcon2, ChevronUpIcon as ChevronUpIcon2, LoaderIcon as LoaderIcon16, PlusIcon, TrashIcon } from "lucide-react";
-import { useCallback as useCallback27, useState as useState26 } from "react";
+import { useCallback as useCallback28, useState as useState26 } from "react";
 import { Fragment as Fragment37, jsx as jsx106, jsxs as jsxs97 } from "react/jsx-runtime";
 function AddressListEditor(props) {
   const { label, assets = [], addresses, onChange } = props;
   const [isAssetSelector, setIsAssetSelector] = useState26(false);
   const [customAddress, setCustomAddress] = useState26("");
   const [customAddressError, setCustomAddressError] = useState26(null);
-  const handleAddress = useCallback27(
+  const handleAddress = useCallback28(
     (addressToAdd) => {
       if (!isValidAddress(addressToAdd)) {
         setCustomAddressError("Bad address");
@@ -25467,7 +25531,7 @@ var init_useOperationHashesStore = __esm({
 
 // src/internal/components/SendMenu/hyperbridge/hooks/useBridge.ts
 import { useMutation as useMutation20, useQueryClient as useQueryClient25 } from "@tanstack/react-query";
-import { useCallback as useCallback28 } from "react";
+import { useCallback as useCallback29 } from "react";
 import { useSwitchChain as useSwitchChain2, useWalletClient } from "wagmi";
 function useBridge() {
   const qc = useQueryClient25();
@@ -25475,7 +25539,7 @@ function useBridge() {
   const address = useSession((st) => st.address);
   const { data: walletClient } = useWalletClient();
   const { mutateAsync: switchChainAsync } = useSwitchChain2();
-  const swapDirection = useCallback28(() => {
+  const swapDirection = useCallback29(() => {
     const {
       // bridgeStep,
       originChain,
@@ -25526,7 +25590,7 @@ function useBridge() {
       useFlowSelectorStore.getState().setError(error instanceof Error ? error.message : String(error));
     }
   });
-  const handleQuoteEstimation = useCallback28((amnt) => {
+  const handleQuoteEstimation = useCallback29((amnt) => {
     const { originChain, destinationChain, bridgeSender } = useBridgeStore.getState();
     if (!amnt || !Number(amnt)) {
       useBridgeStore.getState().setQuote(null);
@@ -25944,7 +26008,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 useQuery25, useQueryClient as useQueryClient26 } from "@tanstack/react-query";
-import { useCallback as useCallback29, useEffect as useEffect46 } from "react";
+import { useCallback as useCallback30, useEffect as useEffect46 } from "react";
 import { createPublicClient as createPublicClient2, erc20Abi as erc20Abi3, formatUnits as formatUnits9, http as http3 } from "viem";
 import { useSwitchChain as useSwitchChain3 } from "wagmi";
 function useBridgeBalance(isLoadingWarpRoutes, hyperlaneWarpRoutes) {
@@ -26034,7 +26098,7 @@ function useBridgeBalance(isLoadingWarpRoutes, hyperlaneWarpRoutes) {
       };
     }
   });
-  const refreshRouteTokenBalance = useCallback29(
+  const refreshRouteTokenBalance = useCallback30(
     (senderWallet) => {
       switch (true) {
         case senderWallet === "embarkai-wallet":
@@ -27250,7 +27314,7 @@ var init_useNicknameResolve = __esm({
 });
 
 // src/hooks/useSendTransaction.ts
-import { useCallback as useCallback30, useState as useState30 } from "react";
+import { useCallback as useCallback31, useState as useState30 } from "react";
 import { encodeFunctionData as encodeFunctionData2, isAddress as isAddress2, parseEther as parseEther2, parseUnits } from "viem";
 function useSendTransaction() {
   const session = useSession((st) => st.session);
@@ -27258,7 +27322,7 @@ function useSendTransaction() {
   const [isLoading, setIsLoading] = useState30(false);
   const [error, setError] = useState30(null);
   const [userOpHash, setUserOpHash] = useState30(null);
-  const sendTransaction = useCallback30(
+  const sendTransaction = useCallback31(
     async (params) => {
       if (!session || !address) {
         setError("No active session");
@@ -27355,7 +27419,7 @@ function useSendTransaction() {
     },
     [session, address]
   );
-  const reset = useCallback30(() => {
+  const reset = useCallback31(() => {
     setError(null);
     setUserOpHash(null);
     setIsLoading(false);
@@ -29484,7 +29548,7 @@ var init_TransactionsGroup = __esm({
 // src/internal/components/TransactionsMenu/TransactionsMenu.tsx
 import { useQuery as useQuery28, useQueryClient as useQueryClient28 } from "@tanstack/react-query";
 import { ArrowLeft as ArrowLeft22, Loader as Loader29, RefreshCw as RefreshCw3, XCircle as XCircle2 } from "lucide-react";
-import { useCallback as useCallback31, useState as useState32 } from "react";
+import { useCallback as useCallback32, useState as useState32 } from "react";
 import { jsx as jsx128, jsxs as jsxs116 } from "react/jsx-runtime";
 function TransactionsMenu() {
   const qc = useQueryClient28();
@@ -29506,7 +29570,7 @@ function TransactionsMenu() {
     queryKey: [TRANSACTIONS_HISTORY_QUERY_KEY, chainConfig.id, address],
     queryFn: () => getTransactionsListQuery({ address, chainConfig })
   });
-  const refreshTxHistory = useCallback31(
+  const refreshTxHistory = useCallback32(
     () => qc.invalidateQueries({ queryKey: [TRANSACTIONS_HISTORY_QUERY_KEY, chainConfig.id, address] }),
     [qc, chainConfig.id, address]
   );
@@ -29884,11 +29948,11 @@ var init_PageMap = __esm({
 });
 
 // src/internal/hooks/usePageMapper.tsx
-import { useCallback as useCallback32, useEffect as useEffect53 } from "react";
+import { useCallback as useCallback33, useEffect as useEffect53 } from "react";
 import { jsx as jsx130 } from "react/jsx-runtime";
 function usePageMapper() {
   const page = useLayoutDataStore((st) => st.page);
-  const closeDialog = useCallback32(() => {
+  const closeDialog = useCallback33(() => {
     useLayoutStore.setState({ isDialogAnimating: true });
     setTimeout(() => {
       useLayoutStore.setState({
@@ -29900,7 +29964,7 @@ function usePageMapper() {
       });
     }, CLEAR_DIALOG_TIMEOUT);
   }, []);
-  const openDialog = useCallback32((pageItem) => {
+  const openDialog = useCallback33((pageItem) => {
     useLayoutStore.setState({
       dialogContent: /* @__PURE__ */ jsx130(pageItem.component, {}),
       isDialogOpen: true
@@ -29975,7 +30039,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.113",
+      version: "0.4.115",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -30081,7 +30145,6 @@ var init_package = __esm({
 // src/internal/components/Footer/Footer.tsx
 import { useMutation as useMutation22, useQueryClient as useQueryClient29 } from "@tanstack/react-query";
 import { Loader as Loader30, LogOut } from "lucide-react";
-import { useDisconnect as useDisconnect5 } from "wagmi";
 import { jsx as jsx131, jsxs as jsxs118 } from "react/jsx-runtime";
 function Footer() {
   const qc = useQueryClient29();
@@ -30090,7 +30153,7 @@ function Footer() {
   const address = useSession((st) => st.address);
   const chainConfig = useSession((st) => st.chainConfig);
   const isDialogForced = useLayoutStore((st) => st.isDialogForced);
-  const { mutate: wagmiDisconnect } = useDisconnect5({
+  const { mutate: wagmiDisconnect } = useSafeDisconnect({
     mutation: {
       onSuccess: () => {
         useExternalWalletStore.getState().clearExternalWallet();
@@ -30204,6 +30267,7 @@ var init_Footer = __esm({
     init_ProviderContext();
     init_SessionContext();
     init_i18n();
+    init_useSafeDisconnect();
     init_auth();
     init_base3();
     init_useLayoutDataStore();
@@ -30300,7 +30364,7 @@ var init_onborading_setup = __esm({
 
 // src/internal/components/Header/Header.tsx
 import { CircleQuestionMarkIcon, Copy as Copy4, Loader as Loader31 } from "lucide-react";
-import { useCallback as useCallback33, useRef as useRef21, useState as useState33 } from "react";
+import { useCallback as useCallback34, useRef as useRef21, useState as useState33 } from "react";
 import { Fragment as Fragment46, jsx as jsx132, jsxs as jsxs119 } from "react/jsx-runtime";
 function formatAddress3(addr) {
   if (!addr) return "";
@@ -30317,7 +30381,7 @@ function Header() {
   const [copied, setCopied] = useState33(false);
   const clickCountRef = useRef21(0);
   const clickTimerRef = useRef21(null);
-  const handleAvatarClick = useCallback33(() => {
+  const handleAvatarClick = useCallback34(() => {
     clickCountRef.current += 1;
     if (clickTimerRef.current) {
       clearTimeout(clickTimerRef.current);
@@ -30742,8 +30806,10 @@ import { useConnection } from "wagmi";
 function DirectWalletHandler() {
   const walletMode = useProviderConfig().config.current?.wallet?.mode || "both";
   const externalAddress = useExternalWalletStore((st) => st.externalAddress);
+  const externalChainId = useExternalWalletStore((st) => st.externalChainId);
+  const externalConnectorName = useExternalWalletStore((st) => st.connectorName);
   const isExternalConnected = useExternalWalletStore((st) => st.isExternalConnected);
-  const { address, isConnected, chain, connector } = useConnection();
+  const { address, isConnected, chainId, connector } = useConnection();
   useEffect56(() => {
     const { setConfigMode, setActiveMode } = useExternalWalletStore.getState();
     setConfigMode(walletMode);
@@ -30754,14 +30820,21 @@ function DirectWalletHandler() {
       useExternalWalletStore.getState().clearExternalWallet();
       return;
     }
-    if (isConnected && address && connector && chain?.id && externalAddress !== address) {
-      useExternalWalletStore.getState().setExternalWallet({
-        address,
-        chainId: chain.id,
-        connectorName: connector.name || "Unknown Wallet"
-      });
+    if (!isConnected || !address || !connector || !chainId) return;
+    const connectorName = connector.name || "Unknown Wallet";
+    if (externalAddress !== address || externalChainId !== chainId || externalConnectorName !== connectorName) {
+      useExternalWalletStore.getState().setExternalWallet({ address, chainId, connectorName });
     }
-  }, [isConnected, address, isExternalConnected, externalAddress, connector, chain]);
+  }, [
+    isConnected,
+    address,
+    isExternalConnected,
+    externalAddress,
+    externalChainId,
+    externalConnectorName,
+    connector,
+    chainId
+  ]);
   return null;
 }
 var init_DirectWalletHandler = __esm({
@@ -30772,7 +30845,7 @@ var init_DirectWalletHandler = __esm({
 });
 
 // src/internal/components/TssManager.tsx
-import React32, { useCallback as useCallback34 } from "react";
+import React32, { useCallback as useCallback35 } from "react";
 var TssManagerWithRef;
 var init_TssManager = __esm({
   "src/internal/components/TssManager.tsx"() {
@@ -30787,7 +30860,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 = useCallback34(
+      const onSessionCreated = useCallback35(
         (session, address) => {
           setSession(session);
           setAddress(address);
@@ -32238,7 +32311,7 @@ var init_iframe_manager = __esm({
        */
       handleMessage(event) {
         const message = event.data;
-        if (!message || typeof message !== "object" || !message.type) {
+        if (!message || typeof message !== "object" || typeof message.type !== "string" || !message.type) {
           return;
         }
         message.type = this.normalizeMessageType(message.type);
@@ -33331,7 +33404,7 @@ import { initSdkErrorTracking } from "@embarkai/core/internal/error-tracking";
 import { merge as merge3 } from "lodash-es";
 import {
   createContext,
-  useCallback as useCallback35,
+  useCallback as useCallback36,
   useContext,
   useEffect as useEffect57,
   useMemo as useMemo21,
@@ -33360,7 +33433,7 @@ function Provider(props) {
   useEffect57(() => notifyNoProjetctId(projectId), [projectId]);
   const config = useRef22(merge3({}, DEFAULT_PROVIDER_CONFIG, { projectId }, initialConfig));
   const wagmiConfig3 = useRef22(getWagmiConfig(config.current?.wallet?.walletConnectId || null));
-  const updateConfig = useCallback35((updates) => {
+  const updateConfig = useCallback36((updates) => {
     const prev = config.current;
     const next = { ...prev };
     if (updates.projectId !== void 0) next.projectId = updates.projectId;
@@ -33394,7 +33467,7 @@ function Provider(props) {
     if (updates.translations) next.translations = { ...next.translations, ...updates.translations };
     config.current = next;
   }, []);
-  const updateCallbacks = useCallback35((updates) => {
+  const updateCallbacks = useCallback36((updates) => {
     const prev = callbacksRef.current;
     const next = updates ? { ...prev, ...updates } : void 0;
     callbacksRef.current = next;
@@ -34463,12 +34536,12 @@ init_useErc3643Compliance();
 
 // src/hooks/useWalletMode.ts
 init_useExternalWalletStore();
-import { useCallback as useCallback38 } from "react";
+import { useCallback as useCallback39 } from "react";
 function useWalletMode() {
   const configMode = useExternalWalletStore((st) => st.configMode);
   const activeMode = useExternalWalletStore((st) => st.activeMode);
   const setActiveMode = useExternalWalletStore((st) => st.setActiveMode);
-  const switchMode = useCallback38(
+  const switchMode = useCallback39(
     (mode) => {
       if (configMode !== "both") return;
       setActiveMode(mode);
@@ -34485,8 +34558,8 @@ function useWalletMode() {
 
 // src/hooks/useDirectWallet.ts
 init_useOpenPage();
-import { useCallback as useCallback39 } from "react";
-import { useDisconnect as useDisconnect6 } from "wagmi";
+init_useSafeDisconnect();
+import { useCallback as useCallback40 } from "react";
 init_useExternalWalletStore();
 function useDirectWallet() {
   const address = useExternalWalletStore((st) => st.externalAddress);
@@ -34494,11 +34567,11 @@ function useDirectWallet() {
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const connectorName = useExternalWalletStore((st) => st.connectorName);
   const { open: openEmbarkAI } = useOpenPage();
-  const { mutate: wagmiDisconnect } = useDisconnect6();
-  const connect = useCallback39((connectFlowType = "connect") => {
+  const { mutate: wagmiDisconnect } = useSafeDisconnect();
+  const connect = useCallback40((connectFlowType = "connect") => {
     openEmbarkAI("connect-external-wallet" /* CONNECT_EXTERNAL_WALLET */, { connectFlowType });
   }, []);
-  const disconnect = useCallback39(() => {
+  const disconnect = useCallback40(() => {
     wagmiDisconnect();
     useExternalWalletStore.getState().clearExternalWallet();
   }, [wagmiDisconnect]);
@@ -34514,66 +34587,92 @@ function useDirectWallet() {
 }
 
 // src/hooks/useSendDirectTransaction.ts
-init_useExternalWalletStore();
-import { useCallback as useCallback40, useState as useState39 } from "react";
+import { useCallback as useCallback41, useState as useState39 } from "react";
 import { isAddress as isAddress4, parseEther as parseEther3 } from "viem";
-import { useSendTransaction as useWagmiSendTransaction, useSwitchChain as useSwitchChain4 } from "wagmi";
+import { useConnection as useConnection2, useSwitchChain as useSwitchChain4, useSendTransaction as useWagmiSendTransaction } from "wagmi";
+
+// src/internal/lib/direct-transaction.ts
+async function submitDirectTransaction(request, deps) {
+  const { connector, switchChain, send } = deps;
+  if (request.chainId) {
+    const walletChainId = await connector.getChainId();
+    if (walletChainId !== request.chainId) {
+      await switchChain({ connector, chainId: request.chainId });
+    }
+  }
+  return send({ ...request, connector });
+}
+
+// src/hooks/useSendDirectTransaction.ts
+init_useExternalWalletStore();
 function useSendDirectTransaction() {
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
-  const externalChainId = useExternalWalletStore((st) => st.externalChainId);
-  const { sendTransactionAsync } = useWagmiSendTransaction();
+  const { connector } = useConnection2();
+  const { sendTransactionAsync: sendWagmiTransactionAsync } = useWagmiSendTransaction();
   const { switchChainAsync } = useSwitchChain4();
   const [isPending, setIsPending] = useState39(false);
   const [error, setError] = useState39(null);
   const [txHash, setTxHash] = useState39(null);
-  const sendTransaction = useCallback40(
+  const sendTransactionAsync = useCallback41(
     async (params) => {
-      if (!isConnected) {
-        setError("No external wallet connected");
-        return null;
+      if (!isConnected || !connector) {
+        const message = "No external wallet connected";
+        setError(message);
+        throw new Error(message);
       }
       if (!isAddress4(params.to)) {
-        setError("Invalid recipient address");
-        return null;
+        const message = "Invalid recipient address";
+        setError(message);
+        throw new Error(message);
       }
       setIsPending(true);
       setError(null);
       setTxHash(null);
       try {
-        if (params.chainId && params.chainId !== externalChainId) {
-          await switchChainAsync({ chainId: params.chainId });
-        }
-        const hash = await sendTransactionAsync({
-          to: params.to,
-          value: parseEther3(params.value),
-          data: params.data,
-          gas: params.gas
-        });
+        const hash = await submitDirectTransaction(
+          {
+            to: params.to,
+            value: parseEther3(params.value),
+            data: params.data,
+            chainId: params.chainId,
+            gas: params.gas
+          },
+          { connector, switchChain: switchChainAsync, send: sendWagmiTransactionAsync }
+        );
         setTxHash(hash);
         return hash;
       } catch (err) {
-        const message = err instanceof Error ? err.message : "Transaction failed";
-        setError(message);
-        return null;
+        setError(err instanceof Error ? err.message : "Transaction failed");
+        throw err;
       } finally {
         setIsPending(false);
       }
     },
-    [isConnected, externalChainId, sendTransactionAsync, switchChainAsync]
+    [isConnected, connector, sendWagmiTransactionAsync, switchChainAsync]
   );
-  const reset = useCallback40(() => {
+  const sendTransaction = useCallback41(
+    async (params) => {
+      try {
+        return await sendTransactionAsync(params);
+      } catch {
+        return null;
+      }
+    },
+    [sendTransactionAsync]
+  );
+  const reset = useCallback41(() => {
     setError(null);
     setTxHash(null);
     setIsPending(false);
   }, []);
-  return { sendTransaction, isPending, error, txHash, reset };
+  return { sendTransaction, sendTransactionAsync, isPending, error, txHash, reset };
 }
 
 // src/hooks/useTransferToLinkedWallet.ts
 init_SessionContext();
 init_account2();
 init_linkedProfiles();
-import { useCallback as useCallback41, useMemo as useMemo23, useState as useState40 } from "react";
+import { useCallback as useCallback42, useMemo as useMemo23, useState as useState40 } from "react";
 import { encodeFunctionData as encodeFunctionData3, isAddress as isAddress5, parseEther as parseEther4, parseUnits as parseUnits3 } from "viem";
 var ERC20_TRANSFER_ABI2 = [
   {
@@ -34596,7 +34695,7 @@ function useTransferToLinkedWallet() {
     () => (profiles || []).filter((p) => p.provider === "wallet" && p.externalId).map((p) => p.externalId),
     [profiles]
   );
-  const transfer = useCallback41(
+  const transfer = useCallback42(
     async (params) => {
       if (!session) {
         setError("No active session");
@@ -34647,7 +34746,7 @@ function useTransferToLinkedWallet() {
     },
     [session, linkedWallets]
   );
-  const reset = useCallback41(() => {
+  const reset = useCallback42(() => {
     setError(null);
     setUserOpHash(null);
     setIsPending(false);
@@ -34670,16 +34769,16 @@ function useNativeWalletSignature() {
 }
 
 // src/hooks/useLogout.ts
+init_useSafeDisconnect();
 init_ProviderContext();
 init_SessionContext();
 init_useExternalWalletStore();
 import { logout as coreLogout, jwtTokenManager as jwtTokenManager3 } from "@embarkai/core/auth";
-import { useCallback as useCallback42 } from "react";
-import { useDisconnect as useDisconnect7 } from "wagmi";
+import { useCallback as useCallback43 } from "react";
 function useLogout() {
   const { callbacksRef } = useProviderConfig();
   const address = useSession((st) => st.address);
-  const { mutate: wagmiDisconnect } = useDisconnect7({
+  const { mutate: wagmiDisconnect } = useSafeDisconnect({
     mutation: {
       onSuccess: () => {
         useExternalWalletStore.getState().clearExternalWallet();
@@ -34690,7 +34789,7 @@ function useLogout() {
       }
     }
   });
-  const logout2 = useCallback42(async () => {
+  const logout2 = useCallback43(async () => {
     const { setSession, setIsLoading, setAddress, setStatus, setError } = useSession.getState();
     const prevAddress = address;
     let userId = null;