@embarkai/ui-kit 0.4.105 → 0.4.107

package/dist/index.cjs

@@ -7575,6 +7575,7 @@ var init_en = __esm({
       connectMenu: {
         connectWallet: "Connect Wallet Profile",
         noWallets: "No wallets available to connect",
+        requestPending: "{{wallet}} already has a pending request from this site. Open {{wallet}}, reject or close that request, then try again.",
         instructions: {
           follow: "Watch your connecting wallet app.\nYou will be asked to:\n {{steps}}",
           confirm: "- 1. Confirm your wallet connection into embarkAI",
@@ -8167,6 +8168,7 @@ var init_ru = __esm({
       connectMenu: {
         connectWallet: "\u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043F\u0440\u043E\u0444\u0438\u043B\u044C \u043A\u043E\u0448\u0435\u043B\u044C\u043A\u0430",
         noWallets: "\u041D\u0435\u0442 \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0445 \u043A\u043E\u0448\u0435\u043B\u044C\u043A\u043E\u0432 \u0434\u043B\u044F \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F",
+        requestPending: "\u0412 {{wallet}} \u0443\u0436\u0435 \u0432\u0438\u0441\u0438\u0442 \u0437\u0430\u043F\u0440\u043E\u0441 \u043E\u0442 \u044D\u0442\u043E\u0433\u043E \u0441\u0430\u0439\u0442\u0430. \u041E\u0442\u043A\u0440\u043E\u0439\u0442\u0435 {{wallet}}, \u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\u0435 \u0438\u043B\u0438 \u0437\u0430\u043A\u0440\u043E\u0439\u0442\u0435 \u044D\u0442\u043E\u0442 \u0437\u0430\u043F\u0440\u043E\u0441 \u0438 \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0441\u043D\u043E\u0432\u0430.",
         instructions: {
           follow: "\u0421\u043B\u0435\u0434\u0438\u0442\u0435 \u0437\u0430 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0435\u043C\u044B\u043C \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435\u043C \u043A\u043E\u0448\u0435\u043B\u044C\u043A\u0430.\n\u0412\u0430\u043C \u0431\u0443\u0434\u0435\u0442 \u043F\u0440\u0435\u0434\u043B\u043E\u0436\u0435\u043D\u043E:\n {{steps}}",
           confirm: "- 1. \u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043A\u043E\u0448\u0435\u043B\u044C\u043A\u0430 \u043A embarkAI",
@@ -8759,6 +8761,7 @@ var init_zh = __esm({
       connectMenu: {
         connectWallet: "\u8FDE\u63A5\u94B1\u5305\u914D\u7F6E\u6587\u4EF6",
         noWallets: "\u6CA1\u6709\u53EF\u8FDE\u63A5\u7684\u94B1\u5305",
+        requestPending: "{{wallet}} \u4E2D\u5DF2\u6709\u6765\u81EA\u672C\u7F51\u7AD9\u7684\u5F85\u5904\u7406\u8BF7\u6C42\u3002\u8BF7\u6253\u5F00 {{wallet}}\uFF0C\u62D2\u7EDD\u6216\u5173\u95ED\u8BE5\u8BF7\u6C42\uFF0C\u7136\u540E\u91CD\u8BD5\u3002",
         instructions: {
           follow: "\u8BF7\u67E5\u770B\u60A8\u6B63\u5728\u8FDE\u63A5\u7684\u94B1\u5305\u5E94\u7528\u3002\n\u60A8\u5C06\u88AB\u8981\u6C42\uFF1A\n {{steps}}",
           confirm: "- 1. \u786E\u8BA4\u5C06\u60A8\u7684\u94B1\u5305\u8FDE\u63A5\u5230 embarkAI",
@@ -16806,16 +16809,19 @@ function getProviderCaption(provider) {
 function ProviderCard(props) {
   const { provider, meta, externalId, disabled } = props;
   const { t } = useT();
-  const externalWalletAddress = useExternalWalletStore((st) => st.externalAddress);
+  const connections = (0, import_wagmi.useConnections)();
   const {
     mutate: connectExternalWallet,
     disconnect: disconnectExternalWallet,
     isPending: isConnectingExternalWallet,
     variables: pendingConnectVariables,
     isAvailable: isConnectExternalWalletAvailable
-  } = useExternalWalletConnnect();
-  const setPage = useLayoutDataStore((st) => st.setPage);
-  const setConfirmUnlink = useManageWalletStore((st) => st.setConfirmUnlink);
+  } = useExternalWalletConnnect({
+    // onSuccess: undefined,
+    onError: ({ connector, error }) => {
+      console.warn("[useExternalWalletConnect]", connector, error);
+    }
+  });
   const { data: providers = [] } = useProvidersList();
   if (!provider) {
     console.warn("[ProviderCard] Received undefined provider");
@@ -16828,7 +16834,7 @@ function ProviderCard(props) {
   };
   const info = getProviderDisplayInfo(provider);
   const allowUnlink = canUnlink(props);
-  const isWalletProviderConnected = !!externalWalletAddress && provider === "wallet" && externalWalletAddress === externalId;
+  const isWalletProviderConnected = provider === "wallet" && connections.some((c) => c.accounts.includes(externalId));
   const IconComponent = provider === "wallet" ? WALLET_ICONS[meta?.walletType || "default"] || WALLET_ICONS.default : info.icon;
   return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "w-full flex items-center justify-between gap-[var(--ui-kit-gap)]", children: [
     /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
@@ -16906,8 +16912,8 @@ function ProviderCard(props) {
           disabled: disabled || isConnectingExternalWallet,
           title: t("passport:common.delete"),
           onClick: () => {
-            setConfirmUnlink({ provider, providerName: info.name, externalId });
-            setPage("unlink-provider" /* UNLINK_PROVIDER */);
+            useManageWalletStore.getState().setConfirmUnlink({ provider, providerName: info.name, externalId });
+            useLayoutDataStore.getState().setPage("unlink-provider" /* UNLINK_PROVIDER */);
           },
           children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_lucide_react30.Trash2Icon, { className: "w-4 h-4 text-[var(--ui-kit-bg-error)]" })
         }
@@ -16915,15 +16921,15 @@ function ProviderCard(props) {
     ] })
   ] });
 }
-var import_lucide_react30, import_jsx_runtime71;
+var import_lucide_react30, import_wagmi, import_jsx_runtime71;
 var init_ProviderCard = __esm({
   "src/internal/components/ManageWalletMenu/ProviderCard.tsx"() {
     init_useLayoutDataStore();
     init_useT();
     init_wallets();
     import_lucide_react30 = require("lucide-react");
+    import_wagmi = require("wagmi");
     init_types();
-    init_useExternalWalletStore();
     init_cn();
     init_ConnectExternalWalletMenu2();
     init_button();
@@ -17139,7 +17145,7 @@ function UnlinkProviderMenu() {
   const qc = (0, import_react_query24.useQueryClient)();
   const address = useSession((st) => st.address);
   const { callbacksRef } = useProviderConfig();
-  const { disconnect: disconnectExternalWallet } = (0, import_wagmi.useDisconnect)();
+  const { disconnect: disconnectExternalWallet } = (0, import_wagmi2.useDisconnect)();
   const isExternalConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const { t } = useT();
   const setPage = useLayoutDataStore((st) => st.setPage);
@@ -17226,7 +17232,7 @@ function UnlinkProviderMenu() {
     ] })
   ] });
 }
-var import_react_query24, import_lucide_react32, import_react43, import_wagmi, import_jsx_runtime73;
+var import_react_query24, import_lucide_react32, import_react43, import_wagmi2, import_jsx_runtime73;
 var init_UnlinkProviderMenu = __esm({
   "src/internal/components/ManageWalletMenu/UnlinkProviderMenu.tsx"() {
     init_useLayoutDataStore();
@@ -17237,7 +17243,7 @@ var init_UnlinkProviderMenu = __esm({
     import_react_query24 = require("@tanstack/react-query");
     import_lucide_react32 = require("lucide-react");
     import_react43 = require("react");
-    import_wagmi = require("wagmi");
+    import_wagmi2 = require("wagmi");
     init_auth();
     init_useExternalWalletStore();
     init_button();
@@ -17323,19 +17329,50 @@ function getConnectFlowType(params) {
   if (!isEmbarkAI) return "auth";
   return connectFlow;
 }
+function someInErrorChain(error, predicate) {
+  let current = error;
+  for (let depth = 0; current && depth < 10; depth++) {
+    if (predicate(current)) return true;
+    current = current.cause;
+  }
+  return false;
+}
 function ConnectExternalWalletMenu() {
   const { config, callbacksRef } = useProviderConfig();
   const allowedWallets = config.current?.wallet?.allowedWallets;
   const walletMode = config.current?.wallet?.mode || "both";
   const qc = (0, import_react_query25.useQueryClient)();
   const { t } = useT();
-  const { address: embarkAiAddress } = useSession();
-  const { open: openEmbarkAI, close: closeEmbarkAI } = useOpenPage();
+  const embarkAiAddress = useSession((st) => st.address);
+  const { close: closeEmbarkAI } = useOpenPage();
   const menuParams = useConnectExternalWalletMenuParams();
-  const connectors = (0, import_wagmi2.useConnectors)();
+  const connectors = (0, import_wagmi3.useConnectors)();
   const hasInjectedWallet2 = useHasInjectedWallet();
-  const { mutate: disconnect } = (0, import_wagmi2.useDisconnect)();
-  const { mutateAsync: signMessageAsync } = (0, import_wagmi2.useSignMessage)();
+  const wagmiConfig3 = (0, import_wagmi3.useConfig)();
+  const connections = (0, import_wagmi3.useConnections)();
+  const { mutate: disconnect, mutateAsync: disconnectAsync } = (0, import_wagmi3.useDisconnect)();
+  const { mutateAsync: signMessageAsync } = (0, import_wagmi3.useSignMessage)();
+  const { mutateAsync: switchChainAsync } = (0, import_wagmi3.useSwitchChain)();
+  const { mutateAsync: switchConnectionAsync } = (0, import_wagmi3.useSwitchConnection)();
+  const [isPreparingConnect, setIsPreparingConnect] = (0, import_react46.useState)(false);
+  const signOnSupportedChain = async (params) => {
+    const { connector, account, message } = params;
+    const signOnce = async (viaFallback = false) => {
+      let chainId = await connector.getChainId();
+      if (viaFallback) {
+        await switchChainAsync({ connector, chainId: SIGN_FALLBACK_CHAIN_ID });
+        chainId = SIGN_FALLBACK_CHAIN_ID;
+      }
+      const signature = await signMessageAsync({ connector, account, message });
+      return { chainId, signature };
+    };
+    try {
+      return await signOnce(false);
+    } catch (error) {
+      if (!isUnsupportedChainError(error)) throw error;
+      return await signOnce(true);
+    }
+  };
   const walletMenuOpenedFrom = useLayoutDataStore((st) => st.walletMenuOpenedFrom);
   const { data: providers = [] } = (0, import_react_query25.useQuery)({
     retry: false,
@@ -17355,7 +17392,24 @@ function ConnectExternalWalletMenu() {
       callbacksRef.current?.onAccountUpdate?.({ providers: providers2 });
     }
   });
-  const { mutateAsync: loginOrLinkOrConnectWallet, isPending: isLoginOrLinkOrConnectWallet } = (0, import_react_query25.useMutation)({
+  const keepOrReleaseExternalWallet = (connector, address, chainId) => {
+    if (walletMode === "direct" || walletMode === "both") {
+      useExternalWalletStore.getState().setExternalWallet({
+        address,
+        chainId,
+        connectorName: connector.name || "Unknown Wallet"
+      });
+    } else {
+      disconnect();
+      const { externalAddress, clearExternalWallet } = useExternalWalletStore.getState();
+      if (!!externalAddress) clearExternalWallet();
+    }
+  };
+  const completeExternalConnect = (connector, address, chainId) => {
+    useLayoutDataStore.getState().setPage(walletMenuOpenedFrom || "manage-wallet" /* MANAGE_WALLET */);
+    keepOrReleaseExternalWallet(connector, address, chainId);
+  };
+  const { mutateAsync: loginOrLinkWallet, isPending: isLoginOrLinkWallet } = (0, import_react_query25.useMutation)({
     mutationFn: async (payload) => {
       const { walletData, connectFlowType } = payload;
       switch (connectFlowType) {
@@ -17370,13 +17424,9 @@ function ConnectExternalWalletMenu() {
           await linkWallet(walletData);
           await onLinkingComplete(true);
           return { linked: true, message: `Address ${walletData.address} linked` };
-        // Connect external wallet flow, only if embarkAI is connected
-        case "connect":
-          return null;
       }
     },
     onSuccess: async (response, { walletData, connector, connectFlowType }) => {
-      let shouldKeepConnected = walletMode === "direct" || walletMode === "both";
       switch (connectFlowType) {
         case "auth":
           useLayoutDataStore.getState().setPendingWalletLogin(response);
@@ -17386,23 +17436,11 @@ function ConnectExternalWalletMenu() {
           const { linked, message } = response || {};
           if (!linked && message.includes("already linked")) {
             console.warn("[LINK STATUS] already linked", response);
-            useManageWalletStore.getState().setProviderType(null);
-            useLayoutDataStore.getState().setPage(walletMenuOpenedFrom || "manage-wallet" /* MANAGE_WALLET */);
+            await onLinkingComplete(false);
           }
           break;
-        case "connect":
-          useLayoutDataStore.getState().setPage(walletMenuOpenedFrom || "main-menu" /* MAIN_MENU */);
-          break;
-      }
-      if (shouldKeepConnected && walletData.chainId && connector) {
-        useExternalWalletStore.getState().setExternalWallet({
-          address: walletData.address,
-          chainId: walletData.chainId,
-          connectorName: connector.name || "Unknown Wallet"
-        });
-      } else {
-        disconnect();
       }
+      keepOrReleaseExternalWallet(connector, walletData.address, walletData.chainId);
       useLayoutStore.getState().setIsDialogForced(false);
     },
     onError: async (err, { walletData, connectFlowType }) => {
@@ -17417,9 +17455,6 @@ function ConnectExternalWalletMenu() {
           useManageWalletStore.getState().setAlert({ title: "Error", message: errorMsg });
           await onLinkingComplete(false);
           break;
-        case "connect":
-          openEmbarkAI(walletMenuOpenedFrom || "main-menu" /* MAIN_MENU */);
-          break;
       }
     }
   });
@@ -17427,77 +17462,77 @@ function ConnectExternalWalletMenu() {
     mutateAsync: connect,
     isPending: isConnectingExternalWallet,
     variables: pendingConnectVariables
-  } = (0, import_wagmi2.useConnect)({
+  } = (0, import_wagmi3.useConnect)({
     mutation: {
-      onSuccess: async (connectionData, { connector }) => {
-        const { chainId, accounts } = connectionData;
-        const projectId = config.current?.projectId;
-        const projectName = projectId ? await fetchProjectName(projectId) : "EmbarkAI";
+      onSuccess: async ({ chainId, accounts }, variables) => {
+        const connector = variables.connector;
         const signingWalletAddress = accounts[0];
         const connectFlowType = getConnectFlowType({
           isEmbarkAI: !!embarkAiAddress,
           connectFlow: menuParams.current?.connectFlowType || "auth"
         });
-        let message;
-        let signature;
-        switch (connectFlowType) {
-          case "auth":
-            message = createLoginMessage(signingWalletAddress, projectName);
-            signature = await signMessageAsync({ message, account: signingWalletAddress });
-            break;
-          case "link":
-            message = createSignatureMessage(signingWalletAddress, projectName);
-            signature = await signMessageAsync({ message, account: signingWalletAddress });
-            break;
-          case "connect":
-            message = "UNUSED_MESSAGE";
-            signature = "0xUNUSED_SIGNATURE";
-            break;
-        }
-        if (!message || !signature) {
-          throw new Error("Failed to get sign message & signature");
+        if (connectFlowType === "connect") {
+          completeExternalConnect(connector, signingWalletAddress, chainId);
+          useLayoutStore.getState().setIsDialogForced(false);
+          return;
         }
-        await loginOrLinkOrConnectWallet({
+        const projectId = config.current?.projectId;
+        const projectName = projectId ? await fetchProjectName(projectId) : "EmbarkAI";
+        const createMessage = connectFlowType === "auth" ? createLoginMessage : createSignatureMessage;
+        const message = createMessage(signingWalletAddress, projectName);
+        const { signature, chainId: signedChainId } = await signOnSupportedChain({
+          connector,
+          account: signingWalletAddress,
+          message
+        });
+        await loginOrLinkWallet({
           connector,
           connectFlowType,
           walletData: {
-            chainId,
+            chainId: signedChainId,
             address: signingWalletAddress,
             signature,
             message,
-            walletName: connector?.name || "Unknown Wallet",
-            // @ts-expect-error id exists
-            walletType: connector?.id || "unknown"
+            walletName: connector.name || "Unknown Wallet",
+            walletType: connector.id || "unknown"
           }
         });
       },
-      onError: (error, { connector }) => {
-        const connectFlowType = getConnectFlowType({
-          isEmbarkAI: !!embarkAiAddress,
-          connectFlow: menuParams.current?.connectFlowType || "auth"
-        });
-        const setPage = useLayoutDataStore.getState().setPage;
-        setTimeout(() => {
-          switch (connectFlowType) {
-            case "auth":
-              setConnectError(error?.message || "Failed to connect wallet");
-              break;
-            case "link":
-              setPage("manage-wallet" /* MANAGE_WALLET */);
-              useManageWalletStore.getState().setAlert({
-                title: `Failed to connect: ${connector.name}`,
-                message: error?.message || "Failed to connect wallet before linking"
-              });
-              break;
-            case "connect":
-              setConnectError(error?.message || "Failed to connect wallet");
-              break;
-          }
-          useLayoutStore.getState().setIsDialogForced(false);
-        }, 100);
-      }
+      onError: (error, { connector }) => reportConnectError(error, connector)
     }
   });
+  function reportConnectError(error, connector) {
+    const connectFlowType = getConnectFlowType({
+      isEmbarkAI: !!embarkAiAddress,
+      connectFlow: menuParams.current?.connectFlowType || "auth"
+    });
+    const isRequestPending = isRequestPendingError(error);
+    if (!isRequestPending && connectFlowType !== "connect" && wagmiConfig3.state.connections.has(connector.uid)) {
+      disconnect({ connector });
+    }
+    const errorMessage = isRequestPending ? (
+      // @ts-expect-error i18n typing
+      t("passport:connectMenu.requestPending", { wallet: connector.name })
+    ) : error?.message;
+    setTimeout(() => {
+      switch (connectFlowType) {
+        case "auth":
+          setConnectError(errorMessage || "Failed to connect wallet");
+          break;
+        case "link":
+          useLayoutDataStore.getState().setPage("manage-wallet" /* MANAGE_WALLET */);
+          useManageWalletStore.getState().setAlert({
+            title: `Failed to connect: ${connector.name}`,
+            message: errorMessage || "Failed to connect wallet before linking"
+          });
+          break;
+        case "connect":
+          setConnectError(errorMessage || "Failed to connect wallet");
+          break;
+      }
+      useLayoutStore.getState().setIsDialogForced(false);
+    }, 100);
+  }
   const visibleConnectors = (0, import_react46.useMemo)(() => {
     const seen = /* @__PURE__ */ new Set();
     const unique = connectors.filter((connector) => {
@@ -17537,8 +17572,8 @@ function ConnectExternalWalletMenu() {
           variant: "ghost",
           size: "icon",
           title: t("passport:common.back"),
-          disabled: isConnectingExternalWallet || isLoginOrLinkOrConnectWallet,
-          onClick: () => useLayoutDataStore.getState().setPage(walletMenuOpenedFrom ?? "main-menu" /* MAIN_MENU */),
+          disabled: isConnectingExternalWallet || isLoginOrLinkWallet,
+          onClick: () => useLayoutDataStore.getState().setPage(walletMenuOpenedFrom ?? "manage-wallet" /* MANAGE_WALLET */),
           children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_lucide_react33.ArrowLeft, { className: "h-4 w-4" })
         }
       ),
@@ -17554,14 +17589,32 @@ function ConnectExternalWalletMenu() {
           variant: "secondary",
           size: "large",
           className: "w-full justify-center",
-          disabled: isConnectingExternalWallet,
+          disabled: isConnectingExternalWallet || isPreparingConnect || isLoginOrLinkWallet,
           onClick: async () => {
             if (connectError) setConnectError(null);
+            const connectFlowType = getConnectFlowType({
+              isEmbarkAI: !!embarkAiAddress,
+              connectFlow: menuParams.current?.connectFlowType || "auth"
+            });
+            setIsPreparingConnect(true);
             try {
-              disconnect();
-            } catch {
+              const existingConnection = connections.find((c) => c.connector.uid === connector.uid);
+              if (connectFlowType === "connect" && existingConnection?.accounts[0]) {
+                await switchConnectionAsync({ connector });
+                completeExternalConnect(connector, existingConnection.accounts[0], existingConnection.chainId);
+                useLayoutStore.getState().setIsDialogForced(false);
+                return;
+              }
+              const connectionsToDrop = connections.filter((c) => c.connector.uid === connector.uid);
+              for (const { connector: connectedConnector } of connectionsToDrop) {
+                await disconnectAsync({ connector: connectedConnector });
+              }
+            } catch (error) {
+              reportConnectError(error, connector);
+              return;
+            } finally {
+              setIsPreparingConnect(false);
             }
-            await new Promise((resolve) => setTimeout(resolve, 500));
             switch (true) {
               case (connector.id === "metaMaskSDK" && !hasInjectedWallet2):
                 closeEmbarkAI();
@@ -17613,7 +17666,7 @@ function ConnectExternalWalletMenu() {
     ] })
   ] });
 }
-var import_react_query25, import_lucide_react33, import_react46, import_wagmi2, import_jsx_runtime74;
+var import_react_query25, import_lucide_react33, import_react46, import_wagmi3, import_chains, import_jsx_runtime74, SIGN_FALLBACK_CHAIN_ID, REQUEST_PENDING_ERROR_CODE, isRequestPendingError, isUnsupportedChainError;
 var init_ConnectExternalWalletMenu = __esm({
   "src/internal/components/ConnectExternalWalletMenu/ConnectExternalWalletMenu.tsx"() {
     init_ProviderContext();
@@ -17625,7 +17678,8 @@ var init_ConnectExternalWalletMenu = __esm({
     import_react_query25 = require("@tanstack/react-query");
     import_lucide_react33 = require("lucide-react");
     import_react46 = require("react");
-    import_wagmi2 = require("wagmi");
+    import_wagmi3 = require("wagmi");
+    import_chains = require("wagmi/chains");
     init_common();
     init_wallet();
     init_useLayoutDataStore();
@@ -17638,16 +17692,21 @@ var init_ConnectExternalWalletMenu = __esm({
     init_useConnectExternalWalletMenuParams();
     init_useHasInjectedWallet();
     import_jsx_runtime74 = require("react/jsx-runtime");
+    SIGN_FALLBACK_CHAIN_ID = import_chains.mainnet.id;
+    REQUEST_PENDING_ERROR_CODE = -32002;
+    isRequestPendingError = (error) => someInErrorChain(error, (e) => e.code === REQUEST_PENDING_ERROR_CODE);
+    isUnsupportedChainError = (error) => someInErrorChain(error, (e) => typeof e.message === "string" && e.message.includes("supportedNetworks"));
   }
 });
 
 // src/internal/components/ConnectExternalWalletMenu/useExternalWalletConnect.ts
-function useExternalWalletConnnect() {
+function useExternalWalletConnnect(options) {
+  const { onSuccess, onError } = options || {};
   const { config } = useProviderConfig();
   const walletMode = config.current?.wallet?.mode;
-  const connectors = (0, import_wagmi3.useConnectors)();
-  const { mutate: disconnect } = (0, import_wagmi3.useDisconnect)();
-  const { mutate: connect, ...restUseConnect } = (0, import_wagmi3.useConnect)({
+  const connectors = (0, import_wagmi4.useConnectors)();
+  const { mutate: disconnect } = (0, import_wagmi4.useDisconnect)();
+  const { mutate: connect, ...restUseConnect } = (0, import_wagmi4.useConnect)({
     mutation: {
       onSuccess: (connectionData, { connector }) => {
         const { chainId, accounts } = connectionData;
@@ -17657,9 +17716,15 @@ function useExternalWalletConnnect() {
           chainId,
           connectorName: connector.name || "Unknown Wallet"
         });
+        onSuccess?.({ connected: true, address: signingWalletAddress });
         useLayoutStore.getState().setIsDialogForced(false);
       },
-      onError: (error, variables) => {
+      onError: (error, { connector }) => {
+        onError?.({
+          connected: false,
+          connector: connector?.name || "Unknown Wallet",
+          error
+        });
         useLayoutStore.getState().setIsDialogForced(false);
       }
     }
@@ -17695,12 +17760,12 @@ function useExternalWalletConnnect() {
     ...restUseConnect
   };
 }
-var import_react47, import_wagmi3;
+var import_react47, import_wagmi4;
 var init_useExternalWalletConnect = __esm({
   "src/internal/components/ConnectExternalWalletMenu/useExternalWalletConnect.ts"() {
     init_ProviderContext();
     import_react47 = require("react");
-    import_wagmi3 = require("wagmi");
+    import_wagmi4 = require("wagmi");
     init_useLayoutStore();
     init_useExternalWalletStore();
   }
@@ -20723,7 +20788,7 @@ var init_methods = __esm({
 });
 
 // src/internal/components/KeyshareRestoreMenu/KeyshareRestoreMenu.tsx
-var import_react_query31, import_lucide_react46, import_react60, import_wagmi4, import_jsx_runtime87, RESTORE_COMPONENTS, KeyshareRestoreMenu;
+var import_react_query31, import_lucide_react46, import_react60, import_wagmi5, import_jsx_runtime87, RESTORE_COMPONENTS, KeyshareRestoreMenu;
 var init_KeyshareRestoreMenu = __esm({
   "src/internal/components/KeyshareRestoreMenu/KeyshareRestoreMenu.tsx"() {
     init_ProviderContext();
@@ -20732,7 +20797,7 @@ var init_KeyshareRestoreMenu = __esm({
     import_react_query31 = require("@tanstack/react-query");
     import_lucide_react46 = require("lucide-react");
     import_react60 = require("react");
-    import_wagmi4 = require("wagmi");
+    import_wagmi5 = require("wagmi");
     init_useLayoutDataStore();
     init_useLayoutStore();
     init_useExternalWalletStore();
@@ -20774,7 +20839,7 @@ var init_KeyshareRestoreMenu = __esm({
           setIsDialogForced(false);
         };
       }, []);
-      const { mutate: wagmiDisconnect } = (0, import_wagmi4.useDisconnect)({
+      const { mutate: wagmiDisconnect } = (0, import_wagmi5.useDisconnect)({
         mutation: {
           onSuccess: () => {
             useExternalWalletStore.getState().clearExternalWallet();
@@ -25080,12 +25145,12 @@ var init_api5 = __esm({
 });
 
 // src/internal/components/SendMenu/hyperbridge/lib/chains.ts
-var import_read17, import_chains, CHAINS_UI_META;
+var import_read17, import_chains2, CHAINS_UI_META;
 var init_chains = __esm({
   "src/internal/components/SendMenu/hyperbridge/lib/chains.ts"() {
     init_networks2();
     import_read17 = require("@embarkai/core/read");
-    import_chains = require("wagmi/chains");
+    import_chains2 = require("wagmi/chains");
     CHAINS_UI_META = {
       lumiaprism: {
         chainID: import_read17.lumiaMainnetChain.id,
@@ -25097,22 +25162,22 @@ var init_chains = __esm({
         chain: import_read17.lumiaMainnetChain
       },
       bsc: {
-        chainID: import_chains.bsc.id,
-        chainLabel: import_chains.bsc.name,
+        chainID: import_chains2.bsc.id,
+        chainLabel: import_chains2.bsc.name,
         chainName: "bsc",
         // exact hyperlane registry chain name
-        Icon: NETWORKS_ICONS[import_chains.bsc.id],
-        explorerUrl: import_chains.bsc.blockExplorers.default.url,
-        chain: import_chains.bsc
+        Icon: NETWORKS_ICONS[import_chains2.bsc.id],
+        explorerUrl: import_chains2.bsc.blockExplorers.default.url,
+        chain: import_chains2.bsc
       },
       ethereum: {
-        chainID: import_chains.mainnet.id,
-        chainLabel: import_chains.mainnet.name,
+        chainID: import_chains2.mainnet.id,
+        chainLabel: import_chains2.mainnet.name,
         chainName: "ethereum",
         // exact hyperlane registry chain name
-        Icon: NETWORKS_ICONS[import_chains.mainnet.id],
-        explorerUrl: import_chains.mainnet.blockExplorers.default.url,
-        chain: import_chains.mainnet
+        Icon: NETWORKS_ICONS[import_chains2.mainnet.id],
+        explorerUrl: import_chains2.mainnet.blockExplorers.default.url,
+        chain: import_chains2.mainnet
       }
     };
   }
@@ -25436,8 +25501,8 @@ function useBridge() {
   const qc = (0, import_react_query50.useQueryClient)();
   const { t } = useT();
   const address = useSession((st) => st.address);
-  const { data: walletClient } = (0, import_wagmi5.useWalletClient)();
-  const { mutateAsync: switchChainAsync } = (0, import_wagmi5.useSwitchChain)();
+  const { data: walletClient } = (0, import_wagmi6.useWalletClient)();
+  const { mutateAsync: switchChainAsync } = (0, import_wagmi6.useSwitchChain)();
   const swapDirection = (0, import_react80.useCallback)(() => {
     const {
       // bridgeStep,
@@ -25624,14 +25689,14 @@ function useBridge() {
     isAssetBridging
   };
 }
-var import_react_query50, import_react80, import_wagmi5;
+var import_react_query50, import_react80, import_wagmi6;
 var init_useBridge = __esm({
   "src/internal/components/SendMenu/hyperbridge/hooks/useBridge.ts"() {
     init_SessionContext();
     init_i18n();
     import_react_query50 = require("@tanstack/react-query");
     import_react80 = require("react");
-    import_wagmi5 = require("wagmi");
+    import_wagmi6 = require("wagmi");
     init_useLayoutStore();
     init_useExternalWalletStore();
     init_useFlowSelector();
@@ -25918,7 +25983,7 @@ function useBridgeBalance(isLoadingWarpRoutes, hyperlaneWarpRoutes) {
   const activeChainId = useSession((st) => st.activeChainId);
   const directWalletAddress = useExternalWalletStore((st) => st.externalAddress);
   const directWalletChainId = useExternalWalletStore((st) => st.externalChainId);
-  const { mutateAsync: switchChainAsync } = (0, import_wagmi6.useSwitchChain)();
+  const { mutateAsync: switchChainAsync } = (0, import_wagmi7.useSwitchChain)();
   const hyperRoute = useBridgeStore((st) => st.hyperRoute);
   const bridgeSender = useBridgeStore((st) => st.bridgeSender);
   const originChain = useBridgeStore((st) => st.originChain);
@@ -26045,7 +26110,7 @@ function useBridgeBalance(isLoadingWarpRoutes, hyperlaneWarpRoutes) {
     isRouteTokenBalanceLoading: isAssetsLoading || isExternalBalanceLoading || isExternalNativeBalanceLoading
   };
 }
-var import_core8, import_react_query52, import_react83, import_viem15, import_wagmi6, EXTERNAL_WALLET_BRIDGING_BALANCE_QUERY, EXTERNAL_WALLET_BRIDGING_NATIVE_BALANCE_QUERY;
+var import_core8, import_react_query52, import_react83, import_viem15, import_wagmi7, EXTERNAL_WALLET_BRIDGING_BALANCE_QUERY, EXTERNAL_WALLET_BRIDGING_NATIVE_BALANCE_QUERY;
 var init_useBridgeBalance = __esm({
   "src/internal/components/SendMenu/hyperbridge/hooks/useBridgeBalance.ts"() {
     init_SessionContext();
@@ -26054,7 +26119,7 @@ var init_useBridgeBalance = __esm({
     import_react_query52 = require("@tanstack/react-query");
     import_react83 = require("react");
     import_viem15 = require("viem");
-    import_wagmi6 = require("wagmi");
+    import_wagmi7 = require("wagmi");
     init_useBlockscoutAssets2();
     init_useExternalWalletStore();
     init_BalanceFeedProvider2();
@@ -27093,7 +27158,7 @@ function useErc3643Compliance(options) {
     isLoading,
     error: queryError,
     refetch
-  } = (0, import_wagmi7.useReadContract)({
+  } = (0, import_wagmi8.useReadContract)({
     address: tokenAddress,
     abi: ERC3643_CAN_TRANSFER_ABI,
     functionName: "canTransfer",
@@ -27130,10 +27195,10 @@ function useErc3643Compliance(options) {
     refetch
   };
 }
-var import_wagmi7, ERC3643_CAN_TRANSFER_ABI;
+var import_wagmi8, ERC3643_CAN_TRANSFER_ABI;
 var init_useErc3643Compliance = __esm({
   "src/hooks/useErc3643Compliance.ts"() {
-    import_wagmi7 = require("wagmi");
+    import_wagmi8 = require("wagmi");
     ERC3643_CAN_TRANSFER_ABI = [
       {
         type: "function",
@@ -29956,7 +30021,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.105",
+      version: "0.4.107",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -30067,7 +30132,7 @@ function Footer() {
   const address = useSession((st) => st.address);
   const chainConfig = useSession((st) => st.chainConfig);
   const isDialogForced = useLayoutStore((st) => st.isDialogForced);
-  const { mutate: wagmiDisconnect } = (0, import_wagmi8.useDisconnect)({
+  const { mutate: wagmiDisconnect } = (0, import_wagmi9.useDisconnect)({
     mutation: {
       onSuccess: () => {
         useExternalWalletStore.getState().clearExternalWallet();
@@ -30173,7 +30238,7 @@ function Footer() {
     }
   );
 }
-var import_react_query59, import_lucide_react83, import_wagmi8, import_jsx_runtime131, FOOTER_ONBOARDING_CHAIN_BUTTON, FOOTER_ONBOARDING_LOGOUT_BUTTON, FOOTER_TOUR;
+var import_react_query59, import_lucide_react83, import_wagmi9, import_jsx_runtime131, FOOTER_ONBOARDING_CHAIN_BUTTON, FOOTER_ONBOARDING_LOGOUT_BUTTON, FOOTER_TOUR;
 var init_Footer = __esm({
   "src/internal/components/Footer/Footer.tsx"() {
     init_package();
@@ -30183,7 +30248,7 @@ var init_Footer = __esm({
     init_i18n();
     import_react_query59 = require("@tanstack/react-query");
     import_lucide_react83 = require("lucide-react");
-    import_wagmi8 = require("wagmi");
+    import_wagmi9 = require("wagmi");
     init_auth();
     init_base3();
     init_useLayoutDataStore();
@@ -30722,7 +30787,7 @@ function DirectWalletHandler() {
   const walletMode = useProviderConfig().config.current?.wallet?.mode || "both";
   const externalAddress = useExternalWalletStore((st) => st.externalAddress);
   const isExternalConnected = useExternalWalletStore((st) => st.isExternalConnected);
-  const { address, isConnected, chain, connector } = (0, import_wagmi9.useConnection)();
+  const { address, isConnected, chain, connector } = (0, import_wagmi10.useConnection)();
   (0, import_react104.useEffect)(() => {
     const { setConfigMode, setActiveMode } = useExternalWalletStore.getState();
     setConfigMode(walletMode);
@@ -30743,11 +30808,11 @@ function DirectWalletHandler() {
   }, [isConnected, address, isExternalConnected, externalAddress, connector, chain]);
   return null;
 }
-var import_react104, import_wagmi9;
+var import_react104, import_wagmi10;
 var init_DirectWalletHandler = __esm({
   "src/internal/components/DirectWalletHandler.tsx"() {
     import_react104 = require("react");
-    import_wagmi9 = require("wagmi");
+    import_wagmi10 = require("wagmi");
     init_ProviderContext();
     init_useExternalWalletStore();
   }
@@ -33407,16 +33472,16 @@ function Provider(props) {
     }),
     [config, updateConfig, callbacks, updateCallbacks]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(UIContext.Provider, { value: contextValue, children: /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(import_wagmi10.WagmiProvider, { config: wagmiConfig3.current, children: /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(SessionProvider, { children }) }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(UIContext.Provider, { value: contextValue, children: /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(import_wagmi11.WagmiProvider, { config: wagmiConfig3.current, children: /* @__PURE__ */ (0, import_jsx_runtime137.jsx)(SessionProvider, { children }) }) });
 }
-var import_core9, import_error_tracking4, import_lodash_es17, import_react107, import_wagmi10, import_jsx_runtime137, UIContext, useProviderConfig;
+var import_core9, import_error_tracking4, import_lodash_es17, import_react107, import_wagmi11, import_jsx_runtime137, UIContext, useProviderConfig;
 var init_ProviderContext = __esm({
   "src/context/ProviderContext.tsx"() {
     import_core9 = require("@embarkai/core");
     import_error_tracking4 = require("@embarkai/core/internal/error-tracking");
     import_lodash_es17 = require("lodash-es");
     import_react107 = require("react");
-    import_wagmi10 = require("wagmi");
+    import_wagmi11 = require("wagmi");
     init_initial();
     init_iframe_manager();
     init_SessionContext();
@@ -34544,7 +34609,7 @@ function useWalletMode() {
 // src/hooks/useDirectWallet.ts
 init_useOpenPage();
 var import_react111 = require("react");
-var import_wagmi11 = require("wagmi");
+var import_wagmi12 = require("wagmi");
 init_useExternalWalletStore();
 function useDirectWallet() {
   const address = useExternalWalletStore((st) => st.externalAddress);
@@ -34552,7 +34617,7 @@ function useDirectWallet() {
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const connectorName = useExternalWalletStore((st) => st.connectorName);
   const { open: openEmbarkAI } = useOpenPage();
-  const { mutate: wagmiDisconnect } = (0, import_wagmi11.useDisconnect)();
+  const { mutate: wagmiDisconnect } = (0, import_wagmi12.useDisconnect)();
   const connect = (0, import_react111.useCallback)((connectFlowType = "connect") => {
     openEmbarkAI("connect-external-wallet" /* CONNECT_EXTERNAL_WALLET */, { connectFlowType });
   }, []);
@@ -34574,13 +34639,13 @@ function useDirectWallet() {
 // src/hooks/useSendDirectTransaction.ts
 var import_react112 = require("react");
 var import_viem23 = require("viem");
-var import_wagmi12 = require("wagmi");
+var import_wagmi13 = require("wagmi");
 init_useExternalWalletStore();
 function useSendDirectTransaction() {
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const externalChainId = useExternalWalletStore((st) => st.externalChainId);
-  const { sendTransactionAsync } = (0, import_wagmi12.useSendTransaction)();
-  const { switchChainAsync } = (0, import_wagmi12.useSwitchChain)();
+  const { sendTransactionAsync } = (0, import_wagmi13.useSendTransaction)();
+  const { switchChainAsync } = (0, import_wagmi13.useSwitchChain)();
   const [isPending, setIsPending] = (0, import_react112.useState)(false);
   const [error, setError] = (0, import_react112.useState)(null);
   const [txHash, setTxHash] = (0, import_react112.useState)(null);
@@ -34713,11 +34778,11 @@ function useTransferToLinkedWallet() {
 }
 
 // src/hooks/useNativeWalletSignature.ts
-var import_wagmi13 = require("wagmi");
+var import_wagmi14 = require("wagmi");
 init_providers();
 function useNativeWalletSignature() {
-  const signMessage = (0, import_wagmi13.useSignMessage)();
-  const signTypedMessage = (0, import_wagmi13.useSignTypedData)();
+  const signMessage = (0, import_wagmi14.useSignMessage)();
+  const signTypedMessage = (0, import_wagmi14.useSignTypedData)();
   return {
     signMessage,
     /** EIP-712 signature */
@@ -34729,14 +34794,14 @@ function useNativeWalletSignature() {
 // src/hooks/useLogout.ts
 var import_auth27 = require("@embarkai/core/auth");
 var import_react114 = require("react");
-var import_wagmi14 = require("wagmi");
+var import_wagmi15 = require("wagmi");
 init_ProviderContext();
 init_SessionContext();
 init_useExternalWalletStore();
 function useLogout() {
   const { callbacksRef } = useProviderConfig();
   const address = useSession((st) => st.address);
-  const { mutate: wagmiDisconnect } = (0, import_wagmi14.useDisconnect)({
+  const { mutate: wagmiDisconnect } = (0, import_wagmi15.useDisconnect)({
     mutation: {
       onSuccess: () => {
         useExternalWalletStore.getState().clearExternalWallet();
@@ -34802,13 +34867,13 @@ init_useBlockscoutAssets2();
 init_SessionContext();
 var import_read24 = require("@embarkai/core/read");
 var import_viem25 = require("viem");
-var import_wagmi15 = require("wagmi");
+var import_wagmi16 = require("wagmi");
 function useTransactions() {
   const chainId = requireActiveChainId();
   const viemChain = (0, import_read24.getViemChain)(chainId);
-  const publicClient = (0, import_wagmi15.usePublicClient)({ chainId });
-  const { data: walletClient } = (0, import_wagmi15.useWalletClient)();
-  const { address } = (0, import_wagmi15.useAccount)();
+  const publicClient = (0, import_wagmi16.usePublicClient)({ chainId });
+  const { data: walletClient } = (0, import_wagmi16.useWalletClient)();
+  const { address } = (0, import_wagmi16.useAccount)();
   const sendTransaction = async (params) => {
     if (!walletClient) {
       throw new Error("Wallet not connected");
@@ -34868,7 +34933,7 @@ function useTransactions() {
 init_SessionContext();
 var import_react115 = __toESM(require("react"), 1);
 var import_viem26 = require("viem");
-var import_wagmi16 = require("wagmi");
+var import_wagmi17 = require("wagmi");
 var COMMON_TOKENS = [
   // Add real token addresses here when available
   // {
@@ -34885,7 +34950,7 @@ function useAssets(address) {
     data: nativeBalance,
     isLoading: nativeBalanceLoading,
     refetch: refetchNativeBalance
-  } = (0, import_wagmi16.useBalance)({
+  } = (0, import_wagmi17.useBalance)({
     address,
     chainId,
     query: {
@@ -34903,7 +34968,7 @@ function useAssets(address) {
     data: tokenBalances,
     isLoading: tokenBalancesLoading,
     refetch: refetchTokenBalances
-  } = (0, import_wagmi16.useReadContracts)({
+  } = (0, import_wagmi17.useReadContracts)({
     contracts: tokenContracts,
     query: {
       enabled: !!address && COMMON_TOKENS.length > 0
@@ -34979,7 +35044,7 @@ function useAssets(address) {
 }
 function useTokenInfo(tokenAddress) {
   const chainId = requireActiveChainId();
-  const readContractsResult = (0, import_wagmi16.useReadContracts)({
+  const readContractsResult = (0, import_wagmi17.useReadContracts)({
     contracts: [
       { address: tokenAddress, abi: import_viem26.erc20Abi, functionName: "name", chainId },
       { address: tokenAddress, abi: import_viem26.erc20Abi, functionName: "symbol", chainId },
@@ -35010,7 +35075,7 @@ function useTokenBalance2(tokenAddress, userAddress) {
     data: balance,
     isLoading,
     refetch
-  } = (0, import_wagmi16.useReadContract)({
+  } = (0, import_wagmi17.useReadContract)({
     address: tokenAddress,
     abi: import_viem26.erc20Abi,
     functionName: "balanceOf",