@openfort/react 0.0.31 → 0.0.33

package/build/index.es.js

@@ -3,14 +3,14 @@ export { AccountTypeEnum, OAuthProvider, OpenfortEvents, RecoveryMethod, ThirdPa
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import React, { useState, useEffect, createContext, useRef, useId, useMemo, useCallback, createElement, useLayoutEffect, useContext } from 'react';
 import { normalize } from 'viem/ens';
-import { useConfig, createConfig, http, useEnsAddress, useEnsName, useEnsAvatar, useAccount, useBlockNumber, useBalance, useConnectors as useConnectors$1, useConnect as useConnect$1, useDisconnect, useChainId, useSwitchChain, usePublicClient, WagmiContext } from 'wagmi';
-import { mainnet, polygon, optimism, arbitrum, sepolia } from 'wagmi/chains';
+import { useEnsAddress, useEnsName, useEnsAvatar, useConfig, useAccount, useBlockNumber, useBalance, useConnectors as useConnectors$1, useConnect as useConnect$1, useDisconnect, useChainId, http, useSwitchChain, usePublicClient, WagmiContext } from 'wagmi';
 import { motion, AnimatePresence, MotionConfig } from 'framer-motion';
 import styled$1, { css, keyframes } from 'styled-components';
 import { detect } from 'detect-browser';
 import { useQueryClient, useQuery } from '@tanstack/react-query';
 import useMeasure from 'react-use-measure';
 import { Buffer } from 'buffer';
+import { mainnet, polygon, optimism, arbitrum, sepolia } from 'wagmi/chains';
 import { safe, injected, coinbaseWallet, walletConnect } from '@wagmi/connectors';
 import { useTransition } from 'react-transition-state';
 import ResizeObserver from 'resize-observer-polyfill';
@@ -24,44 +24,17 @@ import { createSiweMessage } from 'viem/siwe';
 import { parseSignature } from 'viem';
 import { hashAuthorization } from 'viem/utils';
 
-/**
- * Hook for checking if a blockchain chain is supported.
- *
- * This hook verifies whether a specific blockchain chain ID is part of the
- * configured Wagmi chains. Use it to validate chain compatibility before
- * attempting operations or rendering chain-specific UI.
- *
- * @param chainId - The blockchain chain ID to check for support.
- * @returns `true` when the chain is configured, `false` otherwise.
- *
- * @example
- * ```tsx
- * const ChainStatus: React.FC<{ chainId?: number }> = ({ chainId }) => {
- *   const isSupported = useChainIsSupported(chainId);
- *
- *   return (
- *     <span>
- *       {chainId ?? 'Unknown chain'}: {isSupported ? 'Supported' : 'Unsupported'}
- *     </span>
- *   );
- * };
- * ```
- */
-function useChainIsSupported(chainId) {
-    const { chains } = useConfig();
-    if (chainId === undefined || chainId === null)
-        return false;
-    return chains.some((x) => x.id === chainId);
-}
-
-const ensFallbackConfig = createConfig({
-    chains: [mainnet],
-    transports: {
-        [mainnet.id]: http(),
-    },
-});
+// import { createConfig, http } from 'wagmi'
+// import { mainnet } from 'wagmi/chains'
+// import { useChainIsSupported } from './useChainIsSupported'
+// const ensFallbackConfig = createConfig({
+//   chains: [mainnet],
+//   transports: {
+//     [mainnet.id]: http(),
+//   },
+// })
 function useEnsFallbackConfig() {
-    return !useChainIsSupported(1) ? ensFallbackConfig : undefined;
+    return /* !useChainIsSupported(1) ? ensFallbackConfig :  */ undefined;
 }
 
 function useIsMounted() {
@@ -1284,7 +1257,7 @@ const ImageContainer$1 = styled(motion.img) `
 `;
 
 const Avatar = ({ address, name, size = 96, radius = 96 }) => {
-    var _a, _b, _c;
+    var _a;
     const isMounted = useIsMounted();
     const context = useOpenfort();
     const imageRef = useRef(null);
@@ -1318,13 +1291,13 @@ const Avatar = ({ address, name, size = 96, radius = 96 }) => {
     }, [ensAvatar]);
     if (!isMounted)
         return jsx("div", { style: { width: size, height: size, borderRadius: radius } });
-    if ((_b = context.uiConfig) === null || _b === void 0 ? void 0 : _b.customAvatar)
+    if (context.uiConfig.customAvatar)
         return (jsx("div", { style: {
                 width: size,
                 height: size,
                 borderRadius: radius,
                 overflow: 'hidden',
-            }, children: (_c = context.uiConfig) === null || _c === void 0 ? void 0 : _c.customAvatar({
+            }, children: context.uiConfig.customAvatar({
                 address: address !== null && address !== void 0 ? address : ens === null || ens === void 0 ? void 0 : ens.address,
                 ensName: name !== null && name !== void 0 ? name : ens === null || ens === void 0 ? void 0 : ens.name,
                 ensImage: ens === null || ens === void 0 ? void 0 : ens.avatar,
@@ -1788,6 +1761,36 @@ const chainConfigs = [
     },
 ];
 
+/**
+ * Hook for checking if a blockchain chain is supported.
+ *
+ * This hook verifies whether a specific blockchain chain ID is part of the
+ * configured Wagmi chains. Use it to validate chain compatibility before
+ * attempting operations or rendering chain-specific UI.
+ *
+ * @param chainId - The blockchain chain ID to check for support.
+ * @returns `true` when the chain is configured, `false` otherwise.
+ *
+ * @example
+ * ```tsx
+ * const ChainStatus: React.FC<{ chainId?: number }> = ({ chainId }) => {
+ *   const isSupported = useChainIsSupported(chainId);
+ *
+ *   return (
+ *     <span>
+ *       {chainId ?? 'Unknown chain'}: {isSupported ? 'Supported' : 'Unsupported'}
+ *     </span>
+ *   );
+ * };
+ * ```
+ */
+function useChainIsSupported(chainId) {
+    const { chains } = useConfig();
+    if (chainId === undefined || chainId === null)
+        return false;
+    return chains.some((x) => x.id === chainId);
+}
+
 const ChainContainer = styled.div `
   --bg: transparent;
   --color: #333;
@@ -1951,6 +1954,17 @@ const useWalletStatus = () => {
     return [context.walletStatus, context.setWalletStatus];
 };
 
+const PREFIX = '[Openfort-React]';
+const logger = {
+    enabled: true,
+    // biome-ignore lint/suspicious/noConsole: allowed for debugging
+    log: (...args) => (logger.enabled ? console.log(PREFIX, ...args) : null),
+    // biome-ignore lint/suspicious/noConsole: allowed for debugging
+    error: (...args) => (logger.enabled ? console.error(PREFIX, ...args) : null),
+    // biome-ignore lint/suspicious/noConsole: allowed for debugging
+    warn: (...args) => (logger.enabled ? console.warn(PREFIX, ...args) : null),
+};
+
 const safeRoutes = {
     disconnected: [
         routes.PROVIDERS,
@@ -2026,7 +2040,7 @@ const allRoutes = [...safeRoutes.connected, ...safeRoutes.disconnected];
  * ```
  */
 function useUI() {
-    const { open, setOpen, setRoute, log } = useOpenfort();
+    const { open, setOpen, setRoute } = useOpenfort();
     const { isLoading, user, needsRecovery } = useOpenfortCore();
     const { isConnected } = useAccount();
     function defaultOpen() {
@@ -2046,19 +2060,19 @@ function useUI() {
         let validRoute = route;
         if (!allRoutes.includes(route)) {
             validRoute = isConnected ? routes.PROFILE : routes.PROVIDERS;
-            log(`Route ${route} is not a valid route, navigating to ${validRoute} instead.`);
+            logger.log(`Route ${route} is not a valid route, navigating to ${validRoute} instead.`);
         }
         else {
             if (isConnected) {
                 if (!safeRoutes.connected.includes(route)) {
                     validRoute = routes.PROFILE;
-                    log(`Route ${route} is not a valid route when connected, navigating to ${validRoute} instead.`);
+                    logger.log(`Route ${route} is not a valid route when connected, navigating to ${validRoute} instead.`);
                 }
             }
             else {
                 if (!safeRoutes.disconnected.includes(route)) {
                     validRoute = routes.PROVIDERS;
-                    log(`Route ${route} is not a valid route when disconnected, navigating to ${validRoute} instead.`);
+                    logger.log(`Route ${route} is not a valid route when disconnected, navigating to ${validRoute} instead.`);
                 }
             }
         }
@@ -3524,21 +3538,10 @@ export const keys = {
 };
 */
 
-const PREFIX = '[Openfort-React]';
-const logger = {
-    enabled: true,
-    // biome-ignore lint/suspicious/noConsole: allowed for debugging
-    log: (...args) => (logger.enabled ? console.log(PREFIX, ...args) : null),
-    // biome-ignore lint/suspicious/noConsole: allowed for debugging
-    error: (...args) => (logger.enabled ? console.error(PREFIX, ...args) : null),
-    // biome-ignore lint/suspicious/noConsole: allowed for debugging
-    warn: (...args) => (logger.enabled ? console.warn(PREFIX, ...args) : null),
-};
-
 function useLocales(replacements) {
-    var _a, _b;
+    var _a;
     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 language = (_a = context.uiConfig.language) !== null && _a !== void 0 ? _a : 'en-US';
     const translations = useMemo(() => {
         return getLocale(language);
     }, [language]);
@@ -4133,20 +4136,18 @@ label, showBalance = false, showAvatar = true,
 theme, mode, customTheme, 
 // Events
 onClick, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a;
     const isMounted = useIsMounted();
     const context = useOpenfort();
     const { address, chain } = useAccount();
     const chainIsSupported = useChainIsSupported(chain === null || chain === void 0 ? void 0 : chain.id);
     const { open } = useUI();
-    const separator = ['web95', 'rounded', 'minimal'].includes((_b = theme !== null && theme !== void 0 ? theme : (_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.theme) !== null && _b !== void 0 ? _b : '')
-        ? '....'
-        : undefined;
+    const separator = ['web95', 'rounded', 'minimal'].includes((_a = theme !== null && theme !== void 0 ? theme : context.uiConfig.theme) !== null && _a !== void 0 ? _a : '') ? '....' : undefined;
     if (!isMounted)
         return null;
     const shouldShowBalance = showBalance && chainIsSupported;
     const willShowBalance = address && shouldShowBalance;
-    return (jsx(ResetContainer, { "$useTheme": theme !== null && theme !== void 0 ? theme : (_c = context.uiConfig) === null || _c === void 0 ? void 0 : _c.theme, "$useMode": mode !== null && mode !== void 0 ? mode : context.mode, "$customTheme": customTheme !== null && customTheme !== void 0 ? customTheme : (_d = context.uiConfig) === null || _d === void 0 ? void 0 : _d.customTheme, children: jsxs(ThemeContainer, { onClick: () => {
+    return (jsx(ResetContainer, { "$useTheme": theme !== null && theme !== void 0 ? theme : context.uiConfig.theme, "$useMode": mode !== null && mode !== void 0 ? mode : context.mode, "$customTheme": customTheme !== null && customTheme !== void 0 ? customTheme : context.uiConfig.customTheme, children: jsxs(ThemeContainer, { onClick: () => {
                 if (onClick) {
                     onClick(() => open());
                 }
@@ -4176,7 +4177,7 @@ onClick, }) {
                                 duration: 0.4,
                                 ease: [0.25, 1, 0.5, 1],
                             },
-                        }, children: jsx(ThemedButton, { variant: 'secondary', theme: theme !== null && theme !== void 0 ? theme : (_e = context.uiConfig) === null || _e === void 0 ? void 0 : _e.theme, mode: mode !== null && mode !== void 0 ? mode : context.mode, customTheme: customTheme !== null && customTheme !== void 0 ? customTheme : (_f = context.uiConfig) === null || _f === void 0 ? void 0 : _f.customTheme, style: { overflow: 'hidden' }, children: jsx(motion.div, { style: { paddingRight: 24 }, children: jsx(Balance$1, { hideSymbol: true }) }) }) }, 'balance')) })), jsx(ThemedButton, { theme: theme !== null && theme !== void 0 ? theme : (_g = context.uiConfig) === null || _g === void 0 ? void 0 : _g.theme, mode: mode !== null && mode !== void 0 ? mode : context.mode, customTheme: customTheme !== null && customTheme !== void 0 ? customTheme : (_h = context.uiConfig) === null || _h === void 0 ? void 0 : _h.customTheme, style: shouldShowBalance && showBalance && address && (theme === 'retro' || ((_j = context.uiConfig) === null || _j === void 0 ? void 0 : _j.theme) === 'retro')
+                        }, children: jsx(ThemedButton, { variant: 'secondary', theme: theme !== null && theme !== void 0 ? theme : context.uiConfig.theme, mode: mode !== null && mode !== void 0 ? mode : context.mode, customTheme: customTheme !== null && customTheme !== void 0 ? customTheme : context.uiConfig.customTheme, style: { overflow: 'hidden' }, children: jsx(motion.div, { style: { paddingRight: 24 }, children: jsx(Balance$1, { hideSymbol: true }) }) }) }, 'balance')) })), jsx(ThemedButton, { theme: theme !== null && theme !== void 0 ? theme : context.uiConfig.theme, mode: mode !== null && mode !== void 0 ? mode : context.mode, customTheme: customTheme !== null && customTheme !== void 0 ? customTheme : context.uiConfig.customTheme, style: shouldShowBalance && showBalance && address && (theme === 'retro' || context.uiConfig.theme === 'retro')
                         ? {
                             /* Special fix for the retro theme... not happy about this one */
                             boxShadow: 'var(--ck-connectbutton-balance-connectbutton-box-shadow)',
@@ -4272,36 +4273,35 @@ function useThemeFont(theme) {
  * ```
  */
 function useConnect({ ...props } = {}) {
-    const context = useOpenfort();
     const { connect, connectAsync, connectors, ...rest } = useConnect$1({
         ...props,
         mutation: {
             ...props.mutation,
-            onError(err) {
-                if (err.message) {
-                    if (err.message !== 'User rejected request') {
-                        context.log(err.message, err);
+            onError(...err) {
+                var _a, _b;
+                (_b = (_a = props.mutation) === null || _a === void 0 ? void 0 : _a.onError) === null || _b === void 0 ? void 0 : _b.call(_a, ...err);
+                if (err[0].message) {
+                    if (err[0].message !== 'User rejected request') {
+                        logger.log(err[0].message, err);
                     }
                 }
                 else {
-                    context.log(`Could not connect.`, err);
+                    logger.log(`Could not connect.`, err);
                 }
             },
         },
     });
     return {
         connect: ({ connector, chainId, mutation, }) => {
-            var _a;
             return connect({
                 connector,
-                chainId: chainId !== null && chainId !== void 0 ? chainId : (_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.initialChainId,
+                chainId,
             }, mutation);
         },
         connectAsync: async ({ connector, chainId, mutation, }) => {
-            var _a;
             return connectAsync({
                 connector,
-                chainId: chainId !== null && chainId !== void 0 ? chainId : (_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.initialChainId,
+                chainId,
             }, mutation);
         },
         connectors,
@@ -4717,7 +4717,7 @@ const defaultConfig = ({ appName = 'Openfort', appIcon, appDescription, appUrl,
         walletConnectProjectId,
         coinbaseWalletPreference,
     });
-    // console.log("OPENFORT CHAINS", chains, transports);
+    logger.log('OPENFORT CHAINS', { chains, transports, propsTransports: props === null || props === void 0 ? void 0 : props.transports });
     const config = {
         ...props,
         chains,
@@ -4816,7 +4816,6 @@ function useLockBodyScroll(initialLocked) {
     const [locked, setLocked] = useState(initialLocked);
     const context = useOpenfort();
     useIsomorphicLayoutEffect(() => {
-        var _a;
         if (!locked)
             return;
         const original = {
@@ -4839,17 +4838,16 @@ function useLockBodyScroll(initialLocked) {
         document.body.style.position = 'relative';
         document.body.style.touchAction = 'none';
         //document.documentElement.style.overflow = 'hidden'; // overflow:hidden; on <html> breaks position:sticky;
-        if ((_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.avoidLayoutShift) {
+        if (context.uiConfig.avoidLayoutShift) {
             document.body.style.paddingRight = `${scrollBarWidth}px`;
         }
         return () => {
-            var _a;
             document.documentElement.style.removeProperty('--ck-scrollbar-width');
             document.body.style.overflow = original.overflow;
             document.body.style.position = original.position;
             document.body.style.touchAction = original.touchAction;
             //document.documentElement.style.overflow = original.htmlOverflow;
-            if ((_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.avoidLayoutShift) {
+            if (context.uiConfig.avoidLayoutShift) {
                 document.body.style.paddingRight = original.paddingRight;
             }
         };
@@ -5254,12 +5252,11 @@ const useWallets$1 = () => {
         .filter((wallet, index, self) => self.findIndex((w) => w.id === wallet.id) === index)
         // Replace walletConnect's name with the one from options
         .map((wallet) => {
-        var _a, _b;
         if (wallet.id === 'walletConnect') {
             return {
                 ...wallet,
-                name: ((_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.walletConnectName) || wallet.name,
-                shortName: ((_b = context.uiConfig) === null || _b === void 0 ? void 0 : _b.walletConnectName) || wallet.shortName,
+                name: context.uiConfig.walletConnectName || wallet.name,
+                shortName: context.uiConfig.walletConnectName || wallet.shortName,
             };
         }
         return wallet;
@@ -5447,7 +5444,7 @@ const FitText = ({ children, maxFontSize = 100, minFontSize = 70, }) => {
 };
 FitText.displayName = 'FitText';
 
-const OPENFORT_VERSION = '0.0.31';
+const OPENFORT_VERSION = '0.0.33';
 
 const Portal = (props) => {
     props = {
@@ -6165,7 +6162,7 @@ const contentVariants$1 = {
     },
 };
 const Modal = ({ open, pages, pageId, positionInside, inline, demo, onClose, onBack, onInfo, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g;
     const context = useOpenfort();
     const themeContext = useThemeContext();
     const mobile = isMobile();
@@ -6305,7 +6302,7 @@ const Modal = ({ open, pages, pageId, positionInside, inline, demo, onClose, onB
     const Content = (jsx(ResetContainer, { "$useTheme": (_e = demo === null || demo === void 0 ? void 0 : demo.theme) !== null && _e !== void 0 ? _e : themeContext.theme, "$useMode": (_f = demo === null || demo === void 0 ? void 0 : demo.mode) !== null && _f !== void 0 ? _f : themeContext.mode, "$customTheme": (_g = demo === null || demo === void 0 ? void 0 : demo.customTheme) !== null && _g !== void 0 ? _g : themeContext.customTheme, children: jsxs(ModalContainer, { role: "dialog", style: {
                 pointerEvents: rendered ? 'auto' : 'none',
                 position: positionInside ? 'absolute' : undefined,
-            }, children: [!inline && jsx(BackgroundOverlay, { "$active": rendered, onClick: onClose, "$blur": (_h = context.uiConfig) === null || _h === void 0 ? void 0 : _h.overlayBlur }), jsxs(Container$6, { style: dimensionsCSS, initial: false, children: [jsx("div", { style: {
+            }, children: [!inline && jsx(BackgroundOverlay, { "$active": rendered, onClick: onClose, "$blur": context.uiConfig.overlayBlur }), jsxs(Container$6, { style: dimensionsCSS, initial: false, children: [jsx("div", { style: {
                                 pointerEvents: inTransition ? 'all' : 'none', // Block interaction while transitioning
                                 position: 'absolute',
                                 top: 0,
@@ -6315,7 +6312,7 @@ const Modal = ({ open, pages, pageId, positionInside, inline, demo, onClose, onB
                                 width: 'var(--width)',
                                 zIndex: 9,
                                 transition: 'width 200ms ease',
-                            } }), jsxs(BoxContainer, { className: `${rendered && 'active'}`, children: [jsx(AnimatePresence, { initial: false, children: context.errorMessage && (jsxs(ErrorMessage, { initial: { y: '10%', x: '-50%' }, animate: { y: '-100%' }, exit: { y: '100%' }, transition: { duration: 0.2, ease: 'easeInOut' }, children: [jsx("span", { children: context.errorMessage }), jsx("button", { type: "button", "aria-label": flattenChildren(locales.close).toString(), onClick: () => context.displayError(null), style: {
+                            } }), jsxs(BoxContainer, { className: `${rendered && 'active'}`, children: [jsx(AnimatePresence, { initial: false, children: context.errorMessage && (jsxs(ErrorMessage, { initial: { y: '10%', x: '-50%' }, animate: { y: '-100%' }, exit: { y: '100%' }, transition: { duration: 0.2, ease: 'easeInOut' }, children: [jsx("span", { children: context.errorMessage }), jsx("button", { type: "button", "aria-label": flattenChildren(locales.close).toString(), style: {
                                                     position: 'absolute',
                                                     right: 24,
                                                     top: 24,
@@ -6334,7 +6331,7 @@ const Modal = ({ open, pages, pageId, positionInside, inline, demo, onClose, onB
                                                         duration: mobile ? 0 : 0.1,
                                                         delay: mobile ? 0.01 : 0,
                                                     }, children: jsx(BackIcon, {}) }, "backButton")) : (onInfo &&
-                                                    !((_j = context.uiConfig) === null || _j === void 0 ? void 0 : _j.hideQuestionMarkCTA) && (jsx(InfoButton, { disabled: inTransition, "aria-label": flattenChildren(locales.moreInformation).toString(), onClick: onInfo, initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 }, transition: {
+                                                    !context.uiConfig.hideQuestionMarkCTA && (jsx(InfoButton, { disabled: inTransition, "aria-label": flattenChildren(locales.moreInformation).toString(), onClick: onInfo, initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 }, transition: {
                                                         duration: mobile ? 0 : 0.1,
                                                         delay: mobile ? 0.01 : 0,
                                                     }, children: jsx(InfoIcon, {}) }, "infoButton"))) }) })] }), jsx(ModalHeading, { children: jsx(AnimatePresence, { children: jsx(motion.div, { style: {
@@ -7066,12 +7063,12 @@ const Dot = styled.button `
 `;
 
 const About = () => {
-    var _a, _b;
+    var _a;
     const locales = useLocales({
     //CONNECTORNAME: connector.name,
     });
     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 ctaUrl = (_a = context.uiConfig.ethereumOnboardingUrl) !== null && _a !== void 0 ? _a : locales.aboutScreen_ctaUrl;
     const [_ready, setReady] = useState(true);
     const [slider, setSlider] = useState(0);
     const interacted = useRef(false);
@@ -7159,8 +7156,7 @@ const About = () => {
     ];
     // Adjust height of ModalBody to fit content based on language
     const slideHeight = (() => {
-        var _a;
-        switch ((_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.language) {
+        switch (context.uiConfig.language) {
             case 'en-US':
             case 'zh-CN':
                 return 64;
@@ -7206,7 +7202,6 @@ function useIsMobile() {
 }
 
 function useWalletConnectModal() {
-    const { log } = useOpenfort();
     const { connectAsync, connectors } = useConnect();
     const [isOpen, setIsOpen] = useState(false);
     return {
@@ -7230,7 +7225,7 @@ function useWalletConnectModal() {
                         await connectAsync({ connector: connector });
                     }
                     catch (err) {
-                        log('WalletConnect', err);
+                        logger.log('WalletConnect', err);
                         return {
                             error: 'Connection failed',
                         };
@@ -7241,14 +7236,14 @@ function useWalletConnectModal() {
                     return {};
                 }
                 catch (err) {
-                    log('Could not get WalletConnect provider', err);
+                    logger.log('Could not get WalletConnect provider', err);
                     return {
                         error: 'Could not get WalletConnect provider',
                     };
                 }
             }
             else {
-                log('Configuration error: Please provide a WalletConnect Project ID in your wagmi config.');
+                logger.log('Configuration error: Please provide a WalletConnect Project ID in your wagmi config.');
                 return {
                     error: 'Configuration error: Please provide a WalletConnect Project ID in your wagmi config.',
                 };
@@ -7281,7 +7276,6 @@ const useLastConnector = () => {
 function useWalletConnectUri({ enabled } = {
     enabled: true,
 }) {
-    const { log } = useOpenfort();
     const [uri, setUri] = useState(undefined);
     const connector = useWalletConnectConnector();
     const { isConnected } = useAccount();
@@ -7292,7 +7286,7 @@ function useWalletConnectUri({ enabled } = {
             return;
         async function handleMessage(message) {
             const { type, data } = message;
-            log('WC Message', type, data);
+            logger.log('WC Message', type, data);
             if (type === 'display_uri') {
                 setUri(data);
             }
@@ -7306,7 +7300,7 @@ function useWalletConnectUri({ enabled } = {
               */
         }
         async function handleDisconnect() {
-            log('WC Disconnect');
+            logger.log('WC Disconnect');
             if (connector)
                 connectWallet(connector);
         }
@@ -7323,22 +7317,22 @@ function useWalletConnectUri({ enabled } = {
                 await connectWallet(connector);
             }
             catch (error) {
-                log('catch error');
-                log(error);
+                logger.log('catch error');
+                logger.log(error);
                 if (error.code) {
                     switch (error.code) {
                         case 4001:
-                            log('error.code - User rejected');
+                            logger.log('error.code - User rejected');
                             connectWalletConnect(connector); // Regenerate QR code
                             break;
                         default:
-                            log('error.code - Unknown Error');
+                            logger.log('error.code - Unknown Error');
                             break;
                     }
                 }
                 else {
                     // Sometimes the error doesn't respond with a code
-                    log('WalletConnect cannot connect.', error);
+                    logger.log('WalletConnect cannot connect.', error);
                 }
             }
         }
@@ -7350,11 +7344,11 @@ function useWalletConnectUri({ enabled } = {
                 return;
             if (connector && !isConnected) {
                 connectWalletConnect(connector);
-                log('add wc listeners');
+                logger.log('add wc listeners');
                 connector.emitter.on('message', handleMessage);
                 connector.emitter.on('disconnect', handleDisconnect);
                 return () => {
-                    log('remove wc listeners');
+                    logger.log('remove wc listeners');
                     connector.emitter.off('message', handleMessage);
                     connector.emitter.off('disconnect', handleDisconnect);
                 };
@@ -7999,7 +7993,6 @@ const ConnectorsContainer = styled.div `
 `;
 
 const ConnectorList = () => {
-    var _a;
     const context = useOpenfort();
     const isMobile = useIsMobile();
     const wallets = useWallets$1();
@@ -8010,7 +8003,7 @@ const ConnectorList = () => {
     if (familyConnector && isFamily()) {
         filteredWallets = filteredWallets.filter((wallet) => wallet.id !== (familyConnector === null || familyConnector === void 0 ? void 0 : familyConnector.id));
     }
-    const walletsToDisplay = ((_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.hideRecentBadge) || lastConnectorId === 'walletConnect' // do not hoist walletconnect to top of list
+    const walletsToDisplay = context.uiConfig.hideRecentBadge || lastConnectorId === 'walletConnect' // do not hoist walletconnect to top of list
         ? wallets
         : [
             // move last used wallet to top of list
@@ -8046,8 +8039,8 @@ const ConnectorItem = ({ wallet, isRecent }) => {
     if (redirectToMoreWallets || shouldConnectImmediately)
         deeplink = undefined; // mobile redirects to more wallets page
     const content = () => {
-        var _a, _b, _c;
-        return (jsxs(Fragment, { children: [jsx(ConnectorIcon, { "data-small": wallet.iconShouldShrink, "data-shape": wallet.iconShape, "data-background": redirectToMoreWallets, children: (_a = wallet.iconConnector) !== null && _a !== void 0 ? _a : wallet.icon }), jsxs(ConnectorLabel, { children: [isMobile ? ((_b = wallet.shortName) !== null && _b !== void 0 ? _b : wallet.name) : wallet.name, !((_c = context.uiConfig) === null || _c === void 0 ? void 0 : _c.hideRecentBadge) && isRecent && (jsx(RecentlyUsedTag, { children: jsx("span", { children: "Recent" }) }))] })] }));
+        var _a, _b;
+        return (jsxs(Fragment, { children: [jsx(ConnectorIcon, { "data-small": wallet.iconShouldShrink, "data-shape": wallet.iconShape, "data-background": redirectToMoreWallets, children: (_a = wallet.iconConnector) !== null && _a !== void 0 ? _a : wallet.icon }), jsxs(ConnectorLabel, { children: [isMobile ? ((_b = wallet.shortName) !== null && _b !== void 0 ? _b : wallet.name) : wallet.name, !context.uiConfig.hideRecentBadge && isRecent && (jsx(RecentlyUsedTag, { children: jsx("span", { children: "Recent" }) }))] })] }));
     };
     return (jsx(ConnectorButton, { type: "button", disabled: context.route !== routes.CONNECTORS, onClick: () => {
             if (isMobile && deeplink) {
@@ -8341,7 +8334,6 @@ const TooltipTail = styled(motion.div) `
 `;
 
 const Tooltip = ({ children, message, open, xOffset = 0, yOffset = 0, delay }) => {
-    var _a;
     const context = useOpenfort();
     const themeContext = useThemeContext();
     const [isOpen, setIsOpen] = useState(false);
@@ -8386,7 +8378,7 @@ const Tooltip = ({ children, message, open, xOffset = 0, yOffset = 0, delay }) =
     useEffect(() => {
         setIsOpen(!!open);
     }, [open]);
-    if ((_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.hideTooltips)
+    if (context.uiConfig.hideTooltips)
         return jsx(Fragment, { children: children });
     return (jsxs(Fragment, { children: [jsx(motion.div, { ref: ref, style: open === undefined
                     ? {
@@ -8503,7 +8495,7 @@ const Loader = ({ header, description, icon, isError = false, isSuccess = false,
 const ConnectWithMobile$1 = () => {
     const { open: openWalletConnectModal } = useWalletConnectModal();
     const [error, setError] = useState(undefined);
-    const { connect, connectors } = useConnect$1();
+    const { connect, connectors } = useConnect();
     const { connector, address } = useAccount();
     const { setRoute, setConnector } = useOpenfort();
     const openWCModal = async () => {
@@ -9028,14 +9020,14 @@ const mapWalletStatus = (status) => {
 function useWallets(hookOptions = {}) {
     const { client, embeddedAccounts, isLoadingAccounts: isLoadingWallets } = useOpenfortCore();
     const { user } = useUser();
-    const { walletConfig, log, setOpen, setRoute, setConnector, uiConfig } = useOpenfort();
+    const { walletConfig, setOpen, setRoute, setConnector, uiConfig } = useOpenfort();
     const { connector, isConnected, address } = useAccount();
     const chainId = useChainId();
     const availableWallets = useWallets$1(); // TODO: Map wallets object to be the same as wallets
     const { disconnect, disconnectAsync } = useDisconnect();
     const [status, setStatus] = useWalletStatus();
     const [connectToConnector, setConnectToConnector] = useState(undefined);
-    const { connect } = useConnect$1({
+    const { connect } = useConnect({
         mutation: {
             onError: (e) => {
                 logger.error('Error connecting ---', e);
@@ -9051,7 +9043,7 @@ function useWallets(hookOptions = {}) {
             },
             onSuccess: (data) => {
                 setConnectToConnector(undefined);
-                log('Connected with wallet', data, connectToConnector);
+                logger.log('Connected with wallet', data, connectToConnector);
                 if ((connectToConnector === null || connectToConnector === void 0 ? void 0 : connectToConnector.address) &&
                     !data.accounts.some((a) => { var _a; return a.toLowerCase() === ((_a = connectToConnector.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()); })) {
                     setStatus({
@@ -9171,7 +9163,7 @@ function useWallets(hookOptions = {}) {
         return userWallets;
     }, [user === null || user === void 0 ? void 0 : user.linkedAccounts, embeddedAccounts]);
     const wallets = useMemo(() => {
-        // log("Mapping wallets", { rawWallets, status, address, isConnected, connector: connector?.id });
+        // logger.log("Mapping wallets", { rawWallets, status, address, isConnected, connector: connector?.id });
         return rawWallets.map((w) => {
             var _a;
             return ({
@@ -9194,35 +9186,35 @@ function useWallets(hookOptions = {}) {
         if (typeof optionsObject.walletId === 'string') {
             const wallet = availableWallets.find((c) => c.id === optionsObject.walletId);
             if (!wallet) {
-                log('Connector not found', connector);
+                logger.log('Connector not found', connector);
                 return { error: new OpenfortError('Connector not found', OpenfortErrorType.WALLET_ERROR) };
             }
-            log('Connecting to', wallet.connector);
+            logger.log('Connecting to', wallet.connector);
             connector = wallet.connector;
         }
         else {
             connector = optionsObject.walletId;
         }
         if (!connector) {
-            log('Connector not found', availableWallets, optionsObject.walletId);
+            logger.log('Connector not found', availableWallets, optionsObject.walletId);
             return { error: new OpenfortError('Connector not found', OpenfortErrorType.WALLET_ERROR) };
         }
         if ((activeWallet === null || activeWallet === void 0 ? void 0 : activeWallet.id) === connector.id && (address === null || address === void 0 ? void 0 : address.toLowerCase()) === ((_a = optionsObject.address) === null || _a === void 0 ? void 0 : _a.toLowerCase())) {
-            log(`Already connected to ${connector.id} with address ${address}, skipping connection`);
+            logger.log(`Already connected to ${connector.id} with address ${address}, skipping connection`);
             return { wallet: activeWallet };
         }
         await disconnectAsync();
         if (showUI) {
             const walletToConnect = wallets.find((w) => w.id === connector.id);
             if (!walletToConnect) {
-                log('Wallet not found', connector);
+                logger.log('Wallet not found', connector);
                 return onError({
                     error: new OpenfortError('Wallet not found', OpenfortErrorType.AUTHENTICATION_ERROR),
                     options: optionsObject,
                     hookOptions,
                 });
             }
-            log('Connecting to wallet', walletToConnect);
+            logger.log('Connecting to wallet', walletToConnect);
             if (connector.id === embeddedWalletId) {
                 setTimeout(() => {
                     setRoute(routes.RECOVER);
@@ -9239,7 +9231,7 @@ function useWallets(hookOptions = {}) {
         function isOpenfortWallet(opts) {
             return opts.walletId === embeddedWalletId;
         }
-        log('Setting active wallet', { options: optionsObject, chainId });
+        logger.log('Setting active wallet', { options: optionsObject, chainId });
         if (isOpenfortWallet(optionsObject)) {
             setStatus({
                 status: 'connecting',
@@ -9263,7 +9255,7 @@ function useWallets(hookOptions = {}) {
                 });
                 let walletAddress = optionsObject.address;
                 // Ensure that the embedded wallet is listed
-                log('Embedded wallets', embeddedAccounts, chainId);
+                logger.log('Embedded wallets', embeddedAccounts, chainId);
                 let embeddedAccount;
                 if (walletAddress) {
                     const addressToMatch = walletAddress.toLowerCase();
@@ -9283,11 +9275,11 @@ function useWallets(hookOptions = {}) {
                             hookOptions,
                         });
                     }
-                    log('Found embedded wallet to recover', accountToRecover);
+                    logger.log('Found embedded wallet to recover', accountToRecover);
                     if (((_b = optionsObject.recovery) === null || _b === void 0 ? void 0 : _b.recoveryMethod) &&
                         accountToRecover.recoveryMethod &&
                         optionsObject.recovery.recoveryMethod !== accountToRecover.recoveryMethod) {
-                        log('Recovery method does not match', optionsObject.recovery.recoveryMethod, accountToRecover.recoveryMethod);
+                        logger.log('Recovery method does not match', optionsObject.recovery.recoveryMethod, accountToRecover.recoveryMethod);
                         return onError({
                             error: new OpenfortError("The recovery method you entered is incorrect and does not match the wallet's recovery method", OpenfortErrorType.WALLET_ERROR),
                             options: optionsObject,
@@ -9329,7 +9321,7 @@ function useWallets(hookOptions = {}) {
                             });
                         }
                     }
-                    log('Found embedded wallet to recover (without walletAddress)', accountToRecover);
+                    logger.log('Found embedded wallet to recover (without walletAddress)', accountToRecover);
                     const recovery = {
                         recoveryMethod: (_e = accountToRecover.recoveryMethod) !== null && _e !== void 0 ? _e : RecoveryMethod.AUTOMATIC,
                         password: (_f = optionsObject.recovery) === null || _f === void 0 ? void 0 : _f.password,
@@ -9386,7 +9378,7 @@ function useWallets(hookOptions = {}) {
                         error.message = 'Wrong password, Please try again.';
                     }
                 }
-                log('Error handling recovery with Openfort:', error, err);
+                logger.log('Error handling recovery with Openfort:', error, err);
                 setStatus({
                     status: 'error',
                     error,
@@ -9409,26 +9401,13 @@ function useWallets(hookOptions = {}) {
             });
         }
         return {};
-    }, [
-        wallets,
-        setOpen,
-        setRoute,
-        setConnector,
-        disconnectAsync,
-        log,
-        address,
-        client,
-        walletConfig,
-        chainId,
-        hookOptions,
-    ]);
+    }, [wallets, setOpen, setRoute, setConnector, disconnectAsync, address, client, walletConfig, chainId, hookOptions]);
     const queryClient = useQueryClient();
     const createWallet = useCallback(async ({ recovery, ...options } = {}) => {
-        var _a;
         setStatus({
             status: 'creating',
         });
-        log('Creating wallet', { recovery: (recovery === null || recovery === void 0 ? void 0 : recovery.recoveryMethod) || RecoveryMethod.AUTOMATIC, options });
+        logger.log('Creating wallet', { recovery: (recovery === null || recovery === void 0 ? void 0 : recovery.recoveryMethod) || RecoveryMethod.AUTOMATIC, options });
         try {
             const accessToken = await client.getAccessToken();
             if (!accessToken) {
@@ -9447,7 +9426,7 @@ function useWallets(hookOptions = {}) {
             }
             const recoveryParams = await parseWalletRecovery(recovery);
             const embeddedAccount = await client.embeddedWallet.create({
-                chainId: (_a = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.initialChainId) !== null && _a !== void 0 ? _a : chainId,
+                chainId,
                 accountType: (options === null || options === void 0 ? void 0 : options.accountType) || (walletConfig === null || walletConfig === void 0 ? void 0 : walletConfig.accountType) || AccountTypeEnum.SMART_ACCOUNT,
                 chainType: ChainTypeEnum.EVM,
                 recoveryParams,
@@ -9463,12 +9442,10 @@ function useWallets(hookOptions = {}) {
                     wallet: parseEmbeddedAccount({
                         embeddedAccount,
                         connector: openfortConnector,
-                        simpleAccounts: [],
-                        // TODO: Update simple accounts after creating the wallet
-                        // simpleAccounts: getSimpleAccounts({
-                        //   address: embeddedAccount.address as Hex,
-                        //   embeddedAccounts,
-                        // }),
+                        simpleAccounts: getSimpleAccounts({
+                            embeddedAccounts: [embeddedAccount],
+                            address: embeddedAccount.address,
+                        }),
                         chainId,
                     }),
                 },
@@ -9505,12 +9482,10 @@ function useWallets(hookOptions = {}) {
                     wallet: parseEmbeddedAccount({
                         embeddedAccount,
                         connector: openfortConnector,
-                        simpleAccounts: [],
-                        // TODO: Update simple accounts after creating the wallet
-                        // simpleAccounts: getSimpleAccounts({
-                        //   address: embeddedAccount.address as Hex,
-                        //   embeddedAccounts,
-                        // }),
+                        simpleAccounts: getSimpleAccounts({
+                            address: embeddedAccount.address,
+                            embeddedAccounts: [embeddedAccount],
+                        }),
                         chainId,
                     }),
                 },
@@ -9778,7 +9753,6 @@ const isValidEmail = (email) => {
  * ```
  */
 const useEmailAuth = (hookOptions = {}) => {
-    const { log } = useOpenfort();
     const { client, updateUser } = useOpenfortCore();
     const { isOpen } = useUI();
     const [requiresEmailVerification, setRequiresEmailVerification] = useState(false);
@@ -10082,7 +10056,7 @@ const useEmailAuth = (hookOptions = {}) => {
             await client.validateAndRefreshToken();
             const authToken = await client.getAccessToken();
             if (!authToken) {
-                log('No token found');
+                logger.log('No token found');
                 const error = new OpenfortError('No token found', OpenfortErrorType.AUTHENTICATION_ERROR);
                 setStatus({
                     status: 'error',
@@ -10099,7 +10073,7 @@ const useEmailAuth = (hookOptions = {}) => {
                 password: options.password,
                 authToken,
             });
-            log('Email linked successfully');
+            logger.log('Email linked successfully');
             if ('action' in result) {
                 setStatus({
                     status: 'awaiting-input',
@@ -10141,7 +10115,7 @@ const useEmailAuth = (hookOptions = {}) => {
                 error: error,
             });
         }
-    }, [client, setStatus, updateUser, log, hookOptions, isOpen]);
+    }, [client, setStatus, updateUser, hookOptions, isOpen]);
     const verifyEmail = useCallback(async (options) => {
         setStatus({
             status: 'loading',
@@ -10180,14 +10154,14 @@ const useEmailAuth = (hookOptions = {}) => {
                 status: 'error',
                 error,
             });
-            log('Error verifying email', e);
+            logger.log('Error verifying email', e);
             return onError({
                 hookOptions,
                 options,
                 error,
             });
         }
-    }, [client, log, hookOptions]);
+    }, [client, hookOptions]);
     return {
         signInEmail,
         signUpEmail,
@@ -10303,7 +10277,7 @@ const textVariants$1 = {
 };
 const EmailLogin = () => {
     const [password, setPassword] = React.useState('');
-    const { setRoute, triggerResize, log, setEmailInput: setEmail, emailInput: email } = useOpenfort();
+    const { setRoute, triggerResize, setEmailInput: setEmail, emailInput: email } = useOpenfort();
     const [isRegister, setIsRegister] = React.useState(false);
     const { signUpEmail, signInEmail, error: loginError, isLoading: loginLoading, } = useEmailAuth({
         recoverWalletAutomatically: false,
@@ -10320,7 +10294,7 @@ const EmailLogin = () => {
             email,
             password,
         });
-        log('SIGN IN RESPONSE', { error, requiresEmailVerification });
+        logger.log('SIGN IN RESPONSE', { error, requiresEmailVerification });
         if (!error) {
             if (requiresEmailVerification) {
                 setRoute(routes.EMAIL_VERIFICATION);
@@ -10344,7 +10318,7 @@ const EmailLogin = () => {
             email,
             password,
         });
-        log('SIGN UP RESPONSE', { error, requiresEmailVerification });
+        logger.log('SIGN UP RESPONSE', { error, requiresEmailVerification });
         if (!error) {
             if (requiresEmailVerification) {
                 setRoute(routes.EMAIL_VERIFICATION);
@@ -10551,7 +10525,7 @@ const FloatingGraphic = ({ height = '130px', logoCenter, logoTopRight, logoTopLe
 
 const EmailVerification = () => {
     const { client } = useOpenfortCore();
-    const { setRoute, log, emailInput: emailInStorage } = useOpenfort();
+    const { setRoute, emailInput: emailInStorage } = useOpenfort();
     const [loading, setLoading] = useState(true);
     const [verificationResponse, setVerificationResponse] = useState(null);
     useEffect(() => {
@@ -10575,7 +10549,7 @@ const EmailVerification = () => {
             return;
         }
         const removeParams = () => {
-            ['state', 'openfortEmailVerificationUI', 'email'].forEach((key) => {
+            ['state', 'openfortEmailVerificationUI', 'email', 'openfortAuthProvider'].forEach((key) => {
                 url.searchParams.delete(key);
             });
             window.history.replaceState({}, document.title, url.toString());
@@ -10584,7 +10558,7 @@ const EmailVerification = () => {
             setRoute(routes.EMAIL_LOGIN);
             return;
         }
-        log('EmailVerification', state, email);
+        logger.log('EmailVerification', state, email);
         (async () => {
             try {
                 await client.auth.verifyEmail({
@@ -10600,7 +10574,7 @@ const EmailVerification = () => {
                     success: false,
                     error: 'There was an error verifying your email. Please try again.',
                 });
-                log('Error verifying email', e);
+                logger.log('Error verifying email', e);
             }
             finally {
                 removeParams();
@@ -10630,7 +10604,7 @@ const EmailVerification = () => {
 
 // TODO: Localize
 const RequestEmail = () => {
-    const { log, triggerResize, emailInput: email, setEmailInput: setEmail, setRoute } = useOpenfort();
+    const { triggerResize, emailInput: email, setEmailInput: setEmail, setRoute } = useOpenfort();
     const { client } = useOpenfortCore();
     const [loading, setLoading] = React.useState(false);
     const [message, setMessage] = React.useState('');
@@ -10671,7 +10645,7 @@ const RequestEmail = () => {
         })
             .catch((e) => {
             var _a;
-            log(e);
+            logger.log(e);
             const code = (_a = e === null || e === void 0 ? void 0 : e.response) === null || _a === void 0 ? void 0 : _a.status;
             switch (code) {
                 case 400:
@@ -10693,7 +10667,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 } = useOpenfort();
+    const { setRoute, triggerResize } = useOpenfort();
     const { client, updateUser } = useOpenfortCore();
     const [loading, setLoading] = React.useState(false);
     const email = url.searchParams.get('email');
@@ -10701,7 +10675,7 @@ const ResetPassword = () => {
         setLoading(true);
         const state = url.searchParams.get('state');
         if (!email || !state) {
-            log('No email or state found');
+            logger.log('No email or state found');
             setLoading(false);
             return;
         }
@@ -10725,7 +10699,7 @@ const ResetPassword = () => {
             setRoute(routes.RECOVER);
         }
         catch (e) {
-            log('Reset password error', e);
+            logger.log('Reset password error', e);
             setLoading(false);
             triggerResize();
         }
@@ -10767,7 +10741,7 @@ const textVariants = {
 };
 const LinkEmail = () => {
     const [password, setPassword] = React.useState('');
-    const { setRoute, triggerResize, log, emailInput: email, setEmailInput: setEmail } = useOpenfort();
+    const { setRoute, triggerResize, emailInput: email, setEmailInput: setEmail } = useOpenfort();
     const { client, updateUser } = useOpenfortCore();
     const [loginLoading, setLoginLoading] = React.useState(false);
     const [loginError, setLoginError] = React.useState(false);
@@ -10776,7 +10750,7 @@ const LinkEmail = () => {
         await client.validateAndRefreshToken();
         const authToken = await client.getAccessToken();
         if (!authToken) {
-            log('No token found');
+            logger.log('No token found');
             setLoginLoading(false);
             setLoginError('No token found.');
             triggerResize();
@@ -10789,7 +10763,7 @@ const LinkEmail = () => {
             authToken,
         })
             .catch((e) => {
-            log('Link error:', e);
+            logger.log('Link error:', e);
             setLoginLoading(false);
             setLoginError('Could not link email.');
             triggerResize();
@@ -11027,7 +11001,7 @@ const Container$3 = styled.div ``;
 
 const MoreIcon = (jsxs("svg", { width: "60", height: "60", viewBox: "0 0 60 60", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsx("title", { children: "More wallets icon" }), jsx("path", { d: "M30 42V19M19 30.5H42", stroke: "var(--ck-body-color-muted)", strokeWidth: "3", strokeLinecap: "round" })] }));
 const MobileConnectors = () => {
-    var _a, _b;
+    var _a;
     const context = useOpenfort();
     const locales = useLocales();
     const { connect: { getUri }, } = useWeb3();
@@ -11073,7 +11047,7 @@ const MobileConnectors = () => {
                                                     justifyContent: 'center',
                                                 }, children: jsx("div", { style: {
                                                         width: '50%',
-                                                    }, children: jsx(Spinner$3, {}) }) })) : (MoreIcon) }), jsx(WalletLabel, { children: locales.more })] })] }) }) }), ((_b = context.uiConfig) === null || _b === void 0 ? void 0 : _b.walletConnectCTA) !== 'modal' && (jsx("div", { style: {
+                                                    }, children: jsx(Spinner$3, {}) }) })) : (MoreIcon) }), jsx(WalletLabel, { children: locales.more })] })] }) }) }), context.uiConfig.walletConnectCTA !== 'modal' && (jsx("div", { style: {
                         display: 'flex',
                         alignItems: 'center',
                         justifyContent: 'center',
@@ -11083,10 +11057,10 @@ const MobileConnectors = () => {
 };
 
 const Introduction = () => {
-    var _a, _b;
+    var _a;
     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;
+    const ctaUrl = (_a = context.uiConfig.walletOnboardingUrl) !== null && _a !== void 0 ? _a : locales.onboardingScreen_ctaUrl;
     return (jsxs(PageContent, { children: [jsxs(Graphic, { children: [jsxs(LogoGroup, { children: [jsx(Logo$1, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic$1, { children: jsx(Logos.Coinbase, { background: true }) }) }) }) }) }) }), jsx(Logo$1, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic$1, { children: jsx(Logos.MetaMask, { background: true }) }) }) }) }) }) }), jsx(Logo$1, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic$1, { children: jsx(Logos.Trust, {}) }) }) }) }) }) }), jsx(Logo$1, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic$1, { children: jsx(Logos.Argent, {}) }) }) }) }) }) }), jsx(Logo$1, { children: jsx(LogoPosition, { children: jsx(LogoInner, { children: jsx(FloatWrapper, { children: jsx(RotateWrapper, { children: jsx(LogoGraphic$1, { 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 })] }));
 };
 
@@ -11444,7 +11418,7 @@ const DropdownHeading = styled(motion.div) `
 `;
 
 const ChainSelectDropdown = ({ children, open, onClose, offsetX = 0, offsetY = 8 }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const context = useOpenfort();
     const themeContext = useThemeContext();
     const locales = useLocales();
@@ -11558,7 +11532,7 @@ const ChainSelectDropdown = ({ children, open, onClose, offsetX = 0, offsetY = 8
             window.removeEventListener('resize', onResize);
         };
     }, []);
-    return (jsxs(Fragment, { children: [jsx("div", { ref: ref, children: children }), jsx(AnimatePresence, { children: open && (jsx(Portal, { children: jsx(ResetContainer, { "$useTheme": (_a = themeContext.theme) !== null && _a !== void 0 ? _a : (_b = context.uiConfig) === null || _b === void 0 ? void 0 : _b.theme, "$useMode": (_c = themeContext.mode) !== null && _c !== void 0 ? _c : context.mode, "$customTheme": (_d = themeContext.customTheme) !== null && _d !== void 0 ? _d : themeContext.customTheme, children: jsx(FocusTrap, { children: jsxs(DropdownWindow, { ref: contentRef, children: [jsx(DropdownOverlay, { onClick: onClose }), jsxs(DropdownContainer, { ref: innerRef, style: {
+    return (jsxs(Fragment, { children: [jsx("div", { ref: ref, children: children }), jsx(AnimatePresence, { children: open && (jsx(Portal, { children: jsx(ResetContainer, { "$useTheme": (_a = themeContext.theme) !== null && _a !== void 0 ? _a : context.uiConfig.theme, "$useMode": (_b = themeContext.mode) !== null && _b !== void 0 ? _b : context.mode, "$customTheme": (_c = themeContext.customTheme) !== null && _c !== void 0 ? _c : themeContext.customTheme, children: jsx(FocusTrap, { children: jsxs(DropdownWindow, { ref: contentRef, children: [jsx(DropdownOverlay, { onClick: onClose }), jsxs(DropdownContainer, { ref: innerRef, style: {
                                             left: offset.x,
                                             top: offset.y,
                                         }, initial: 'collapsed', animate: 'open', exit: 'collapsed', variants: {
@@ -12104,7 +12078,7 @@ const LinkedProviders = () => {
 };
 
 const Profile = ({ closeModal }) => {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const context = useOpenfort();
     const themeContext = useThemeContext();
     const locales = useLocales();
@@ -12135,10 +12109,10 @@ const Profile = ({ closeModal }) => {
             logout();
         };
     }, [shouldDisconnect, logout]);
-    const separator = ['web95', 'rounded', 'minimal'].includes((_c = (_a = themeContext.theme) !== null && _a !== void 0 ? _a : (_b = context.uiConfig) === null || _b === void 0 ? void 0 : _b.theme) !== null && _c !== void 0 ? _c : '')
+    const separator = ['web95', 'rounded', 'minimal'].includes((_b = (_a = themeContext.theme) !== null && _a !== void 0 ? _a : context.uiConfig.theme) !== null && _b !== void 0 ? _b : '')
         ? '....'
         : undefined;
-    return (jsxs(PageContent, { children: [jsxs(ModalContent, { style: { paddingBottom: 22, gap: 6 }, children: [address ? (jsxs(Fragment, { children: [jsx(AvatarContainer, { children: jsxs(AvatarInner, { children: [jsx(ChainSelectorContainer, { children: jsx(ChainSelector, {}) }), jsx(Avatar, { address: address })] }) }), jsx(ModalH1, { children: jsx(CopyToClipboard, { string: address, children: ensName !== null && ensName !== void 0 ? ensName : truncateEthAddress(address, separator) }) }), ((_d = context === null || context === void 0 ? void 0 : context.uiConfig) === null || _d === void 0 ? void 0 : _d.hideBalance) ? null : (jsx(ModalBody, { children: jsx(BalanceContainer, { children: jsxs(AnimatePresence, { exitBeforeEnter: true, initial: false, children: [balance && (jsxs(Balance, { initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 }, transition: { duration: 0.2 }, children: [nFormatter(Number(balance === null || balance === void 0 ? void 0 : balance.formatted)), ` `, balance === null || balance === void 0 ? void 0 : balance.symbol] }, `chain-${chain === null || chain === void 0 ? void 0 : chain.id}`)), !balance && (jsx(LoadingBalance, { initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 }, transition: { duration: 0.2 }, children: "\u00A0" }))] }) }) }))] })) : (jsx(Button, { onClick: () => context.setRoute(routes.CONNECTORS), icon: jsx(Unsupported, { initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 }, children: jsxs("svg", { width: "130", height: "120", viewBox: "0 0 13 12", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsx("title", { children: "Unsupported wallet icon" }), jsx("path", { d: "M2.61317 11.2501H9.46246C10.6009 11.2501 11.3256 10.3506 11.3256 9.3549C11.3256 9.05145 11.255 8.73244 11.0881 8.43303L7.65903 2.14708C7.659 2.14702 7.65897 2.14696 7.65893 2.1469C7.65889 2.14682 7.65884 2.14673 7.65879 2.14664C7.31045 1.50746 6.6741 1.17871 6.04 1.17871C5.41478 1.17871 4.763 1.50043 4.41518 2.14968L0.993416 8.43476C0.828865 8.72426 0.75 9.04297 0.75 9.3549C0.75 10.3506 1.47471 11.2501 2.61317 11.2501Z", fill: "currentColor", stroke: "var(--ck-body-background, #fff)", strokeWidth: "1.5" }), jsx("path", { d: "M6.03258 7.43916C5.77502 7.43916 5.63096 7.29153 5.62223 7.02311L5.55675 4.96973C5.54802 4.69684 5.74446 4.5 6.02821 4.5C6.3076 4.5 6.51277 4.70131 6.50404 4.9742L6.43856 7.01864C6.42546 7.29153 6.2814 7.43916 6.03258 7.43916ZM6.03258 9.11676C5.7401 9.11676 5.5 8.9065 5.5 8.60677C5.5 8.30704 5.7401 8.09678 6.03258 8.09678C6.32506 8.09678 6.56515 8.30256 6.56515 8.60677C6.56515 8.91097 6.32069 9.11676 6.03258 9.11676Z", fill: "white" })] }) }), children: "Connect wallet" })), jsx(LinkedProviders, {})] }), !isSafeConnector(connector === null || connector === void 0 ? void 0 : connector.id) && (jsx(Button, { onClick: () => setShouldDisconnect(true), icon: jsx(DisconnectIcon, {}), children: locales.disconnect })), jsx(PoweredByFooter, {})] }));
+    return (jsxs(PageContent, { children: [jsxs(ModalContent, { style: { paddingBottom: 22, gap: 6 }, children: [address ? (jsxs(Fragment, { children: [jsx(AvatarContainer, { children: jsxs(AvatarInner, { children: [jsx(ChainSelectorContainer, { children: jsx(ChainSelector, {}) }), jsx(Avatar, { address: address })] }) }), jsx(ModalH1, { children: jsx(CopyToClipboard, { string: address, children: ensName !== null && ensName !== void 0 ? ensName : truncateEthAddress(address, separator) }) }), (context === null || context === void 0 ? void 0 : context.uiConfig.hideBalance) ? null : (jsx(ModalBody, { children: jsx(BalanceContainer, { children: jsxs(AnimatePresence, { exitBeforeEnter: true, initial: false, children: [balance && (jsxs(Balance, { initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 }, transition: { duration: 0.2 }, children: [nFormatter(Number(balance === null || balance === void 0 ? void 0 : balance.formatted)), ` `, balance === null || balance === void 0 ? void 0 : balance.symbol] }, `chain-${chain === null || chain === void 0 ? void 0 : chain.id}`)), !balance && (jsx(LoadingBalance, { initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 }, transition: { duration: 0.2 }, children: "\u00A0" }))] }) }) }))] })) : (jsx(Button, { onClick: () => context.setRoute(routes.CONNECTORS), icon: jsx(Unsupported, { initial: { opacity: 0 }, animate: { opacity: 1 }, exit: { opacity: 0 }, children: jsxs("svg", { width: "130", height: "120", viewBox: "0 0 13 12", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [jsx("title", { children: "Unsupported wallet icon" }), jsx("path", { d: "M2.61317 11.2501H9.46246C10.6009 11.2501 11.3256 10.3506 11.3256 9.3549C11.3256 9.05145 11.255 8.73244 11.0881 8.43303L7.65903 2.14708C7.659 2.14702 7.65897 2.14696 7.65893 2.1469C7.65889 2.14682 7.65884 2.14673 7.65879 2.14664C7.31045 1.50746 6.6741 1.17871 6.04 1.17871C5.41478 1.17871 4.763 1.50043 4.41518 2.14968L0.993416 8.43476C0.828865 8.72426 0.75 9.04297 0.75 9.3549C0.75 10.3506 1.47471 11.2501 2.61317 11.2501Z", fill: "currentColor", stroke: "var(--ck-body-background, #fff)", strokeWidth: "1.5" }), jsx("path", { d: "M6.03258 7.43916C5.77502 7.43916 5.63096 7.29153 5.62223 7.02311L5.55675 4.96973C5.54802 4.69684 5.74446 4.5 6.02821 4.5C6.3076 4.5 6.51277 4.70131 6.50404 4.9742L6.43856 7.01864C6.42546 7.29153 6.2814 7.43916 6.03258 7.43916ZM6.03258 9.11676C5.7401 9.11676 5.5 8.9065 5.5 8.60677C5.5 8.30704 5.7401 8.09678 6.03258 8.09678C6.32506 8.09678 6.56515 8.30256 6.56515 8.60677C6.56515 8.91097 6.32069 9.11676 6.03258 9.11676Z", fill: "white" })] }) }), children: "Connect wallet" })), jsx(LinkedProviders, {})] }), !isSafeConnector(connector === null || connector === void 0 ? void 0 : connector.id) && (jsx(Button, { onClick: () => setShouldDisconnect(true), icon: jsx(DisconnectIcon, {}), children: locales.disconnect })), jsx(PoweredByFooter, {})] }));
 };
 
 const ProviderButton = ({ children, icon, onClick }) => {
@@ -12453,7 +12427,7 @@ const OtherMethodButton = styled.button `
 const RecoverPasswordWallet = ({ wallet }) => {
     const [recoveryPhrase, setRecoveryPhrase] = useState('');
     const [recoveryError, setRecoveryError] = useState(false);
-    const { triggerResize, log } = useOpenfort();
+    const { triggerResize } = useOpenfort();
     const [loading, setLoading] = useState(false);
     const { setActiveWallet } = useWallets();
     const handleSubmit = async () => {
@@ -12471,7 +12445,7 @@ const RecoverPasswordWallet = ({ wallet }) => {
             setRecoveryError(error.message || 'There was an error recovering your account');
         }
         else {
-            log('Recovery success');
+            logger.log('Recovery success');
         }
     };
     useEffect(() => {
@@ -12536,18 +12510,17 @@ const RecoverPasskeyWallet = ({ wallet }) => {
 const RecoverAutomaticWallet = ({ walletAddress }) => {
     const { embeddedState } = useOpenfortCore();
     const { setActiveWallet } = useWallets();
-    const { log } = useOpenfort();
     const [error, setError] = useState(false);
     useEffect(() => {
         (async () => {
             if (embeddedState === EmbeddedState.EMBEDDED_SIGNER_NOT_CONFIGURED) {
-                log('Automatically recovering wallet', walletAddress);
+                logger.log('Automatically recovering wallet', walletAddress);
                 const response = await setActiveWallet({
                     walletId: embeddedWalletId,
                 });
                 if (response.error) {
                     setError(response.error.message || 'There was an error recovering your account');
-                    log('Error recovering wallet', response.error);
+                    logger.log('Error recovering wallet', response.error);
                 }
             }
         })();
@@ -12561,15 +12534,14 @@ const CreateWalletAutomaticRecovery = () => {
     const { embeddedState } = useOpenfortCore();
     const { createWallet } = useWallets();
     const [shouldCreateWallet, setShouldCreateWallet] = useState(false);
-    const { log } = useOpenfort();
     useEffect(() => {
         // To ensure the wallet is created only once
         if (shouldCreateWallet) {
             (async () => {
-                log('Creating wallet Automatic recover');
+                logger.log('Creating wallet Automatic recover');
                 const response = await createWallet();
                 if (response.error) {
-                    log('Error creating wallet', response.error);
+                    logger.log('Error creating wallet', response.error);
                 }
             })();
         }
@@ -12616,20 +12588,19 @@ const CreateWalletPasskeyRecovery = ({ onChangeMethod, }) => {
     const { triggerResize } = useOpenfort();
     const { createWallet, error: recoveryError } = useWallets();
     const [shouldCreateWallet, setShouldCreateWallet] = useState(false);
-    const { log } = useOpenfort();
     const { embeddedState } = useOpenfortCore();
     useEffect(() => {
         // To ensure the wallet is created only once
         if (shouldCreateWallet) {
             (async () => {
-                log('Creating wallet passkey recovery');
+                logger.log('Creating wallet passkey recovery');
                 const response = await createWallet({
                     recovery: {
                         recoveryMethod: RecoveryMethod.PASSKEY,
                     },
                 });
                 if (response.error) {
-                    log('Error creating wallet', response.error);
+                    logger.log('Error creating wallet', response.error);
                     setShouldCreateWallet(false);
                 }
             })();
@@ -12649,7 +12620,7 @@ const CreateWalletPasskeyRecovery = ({ onChangeMethod, }) => {
 const CreateWalletPasswordRecovery = ({ onChangeMethod, }) => {
     const [recoveryPhrase, setRecoveryPhrase] = useState('');
     const [recoveryError, setRecoveryError] = useState(false);
-    const { triggerResize, log } = useOpenfort();
+    const { triggerResize } = useOpenfort();
     const [showPasswordIsTooWeakError, setShowPasswordIsTooWeakError] = useState(false);
     const [loading, setLoading] = useState(false);
     const { createWallet } = useWallets();
@@ -12670,7 +12641,7 @@ const CreateWalletPasswordRecovery = ({ onChangeMethod, }) => {
             setRecoveryError(error.message || 'There was an error recovering your account');
         }
         else {
-            log('Recovery success');
+            logger.log('Recovery success');
         }
     };
     useEffect(() => {
@@ -12740,6 +12711,10 @@ const SelectWalletButton = ({ wallet, onSelect }) => {
 };
 const SelectWalletToRecover = ({ wallets }) => {
     const [selectedWallet, setSelectedWallet] = useState(null);
+    const { triggerResize } = useOpenfort();
+    useEffect(() => {
+        triggerResize();
+    }, [selectedWallet]);
     if (selectedWallet) {
         return jsx(RecoverWallet, { wallet: selectedWallet });
     }
@@ -12778,7 +12753,7 @@ const Connected = () => {
 };
 const RecoverPage = () => {
     const { user } = useOpenfortCore();
-    const { triggerResize } = useOpenfort();
+    const { triggerResize, uiConfig, walletConfig, setRoute } = useOpenfort();
     const { wallets, isLoadingWallets } = useWallets();
     // const [loading, setLoading] = useState(true);
     const [embeddedSignerLoading, setEmbeddedSignerLoading] = useState(true);
@@ -12798,21 +12773,21 @@ const RecoverPage = () => {
     const openfortWallets = useMemo(() => {
         return wallets.filter((wallet) => wallet.id === embeddedWalletId);
     }, [wallets]);
-    // useEffect(() => {
-    //   if (!user) return;
-    //   if (uiConfig?.linkWalletOnSignUp || !walletConfig) {
-    //     if (!user.linkedAccounts.find((account) => account.provider === "wallet")) {
-    //       setRoute(routes.CONNECTORS);
-    //       return;
-    //     }
-    //     if (!walletConfig) {
-    //       // Logged in without a wallet
-    //       setRoute(routes.PROFILE);
-    //       return;
-    //     }
-    //   }
-    //   setLoading(false);
-    // }, [user])
+    useEffect(() => {
+        if (!user)
+            return;
+        if (uiConfig.linkWalletOnSignUp || !walletConfig) {
+            if (!user.linkedAccounts.find((account) => account.provider === 'wallet')) {
+                setRoute(routes.CONNECTORS);
+                return;
+            }
+            if (!walletConfig) {
+                // Logged in without a wallet
+                setRoute(routes.PROFILE);
+                return;
+            }
+        }
+    }, [user]);
     if (embeddedSignerLoading) {
         return (jsx(PageContent, { children: jsx(Loader, { header: "Setting up wallet" }) }));
     }
@@ -12878,7 +12853,6 @@ const createSIWEMessage = (address, nonce, chainId) => createSiweMessage({
 // If there is a user already, it will link the wallet to the user
 function useConnectWithSiwe() {
     const { client, user, updateUser } = useOpenfortCore();
-    const { log } = useOpenfort();
     const { address, connector, chainId: accountChainId } = useAccount();
     const chainId = useChainId();
     const config = useConfig();
@@ -12888,7 +12862,7 @@ function useConnectWithSiwe() {
         const connectorType = propsConnectorType !== null && propsConnectorType !== void 0 ? propsConnectorType : connector === null || connector === void 0 ? void 0 : connector.type;
         const walletClientType = propsWalletClientType !== null && propsWalletClientType !== void 0 ? propsWalletClientType : connector === null || connector === void 0 ? void 0 : connector.id;
         if (!address || !connectorType || !walletClientType) {
-            log('No address found', { address, connectorType, walletClientType });
+            logger.log('No address found', { address, connectorType, walletClientType });
             onError === null || onError === void 0 ? void 0 : onError('No address found');
             return;
         }
@@ -12906,7 +12880,7 @@ function useConnectWithSiwe() {
                 const authToken = await client.getAccessToken();
                 if (!authToken)
                     throw new Error('No access token found');
-                log('Linking wallet', { signature, message: SIWEMessage, connectorType, walletClientType, authToken });
+                logger.log('Linking wallet', { signature, message: SIWEMessage, connectorType, walletClientType, authToken });
                 await client.auth.linkWallet({
                     signature,
                     message: SIWEMessage,
@@ -12925,7 +12899,7 @@ function useConnectWithSiwe() {
             onConnect === null || onConnect === void 0 ? void 0 : onConnect();
         }
         catch (err) {
-            log('Failed to connect with SIWE', err);
+            logger.log('Failed to connect with SIWE', err);
             if (!onError)
                 return;
             let message = err instanceof Error ? err.message : err instanceof AxiosError ? err.message : String(err);
@@ -12943,7 +12917,7 @@ function useConnectWithSiwe() {
             }
             onError(message, err instanceof AxiosError ? err.request.status : undefined);
         }
-    }, [client, user, updateUser, log, address, chainId, config, connector, accountChainId, publicClient]);
+    }, [client, user, updateUser, address, chainId, config, connector, accountChainId, publicClient]);
     return connectWithSiwe;
 }
 
@@ -13154,7 +13128,7 @@ const contentVariants = {
 const ConnectWithInjector = ({ switchConnectMethod, forceState }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const openfort = useOpenfortCore();
-    const { log, setOpen } = useOpenfort();
+    const { setOpen } = useOpenfort();
     const { isConnected } = useAccount();
     const { disconnect } = useDisconnect();
     const connectWithSiwe = useConnectWithSiwe();
@@ -13173,7 +13147,7 @@ const ConnectWithInjector = ({ switchConnectMethod, forceState }) => {
             },
             onSettled(data, error) {
                 var _a;
-                log(`onSettled - data: ${data}, error: ${error}`, data);
+                logger.log(`onSettled - data: ${data}, error: ${error}`, data);
                 if (error) {
                     setShowTryAgainTooltip(true);
                     setTimeout(() => setShowTryAgainTooltip(false), 3500);
@@ -13343,7 +13317,7 @@ const states$2 = {
     ERROR: 'error',
 };
 const ConnectWithOAuth = () => {
-    const { connector, setRoute, log } = useOpenfort();
+    const { connector, setRoute } = useOpenfort();
     const { client, user } = useOpenfortCore();
     const [status, setStatus] = useState(states$2.INIT);
     const [description, setDescription] = useState(undefined);
@@ -13403,7 +13377,7 @@ const ConnectWithOAuth = () => {
                                     queryParams,
                                 },
                             });
-                            log(linkResponse);
+                            logger.log(linkResponse);
                             window.location.href = linkResponse.url;
                         }
                         else {
@@ -13414,7 +13388,7 @@ const ConnectWithOAuth = () => {
                                     queryParams,
                                 },
                             });
-                            log(r);
+                            logger.log(r);
                             window.location.href = r.url;
                         }
                     }
@@ -13470,7 +13444,7 @@ const ScanIconWithLogos = ({ logo }) => {
 };
 
 const ConnectWithQRCode = ({ switchConnectMethod }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d;
     const context = useOpenfort();
     const id = context.connector.id;
     const wallet = useWallet(context.connector.id);
@@ -13483,7 +13457,7 @@ const ConnectWithQRCode = ({ switchConnectMethod }) => {
     });
     const connectWithSiwe = useConnectWithSiwe();
     const { isConnected } = useAccount();
-    const { log, setOpen } = useOpenfort();
+    const { setOpen } = useOpenfort();
     const { disconnect } = useDisconnect();
     const [isFirstFrame, setIsFirstFrame] = React.useState(true);
     useEffect(() => {
@@ -13501,7 +13475,7 @@ const ConnectWithQRCode = ({ switchConnectMethod }) => {
                     // connectorType: 'walletConnect',
                     // walletClientType: 'walletConnect',
                     onError: (error) => {
-                        log(error);
+                        logger.log(error);
                         disconnect();
                     },
                     onConnect: () => {
@@ -13537,7 +13511,7 @@ const ConnectWithQRCode = ({ switchConnectMethod }) => {
                     alignItems: 'center',
                     justifyContent: 'center',
                     gap: 14,
-                }, children: [((_e = context.uiConfig) === null || _e === void 0 ? void 0 : _e.walletConnectCTA) !== 'modal' && (jsx(CopyToClipboard, { variant: "button", string: uri, children: ((_f = context.uiConfig) === null || _f === void 0 ? void 0 : _f.walletConnectCTA) === 'link' ? locales.copyToClipboard : locales.copyCode })), ((_g = context.uiConfig) === null || _g === void 0 ? void 0 : _g.walletConnectCTA) !== 'link' && (jsx(Button, { icon: jsx(ExternalLinkIcon, {}), onClick: openW3M, disabled: isOpenW3M, waiting: isOpenW3M, children: ((_h = context.uiConfig) === null || _h === void 0 ? void 0 : _h.walletConnectCTA) === 'modal' ? locales.useWalletConnectModal : locales.useModal }))] })), isFamilyAccountsConnector(wallet.id) && (jsxs(Fragment, { children: [jsx(OrDivider, {}), jsx(Button, { onClick: () => switchConnectMethod(id), children: locales.loginWithEmailOrPhone })] })), hasApps && (jsx(Button, { onClick: () => {
+                }, children: [context.uiConfig.walletConnectCTA !== 'modal' && (jsx(CopyToClipboard, { variant: "button", string: uri, children: context.uiConfig.walletConnectCTA === 'link' ? locales.copyToClipboard : locales.copyCode })), context.uiConfig.walletConnectCTA !== 'link' && (jsx(Button, { icon: jsx(ExternalLinkIcon, {}), onClick: openW3M, disabled: isOpenW3M, waiting: isOpenW3M, children: context.uiConfig.walletConnectCTA === 'modal' ? locales.useWalletConnectModal : locales.useModal }))] })), isFamilyAccountsConnector(wallet.id) && (jsxs(Fragment, { children: [jsx(OrDivider, {}), jsx(Button, { onClick: () => switchConnectMethod(id), children: locales.loginWithEmailOrPhone })] })), hasApps && (jsx(Button, { onClick: () => {
                     context.setRoute(routes.DOWNLOAD);
                 }, 
                 /*
@@ -13565,7 +13539,7 @@ const ConnectUsing = () => {
     const [status, setStatus] = useState(isQrCode ? states$1.QRCODE : states$1.INJECTOR);
     useEffect(() => {
         const connector = context.connector;
-        context.log('ConnectUsing', { status, isQrCode, isOauth, connector });
+        logger.log('ConnectUsing', { status, isQrCode, isOauth, connector });
         if (isOauth)
             return;
         // if no provider, change to qrcode
@@ -13625,9 +13599,9 @@ const DownloadFooter = styled.div `
 `;
 const ConnectWithMobile = () => {
     var _a, _b, _c;
-    const { connector, setRoute, log } = useOpenfort();
+    const { connector, setRoute } = useOpenfort();
     const walletId = Object.keys(walletConfigs).find(
-    // where id is comma seperated list
+    // where id is comma separated list
     (id) => id
         .split(',')
         .map((i) => i.trim())
@@ -13643,7 +13617,7 @@ const ConnectWithMobile = () => {
     const openApp = (url) => {
         var _a;
         const uri = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.getWalletConnectDeeplink) === null || _a === void 0 ? void 0 : _a.call(wallet, url !== null && url !== void 0 ? url : '');
-        log('Opening wallet app with uri', { uri, url, wallet, walletId, walletConfigs, connectorId: connector.id });
+        logger.log('Opening wallet app with uri', { uri, url, wallet, walletId, walletConfigs, connectorId: connector.id });
         if (uri) {
             if (url) {
                 window.location.href = uri;
@@ -13706,13 +13680,12 @@ const ConnectWithMobile = () => {
 
 const customThemeDefault = {};
 const ConnectModal = ({ mode = 'auto', theme = 'auto', customTheme = customThemeDefault, lang = 'en-US' }) => {
-    var _a;
     const context = 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
-    const closeable = !(((_a = context.uiConfig) === null || _a === void 0 ? void 0 : _a.enforceSupportedChains) && isConnected && !chainIsSupported);
+    const closeable = !(context.uiConfig.enforceSupportedChains && isConnected && !chainIsSupported);
     const mainRoutes = [
         routes.PROFILE,
         routes.LOADING,
@@ -13772,7 +13745,7 @@ const ConnectModal = ({ mode = 'auto', theme = 'auto', customTheme = customTheme
         const provider = url.searchParams.get('openfortAuthProviderUI');
         const emailVerification = url.searchParams.get('openfortEmailVerificationUI');
         const forgotPassword = url.searchParams.get('openfortForgotPasswordUI');
-        context.log('Checking for search parameters', url);
+        logger.log('Checking for search parameters', url);
         if (emailVerification) {
             context.setOpen(true);
             context.setRoute(routes.EMAIL_VERIFICATION);
@@ -13789,7 +13762,7 @@ const ConnectModal = ({ mode = 'auto', theme = 'auto', customTheme = customTheme
             return Object.values(OAuthProvider).includes(value);
         }
         if (isProvider(provider)) {
-            context.log('Found auth provider', provider);
+            logger.log('Found auth provider', provider);
             context.setOpen(true);
             context.setConnector({ id: provider, type: 'oauth' });
             context.setRoute(routes.CONNECT);
@@ -13859,7 +13832,7 @@ const ConnectModal = ({ mode = 'auto', theme = 'auto', customTheme = customTheme
  * ```
  */
 const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMode = false, publishableKey, walletConfig, overrides, thirdPartyAuth, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e;
     // OpenfortProvider must be within a WagmiProvider
     if (!React.useContext(WagmiContext)) {
         throw Error('OpenfortProvider must be within a WagmiProvider');
@@ -13872,7 +13845,6 @@ const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMo
     useMemo(() => {
         logger.enabled = !!debugMode;
     }, []);
-    const chains = useChains();
     const injectedConnector = useConnector('injected');
     const allowAutomaticRecovery = !!((walletConfig === null || walletConfig === void 0 ? void 0 : walletConfig.createEncryptedSessionEndpoint) || (walletConfig === null || walletConfig === void 0 ? void 0 : walletConfig.getEncryptionSession));
     // Default config options
@@ -13894,7 +13866,6 @@ const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMo
         disclaimer: null,
         bufferPolyfill: true,
         customAvatar: undefined,
-        initialChainId: (_a = chains === null || chains === void 0 ? void 0 : chains[0]) === null || _a === void 0 ? void 0 : _a.id,
         enforceSupportedChains: false,
         ethereumOnboardingUrl: undefined,
         walletOnboardingUrl: undefined,
@@ -13919,7 +13890,7 @@ const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMo
     if (typeof window !== 'undefined') {
         // Buffer Polyfill, needed for bundlers that don't provide Node polyfills (e.g CRA, Vite, etc.)
         if (safeUiConfig.bufferPolyfill)
-            window.Buffer = (_b = window.Buffer) !== null && _b !== void 0 ? _b : Buffer;
+            window.Buffer = (_a = window.Buffer) !== null && _a !== void 0 ? _a : Buffer;
         // Some bundlers may need `global` and `process.env` polyfills as well
         // Not implemented here to avoid unexpected behaviors, but leaving example here for future reference
         /*
@@ -13927,9 +13898,9 @@ const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMo
          * window.process = window.process ?? { env: {} };
          */
     }
-    const [ckTheme, setTheme] = useState((_d = (_c = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.theme) !== null && _c !== void 0 ? _c : defaultUIOptions.theme) !== null && _d !== void 0 ? _d : 'auto');
-    const [ckMode, setMode] = useState((_f = (_e = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.mode) !== null && _e !== void 0 ? _e : defaultUIOptions.mode) !== null && _f !== void 0 ? _f : 'auto');
-    const [ckCustomTheme, setCustomTheme] = useState((_g = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.customTheme) !== null && _g !== void 0 ? _g : {});
+    const [ckTheme, setTheme] = useState((_b = safeUiConfig.theme) !== null && _b !== void 0 ? _b : 'auto');
+    const [ckMode, setMode] = useState((_c = safeUiConfig.mode) !== null && _c !== void 0 ? _c : 'auto');
+    const [ckCustomTheme, setCustomTheme] = useState((_d = safeUiConfig.customTheme) !== null && _d !== void 0 ? _d : {});
     const [ckLang, setLang] = useState('en-US');
     const [open, setOpen] = useState(false);
     const [connector, setConnector] = useState({
@@ -13942,9 +13913,9 @@ const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMo
     // Include Google Font that is needed for a themes
     useThemeFont(safeUiConfig.embedGoogleFonts ? ckTheme : '');
     // Other Configuration
-    useEffect(() => { var _a; return setTheme((_a = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.theme) !== null && _a !== void 0 ? _a : 'auto'); }, [uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.theme]);
-    useEffect(() => { var _a; return setMode((_a = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.mode) !== null && _a !== void 0 ? _a : 'auto'); }, [uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.mode]);
-    useEffect(() => { var _a; return setCustomTheme((_a = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.customTheme) !== null && _a !== void 0 ? _a : {}); }, [uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.customTheme]);
+    useEffect(() => { var _a; return setTheme((_a = safeUiConfig.theme) !== null && _a !== void 0 ? _a : 'auto'); }, [safeUiConfig.theme]);
+    useEffect(() => { var _a; return setMode((_a = safeUiConfig.mode) !== null && _a !== void 0 ? _a : 'auto'); }, [safeUiConfig.mode]);
+    useEffect(() => { var _a; return setCustomTheme((_a = safeUiConfig.customTheme) !== null && _a !== void 0 ? _a : {}); }, [safeUiConfig.customTheme]);
     useEffect(() => setLang(safeUiConfig.language || 'en-US'), [safeUiConfig.language]);
     useEffect(() => setErrorMessage(null), [route, open]);
     // Check if chain is supported, elsewise redirect to switches page
@@ -13984,16 +13955,8 @@ const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMo
         uiConfig: safeUiConfig,
         errorMessage,
         debugMode,
-        log: logger.log,
         emailInput,
         setEmailInput,
-        displayError: (message, code) => {
-            setErrorMessage(message);
-            logger.log('---------OPENFORT DEBUG---------');
-            logger.log(message);
-            if (code)
-                logger.log('---------/OPENFORT DEBUG---------');
-        },
         resize,
         triggerResize: () => onResize((prev) => prev + 1),
         walletConfig,
@@ -14007,7 +13970,7 @@ const OpenfortProvider = ({ children, uiConfig, onConnect, onDisconnect, debugMo
                     shieldPublishableKey: walletConfig.shieldPublishableKey,
                     debug: debugMode,
                 }
-                : undefined, overrides: overrides, thirdPartyAuth: thirdPartyAuth, onConnect: onConnect, onDisconnect: onDisconnect, children: [children, jsx(ConnectModal, { lang: ckLang, theme: ckTheme, mode: (_h = uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.mode) !== null && _h !== void 0 ? _h : ckMode, customTheme: ckCustomTheme })] }) }));
+                : undefined, overrides: overrides, thirdPartyAuth: thirdPartyAuth, onConnect: onConnect, onDisconnect: onDisconnect, children: [children, jsx(ConnectModal, { lang: ckLang, theme: ckTheme, mode: (_e = safeUiConfig.mode) !== null && _e !== void 0 ? _e : ckMode, customTheme: ckCustomTheme })] }) }));
 };
 
 /**
@@ -14283,7 +14246,6 @@ const useOAuth = (hookOptions = {}) => {
  */
 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();
@@ -14320,7 +14282,7 @@ const useAuthCallback = ({ enabled = true, // Automatically handle OAuth and ema
                     });
                     window.history.replaceState({}, document.title, url.toString());
                 };
-                log('EmailVerification', state, email);
+                logger.log('EmailVerification', state, email);
                 const options = {
                     onSuccess: (data) => {
                         var _a;
@@ -14367,7 +14329,7 @@ const useAuthCallback = ({ enabled = true, // Automatically handle OAuth and ema
                     });
                     window.history.replaceState({}, document.title, url.toString());
                 };
-                log('callback', { player, accessToken, refreshToken });
+                logger.log('callback', { player, accessToken, refreshToken });
                 const options = {
                     onSuccess: (data) => {
                         var _a;
@@ -14513,7 +14475,6 @@ const useGuestAuth = (hookOptions = {}) => {
 
 const useWalletAuth = (hookOptions = {}) => {
     const { updateUser } = useOpenfortCore();
-    const { log } = useOpenfort();
     const siwe = useConnectWithSiwe();
     const availableWallets = useWallets$1(); // TODO: Use this to get the wallet client type
     const { disconnect } = useDisconnect();
@@ -14553,7 +14514,7 @@ const useWalletAuth = (hookOptions = {}) => {
         setShouldConnectWithSiwe(false);
         siwe({
             onError: (e) => {
-                log('Error connecting with SIWE', e);
+                logger.log('Error connecting with SIWE', e);
                 disconnect();
                 const error = new OpenfortError('Failed to connect with siwe', OpenfortErrorType.AUTHENTICATION_ERROR, {
                     error: e,
@@ -14561,7 +14522,7 @@ const useWalletAuth = (hookOptions = {}) => {
                 handleError(error);
             },
             onConnect: () => {
-                log('Successfully connected with SIWE');
+                logger.log('Successfully connected with SIWE');
                 setStatus({
                     status: 'success',
                 });
@@ -14572,7 +14533,7 @@ const useWalletAuth = (hookOptions = {}) => {
                 });
             },
         });
-    }, [shouldConnectWithSiwe, siwe, updateUser, log]);
+    }, [shouldConnectWithSiwe, siwe, updateUser]);
     // const generateSiweMessage = useCallback(
     //   async (args) => {
     //     try {
@@ -14657,7 +14618,7 @@ const useWalletAuth = (hookOptions = {}) => {
             connector = options.connector;
         }
         if (!connector) {
-            log('Connector not found', connector);
+            logger.log('Connector not found', connector);
             return handleError(new OpenfortError('Connector not found', OpenfortErrorType.AUTHENTICATION_ERROR));
         }
         setWalletConnectingTo(connector.id);
@@ -14681,13 +14642,13 @@ const useWalletAuth = (hookOptions = {}) => {
             await connectAsync({
                 connector,
             });
-            log('Connected to wallet!!!', connector.id);
+            logger.log('Connected to wallet!!!', connector.id);
         }
         catch (error) {
             logger.error('Error connecting', error);
             handleError(new OpenfortError('Failed to connect', OpenfortErrorType.AUTHENTICATION_ERROR, { error }));
         }
-    }, [siwe, disconnect, updateUser, availableWallets, log, setStatus, hookOptions]);
+    }, [siwe, disconnect, updateUser, availableWallets, setStatus, hookOptions]);
     return {
         walletConnectingTo,
         connectWallet,