@openfort/react 0.0.1 → 0.0.2

package/build/index.es.js

@@ -5,7 +5,7 @@ import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import React, { createContext, useEffect, useState, useMemo, useRef, useCallback, createElement, useLayoutEffect } from 'react';
 import { detect } from 'detect-browser';
 import { Buffer } from 'buffer';
-import { Openfort as Openfort$1, RecoveryMethod, EmbeddedState, AuthActionRequiredActions, OAuthProvider, ShieldAuthType, MissingRecoveryPasswordError } from '@openfort/openfort-js';
+import { Openfort as Openfort$1, RecoveryMethod, EmbeddedState, AuthActionRequiredActions, OAuthProvider, ShieldAuthType, MissingRecoveryPasswordError, AccountTypeEnum, ChainTypeEnum } from '@openfort/openfort-js';
 export { RecoveryMethod } from '@openfort/openfort-js';
 import { polygonAmoy } from 'viem/chains';
 import { motion, AnimatePresence, MotionConfig } from 'framer-motion';
@@ -20,17 +20,18 @@ import { normalize } from 'viem/ens';
 import { AxiosError } from 'axios';
 import { createSiweMessage } from 'viem/siwe';
 import { signMessage } from '@wagmi/core';
-import { useQueryClient } from '@tanstack/react-query';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
 
-const OPENFORTKIT_VERSION = '0.0.1';
+const OPENFORTKIT_VERSION = '0.0.2';
 
-var OpenfortKitErrorType;
-(function (OpenfortKitErrorType) {
-    OpenfortKitErrorType["AUTHENTICATION_ERROR"] = "AUTHENTICATION_ERROR";
-})(OpenfortKitErrorType || (OpenfortKitErrorType = {}));
-class OpenfortKitError extends Error {
+var OpenfortErrorType;
+(function (OpenfortErrorType) {
+    OpenfortErrorType["AUTHENTICATION_ERROR"] = "AUTHENTICATION_ERROR";
+    OpenfortErrorType["WALLET_ERROR"] = "WALLET_ERROR";
+})(OpenfortErrorType || (OpenfortErrorType = {}));
+class OpenfortError extends Error {
     constructor(message, type, data) {
-        if ((data === null || data === void 0 ? void 0 : data.error) instanceof OpenfortKitError) {
+        if ((data === null || data === void 0 ? void 0 : data.error) instanceof OpenfortError) {
             super(data.error.message);
             this.data = data.error.data;
             this.type = data.error.type;
@@ -45,7 +46,7 @@ class OpenfortKitError extends Error {
         }
         this.type = type;
         this.data = data || {};
-        this.name = 'OpenfortKitError';
+        this.name = 'OpenfortError';
     }
 }
 
@@ -108,7 +109,7 @@ const defaultConfig = ({ appName = 'OpenfortKit', appIcon, appDescription, appUr
         walletConnectProjectId,
         coinbaseWalletPreference,
     });
-    console.log("OPENFORTKIT CHAINS", chains, transports);
+    // console.log("OPENFORTKIT CHAINS", chains, transports);
     const config = {
         ...props,
         chains,
@@ -918,10 +919,10 @@ function useConnect({ ...props } = {}) {
 
 const Context$1 = createContext(null);
 
-const useOpenfort = () => {
+const useOpenfortCore = () => {
     const context = React.useContext(Context$1);
     if (!context)
-        throw Error('useOpenfortContext Hook must be inside OpenfortProvider.');
+        throw Error('useOpenfortContext Hook must be inside CoreOpenfortProvider.');
     return context;
 };
 
@@ -932,7 +933,7 @@ function useIsMounted() {
 }
 
 const useConnectCallback = ({ onConnect, onDisconnect, }) => {
-    const { user } = useOpenfort();
+    const { user } = useOpenfortCore();
     const { address, connector } = useAccount();
     const hasAddress = !!address;
     const [isConnected, setIsConnected] = useState(false);
@@ -990,7 +991,7 @@ const ConnectCallback = ({ onConnect, onDisconnect }) => {
     });
     return null;
 };
-const OpenfortProvider = ({ children, debugMode, onConnect, onDisconnect, ...openfortProps }) => {
+const CoreOpenfortProvider = ({ children, debugMode, onConnect, onDisconnect, ...openfortProps }) => {
     const log = debugMode ? console.log : () => { };
     const { connectors, connect, reset } = useConnect();
     const { address } = useAccount();
@@ -1002,7 +1003,7 @@ const OpenfortProvider = ({ children, debugMode, onConnect, onDisconnect, ...ope
     const openfort = useMemo(() => {
         log('Creating Openfort instance.');
         if (!openfortProps.baseConfiguration.publishableKey)
-            throw Error('OpenfortProvider requires a publishableKey to be set in the baseConfiguration.');
+            throw Error('CoreOpenfortProvider requires a publishableKey to be set in the baseConfiguration.');
         const newClient = createOpenfortClient(openfortProps);
         return newClient;
     }, []);
@@ -4477,7 +4478,7 @@ function usePrevious(value, initial) {
     return ref.current.previous;
 }
 
-const useWallet = (id) => {
+const useWallet$1 = (id) => {
     const wallets = useWallets$1();
     const wallet = wallets.find((c) => c.id === id);
     if (!wallet)
@@ -4774,7 +4775,7 @@ const Modal = ({ open, pages, pageId, positionInside, inline, demo, onClose, onB
     const context = useOpenfortKit();
     const themeContext = useThemeContext();
     const mobile = isMobile();
-    const wallet = useWallet((_a = context.connector) === null || _a === void 0 ? void 0 : _a.id);
+    const wallet = useWallet$1((_a = context.connector) === null || _a === void 0 ? void 0 : _a.id);
     const walletInfo = {
         name: wallet === null || wallet === void 0 ? void 0 : wallet.name,
         shortName: (_b = wallet === null || wallet === void 0 ? void 0 : wallet.shortName) !== null && _b !== void 0 ? _b : wallet === null || wallet === void 0 ? void 0 : wallet.name,
@@ -7265,7 +7266,7 @@ CustomQRCode.displayName = 'CustomQRCode';
 const DownloadApp = () => {
     var _a, _b, _c;
     const context = useOpenfortKit();
-    const wallet = useWallet(context.connector.id);
+    const wallet = useWallet$1(context.connector.id);
     const locales = useLocales({
         CONNECTORNAME: wallet === null || wallet === void 0 ? void 0 : wallet.name,
     });
@@ -9199,7 +9200,7 @@ var Wallet = ({ ...props }) => {
 };
 
 function useProviders() {
-    const { user } = useOpenfort();
+    const { user } = useOpenfortCore();
     const { uiConfig: options } = useOpenfortKit();
     const allProviders = (options === null || options === void 0 ? void 0 : options.authProviders) || [];
     const providers = allProviders.filter(p => p !== AuthProvider.GUEST) || [];
@@ -9314,7 +9315,7 @@ const AddLinkedProviderButton = () => {
     return (jsx(LinkedProviderButton, { disabled: unlinkedProviders.length === 0, onClick: () => setRoute(routes.PROVIDERS), children: "+" }));
 };
 const LinkedProviders = () => {
-    const { user } = useOpenfort();
+    const { user } = useOpenfortCore();
     if (!user || !user.linkedAccounts) {
         return (jsx("div", { children: jsx("p", { children: "No linked providers" }) }));
     }
@@ -9338,7 +9339,7 @@ const Profile = ({ closeModal }) => {
         //watch: true,
     });
     const [shouldDisconnect, setShouldDisconnect] = useState(false);
-    const { logout, user } = useOpenfort();
+    const { logout, user } = useOpenfortCore();
     useEffect(() => {
         // if (!isConnected) context.setOpen(false);
     }, [isConnected]);
@@ -9747,7 +9748,7 @@ const createSIWEMessage = (address, nonce, chainId) => createSiweMessage({
 });
 
 function useConnectWithSiwe() {
-    const { client, user, updateUser } = useOpenfort();
+    const { client, user, updateUser } = useOpenfortCore();
     const { log } = useOpenfortKit();
     const { address } = useAccount();
     const chainId = useChainId();
@@ -9797,7 +9798,7 @@ function useConnectWithSiwe() {
                 onError && onError("Failed to connect with SIWE");
             }
         }
-    }, [client, user, updateUser, log]);
+    }, [client, user, updateUser, log, address, chainId, config, connector]);
     return connectWithSiwe;
 }
 
@@ -9841,7 +9842,7 @@ const contentVariants$1 = {
 };
 const ConnectWithInjector = ({ switchConnectMethod, forceState }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const openfort = useOpenfort();
+    const openfort = useOpenfortCore();
     const { log, setOpen } = useOpenfortKit();
     const { isConnected } = useAccount();
     const { disconnect } = useDisconnect();
@@ -9927,7 +9928,7 @@ const ConnectWithInjector = ({ switchConnectMethod, forceState }) => {
     });
     const { triggerResize, connector: c } = useOpenfortKit();
     const id = c.id;
-    const wallet = useWallet(id);
+    const wallet = useWallet$1(id);
     const walletInfo = {
         name: wallet === null || wallet === void 0 ? void 0 : wallet.name,
         shortName: (_a = wallet === null || wallet === void 0 ? void 0 : wallet.shortName) !== null && _a !== void 0 ? _a : wallet === null || wallet === void 0 ? void 0 : wallet.name,
@@ -10055,7 +10056,7 @@ const ConnectWithQRCode = ({ switchConnectMethod }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const context = useOpenfortKit();
     const id = context.connector.id;
-    const wallet = useWallet(context.connector.id);
+    const wallet = useWallet$1(context.connector.id);
     const { open: openW3M, isOpen: isOpenW3M } = useWalletConnectModal();
     const { connect: { getUri }, } = useWeb3();
     const wcUri = getUri(id);
@@ -10179,11 +10180,23 @@ const Loader = ({ reason, isLoading = true, icon }) => {
     useEffect(() => {
         return () => triggerResize();
     }, []);
+    const renderLogo = () => {
+        if (icon) {
+            return icon;
+        }
+        if (options === null || options === void 0 ? void 0 : options.logo) {
+            if (typeof options.logo === 'string') {
+                return jsx("img", { src: options.logo, alt: "Logo", style: { width: '100%' } });
+            }
+            return options.logo;
+        }
+        return jsx(Logos.Openfort, {});
+    };
     return (jsxs(Fragment, { children: [jsx(ConnectingContainer, { children: jsx(ConnectingAnimation, { "$success": !isLoading, children: jsx(SquircleSpinner, { logo: jsx("div", { style: {
                                 padding: '12px',
                                 position: 'relative',
                                 width: '100%',
-                            }, children: icon || (options === null || options === void 0 ? void 0 : options.logo) || jsx(Logos.Openfort, {}) }), connecting: isLoading }) }) }), jsx(TextWrapper, { children: isLoading ? (jsxs(Fragment, { children: [jsx(ModalH1, { children: "Loading, please wait" }), jsx(ModalBody, { children: reason })] })) : (jsxs(ModalH1, { "$valid": true, children: [jsx(TickIcon, {}), " ", reason] })) })] }));
+                            }, children: renderLogo() }), connecting: isLoading }) }) }), jsx(TextWrapper, { children: isLoading ? (jsxs(Fragment, { children: [jsx(ModalH1, { children: "Loading, please wait" }), jsx(ModalBody, { children: reason })] })) : (jsxs(ModalH1, { "$valid": true, children: [jsx(TickIcon, {}), " ", reason] })) })] }));
 };
 
 const states$1 = {
@@ -10193,7 +10206,7 @@ const states$1 = {
 };
 const ConnectWithOAuth = ({}) => {
     const { connector, setRoute, log } = useOpenfortKit();
-    const { client, user } = useOpenfort();
+    const { client, user } = useOpenfortCore();
     const [status, setStatus] = useState(states$1.INIT);
     useEffect(() => {
         (async () => {
@@ -10290,7 +10303,7 @@ const states = {
 };
 const ConnectUsing = () => {
     const context = useOpenfortKit();
-    const wallet = useWallet(context.connector.id);
+    const wallet = useWallet$1(context.connector.id);
     // If cannot be scanned, display injector flow, which if extension is not installed will show CTA to install it
     const isQrCode = !(wallet === null || wallet === void 0 ? void 0 : wallet.isInstalled) && (wallet === null || wallet === void 0 ? void 0 : wallet.getWalletConnectDeeplink);
     // For OAuth connectors, we don't need to show the injector flow
@@ -10455,7 +10468,7 @@ const EmailLogin = () => {
     const [email, setEmail] = React.useState("");
     const [password, setPassword] = React.useState("");
     const { setRoute, log } = useOpenfortKit();
-    const { client } = useOpenfort();
+    const { client } = useOpenfortCore();
     const [loginLoading, setLoginLoading] = React.useState(false);
     const [loginError, setLoginError] = React.useState(false);
     const handleSubmit = async () => {
@@ -10498,7 +10511,7 @@ const EmailSignup = () => {
     const [password, setPassword] = React.useState("");
     const [username, setUsername] = React.useState("");
     const { setRoute, triggerResize, log, uiConfig: options } = useOpenfortKit();
-    const { client } = useOpenfort();
+    const { client } = useOpenfortCore();
     const [signupLoading, setSignupLoading] = React.useState(false);
     const [signupError, setSignupError] = React.useState(false);
     const handleSubmit = async () => {
@@ -10544,7 +10557,7 @@ const EmailSignup = () => {
 };
 
 const EmailVerification = () => {
-    const { client } = useOpenfort();
+    const { client } = useOpenfortCore();
     const { setRoute, log } = useOpenfortKit();
     const [loading, setLoading] = useState(true);
     const [shouldSendEmailVerification, setShouldSendEmailVerification] = useState(false);
@@ -10637,7 +10650,7 @@ const EmailVerification = () => {
 const RequestEmail = () => {
     const [email, setEmail] = React.useState("");
     const { log, triggerResize } = useOpenfortKit();
-    const { client } = useOpenfort();
+    const { client } = useOpenfortCore();
     const [loading, setLoading] = React.useState(false);
     const [message, setMessage] = React.useState("");
     const [error, setError] = React.useState("");
@@ -10694,7 +10707,7 @@ const ResetPassword = () => {
     const url = new URL(fixedUrl);
     const [password, setPassword] = React.useState("");
     const { setRoute, triggerResize, log } = useOpenfortKit();
-    const { client, updateUser } = useOpenfort();
+    const { client, updateUser } = useOpenfortCore();
     const [loading, setLoading] = React.useState(false);
     const email = url.searchParams.get("email");
     const handleSubmit = async () => {
@@ -10769,7 +10782,7 @@ const LinkEmail = () => {
     const [email, setEmail] = React.useState("");
     const [password, setPassword] = React.useState("");
     const { setRoute, triggerResize, log } = useOpenfortKit();
-    const { client, updateUser } = useOpenfort();
+    const { client, updateUser } = useOpenfortCore();
     const [loginLoading, setLoginLoading] = React.useState(false);
     const [loginError, setLoginError] = React.useState(false);
     const handleSubmit = async () => {
@@ -10807,7 +10820,7 @@ const LinkEmail = () => {
 
 const Loading = () => {
     const { setRoute, walletConfig } = useOpenfortKit();
-    const { isLoading, user, needsRecovery } = useOpenfort();
+    const { isLoading, user, needsRecovery } = useOpenfortCore();
     const { address } = useAccount();
     const [isFirstFrame, setIsFirstFrame] = React.useState(true);
     const [retryCount, setRetryCount] = React.useState(0);
@@ -10851,7 +10864,7 @@ const ProviderButton = ({ children, icon, onClick }) => {
     return (jsx(ProvidersButton, { children: jsxs(Button, { onClick: onClick, children: [jsx(ProviderLabel, { children: children }), jsx(ProviderIcon$1, { children: icon })] }) }));
 };
 const GuestButton = () => {
-    const { signUpGuest } = useOpenfort();
+    const { signUpGuest } = useOpenfortCore();
     const { setRoute } = useOpenfortKit();
     const handleClick = () => {
         signUpGuest();
@@ -10865,7 +10878,7 @@ const WalletButton = () => {
 };
 const EmailButton = () => {
     const { setRoute } = useOpenfortKit();
-    const { user } = useOpenfort();
+    const { user } = useOpenfortCore();
     return jsx(ProviderButton, { onClick: () => setRoute(user ? routes.LINK_EMAIL : routes.EMAIL_LOGIN), icon: jsx(EmailIcon, {}), children: "Email" });
 };
 const AuthProviderButton = ({ provider, title = provider + " login", icon }) => {
@@ -10896,7 +10909,7 @@ const ProviderButtonSwitch = ({ provider }) => {
 };
 // This accounts for the case where the user has an address but no user, which can happen if the user has not signed up yet, but logged in with a wallet
 const AddressButNoUserCase = () => {
-    const { updateUser } = useOpenfort();
+    const { updateUser } = useOpenfortCore();
     const { disconnect } = useDisconnect();
     useEffect(() => {
         updateUser()
@@ -10916,7 +10929,7 @@ const SocialProvidersButton = () => {
 };
 const Providers = () => {
     const maxProviders = 4;
-    const { user } = useOpenfort();
+    const { user } = useOpenfortCore();
     const { address } = useAccount();
     const { allProviders, availableProviders } = useProviders();
     if (address && !user) {
@@ -10937,19 +10950,38 @@ const mapStatus = (status) => {
     };
 };
 
-const createOpenfortWallet = ({ connector, isEmbedded, address, }) => ({
+const onSuccess = ({ hookOptions, options, data, }) => {
+    var _a, _b, _c, _d;
+    (_a = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.onSuccess) === null || _a === void 0 ? void 0 : _a.call(hookOptions, data);
+    (_b = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.onSettled) === null || _b === void 0 ? void 0 : _b.call(hookOptions, data, null);
+    (_c = options === null || options === void 0 ? void 0 : options.onSuccess) === null || _c === void 0 ? void 0 : _c.call(options, data);
+    (_d = options === null || options === void 0 ? void 0 : options.onSettled) === null || _d === void 0 ? void 0 : _d.call(options, data, null);
+    return data;
+};
+const onError = ({ hookOptions, options, error, }) => {
+    var _a, _b, _c, _d;
+    (_a = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.onError) === null || _a === void 0 ? void 0 : _a.call(hookOptions, error);
+    (_b = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.onSettled) === null || _b === void 0 ? void 0 : _b.call(hookOptions, null, error);
+    (_c = options === null || options === void 0 ? void 0 : options.onError) === null || _c === void 0 ? void 0 : _c.call(options, error);
+    (_d = options === null || options === void 0 ? void 0 : options.onSettled) === null || _d === void 0 ? void 0 : _d.call(options, null, error);
+    if ((hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.throwOnError) || (options === null || options === void 0 ? void 0 : options.throwOnError))
+        throw error;
+    return { error };
+};
+
+const createOpenfortWallet = ({ address, isActive, }) => ({
     connectorType: "embedded",
     walletClientType: "openfort",
-    address: isEmbedded ? address : undefined,
+    address,
     id: embeddedWalletId,
     isAvailable: true,
-    isActive: isEmbedded && (connector === null || connector === void 0 ? void 0 : connector.id) === embeddedWalletId,
+    isActive,
 });
-function useWallets() {
-    const { user, embeddedState, client } = useOpenfort();
-    const { walletConfig, log, setOpen, setRoute, setConnector, uiConfig: openfortKitOptions } = useOpenfortKit();
+function useWallets(hookOptions = {}) {
+    const { user, embeddedState, client } = useOpenfortCore();
+    const { walletConfig, log, setOpen, setRoute, setConnector, uiConfig } = useOpenfortKit();
     const { connector, isConnected, address } = useAccount();
-    const chain = useChainId();
+    const chainId = useChainId();
     const deviceWallets = useWallets$1(); // TODO: Map wallets object to be the same as wallets
     const { disconnect } = useDisconnect();
     const [status, setStatus] = useState({
@@ -10958,20 +10990,25 @@ function useWallets() {
     const [connectToConnector, setConnectToConnector] = useState(undefined);
     const { connect } = useConnect$1({
         mutation: {
-            onError: (error) => {
-                console.error("Error connecting ---", error);
+            onError: (e) => {
+                console.error("Error connecting ---", e);
+                const error = new OpenfortError("Failed to connect with wallet: ", OpenfortErrorType.AUTHENTICATION_ERROR, e);
                 setStatus({
                     status: 'error',
-                    error: new OpenfortKitError("Failed to connect with wallet: ", OpenfortKitErrorType.AUTHENTICATION_ERROR, error),
+                    error,
+                });
+                onError({
+                    error,
+                    options: hookOptions,
                 });
             },
             onSuccess: (data) => {
                 setConnectToConnector(undefined);
-                console.log("Connected with wallet", data, connectToConnector);
+                log("Connected with wallet", data, connectToConnector);
                 if ((connectToConnector === null || connectToConnector === void 0 ? void 0 : connectToConnector.address) && !data.accounts.some((a) => a === connectToConnector.address)) {
                     setStatus({
                         status: 'error',
-                        error: new OpenfortKitError("Failed to connect with wallet: Address mismatch", OpenfortKitErrorType.AUTHENTICATION_ERROR),
+                        error: new OpenfortError("Failed to connect with wallet: Address mismatch", OpenfortErrorType.AUTHENTICATION_ERROR),
                     });
                     disconnect();
                     return;
@@ -10984,8 +11021,32 @@ function useWallets() {
     });
     const usesEmbeddedWallet = user && walletConfig;
     const isEmbedded = embeddedState === EmbeddedState.READY;
+    const { data: embeddedWallets, refetch } = useQuery({
+        queryKey: ['openfortEmbeddedWalletList'],
+        queryFn: () => !!user ? client.embeddedWallet.list() : Promise.resolve([]),
+    });
+    useEffect(() => {
+        log("Refetching embedded wallets");
+        refetch();
+    }, [!!user, refetch]);
+    const getEncryptionSession = useCallback(async () => {
+        if (!walletConfig || !walletConfig.createEncryptedSessionEndpoint) {
+            throw new Error("No createEncryptedSessionEndpoint set in walletConfig");
+        }
+        const resp = await fetch(walletConfig.createEncryptedSessionEndpoint, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+        });
+        if (!resp.ok) {
+            throw new Error("Failed to create encryption session");
+        }
+        const respJSON = await resp.json();
+        return respJSON.session;
+    }, [walletConfig]);
     const wallets = useMemo(() => {
-        const linkedWallets = user ? user.linkedAccounts
+        const userWallets = user ? user.linkedAccounts
             .filter((a) => a.provider === AuthProvider.WALLET)
             .map((a) => {
             const wallet = deviceWallets.find((c) => c.connector.id === a.walletClientType);
@@ -10998,16 +11059,14 @@ function useWallets() {
                 isActive: (connector === null || connector === void 0 ? void 0 : connector.id) === a.walletClientType && address === a.address,
             };
         }) : [];
-        // TODO: List user wallets with embeddedWallet.list
-        if (usesEmbeddedWallet) {
-            linkedWallets.push(createOpenfortWallet({
-                connector,
-                isEmbedded,
-                address
+        embeddedWallets === null || embeddedWallets === void 0 ? void 0 : embeddedWallets.forEach((wallet) => {
+            userWallets.push(createOpenfortWallet({
+                address: wallet.address,
+                isActive: wallet.address === address,
             }));
-        }
-        return linkedWallets;
-    }, [user, address, connector === null || connector === void 0 ? void 0 : connector.id]);
+        });
+        return userWallets;
+    }, [user, address, connector === null || connector === void 0 ? void 0 : connector.id, embeddedWallets]);
     const activeWallet = isConnected && connector ? wallets.find((w) => w.isActive) : undefined;
     useEffect(() => {
         if (connectToConnector)
@@ -11022,7 +11081,7 @@ function useWallets() {
             const wallet = deviceWallets.find(c => c.id === optionsObject.connector);
             if (!wallet) {
                 log("Connector not found", connector);
-                return { error: "Connector not found" };
+                return { error: new OpenfortError("Connector not found", OpenfortErrorType.WALLET_ERROR) };
             }
             log("Connecting to", wallet.connector);
             connector = wallet.connector;
@@ -11032,7 +11091,7 @@ function useWallets() {
         }
         if (!connector) {
             log("Connector not found", deviceWallets, optionsObject.connector);
-            return { error: "Connector not found" };
+            return { error: new OpenfortError("Connector not found", OpenfortErrorType.WALLET_ERROR) };
         }
         if ((activeWallet === null || activeWallet === void 0 ? void 0 : activeWallet.id) === connector.id && address === optionsObject.address) {
             log(`Already connected to ${connector.id} with address ${address}, skipping connection`);
@@ -11058,7 +11117,11 @@ function useWallets() {
             const walletToConnect = wallets.find((w) => w.id == connector.id);
             if (!walletToConnect) {
                 log("Wallet not found", connector);
-                return {};
+                return onError({
+                    error: new OpenfortError("Wallet not found", OpenfortErrorType.AUTHENTICATION_ERROR),
+                    options: optionsObject,
+                    hookOptions
+                });
             }
             log("Connecting to wallet", walletToConnect);
             if (connector.id === embeddedWalletId) {
@@ -11077,38 +11140,18 @@ function useWallets() {
         function isOpenfortWallet(opts) {
             return opts.connector === embeddedWalletId;
         }
-        const chainId = (_a = openfortKitOptions === null || openfortKitOptions === void 0 ? void 0 : openfortKitOptions.initialChainId) !== null && _a !== void 0 ? _a : chain;
-        console.log("Setting active wallet", { options: optionsObject, chainId });
+        log("Setting active wallet", { options: optionsObject, chainId });
         if (isOpenfortWallet(optionsObject)) {
-            const getEncryptionSession = async () => {
-                if (!walletConfig || !walletConfig.createEncryptedSessionEndpoint) {
-                    throw new Error("No createEncryptedSessionEndpoint set in walletConfig");
-                }
-                const resp = await fetch(walletConfig.createEncryptedSessionEndpoint, {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json",
-                    },
-                });
-                if (!resp.ok) {
-                    throw new Error("Failed to create encryption session");
-                }
-                const respJSON = await resp.json();
-                return respJSON.session;
-            };
             setStatus({
                 status: 'loading',
             });
             const { password } = optionsObject;
-            // -----
-            //
-            // HERE WOULD GO THE LOGIC TO CONNECT TO WALLET A OR B
-            //
-            // -----
             if (!walletConfig) {
-                return {
-                    error: "Embedded signer not enabled",
-                };
+                return onError({
+                    error: new OpenfortError("Embedded signer not enabled", OpenfortErrorType.WALLET_ERROR),
+                    options: optionsObject,
+                    hookOptions
+                });
             }
             log(`Handling recovery with Openfort: password=${password}, chainId=${chainId}`);
             try {
@@ -11116,70 +11159,91 @@ function useWallets() {
                 if (!accessToken) {
                     throw new Error("Openfort access token not found");
                 }
-                if (!password) {
-                    const shieldAuth = {
-                        auth: ShieldAuthType.OPENFORT,
-                        token: accessToken,
-                        encryptionSession: walletConfig.getEncryptionSession ?
-                            await walletConfig.getEncryptionSession() :
-                            await getEncryptionSession(),
-                    };
-                    log("Configuring embedded signer with automatic recovery");
-                    await client.embeddedWallet.configure({
-                        chainId,
-                        recoveryParams: {
-                            recoveryMethod: RecoveryMethod.AUTOMATIC,
-                        },
-                        shieldAuthentication: shieldAuth,
+                const shieldAuthentication = password ? {
+                    auth: ShieldAuthType.OPENFORT,
+                    token: accessToken,
+                } : {
+                    auth: ShieldAuthType.OPENFORT,
+                    token: accessToken,
+                    encryptionSession: walletConfig.getEncryptionSession ?
+                        await walletConfig.getEncryptionSession() :
+                        await getEncryptionSession(),
+                };
+                const recoveryParams = password ? {
+                    recoveryMethod: RecoveryMethod.PASSWORD,
+                    password,
+                } : {
+                    recoveryMethod: RecoveryMethod.AUTOMATIC,
+                };
+                log("Recovery params", recoveryParams, optionsObject.address);
+                if (optionsObject.address) {
+                    const walletId = (_a = embeddedWallets === null || embeddedWallets === void 0 ? void 0 : embeddedWallets.find((w) => w.address === optionsObject.address && w.chainId === chainId)) === null || _a === void 0 ? void 0 : _a.id;
+                    if (!walletId) {
+                        return onError({
+                            error: new OpenfortError("Embedded wallet not found for address", OpenfortErrorType.WALLET_ERROR),
+                            options: optionsObject,
+                            hookOptions
+                        });
+                    }
+                    await client.embeddedWallet.recover({
+                        account: walletId,
+                        shieldAuthentication,
+                        recoveryParams,
                     });
                 }
                 else {
-                    if (!password || password.length < 4) {
-                        throw "Password recovery must be at least 4 characters";
-                    }
-                    const shieldAuth = {
-                        auth: ShieldAuthType.OPENFORT,
-                        token: accessToken,
-                    };
-                    await client.embeddedWallet.configure({
-                        chainId,
-                        recoveryParams: {
-                            recoveryMethod: RecoveryMethod.PASSWORD,
+                    if (!embeddedWallets || embeddedWallets.length === 0) {
+                        await createWallet({
                             password,
-                        },
-                        shieldAuthentication: shieldAuth,
-                    });
+                        });
+                    }
+                    else {
+                        await client.embeddedWallet.recover({
+                            account: embeddedWallets[0].id,
+                            shieldAuthentication,
+                            recoveryParams,
+                        });
+                    }
                 }
                 setStatus({
                     status: 'success',
                 });
-                return {
-                    wallet: createOpenfortWallet({
-                        connector,
-                        isEmbedded,
-                        address,
-                    }),
-                };
+                return onSuccess({
+                    data: {
+                        wallet: createOpenfortWallet({
+                            address: optionsObject.address,
+                            isActive: true,
+                        }),
+                    },
+                    options: optionsObject,
+                    hookOptions,
+                });
             }
             catch (err) {
                 log('Error handling recovery with Openfort:', err);
                 if (err instanceof MissingRecoveryPasswordError) {
-                    return {
-                        error: "Missing recovery password",
-                    };
+                    return onError({
+                        error: new OpenfortError("Missing recovery password", OpenfortErrorType.WALLET_ERROR),
+                        options: optionsObject,
+                        hookOptions
+                    });
                 }
                 if (typeof err === 'string') {
-                    return {
-                        error: err,
-                    };
+                    return onError({
+                        error: new OpenfortError(err, OpenfortErrorType.WALLET_ERROR),
+                        options: optionsObject,
+                        hookOptions
+                    });
                 }
                 // setStatus({
                 //   status: 'error',
                 //   error: new Error("Failed to connect with embedded wallet: " + err),
                 // });
-                return {
-                    error: "The recovery phrase you entered is incorrect.",
-                };
+                return onError({
+                    error: new OpenfortError("The recovery phrase you entered is incorrect.", OpenfortErrorType.WALLET_ERROR),
+                    options: optionsObject,
+                    hookOptions
+                });
             }
         }
         else {
@@ -11193,15 +11257,68 @@ function useWallets() {
         }
         return {};
     }, [wallets, setOpen, setRoute, setConnector, disconnect, log, isConnected, address, usesEmbeddedWallet, isEmbedded]);
-    useCallback(() => {
-        throw new Error("createWallet is not implemented in useWallets. Use setActiveWallet instead.");
-    }, []);
+    const createWallet = useCallback(async ({ password, ...options } = {}) => {
+        var _a;
+        setStatus({
+            status: 'loading',
+        });
+        const accessToken = await client.getAccessToken();
+        if (!accessToken) {
+            return onError({
+                error: new OpenfortError("Openfort access token not found", OpenfortErrorType.WALLET_ERROR),
+                hookOptions,
+                options,
+            });
+        }
+        if (!walletConfig) {
+            return onError({
+                error: new OpenfortError("Embedded signer not enabled", OpenfortErrorType.WALLET_ERROR),
+                hookOptions,
+                options,
+            });
+        }
+        const shieldAuthentication = password ? {
+            auth: ShieldAuthType.OPENFORT,
+            token: accessToken,
+        } : {
+            auth: ShieldAuthType.OPENFORT,
+            token: accessToken,
+            encryptionSession: walletConfig.getEncryptionSession ?
+                await walletConfig.getEncryptionSession() :
+                await getEncryptionSession(),
+        };
+        const recoveryParams = password ? {
+            recoveryMethod: RecoveryMethod.PASSWORD,
+            password,
+        } : {
+            recoveryMethod: RecoveryMethod.AUTOMATIC,
+        };
+        const wallet = await client.embeddedWallet.create({
+            chainId: (_a = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.initialChainId) !== null && _a !== void 0 ? _a : chainId,
+            accountType: AccountTypeEnum.SMART_ACCOUNT,
+            chainType: ChainTypeEnum.EVM,
+            recoveryParams,
+            shieldAuthentication
+        });
+        setStatus({
+            status: 'success',
+        });
+        refetch();
+        return onSuccess({
+            data: {
+                wallet: createOpenfortWallet({
+                    address: wallet.address,
+                    isActive: true,
+                })
+            }
+        });
+    }, [refetch, client, uiConfig, chainId]);
     return {
         wallets,
         availableWallets: deviceWallets,
         activeWallet,
         setActiveWallet,
-        // createWallet,
+        createWallet,
         ...mapStatus(status),
         exportPrivateKey: client.embeddedWallet.exportPrivateKey,
     };
@@ -11223,7 +11340,7 @@ const Recover = () => {
         });
         setLoading(false);
         if (error) {
-            setRecoveryError(error || "There was an error recovering your account");
+            setRecoveryError(error.message || "There was an error recovering your account");
         }
         else {
             log("Recovery success");
@@ -11239,7 +11356,7 @@ const Recover = () => {
                 }, children: [jsx(Input, { value: recoveryPhrase, onChange: (e) => setRecoveryPhrase(e.target.value), type: "password", placeholder: "Enter your password", autoComplete: "off" }), recoveryError && (jsx(motion.div, { initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 }, children: jsx(ModalBody, { style: { height: 24, marginTop: 12 }, "$error": true, children: jsx(FitText, { children: recoveryError }) }) }, recoveryError)), jsx(Button, { onClick: handleSubmit, waiting: loading, disabled: loading, children: "Enter" })] })] }));
 };
 const AutomaticRecovery = () => {
-    const { needsRecovery } = useOpenfort();
+    const { needsRecovery } = useOpenfortCore();
     const { setActiveWallet } = useWallets();
     const { log } = useOpenfortKit();
     const [hasRecoveryMethod, setHasRecoveryMethod] = React.useState(false);
@@ -11250,7 +11367,8 @@ const AutomaticRecovery = () => {
                 const response = await setActiveWallet({
                     connector: embeddedWalletId,
                 });
-                if (response.error && response.error === "Missing recovery password") {
+                // TODO: Handle error properly
+                if (response.error && response.error.message === "Missing recovery password") {
                     setHasRecoveryMethod(true);
                 }
             }
@@ -11272,7 +11390,7 @@ const Connected = () => {
     return (jsx(PageContent, { children: jsx(Loader, { isLoading: false, reason: "Connected" }) }));
 };
 const CreateEmbeddedSigner = () => {
-    const { needsRecovery, user } = useOpenfort();
+    const { needsRecovery, user } = useOpenfortCore();
     const { triggerResize, uiConfig, walletConfig, setRoute } = useOpenfortKit();
     const [loading, setLoading] = React.useState(true);
     const [embeddedSignerLoading, setEmbeddedSignerLoading] = React.useState(true);
@@ -11326,7 +11444,7 @@ const customThemeDefault = {};
 const ConnectModal = ({ mode = 'auto', theme = 'auto', customTheme = customThemeDefault, lang = 'en-US' }) => {
     var _a;
     const context = useOpenfortKit();
-    const { logout, user } = useOpenfort();
+    const { logout, user } = useOpenfortCore();
     const { isConnected, chain } = useAccount();
     const chainIsSupported = useChainIsSupported(chain === null || chain === void 0 ? void 0 : chain.id);
     //if chain is unsupported we enforce a "switch chain" prompt
@@ -11455,30 +11573,30 @@ const ConnectModal = ({ mode = 'auto', theme = 'auto', customTheme = customTheme
 };
 
 /**
- * OpenfortKitProvider component provides context and configuration for OpenfortKit.
+ * OpenfortProvider component provides context and configuration for OpenfortKit.
  * It must be used within a WagmiProvider.
  *
  * @param {React.ReactNode} children - The child components to be wrapped by the provider.
  * @param {string} [theme='auto'] - The theme to be used, default is 'auto'.
  * @param {string} [mode='auto'] - The mode to be used, default is 'auto'.
  * @param {CustomTheme} [customTheme] - Custom theme configuration.
- * @param {ConnectKitOptions} [options] - Additional configuration options.
+ * @param {ConnectUIOptions} [options] - Additional configuration options.
  * @param {Function} [onConnect] - Callback function to be called on connect.
  * @param {Function} [onDisconnect] - Callback function to be called on disconnect.
  * @param {boolean} [debugMode=false] - Enable or disable debug mode, default is false.
  * @param {OpenfortOptions} [openfortOptions] - Options for Openfort integration.
  * @throws Will throw an error if used outside of a WagmiProvider or if nested usages are detected.
  */
-const OpenfortKitProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMode = false, publishableKey, walletConfig, }) => {
+const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMode = false, publishableKey, walletConfig, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    // OpenfortKitProvider must be within a WagmiProvider
+    // OpenfortProvider must be within a WagmiProvider
     if (!React.useContext(WagmiContext)) {
-        throw Error('OpenfortKitProvider must be within a WagmiProvider');
+        throw Error('OpenfortProvider must be within a WagmiProvider');
     }
-    // Only allow for mounting OpenfortKitProvider once, so we avoid weird global
+    // Only allow for mounting OpenfortProvider once, so we avoid weird global
     // state collisions.
     if (React.useContext(OpenfortKitContext)) {
-        throw new Error('Multiple, nested usages of OpenfortKitProvider detected. Please use only one.');
+        throw new Error('Multiple, nested usages of OpenfortProvider detected. Please use only one.');
     }
     const chains = useChains();
     const injectedConnector = useConnector('injected');
@@ -11596,7 +11714,7 @@ const OpenfortKitProvider = ({ children, uiConfig, onConnect, onDisconnect, debu
         triggerResize: () => onResize((prev) => prev + 1),
         walletConfig,
     };
-    return createElement(OpenfortKitContext.Provider, { value }, jsx(Fragment, { children: jsx(Web3ContextProvider, { enabled: open, children: jsxs(OpenfortProvider, { baseConfiguration: {
+    return createElement(OpenfortKitContext.Provider, { value }, jsx(Fragment, { children: jsx(Web3ContextProvider, { enabled: open, children: jsxs(CoreOpenfortProvider, { baseConfiguration: {
                     publishableKey,
                 }, shieldConfiguration: walletConfig ? {
                     shieldPublishableKey: walletConfig.shieldPublishableKey,
@@ -11855,7 +11973,7 @@ const allRoutes = [
 ];
 function useUI() {
     const { open, setOpen, setRoute, log } = useOpenfortKit();
-    const { isLoading, user, needsRecovery } = useOpenfort();
+    const { isLoading, user, needsRecovery } = useOpenfortCore();
     const { isConnected } = useAccount();
     function defaultOpen() {
         setOpen(true);
@@ -12014,7 +12132,7 @@ const ConnectButtonRenderer = ({ children, }) => {
 };
 ConnectButtonRenderer.displayName = 'OpenfortKitButton.Custom';
 const ConnectedLabel = ({ separator }) => {
-    const { user, isLoading } = useOpenfort();
+    const { user, isLoading } = useOpenfortCore();
     const { address } = useAccount();
     if (address && (user || isLoading))
         return truncateEthAddress(address, separator);
@@ -12026,7 +12144,7 @@ const ConnectedLabel = ({ separator }) => {
 };
 function OpenfortKitButtonInner({ label, showAvatar, separator, }) {
     const locales = useLocales({});
-    const { user } = useOpenfort();
+    const { user } = useOpenfortCore();
     const { address, chain } = useAccount();
     const isChainSupported = useChainIsSupported(chain === null || chain === void 0 ? void 0 : chain.id);
     const ensFallbackConfig = useEnsFallbackConfig();
@@ -12117,44 +12235,41 @@ OpenfortKitButton.Custom = ConnectButtonRenderer;
 
 var OpenfortKitStatus;
 (function (OpenfortKitStatus) {
-    OpenfortKitStatus[OpenfortKitStatus["LOADING"] = 0] = "LOADING";
-    OpenfortKitStatus[OpenfortKitStatus["CONNECTED"] = 1] = "CONNECTED";
-    OpenfortKitStatus[OpenfortKitStatus["DISCONNECTED"] = 2] = "DISCONNECTED";
-    OpenfortKitStatus[OpenfortKitStatus["NEEDS_RECOVERY"] = 3] = "NEEDS_RECOVERY";
-    OpenfortKitStatus[OpenfortKitStatus["CONNECTED_WITHOUT_USER"] = 4] = "CONNECTED_WITHOUT_USER";
+    OpenfortKitStatus[OpenfortKitStatus["DISCONNECTED"] = 0] = "DISCONNECTED";
+    OpenfortKitStatus[OpenfortKitStatus["NEEDS_RECOVERY"] = 1] = "NEEDS_RECOVERY";
+    OpenfortKitStatus[OpenfortKitStatus["LOADING"] = 2] = "LOADING";
+    OpenfortKitStatus[OpenfortKitStatus["CONNECTED"] = 3] = "CONNECTED";
 })(OpenfortKitStatus || (OpenfortKitStatus = {}));
 function useStatus() {
-    const { isLoading, needsRecovery, user } = useOpenfort();
-    const { isConnected } = useAccount();
+    const { embeddedState } = useOpenfortCore();
+    const { isConnected, isConnecting } = useAccount();
     const getStatus = () => {
-        if (isLoading)
+        if (embeddedState === EmbeddedState.READY)
+            return OpenfortKitStatus.CONNECTED;
+        if (embeddedState === EmbeddedState.NONE)
             return OpenfortKitStatus.LOADING;
-        if (needsRecovery)
-            return OpenfortKitStatus.NEEDS_RECOVERY;
-        if (!user) {
+        // if (needsRecovery) return OpenfortKitStatus.NEEDS_RECOVERY;
+        if (embeddedState === EmbeddedState.EMBEDDED_SIGNER_NOT_CONFIGURED) {
             if (isConnected)
-                return OpenfortKitStatus.CONNECTED_WITHOUT_USER;
+                return OpenfortKitStatus.CONNECTED;
             else
-                return OpenfortKitStatus.DISCONNECTED;
+                return OpenfortKitStatus.NEEDS_RECOVERY;
         }
-        if (!isConnected)
-            return OpenfortKitStatus.NEEDS_RECOVERY;
-        return OpenfortKitStatus.CONNECTED;
+        return OpenfortKitStatus.DISCONNECTED;
     };
     const status = getStatus();
     return {
-        status,
         isLoading: status === OpenfortKitStatus.LOADING,
-        hasUser: !!user,
         isConnected: status === OpenfortKitStatus.CONNECTED,
         isDisconnected: status === OpenfortKitStatus.DISCONNECTED,
-        isConnectedWithoutUser: status === OpenfortKitStatus.CONNECTED_WITHOUT_USER,
-        needsRecovery: status === OpenfortKitStatus.NEEDS_RECOVERY,
+        isConnecting: isConnecting || embeddedState === EmbeddedState.CREATING_ACCOUNT,
+        isAuthenticated: embeddedState !== EmbeddedState.NONE && embeddedState !== EmbeddedState.UNAUTHENTICATED,
     };
 }
 
 function useUser() {
-    const { user, client } = useOpenfort();
+    const { user, client } = useOpenfortCore();
+    const { isAuthenticated } = useStatus();
     const getAccessTokenAndUpdate = useCallback(async () => {
         await client.validateAndRefreshToken();
         const token = await client.getAccessToken();
@@ -12162,11 +12277,17 @@ function useUser() {
     }, [client]);
     return {
         user,
+        isAuthenticated,
         getAccessToken: getAccessTokenAndUpdate,
         validateAndRefreshToken: async () => await client.validateAndRefreshToken(),
     };
 }
 
+function useWallet() {
+    const { activeWallet } = useWallets();
+    return activeWallet;
+}
+
 const buildCallbackUrl = ({ email, callbackUrl, provider, }) => {
     if (callbackUrl && !callbackUrl.startsWith("http")) {
         callbackUrl = `${window.location.origin}${callbackUrl.startsWith("/") ? "" : "/"}${callbackUrl}`;
@@ -12179,25 +12300,6 @@ const buildCallbackUrl = ({ email, callbackUrl, provider, }) => {
     return redirectUrl.toString();
 };
 
-const onSuccess = ({ hookOptions, options, data, }) => {
-    var _a, _b, _c, _d;
-    (_a = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.onSuccess) === null || _a === void 0 ? void 0 : _a.call(hookOptions, data);
-    (_b = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.onSettled) === null || _b === void 0 ? void 0 : _b.call(hookOptions, data, null);
-    (_c = options === null || options === void 0 ? void 0 : options.onSuccess) === null || _c === void 0 ? void 0 : _c.call(options, data);
-    (_d = options === null || options === void 0 ? void 0 : options.onSettled) === null || _d === void 0 ? void 0 : _d.call(options, data, null);
-    return data;
-};
-const onError = ({ hookOptions, options, error, }) => {
-    var _a, _b, _c, _d;
-    (_a = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.onError) === null || _a === void 0 ? void 0 : _a.call(hookOptions, error);
-    (_b = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.onSettled) === null || _b === void 0 ? void 0 : _b.call(hookOptions, null, error);
-    (_c = options === null || options === void 0 ? void 0 : options.onError) === null || _c === void 0 ? void 0 : _c.call(options, error);
-    (_d = options === null || options === void 0 ? void 0 : options.onSettled) === null || _d === void 0 ? void 0 : _d.call(options, null, error);
-    if ((hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.throwOnError) || (options === null || options === void 0 ? void 0 : options.throwOnError))
-        throw error;
-    return { error };
-};
-
 // this hook is used to create a wallet after the user has authenticated
 const useCreateWalletPostAuth = () => {
     const { setActiveWallet } = useWallets();
@@ -12216,7 +12318,7 @@ const useCreateWalletPostAuth = () => {
 
 const useEmailAuth = (hookOptions = {}) => {
     const { log } = useOpenfortKit();
-    const { client, updateUser } = useOpenfort();
+    const { client, updateUser } = useOpenfortCore();
     const [requiresEmailVerification, setRequiresEmailVerification] = useState(false);
     const [status, setStatus] = useState({
         status: "idle",
@@ -12273,7 +12375,7 @@ const useEmailAuth = (hookOptions = {}) => {
             }
         }
         catch (e) {
-            const error = new OpenfortKitError("Failed to login with email and password", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+            const error = new OpenfortError("Failed to login with email and password", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
             setStatus({
                 status: 'error',
                 error: error
@@ -12311,7 +12413,7 @@ const useEmailAuth = (hookOptions = {}) => {
             });
         }
         catch (e) {
-            const error = new OpenfortKitError("Failed to reset password", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+            const error = new OpenfortError("Failed to reset password", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
             setStatus({
                 status: 'error',
                 error
@@ -12345,7 +12447,7 @@ const useEmailAuth = (hookOptions = {}) => {
             });
         }
         catch (e) {
-            const error = new OpenfortKitError("Failed to reset password", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+            const error = new OpenfortError("Failed to reset password", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
             setStatus({
                 status: 'error',
                 error
@@ -12403,7 +12505,7 @@ const useEmailAuth = (hookOptions = {}) => {
             }
         }
         catch (e) {
-            const error = new OpenfortKitError("Failed to login with email and password", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+            const error = new OpenfortError("Failed to login with email and password", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
             setStatus({
                 status: 'error',
                 error
@@ -12422,7 +12524,7 @@ const useEmailAuth = (hookOptions = {}) => {
             const authToken = await client.getAccessToken();
             if (!authToken) {
                 log("No token found");
-                const error = new OpenfortKitError("No token found", OpenfortKitErrorType.AUTHENTICATION_ERROR);
+                const error = new OpenfortError("No token found", OpenfortErrorType.AUTHENTICATION_ERROR);
                 setStatus({
                     status: 'error',
                     error
@@ -12468,7 +12570,7 @@ const useEmailAuth = (hookOptions = {}) => {
             }
         }
         catch (e) {
-            const error = new OpenfortKitError("Failed to link email", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+            const error = new OpenfortError("Failed to link email", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
             setStatus({
                 status: 'error',
                 error: error
@@ -12499,7 +12601,7 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
     const [status, setStatus] = useState({
         status: "idle",
     });
-    const { client, updateUser } = useOpenfort();
+    const { client, updateUser } = useOpenfortCore();
     const [provider, setProvider] = useState(null);
     const [email, setEmail] = useState(null);
     const { tryUseWallet } = useCreateWalletPostAuth();
@@ -12523,7 +12625,7 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
             });
         }
         catch (e) {
-            const error = new OpenfortKitError("Failed to verify email", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+            const error = new OpenfortError("Failed to verify email", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
             setStatus({
                 status: 'error',
                 error,
@@ -12559,7 +12661,7 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
             });
         }
         catch (e) {
-            const error = new OpenfortKitError("Failed to store credentials", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+            const error = new OpenfortError("Failed to store credentials", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
             setStatus({
                 status: 'error',
                 error,
@@ -12594,7 +12696,7 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
                     onError({
                         hookOptions,
                         options: {},
-                        error: new OpenfortKitError("No state or email found in URL", OpenfortKitErrorType.AUTHENTICATION_ERROR),
+                        error: new OpenfortError("No state or email found in URL", OpenfortErrorType.AUTHENTICATION_ERROR),
                     });
                     return;
                 }
@@ -12620,7 +12722,7 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
                     onError({
                         hookOptions,
                         options: {},
-                        error: new OpenfortKitError("Missing player id or access token or refresh token", OpenfortKitErrorType.AUTHENTICATION_ERROR),
+                        error: new OpenfortError("Missing player id or access token or refresh token", OpenfortErrorType.AUTHENTICATION_ERROR),
                     });
                     return;
                 }
@@ -12649,7 +12751,7 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
 };
 
 const useGuestAuth = (hookOptions = {}) => {
-    const { client, updateUser } = useOpenfort();
+    const { client, updateUser } = useOpenfortCore();
     const [status, setStatus] = useState({
         status: "idle",
     });
@@ -12674,15 +12776,15 @@ const useGuestAuth = (hookOptions = {}) => {
             return { user, wallet };
         }
         catch (error) {
-            const openfortKitError = new OpenfortKitError("Failed to signup guest", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error });
+            const openfortError = new OpenfortError("Failed to signup guest", OpenfortErrorType.AUTHENTICATION_ERROR, { error });
             setStatus({
                 status: 'error',
-                error: openfortKitError,
+                error: openfortError,
             });
             return onError({
                 hookOptions,
                 options,
-                error: openfortKitError,
+                error: openfortError,
             });
         }
     }, [client, setStatus, updateUser, hookOptions]);
@@ -12693,12 +12795,14 @@ const useGuestAuth = (hookOptions = {}) => {
 };
 
 const useWalletAuth = (hookOptions = {}) => {
-    const { updateUser } = useOpenfort();
+    const { updateUser } = useOpenfortCore();
     const { log } = useOpenfortKit();
     const siwe = useConnectWithSiwe();
     const availableWallets = useWallets$1(); // TODO: Use this to get the wallet client type
     const { disconnect } = useDisconnect();
     const [walletConnectingTo, setWalletConnectingTo] = useState(null);
+    const [shouldConnectWithSiwe, setShouldConnectWithSiwe] = useState(false);
+    useAccount();
     const [status, setStatus] = useState({
         status: "idle",
     });
@@ -12716,32 +12820,39 @@ const useWalletAuth = (hookOptions = {}) => {
     const { connectAsync } = useConnect({
         mutation: {
             onError: (e) => {
-                const error = new OpenfortKitError("Failed to connect with wallet", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+                const error = new OpenfortError("Failed to connect with wallet", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
                 handleError(error);
             },
             onSuccess: () => {
-                siwe({
-                    onError: (e) => {
-                        log("Error connecting with SIWE", e);
-                        disconnect();
-                        const error = new OpenfortKitError("Failed to connect with siwe", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
-                        handleError(error);
-                    },
-                    onConnect: () => {
-                        log("Successfully connected with SIWE");
-                        setStatus({
-                            status: 'success',
-                        });
-                        updateUser();
-                        onSuccess({
-                            hookOptions,
-                            data: {},
-                        });
-                    },
-                });
+                setShouldConnectWithSiwe(true);
             }
         }
     });
+    useEffect(() => {
+        // Ensure it has been connected with a wallet before connecting with SIWE
+        if (!shouldConnectWithSiwe)
+            return;
+        setShouldConnectWithSiwe(false);
+        siwe({
+            onError: (e) => {
+                log("Error connecting with SIWE", e);
+                disconnect();
+                const error = new OpenfortError("Failed to connect with siwe", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
+                handleError(error);
+            },
+            onConnect: () => {
+                log("Successfully connected with SIWE");
+                setStatus({
+                    status: 'success',
+                });
+                updateUser();
+                onSuccess({
+                    hookOptions,
+                    data: {},
+                });
+            },
+        });
+    }, [shouldConnectWithSiwe, siwe, updateUser, log]);
     // const generateSiweMessage = useCallback(
     //   async (args) => {
     //     try {
@@ -12827,7 +12938,7 @@ const useWalletAuth = (hookOptions = {}) => {
         }
         if (!connector) {
             log("Connector not found", connector);
-            return handleError(new OpenfortKitError("Connector not found", OpenfortKitErrorType.AUTHENTICATION_ERROR));
+            return handleError(new OpenfortError("Connector not found", OpenfortErrorType.AUTHENTICATION_ERROR));
         }
         setWalletConnectingTo(connector.id);
         const hasDisconnected = new Promise((resolve) => {
@@ -12837,7 +12948,7 @@ const useWalletAuth = (hookOptions = {}) => {
                 },
                 onError: (e) => {
                     console.error("Error disconnecting", e);
-                    const error = new OpenfortKitError("Failed to disconnect", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+                    const error = new OpenfortError("Failed to disconnect", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
                     handleError(error);
                     resolve();
                 },
@@ -12848,11 +12959,11 @@ const useWalletAuth = (hookOptions = {}) => {
             await connectAsync({
                 connector,
             });
-            console.log("Connected to wallet!!!", connector.id);
+            log("Connected to wallet!!!", connector.id);
         }
         catch (error) {
             console.error("Error connecting", error);
-            handleError(new OpenfortKitError("Failed to connect", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error }));
+            handleError(new OpenfortError("Failed to connect", OpenfortErrorType.AUTHENTICATION_ERROR, { error }));
         }
     }, [siwe, disconnect, updateUser, availableWallets, log, setStatus, hookOptions]);
     return {
@@ -12882,7 +12993,7 @@ function getOAuthProvider(provider) {
     return providerToAuthProvider[provider];
 }
 const useOAuth = (hookOptions = {}) => {
-    const { client, updateUser } = useOpenfort();
+    const { client, updateUser } = useOpenfortCore();
     const [status, setStatus] = useState({
         status: "idle",
     });
@@ -12909,7 +13020,7 @@ const useOAuth = (hookOptions = {}) => {
             });
         }
         catch (e) {
-            const error = new OpenfortKitError("Failed to login with OAuth", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+            const error = new OpenfortError("Failed to login with OAuth", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
             setStatus({
                 status: 'error',
                 error
@@ -12930,7 +13041,7 @@ const useOAuth = (hookOptions = {}) => {
             });
             const authToken = await client.getAccessToken();
             if (!authToken) {
-                throw new OpenfortKitError("No auth token found", OpenfortKitErrorType.AUTHENTICATION_ERROR);
+                throw new OpenfortError("No auth token found", OpenfortErrorType.AUTHENTICATION_ERROR);
             }
             await client.auth.initLinkOAuth({
                 authToken,
@@ -12949,7 +13060,7 @@ const useOAuth = (hookOptions = {}) => {
             });
         }
         catch (e) {
-            const error = new OpenfortKitError("Failed to link OAuth", OpenfortKitErrorType.AUTHENTICATION_ERROR, { error: e });
+            const error = new OpenfortError("Failed to link OAuth", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
             setStatus({
                 status: 'error',
                 error
@@ -12969,7 +13080,7 @@ const useOAuth = (hookOptions = {}) => {
 };
 
 function useSignOut(hookOptions = {}) {
-    const { client, updateUser, user } = useOpenfort();
+    const { client, updateUser, user } = useOpenfortCore();
     const [status, setStatus] = useState({
         status: "idle",
     });
@@ -12996,7 +13107,7 @@ function useSignOut(hookOptions = {}) {
         catch (error) {
             setStatus({
                 status: 'error',
-                error: new OpenfortKitError('Failed to sign out', OpenfortKitErrorType.AUTHENTICATION_ERROR, { error }),
+                error: new OpenfortError('Failed to sign out', OpenfortErrorType.AUTHENTICATION_ERROR, { error }),
             });
             throw error;
         }
@@ -13007,5 +13118,5 @@ function useSignOut(hookOptions = {}) {
     };
 }
 
-export { AuthProvider, Avatar, Chain as ChainIcon, OPENFORTKIT_VERSION, OpenfortKitButton, OpenfortKitContext, OpenfortKitError, OpenfortKitErrorType, OpenfortKitProvider, OpenfortKitStatus, embeddedWalletId, defaultConfig as getDefaultConfig, defaultConnectors as getDefaultConnectors, useAuthCallback, useChainIsSupported, useChains, useConnectWithSiwe, useEmailAuth, useGuestAuth, useOAuth, useOpenfort, useSignOut, useStatus, useUI, useUser, useWalletAuth, useWallets, wallets };
+export { AuthProvider, Avatar, Chain as ChainIcon, OPENFORTKIT_VERSION, OpenfortError, OpenfortErrorType, OpenfortKitButton, OpenfortKitContext, OpenfortKitStatus, OpenfortProvider, embeddedWalletId, defaultConfig as getDefaultConfig, defaultConnectors as getDefaultConnectors, useAuthCallback, useChainIsSupported, useChains, useConnectWithSiwe, useEmailAuth, useGuestAuth, useOAuth, useOpenfortCore as useOpenfort, useSignOut, useStatus, useUI, useUser, useWallet, useWalletAuth, useWallets, wallets };
 //# sourceMappingURL=index.es.js.map