@openfort/react 0.0.2 → 0.0.4

package/build/index.es.js

@@ -22,7 +22,7 @@ import { createSiweMessage } from 'viem/siwe';
 import { signMessage } from '@wagmi/core';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
 
-const OPENFORTKIT_VERSION = '0.0.2';
+const OPENFORT_VERSION = '0.0.4';
 
 var OpenfortErrorType;
 (function (OpenfortErrorType) {
@@ -94,7 +94,7 @@ const defaultConnectors = ({ app, walletConnectProjectId, coinbaseWalletPreferen
 // OLD_TODO: Move these to a provider rather than global variable
 let globalAppName;
 const getAppName = () => globalAppName;
-const defaultConfig = ({ appName = 'OpenfortKit', appIcon, appDescription, appUrl, walletConnectProjectId, coinbaseWalletPreference, chains = [mainnet, polygon, optimism, arbitrum], client, ...props }) => {
+const defaultConfig = ({ appName = 'Openfort', appIcon, appDescription, appUrl, walletConnectProjectId, coinbaseWalletPreference, chains = [mainnet, polygon, optimism, arbitrum], client, ...props }) => {
     var _a, _b;
     globalAppName = appName;
     // OLD_TODO: nice to have, automate transports based on chains, but for now just provide public if not provided
@@ -109,7 +109,7 @@ const defaultConfig = ({ appName = 'OpenfortKit', appIcon, appDescription, appUr
         walletConnectProjectId,
         coinbaseWalletPreference,
     });
-    // console.log("OPENFORTKIT CHAINS", chains, transports);
+    // console.log("OPENFORT CHAINS", chains, transports);
     const config = {
         ...props,
         chains,
@@ -788,7 +788,7 @@ const socialProviders = [
     AuthProvider.FACEBOOK,
 ];
 
-const OpenfortKitContext = createContext(null);
+const Openfortcontext = createContext(null);
 
 function useChainIsSupported(chainId) {
     const { chains } = useConfig();
@@ -868,10 +868,10 @@ function useThemeFont(theme) {
     useGoogleFont(font !== null && font !== void 0 ? font : '');
 }
 
-const useOpenfortKit = () => {
-    const context = React.useContext(OpenfortKitContext);
+const useOpenfort = () => {
+    const context = React.useContext(Openfortcontext);
     if (!context)
-        throw Error('OpenfortKit Hook must be inside a Provider.');
+        throw Error('Openfort Hook must be inside a Provider.');
     return context;
 };
 
@@ -880,7 +880,7 @@ const useOpenfortKit = () => {
  * additional functionality.
  */
 function useConnect({ ...props } = {}) {
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const { connect, connectAsync, connectors, ...rest } = useConnect$1({
         ...props,
         mutation: {
@@ -997,7 +997,7 @@ const CoreOpenfortProvider = ({ children, debugMode, onConnect, onDisconnect, ..
     const { address } = useAccount();
     const [user, setUser] = useState(null);
     const { disconnect } = useDisconnect();
-    const { walletConfig } = useOpenfortKit();
+    const { walletConfig } = useOpenfort();
     const automaticRecovery = walletConfig && walletConfig.recoveryMethod === RecoveryMethod.AUTOMATIC;
     // ---- Openfort instance ----
     const openfort = useMemo(() => {
@@ -1207,7 +1207,7 @@ const CoreOpenfortProvider = ({ children, debugMode, onConnect, onDisconnect, ..
  * When using rollup with styled-components to build into an ES module, styled components decides to move all of it’s DOM elements into "styled.default" rather than just within "styled"
  *
  * We're unsure as to why this issue occurs, if you have any ideas or a better solution please let us know by opening a discussion on our GitHub repo:
- * https://github.com/openfort-xyz/openfort-kit/discussions/new
+ * https://github.com/openfort-xyz/openfort-react/discussions/new
  *
  */
 var styled = typeof styled$1.div === 'function' ? styled$1 : styled$1['default'];
@@ -2343,7 +2343,7 @@ const ResetContainer = styled(motion.div) `
 
 const Portal = (props) => {
     props = {
-        selector: '__CONNECTKIT__',
+        selector: '__OPENFORT__',
         ...props,
     };
     const { selector, children } = props;
@@ -2355,7 +2355,7 @@ const Portal = (props) => {
         if (!ref.current) {
             const div = document.createElement('div');
             div.setAttribute('id', selector);
-            div.setAttribute('data-openfortkit', `${OPENFORTKIT_VERSION}`);
+            div.setAttribute('data-openfort-react', `${OPENFORT_VERSION}`);
             document.body.appendChild(div);
             ref.current = div;
         }
@@ -3026,7 +3026,7 @@ styled(motion.div) `
 const useIsomorphicLayoutEffect = typeof window !== 'undefined' ? useLayoutEffect : useEffect;
 function useLockBodyScroll(initialLocked) {
     const [locked, setLocked] = useState(initialLocked);
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     useIsomorphicLayoutEffect(() => {
         var _a;
         if (!locked)
@@ -4410,7 +4410,7 @@ export const keys = {
 
 function useLocales(replacements) {
     var _a, _b;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const language = (_b = (_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.language) !== null && _b !== void 0 ? _b : 'en-US';
     const translations = useMemo(() => {
         return getLocale(language);
@@ -4487,7 +4487,7 @@ const useWallet$1 = (id) => {
 };
 const useWallets$1 = () => {
     const connectors = useConnectors();
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const wallets = connectors.map((connector) => {
         var _a, _b;
         // use overrides
@@ -4772,7 +4772,7 @@ const contentVariants$2 = {
 };
 const Modal = ({ open, pages, pageId, positionInside, inline, demo, onClose, onBack, onInfo, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const themeContext = useThemeContext();
     const mobile = isMobile();
     const wallet = useWallet$1((_a = context.connector) === null || _a === void 0 ? void 0 : _a.id);
@@ -5681,7 +5681,7 @@ const About = () => {
     const locales = useLocales({
     //CONNECTORNAME: connector.name,
     });
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const ctaUrl = (_b = (_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.ethereumOnboardingUrl) !== null && _b !== void 0 ? _b : locales.aboutScreen_ctaUrl;
     const [ready, setReady] = useState(true);
     const [slider, setSlider] = useState(0);
@@ -6376,7 +6376,7 @@ const ConnectorsContainer = styled.div `
 function useWalletConnectUri({ enabled } = {
     enabled: true,
 }) {
-    const { log } = useOpenfortKit();
+    const { log } = useOpenfort();
     const [uri, setUri] = useState(undefined);
     const connector = useWalletConnectConnector();
     const { isConnected } = useAccount();
@@ -6790,7 +6790,7 @@ const useLastConnector = () => {
 
 const ConnectorList = () => {
     var _a;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const isMobile = useIsMobile();
     const wallets = useWallets$1();
     const { lastConnectorId } = useLastConnector();
@@ -6802,14 +6802,14 @@ const ConnectorList = () => {
             ...wallets.filter((wallet) => lastConnectorId === wallet.connector.id && wallet.id !== embeddedWalletId),
             ...wallets.filter((wallet) => lastConnectorId !== wallet.connector.id && wallet.id !== embeddedWalletId),
         ];
-    return (jsxs(ScrollArea, { mobileDirection: 'horizontal', children: [walletsToDisplay.length === 0 && (jsx(Alert, { error: true, children: "No connectors found in OpenfortKit config." })), walletsToDisplay.length > 0 && (jsx(ConnectorsContainer, { "$mobile": isMobile, "$totalResults": walletsToDisplay.length, children: walletsToDisplay.map((wallet) => jsx(ConnectorItem, { wallet: wallet, isRecent: wallet.id === lastConnectorId }, wallet.id)) }))] }));
+    return (jsxs(ScrollArea, { mobileDirection: 'horizontal', children: [walletsToDisplay.length === 0 && (jsx(Alert, { error: true, children: "No connectors found in Openfort config." })), walletsToDisplay.length > 0 && (jsx(ConnectorsContainer, { "$mobile": isMobile, "$totalResults": walletsToDisplay.length, children: walletsToDisplay.map((wallet) => jsx(ConnectorItem, { wallet: wallet, isRecent: wallet.id === lastConnectorId }, wallet.id)) }))] }));
 };
 const ConnectorItem = ({ wallet, isRecent, }) => {
     var _a, _b, _c, _d;
     const { connect: { getUri }, } = useWeb3();
     const uri = getUri();
     const isMobile = useIsMobile();
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const { connect } = useConnect();
     /*
     const [ready, setReady] = useState(false);
@@ -6851,7 +6851,7 @@ const ConnectorItem = ({ wallet, isRecent, }) => {
 
 const Wallets = () => {
     var _a, _b;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const locales = useLocales({});
     const isMobile = useIsMobile();
     return (jsxs(PageContent, { style: { width: 312 }, children: [jsx(ConnectorList, {}), isMobile ? (jsx(Fragment, { children: jsxs(InfoBox, { children: [jsxs(ModalContent, { style: { padding: 0, textAlign: 'left' }, children: [jsx(ModalH1, { "$small": true, children: locales.connectorsScreen_h1 }), jsx(ModalBody, { children: locales.connectorsScreen_p })] }), jsxs(InfoBoxButtons, { children: [!((_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.hideQuestionMarkCTA) && (jsx(Button, { variant: 'tertiary', onClick: () => context.setRoute(routes.ABOUT), children: locales.learnMore })), !((_b = context.uiConfig) === null || _b === void 0 ? void 0 : _b.hideNoWalletCTA) && (jsx(Button, { variant: 'tertiary', onClick: () => context.setRoute(routes.ONBOARDING), children: locales.getWallet }))] })] }) })) : (jsx(Fragment, {}))] }));
@@ -7084,7 +7084,7 @@ const TooltipTail = styled(motion.div) `
 
 const Tooltip = ({ children, message, open, xOffset = 0, yOffset = 0, delay, }) => {
     var _a;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const themeContext = useThemeContext();
     if ((_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.hideTooltips)
         return jsx(Fragment, { children: children });
@@ -7265,7 +7265,7 @@ CustomQRCode.displayName = 'CustomQRCode';
 
 const DownloadApp = () => {
     var _a, _b, _c;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const wallet = useWallet$1(context.connector.id);
     const locales = useLocales({
         CONNECTORNAME: wallet === null || wallet === void 0 ? void 0 : wallet.name,
@@ -7346,7 +7346,7 @@ const WalletList = styled.div `
 const Container$6 = styled.div ``;
 
 function useWalletConnectModal() {
-    const { log } = useOpenfortKit();
+    const { log } = useOpenfort();
     const { connectAsync, connectors } = useConnect();
     const [isOpen, setIsOpen] = useState(false);
     return {
@@ -7506,7 +7506,7 @@ const CopyToClipboard = ({ string, children, variant }) => {
 const MoreIcon = (jsx("svg", { width: "60", height: "60", viewBox: "0 0 60 60", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: jsx("path", { d: "M30 42V19M19 30.5H42", stroke: "var(--ck-body-color-muted)", strokeWidth: "3", strokeLinecap: "round" }) }));
 const MobileConnectors = () => {
     var _a, _b;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const locales = useLocales();
     const { connect: { getUri }, } = useWeb3();
     const wcUri = getUri();
@@ -7733,7 +7733,7 @@ var wave = (jsxs("svg", { "aria-hidden": "true", width: "298", height: "188", vi
 
 const Introduction = () => {
     var _a, _b;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const locales = useLocales({});
     const ctaUrl = (_b = (_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.walletOnboardingUrl) !== null && _b !== void 0 ? _b : locales.onboardingScreen_ctaUrl;
     return (jsxs(PageContent, { children: [jsxs(Graphic, { children: [jsxs(LogoGroup, { children: [jsx(Logo$2, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic, { children: jsx(Logos.Coinbase, { background: true }) }) }) }) }) }) }), jsx(Logo$2, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic, { children: jsx(Logos.MetaMask, { background: true }) }) }) }) }) }) }), jsx(Logo$2, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic, { children: jsx(Logos.Trust, {}) }) }) }) }) }) }), jsx(Logo$2, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic, { children: jsx(Logos.Argent, {}) }) }) }) }) }) }), jsx(Logo$2, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic, { children: jsx(Logos.ImToken, {}) }) }) }) }) }) })] }), jsx(GraphicBackground, { children: wave })] }), jsxs(ModalContent, { style: { paddingBottom: 18 }, children: [jsx(ModalH1, { "$small": true, children: locales.onboardingScreen_h1 }), jsx(ModalBody, { children: locales.onboardingScreen_p })] }), jsx(Button, { href: ctaUrl, arrow: true, children: locales.onboardingScreen_ctaText })] }));
@@ -7885,7 +7885,7 @@ function useEnsFallbackConfig() {
 const Avatar = ({ address, name, size = 96, radius = 96 }) => {
     var _a, _b, _c;
     const isMounted = useIsMounted();
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const imageRef = useRef(null);
     const [loaded, setLoaded] = useState(true);
     const ensFallbackConfig = useEnsFallbackConfig();
@@ -8708,7 +8708,7 @@ const ChainSelectList = ({ variant, }) => {
             switchChain({ chainId });
         }
     };
-    const { triggerResize } = useOpenfortKit();
+    const { triggerResize } = useOpenfort();
     return (jsxs(SwitchNetworksContainer, { style: { marginBottom: switchChain !== undefined ? -8 : 0 }, children: [jsx(ChainButtonContainer, { children: jsx(ChainButtons, { children: chains.map((x) => {
                         var _a;
                         const c = chainConfigs.find((ch) => ch.id === x.id);
@@ -8831,7 +8831,7 @@ const DropdownHeading = styled(motion.div) `
 
 const ChainSelectDropdown = ({ children, open, onClose, offsetX = 0, offsetY = 8 }) => {
     var _a, _b, _c, _d;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const themeContext = useThemeContext();
     const locales = useLocales();
     const [offset, setOffset] = useState({ x: 0, y: 0 });
@@ -9077,7 +9077,7 @@ const SwitchChainButton = styled(motion.button) `
 `;
 const ChevronDown = ({ ...props }) => (jsx("svg", { "aria-hidden": "true", width: "11", height: "6", viewBox: "0 0 11 6", fill: "none", xmlns: "http://www.w3.org/2000/svg", ...props, children: jsx("path", { d: "M1.5 1L5.5 5L9.5 1", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) }));
 const ChainSelector = () => {
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const [isOpen, setIsOpen] = useState(false);
     const { chain } = useAccount();
     const { chains } = useSwitchChain();
@@ -9102,7 +9102,7 @@ const ChainSelector = () => {
 
 const PoweredByFooter = ({ showDisclaimer }) => {
     var _a, _b;
-    const { uiConfig: options } = useOpenfortKit();
+    const { uiConfig: options } = useOpenfort();
     return (jsxs(Container$3, { children: [showDisclaimer && (jsx(Disclaimer, { children: (options === null || options === void 0 ? void 0 : options.disclaimer) ? (jsx(Fragment, { children: options.disclaimer })) : (jsxs("div", { children: ["By logging in, you agree to our ", jsx("a", { href: (_a = options === null || options === void 0 ? void 0 : options.termsOfServiceUrl) !== null && _a !== void 0 ? _a : "https://www.openfort.xyz/terms", target: "_blank", rel: "noopener noreferrer", children: "Terms of Service" }), " & ", jsx("a", { href: (_b = options === null || options === void 0 ? void 0 : options.privacyPolicyUrl) !== null && _b !== void 0 ? _b : "https://www.openfort.xyz/privacy", target: "_blank", rel: "noopener noreferrer", children: "Privacy Policy" }), "."] })) })), jsxs(TextButton, { onClick: () => {
                     window.open("https://www.openfort.xyz/", "_blank");
                 }, children: [jsx("span", { children: "Powered by" }), jsx(IconContainer$2, { children: jsx(Logos.Openfort, {}) }), jsx("span", { children: "Openfort" })] })] }));
@@ -9201,7 +9201,7 @@ var Wallet = ({ ...props }) => {
 
 function useProviders() {
     const { user } = useOpenfortCore();
-    const { uiConfig: options } = useOpenfortKit();
+    const { uiConfig: options } = useOpenfort();
     const allProviders = (options === null || options === void 0 ? void 0 : options.authProviders) || [];
     const providers = allProviders.filter(p => p !== AuthProvider.GUEST) || [];
     const linkedProviders = user ? providers.filter(p => { var _a; return (_a = user.linkedAccounts) === null || _a === void 0 ? void 0 : _a.find(a => a.provider === p); }) : [];
@@ -9310,7 +9310,7 @@ const LinkedProvider = ({ provider }) => {
     return (jsx(LinkedProviderButton, { disabled: true, children: jsx(ProviderIcon$1, { children: jsx(ProviderIcon, { provider: provider }) }) }));
 };
 const AddLinkedProviderButton = () => {
-    const { setRoute } = useOpenfortKit();
+    const { setRoute } = useOpenfort();
     const { availableProviders: unlinkedProviders } = useProviders();
     return (jsx(LinkedProviderButton, { disabled: unlinkedProviders.length === 0, onClick: () => setRoute(routes.PROVIDERS), children: "+" }));
 };
@@ -9324,7 +9324,7 @@ const LinkedProviders = () => {
 
 const Profile = ({ closeModal }) => {
     var _a, _b, _c, _d;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const themeContext = useThemeContext();
     const locales = useLocales();
     const { address, isConnected, connector, chain } = useAccount();
@@ -9749,11 +9749,10 @@ const createSIWEMessage = (address, nonce, chainId) => createSiweMessage({
 
 function useConnectWithSiwe() {
     const { client, user, updateUser } = useOpenfortCore();
-    const { log } = useOpenfortKit();
-    const { address } = useAccount();
+    const { log } = useOpenfort();
+    const { address, connector } = useAccount();
     const chainId = useChainId();
     const config = useConfig();
-    const { connector } = useAccount();
     const connectWithSiwe = useCallback(async ({ onError, onConnect, }) => {
         const connectorType = connector === null || connector === void 0 ? void 0 : connector.type;
         const walletClientType = connector === null || connector === void 0 ? void 0 : connector.id;
@@ -9843,7 +9842,7 @@ const contentVariants$1 = {
 const ConnectWithInjector = ({ switchConnectMethod, forceState }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const openfort = useOpenfortCore();
-    const { log, setOpen } = useOpenfortKit();
+    const { log, setOpen } = useOpenfort();
     const { isConnected } = useAccount();
     const { disconnect } = useDisconnect();
     const connectWithSiwe = useConnectWithSiwe();
@@ -9926,7 +9925,7 @@ const ConnectWithInjector = ({ switchConnectMethod, forceState }) => {
             },
         },
     });
-    const { triggerResize, connector: c } = useOpenfortKit();
+    const { triggerResize, connector: c } = useOpenfort();
     const id = c.id;
     const wallet = useWallet$1(id);
     const walletInfo = {
@@ -10054,7 +10053,7 @@ const ScanIconWithLogos = ({ logo }) => {
 
 const ConnectWithQRCode = ({ switchConnectMethod }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const id = context.connector.id;
     const wallet = useWallet$1(context.connector.id);
     const { open: openW3M, isOpen: isOpenW3M } = useWalletConnectModal();
@@ -10080,7 +10079,7 @@ const ConnectWithQRCode = ({ switchConnectMethod }) => {
     const hasApps = downloads && Object.keys(downloads).length !== 0;
     const connectWithSiwe = useConnectWithSiwe();
     const { isConnected } = useAccount();
-    const { log, setOpen } = useOpenfortKit();
+    const { log, setOpen } = useOpenfort();
     const { disconnect } = useDisconnect();
     const [isFirstFrame, setIsFirstFrame] = React.useState(true);
     useEffect(() => {
@@ -10175,8 +10174,8 @@ const ConnectingAnimation = styled(motion.div) `
   `}
 `;
 const Loader = ({ reason, isLoading = true, icon }) => {
-    const { uiConfig: options } = useOpenfortKit();
-    const { triggerResize } = useOpenfortKit();
+    const { uiConfig: options } = useOpenfort();
+    const { triggerResize } = useOpenfort();
     useEffect(() => {
         return () => triggerResize();
     }, []);
@@ -10205,7 +10204,7 @@ const states$1 = {
     CONNECTING: "connecting",
 };
 const ConnectWithOAuth = ({}) => {
-    const { connector, setRoute, log } = useOpenfortKit();
+    const { connector, setRoute, log } = useOpenfort();
     const { client, user } = useOpenfortCore();
     const [status, setStatus] = useState(states$1.INIT);
     useEffect(() => {
@@ -10302,7 +10301,7 @@ const states = {
     INJECTOR: 'injector',
 };
 const ConnectUsing = () => {
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     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);
@@ -10467,7 +10466,7 @@ const textVariants$2 = {
 const EmailLogin = () => {
     const [email, setEmail] = React.useState("");
     const [password, setPassword] = React.useState("");
-    const { setRoute, log } = useOpenfortKit();
+    const { setRoute, log } = useOpenfort();
     const { client } = useOpenfortCore();
     const [loginLoading, setLoginLoading] = React.useState(false);
     const [loginError, setLoginError] = React.useState(false);
@@ -10510,7 +10509,7 @@ const EmailSignup = () => {
     const [email, setEmail] = React.useState("");
     const [password, setPassword] = React.useState("");
     const [username, setUsername] = React.useState("");
-    const { setRoute, triggerResize, log, uiConfig: options } = useOpenfortKit();
+    const { setRoute, triggerResize, log, uiConfig: options } = useOpenfort();
     const { client } = useOpenfortCore();
     const [signupLoading, setSignupLoading] = React.useState(false);
     const [signupError, setSignupError] = React.useState(false);
@@ -10558,7 +10557,7 @@ const EmailSignup = () => {
 
 const EmailVerification = () => {
     const { client } = useOpenfortCore();
-    const { setRoute, log } = useOpenfortKit();
+    const { setRoute, log } = useOpenfort();
     const [loading, setLoading] = useState(true);
     const [shouldSendEmailVerification, setShouldSendEmailVerification] = useState(false);
     const emailInStorage = useMemo(() => localStorage.getItem(emailToVerifyLocalStorageKey), []);
@@ -10649,7 +10648,7 @@ const EmailVerification = () => {
 // TODO: Localize
 const RequestEmail = () => {
     const [email, setEmail] = React.useState("");
-    const { log, triggerResize } = useOpenfortKit();
+    const { log, triggerResize } = useOpenfort();
     const { client } = useOpenfortCore();
     const [loading, setLoading] = React.useState(false);
     const [message, setMessage] = React.useState("");
@@ -10706,7 +10705,7 @@ const ResetPassword = () => {
     const fixedUrl = window.location.href.replace("?state=", "&state="); // redirectUrl is not working with query params
     const url = new URL(fixedUrl);
     const [password, setPassword] = React.useState("");
-    const { setRoute, triggerResize, log } = useOpenfortKit();
+    const { setRoute, triggerResize, log } = useOpenfort();
     const { client, updateUser } = useOpenfortCore();
     const [loading, setLoading] = React.useState(false);
     const email = url.searchParams.get("email");
@@ -10781,7 +10780,7 @@ const textVariants$1 = {
 const LinkEmail = () => {
     const [email, setEmail] = React.useState("");
     const [password, setPassword] = React.useState("");
-    const { setRoute, triggerResize, log } = useOpenfortKit();
+    const { setRoute, triggerResize, log } = useOpenfort();
     const { client, updateUser } = useOpenfortCore();
     const [loginLoading, setLoginLoading] = React.useState(false);
     const [loginError, setLoginError] = React.useState(false);
@@ -10819,7 +10818,7 @@ const LinkEmail = () => {
 };
 
 const Loading = () => {
-    const { setRoute, walletConfig } = useOpenfortKit();
+    const { setRoute, walletConfig } = useOpenfort();
     const { isLoading, user, needsRecovery } = useOpenfortCore();
     const { address } = useAccount();
     const [isFirstFrame, setIsFirstFrame] = React.useState(true);
@@ -10865,7 +10864,7 @@ const ProviderButton = ({ children, icon, onClick }) => {
 };
 const GuestButton = () => {
     const { signUpGuest } = useOpenfortCore();
-    const { setRoute } = useOpenfortKit();
+    const { setRoute } = useOpenfort();
     const handleClick = () => {
         signUpGuest();
         setRoute(routes.RECOVER);
@@ -10873,16 +10872,16 @@ const GuestButton = () => {
     return (jsx(ProviderButton, { onClick: handleClick, icon: jsx(GuestIcon, {}), children: "Guest" }));
 };
 const WalletButton = () => {
-    const { setRoute } = useOpenfortKit();
+    const { setRoute } = useOpenfort();
     return jsx(ProviderButton, { onClick: () => setRoute(routes.CONNECTORS), icon: jsx(Logos.OtherWallets, {}), children: "Wallet" });
 };
 const EmailButton = () => {
-    const { setRoute } = useOpenfortKit();
+    const { setRoute } = 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 }) => {
-    const { setRoute, setConnector } = useOpenfortKit();
+    const { setRoute, setConnector } = useOpenfort();
     const handleClick = () => {
         setRoute(routes.CONNECT);
         setConnector({ id: provider, type: "oauth" });
@@ -10924,7 +10923,7 @@ const AddressButNoUserCase = () => {
     return (jsx(PageContent, { children: jsx(Loader, { reason: "Updating user" }) }));
 };
 const SocialProvidersButton = () => {
-    const { setRoute } = useOpenfortKit();
+    const { setRoute } = useOpenfort();
     return (jsx(ProviderButton, { onClick: () => setRoute(routes.SOCIAL_PROVIDERS), icon: jsx(OtherSocials, {}), children: "Other socials" }));
 };
 const Providers = () => {
@@ -10941,15 +10940,6 @@ const Providers = () => {
     return (jsxs(PageContent, { children: [(filteredProviders).map((auth) => (jsx(ProviderButtonSwitch, { provider: auth }, auth))), hasExcessProviders && jsx(SocialProvidersButton, {}), jsx(PoweredByFooter, { showDisclaimer: true })] }));
 };
 
-const mapStatus = (status) => {
-    return {
-        isLoading: status.status === 'loading',
-        isError: status.status === 'error',
-        isSuccess: status.status === 'success',
-        error: status.error
-    };
-};
-
 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);
@@ -10969,21 +10959,29 @@ const onError = ({ hookOptions, options, error, }) => {
     return { error };
 };
 
-const createOpenfortWallet = ({ address, isActive, }) => ({
+const createOpenfortWallet = ({ address, }) => ({
     connectorType: "embedded",
     walletClientType: "openfort",
     address,
     id: embeddedWalletId,
     isAvailable: true,
-    isActive,
 });
+const mapWalletStatus = (status) => {
+    return {
+        error: status.error,
+        isError: status.status === 'error',
+        isSuccess: status.status === 'success',
+        isCreating: status.status === 'creating',
+        isConnecting: status.status === 'connecting',
+    };
+};
 function useWallets(hookOptions = {}) {
     const { user, embeddedState, client } = useOpenfortCore();
-    const { walletConfig, log, setOpen, setRoute, setConnector, uiConfig } = useOpenfortKit();
+    const { walletConfig, log, setOpen, setRoute, setConnector, uiConfig } = useOpenfort();
     const { connector, isConnected, address } = useAccount();
     const chainId = useChainId();
     const deviceWallets = useWallets$1(); // TODO: Map wallets object to be the same as wallets
-    const { disconnect } = useDisconnect();
+    const { disconnect, disconnectAsync } = useDisconnect();
     const [status, setStatus] = useState({
         status: "idle",
     });
@@ -11019,8 +11017,6 @@ function useWallets(hookOptions = {}) {
             }
         }
     });
-    const usesEmbeddedWallet = user && walletConfig;
-    const isEmbedded = embeddedState === EmbeddedState.READY;
     const { data: embeddedWallets, refetch } = useQuery({
         queryKey: ['openfortEmbeddedWalletList'],
         queryFn: () => !!user ? client.embeddedWallet.list() : Promise.resolve([]),
@@ -11045,7 +11041,7 @@ function useWallets(hookOptions = {}) {
         const respJSON = await resp.json();
         return respJSON.session;
     }, [walletConfig]);
-    const wallets = useMemo(() => {
+    const rawWallets = useMemo(() => {
         const userWallets = user ? user.linkedAccounts
             .filter((a) => a.provider === AuthProvider.WALLET)
             .map((a) => {
@@ -11056,17 +11052,28 @@ function useWallets(hookOptions = {}) {
                 walletClientType: a.walletClientType,
                 id: (wallet === null || wallet === void 0 ? void 0 : wallet.id) || a.walletClientType || "unknown",
                 isAvailable: !!wallet,
-                isActive: (connector === null || connector === void 0 ? void 0 : connector.id) === a.walletClientType && address === a.address,
             };
         }) : [];
         embeddedWallets === null || embeddedWallets === void 0 ? void 0 : embeddedWallets.forEach((wallet) => {
+            // Remove duplicates (different chain ids)
+            if (userWallets.find(w => w.address === (wallet.address)))
+                return;
             userWallets.push(createOpenfortWallet({
                 address: wallet.address,
-                isActive: wallet.address === address,
             }));
         });
         return userWallets;
-    }, [user, address, connector === null || connector === void 0 ? void 0 : connector.id, embeddedWallets]);
+    }, [user === null || user === void 0 ? void 0 : user.linkedAccounts, embeddedWallets]);
+    const wallets = useMemo(() => {
+        if (!isConnected || !address)
+            return rawWallets;
+        console.log("Mapping wallets", { rawWallets, status, address, isConnected, connector });
+        return rawWallets.map((w) => ({
+            ...w,
+            isConnecting: status.status === 'connecting' && status.address === w.address,
+            isActive: w.address === address && isConnected && (connector === null || connector === void 0 ? void 0 : connector.id) === w.id,
+        }));
+    }, [rawWallets, status, address, isConnected, connector]);
     const activeWallet = isConnected && connector ? wallets.find((w) => w.isActive) : undefined;
     useEffect(() => {
         if (connectToConnector)
@@ -11087,7 +11094,7 @@ function useWallets(hookOptions = {}) {
             connector = wallet.connector;
         }
         else {
-            connector = connector;
+            connector = optionsObject.connector;
         }
         if (!connector) {
             log("Connector not found", deviceWallets, optionsObject.connector);
@@ -11097,22 +11104,7 @@ function useWallets(hookOptions = {}) {
             log(`Already connected to ${connector.id} with address ${address}, skipping connection`);
             return { wallet: activeWallet };
         }
-        const hasDisconnected = new Promise((resolve) => {
-            disconnect(undefined, {
-                onSuccess: () => {
-                    resolve();
-                },
-                onError: (error) => {
-                    console.error("Error disconnecting", error);
-                    // setStatus({
-                    //   status: 'error',
-                    //   error: new Error("Failed to disconnect: " + error),
-                    // });
-                    resolve();
-                },
-            });
-        });
-        await hasDisconnected;
+        await disconnectAsync();
         if (showUI) {
             const walletToConnect = wallets.find((w) => w.id == connector.id);
             if (!walletToConnect) {
@@ -11143,7 +11135,8 @@ function useWallets(hookOptions = {}) {
         log("Setting active wallet", { options: optionsObject, chainId });
         if (isOpenfortWallet(optionsObject)) {
             setStatus({
-                status: 'loading',
+                status: 'connecting',
+                address: optionsObject.address,
             });
             const { password } = optionsObject;
             if (!walletConfig) {
@@ -11153,12 +11146,13 @@ function useWallets(hookOptions = {}) {
                     hookOptions
                 });
             }
-            log(`Handling recovery with Openfort: password=${password}, chainId=${chainId}`);
+            log(`Handling recovery with Openfort: ${password ? "with password" : "without password"}, chainId=${chainId}`);
             try {
                 const accessToken = await client.getAccessToken();
                 if (!accessToken) {
                     throw new Error("Openfort access token not found");
                 }
+                log("Access token");
                 const shieldAuthentication = password ? {
                     auth: ShieldAuthType.OPENFORT,
                     token: accessToken,
@@ -11169,13 +11163,17 @@ function useWallets(hookOptions = {}) {
                         await walletConfig.getEncryptionSession() :
                         await getEncryptionSession(),
                 };
+                log("Shield authentication");
                 const recoveryParams = password ? {
                     recoveryMethod: RecoveryMethod.PASSWORD,
                     password,
                 } : {
                     recoveryMethod: RecoveryMethod.AUTOMATIC,
                 };
-                log("Recovery params", recoveryParams, optionsObject.address);
+                // Ensure that the embedded wallet is listed
+                const embeddedWallets = await client.embeddedWallet.list();
+                log("Recovery params", optionsObject.address);
+                log("Embedded wallets", embeddedWallets, chainId);
                 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) {
@@ -11192,18 +11190,19 @@ function useWallets(hookOptions = {}) {
                     });
                 }
                 else {
-                    if (!embeddedWallets || embeddedWallets.length === 0) {
-                        await createWallet({
-                            password,
-                        });
-                    }
-                    else {
+                    // Check if the embedded wallet is already created in the current chain
+                    if (embeddedWallets.some((w) => w.chainId === chainId)) {
                         await client.embeddedWallet.recover({
                             account: embeddedWallets[0].id,
                             shieldAuthentication,
                             recoveryParams,
                         });
                     }
+                    else {
+                        await createWallet({
+                            password,
+                        });
+                    }
                 }
                 setStatus({
                     status: 'success',
@@ -11212,7 +11211,6 @@ function useWallets(hookOptions = {}) {
                     data: {
                         wallet: createOpenfortWallet({
                             address: optionsObject.address,
-                            isActive: true,
                         }),
                     },
                     options: optionsObject,
@@ -11248,7 +11246,8 @@ function useWallets(hookOptions = {}) {
         }
         else {
             setStatus({
-                status: 'loading',
+                status: 'connecting',
+                address: optionsObject.address,
             });
             setConnectToConnector({
                 address: optionsObject.address,
@@ -11256,12 +11255,13 @@ function useWallets(hookOptions = {}) {
             });
         }
         return {};
-    }, [wallets, setOpen, setRoute, setConnector, disconnect, log, isConnected, address, usesEmbeddedWallet, isEmbedded]);
+    }, [wallets, setOpen, setRoute, setConnector, disconnectAsync, log, address, client, walletConfig, chainId, refetch, hookOptions]);
     const createWallet = useCallback(async ({ password, ...options } = {}) => {
         var _a;
         setStatus({
-            status: 'loading',
+            status: 'creating',
         });
+        log("Creating wallet", { password: !!password, options });
         const accessToken = await client.getAccessToken();
         if (!accessToken) {
             return onError({
@@ -11277,10 +11277,7 @@ function useWallets(hookOptions = {}) {
                 options,
             });
         }
-        const shieldAuthentication = password ? {
-            auth: ShieldAuthType.OPENFORT,
-            token: accessToken,
-        } : {
+        const shieldAuthentication = {
             auth: ShieldAuthType.OPENFORT,
             token: accessToken,
             encryptionSession: walletConfig.getEncryptionSession ?
@@ -11308,18 +11305,57 @@ function useWallets(hookOptions = {}) {
             data: {
                 wallet: createOpenfortWallet({
                     address: wallet.address,
-                    isActive: true,
                 })
             }
         });
     }, [refetch, client, uiConfig, chainId]);
+    const setRecovery = useCallback(async (params) => {
+        try {
+            setStatus({
+                status: 'loading',
+            });
+            // Set embedded wallet recovery method
+            if (params.recoveryMethod === 'password') {
+                await client.embeddedWallet.setEmbeddedRecovery({
+                    recoveryMethod: RecoveryMethod.PASSWORD,
+                    recoveryPassword: params.recoveryPassword
+                });
+            }
+            else {
+                await client.embeddedWallet.setEmbeddedRecovery({
+                    recoveryMethod: RecoveryMethod.AUTOMATIC
+                });
+            }
+            // Get the updated embedded account
+            const embeddedAccount = await client.embeddedWallet.get();
+            setStatus({ status: 'success' });
+            return onSuccess({
+                hookOptions,
+                options: params,
+                data: {
+                    wallet: createOpenfortWallet({
+                        address: embeddedAccount.address,
+                    }),
+                }
+            });
+        }
+        catch (error) {
+            const errorObj = error instanceof Error ? error : new Error('Failed to set wallet recovery');
+            return onError({
+                hookOptions,
+                options: params,
+                error: new OpenfortError('Failed to set wallet recovery', OpenfortErrorType.WALLET_ERROR, { error: errorObj }),
+            });
+        }
+    }, [client, setStatus, hookOptions]);
     return {
         wallets,
         availableWallets: deviceWallets,
         activeWallet,
-        setActiveWallet,
+        setRecovery,
         createWallet,
-        ...mapStatus(status),
+        setActiveWallet,
+        ...mapWalletStatus(status),
         exportPrivateKey: client.embeddedWallet.exportPrivateKey,
     };
 }
@@ -11328,7 +11364,7 @@ function useWallets(hookOptions = {}) {
 const Recover = () => {
     const [recoveryPhrase, setRecoveryPhrase] = React.useState("");
     const [recoveryError, setRecoveryError] = React.useState(false);
-    const { triggerResize, uiConfig: options, log } = useOpenfortKit();
+    const { triggerResize, uiConfig: options, log } = useOpenfort();
     useChainId();
     const [loading, setLoading] = React.useState(false);
     const { setActiveWallet } = useWallets();
@@ -11358,7 +11394,7 @@ const Recover = () => {
 const AutomaticRecovery = () => {
     const { needsRecovery } = useOpenfortCore();
     const { setActiveWallet } = useWallets();
-    const { log } = useOpenfortKit();
+    const { log } = useOpenfort();
     const [hasRecoveryMethod, setHasRecoveryMethod] = React.useState(false);
     useEffect(() => {
         (async () => {
@@ -11380,7 +11416,7 @@ const AutomaticRecovery = () => {
     return (jsx(PageContent, { children: jsx(Loader, { reason: "Setting up signer" }) }));
 };
 const Connected = () => {
-    const { setOpen } = useOpenfortKit();
+    const { setOpen } = useOpenfort();
     // hide on connect
     useEffect(() => {
         setTimeout(() => {
@@ -11391,7 +11427,7 @@ const Connected = () => {
 };
 const CreateEmbeddedSigner = () => {
     const { needsRecovery, user } = useOpenfortCore();
-    const { triggerResize, uiConfig, walletConfig, setRoute } = useOpenfortKit();
+    const { triggerResize, uiConfig, walletConfig, setRoute } = useOpenfort();
     const [loading, setLoading] = React.useState(true);
     const [embeddedSignerLoading, setEmbeddedSignerLoading] = React.useState(true);
     const { isConnected } = useAccount();
@@ -11443,7 +11479,7 @@ const SocialProviders = () => {
 const customThemeDefault = {};
 const ConnectModal = ({ mode = 'auto', theme = 'auto', customTheme = customThemeDefault, lang = 'en-US' }) => {
     var _a;
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const { logout, user } = useOpenfortCore();
     const { isConnected, chain } = useAccount();
     const chainIsSupported = useChainIsSupported(chain === null || chain === void 0 ? void 0 : chain.id);
@@ -11573,7 +11609,7 @@ const ConnectModal = ({ mode = 'auto', theme = 'auto', customTheme = customTheme
 };
 
 /**
- * OpenfortProvider component provides context and configuration for OpenfortKit.
+ * OpenfortProvider component provides context and configuration for Openfort.
  * It must be used within a WagmiProvider.
  *
  * @param {React.ReactNode} children - The child components to be wrapped by the provider.
@@ -11595,7 +11631,7 @@ const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMo
     }
     // Only allow for mounting OpenfortProvider once, so we avoid weird global
     // state collisions.
-    if (React.useContext(OpenfortKitContext)) {
+    if (React.useContext(Openfortcontext)) {
         throw new Error('Multiple, nested usages of OpenfortProvider detected. Please use only one.');
     }
     const chains = useChains();
@@ -11714,12 +11750,13 @@ const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMo
         triggerResize: () => onResize((prev) => prev + 1),
         walletConfig,
     };
-    return createElement(OpenfortKitContext.Provider, { value }, jsx(Fragment, { children: jsx(Web3ContextProvider, { enabled: open, children: jsxs(CoreOpenfortProvider, { baseConfiguration: {
+    return createElement(Openfortcontext.Provider, { value }, jsx(Fragment, { children: jsx(Web3ContextProvider, { enabled: open, children: jsxs(CoreOpenfortProvider, { baseConfiguration: {
                     publishableKey,
                 }, shieldConfiguration: walletConfig ? {
                     shieldPublishableKey: walletConfig.shieldPublishableKey,
                     shieldEncryptionKey: walletConfig.recoveryMethod === RecoveryMethod.PASSWORD ? walletConfig.shieldEncryptionKey : undefined,
-                } : undefined, overrides: opts.openfortUrlOverrides, debugMode: debugMode, onConnect: onConnect, onDisconnect: onDisconnect, children: [children, jsx(ConnectModal, { lang: ckLang, theme: ckTheme, mode: (_j = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.mode) !== null && _j !== void 0 ? _j : ckMode, customTheme: ckCustomTheme })] }) }) }));
+                    debug: debugMode,
+                } : undefined, overrides: opts.overrides, debugMode: debugMode, onConnect: onConnect, onDisconnect: onDisconnect, children: [children, jsx(ConnectModal, { lang: ckLang, theme: ckTheme, mode: (_j = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.mode) !== null && _j !== void 0 ? _j : ckMode, customTheme: ckCustomTheme })] }) }) }));
 };
 
 const Container$1 = styled(motion.div) `
@@ -11972,7 +12009,7 @@ const allRoutes = [
     ...safeRoutes.disconnected,
 ];
 function useUI() {
-    const { open, setOpen, setRoute, log } = useOpenfortKit();
+    const { open, setOpen, setRoute, log } = useOpenfort();
     const { isLoading, user, needsRecovery } = useOpenfortCore();
     const { isConnected } = useAccount();
     function defaultOpen() {
@@ -12097,7 +12134,7 @@ const textVariants = {
 };
 const ConnectButtonRenderer = ({ children, }) => {
     const isMounted = useIsMounted();
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const { open, close, isOpen } = useUI();
     const { address, isConnected, chain } = useAccount();
     const isChainSupported = useChainIsSupported(chain === null || chain === void 0 ? void 0 : chain.id);
@@ -12130,7 +12167,7 @@ const ConnectButtonRenderer = ({ children, }) => {
             ensName: ensName === null || ensName === void 0 ? void 0 : ensName.toString(),
         }) }));
 };
-ConnectButtonRenderer.displayName = 'OpenfortKitButton.Custom';
+ConnectButtonRenderer.displayName = 'OpenfortButton.Custom';
 const ConnectedLabel = ({ separator }) => {
     const { user, isLoading } = useOpenfortCore();
     const { address } = useAccount();
@@ -12142,7 +12179,7 @@ const ConnectedLabel = ({ separator }) => {
         return truncateUserId(user.id, separator);
     return "Loading...";
 };
-function OpenfortKitButtonInner({ label, showAvatar, separator, }) {
+function OpenfortButtonInner({ label, showAvatar, separator, }) {
     const locales = useLocales({});
     const { user } = useOpenfortCore();
     const { address, chain } = useAccount();
@@ -12167,7 +12204,7 @@ function OpenfortKitButtonInner({ label, showAvatar, separator, }) {
                 //padding: '0 5px',
             }, children: label ? label : defaultLabel }, "connectWalletText")) }));
 }
-function OpenfortKitButton({ 
+function OpenfortButton({ 
 // Options
 label, showBalance = false, showAvatar = true, 
 // Theming
@@ -12176,7 +12213,7 @@ theme, mode, customTheme,
 onClick, }) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const isMounted = useIsMounted();
-    const context = useOpenfortKit();
+    const context = useOpenfort();
     const { address, chain } = useAccount();
     const chainIsSupported = useChainIsSupported(chain === null || chain === void 0 ? void 0 : chain.id);
     const { open } = useUI();
@@ -12229,39 +12266,39 @@ onClick, }) {
                         }
                         : {
                             overflow: 'hidden',
-                        }, children: jsx(OpenfortKitButtonInner, { separator: separator, showAvatar: showAvatar, label: label }) })] }) }));
+                        }, children: jsx(OpenfortButtonInner, { separator: separator, showAvatar: showAvatar, label: label }) })] }) }));
 }
-OpenfortKitButton.Custom = ConnectButtonRenderer;
-
-var OpenfortKitStatus;
-(function (OpenfortKitStatus) {
-    OpenfortKitStatus[OpenfortKitStatus["DISCONNECTED"] = 0] = "DISCONNECTED";
-    OpenfortKitStatus[OpenfortKitStatus["NEEDS_RECOVERY"] = 1] = "NEEDS_RECOVERY";
-    OpenfortKitStatus[OpenfortKitStatus["LOADING"] = 2] = "LOADING";
-    OpenfortKitStatus[OpenfortKitStatus["CONNECTED"] = 3] = "CONNECTED";
-})(OpenfortKitStatus || (OpenfortKitStatus = {}));
+OpenfortButton.Custom = ConnectButtonRenderer;
+
+var OpenfortStatus;
+(function (OpenfortStatus) {
+    OpenfortStatus[OpenfortStatus["DISCONNECTED"] = 0] = "DISCONNECTED";
+    OpenfortStatus[OpenfortStatus["NEEDS_RECOVERY"] = 1] = "NEEDS_RECOVERY";
+    OpenfortStatus[OpenfortStatus["LOADING"] = 2] = "LOADING";
+    OpenfortStatus[OpenfortStatus["CONNECTED"] = 3] = "CONNECTED";
+})(OpenfortStatus || (OpenfortStatus = {}));
 function useStatus() {
     const { embeddedState } = useOpenfortCore();
     const { isConnected, isConnecting } = useAccount();
     const getStatus = () => {
         if (embeddedState === EmbeddedState.READY)
-            return OpenfortKitStatus.CONNECTED;
+            return OpenfortStatus.CONNECTED;
         if (embeddedState === EmbeddedState.NONE)
-            return OpenfortKitStatus.LOADING;
-        // if (needsRecovery) return OpenfortKitStatus.NEEDS_RECOVERY;
+            return OpenfortStatus.LOADING;
+        // if (needsRecovery) return OpenfortStatus.NEEDS_RECOVERY;
         if (embeddedState === EmbeddedState.EMBEDDED_SIGNER_NOT_CONFIGURED) {
             if (isConnected)
-                return OpenfortKitStatus.CONNECTED;
+                return OpenfortStatus.CONNECTED;
             else
-                return OpenfortKitStatus.NEEDS_RECOVERY;
+                return OpenfortStatus.NEEDS_RECOVERY;
         }
-        return OpenfortKitStatus.DISCONNECTED;
+        return OpenfortStatus.DISCONNECTED;
     };
     const status = getStatus();
     return {
-        isLoading: status === OpenfortKitStatus.LOADING,
-        isConnected: status === OpenfortKitStatus.CONNECTED,
-        isDisconnected: status === OpenfortKitStatus.DISCONNECTED,
+        isLoading: status === OpenfortStatus.LOADING,
+        isConnected: status === OpenfortStatus.CONNECTED,
+        isDisconnected: status === OpenfortStatus.DISCONNECTED,
         isConnecting: isConnecting || embeddedState === EmbeddedState.CREATING_ACCOUNT,
         isAuthenticated: embeddedState !== EmbeddedState.NONE && embeddedState !== EmbeddedState.UNAUTHENTICATED,
     };
@@ -12300,24 +12337,84 @@ const buildCallbackUrl = ({ email, callbackUrl, provider, }) => {
     return redirectUrl.toString();
 };
 
+const mapStatus = (status) => {
+    return {
+        isLoading: status.status === 'loading',
+        isError: status.status === 'error',
+        isSuccess: status.status === 'success',
+        error: status.error
+    };
+};
+
+function useSignOut(hookOptions = {}) {
+    const { client, updateUser, user } = useOpenfortCore();
+    const [status, setStatus] = useState({
+        status: "idle",
+    });
+    const { disconnect } = useDisconnect();
+    const signOut = useCallback(async (options = {}) => {
+        if (!user)
+            return;
+        setStatus({
+            status: 'loading',
+        });
+        try {
+            await client.auth.logout();
+            disconnect();
+            updateUser();
+            setStatus({
+                status: 'success',
+            });
+            return onSuccess({
+                hookOptions,
+                options,
+                data: {},
+            });
+        }
+        catch (e) {
+            const error = new OpenfortError('Failed to sign out', OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
+            setStatus({
+                status: 'error',
+                error,
+            });
+            return onError({
+                hookOptions,
+                options,
+                error,
+            });
+        }
+    }, [client, user, disconnect, updateUser, setStatus, hookOptions]);
+    return {
+        ...mapStatus(status),
+        signOut,
+    };
+}
+
 // this hook is used to create a wallet after the user has authenticated
 const useCreateWalletPostAuth = () => {
     const { setActiveWallet } = useWallets();
-    const { walletConfig } = useOpenfortKit();
-    const tryUseWallet = useCallback(async () => {
-        if (!walletConfig || walletConfig.recoveryMethod !== RecoveryMethod.AUTOMATIC)
+    const { walletConfig } = useOpenfort();
+    const { signOut } = useSignOut();
+    const tryUseWallet = useCallback(async ({ logoutOnError: signOutOnError = true, automaticRecovery = true }) => {
+        if (!walletConfig || walletConfig.recoveryMethod !== RecoveryMethod.AUTOMATIC || !automaticRecovery) {
             return {};
-        return await setActiveWallet({
+        }
+        const wallet = await setActiveWallet({
             connector: embeddedWalletId,
         });
-    }, [walletConfig]);
+        if (wallet.error && signOutOnError) {
+            // If there was an error and we should log out, we can call the logout function
+            await signOut();
+        }
+        return wallet;
+    }, [walletConfig, setActiveWallet, signOut]);
     return {
         tryUseWallet,
     };
 };
 
 const useEmailAuth = (hookOptions = {}) => {
-    const { log } = useOpenfortKit();
+    const { log } = useOpenfort();
     const { client, updateUser } = useOpenfortCore();
     const [requiresEmailVerification, setRequiresEmailVerification] = useState(false);
     const [status, setStatus] = useState({
@@ -12361,7 +12458,10 @@ const useEmailAuth = (hookOptions = {}) => {
                 });
             }
             else {
-                const { wallet } = await tryUseWallet();
+                const { wallet } = await tryUseWallet({
+                    logoutOnError: options.logoutOnError || hookOptions.logoutOnError,
+                    automaticRecovery: options.automaticRecovery || hookOptions.automaticRecovery,
+                });
                 setStatus({
                     status: 'success',
                 });
@@ -12491,7 +12591,10 @@ const useEmailAuth = (hookOptions = {}) => {
                 });
             }
             else {
-                const { wallet } = await tryUseWallet();
+                const { wallet } = await tryUseWallet({
+                    logoutOnError: options.logoutOnError || hookOptions.logoutOnError,
+                    automaticRecovery: options.automaticRecovery || hookOptions.automaticRecovery,
+                });
                 setStatus({
                     status: 'success',
                 });
@@ -12582,38 +12685,14 @@ const useEmailAuth = (hookOptions = {}) => {
             });
         }
     }, [client, setStatus, updateUser, log, hookOptions]);
-    return {
-        signInEmail,
-        signUpEmail,
-        linkEmail,
-        requestResetPassword,
-        resetPassword,
-        reset,
-        ...mapStatus(status),
-        requiresEmailVerification,
-        isAwaitingInput: status.status === 'awaiting-input',
-    };
-};
-
-const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically handle OAuth and email callback
-...hookOptions } = {}) => {
-    const { log } = useOpenfortKit();
-    const [status, setStatus] = useState({
-        status: "idle",
-    });
-    const { client, updateUser } = useOpenfortCore();
-    const [provider, setProvider] = useState(null);
-    const [email, setEmail] = useState(null);
-    const { tryUseWallet } = useCreateWalletPostAuth();
-    const verifyEmail = useCallback(async ({ email, state, ...options }) => {
+    const verifyEmail = useCallback(async (options) => {
         setStatus({
             status: 'loading',
         });
-        setEmail(email);
         try {
             await client.auth.verifyEmail({
-                email,
-                state,
+                email: options.email,
+                state: options.state,
             });
             setStatus({
                 status: 'success',
@@ -12621,7 +12700,9 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
             return onSuccess({
                 hookOptions,
                 options,
-                data: { email, type: "verifyEmail" },
+                data: {
+                    email: options.email,
+                },
             });
         }
         catch (e) {
@@ -12631,14 +12712,42 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
                 error,
             });
             log("Error verifying email", e);
-            onError({
+            return onError({
                 hookOptions,
                 options,
                 error,
             });
-            return { error, type: "verifyEmail" };
         }
     }, [client, log, hookOptions]);
+    return {
+        signInEmail,
+        signUpEmail,
+        verifyEmail,
+        linkEmail,
+        requestResetPassword,
+        resetPassword,
+        reset,
+        ...mapStatus(status),
+        requiresEmailVerification,
+        isAwaitingInput: status.status === 'awaiting-input',
+    };
+};
+
+({
+    // [OAuthProvider.APPLE]: AuthProvider.,
+    // [OAuthProvider.DISCORD]: AuthProvider.,
+    // [OAuthProvider.EPIC_GAMES]: AuthProvider.,
+    [AuthProvider.FACEBOOK]: OAuthProvider.FACEBOOK,
+    [AuthProvider.GOOGLE]: OAuthProvider.GOOGLE,
+    // [OAuthProvider.LINE]: AuthProvider.,
+    [AuthProvider.TWITTER]: OAuthProvider.TWITTER,
+});
+const useOAuth = (hookOptions = {}) => {
+    const { client, updateUser } = useOpenfortCore();
+    const [status, setStatus] = useState({
+        status: "idle",
+    });
+    const { tryUseWallet } = useCreateWalletPostAuth();
     const storeCredentials = useCallback(async ({ player, accessToken, refreshToken, ...options }) => {
         setStatus({
             status: 'loading',
@@ -12653,7 +12762,10 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
                 status: 'success',
             });
             const user = await updateUser() || undefined;
-            const { wallet } = await tryUseWallet();
+            const { wallet } = await tryUseWallet({
+                logoutOnError: options.logoutOnError || hookOptions.logoutOnError,
+                automaticRecovery: options.automaticRecovery || hookOptions.automaticRecovery,
+            });
             return onSuccess({
                 data: { user, wallet, type: "storeCredentials" },
                 hookOptions,
@@ -12666,17 +12778,105 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
                 status: 'error',
                 error,
             });
-            log("Error storing credentials", e);
-            onError({
+            return onError({
                 hookOptions,
                 options,
                 error,
             });
-            return { error, type: "storeCredentials" };
         }
-    }, [client, log, hookOptions]);
+    }, [client, hookOptions]);
+    const initOAuth = useCallback(async (options) => {
+        var _a;
+        const authProvider = options.provider;
+        try {
+            setStatus({
+                status: 'loading',
+            });
+            await client.auth.initOAuth({
+                provider: authProvider,
+                options: {
+                    redirectTo: buildCallbackUrl({
+                        provider: authProvider,
+                        callbackUrl: (_a = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.redirectTo) !== null && _a !== void 0 ? _a : options === null || options === void 0 ? void 0 : options.redirectTo,
+                    })
+                },
+            });
+            return onSuccess({
+                data: {},
+                hookOptions,
+                options,
+            });
+        }
+        catch (e) {
+            const error = new OpenfortError("Failed to login with OAuth", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
+            setStatus({
+                status: 'error',
+                error
+            });
+            return onError({
+                hookOptions,
+                options,
+                error,
+            });
+        }
+    }, [client, setStatus, updateUser, hookOptions]);
+    const linkOauth = useCallback(async (options) => {
+        var _a;
+        const authProvider = options.provider;
+        try {
+            setStatus({
+                status: 'loading',
+            });
+            const authToken = await client.getAccessToken();
+            if (!authToken) {
+                throw new OpenfortError("No auth token found", OpenfortErrorType.AUTHENTICATION_ERROR);
+            }
+            await client.auth.initLinkOAuth({
+                authToken,
+                provider: authProvider,
+                options: {
+                    redirectTo: buildCallbackUrl({
+                        provider: authProvider,
+                        callbackUrl: (_a = options === null || options === void 0 ? void 0 : options.redirectTo) !== null && _a !== void 0 ? _a : hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.redirectTo,
+                    })
+                },
+            });
+            return onSuccess({
+                data: {},
+                hookOptions,
+                options,
+            });
+        }
+        catch (e) {
+            const error = new OpenfortError("Failed to link OAuth", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
+            setStatus({
+                status: 'error',
+                error
+            });
+            return onError({
+                hookOptions,
+                options,
+                error,
+            });
+        }
+    }, [client, setStatus, updateUser, hookOptions]);
+    return {
+        initOAuth,
+        linkOauth,
+        storeCredentials,
+        ...mapStatus(status),
+    };
+};
+
+const useAuthCallback = ({ enabled = true, // Automatically handle OAuth and email callback
+...hookOptions } = {}) => {
+    const { log } = useOpenfort();
+    const [provider, setProvider] = useState(null);
+    const [email, setEmail] = useState(null);
+    const { verifyEmail, isSuccess: isEmailSuccess, isLoading: isEmailLoading, isError: isEmailError, error: emailError, } = useEmailAuth();
+    const { storeCredentials, isSuccess: isOAuthSuccess, isLoading: isOAuthLoading, isError: isOAuthError, error: oAuthError, } = useOAuth();
     useEffect(() => {
-        if (!automaticallyHandleCallback)
+        if (!enabled)
             return;
         (async () => {
             // redirectUrl is not working with query params OF-1013
@@ -12705,7 +12905,26 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
                     window.history.replaceState({}, document.title, url.toString());
                 };
                 log("EmailVerification", state, email);
-                await verifyEmail({ email, state });
+                const options = {
+                    onSuccess: (data) => {
+                        var _a;
+                        (_a = hookOptions.onSuccess) === null || _a === void 0 ? void 0 : _a.call(hookOptions, {
+                            ...data,
+                            type: "verifyEmail",
+                        });
+                    },
+                    onSettled: (data, error) => {
+                        var _a;
+                        (_a = hookOptions.onSettled) === null || _a === void 0 ? void 0 : _a.call(hookOptions, {
+                            ...data,
+                            type: "verifyEmail",
+                        }, error);
+                    },
+                    onError: hookOptions.onError,
+                    throwOnError: hookOptions.throwOnError,
+                };
+                await verifyEmail({ email, state, ...options });
+                setEmail(email);
                 removeParams();
             }
             else {
@@ -12736,7 +12955,25 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
                     window.history.replaceState({}, document.title, url.toString());
                 };
                 log("callback", { player, accessToken, refreshToken });
-                await storeCredentials({ player, accessToken, refreshToken });
+                const options = {
+                    onSuccess: (data) => {
+                        var _a;
+                        (_a = hookOptions.onSuccess) === null || _a === void 0 ? void 0 : _a.call(hookOptions, {
+                            ...data,
+                            type: "storeCredentials",
+                        });
+                    },
+                    onSettled: (data, error) => {
+                        var _a;
+                        (_a = hookOptions.onSettled) === null || _a === void 0 ? void 0 : _a.call(hookOptions, {
+                            ...data,
+                            type: "storeCredentials",
+                        }, error);
+                    },
+                    onError: hookOptions.onError,
+                    throwOnError: hookOptions.throwOnError,
+                };
+                await storeCredentials({ player, accessToken, refreshToken, ...options });
                 removeParams();
             }
         })();
@@ -12746,7 +12983,10 @@ const useAuthCallback = ({ automaticallyHandleCallback = true, // Automatically
         provider,
         verifyEmail,
         storeCredentials,
-        ...mapStatus(status),
+        isLoading: isEmailLoading || isOAuthLoading,
+        isError: isEmailError || isOAuthError,
+        isSuccess: isEmailSuccess || isOAuthSuccess,
+        error: emailError || oAuthError,
     };
 };
 
@@ -12764,16 +13004,18 @@ const useGuestAuth = (hookOptions = {}) => {
             const result = await client.auth.signUpGuest();
             const user = result.player;
             await updateUser(user);
-            const { wallet } = await tryUseWallet();
+            const { wallet } = await tryUseWallet({
+                logoutOnError: options.logoutOnError || hookOptions.logoutOnError,
+                automaticRecovery: options.automaticRecovery || hookOptions.automaticRecovery,
+            });
             setStatus({
                 status: 'success',
             });
-            onSuccess({
+            return onSuccess({
                 hookOptions,
                 options,
-                data: user,
+                data: { user, wallet },
             });
-            return { user, wallet };
         }
         catch (error) {
             const openfortError = new OpenfortError("Failed to signup guest", OpenfortErrorType.AUTHENTICATION_ERROR, { error });
@@ -12796,13 +13038,12 @@ const useGuestAuth = (hookOptions = {}) => {
 
 const useWalletAuth = (hookOptions = {}) => {
     const { updateUser } = useOpenfortCore();
-    const { log } = useOpenfortKit();
+    const { log } = useOpenfort();
     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",
     });
@@ -12977,146 +13218,5 @@ const useWalletAuth = (hookOptions = {}) => {
     };
 };
 
-const providerToAuthProvider = {
-    // [OAuthProvider.APPLE]: AuthProvider.,
-    // [OAuthProvider.DISCORD]: AuthProvider.,
-    // [OAuthProvider.EPIC_GAMES]: AuthProvider.,
-    [AuthProvider.FACEBOOK]: OAuthProvider.FACEBOOK,
-    [AuthProvider.GOOGLE]: OAuthProvider.GOOGLE,
-    // [OAuthProvider.LINE]: AuthProvider.,
-    [AuthProvider.TWITTER]: OAuthProvider.TWITTER,
-};
-function getOAuthProvider(provider) {
-    if (!providerToAuthProvider[provider]) {
-        throw new Error(`Unsupported OAuth provider: ${provider}`);
-    }
-    return providerToAuthProvider[provider];
-}
-const useOAuth = (hookOptions = {}) => {
-    const { client, updateUser } = useOpenfortCore();
-    const [status, setStatus] = useState({
-        status: "idle",
-    });
-    const initOAuth = useCallback(async (options) => {
-        var _a;
-        const authProvider = options.provider;
-        try {
-            setStatus({
-                status: 'loading',
-            });
-            await client.auth.initOAuth({
-                provider: getOAuthProvider(authProvider),
-                options: {
-                    redirectTo: buildCallbackUrl({
-                        provider: authProvider,
-                        callbackUrl: (_a = hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.redirectTo) !== null && _a !== void 0 ? _a : options === null || options === void 0 ? void 0 : options.redirectTo,
-                    })
-                },
-            });
-            return onSuccess({
-                data: {},
-                hookOptions,
-                options,
-            });
-        }
-        catch (e) {
-            const error = new OpenfortError("Failed to login with OAuth", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
-            setStatus({
-                status: 'error',
-                error
-            });
-            return onError({
-                hookOptions,
-                options,
-                error,
-            });
-        }
-    }, [client, setStatus, updateUser, hookOptions]);
-    const linkOauth = useCallback(async (options) => {
-        var _a;
-        const authProvider = options.provider;
-        try {
-            setStatus({
-                status: 'loading',
-            });
-            const authToken = await client.getAccessToken();
-            if (!authToken) {
-                throw new OpenfortError("No auth token found", OpenfortErrorType.AUTHENTICATION_ERROR);
-            }
-            await client.auth.initLinkOAuth({
-                authToken,
-                provider: getOAuthProvider(authProvider),
-                options: {
-                    redirectTo: buildCallbackUrl({
-                        provider: authProvider,
-                        callbackUrl: (_a = options === null || options === void 0 ? void 0 : options.redirectTo) !== null && _a !== void 0 ? _a : hookOptions === null || hookOptions === void 0 ? void 0 : hookOptions.redirectTo,
-                    })
-                },
-            });
-            return onSuccess({
-                data: {},
-                hookOptions,
-                options,
-            });
-        }
-        catch (e) {
-            const error = new OpenfortError("Failed to link OAuth", OpenfortErrorType.AUTHENTICATION_ERROR, { error: e });
-            setStatus({
-                status: 'error',
-                error
-            });
-            return onError({
-                hookOptions,
-                options,
-                error,
-            });
-        }
-    }, [client, setStatus, updateUser, hookOptions]);
-    return {
-        initOAuth,
-        linkOauth,
-        ...mapStatus(status),
-    };
-};
-
-function useSignOut(hookOptions = {}) {
-    const { client, updateUser, user } = useOpenfortCore();
-    const [status, setStatus] = useState({
-        status: "idle",
-    });
-    const { disconnect } = useDisconnect();
-    const signOut = useCallback(async (options = {}) => {
-        if (!user)
-            return;
-        setStatus({
-            status: 'loading',
-        });
-        try {
-            await client.auth.logout();
-            disconnect();
-            updateUser();
-            setStatus({
-                status: 'success',
-            });
-            return onSuccess({
-                hookOptions,
-                options,
-                data: {},
-            });
-        }
-        catch (error) {
-            setStatus({
-                status: 'error',
-                error: new OpenfortError('Failed to sign out', OpenfortErrorType.AUTHENTICATION_ERROR, { error }),
-            });
-            throw error;
-        }
-    }, [client, user, disconnect, updateUser, setStatus, hookOptions]);
-    return {
-        ...mapStatus(status),
-        signOut,
-    };
-}
-
-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 };
+export { AuthProvider, Avatar, Chain as ChainIcon, OPENFORT_VERSION, OpenfortButton, OpenfortError, OpenfortErrorType, OpenfortProvider, OpenfortStatus, Openfortcontext, 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