@embarkai/ui-kit 0.4.113 → 0.4.114

package/dist/iframe/index.html

@@ -15,7 +15,7 @@
     <meta http-equiv="X-Content-Type-Options" content="nosniff" />
     <meta http-equiv="Referrer-Policy" content="strict-origin-when-cross-origin" />
 
-    <title>EmbarkAI Secure Wallet - iframe version 0.4.113</title>
+    <title>EmbarkAI Secure Wallet - iframe version 0.4.114</title>
 
     <!-- Styles will be injected by build process -->
     <style>

package/dist/iframe/main.js

@@ -6342,7 +6342,7 @@ var SigningManager = class extends TokenRefreshApiClient {
 };
 
 // src/iframe/main.ts
-var IFRAME_VERSION = "0.4.113";
+var IFRAME_VERSION = "0.4.114";
 var IframeWallet = class {
   // private finchpay: FinchPayRampAPI
   // private rampnow: RampnowOnrampAPI

package/dist/index.cjs

@@ -17394,6 +17394,7 @@ function ConnectExternalWalletMenu() {
   const connectors = (0, import_wagmi3.useConnectors)();
   const hasInjectedWallet2 = useHasInjectedWallet();
   const wagmiConfig3 = (0, import_wagmi3.useConfig)();
+  const chains = (0, import_wagmi3.useChains)();
   const connections = (0, import_wagmi3.useConnections)();
   const { mutate: disconnect, mutateAsync: disconnectAsync } = (0, import_wagmi3.useDisconnect)();
   const { mutateAsync: signMessageAsync } = (0, import_wagmi3.useSignMessage)();
@@ -17404,7 +17405,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;
       }
@@ -30068,7 +30070,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.113",
+      version: "0.4.114",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -30835,8 +30837,10 @@ var init_Dialog2 = __esm({
 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 } = (0, import_wagmi10.useConnection)();
+  const { address, isConnected, chainId, connector } = (0, import_wagmi10.useConnection)();
   (0, import_react105.useEffect)(() => {
     const { setConfigMode, setActiveMode } = useExternalWalletStore.getState();
     setConfigMode(walletMode);
@@ -30847,14 +30851,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 import_react105, import_wagmi10;
@@ -34689,56 +34700,82 @@ function useDirectWallet() {
 var import_react113 = require("react");
 var import_viem23 = require("viem");
 var import_wagmi13 = require("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 } = (0, import_wagmi13.useSendTransaction)();
+  const { connector } = (0, import_wagmi13.useConnection)();
+  const { sendTransactionAsync: sendWagmiTransactionAsync } = (0, import_wagmi13.useSendTransaction)();
   const { switchChainAsync } = (0, import_wagmi13.useSwitchChain)();
   const [isPending, setIsPending] = (0, import_react113.useState)(false);
   const [error, setError] = (0, import_react113.useState)(null);
   const [txHash, setTxHash] = (0, import_react113.useState)(null);
-  const sendTransaction = (0, import_react113.useCallback)(
+  const sendTransactionAsync = (0, import_react113.useCallback)(
     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 (!(0, import_viem23.isAddress)(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: (0, import_viem23.parseEther)(params.value),
-          data: params.data,
-          gas: params.gas
-        });
+        const hash = await submitDirectTransaction(
+          {
+            to: params.to,
+            value: (0, import_viem23.parseEther)(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 sendTransaction = (0, import_react113.useCallback)(
+    async (params) => {
+      try {
+        return await sendTransactionAsync(params);
+      } catch {
+        return null;
+      }
+    },
+    [sendTransactionAsync]
   );
   const reset = (0, import_react113.useCallback)(() => {
     setError(null);
     setTxHash(null);
     setIsPending(false);
   }, []);
-  return { sendTransaction, isPending, error, txHash, reset };
+  return { sendTransaction, sendTransactionAsync, isPending, error, txHash, reset };
 }
 
 // src/hooks/useTransferToLinkedWallet.ts

package/dist/index.d.cts

@@ -1602,6 +1602,7 @@ interface DirectTransactionParams {
 }
 interface UseSendDirectTransactionReturn {
     sendTransaction: (params: DirectTransactionParams) => Promise<`0x${string}` | null>;
+    sendTransactionAsync: (params: DirectTransactionParams) => Promise<`0x${string}`>;
     isPending: boolean;
     error: string | null;
     txHash: `0x${string}` | null;

package/dist/index.d.ts

@@ -1602,6 +1602,7 @@ interface DirectTransactionParams {
 }
 interface UseSendDirectTransactionReturn {
     sendTransaction: (params: DirectTransactionParams) => Promise<`0x${string}` | null>;
+    sendTransactionAsync: (params: DirectTransactionParams) => Promise<`0x${string}`>;
     isPending: boolean;
     error: string | null;
     txHash: `0x${string}` | null;

package/dist/index.js

@@ -17329,6 +17329,7 @@ import { useMutation as useMutation10, useQuery as useQuery9, useQueryClient as
 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 {
+  useChains,
   useConfig,
   useConnect,
   useConnections as useConnections2,
@@ -17357,6 +17358,7 @@ function ConnectExternalWalletMenu() {
   const connectors = useConnectors();
   const hasInjectedWallet2 = useHasInjectedWallet();
   const wagmiConfig3 = useConfig();
+  const chains = useChains();
   const connections = useConnections2();
   const { mutate: disconnect, mutateAsync: disconnectAsync } = useDisconnect2();
   const { mutateAsync: signMessageAsync } = useSignMessage();
@@ -17367,7 +17369,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;
       }
@@ -29975,7 +29978,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.113",
+      version: "0.4.114",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -30742,8 +30745,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 +30759,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({
@@ -34514,59 +34526,85 @@ function useDirectWallet() {
 }
 
 // src/hooks/useSendDirectTransaction.ts
-init_useExternalWalletStore();
 import { useCallback as useCallback40, 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 = useCallback40(
     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 sendTransaction = useCallback40(
+    async (params) => {
+      try {
+        return await sendTransactionAsync(params);
+      } catch {
+        return null;
+      }
+    },
+    [sendTransactionAsync]
   );
   const reset = useCallback40(() => {
     setError(null);
     setTxHash(null);
     setIsPending(false);
   }, []);
-  return { sendTransaction, isPending, error, txHash, reset };
+  return { sendTransaction, sendTransactionAsync, isPending, error, txHash, reset };
 }
 
 // src/hooks/useTransferToLinkedWallet.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embarkai/ui-kit",
-  "version": "0.4.113",
+  "version": "0.4.114",
   "description": "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
   "type": "module",
   "main": "./dist/index.cjs",