@embarkai/ui-kit 0.4.6 → 0.4.8

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.6</title>
+    <title>EmbarkAI Secure Wallet - iframe version 0.4.8</title>
 
     <!-- Styles will be injected by build process -->
     <style>

package/dist/iframe/main.js

@@ -6262,7 +6262,7 @@ var SigningManager = class extends TokenRefreshApiClient {
 };
 
 // src/iframe/main.ts
-var IFRAME_VERSION = "0.4.6";
+var IFRAME_VERSION = "0.4.8";
 var IframeWallet = class {
   constructor() {
     console.log("=".repeat(60));

package/dist/index.cjs

@@ -19167,7 +19167,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.6",
+      version: "0.4.8",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -19900,19 +19900,6 @@ Timestamp: ${timestamp}
 
 Sign this message to link your wallet to ${projectName} Wallet`;
 }
-function createNativeWalletSignatureMessage(address, projectName, nonce) {
-  const timestamp = Date.now();
-  const nonceValue = nonce || crypto.randomUUID();
-  return [
-    `${projectName} Wallet Sign`,
-    "",
-    `Address: ${address}`,
-    `Nonce: ${nonceValue}`,
-    `Timestamp: ${timestamp}`,
-    "",
-    `Project ${projectName} signature request for wallet operation`
-  ].join("\n");
-}
 function createLoginMessage(address, projectName) {
   const nonce = crypto.randomUUID();
   const timestamp = Date.now();
@@ -20268,10 +20255,10 @@ function DirectWalletHandler() {
     }
   }, [walletMode, setConfigMode, setActiveMode]);
   (0, import_react76.useEffect)(() => {
-    if (isConnected && address && !isExternalConnected && connector) {
+    if (isConnected && address && !isExternalConnected && connector && chain?.id) {
       setExternalWallet({
         address,
-        chainId: chain?.id || 1,
+        chainId: chain.id,
         connectorName: connector.name || "Unknown Wallet"
       });
     }
@@ -20287,10 +20274,10 @@ function DirectWalletHandler() {
     }
   }, [chain?.id, isConnected, isExternalConnected, setExternalChainId]);
   (0, import_react76.useEffect)(() => {
-    if (isExternalConnected && isConnected && address && address !== externalAddress && connector) {
+    if (isExternalConnected && isConnected && address && address !== externalAddress && connector && chain?.id) {
       setExternalWallet({
         address,
-        chainId: chain?.id || 1,
+        chainId: chain.id,
         connectorName: connector.name || "Unknown Wallet"
       });
     }
@@ -21411,7 +21398,6 @@ __export(auth_exports, {
   createInitialAuthState: () => createInitialAuthState,
   createJwtTokenManager: () => import_auth20.createJwtTokenManager,
   createLoginMessage: () => createLoginMessage,
-  createNativeWalletSignatureMessage: () => createNativeWalletSignatureMessage,
   createPasskeyHelpers: () => createPasskeyHelpers,
   createSignatureMessage: () => createSignatureMessage,
   deriveDemoPrivateKey: () => deriveDemoPrivateKey,
@@ -22756,11 +22742,13 @@ var init_iframe_manager = __esm({
 });
 
 // src/config/rainbowkit.ts
-var import_rainbowkit2, import_wallets, import_chains, getProjectId2, WALLET_MAP, createRainbowConfig, rainbowTheme;
+var import_read17, import_rainbowkit2, import_wallets, import_wagmi4, import_chains, getProjectId2, WALLET_MAP, getWagmiStorageKey, buildRainbowChains, createRainbowConfig, rainbowTheme;
 var init_rainbowkit = __esm({
   "src/config/rainbowkit.ts"() {
+    import_read17 = require("@embarkai/core/read");
     import_rainbowkit2 = require("@rainbow-me/rainbowkit");
     import_wallets = require("@rainbow-me/rainbowkit/wallets");
+    import_wagmi4 = require("wagmi");
     import_chains = require("wagmi/chains");
     getProjectId2 = (configProjectId) => {
       if (configProjectId) return configProjectId;
@@ -22775,12 +22763,41 @@ var init_rainbowkit = __esm({
       coinbase: import_wallets.coinbaseWallet,
       rainbow: import_wallets.rainbowWallet
     };
+    getWagmiStorageKey = (options) => {
+      const projectId = options?.projectId || "default";
+      const preferredChainId = options?.preferredChainId || "default";
+      return `embark-wagmi-v2-${projectId}-${preferredChainId}`;
+    };
+    buildRainbowChains = (supportedChains, preferredChainId) => {
+      const availableChains = [
+        import_read17.lumiaMainnetChain,
+        import_read17.lumiaTestnetChain,
+        import_chains.mainnet,
+        import_chains.polygon,
+        import_chains.bsc,
+        import_chains.arbitrum,
+        import_chains.optimism,
+        import_chains.avalanche,
+        import_chains.base,
+        import_chains.zora
+      ];
+      const chains = (supportedChains?.length ? availableChains.filter((chain) => supportedChains.includes(chain.id)) : availableChains).filter((chain, index, collection) => collection.findIndex((candidate) => candidate.id === chain.id) === index);
+      if (preferredChainId == null) {
+        return chains;
+      }
+      const preferredChain = chains.find((chain) => chain.id === preferredChainId);
+      if (!preferredChain) {
+        return chains;
+      }
+      return [preferredChain, ...chains.filter((chain) => chain.id !== preferredChainId)];
+    };
     createRainbowConfig = (options) => {
       const opts = typeof options === "string" ? { projectId: options } : options || {};
       const config = {
         appName: "EmbarkAI Wallet",
         projectId: getProjectId2(opts.projectId),
-        chains: [import_chains.mainnet, import_chains.polygon, import_chains.bsc, import_chains.arbitrum, import_chains.optimism, import_chains.avalanche, import_chains.base, import_chains.zora],
+        chains: buildRainbowChains(opts.supportedChains, opts.preferredChainId),
+        storage: (0, import_wagmi4.createStorage)({ key: getWagmiStorageKey(opts) }),
         ssr: false
       };
       if (opts.allowedWallets && opts.allowedWallets.length > 0) {
@@ -22990,9 +23007,16 @@ function RainbowKitProvider({ children }) {
   const rainbowConfig = (0, import_react78.useMemo)(
     () => createRainbowConfig({
       projectId: config.current?.wallet?.walletConnectProjectId,
-      allowedWallets: config.current?.wallet?.allowedWallets
+      allowedWallets: config.current?.wallet?.allowedWallets,
+      supportedChains: config.current?.wallet?.supportedChains,
+      preferredChainId: config.current?.network?.chainId
     }),
-    []
+    [
+      config.current?.network?.chainId,
+      config.current?.wallet?.allowedWallets,
+      config.current?.wallet?.supportedChains,
+      config.current?.wallet?.walletConnectProjectId
+    ]
   );
   const customTheme = (0, import_react78.useMemo)(() => {
     if (!config.current?.wallet?.enabled) return {};
@@ -23009,14 +23033,14 @@ function RainbowKitProvider({ children }) {
     };
   }, [colorMode]);
   if (!config.current?.wallet?.enabled) return /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(import_jsx_runtime110.Fragment, { children });
-  return /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(import_wagmi4.WagmiProvider, { config: rainbowConfig, children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(import_rainbowkit3.RainbowKitProvider, { theme: customTheme, modalSize: "compact", showRecentTransactions: true, children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(import_wagmi5.WagmiProvider, { config: rainbowConfig, children: /* @__PURE__ */ (0, import_jsx_runtime110.jsx)(import_rainbowkit3.RainbowKitProvider, { theme: customTheme, modalSize: "compact", showRecentTransactions: true, children }) });
 }
-var import_rainbowkit3, import_react78, import_wagmi4, import_styles, import_jsx_runtime110;
+var import_rainbowkit3, import_react78, import_wagmi5, import_styles, import_jsx_runtime110;
 var init_RainbowKitContext = __esm({
   "src/context/RainbowKitContext.tsx"() {
     import_rainbowkit3 = require("@rainbow-me/rainbowkit");
     import_react78 = require("react");
-    import_wagmi4 = require("wagmi");
+    import_wagmi5 = require("wagmi");
     init_rainbowkit();
     init_useLayoutStore();
     init_ProviderContext();
@@ -23043,7 +23067,7 @@ var init_utils10 = __esm({
 // src/config/wagmi.ts
 function buildTransport(urls) {
   const transports = urls.map(
-    (url) => (0, import_wagmi5.http)(url, {
+    (url) => (0, import_wagmi6.http)(url, {
       timeout: 1e4,
       retryCount: 0,
       batch: false,
@@ -23059,36 +23083,52 @@ function buildTransport(urls) {
     retryCount: 0
   });
 }
-var import_read17, import_viem17, import_wagmi5, wagmiConfig;
+var import_read18, import_viem17, import_wagmi6, wagmiConfig;
 var init_wagmi = __esm({
   "src/config/wagmi.ts"() {
-    import_read17 = require("@embarkai/core/read");
+    import_read18 = require("@embarkai/core/read");
     import_viem17 = require("viem");
-    import_wagmi5 = require("wagmi");
-    wagmiConfig = (0, import_wagmi5.createConfig)({
-      chains: [import_read17.lumiaMainnetChain, import_read17.lumiaTestnetChain],
+    import_wagmi6 = require("wagmi");
+    wagmiConfig = (0, import_wagmi6.createConfig)({
+      chains: [import_read18.lumiaMainnetChain, import_read18.lumiaTestnetChain],
+      storage: (0, import_wagmi6.createStorage)({ key: "embark-wagmi-static-v2" }),
       transports: {
-        [import_read17.lumiaTestnetChain.id]: buildTransport(import_read17.lumiaTestnetChain.rpcUrls.default.http),
-        [import_read17.lumiaMainnetChain.id]: buildTransport(import_read17.lumiaMainnetChain.rpcUrls.default.http)
+        [import_read18.lumiaTestnetChain.id]: buildTransport(import_read18.lumiaTestnetChain.rpcUrls.default.http),
+        [import_read18.lumiaMainnetChain.id]: buildTransport(import_read18.lumiaMainnetChain.rpcUrls.default.http)
       }
     });
   }
 });
 
 // src/context/WagmiContext.tsx
-var import_wagmi6, import_jsx_runtime111, WagmiProvider2;
+var import_wagmi7, import_jsx_runtime111, WagmiProvider2;
 var init_WagmiContext = __esm({
   "src/context/WagmiContext.tsx"() {
-    import_wagmi6 = require("wagmi");
+    import_wagmi7 = require("wagmi");
     init_wagmi();
     import_jsx_runtime111 = require("react/jsx-runtime");
     WagmiProvider2 = ({ children }) => {
-      return /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(import_wagmi6.WagmiProvider, { config: wagmiConfig, children });
+      return /* @__PURE__ */ (0, import_jsx_runtime111.jsx)(import_wagmi7.WagmiProvider, { config: wagmiConfig, children });
     };
   }
 });
 
 // src/context/ProviderContext.tsx
+function clearLegacyWagmiStorage() {
+  if (typeof window === "undefined" || !window.localStorage) return;
+  const legacyKeys = [
+    "wagmi.state",
+    "wagmi.recentConnectorId",
+    "embark-wagmi-static-v1.state",
+    "embark-wagmi-static-v1.recentConnectorId"
+  ];
+  for (const key of legacyKeys) {
+    try {
+      window.localStorage.removeItem(key);
+    } catch {
+    }
+  }
+}
 function Provider(props) {
   const { children, projectId, initialConfig = {}, callbacks } = props;
   const callbacksRef = (0, import_react79.useRef)(callbacks);
@@ -23136,6 +23176,9 @@ function Provider(props) {
     if (typeof window === "undefined" || !projectId) return;
     const mergedConfig = (0, import_lodash_es8.merge)(DEFAULT_PROVIDER_CONFIG, initialConfig);
     updateConfig(mergedConfig);
+    if (mergedConfig.wallet?.enabled) {
+      clearLegacyWagmiStorage();
+    }
     try {
       if (typeof window !== "undefined") {
         window.__EMBARK_SERVICES__ = mergedConfig.services;
@@ -23548,7 +23591,7 @@ var init_LangToggle = __esm({
 // src/clients/bundler/getUserOperationByHash.ts
 async function getUserOperationByHash(userOpHash, chainId) {
   const targetChainId = chainId ?? requireActiveChainId();
-  const chainConfig = (0, import_read18.getChainConfig)(targetChainId);
+  const chainConfig = (0, import_read19.getChainConfig)(targetChainId);
   if (!chainConfig) {
     throw new Error(`Chain ${targetChainId} is not supported`);
   }
@@ -23576,19 +23619,19 @@ async function getUserOperationByHash(userOpHash, chainId) {
     return null;
   }
 }
-var import_core3, import_read18;
+var import_core3, import_read19;
 var init_getUserOperationByHash = __esm({
   "src/clients/bundler/getUserOperationByHash.ts"() {
     init_SessionContext();
     import_core3 = require("@embarkai/core");
-    import_read18 = require("@embarkai/core/read");
+    import_read19 = require("@embarkai/core/read");
   }
 });
 
 // src/clients/bundler/getUserOperationReceipt.ts
 async function getUserOperationReceipt(userOpHash, chainId) {
   const targetChainId = chainId ?? requireActiveChainId();
-  const chainConfig = (0, import_read19.getChainConfig)(targetChainId);
+  const chainConfig = (0, import_read20.getChainConfig)(targetChainId);
   if (!chainConfig) {
     throw new Error(`Chain ${targetChainId} is not supported`);
   }
@@ -23622,12 +23665,12 @@ async function getUserOperationReceipt(userOpHash, chainId) {
     return null;
   }
 }
-var import_core4, import_read19;
+var import_core4, import_read20;
 var init_getUserOperationReceipt = __esm({
   "src/clients/bundler/getUserOperationReceipt.ts"() {
     init_SessionContext();
     import_core4 = require("@embarkai/core");
-    import_read19 = require("@embarkai/core/read");
+    import_read20 = require("@embarkai/core/read");
   }
 });
 
@@ -24376,7 +24419,7 @@ function useDirectWallet() {
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const connectorName = useExternalWalletStore((st) => st.connectorName);
   const clearExternalWallet = useExternalWalletStore((st) => st.clearExternalWallet);
-  const { disconnect: wagmiDisconnect } = (0, import_wagmi8.useDisconnect)();
+  const { disconnect: wagmiDisconnect } = (0, import_wagmi9.useDisconnect)();
   const { openConnectModal } = (0, import_rainbowkit5.useConnectModal)();
   const setIsWalletLinking = useLayoutDataStore((st) => st.setIsWalletLinking);
   const connect = (0, import_react84.useCallback)(() => {
@@ -24399,12 +24442,12 @@ function useDirectWallet() {
     disconnect
   };
 }
-var import_react84, import_rainbowkit5, import_wagmi8;
+var import_react84, import_rainbowkit5, import_wagmi9;
 var init_useDirectWallet = __esm({
   "src/hooks/useDirectWallet.ts"() {
     import_react84 = require("react");
     import_rainbowkit5 = require("@rainbow-me/rainbowkit");
-    import_wagmi8 = require("wagmi");
+    import_wagmi9 = require("wagmi");
     init_useExternalWalletStore();
     init_useLayoutDataStore();
   }
@@ -24414,8 +24457,8 @@ var init_useDirectWallet = __esm({
 function useSendDirectTransaction() {
   const isConnected = useExternalWalletStore((st) => st.isExternalConnected);
   const externalChainId = useExternalWalletStore((st) => st.externalChainId);
-  const { sendTransactionAsync } = (0, import_wagmi9.useSendTransaction)();
-  const { switchChainAsync } = (0, import_wagmi9.useSwitchChain)();
+  const { sendTransactionAsync } = (0, import_wagmi10.useSendTransaction)();
+  const { switchChainAsync } = (0, import_wagmi10.useSwitchChain)();
   const [isPending, setIsPending] = (0, import_react85.useState)(false);
   const [error, setError] = (0, import_react85.useState)(null);
   const [txHash, setTxHash] = (0, import_react85.useState)(null);
@@ -24460,12 +24503,12 @@ function useSendDirectTransaction() {
   }, []);
   return { sendTransaction, isPending, error, txHash, reset };
 }
-var import_react85, import_viem18, import_wagmi9;
+var import_react85, import_viem18, import_wagmi10;
 var init_useSendDirectTransaction = __esm({
   "src/hooks/useSendDirectTransaction.ts"() {
     import_react85 = require("react");
     import_viem18 = require("viem");
-    import_wagmi9 = require("wagmi");
+    import_wagmi10 = require("wagmi");
     init_useExternalWalletStore();
   }
 });
@@ -24563,40 +24606,19 @@ var init_useTransferToLinkedWallet = __esm({
 
 // src/hooks/useNativeWalletSignature.ts
 function useNativeWalletSignature() {
-  const nativeAccount = (0, import_wagmi10.useAccount)();
-  const { signMessageAsync } = (0, import_wagmi10.useSignMessage)();
-  const getNativeWalletSignature = (0, import_react87.useCallback)(
-    async (projectId, nativeWalletAddress, nonce) => {
-      console.log(
-        "[GET WALLET SIGNATURE]",
-        "\nCalled for address:",
-        nativeWalletAddress,
-        "\nNative account:",
-        nativeAccount
-      );
-      const projectName = projectId ? await fetchProjectName(projectId) : "EmbarkAI";
-      const message = createNativeWalletSignatureMessage(nativeWalletAddress, projectName, nonce);
-      const signature = await Promise.race([
-        signMessageAsync({ message, account: nativeWalletAddress }),
-        new Promise((_, rej) => setTimeout(() => rej(new Error("Singing timed out. Please try again.")), 12e4))
-      ]).catch((err) => {
-        console.error("[GET WALLET SIGNATURE]", err);
-        throw err;
-      });
-      return {
-        message,
-        signature
-      };
-    },
-    [signMessageAsync]
-  );
-  return { getNativeWalletSignature };
+  const signMessage = (0, import_wagmi11.useSignMessage)();
+  const signTypedMessage = (0, import_wagmi11.useSignTypedData)();
+  return {
+    signMessage,
+    /** EIP-712 signature */
+    signTypedMessage,
+    fetchProjectNameById: fetchProjectName
+  };
 }
-var import_react87, import_wagmi10;
+var import_wagmi11;
 var init_useNativeWalletSignature = __esm({
   "src/hooks/useNativeWalletSignature.ts"() {
-    import_react87 = require("react");
-    import_wagmi10 = require("wagmi");
+    import_wagmi11 = require("wagmi");
     init_providers();
   }
 });
@@ -24605,7 +24627,7 @@ var init_useNativeWalletSignature = __esm({
 function useLogout() {
   const { setSession, setIsLoading, setAddress, setStatus, setError, address } = useSession();
   const { callbacksRef } = useProviderConfig();
-  const logout2 = (0, import_react88.useCallback)(async () => {
+  const logout2 = (0, import_react87.useCallback)(async () => {
     const prevAddress = address;
     let userId = null;
     setIsLoading(true);
@@ -24635,11 +24657,11 @@ function useLogout() {
   }, [address, setAddress, setError, setSession, setStatus]);
   return { logout: logout2 };
 }
-var import_auth22, import_react88;
+var import_auth22, import_react87;
 var init_useLogout = __esm({
   "src/hooks/useLogout.ts"() {
     import_auth22 = require("@embarkai/core/auth");
-    import_react88 = require("react");
+    import_react87 = require("react");
     init_ProviderContext();
     init_SessionContext();
   }
@@ -24699,10 +24721,10 @@ var init_clients2 = __esm({
 // src/modules/transactions.ts
 function useTransactions() {
   const chainId = requireActiveChainId();
-  const viemChain = (0, import_read20.getViemChain)(chainId);
-  const publicClient = (0, import_wagmi11.usePublicClient)({ chainId });
-  const { data: walletClient } = (0, import_wagmi11.useWalletClient)();
-  const { address } = (0, import_wagmi11.useAccount)();
+  const viemChain = (0, import_read21.getViemChain)(chainId);
+  const publicClient = (0, import_wagmi12.usePublicClient)({ chainId });
+  const { data: walletClient } = (0, import_wagmi12.useWalletClient)();
+  const { address } = (0, import_wagmi12.useAccount)();
   const sendTransaction = async (params) => {
     if (!walletClient) {
       throw new Error("Wallet not connected");
@@ -24757,13 +24779,13 @@ function useTransactions() {
     isConnected: !!address && !!walletClient
   };
 }
-var import_read20, import_viem20, import_wagmi11;
+var import_read21, import_viem20, import_wagmi12;
 var init_transactions = __esm({
   "src/modules/transactions.ts"() {
     init_SessionContext();
-    import_read20 = require("@embarkai/core/read");
+    import_read21 = require("@embarkai/core/read");
     import_viem20 = require("viem");
-    import_wagmi11 = require("wagmi");
+    import_wagmi12 = require("wagmi");
   }
 });
 
@@ -24774,7 +24796,7 @@ function useAssets(address) {
     data: nativeBalance,
     isLoading: nativeBalanceLoading,
     refetch: refetchNativeBalance
-  } = (0, import_wagmi12.useBalance)({
+  } = (0, import_wagmi13.useBalance)({
     address,
     chainId,
     query: {
@@ -24788,7 +24810,7 @@ function useAssets(address) {
     args: [address],
     chainId
   }));
-  const readContractsResult = (0, import_wagmi12.useReadContracts)({
+  const readContractsResult = (0, import_wagmi13.useReadContracts)({
     contracts: tokenContracts,
     query: {
       enabled: !!address && COMMON_TOKENS.length > 0
@@ -24869,7 +24891,7 @@ function useAssets(address) {
 }
 function useTokenInfo(tokenAddress) {
   const chainId = requireActiveChainId();
-  const readContractsResult = (0, import_wagmi12.useReadContracts)({
+  const readContractsResult = (0, import_wagmi13.useReadContracts)({
     contracts: [
       { address: tokenAddress, abi: import_viem21.erc20Abi, functionName: "name", chainId },
       { address: tokenAddress, abi: import_viem21.erc20Abi, functionName: "symbol", chainId },
@@ -24900,7 +24922,7 @@ function useTokenBalance(tokenAddress, userAddress) {
     data: balance,
     isLoading,
     refetch
-  } = (0, import_wagmi12.useReadContract)({
+  } = (0, import_wagmi13.useReadContract)({
     address: tokenAddress,
     abi: import_viem21.erc20Abi,
     functionName: "balanceOf",
@@ -24911,7 +24933,7 @@ function useTokenBalance(tokenAddress, userAddress) {
     }
   });
   const { tokenInfo } = useTokenInfo(tokenAddress);
-  const formattedBalance = import_react89.default.useMemo(() => {
+  const formattedBalance = import_react88.default.useMemo(() => {
     if (!balance || !tokenInfo) return "0";
     return (0, import_viem21.formatUnits)(balance, tokenInfo.decimals);
   }, [balance, tokenInfo]);
@@ -24923,13 +24945,13 @@ function useTokenBalance(tokenAddress, userAddress) {
     refetch
   };
 }
-var import_react89, import_viem21, import_wagmi12, COMMON_TOKENS;
+var import_react88, import_viem21, import_wagmi13, COMMON_TOKENS;
 var init_assets2 = __esm({
   "src/modules/assets.ts"() {
     init_SessionContext();
-    import_react89 = __toESM(require("react"), 1);
+    import_react88 = __toESM(require("react"), 1);
     import_viem21 = require("viem");
-    import_wagmi12 = require("wagmi");
+    import_wagmi13 = require("wagmi");
     COMMON_TOKENS = [
       // Add real token addresses here when available
       // {

package/dist/index.d.cts

@@ -11,8 +11,8 @@ import { BundlerClient } from 'viem/account-abstraction';
 import { UserOperationV07 } from '@embarkai/core/bundler';
 import * as class_variance_authority_types from 'class-variance-authority/types';
 import { VariantProps } from 'class-variance-authority';
-export { JwtTokens, LoginResponse, VerifyResponse, getValidTokens, jwtTokenManager, logout } from '@embarkai/core/auth';
 import * as wagmi from 'wagmi';
+export { JwtTokens, LoginResponse, VerifyResponse, getValidTokens, jwtTokenManager, logout } from '@embarkai/core/auth';
 
 interface TokenBalance {
     address: `0x${string}`;
@@ -1357,11 +1357,28 @@ interface UseTransferToLinkedReturn {
 }
 declare function useTransferToLinkedWallet(): UseTransferToLinkedReturn;
 
+interface AuthProviderMeta extends Record<string, unknown> {
+    walletName?: string;
+    walletType?: string;
+    chainId?: number;
+    email?: string;
+}
+interface AuthProvider {
+    provider: 'passkey' | 'email' | 'telegram' | 'google' | 'discord' | 'twitter' | 'wallet';
+    verified: boolean;
+    linkedAt: string;
+    lastUsedAt?: string;
+    externalId: string;
+    meta?: AuthProviderMeta;
+}
+
+declare function fetchProjectName(projectId: string): Promise<string>;
+
 declare function useNativeWalletSignature(): {
-    getNativeWalletSignature: (projectId: string, nativeWalletAddress: `0x${string}`, nonce?: string) => Promise<{
-        message: string;
-        signature: unknown;
-    }>;
+    signMessage: wagmi.UseSignMessageReturnType<unknown>;
+    /** EIP-712 signature */
+    signTypedMessage: wagmi.UseSignTypedDataReturnType<unknown>;
+    fetchProjectNameById: typeof fetchProjectName;
 };
 
 interface UseLogoutReturn {
@@ -1733,21 +1750,6 @@ declare global {
     }
 }
 
-interface AuthProviderMeta extends Record<string, unknown> {
-    walletName?: string;
-    walletType?: string;
-    chainId?: number;
-    email?: string;
-}
-interface AuthProvider {
-    provider: 'passkey' | 'email' | 'telegram' | 'google' | 'discord' | 'twitter' | 'wallet';
-    verified: boolean;
-    linkedAt: string;
-    lastUsedAt?: string;
-    externalId: string;
-    meta?: AuthProviderMeta;
-}
-
 /**
  * Provider information in user profile
  * Matches the structure returned by backend /api/auth/profile

package/dist/index.d.ts

@@ -11,8 +11,8 @@ import { BundlerClient } from 'viem/account-abstraction';
 import { UserOperationV07 } from '@embarkai/core/bundler';
 import * as class_variance_authority_types from 'class-variance-authority/types';
 import { VariantProps } from 'class-variance-authority';
-export { JwtTokens, LoginResponse, VerifyResponse, getValidTokens, jwtTokenManager, logout } from '@embarkai/core/auth';
 import * as wagmi from 'wagmi';
+export { JwtTokens, LoginResponse, VerifyResponse, getValidTokens, jwtTokenManager, logout } from '@embarkai/core/auth';
 
 interface TokenBalance {
     address: `0x${string}`;
@@ -1357,11 +1357,28 @@ interface UseTransferToLinkedReturn {
 }
 declare function useTransferToLinkedWallet(): UseTransferToLinkedReturn;
 
+interface AuthProviderMeta extends Record<string, unknown> {
+    walletName?: string;
+    walletType?: string;
+    chainId?: number;
+    email?: string;
+}
+interface AuthProvider {
+    provider: 'passkey' | 'email' | 'telegram' | 'google' | 'discord' | 'twitter' | 'wallet';
+    verified: boolean;
+    linkedAt: string;
+    lastUsedAt?: string;
+    externalId: string;
+    meta?: AuthProviderMeta;
+}
+
+declare function fetchProjectName(projectId: string): Promise<string>;
+
 declare function useNativeWalletSignature(): {
-    getNativeWalletSignature: (projectId: string, nativeWalletAddress: `0x${string}`, nonce?: string) => Promise<{
-        message: string;
-        signature: unknown;
-    }>;
+    signMessage: wagmi.UseSignMessageReturnType<unknown>;
+    /** EIP-712 signature */
+    signTypedMessage: wagmi.UseSignTypedDataReturnType<unknown>;
+    fetchProjectNameById: typeof fetchProjectName;
 };
 
 interface UseLogoutReturn {
@@ -1733,21 +1750,6 @@ declare global {
     }
 }
 
-interface AuthProviderMeta extends Record<string, unknown> {
-    walletName?: string;
-    walletType?: string;
-    chainId?: number;
-    email?: string;
-}
-interface AuthProvider {
-    provider: 'passkey' | 'email' | 'telegram' | 'google' | 'discord' | 'twitter' | 'wallet';
-    verified: boolean;
-    linkedAt: string;
-    lastUsedAt?: string;
-    externalId: string;
-    meta?: AuthProviderMeta;
-}
-
 /**
  * Provider information in user profile
  * Matches the structure returned by backend /api/auth/profile

package/dist/index.js

@@ -19086,7 +19086,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@embarkai/ui-kit",
-      version: "0.4.6",
+      version: "0.4.8",
       description: "React UI components and hooks for EmbarkAI authentication and Account Abstraction",
       type: "module",
       main: "./dist/index.cjs",
@@ -19816,19 +19816,6 @@ Timestamp: ${timestamp}
 
 Sign this message to link your wallet to ${projectName} Wallet`;
 }
-function createNativeWalletSignatureMessage(address, projectName, nonce) {
-  const timestamp = Date.now();
-  const nonceValue = nonce || crypto.randomUUID();
-  return [
-    `${projectName} Wallet Sign`,
-    "",
-    `Address: ${address}`,
-    `Nonce: ${nonceValue}`,
-    `Timestamp: ${timestamp}`,
-    "",
-    `Project ${projectName} signature request for wallet operation`
-  ].join("\n");
-}
 function createLoginMessage(address, projectName) {
   const nonce = crypto.randomUUID();
   const timestamp = Date.now();
@@ -20185,10 +20172,10 @@ function DirectWalletHandler() {
     }
   }, [walletMode, setConfigMode, setActiveMode]);
   useEffect42(() => {
-    if (isConnected && address && !isExternalConnected && connector) {
+    if (isConnected && address && !isExternalConnected && connector && chain?.id) {
       setExternalWallet({
         address,
-        chainId: chain?.id || 1,
+        chainId: chain.id,
         connectorName: connector.name || "Unknown Wallet"
       });
     }
@@ -20204,10 +20191,10 @@ function DirectWalletHandler() {
     }
   }, [chain?.id, isConnected, isExternalConnected, setExternalChainId]);
   useEffect42(() => {
-    if (isExternalConnected && isConnected && address && address !== externalAddress && connector) {
+    if (isExternalConnected && isConnected && address && address !== externalAddress && connector && chain?.id) {
       setExternalWallet({
         address,
-        chainId: chain?.id || 1,
+        chainId: chain.id,
         connectorName: connector.name || "Unknown Wallet"
       });
     }
@@ -21331,7 +21318,6 @@ __export(auth_exports, {
   createInitialAuthState: () => createInitialAuthState,
   createJwtTokenManager: () => createJwtTokenManager,
   createLoginMessage: () => createLoginMessage,
-  createNativeWalletSignatureMessage: () => createNativeWalletSignatureMessage,
   createPasskeyHelpers: () => createPasskeyHelpers,
   createSignatureMessage: () => createSignatureMessage,
   deriveDemoPrivateKey: () => deriveDemoPrivateKey,
@@ -22690,15 +22676,12 @@ var init_iframe_manager = __esm({
 });
 
 // src/config/rainbowkit.ts
+import { lumiaMainnetChain as lumiaMainnetChain2, lumiaTestnetChain as lumiaTestnetChain2 } from "@embarkai/core/read";
 import { getDefaultConfig } from "@rainbow-me/rainbowkit";
-import {
-  coinbaseWallet,
-  metaMaskWallet,
-  rainbowWallet,
-  walletConnectWallet
-} from "@rainbow-me/rainbowkit/wallets";
+import { coinbaseWallet, metaMaskWallet, rainbowWallet, walletConnectWallet } from "@rainbow-me/rainbowkit/wallets";
+import { createStorage } from "wagmi";
 import { arbitrum, avalanche, base, bsc, mainnet, optimism, polygon, zora } from "wagmi/chains";
-var getProjectId2, WALLET_MAP, createRainbowConfig, rainbowTheme;
+var getProjectId2, WALLET_MAP, getWagmiStorageKey, buildRainbowChains, createRainbowConfig, rainbowTheme;
 var init_rainbowkit = __esm({
   "src/config/rainbowkit.ts"() {
     getProjectId2 = (configProjectId) => {
@@ -22714,12 +22697,41 @@ var init_rainbowkit = __esm({
       coinbase: coinbaseWallet,
       rainbow: rainbowWallet
     };
+    getWagmiStorageKey = (options) => {
+      const projectId = options?.projectId || "default";
+      const preferredChainId = options?.preferredChainId || "default";
+      return `embark-wagmi-v2-${projectId}-${preferredChainId}`;
+    };
+    buildRainbowChains = (supportedChains, preferredChainId) => {
+      const availableChains = [
+        lumiaMainnetChain2,
+        lumiaTestnetChain2,
+        mainnet,
+        polygon,
+        bsc,
+        arbitrum,
+        optimism,
+        avalanche,
+        base,
+        zora
+      ];
+      const chains = (supportedChains?.length ? availableChains.filter((chain) => supportedChains.includes(chain.id)) : availableChains).filter((chain, index, collection) => collection.findIndex((candidate) => candidate.id === chain.id) === index);
+      if (preferredChainId == null) {
+        return chains;
+      }
+      const preferredChain = chains.find((chain) => chain.id === preferredChainId);
+      if (!preferredChain) {
+        return chains;
+      }
+      return [preferredChain, ...chains.filter((chain) => chain.id !== preferredChainId)];
+    };
     createRainbowConfig = (options) => {
       const opts = typeof options === "string" ? { projectId: options } : options || {};
       const config = {
         appName: "EmbarkAI Wallet",
         projectId: getProjectId2(opts.projectId),
-        chains: [mainnet, polygon, bsc, arbitrum, optimism, avalanche, base, zora],
+        chains: buildRainbowChains(opts.supportedChains, opts.preferredChainId),
+        storage: createStorage({ key: getWagmiStorageKey(opts) }),
         ssr: false
       };
       if (opts.allowedWallets && opts.allowedWallets.length > 0) {
@@ -22934,9 +22946,16 @@ function RainbowKitProvider({ children }) {
   const rainbowConfig = useMemo9(
     () => createRainbowConfig({
       projectId: config.current?.wallet?.walletConnectProjectId,
-      allowedWallets: config.current?.wallet?.allowedWallets
+      allowedWallets: config.current?.wallet?.allowedWallets,
+      supportedChains: config.current?.wallet?.supportedChains,
+      preferredChainId: config.current?.network?.chainId
     }),
-    []
+    [
+      config.current?.network?.chainId,
+      config.current?.wallet?.allowedWallets,
+      config.current?.wallet?.supportedChains,
+      config.current?.wallet?.walletConnectProjectId
+    ]
   );
   const customTheme = useMemo9(() => {
     if (!config.current?.wallet?.enabled) return {};
@@ -22979,9 +22998,9 @@ var init_utils10 = __esm({
 });
 
 // src/config/wagmi.ts
-import { lumiaMainnetChain as lumiaMainnetChain2, lumiaTestnetChain as lumiaTestnetChain2 } from "@embarkai/core/read";
+import { lumiaMainnetChain as lumiaMainnetChain3, lumiaTestnetChain as lumiaTestnetChain3 } from "@embarkai/core/read";
 import { fallback } from "viem";
-import { createConfig, http as http4 } from "wagmi";
+import { createConfig, createStorage as createStorage2, http as http4 } from "wagmi";
 function buildTransport(urls) {
   const transports = urls.map(
     (url) => http4(url, {
@@ -23004,10 +23023,11 @@ var wagmiConfig;
 var init_wagmi = __esm({
   "src/config/wagmi.ts"() {
     wagmiConfig = createConfig({
-      chains: [lumiaMainnetChain2, lumiaTestnetChain2],
+      chains: [lumiaMainnetChain3, lumiaTestnetChain3],
+      storage: createStorage2({ key: "embark-wagmi-static-v2" }),
       transports: {
-        [lumiaTestnetChain2.id]: buildTransport(lumiaTestnetChain2.rpcUrls.default.http),
-        [lumiaMainnetChain2.id]: buildTransport(lumiaMainnetChain2.rpcUrls.default.http)
+        [lumiaTestnetChain3.id]: buildTransport(lumiaTestnetChain3.rpcUrls.default.http),
+        [lumiaMainnetChain3.id]: buildTransport(lumiaMainnetChain3.rpcUrls.default.http)
       }
     });
   }
@@ -23038,6 +23058,21 @@ import {
   useRef as useRef18
 } from "react";
 import { jsx as jsx112 } from "react/jsx-runtime";
+function clearLegacyWagmiStorage() {
+  if (typeof window === "undefined" || !window.localStorage) return;
+  const legacyKeys = [
+    "wagmi.state",
+    "wagmi.recentConnectorId",
+    "embark-wagmi-static-v1.state",
+    "embark-wagmi-static-v1.recentConnectorId"
+  ];
+  for (const key of legacyKeys) {
+    try {
+      window.localStorage.removeItem(key);
+    } catch {
+    }
+  }
+}
 function Provider(props) {
   const { children, projectId, initialConfig = {}, callbacks } = props;
   const callbacksRef = useRef18(callbacks);
@@ -23085,6 +23120,9 @@ function Provider(props) {
     if (typeof window === "undefined" || !projectId) return;
     const mergedConfig = merge3(DEFAULT_PROVIDER_CONFIG, initialConfig);
     updateConfig(mergedConfig);
+    if (mergedConfig.wallet?.enabled) {
+      clearLegacyWagmiStorage();
+    }
     try {
       if (typeof window !== "undefined") {
         window.__EMBARK_SERVICES__ = mergedConfig.services;
@@ -24497,37 +24535,16 @@ var init_useTransferToLinkedWallet = __esm({
 });
 
 // src/hooks/useNativeWalletSignature.ts
-import { useCallback as useCallback36 } from "react";
-import { useAccount as useAccount3, useSignMessage as useSignMessage2 } from "wagmi";
+import { useSignMessage as useSignMessage2, useSignTypedData } from "wagmi";
 function useNativeWalletSignature() {
-  const nativeAccount = useAccount3();
-  const { signMessageAsync } = useSignMessage2();
-  const getNativeWalletSignature = useCallback36(
-    async (projectId, nativeWalletAddress, nonce) => {
-      console.log(
-        "[GET WALLET SIGNATURE]",
-        "\nCalled for address:",
-        nativeWalletAddress,
-        "\nNative account:",
-        nativeAccount
-      );
-      const projectName = projectId ? await fetchProjectName(projectId) : "EmbarkAI";
-      const message = createNativeWalletSignatureMessage(nativeWalletAddress, projectName, nonce);
-      const signature = await Promise.race([
-        signMessageAsync({ message, account: nativeWalletAddress }),
-        new Promise((_, rej) => setTimeout(() => rej(new Error("Singing timed out. Please try again.")), 12e4))
-      ]).catch((err) => {
-        console.error("[GET WALLET SIGNATURE]", err);
-        throw err;
-      });
-      return {
-        message,
-        signature
-      };
-    },
-    [signMessageAsync]
-  );
-  return { getNativeWalletSignature };
+  const signMessage = useSignMessage2();
+  const signTypedMessage = useSignTypedData();
+  return {
+    signMessage,
+    /** EIP-712 signature */
+    signTypedMessage,
+    fetchProjectNameById: fetchProjectName
+  };
 }
 var init_useNativeWalletSignature = __esm({
   "src/hooks/useNativeWalletSignature.ts"() {
@@ -24537,11 +24554,11 @@ var init_useNativeWalletSignature = __esm({
 
 // src/hooks/useLogout.ts
 import { logout as coreLogout, jwtTokenManager as jwtTokenManager3 } from "@embarkai/core/auth";
-import { useCallback as useCallback37 } from "react";
+import { useCallback as useCallback36 } from "react";
 function useLogout() {
   const { setSession, setIsLoading, setAddress, setStatus, setError, address } = useSession();
   const { callbacksRef } = useProviderConfig();
-  const logout2 = useCallback37(async () => {
+  const logout2 = useCallback36(async () => {
     const prevAddress = address;
     let userId = null;
     setIsLoading(true);
@@ -24632,13 +24649,13 @@ var init_clients2 = __esm({
 // src/modules/transactions.ts
 import { getViemChain as getViemChain4 } from "@embarkai/core/read";
 import { parseEther as parseEther6 } from "viem";
-import { useAccount as useAccount4, usePublicClient, useWalletClient } from "wagmi";
+import { useAccount as useAccount3, usePublicClient, useWalletClient } from "wagmi";
 function useTransactions() {
   const chainId = requireActiveChainId();
   const viemChain = getViemChain4(chainId);
   const publicClient = usePublicClient({ chainId });
   const { data: walletClient } = useWalletClient();
-  const { address } = useAccount4();
+  const { address } = useAccount3();
   const sendTransaction = async (params) => {
     if (!walletClient) {
       throw new Error("Wallet not connected");

package/package.json

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