signer-test-sdk-react 0.0.20 → 0.0.21

package/dist/src/AbstraxnProvider.js

@@ -3,15 +3,15 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
  * Abstraxn Wallet Provider - React Context Provider
  * Wrap your app with this provider to use Abstraxn Wallet SDK
  */
-import React, { createContext, useContext, useEffect, useState, useRef, useCallback, useMemo, } from "react";
-import { AbstraxnWallet, AuthenticationError, } from "signer-test-sdk-core";
-import { OnboardingUIWeb } from "./components/OnboardingUI";
-import { WagmiProvider, useAccount, useConnect, useDisconnect, useSignMessage, useSendTransaction, useSwitchChain, useBalance, useChainId, } from "wagmi";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { createWagmiConfig } from "./wagmiConfig";
-import { parseEther, createPublicClient, http } from "viem";
-import { ExternalWalletButtons } from "./ExternalWalletButtons";
-import { EVM_CHAINS, SOLANA_CHAINS, getChainById, toCoreChain, } from "./chains";
+import React, { createContext, useContext, useEffect, useState, useRef, useCallback, useMemo } from 'react';
+import { AbstraxnWallet, AuthenticationError } from 'signer-test-sdk-core';
+import { OnboardingUIWeb } from './components/OnboardingUI';
+import { WagmiProvider, useAccount, useConnect, useDisconnect, useSignMessage, useSendTransaction, useSwitchChain, useBalance, useChainId } from 'wagmi';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { createWagmiConfig } from './wagmiConfig';
+import { parseEther, createPublicClient, http } from 'viem';
+import { ExternalWalletButtons } from './ExternalWalletButtons';
+import { EVM_CHAINS, SOLANA_CHAINS, getChainById, toCoreChain } from './chains';
 export const AbstraxnContext = createContext(null);
 // QueryClient will be created inside the component to ensure React context is available
 // Base provider logic (shared between with and without wagmi)
@@ -32,34 +32,20 @@ function useAbstraxnProviderBase(_config) {
     const twitterCallbackHandledRef = useRef(false);
     const discordCallbackHandledRef = useRef(false);
     return {
-        isInitialized,
-        setIsInitialized,
-        isConnected,
-        setIsConnected,
-        address,
-        setAddress,
-        user,
-        setUser,
-        whoami,
-        setWhoami,
-        chainId,
-        setChainId,
-        error,
-        setError,
-        loading,
-        setLoading,
-        walletBalance,
-        setWalletBalance,
-        onboardingRef,
-        otpIdRef,
-        walletRef,
-        googleCallbackHandledRef,
-        twitterCallbackHandledRef,
-        discordCallbackHandledRef,
+        isInitialized, setIsInitialized,
+        isConnected, setIsConnected,
+        address, setAddress,
+        user, setUser,
+        whoami, setWhoami,
+        chainId, setChainId,
+        error, setError,
+        loading, setLoading,
+        walletBalance, setWalletBalance,
+        onboardingRef, otpIdRef, walletRef, googleCallbackHandledRef, twitterCallbackHandledRef, discordCallbackHandledRef,
     };
 }
 // Internal component WITH wagmi hooks (used when external wallets are enabled)
-function AbstraxnProviderWithWagmi({ config, children, }) {
+function AbstraxnProviderWithWagmi({ config, children }) {
     const base = useAbstraxnProviderBase(config);
     const externalWalletsEnabled = config.externalWallets?.enabled ?? false;
     // Keep a ref so callbacks remain stable when config toggles
@@ -84,23 +70,14 @@ function AbstraxnProviderWithWagmi({ config, children, }) {
             refetchInterval: false,
         },
     });
-    return (_jsx(AbstraxnProviderInner, { config: config, children: children, base: base, wagmi: {
-            wagmiAccount,
-            wagmiConnect,
-            wagmiDisconnect,
-            wagmiSignMessage,
-            wagmiSendTransaction,
-            wagmiSwitchChain,
-            wagmiBalance,
-            wagmiChainIdHook,
-        } }));
+    return _jsx(AbstraxnProviderInner, { config: config, children: children, base: base, wagmi: { wagmiAccount, wagmiConnect, wagmiDisconnect, wagmiSignMessage, wagmiSendTransaction, wagmiSwitchChain, wagmiBalance, wagmiChainIdHook } });
 }
 // Internal component WITHOUT wagmi hooks (used when external wallets are disabled)
-function AbstraxnProviderWithoutWagmi({ config, children, }) {
+function AbstraxnProviderWithoutWagmi({ config, children }) {
     const base = useAbstraxnProviderBase(config);
-    return (_jsx(AbstraxnProviderInner, { config: config, children: children, base: base, wagmi: null }));
+    return _jsx(AbstraxnProviderInner, { config: config, children: children, base: base, wagmi: null });
 }
-function AbstraxnProviderInner({ config, children, base, wagmi, }) {
+function AbstraxnProviderInner({ config, children, base, wagmi }) {
     const { isInitialized, setIsInitialized, isConnected, setIsConnected, address, setAddress, user, setUser, whoami, setWhoami, chainId, setChainId, error, setError, loading, setLoading, walletBalance, setWalletBalance, onboardingRef, otpIdRef, walletRef, googleCallbackHandledRef, twitterCallbackHandledRef, discordCallbackHandledRef, } = base;
     const externalWalletsEnabled = config.externalWallets?.enabled ?? false;
     // Keep a ref to avoid re-creating callbacks when toggling config (prevents flicker)
@@ -142,27 +119,24 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             if (externalWalletsEnabled) {
                 // Show external wallet container when enabled
                 if (onboardingAny.externalWalletContainer) {
-                    onboardingAny.externalWalletContainer.style.display = "";
+                    onboardingAny.externalWalletContainer.style.display = '';
                 }
                 // Show divider if email/Google are also visible
-                const authMethods = onboardingAny.config?.authMethods || [
-                    "otp",
-                    "google",
-                ];
-                const showEmail = authMethods.includes("otp");
-                const showGoogle = authMethods.includes("google");
+                const authMethods = onboardingAny.config?.authMethods || ['otp', 'google'];
+                const showEmail = authMethods.includes('otp');
+                const showGoogle = authMethods.includes('google');
                 const hasEmailOrGoogle = showEmail || showGoogle;
                 if (onboardingAny.externalWalletDivider && hasEmailOrGoogle) {
-                    onboardingAny.externalWalletDivider.style.display = "";
+                    onboardingAny.externalWalletDivider.style.display = '';
                 }
             }
             else {
                 // Hide external wallet container when disabled
                 if (onboardingAny.externalWalletContainer) {
-                    onboardingAny.externalWalletContainer.style.display = "none";
+                    onboardingAny.externalWalletContainer.style.display = 'none';
                 }
                 if (onboardingAny.externalWalletDivider) {
-                    onboardingAny.externalWalletDivider.style.display = "none";
+                    onboardingAny.externalWalletDivider.style.display = 'none';
                 }
             }
         });
@@ -176,9 +150,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         // Check if wagmi has already restored a connection from localStorage
         // This happens automatically with wagmi's persistence when storage is configured
         const checkAndRestore = () => {
-            if (wagmiAccount.isConnected &&
-                wagmiAccount.address &&
-                !isExternalWalletConnected) {
+            if (wagmiAccount.isConnected && wagmiAccount.address && !isExternalWalletConnected) {
                 const walletAddress = wagmiAccount.address.toLowerCase();
                 const currentChainId = wagmiChainIdHook || wagmiAccount.chainId || null;
                 // Set explicitConnectionRef FIRST to prevent auto-disconnect from interfering
@@ -251,13 +223,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 clearTimeout(timeout2);
             }
         };
-    }, [
-        externalWalletsEnabled,
-        wagmiAccount?.isConnected,
-        wagmiAccount?.address,
-        wagmiChainIdHook,
-        isExternalWalletConnected,
-    ]); // Re-run if wagmi state changes
+    }, [externalWalletsEnabled, wagmiAccount?.isConnected, wagmiAccount?.address, wagmiChainIdHook, isExternalWalletConnected]); // Re-run if wagmi state changes
     // Initialize wallet
     useEffect(() => {
         // If wallet already exists (from previous mount), reuse it to prevent flicker
@@ -279,12 +245,10 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             // Priority 1: Check if chains is an array of viem chain objects (direct format)
             if (Array.isArray(chainConfig) && chainConfig?.length > 0) {
                 const firstItem = chainConfig[0];
-                if (firstItem &&
-                    typeof firstItem.id === "number" &&
-                    firstItem.nativeCurrency) {
+                if (firstItem && typeof firstItem.id === 'number' && firstItem.nativeCurrency) {
                     // Convert viem chain objects to core chain format
                     chainConfig.forEach((viemChain) => {
-                        let rpcUrl = "";
+                        let rpcUrl = '';
                         if (viemChain.rpcUrls?.default?.http) {
                             rpcUrl = Array.isArray(viemChain.rpcUrls.default.http)
                                 ? viemChain.rpcUrls.default.http[0]
@@ -298,19 +262,17 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                         chains.push({
                             id: viemChain.id,
                             name: viemChain.name,
-                            rpcUrl: rpcUrl ||
-                                `https://rpc.ankr.com/${viemChain.name.toLowerCase()}`,
+                            rpcUrl: rpcUrl || `https://rpc.ankr.com/${viemChain.name.toLowerCase()}`,
                             nativeCurrency: viemChain.nativeCurrency,
                         });
                     });
                 }
             }
             // Priority 2: Check new chains config format
-            else if (chainConfig?.supportedEvmChains &&
-                chainConfig.supportedEvmChains.length > 0) {
+            else if (chainConfig?.supportedEvmChains && chainConfig.supportedEvmChains.length > 0) {
                 chainConfig.supportedEvmChains.forEach((chainName) => {
                     const chainData = EVM_CHAINS[chainName];
-                    if (chainData && chainData.type === "evm") {
+                    if (chainData && chainData.type === 'evm') {
                         chains.push(toCoreChain(chainData));
                     }
                 });
@@ -323,14 +285,11 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 chains.push(toCoreChain(EVM_CHAINS.polygon));
                 chains.push(toCoreChain(EVM_CHAINS.base));
             }
-            computedSupportedChains =
-                chains.length > 0
-                    ? chains
-                    : [
-                        toCoreChain(EVM_CHAINS.ethereum),
-                        toCoreChain(EVM_CHAINS.polygon),
-                        toCoreChain(EVM_CHAINS.base),
-                    ];
+            computedSupportedChains = chains.length > 0 ? chains : [
+                toCoreChain(EVM_CHAINS.ethereum),
+                toCoreChain(EVM_CHAINS.polygon),
+                toCoreChain(EVM_CHAINS.base),
+            ];
         }
         const walletInstance = new AbstraxnWallet({
             apiKey: config.apiKey,
@@ -343,7 +302,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         });
         walletRef.current = walletInstance;
         // Set up event listeners
-        walletInstance.on("connect", async () => {
+        walletInstance.on('connect', async () => {
             try {
                 // Verify whoami exists before setting connected
                 const whoamiInfo = await walletInstance.getWhoami();
@@ -361,7 +320,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     setAddress(addr);
                 }
                 catch (addrErr) {
-                    console.warn("Address not available on connect:", addrErr);
+                    console.warn('Address not available on connect:', addrErr);
                 }
                 const cid = await walletInstance.getChainId();
                 setChainId(cid);
@@ -379,7 +338,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 }
             }
             catch (err) {
-                console.error("Error getting wallet info on connect:", err);
+                console.error('Error getting wallet info on connect:', err);
             }
             // Ensure loading modal is closed when connected (whoami received)
             if (onboardingRef.current) {
@@ -388,20 +347,19 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     onboardingAny.hideLoadingModal();
                 }
                 // Also ensure the overlay is hidden if it was opened
-                if (onboardingAny.modalOverlay &&
-                    onboardingAny.modalOverlay.classList.contains("onboarding-modal-open")) {
-                    onboardingAny.modalOverlay.classList.remove("onboarding-modal-open");
-                    onboardingAny.modalOverlay.classList.add("onboarding-modal-closing");
+                if (onboardingAny.modalOverlay && onboardingAny.modalOverlay.classList.contains('onboarding-modal-open')) {
+                    onboardingAny.modalOverlay.classList.remove('onboarding-modal-open');
+                    onboardingAny.modalOverlay.classList.add('onboarding-modal-closing');
                     setTimeout(() => {
                         if (onboardingAny.modalOverlay) {
-                            onboardingAny.modalOverlay.style.display = "none";
+                            onboardingAny.modalOverlay.style.display = 'none';
                         }
                     }, 200);
-                    document.body.style.overflow = "";
+                    document.body.style.overflow = '';
                 }
             }
         });
-        walletInstance.on("disconnect", () => {
+        walletInstance.on('disconnect', () => {
             setIsConnected(false);
             setAddress(null);
             setUser(null);
@@ -416,10 +374,10 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 // Ignore localStorage errors
             }
         });
-        walletInstance.on("accountChanged", (newAddress) => {
+        walletInstance.on('accountChanged', (newAddress) => {
             setAddress(newAddress);
         });
-        walletInstance.on("chainChanged", (newChainId) => {
+        walletInstance.on('chainChanged', (newChainId) => {
             setChainId(newChainId);
         });
         // Initialize OnboardingUI only if not already created (prevents flicker on config change)
@@ -429,9 +387,9 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         const uiConfig = config.ui || {};
         const onboarding = new OnboardingUIWeb({
             logo: uiConfig.logo,
-            theme: uiConfig.theme || "light",
+            theme: uiConfig.theme || 'light',
             showFooter: uiConfig.showFooter !== false,
-            onboardTitle: uiConfig.onboardTitle || "Sign In",
+            onboardTitle: uiConfig.onboardTitle || 'Sign In',
             modal: uiConfig.modal !== false,
             closeOnBackdropClick: uiConfig.closeOnBackdropClick !== false,
             className: uiConfig.className,
@@ -443,12 +401,12 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             onEmailOtpInitiate: async (email) => {
                 try {
                     if (!walletInstance)
-                        throw new Error("Wallet not initialized");
+                        throw new Error('Wallet not initialized');
                     const authManager = walletInstance.getAuthManager();
-                    const connectionTypeValue = "email";
+                    const connectionTypeValue = 'email';
                     setConnectionType(connectionTypeValue);
                     try {
-                        localStorage.setItem("abstraxn_connection_type", connectionTypeValue);
+                        localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
                     }
                     catch (e) {
                         // Ignore localStorage errors
@@ -457,21 +415,21 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     otpIdRef.current = result.otpId;
                 }
                 catch (err) {
-                    console.error("OTP Init Error:", err);
+                    console.error('OTP Init Error:', err);
                     throw err;
                 }
             },
             onEmailOtpVerify: async (_email, otp) => {
                 try {
                     if (!walletInstance)
-                        throw new Error("Wallet not initialized");
+                        throw new Error('Wallet not initialized');
                     if (!otpIdRef.current)
-                        throw new Error("OTP ID not found");
+                        throw new Error('OTP ID not found');
                     // Set connection type for email OTP before verification
-                    const connectionTypeValue = "email";
+                    const connectionTypeValue = 'email';
                     setConnectionType(connectionTypeValue);
                     try {
-                        localStorage.setItem("abstraxn_connection_type", connectionTypeValue);
+                        localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
                     }
                     catch (e) {
                         // Ignore localStorage errors
@@ -486,98 +444,277 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     return { success: true, user };
                 }
                 catch (err) {
-                    console.error("OTP Verify Error:", err);
+                    console.error('OTP Verify Error:', err);
                     // Return the actual error message from the API
-                    const errorMessage = err instanceof Error ? err.message : "Failed to verify OTP";
+                    const errorMessage = err instanceof Error ? err.message : 'Failed to verify OTP';
                     return { success: false, error: errorMessage };
                 }
             },
             onGoogleLogin: async () => {
                 if (!walletInstance)
-                    throw new Error("Wallet not initialized");
-                const connectionTypeValue = "google";
+                    throw new Error('Wallet not initialized');
+                const connectionTypeValue = 'google';
                 setConnectionType(connectionTypeValue);
                 // Store in localStorage for restoration
                 try {
-                    localStorage.setItem("abstraxn_connection_type", connectionTypeValue);
+                    localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
+                    localStorage.setItem('abstraxn_oauth_pending', 'google');
                 }
                 catch (e) {
                     // Ignore localStorage errors
                 }
-            }
+                // Clear existing query params before starting new flow
+                if (typeof window !== 'undefined') {
+                    const url = new URL(window.location.href);
+                    // Remove auth params that might be present from previous attempts
+                    url.searchParams.delete('code');
+                    url.searchParams.delete('state');
+                    url.searchParams.delete('error');
+                    url.searchParams.delete('success');
+                    url.searchParams.delete('accessToken');
+                    url.searchParams.delete('provider');
+                    url.searchParams.delete('authProvider');
+                    window.history.replaceState({}, document.title, url.toString());
+                }
+                const authManager = walletInstance.getAuthManager();
+                await authManager.loginWithGoogle();
+            },
+            onTwitterLogin: async () => {
+                if (!walletInstance)
+                    throw new Error('Wallet not initialized');
+                const connectionTypeValue = 'x';
+                setConnectionType(connectionTypeValue);
+                try {
+                    localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
+                    localStorage.setItem('abstraxn_oauth_pending', 'twitter');
+                }
+                catch (e) {
+                    // Ignore localStorage errors
+                }
+                // Clear existing query params before starting new flow
+                if (typeof window !== 'undefined') {
+                    const url = new URL(window.location.href);
+                    // Remove auth params that might be present from previous attempts
+                    url.searchParams.delete('code');
+                    url.searchParams.delete('state');
+                    url.searchParams.delete('error');
+                    url.searchParams.delete('success');
+                    url.searchParams.delete('accessToken');
+                    url.searchParams.delete('provider');
+                    url.searchParams.delete('authProvider');
+                    window.history.replaceState({}, document.title, url.toString());
+                }
+                const authManager = walletInstance.getAuthManager();
+                await authManager.loginWithTwitter();
+            },
+            onDiscordLogin: async () => {
+                if (!walletInstance)
+                    throw new Error('Wallet not initialized');
+                const connectionTypeValue = 'discord';
+                setConnectionType(connectionTypeValue);
+                try {
+                    localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
+                    localStorage.setItem('abstraxn_oauth_pending', 'discord');
+                }
+                catch (e) {
+                    // Ignore localStorage errors
+                }
+                // Clear existing query params before starting new flow
+                if (typeof window !== 'undefined') {
+                    const url = new URL(window.location.href);
+                    // Remove auth params that might be present from previous attempts
+                    url.searchParams.delete('code');
+                    url.searchParams.delete('state');
+                    url.searchParams.delete('error');
+                    url.searchParams.delete('success');
+                    url.searchParams.delete('accessToken');
+                    url.searchParams.delete('provider');
+                    url.searchParams.delete('authProvider');
+                    window.history.replaceState({}, document.title, url.toString());
+                }
+                const authManager = walletInstance.getAuthManager();
+                await authManager.loginWithDiscord();
+            },
+            onPasskeyLogin: async () => {
+                if (!walletInstance)
+                    throw new Error('Wallet not initialized');
+                const connectionTypeValue = 'passkey';
+                setConnectionType(connectionTypeValue);
+                try {
+                    localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
+                }
+                catch (e) {
+                    // Ignore localStorage errors
+                }
+                const authManager = walletInstance.getAuthManager();
+                const user = await authManager.loginWithPasskey();
+                // Set user immediately so onLoginSuccess can access it
+                setUser(user);
+                // Connect wallet after successful authentication
+                await walletInstance.connect();
+            },
+            onPasskeySignup: async () => {
+                if (!walletInstance)
+                    throw new Error('Wallet not initialized');
+                const connectionTypeValue = 'passkey';
+                setConnectionType(connectionTypeValue);
+                try {
+                    localStorage.setItem('abstraxn_connection_type', connectionTypeValue);
+                }
+                catch (e) {
+                    // Ignore localStorage errors
+                }
+                const authManager = walletInstance.getAuthManager();
+                const user = await authManager.signupWithPasskey();
+                // Set user immediately so onLoginSuccess can access it
+                setUser(user);
+                // Connect wallet after successful authentication
+                await walletInstance.connect();
+            },
+            onLoginSuccess: async (data) => {
+                // Clear any previous errors on successful login
+                setError(null);
+                // Restore connection type from localStorage for OAuth logins (Google, X, Discord)
+                // This ensures connectionType is set after OAuth redirects
+                try {
+                    const storedType = localStorage.getItem('abstraxn_connection_type');
+                    if (storedType && (storedType === 'google' || storedType === 'x' || storedType === 'discord' || storedType === 'email' || storedType === 'passkey')) {
+                        setConnectionType(storedType);
+                    }
+                }
+                catch (e) {
+                    // Ignore localStorage errors
+                }
+                // Set user if provided in data
+                if (data.user) {
+                    setUser(data.user);
+                }
+                // Load whoami after successful login
+                if (walletInstance) {
+                    try {
+                        const whoamiInfo = await walletInstance.getWhoami();
+                        setWhoami(whoamiInfo);
+                        const addr = await walletInstance.getAddress();
+                        setAddress(addr);
+                        const cid = await walletInstance.getChainId();
+                        setChainId(cid);
+                        // Only hide onboarding UI and set connected if whoami succeeds
+                        if (onboardingRef.current) {
+                            const onboardingAny = onboardingRef.current;
+                            if (onboardingAny.hideLoadingModal) {
+                                onboardingAny.hideLoadingModal();
+                            }
+                            if (onboardingAny.modalOverlay) {
+                                onboardingAny.modalOverlay.classList.remove('onboarding-modal-open');
+                                onboardingAny.modalOverlay.classList.add('onboarding-modal-closing');
+                                setTimeout(() => {
+                                    if (onboardingAny.modalOverlay) {
+                                        onboardingAny.modalOverlay.style.display = 'none';
+                                    }
+                                }, 200);
+                            }
+                            document.body.style.overflow = '';
+                        }
+                        // Set connected state only after whoami succeeds
+                        setIsConnected(true);
+                    }
+                    catch (err) {
+                        console.error('Error loading whoami after login:', err);
+                        // Hide loading modal on whoami error
+                        if (onboardingRef.current) {
+                            const onboardingAny = onboardingRef.current;
+                            if (onboardingAny.hideLoadingModal) {
+                                onboardingAny.hideLoadingModal();
+                            }
+                            // Show error modal/screen
+                            const errorMessage = err instanceof Error ? err.message : 'Failed to load user information';
+                            if (onboardingAny.showError) {
+                                onboardingAny.showError(errorMessage);
+                            }
+                        }
+                        // Set error state
+                        const error = err instanceof Error ? err : new Error('Failed to load user information after login');
+                        setError(error);
+                        // Don't set connected if whoami fails
+                        setIsConnected(false);
+                    }
+                }
+            },
+            onLoginError: (err) => {
+                setError(err);
+            },
         }, externalWalletsEnabled); // Pass externalWalletsEnabled as second parameter
         // Inject custom CSS if provided
         if (uiConfig.customCSS) {
-            const styleId = "abstraxn-custom-css";
+            const styleId = 'abstraxn-custom-css';
             if (!document.getElementById(styleId)) {
-                const style = document.createElement("style");
+                const style = document.createElement('style');
                 style.id = styleId;
                 style.textContent = uiConfig.customCSS;
                 document.head.appendChild(style);
             }
         }
-        const hasAuthParams = (params) => params.get("success") === "true" ||
-            params.get("error") ||
-            params.get("code") ||
-            params.get("accessToken");
+        const hasAuthParams = (params) => params.get('success') === 'true' ||
+            params.get('error') ||
+            params.get('code') ||
+            params.get('accessToken');
         const getAuthProviderFromToken = (token) => {
             try {
-                const base64Url = token.split(".")[1];
-                const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
-                const jsonPayload = decodeURIComponent(window
-                    .atob(base64)
-                    .split("")
-                    .map(function (c) {
-                    return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
-                })
-                    .join(""));
+                const base64Url = token.split('.')[1];
+                const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+                const jsonPayload = decodeURIComponent(window.atob(base64).split('').map(function (c) {
+                    return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+                }).join(''));
                 const payload = JSON.parse(jsonPayload);
-                return (payload.authProvider || payload.provider || "").toLowerCase();
+                return (payload.authProvider || payload.provider || '').toLowerCase();
             }
             catch (e) {
                 return null;
             }
         };
         const matchesProvider = (provider, params) => {
-            const providerParam = (params.get("provider") ||
-                params.get("authProvider") ||
-                "").toLowerCase();
+            const providerParam = (params.get('provider') || params.get('authProvider') || '').toLowerCase();
             const path = window.location.pathname.toLowerCase();
             if (providerParam) {
-                if (provider === "twitter") {
-                    return providerParam === "twitter" || providerParam === "x";
+                if (provider === 'twitter') {
+                    return providerParam === 'twitter' || providerParam === 'x';
                 }
                 return providerParam === provider;
             }
             // Check accessToken for provider
-            const accessToken = params.get("accessToken");
+            const accessToken = params.get('accessToken');
             if (accessToken) {
                 const tokenProvider = getAuthProviderFromToken(accessToken);
                 if (tokenProvider) {
-                    if (provider === "twitter") {
-                        return tokenProvider === "twitter" || tokenProvider === "x";
+                    if (provider === 'twitter') {
+                        return tokenProvider === 'twitter' || tokenProvider === 'x';
                     }
                     return tokenProvider === provider;
                 }
             }
-            if (provider === "twitter") {
-                return path.includes("/twitter") || path.includes("/x");
+            if (provider === 'twitter') {
+                return path.includes('/twitter') || path.includes('/x');
             }
             return path.includes(`/${provider}`);
         };
-        onboarding.init();
+        try {
+            onboarding.init();
+        }
+        catch (err) {
+            console.error('Failed to initialize OnboardingUI:', err);
+        }
         // Check if we should keep it open (if handling a callback)
         const urlParams = new URLSearchParams(window.location.search);
         const shouldKeepOpen = hasAuthParams(urlParams);
-        const hasSuccess = urlParams.get("success") === "true";
+        const hasSuccess = urlParams.get('success') === 'true';
         // Hide immediately - use synchronous approach to prevent flicker
         // Only hide if NOT handling a callback
         const onboardingAny = onboarding;
         if (!shouldKeepOpen && onboardingAny.modalOverlay) {
             // Hide immediately without delay to prevent flicker
-            onboardingAny.modalOverlay.classList.remove("onboarding-modal-open");
-            onboardingAny.modalOverlay.style.display = "none";
-            document.body.style.overflow = "";
+            onboardingAny.modalOverlay.classList.remove('onboarding-modal-open');
+            onboardingAny.modalOverlay.style.display = 'none';
+            document.body.style.overflow = '';
         }
         else if (hasSuccess) {
             // If success=true is in URL, show loading modal
@@ -592,17 +729,28 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         }
         onboardingRef.current = onboarding;
         // Handle Google OAuth callback (only in useEffect, not exposed)
-        const handleGoogleCallback = async () => {
+        const handleGoogleCallback = async (force = false) => {
             if (googleCallbackHandledRef.current)
                 return;
             const urlParams = new URLSearchParams(window.location.search);
-            if (!hasAuthParams(urlParams) ||
-                matchesProvider("twitter", urlParams) ||
-                matchesProvider("discord", urlParams)) {
+            if (!hasAuthParams(urlParams) || matchesProvider('twitter', urlParams) || matchesProvider('discord', urlParams)) {
                 return;
             }
+            // Check if we initiated this OAuth flow
+            let oauthPending = null;
+            try {
+                oauthPending = localStorage.getItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
+            if (!force && !oauthPending)
+                return;
+            // Clear the pending flag
+            try {
+                localStorage.removeItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
             // Show loading modal if success=true is in URL
-            const hasSuccess = urlParams.get("success") === "true";
+            const hasSuccess = urlParams.get('success') === 'true';
             if (hasSuccess && onboardingRef.current) {
                 const onboardingAny = onboardingRef.current;
                 if (onboardingAny.showLoadingScreen) {
@@ -629,7 +777,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 }
             }
             catch (err) {
-                console.error("Google callback error:", err);
+                console.error('Google callback error:', err);
                 // Hide loading modal on error (including whoami API failures)
                 if (onboardingRef.current) {
                     const onboardingAny = onboardingRef.current;
@@ -639,29 +787,42 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     }
                     // Also hide any main modal overlay
                     if (onboardingAny.modalOverlay) {
-                        onboardingAny.modalOverlay.style.display = "none";
+                        onboardingAny.modalOverlay.style.display = 'none';
                     }
                     // Show error modal/screen
-                    const errorMessage = err instanceof Error ? err.message : "Google authentication failed";
+                    const errorMessage = err instanceof Error ? err.message : 'Google authentication failed';
                     if (onboardingAny.showError) {
                         onboardingAny.showError(errorMessage);
                     }
                 }
-                setError(err instanceof Error ? err : new Error("Google callback failed"));
+                setError(err instanceof Error ? err : new Error('Google callback failed'));
                 googleCallbackHandledRef.current = false;
                 // Ensure body scroll is restored
-                document.body.style.overflow = "";
+                document.body.style.overflow = '';
             }
         };
         const handleDiscordCallback = async () => {
             if (discordCallbackHandledRef.current)
                 return;
             const urlParams = new URLSearchParams(window.location.search);
-            if (!hasAuthParams(urlParams) || !matchesProvider("discord", urlParams)) {
+            if (!hasAuthParams(urlParams) || !matchesProvider('discord', urlParams)) {
                 return;
             }
+            // Check if we initiated this OAuth flow
+            let oauthPending = null;
+            try {
+                oauthPending = localStorage.getItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
+            if (!oauthPending)
+                return;
+            // Clear the pending flag
+            try {
+                localStorage.removeItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
             // Show loading modal if success=true is in URL
-            const hasSuccess = urlParams.get("success") === "true";
+            const hasSuccess = urlParams.get('success') === 'true';
             if (hasSuccess && onboardingRef.current) {
                 const onboardingAny = onboardingRef.current;
                 if (onboardingAny.showLoadingScreen) {
@@ -688,7 +849,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 }
             }
             catch (err) {
-                console.error("Discord callback error:", err);
+                console.error('Discord callback error:', err);
                 // Hide loading modal on error (including whoami API failures)
                 if (onboardingRef.current) {
                     const onboardingAny = onboardingRef.current;
@@ -698,31 +859,42 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     }
                     // Also hide any main modal overlay
                     if (onboardingAny.modalOverlay) {
-                        onboardingAny.modalOverlay.style.display = "none";
+                        onboardingAny.modalOverlay.style.display = 'none';
                     }
                     // Show error modal/screen
-                    const errorMessage = err instanceof Error
-                        ? err.message
-                        : "Discord authentication failed";
+                    const errorMessage = err instanceof Error ? err.message : 'Discord authentication failed';
                     if (onboardingAny.showError) {
                         onboardingAny.showError(errorMessage);
                     }
                 }
-                setError(err instanceof Error ? err : new Error("Discord callback failed"));
+                setError(err instanceof Error ? err : new Error('Discord callback failed'));
                 discordCallbackHandledRef.current = false;
                 // Ensure body scroll is restored
-                document.body.style.overflow = "";
+                document.body.style.overflow = '';
             }
         };
         const handleTwitterCallback = async () => {
             if (twitterCallbackHandledRef.current)
                 return;
             const urlParams = new URLSearchParams(window.location.search);
-            if (!hasAuthParams(urlParams) || !matchesProvider("twitter", urlParams)) {
+            if (!hasAuthParams(urlParams) || !matchesProvider('twitter', urlParams)) {
                 return;
             }
+            // Check if we initiated this OAuth flow
+            let oauthPending = null;
+            try {
+                oauthPending = localStorage.getItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
+            if (!oauthPending)
+                return;
+            // Clear the pending flag
+            try {
+                localStorage.removeItem('abstraxn_oauth_pending');
+            }
+            catch (e) { }
             // Show loading modal if success=true is in URL
-            const hasSuccess = urlParams.get("success") === "true";
+            const hasSuccess = urlParams.get('success') === 'true';
             if (hasSuccess && onboardingRef.current) {
                 const onboardingAny = onboardingRef.current;
                 if (onboardingAny.showLoadingScreen) {
@@ -749,7 +921,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 }
             }
             catch (err) {
-                console.error("Twitter callback error:", err);
+                console.error('Twitter callback error:', err);
                 // Hide loading modal on error (including whoami API failures)
                 if (onboardingRef.current) {
                     const onboardingAny = onboardingRef.current;
@@ -759,20 +931,18 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     }
                     // Also hide any main modal overlay
                     if (onboardingAny.modalOverlay) {
-                        onboardingAny.modalOverlay.style.display = "none";
+                        onboardingAny.modalOverlay.style.display = 'none';
                     }
                     // Show error modal/screen
-                    const errorMessage = err instanceof Error
-                        ? err.message
-                        : "Twitter authentication failed";
+                    const errorMessage = err instanceof Error ? err.message : 'Twitter authentication failed';
                     if (onboardingAny.showError) {
                         onboardingAny.showError(errorMessage);
                     }
                 }
-                setError(err instanceof Error ? err : new Error("Twitter callback failed"));
+                setError(err instanceof Error ? err : new Error('Twitter callback failed'));
                 twitterCallbackHandledRef.current = false;
                 // Ensure body scroll is restored
-                document.body.style.overflow = "";
+                document.body.style.overflow = '';
             }
         };
         handleGoogleCallback();
@@ -797,13 +967,13 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     setAddress(addr);
                 }
                 catch (addrErr) {
-                    console.warn("Address not available during restore:", addrErr);
+                    console.warn('Address not available during restore:', addrErr);
                 }
                 const cid = await wallet.getChainId();
                 setChainId(cid);
             }
             catch (err) {
-                console.error("Error restoring connection state:", err);
+                console.error('Error restoring connection state:', err);
                 // If restore fails, mark as disconnected
                 setIsConnected(false);
             }
@@ -833,24 +1003,26 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     // Show onboarding UI (defined first to avoid hoisting issues)
     const showOnboarding = useCallback(() => {
         setError(null); // Clear any previous errors
+        if (!onboardingRef.current) {
+            console.error('OnboardingUI not initialized - cannot show modal');
+            return;
+        }
         if (onboardingRef.current) {
             const onboarding = onboardingRef.current;
             // Re-initialize if destroyed
-            if (!onboarding.modalOverlay ||
-                !document.body.contains(onboarding.modalOverlay)) {
+            if (!onboarding.modalOverlay || !document.body.contains(onboarding.modalOverlay)) {
                 onboarding.init();
                 // Wait for init to complete
                 setTimeout(() => {
                     if (onboarding.modalOverlay) {
                         // Use requestAnimationFrame to prevent blinking
                         requestAnimationFrame(() => {
-                            onboarding.modalOverlay.classList.remove("onboarding-modal-closing");
-                            onboarding.modalOverlay.classList.add("onboarding-modal-open");
-                            onboarding.modalOverlay.style.display = "flex";
-                            document.body.style.overflow = "hidden";
+                            onboarding.modalOverlay.classList.remove('onboarding-modal-closing');
+                            onboarding.modalOverlay.classList.add('onboarding-modal-open');
+                            onboarding.modalOverlay.style.display = 'flex';
+                            document.body.style.overflow = 'hidden';
                             // Ensure external wallet container is visible when modal opens
-                            if (externalWalletsEnabledRef.current &&
-                                onboarding.externalWalletContainer) {
+                            if (externalWalletsEnabledRef.current && onboarding.externalWalletContainer) {
                                 // Check if we're on OTP screen - if so, don't show external wallets
                                 // Check if OTP screen exists AND is actually visible in the DOM
                                 const isOtpScreen = onboarding.otpVerificationScreen &&
@@ -858,27 +1030,24 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                                     onboarding.otpVerificationScreen.offsetParent !== null;
                                 if (!isOtpScreen) {
                                     // Only show external wallets if not on OTP screen
-                                    onboarding.externalWalletContainer.style.display = "";
+                                    onboarding.externalWalletContainer.style.display = '';
                                     // Show divider only if both email/Google AND external wallets are visible
-                                    const authMethods = onboarding.config?.authMethods || [
-                                        "otp",
-                                        "google",
-                                    ];
-                                    const showEmail = authMethods.includes("otp");
-                                    const showGoogle = authMethods.includes("google");
+                                    const authMethods = onboarding.config?.authMethods || ['otp', 'google'];
+                                    const showEmail = authMethods.includes('otp');
+                                    const showGoogle = authMethods.includes('google');
                                     const hasEmailOrGoogle = showEmail || showGoogle;
                                     if (onboarding.externalWalletDivider && hasEmailOrGoogle) {
-                                        onboarding.externalWalletDivider.style.display = "";
+                                        onboarding.externalWalletDivider.style.display = '';
                                     }
                                     else if (onboarding.externalWalletDivider) {
-                                        onboarding.externalWalletDivider.style.display = "none";
+                                        onboarding.externalWalletDivider.style.display = 'none';
                                     }
                                 }
                                 else {
                                     // On OTP screen - hide external wallets
-                                    onboarding.externalWalletContainer.style.display = "none";
+                                    onboarding.externalWalletContainer.style.display = 'none';
                                     if (onboarding.externalWalletDivider) {
-                                        onboarding.externalWalletDivider.style.display = "none";
+                                        onboarding.externalWalletDivider.style.display = 'none';
                                     }
                                 }
                                 // Always re-render external wallets when modal opens immediately
@@ -903,71 +1072,66 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     const isOtpScreen = onboarding.otpVerificationScreen &&
                         onboarding.otpVerificationScreen.parentElement &&
                         onboarding.otpVerificationScreen.offsetParent !== null;
-                    onboarding.modalOverlay.classList.remove("onboarding-modal-closing");
-                    onboarding.modalOverlay.classList.add("onboarding-modal-open");
-                    onboarding.modalOverlay.style.display = "flex";
+                    onboarding.modalOverlay.classList.remove('onboarding-modal-closing');
+                    onboarding.modalOverlay.classList.add('onboarding-modal-open');
+                    onboarding.modalOverlay.style.display = 'flex';
                     if (onboarding.rootElement) {
-                        onboarding.rootElement.style.display = "";
+                        onboarding.rootElement.style.display = '';
                     }
-                    document.body.style.overflow = "hidden";
+                    document.body.style.overflow = 'hidden';
                     // If on OTP screen, ensure all login elements (social buttons, etc.) are hidden
                     if (isOtpScreen) {
                         // On OTP screen - ensure all login elements are hidden
-                        if (onboarding.hideLoginElements &&
-                            typeof onboarding.hideLoginElements === "function") {
+                        if (onboarding.hideLoginElements && typeof onboarding.hideLoginElements === 'function') {
                             onboarding.hideLoginElements();
                         }
                         else {
                             // Fallback: manually hide elements
                             if (onboarding.googleButton)
-                                onboarding.googleButton.style.display = "none";
+                                onboarding.googleButton.style.display = 'none';
                             if (onboarding.twitterButton)
-                                onboarding.twitterButton.style.display = "none";
+                                onboarding.twitterButton.style.display = 'none';
                             if (onboarding.discordButton)
-                                onboarding.discordButton.style.display = "none";
+                                onboarding.discordButton.style.display = 'none';
                             if (onboarding.socialGrid)
-                                onboarding.socialGrid.style.display = "none";
+                                onboarding.socialGrid.style.display = 'none';
                             if (onboarding.divider)
-                                onboarding.divider.style.display = "none";
+                                onboarding.divider.style.display = 'none';
                             if (onboarding.passkeyLoginButton)
-                                onboarding.passkeyLoginButton.style.display = "none";
+                                onboarding.passkeyLoginButton.style.display = 'none';
                             if (onboarding.passkeySignupLink)
-                                onboarding.passkeySignupLink.style.display = "none";
+                                onboarding.passkeySignupLink.style.display = 'none';
                             if (onboarding.passkeyDivider)
-                                onboarding.passkeyDivider.style.display = "none";
+                                onboarding.passkeyDivider.style.display = 'none';
                             if (onboarding.externalWalletContainer)
-                                onboarding.externalWalletContainer.style.display = "none";
+                                onboarding.externalWalletContainer.style.display = 'none';
                             if (onboarding.externalWalletDivider)
-                                onboarding.externalWalletDivider.style.display = "none";
+                                onboarding.externalWalletDivider.style.display = 'none';
                         }
                     }
                     // CRITICAL: Always ensure external wallets are mounted when modal reopens
-                    if (externalWalletsEnabledRef.current &&
-                        onboarding.externalWalletContainer) {
+                    if (externalWalletsEnabledRef.current && onboarding.externalWalletContainer) {
                         // Check if we're on OTP screen - if so, don't show external wallets
                         if (!isOtpScreen) {
                             // Only show external wallets if not on OTP screen
-                            onboarding.externalWalletContainer.style.display = "";
+                            onboarding.externalWalletContainer.style.display = '';
                             // Show divider only if both email/Google AND external wallets are visible
-                            const authMethods = onboarding.config?.authMethods || [
-                                "otp",
-                                "google",
-                            ];
-                            const showEmail = authMethods.includes("otp");
-                            const showGoogle = authMethods.includes("google");
+                            const authMethods = onboarding.config?.authMethods || ['otp', 'google'];
+                            const showEmail = authMethods.includes('otp');
+                            const showGoogle = authMethods.includes('google');
                             const hasEmailOrGoogle = showEmail || showGoogle;
                             if (onboarding.externalWalletDivider && hasEmailOrGoogle) {
-                                onboarding.externalWalletDivider.style.display = "";
+                                onboarding.externalWalletDivider.style.display = '';
                             }
                             else if (onboarding.externalWalletDivider) {
-                                onboarding.externalWalletDivider.style.display = "none";
+                                onboarding.externalWalletDivider.style.display = 'none';
                             }
                         }
                         else {
                             // On OTP screen - hide external wallets
-                            onboarding.externalWalletContainer.style.display = "none";
+                            onboarding.externalWalletContainer.style.display = 'none';
                             if (onboarding.externalWalletDivider) {
-                                onboarding.externalWalletDivider.style.display = "none";
+                                onboarding.externalWalletDivider.style.display = 'none';
                             }
                         }
                         // Always re-render external wallets when modal opens (even if already mounted)
@@ -978,7 +1142,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                                 return;
                             }
                             // Use the reusable mount function (will be defined later, but accessible via closure)
-                            if (typeof mountExternalWalletsToContainer === "function") {
+                            if (typeof mountExternalWalletsToContainer === 'function') {
                                 mountExternalWalletsToContainer(container, onboarding);
                             }
                         }, 50); // Reduced delay for faster initial render
@@ -1049,7 +1213,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                             setAddress(addr);
                         }
                         catch (addrErr) {
-                            console.warn("Address not available during restore:", addrErr);
+                            console.warn('Address not available during restore:', addrErr);
                         }
                         const cid = await walletRef.current.getChainId();
                         setChainId(cid);
@@ -1065,16 +1229,16 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                         }
                     }
                     catch (restoreErr) {
-                        console.error("Error restoring connection state:", restoreErr);
+                        console.error('Error restoring connection state:', restoreErr);
                         setIsConnected(false);
                     }
                 }
             }
         }
         catch (err) {
-            const error = err instanceof Error ? err : new Error("Failed to initialize");
+            const error = err instanceof Error ? err : new Error('Failed to initialize');
             setError(error);
-            console.error("Init error:", err);
+            console.error('Init error:', err);
         }
         finally {
             setLoading(false);
@@ -1097,7 +1261,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 setAddress(addr);
             }
             catch (err) {
-                console.error("Error loading whoami after connect:", err);
+                console.error('Error loading whoami after connect:', err);
             }
         }
         catch (err) {
@@ -1107,7 +1271,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 setError(err);
             }
             else {
-                setError(err instanceof Error ? err : new Error("Failed to connect"));
+                setError(err instanceof Error ? err : new Error('Failed to connect'));
             }
         }
         finally {
@@ -1123,13 +1287,11 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             const wasExternalWalletConnected = isExternalWalletConnected;
             const wasAbstraxnWalletConnected = walletRef.current?.isConnected ?? false;
             // If external wallet is connected, disconnect it first
-            if (wasExternalWalletConnected &&
-                externalWalletsEnabled &&
-                wagmiDisconnect) {
+            if (wasExternalWalletConnected && externalWalletsEnabled && wagmiDisconnect) {
                 try {
                     await wagmiDisconnect.disconnect();
                     // Wait a bit to ensure wagmi state updates
-                    await new Promise((resolve) => setTimeout(resolve, 150));
+                    await new Promise(resolve => setTimeout(resolve, 150));
                     // Reset external wallet state immediately
                     setIsExternalWalletConnected(false);
                     setExternalWalletAddress(null);
@@ -1176,7 +1338,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     // console.log('✅ Abstraxn wallet disconnected, main state reset');
                 }
                 catch (err) {
-                    console.error("Error disconnecting Abstraxn wallet:", err);
+                    console.error('Error disconnecting Abstraxn wallet:', err);
                     // Continue even if Abstraxn wallet disconnect fails, but still reset state
                     setIsConnected(false);
                     setAddress(null);
@@ -1214,17 +1376,16 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 const onboarding = onboardingRef.current;
                 onboarding.resetToLoginForm();
                 // If modal is visible (showing OTP screen), ensure it shows the login form
-                if (onboarding.modalOverlay &&
-                    onboarding.modalOverlay.style.display !== "none") {
+                if (onboarding.modalOverlay && onboarding.modalOverlay.style.display !== 'none') {
                     // Modal is visible, just reset the form (already done above)
                     // Ensure modal is in open state
-                    onboarding.modalOverlay.classList.remove("onboarding-modal-closing");
-                    onboarding.modalOverlay.classList.add("onboarding-modal-open");
+                    onboarding.modalOverlay.classList.remove('onboarding-modal-closing');
+                    onboarding.modalOverlay.classList.add('onboarding-modal-open');
                 }
             }
         }
         catch (err) {
-            setError(err instanceof Error ? err : new Error("Failed to disconnect"));
+            setError(err instanceof Error ? err : new Error('Failed to disconnect'));
             throw err;
         }
         finally {
@@ -1241,15 +1402,15 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         if (onboardingRef.current) {
             const onboarding = onboardingRef.current;
             if (onboarding.modalOverlay) {
-                onboarding.modalOverlay.classList.remove("onboarding-modal-open");
-                onboarding.modalOverlay.classList.add("onboarding-modal-closing");
+                onboarding.modalOverlay.classList.remove('onboarding-modal-open');
+                onboarding.modalOverlay.classList.add('onboarding-modal-closing');
                 setTimeout(() => {
                     if (onboarding.modalOverlay) {
-                        onboarding.modalOverlay.style.display = "none";
+                        onboarding.modalOverlay.style.display = 'none';
                     }
                 }, 200);
             }
-            document.body.style.overflow = "";
+            document.body.style.overflow = '';
         }
     }, []);
     // Get address - works for both Abstraxn wallet and external wallets
@@ -1261,7 +1422,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         }
         // Otherwise use Abstraxn wallet
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         return await walletRef.current.getAddress();
     }, [isExternalWalletConnected, externalWalletAddress]);
     // Get chain ID - works for both Abstraxn wallet and external wallets
@@ -1273,7 +1434,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         }
         // Otherwise use Abstraxn wallet
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         return await walletRef.current.getChainId();
     }, [isExternalWalletConnected, externalWalletChainId]);
     // Switch chain - works for both Abstraxn wallet and external wallets
@@ -1286,7 +1447,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 await wagmiSwitchChain.switchChainAsync({ chainId: newChainId });
             }
             catch (err) {
-                const error = err instanceof Error ? err : new Error("Failed to switch chain");
+                const error = err instanceof Error ? err : new Error('Failed to switch chain');
                 setError(error);
                 throw error;
             }
@@ -1297,12 +1458,12 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         else {
             // Otherwise use Abstraxn wallet
             if (!walletRef.current)
-                throw new Error("Wallet not initialized");
+                throw new Error('Wallet not initialized');
             try {
                 await walletRef.current.switchChain(newChainId);
             }
             catch (err) {
-                setError(err instanceof Error ? err : new Error("Failed to switch chain"));
+                setError(err instanceof Error ? err : new Error('Failed to switch chain'));
                 throw err;
             }
         }
@@ -1311,18 +1472,14 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     const signMessage = useCallback(async (message) => {
         setError(null);
         // If external wallet is connected, use wagmi
-        if (isExternalWalletConnected &&
-            externalWalletAddress &&
-            wagmiSignMessage) {
+        if (isExternalWalletConnected && externalWalletAddress && wagmiSignMessage) {
             try {
                 setLoading(true);
-                const signature = await wagmiSignMessage.signMessageAsync({
-                    message,
-                });
+                const signature = await wagmiSignMessage.signMessageAsync({ message });
                 return signature;
             }
             catch (err) {
-                const error = err instanceof Error ? err : new Error("Failed to sign message");
+                const error = err instanceof Error ? err : new Error('Failed to sign message');
                 setError(error);
                 throw error;
             }
@@ -1332,12 +1489,12 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         }
         // Otherwise use Abstraxn wallet
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         try {
             return await walletRef.current.signMessage(message);
         }
         catch (err) {
-            setError(err instanceof Error ? err : new Error("Failed to sign message"));
+            setError(err instanceof Error ? err : new Error('Failed to sign message'));
             throw err;
         }
     }, [isExternalWalletConnected, externalWalletAddress, wagmiSignMessage]);
@@ -1345,12 +1502,12 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     const signTransaction = useCallback(async (tx) => {
         setError(null); // Clear any previous errors
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         try {
             return await walletRef.current.signTransaction(tx);
         }
         catch (err) {
-            setError(err instanceof Error ? err : new Error("Failed to sign transaction"));
+            setError(err instanceof Error ? err : new Error('Failed to sign transaction'));
             throw err;
         }
     }, []);
@@ -1358,9 +1515,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     const sendTransaction = useCallback(async (tx) => {
         setError(null);
         // If external wallet is connected, use wagmi
-        if (isExternalWalletConnected &&
-            externalWalletAddress &&
-            wagmiSendTransaction) {
+        if (isExternalWalletConnected && externalWalletAddress && wagmiSendTransaction) {
             try {
                 setLoading(true);
                 // Convert TransactionRequest to wagmi format
@@ -1368,10 +1523,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     to: tx.to,
                 };
                 if (tx.value) {
-                    wagmiTx.value =
-                        typeof tx.value === "string"
-                            ? parseEther(tx.value)
-                            : BigInt(tx.value);
+                    wagmiTx.value = typeof tx.value === 'string' ? parseEther(tx.value) : BigInt(tx.value);
                 }
                 if (tx.data) {
                     wagmiTx.data = tx.data;
@@ -1394,9 +1546,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 };
             }
             catch (err) {
-                const error = err instanceof Error
-                    ? err
-                    : new Error("Failed to send transaction");
+                const error = err instanceof Error ? err : new Error('Failed to send transaction');
                 setError(error);
                 throw error;
             }
@@ -1406,26 +1556,26 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         }
         // Otherwise use Abstraxn wallet
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         try {
             return await walletRef.current.sendTransaction(tx);
         }
         catch (err) {
-            setError(err instanceof Error ? err : new Error("Failed to send transaction"));
+            setError(err instanceof Error ? err : new Error('Failed to send transaction'));
             throw err;
         }
     }, [isExternalWalletConnected, externalWalletAddress, wagmiSendTransaction]);
     // Sign transaction via API (returns signed transaction)
     const signTransactionViaAPI = useCallback(async (unsignedTransaction, fromAddress) => {
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         setLoading(true);
         setError(null);
         try {
             return await walletRef.current.signTransactionViaAPI(unsignedTransaction, fromAddress);
         }
         catch (err) {
-            const error = err instanceof Error ? err : new Error("Failed to sign transaction");
+            const error = err instanceof Error ? err : new Error('Failed to sign transaction');
             setError(error);
             throw error;
         }
@@ -1436,16 +1586,14 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     // Sign and send transaction using backend API
     const signAndSendTransaction = useCallback(async (unsignedTransaction, fromAddress, rpcUrl) => {
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         setLoading(true);
         setError(null);
         try {
             return await walletRef.current.signAndSendTransaction(unsignedTransaction, fromAddress, rpcUrl);
         }
         catch (err) {
-            const error = err instanceof Error
-                ? err
-                : new Error("Failed to sign and send transaction");
+            const error = err instanceof Error ? err : new Error('Failed to sign and send transaction');
             setError(error);
             throw error;
         }
@@ -1456,7 +1604,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     // Login with email OTP (initiate OTP)
     const loginWithOTP = useCallback(async (email) => {
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         setLoading(true);
         setError(null);
         try {
@@ -1472,7 +1620,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             return result;
         }
         catch (err) {
-            const error = err instanceof Error ? err : new Error("Failed to initiate OTP");
+            const error = err instanceof Error ? err : new Error('Failed to initiate OTP');
             setError(error);
             throw error;
         }
@@ -1483,7 +1631,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     // Verify OTP
     const verifyOTP = useCallback(async (otpId, otpCode) => {
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         setLoading(true);
         setError(null);
         try {
@@ -1517,11 +1665,11 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 setChainId(cid);
             }
             catch (err) {
-                console.error("Error loading whoami after OTP verification:", err);
+                console.error('Error loading whoami after OTP verification:', err);
             }
         }
         catch (err) {
-            const error = err instanceof Error ? err : new Error("Failed to verify OTP");
+            const error = err instanceof Error ? err : new Error('Failed to verify OTP');
             setError(error);
             throw error;
         }
@@ -1532,7 +1680,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     // Login with Google
     const loginWithGoogle = useCallback(async () => {
         if (!walletRef.current)
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         setLoading(true);
         setError(null);
         try {
@@ -1548,16 +1696,14 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             // Note: This will redirect, so loading state will be reset on callback
         }
         catch (err) {
-            const error = err instanceof Error
-                ? err
-                : new Error("Failed to initiate Google login");
+            const error = err instanceof Error ? err : new Error('Failed to initiate Google login');
             setError(error);
             setLoading(false);
             throw error;
         }
     }, []);
     // Handle Google callback
-    const handleGoogleCallback = useCallback(async () => {
+    const handleGoogleCallback = useCallback(async (_force = false) => {
         if (!walletRef.current)
             return;
         setLoading(true);
@@ -1584,9 +1730,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             }
         }
         catch (err) {
-            const error = err instanceof Error
-                ? err
-                : new Error("Failed to handle Google callback");
+            const error = err instanceof Error ? err : new Error('Failed to handle Google callback');
             setError(error);
             throw error;
         }
@@ -1622,7 +1766,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             return whoamiInfo;
         }
         catch (err) {
-            const error = err instanceof Error ? err : new Error("Failed to refresh whoami");
+            const error = err instanceof Error ? err : new Error('Failed to refresh whoami');
             setError(error);
             throw error;
         }
@@ -1646,10 +1790,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         // 2. We don't have explicitConnectionRef set (meaning user didn't explicitly connect)
         // 3. We haven't already handled auto-disconnect
         // 4. We don't have a stored address (meaning this isn't a restoration from persistence)
-        if (wagmiAccount.isConnected &&
-            !explicitConnectionRef.current &&
-            !autoDisconnectHandledRef.current &&
-            lastAddressRef.current === null) {
+        if (wagmiAccount.isConnected && !explicitConnectionRef.current && !autoDisconnectHandledRef.current && lastAddressRef.current === null) {
             autoDisconnectHandledRef.current = true;
             if (wagmiDisconnect) {
                 setTimeout(() => {
@@ -1696,7 +1837,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         if (wagmiAccount.isConnected && wagmiAccount.address) {
             const walletAddress = wagmiAccount.address;
             // Ensure address is properly formatted (should be 0x...)
-            const formattedAddress = walletAddress && typeof walletAddress === "string"
+            const formattedAddress = walletAddress && typeof walletAddress === 'string'
                 ? walletAddress.toLowerCase()
                 : walletAddress;
             // Use wagmiChainIdHook first (more reliable), then fallback to wagmiAccount.chainId
@@ -1706,9 +1847,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             const chainIdChanged = lastChainIdRef.current !== currentChainId;
             // Also check if we need to reconnect (lastAddressRef is null but wagmiAccount is connected)
             // This handles the case where user disconnects and then reconnects, OR page reload
-            const needsReconnect = lastAddressRef.current === null &&
-                wagmiAccount.isConnected &&
-                formattedAddress;
+            const needsReconnect = lastAddressRef.current === null && wagmiAccount.isConnected && formattedAddress;
             // Only update if something actually changed OR if we need to reconnect
             if (addressChanged || chainIdChanged || needsReconnect) {
                 isUpdatingRef.current = true;
@@ -1727,8 +1866,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     lastConnectionTimeRef.current = Date.now();
                 }
                 // Update chainId if it changed or if we need to reconnect
-                if ((chainIdChanged && currentChainId) ||
-                    (needsReconnect && currentChainId)) {
+                if ((chainIdChanged && currentChainId) || (needsReconnect && currentChainId)) {
                     setExternalWalletChainId(currentChainId);
                     setChainId(currentChainId);
                     lastChainIdRef.current = currentChainId;
@@ -1740,14 +1878,14 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     if (onboardingAny.modalOverlay) {
                         setTimeout(() => {
                             if (onboardingAny.modalOverlay) {
-                                onboardingAny.modalOverlay.classList.remove("onboarding-modal-open");
-                                onboardingAny.modalOverlay.classList.add("onboarding-modal-closing");
+                                onboardingAny.modalOverlay.classList.remove('onboarding-modal-open');
+                                onboardingAny.modalOverlay.classList.add('onboarding-modal-closing');
                                 setTimeout(() => {
                                     if (onboardingAny.modalOverlay) {
-                                        onboardingAny.modalOverlay.style.display = "none";
+                                        onboardingAny.modalOverlay.style.display = 'none';
                                     }
                                 }, 200);
-                                document.body.style.overflow = "";
+                                document.body.style.overflow = '';
                             }
                         }, 100);
                     }
@@ -1787,14 +1925,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 clearTimeout(checkAddressTimeout);
             }
         };
-    }, [
-        wagmiAccount?.isConnected,
-        wagmiAccount?.address,
-        wagmiAccount?.chainId,
-        wagmiChainIdHook,
-        externalWalletsEnabled,
-        wagmiDisconnect,
-    ]);
+    }, [wagmiAccount?.isConnected, wagmiAccount?.address, wagmiAccount?.chainId, wagmiChainIdHook, externalWalletsEnabled, wagmiDisconnect]);
     // Connect external wallet
     const connectExternalWallet = useCallback(async (connectorId) => {
         if (!externalWalletsEnabled || !wagmiConnect || !wagmiDisconnect) {
@@ -2000,7 +2131,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             // Await the disconnect to ensure it completes
             await wagmiDisconnect.disconnect();
             // Wait a bit to ensure wagmi state updates
-            await new Promise((resolve) => setTimeout(resolve, 150));
+            await new Promise(resolve => setTimeout(resolve, 150));
             // Reset external wallet state immediately
             setIsExternalWalletConnected(false);
             setExternalWalletAddress(null);
@@ -2027,10 +2158,8 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             setConnectionType(null);
         }
         catch (err) {
-            const error = err instanceof Error
-                ? err
-                : new Error("Failed to disconnect external wallet");
-            console.error("Error disconnecting external wallet:", error);
+            const error = err instanceof Error ? err : new Error('Failed to disconnect external wallet');
+            console.error('Error disconnecting external wallet:', error);
             setError(error);
             throw error;
         }
@@ -2045,27 +2174,27 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     // Helper function to get network name from chain ID
     const getNetworkName = useCallback((chainId) => {
         const chainNames = {
-            1: "Ethereum Mainnet",
-            5: "Goerli",
-            11155111: "Sepolia",
-            137: "Polygon",
-            80001: "Mumbai",
-            80002: "Polygon Amoy",
-            8453: "Base",
-            84531: "Base Goerli",
-            42161: "Arbitrum One",
-            421613: "Arbitrum Goerli",
-            10: "Optimism",
-            420: "Optimism Goerli",
-            56: "BNB Smart Chain",
-            97: "BNB Smart Chain Testnet",
+            1: 'Ethereum Mainnet',
+            5: 'Goerli',
+            11155111: 'Sepolia',
+            137: 'Polygon',
+            80001: 'Mumbai',
+            80002: 'Polygon Amoy',
+            8453: 'Base',
+            84531: 'Base Goerli',
+            42161: 'Arbitrum One',
+            421613: 'Arbitrum Goerli',
+            10: 'Optimism',
+            420: 'Optimism Goerli',
+            56: 'BNB Smart Chain',
+            97: 'BNB Smart Chain Testnet',
         };
         return chainNames[chainId] || `Chain ${chainId}`;
     }, []);
     // Switch external wallet chain (dedicated function for external wallets)
     const switchExternalWalletChain = useCallback(async (chainId) => {
         if (!externalWalletsEnabled || !wagmiSwitchChain) {
-            const error = new Error("External wallets are not enabled or chain switching is not available");
+            const error = new Error('External wallets are not enabled or chain switching is not available');
             setError(error);
             throw error;
         }
@@ -2079,9 +2208,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             setExternalWalletChainId(chainId);
         }
         catch (err) {
-            const error = err instanceof Error
-                ? err
-                : new Error(`Failed to switch chain: ${err instanceof Error ? err.message : String(err)}`);
+            const error = err instanceof Error ? err : new Error(`Failed to switch chain: ${err instanceof Error ? err.message : String(err)}`);
             setError(error);
             throw error;
         }
@@ -2096,8 +2223,8 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         ? wagmiConnect.connectors
             .filter((connector) => {
             // If io.metamask exists, exclude generic 'injected' connector
-            const hasIoMetaMask = wagmiConnect.connectors.some((c) => c.id === "io.metamask");
-            if (hasIoMetaMask && connector.id === "injected") {
+            const hasIoMetaMask = wagmiConnect.connectors.some((c) => c.id === 'io.metamask');
+            if (hasIoMetaMask && connector.id === 'injected') {
                 return false; // Exclude generic injected when io.metamask is available
             }
             return true;
@@ -2125,7 +2252,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         const fetchBalance = async () => {
             try {
                 const currentChain = getChainById(currentChainId);
-                if (!currentChain || currentChain.type !== "evm") {
+                if (!currentChain || currentChain.type !== 'evm') {
                     setWalletBalance(null);
                     return;
                 }
@@ -2148,7 +2275,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 setWalletBalance(balance);
             }
             catch (error) {
-                console.error("Failed to fetch balance:", error);
+                console.error('Failed to fetch balance:', error);
                 setWalletBalance(null);
             }
         };
@@ -2162,10 +2289,9 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         const chains = [];
         const chainConfig = config.chains;
         // Priority 1: Check new chains config format
-        if (chainConfig?.supportedEvmChains &&
-            chainConfig.supportedEvmChains.length > 0) {
+        if (chainConfig?.supportedEvmChains && chainConfig.supportedEvmChains.length > 0) {
             // Use configured chains from new format
-            chainConfig.supportedEvmChains.forEach((chainName) => {
+            chainConfig.supportedEvmChains.forEach(chainName => {
                 const chain = EVM_CHAINS[chainName];
                 if (chain) {
                     chains.push(chain);
@@ -2175,7 +2301,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         // Priority 2: Check legacy supportedChains format
         else if (config.supportedChains && config.supportedChains.length > 0) {
             // Convert legacy Chain format to ChainData
-            config.supportedChains.forEach((legacyChain) => {
+            config.supportedChains.forEach(legacyChain => {
                 // Try to find matching chain by ID
                 const chainData = getChainById(legacyChain.id);
                 if (chainData) {
@@ -2185,15 +2311,13 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     // If not found, create ChainData from legacy chain
                     const newChain = {
                         id: legacyChain.id,
-                        name: legacyChain.name.toLowerCase().replace(/\s+/g, "-"),
+                        name: legacyChain.name.toLowerCase().replace(/\s+/g, '-'),
                         displayName: legacyChain.name,
                         rpcUrl: legacyChain.rpcUrl,
                         explorerUrl: `https://etherscan.io`, // Default explorer
                         nativeCurrency: legacyChain.nativeCurrency,
-                        type: "evm", // Assume EVM for legacy chains
-                        isTestnet: legacyChain.id !== 1 &&
-                            legacyChain.id !== 137 &&
-                            legacyChain.id !== 8453, // Common mainnets
+                        type: 'evm', // Assume EVM for legacy chains
+                        isTestnet: legacyChain.id !== 1 && legacyChain.id !== 137 && legacyChain.id !== 8453, // Common mainnets
                     };
                     chains.push(newChain);
                 }
@@ -2209,13 +2333,13 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             chains.push(SOLANA_CHAINS.solana);
         }
         // Remove duplicates by chain ID
-        const uniqueChains = chains.filter((chain, index, self) => index === self.findIndex((c) => c.id === chain.id));
+        const uniqueChains = chains.filter((chain, index, self) => index === self.findIndex(c => c.id === chain.id));
         // Only return defaults if absolutely nothing was configured
         return uniqueChains.length > 0
             ? uniqueChains
-            : !chainConfig && !config.supportedChains
+            : (!chainConfig && !config.supportedChains
                 ? [EVM_CHAINS.ethereum, EVM_CHAINS.polygon, EVM_CHAINS.base]
-                : [];
+                : []);
     }, [config.chains, config.supportedChains]);
     // Get current chain data
     const currentChain = useMemo(() => {
@@ -2226,10 +2350,10 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     // Enhanced switchChain that works for both EVM and Solana
     const switchChainEnhanced = useCallback(async (targetChainId) => {
         if (!walletRef.current) {
-            throw new Error("Wallet not initialized");
+            throw new Error('Wallet not initialized');
         }
         // Check if chain is in availableChains (user-configured chains)
-        const targetChainInAvailable = availableChains?.find((c) => c.id === targetChainId);
+        const targetChainInAvailable = availableChains?.find(c => c.id === targetChainId);
         if (!targetChainInAvailable) {
             throw new Error(`Chain with ID ${targetChainId} is not available. Please configure it in your SDK setup.`);
         }
@@ -2240,7 +2364,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         setLoading(true);
         setError(null);
         try {
-            if (targetChain.type === "evm") {
+            if (targetChain.type === 'evm') {
                 // For EVM chains, use the existing switchChain
                 if (isExternalWalletConnected && wagmiSwitchChain) {
                     // External wallet - use wagmi switchChain
@@ -2256,14 +2380,12 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     catch (switchErr) {
                         // If the wallet doesn't support this chain, but it's in availableChains,
                         // we can still update the state to allow UI to work
-                        if (switchErr?.message?.includes("not supported") &&
-                            targetChainInAvailable) {
+                        if (switchErr?.message?.includes('not supported') && targetChainInAvailable) {
                             // Update chainId state directly for chains in availableChains
                             setChainId(targetChainId);
                             // Emit chainChanged event if wallet supports it
-                            if (walletRef.current &&
-                                typeof walletRef.current.emit === "function") {
-                                walletRef.current.emit("chainChanged", targetChainId);
+                            if (walletRef.current && typeof walletRef.current.emit === 'function') {
+                                walletRef.current.emit('chainChanged', targetChainId);
                             }
                         }
                         else {
@@ -2272,7 +2394,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     }
                 }
             }
-            else if (targetChain.type === "solana") {
+            else if (targetChain.type === 'solana') {
                 // For Solana, we might need different handling
                 // For now, just update the chainId state
                 // TODO: Implement actual Solana chain switching when wallet supports it
@@ -2284,9 +2406,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             }
         }
         catch (err) {
-            const error = err instanceof Error
-                ? err
-                : new Error(`Failed to switch to chain ${targetChainId}: ${err instanceof Error ? err.message : String(err)}`);
+            const error = err instanceof Error ? err : new Error(`Failed to switch to chain ${targetChainId}: ${err instanceof Error ? err.message : String(err)}`);
             setError(error);
             throw error;
         }
@@ -2320,41 +2440,19 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         loginWithOTP,
         verifyOTP,
         loginWithGoogle,
-        handleGoogleCallback,
+        handleGoogleCallback: () => handleGoogleCallback(true),
         refreshWhoami,
         uiConfig: config.ui,
         // External wallet methods
-        connectExternalWallet: externalWalletsEnabled
-            ? connectExternalWallet
-            : undefined,
-        disconnectExternalWallet: externalWalletsEnabled
-            ? disconnectExternalWallet
-            : undefined,
-        isExternalWalletConnected: externalWalletsEnabled
-            ? isExternalWalletConnected
-            : undefined,
-        externalWalletAddress: externalWalletsEnabled
-            ? externalWalletAddress
-            : undefined,
-        externalWalletChainId: externalWalletsEnabled
-            ? externalWalletChainId
-            : undefined,
-        externalWalletBalance: externalWalletsEnabled &&
-            wagmiBalance?.data &&
-            typeof wagmiBalance.data === "object" &&
-            wagmiBalance.data !== null &&
-            "value" in wagmiBalance.data
-            ? wagmiBalance.data.value
-            : undefined,
-        externalWalletNetwork: externalWalletsEnabled && wagmiChainIdHook
-            ? getNetworkName(wagmiChainIdHook)
-            : undefined,
-        availableConnectors: externalWalletsEnabled
-            ? availableConnectors
-            : undefined,
-        switchExternalWalletChain: externalWalletsEnabled
-            ? switchExternalWalletChain
-            : undefined,
+        connectExternalWallet: externalWalletsEnabled ? connectExternalWallet : undefined,
+        disconnectExternalWallet: externalWalletsEnabled ? disconnectExternalWallet : undefined,
+        isExternalWalletConnected: externalWalletsEnabled ? isExternalWalletConnected : undefined,
+        externalWalletAddress: externalWalletsEnabled ? externalWalletAddress : undefined,
+        externalWalletChainId: externalWalletsEnabled ? externalWalletChainId : undefined,
+        externalWalletBalance: externalWalletsEnabled && wagmiBalance?.data && typeof wagmiBalance.data === 'object' && wagmiBalance.data !== null && 'value' in wagmiBalance.data ? wagmiBalance.data.value : undefined,
+        externalWalletNetwork: externalWalletsEnabled && wagmiChainIdHook ? getNetworkName(wagmiChainIdHook) : undefined,
+        availableConnectors: externalWalletsEnabled ? availableConnectors : undefined,
+        switchExternalWalletChain: externalWalletsEnabled ? switchExternalWalletChain : undefined,
         // Chain management
         switchChainEnhanced,
         currentChain,
@@ -2389,27 +2487,24 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             onboardingAny.otpVerificationScreen.offsetParent !== null;
         if (!isOtpScreen) {
             // Only show external wallets if not on OTP screen
-            container.style.display = "";
+            container.style.display = '';
             // Show divider only if both email/Google AND external wallets are visible
-            const authMethods = onboardingAny.config?.authMethods || [
-                "otp",
-                "google",
-            ];
-            const showEmail = authMethods.includes("otp");
-            const showGoogle = authMethods.includes("google");
+            const authMethods = onboardingAny.config?.authMethods || ['otp', 'google'];
+            const showEmail = authMethods.includes('otp');
+            const showGoogle = authMethods.includes('google');
             const hasEmailOrGoogle = showEmail || showGoogle;
             if (onboardingAny.externalWalletDivider && hasEmailOrGoogle) {
-                onboardingAny.externalWalletDivider.style.display = "";
+                onboardingAny.externalWalletDivider.style.display = '';
             }
             else if (onboardingAny.externalWalletDivider) {
-                onboardingAny.externalWalletDivider.style.display = "none";
+                onboardingAny.externalWalletDivider.style.display = 'none';
             }
         }
         else {
             // On OTP screen - hide external wallets
-            container.style.display = "none";
+            container.style.display = 'none';
             if (onboardingAny.externalWalletDivider) {
-                onboardingAny.externalWalletDivider.style.display = "none";
+                onboardingAny.externalWalletDivider.style.display = 'none';
             }
             return;
         }
@@ -2418,79 +2513,69 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         // Check if the container is the same as the one we created the root for
         const isSameContainer = externalWalletContainerRef.current === container;
         const rootStillValid = externalWalletRootRef.current && containerInDOM && isSameContainer;
-        const renderExternalWalletButtons = () => (_jsx(AbstraxnContext.Provider, { value: valueRef.current, children: _jsx(ExternalWalletButtons, { onConnect: async () => { }, onShowMoreWallets: () => {
+        const renderExternalWalletButtons = () => (_jsx(AbstraxnContext.Provider, { value: valueRef.current, children: _jsx(ExternalWalletButtons, { onConnect: async () => {
+                }, onShowMoreWallets: () => {
                     const onboardingAny = onboardingRef.current;
                     if (onboardingAny?.emailForm) {
-                        onboardingAny.emailForm.style.display = "none";
+                        onboardingAny.emailForm.style.display = 'none';
                     }
                     if (onboardingAny?.googleButton) {
-                        onboardingAny.googleButton.style.display = "none";
+                        onboardingAny.googleButton.style.display = 'none';
                     }
                     // Hide all passkey elements when wallet selection screen is shown
                     if (onboardingAny?.passkeyLoginButton) {
-                        onboardingAny.passkeyLoginButton.style.display = "none";
+                        onboardingAny.passkeyLoginButton.style.display = 'none';
                     }
                     if (onboardingAny?.passkeySignupLink) {
-                        onboardingAny.passkeySignupLink.style.display = "none";
+                        onboardingAny.passkeySignupLink.style.display = 'none';
                     }
                     if (onboardingAny?.passkeyErrorElement) {
-                        onboardingAny.passkeyErrorElement.style.display = "none";
+                        onboardingAny.passkeyErrorElement.style.display = 'none';
                     }
                     if (onboardingAny?.passkeyDivider) {
-                        onboardingAny.passkeyDivider.style.display = "none";
+                        onboardingAny.passkeyDivider.style.display = 'none';
                     }
                     if (onboardingAny?.externalWalletDivider) {
-                        onboardingAny.externalWalletDivider.style.display = "none";
+                        onboardingAny.externalWalletDivider.style.display = 'none';
                     }
                     if (onboardingAny?.divider) {
-                        onboardingAny.divider.style.display = "none";
+                        onboardingAny.divider.style.display = 'none';
                     }
                 }, onHideMoreWallets: () => {
                     const onboardingAny = onboardingRef.current;
-                    const authMethods = onboardingAny?.config?.authMethods || [
-                        "otp",
-                        "google",
-                    ];
-                    const showEmail = authMethods.includes("otp");
-                    const showGoogle = authMethods.includes("google");
-                    const showPasskey = authMethods.includes("passkey");
+                    const authMethods = onboardingAny?.config?.authMethods || ['otp', 'google'];
+                    const showEmail = authMethods.includes('otp');
+                    const showGoogle = authMethods.includes('google');
+                    const showPasskey = authMethods.includes('passkey');
                     if (onboardingAny?.emailForm) {
-                        onboardingAny.emailForm.style.display = showEmail ? "" : "none";
+                        onboardingAny.emailForm.style.display = showEmail ? '' : 'none';
                     }
                     if (onboardingAny?.googleButton) {
-                        onboardingAny.googleButton.style.display = showGoogle
-                            ? ""
-                            : "none";
+                        onboardingAny.googleButton.style.display = showGoogle ? '' : 'none';
                     }
                     // Show passkey controls if enabled
                     if (onboardingAny?.passkeyLoginButton) {
-                        onboardingAny.passkeyLoginButton.style.display = showPasskey
-                            ? ""
-                            : "none";
+                        onboardingAny.passkeyLoginButton.style.display = showPasskey ? '' : 'none';
                     }
                     if (onboardingAny?.passkeySignupLink) {
-                        onboardingAny.passkeySignupLink.style.display = showPasskey
-                            ? ""
-                            : "none";
+                        onboardingAny.passkeySignupLink.style.display = showPasskey ? '' : 'none';
                     }
                     if (onboardingAny?.passkeyErrorElement) {
-                        onboardingAny.passkeyErrorElement.style.display = "none";
+                        onboardingAny.passkeyErrorElement.style.display = 'none';
                     }
                     // Show passkey divider if passkey is enabled and there are other auth methods
                     if (onboardingAny?.passkeyDivider) {
-                        onboardingAny.passkeyDivider.style.display =
-                            showPasskey && (showEmail || showGoogle) ? "" : "none";
+                        onboardingAny.passkeyDivider.style.display = (showPasskey && (showEmail || showGoogle)) ? '' : 'none';
                     }
                     if (onboardingAny?.divider) {
-                        onboardingAny.divider.style.display =
-                            showEmail && showGoogle ? "" : "none";
+                        onboardingAny.divider.style.display = (showEmail && showGoogle) ? '' : 'none';
                     }
                     const hasEmailOrGoogle = showEmail || showGoogle;
                     if (onboardingAny?.externalWalletDivider && hasEmailOrGoogle) {
-                        onboardingAny.externalWalletDivider.style.display = "";
+                        onboardingAny.externalWalletDivider.style.display = '';
                     }
                     else if (onboardingAny?.externalWalletDivider) {
-                        onboardingAny.externalWalletDivider.style.display = "none";
+                        onboardingAny.externalWalletDivider.style.display = 'none';
                     }
                 } }) }));
         if (rootStillValid) {
@@ -2511,7 +2596,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     }
                     externalWalletRootRef.current = null;
                 }
-                const reactDomClient = await import("react-dom/client");
+                const reactDomClient = await import('react-dom/client');
                 const rootInstance = reactDomClient.createRoot(container);
                 externalWalletRootRef.current = rootInstance;
                 externalWalletContainerRef.current = container; // Track the container
@@ -2529,23 +2614,23 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             // When disabled, ensure container is hidden
             const onboardingAny = onboardingRef.current;
             if (onboardingAny?.externalWalletContainer) {
-                onboardingAny.externalWalletContainer.style.display = "none";
+                onboardingAny.externalWalletContainer.style.display = 'none';
             }
             if (onboardingAny?.externalWalletDivider) {
-                onboardingAny.externalWalletDivider.style.display = "none";
+                onboardingAny.externalWalletDivider.style.display = 'none';
             }
             return;
         }
         if (!onboardingRef.current) {
-            console.log("OnboardingUI not initialized yet");
+            console.log('OnboardingUI not initialized yet');
             return;
         }
         if (!wagmiConnect) {
-            console.log("Wagmi connect not available");
+            console.log('Wagmi connect not available');
             return;
         }
         if (!wagmiConnect.connectors || wagmiConnect.connectors.length === 0) {
-            console.log("Wagmi connectors not ready yet");
+            console.log('Wagmi connectors not ready yet');
             return;
         }
         if (availableConnectors.length === 0) {
@@ -2568,7 +2653,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             try {
                 const container = onboardingAny.externalWalletContainer;
                 if (!container) {
-                    console.warn("External wallet container is null");
+                    console.warn('External wallet container is null');
                     return;
                 }
                 // Check if we're on OTP screen - if so, don't show external wallets
@@ -2579,27 +2664,24 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 if (!isOtpScreen) {
                     // Only show external wallets if not on OTP screen
                     // Force container to be visible when external wallets are enabled
-                    container.style.display = "";
+                    container.style.display = '';
                     // Show divider only if both email/Google AND external wallets are visible
-                    const authMethods = onboardingAny.config?.authMethods || [
-                        "otp",
-                        "google",
-                    ];
-                    const showEmail = authMethods.includes("otp");
-                    const showGoogle = authMethods.includes("google");
+                    const authMethods = onboardingAny.config?.authMethods || ['otp', 'google'];
+                    const showEmail = authMethods.includes('otp');
+                    const showGoogle = authMethods.includes('google');
                     const hasEmailOrGoogle = showEmail || showGoogle;
                     if (onboardingAny.externalWalletDivider && hasEmailOrGoogle) {
-                        onboardingAny.externalWalletDivider.style.display = "";
+                        onboardingAny.externalWalletDivider.style.display = '';
                     }
                     else if (onboardingAny.externalWalletDivider) {
-                        onboardingAny.externalWalletDivider.style.display = "none";
+                        onboardingAny.externalWalletDivider.style.display = 'none';
                     }
                 }
                 else {
                     // On OTP screen - hide external wallets
-                    container.style.display = "none";
+                    container.style.display = 'none';
                     if (onboardingAny.externalWalletDivider) {
-                        onboardingAny.externalWalletDivider.style.display = "none";
+                        onboardingAny.externalWalletDivider.style.display = 'none';
                     }
                 }
                 // Always unmount and create fresh mount when config changes
@@ -2615,7 +2697,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     externalWalletContainerRef.current = null;
                 }
                 // Create fresh mount - this ensures buttons appear when config changes
-                const reactDomClient = await import("react-dom/client");
+                const reactDomClient = await import('react-dom/client');
                 const rootInstance = reactDomClient.createRoot(container);
                 externalWalletRootRef.current = rootInstance;
                 externalWalletContainerRef.current = container; // Track the container
@@ -2627,90 +2709,77 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                             // Hide email and Google sections when "More wallets" is clicked
                             const onboardingAny = onboardingRef.current;
                             if (onboardingAny?.emailForm) {
-                                onboardingAny.emailForm.style.display = "none";
+                                onboardingAny.emailForm.style.display = 'none';
                             }
                             if (onboardingAny?.googleButton) {
-                                onboardingAny.googleButton.style.display = "none";
+                                onboardingAny.googleButton.style.display = 'none';
                             }
                             // Hide all passkey elements when wallet selection screen is shown
                             if (onboardingAny?.passkeyLoginButton) {
-                                onboardingAny.passkeyLoginButton.style.display = "none";
+                                onboardingAny.passkeyLoginButton.style.display = 'none';
                             }
                             if (onboardingAny?.passkeySignupLink) {
-                                onboardingAny.passkeySignupLink.style.display = "none";
+                                onboardingAny.passkeySignupLink.style.display = 'none';
                             }
                             if (onboardingAny?.passkeyErrorElement) {
-                                onboardingAny.passkeyErrorElement.style.display = "none";
+                                onboardingAny.passkeyErrorElement.style.display = 'none';
                             }
                             if (onboardingAny?.passkeyDivider) {
-                                onboardingAny.passkeyDivider.style.display = "none";
+                                onboardingAny.passkeyDivider.style.display = 'none';
                             }
                             if (onboardingAny?.externalWalletDivider) {
-                                onboardingAny.externalWalletDivider.style.display = "none";
+                                onboardingAny.externalWalletDivider.style.display = 'none';
                             }
                             // Also hide the divider between email and Google if it exists
                             if (onboardingAny?.divider) {
-                                onboardingAny.divider.style.display = "none";
+                                onboardingAny.divider.style.display = 'none';
                             }
                         }, onHideMoreWallets: () => {
                             // Show email and Google sections when back is clicked (restore initial screen)
                             const onboardingAny = onboardingRef.current;
-                            const authMethods = onboardingAny?.config?.authMethods || [
-                                "otp",
-                                "google",
-                            ];
-                            const showEmail = authMethods.includes("otp");
-                            const showGoogle = authMethods.includes("google");
-                            const showPasskey = authMethods.includes("passkey");
+                            const authMethods = onboardingAny?.config?.authMethods || ['otp', 'google'];
+                            const showEmail = authMethods.includes('otp');
+                            const showGoogle = authMethods.includes('google');
+                            const showPasskey = authMethods.includes('passkey');
                             // Show email form if enabled
                             if (onboardingAny?.emailForm) {
-                                onboardingAny.emailForm.style.display = showEmail
-                                    ? ""
-                                    : "none";
+                                onboardingAny.emailForm.style.display = showEmail ? '' : 'none';
                             }
                             // Show Google button if enabled
                             if (onboardingAny?.googleButton) {
-                                onboardingAny.googleButton.style.display = showGoogle
-                                    ? ""
-                                    : "none";
+                                onboardingAny.googleButton.style.display = showGoogle ? '' : 'none';
                             }
                             // Show passkey controls if enabled
                             if (onboardingAny?.passkeyLoginButton) {
-                                onboardingAny.passkeyLoginButton.style.display = showPasskey
-                                    ? ""
-                                    : "none";
+                                onboardingAny.passkeyLoginButton.style.display = showPasskey ? '' : 'none';
                             }
                             if (onboardingAny?.passkeySignupLink) {
-                                onboardingAny.passkeySignupLink.style.display = showPasskey
-                                    ? ""
-                                    : "none";
+                                onboardingAny.passkeySignupLink.style.display = showPasskey ? '' : 'none';
                             }
                             if (onboardingAny?.passkeyErrorElement) {
-                                onboardingAny.passkeyErrorElement.style.display = "none";
+                                onboardingAny.passkeyErrorElement.style.display = 'none';
                             }
                             // Show passkey divider if passkey is enabled and there are other auth methods
                             if (onboardingAny?.passkeyDivider) {
-                                onboardingAny.passkeyDivider.style.display =
-                                    showPasskey && (showEmail || showGoogle) ? "" : "none";
+                                onboardingAny.passkeyDivider.style.display = (showPasskey && (showEmail || showGoogle)) ? '' : 'none';
                             }
                             // Show divider between email and Google if both are enabled
                             if (onboardingAny?.divider) {
-                                onboardingAny.divider.style.display =
-                                    showEmail && showGoogle ? "" : "none";
+                                onboardingAny.divider.style.display = (showEmail && showGoogle) ? '' : 'none';
                             }
                             // Show the "or" divider before external wallets only if email/Google are visible
                             const hasEmailOrGoogle = showEmail || showGoogle;
                             if (onboardingAny?.externalWalletDivider && hasEmailOrGoogle) {
-                                onboardingAny.externalWalletDivider.style.display = "";
+                                onboardingAny.externalWalletDivider.style.display = '';
                             }
                             else if (onboardingAny?.externalWalletDivider) {
-                                onboardingAny.externalWalletDivider.style.display = "none";
+                                onboardingAny.externalWalletDivider.style.display = 'none';
                             }
                         } }) }));
                 externalWalletMountedRef.current = true;
             }
             catch (error) {
-                console.error("Failed to mount ExternalWalletButtons:", error);
+                console.error('Failed to mount ExternalWalletButtons:', error);
                 externalWalletMountedRef.current = false;
             }
         };
@@ -2735,12 +2804,7 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         return () => {
             // Cleanup if needed
         };
-    }, [
-        externalWalletsEnabled,
-        wagmiConnect,
-        wagmiConnect?.connectors,
-        availableConnectors.length,
-    ]);
+    }, [externalWalletsEnabled, wagmiConnect, wagmiConnect?.connectors, availableConnectors.length]);
     // Update the rendered component when value changes (but don't re-mount)
     useEffect(() => {
         if (!externalWalletsEnabled)
@@ -2755,134 +2819,112 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                         // Hide email and Google sections when "More wallets" is clicked
                         const onboardingAny = onboardingRef.current;
                         if (onboardingAny?.emailForm) {
-                            onboardingAny.emailForm.style.display = "none";
+                            onboardingAny.emailForm.style.display = 'none';
                         }
                         if (onboardingAny?.googleButton) {
-                            onboardingAny.googleButton.style.display = "none";
+                            onboardingAny.googleButton.style.display = 'none';
                         }
                         // Hide Discord and X (Twitter) buttons when wallet selection screen is shown
                         if (onboardingAny?.discordButton) {
-                            onboardingAny.discordButton.style.display = "none";
+                            onboardingAny.discordButton.style.display = 'none';
                         }
                         if (onboardingAny?.twitterButton) {
-                            onboardingAny.twitterButton.style.display = "none";
+                            onboardingAny.twitterButton.style.display = 'none';
                         }
                         // Hide social grid if it exists
                         if (onboardingAny?.socialGrid) {
-                            onboardingAny.socialGrid.style.display = "none";
+                            onboardingAny.socialGrid.style.display = 'none';
                         }
                         // Extra guard: hide any social icon buttons by class
                         if (onboardingAny?.rootElement) {
                             onboardingAny.rootElement
-                                .querySelectorAll(".onboarding-button-social-icon, .onboarding-button-social")
+                                .querySelectorAll('.onboarding-button-social-icon, .onboarding-button-social')
                                 .forEach((el) => {
-                                el.style.display = "none";
+                                el.style.display = 'none';
                             });
                         }
                         // Hide all passkey elements when wallet selection screen is shown
                         if (onboardingAny?.passkeyLoginButton) {
-                            onboardingAny.passkeyLoginButton.style.display = "none";
+                            onboardingAny.passkeyLoginButton.style.display = 'none';
                         }
                         if (onboardingAny?.passkeySignupLink) {
-                            onboardingAny.passkeySignupLink.style.display = "none";
+                            onboardingAny.passkeySignupLink.style.display = 'none';
                         }
                         if (onboardingAny?.passkeyErrorElement) {
-                            onboardingAny.passkeyErrorElement.style.display = "none";
+                            onboardingAny.passkeyErrorElement.style.display = 'none';
                         }
                         if (onboardingAny?.passkeyDivider) {
-                            onboardingAny.passkeyDivider.style.display = "none";
+                            onboardingAny.passkeyDivider.style.display = 'none';
                         }
                         if (onboardingAny?.externalWalletDivider) {
-                            onboardingAny.externalWalletDivider.style.display = "none";
+                            onboardingAny.externalWalletDivider.style.display = 'none';
                         }
                         // Also hide the divider between email and Google if it exists
                         if (onboardingAny?.divider) {
-                            onboardingAny.divider.style.display = "none";
+                            onboardingAny.divider.style.display = 'none';
                         }
                     }, onHideMoreWallets: () => {
                         // Show email and Google sections when back is clicked
                         const onboardingAny = onboardingRef.current;
-                        const authMethods = onboardingAny?.config?.authMethods || [
-                            "otp",
-                            "google",
-                        ];
-                        const showEmail = authMethods.includes("otp");
-                        const showGoogle = authMethods.includes("google");
-                        const showTwitter = authMethods.includes("twitter");
-                        const showDiscord = authMethods.includes("discord");
-                        const showPasskey = authMethods.includes("passkey");
+                        const authMethods = onboardingAny?.config?.authMethods || ['otp', 'google'];
+                        const showEmail = authMethods.includes('otp');
+                        const showGoogle = authMethods.includes('google');
+                        const showTwitter = authMethods.includes('twitter');
+                        const showDiscord = authMethods.includes('discord');
+                        const showPasskey = authMethods.includes('passkey');
                         if (onboardingAny?.emailForm) {
-                            onboardingAny.emailForm.style.display = showEmail ? "" : "none";
+                            onboardingAny.emailForm.style.display = showEmail ? '' : 'none';
                         }
                         if (onboardingAny?.googleButton) {
-                            onboardingAny.googleButton.style.display = showGoogle
-                                ? ""
-                                : "none";
+                            onboardingAny.googleButton.style.display = showGoogle ? '' : 'none';
                         }
                         // Show Discord and X (Twitter) buttons if enabled
                         if (onboardingAny?.discordButton) {
-                            onboardingAny.discordButton.style.display = showDiscord
-                                ? ""
-                                : "none";
+                            onboardingAny.discordButton.style.display = showDiscord ? '' : 'none';
                         }
                         if (onboardingAny?.twitterButton) {
-                            onboardingAny.twitterButton.style.display = showTwitter
-                                ? ""
-                                : "none";
+                            onboardingAny.twitterButton.style.display = showTwitter ? '' : 'none';
                         }
                         // Show social grid if it exists and social methods are enabled
                         if (onboardingAny?.socialGrid) {
                             const hasSocialMethods = showGoogle || showTwitter || showDiscord;
-                            onboardingAny.socialGrid.style.display = hasSocialMethods
-                                ? ""
-                                : "none";
+                            onboardingAny.socialGrid.style.display = hasSocialMethods ? '' : 'none';
                         }
                         // Extra guard: restore social icon buttons by class based on flags
                         if (onboardingAny?.rootElement) {
                             const hasSocialMethods = showGoogle || showTwitter || showDiscord;
                             onboardingAny.rootElement
-                                .querySelectorAll(".onboarding-button-social-icon, .onboarding-button-social")
+                                .querySelectorAll('.onboarding-button-social-icon, .onboarding-button-social')
                                 .forEach((el) => {
-                                el.style.display = hasSocialMethods
-                                    ? ""
-                                    : "none";
+                                el.style.display = hasSocialMethods ? '' : 'none';
                             });
                         }
                         // Show passkey controls if enabled
                         if (onboardingAny?.passkeyLoginButton) {
-                            onboardingAny.passkeyLoginButton.style.display = showPasskey
-                                ? ""
-                                : "none";
+                            onboardingAny.passkeyLoginButton.style.display = showPasskey ? '' : 'none';
                         }
                         if (onboardingAny?.passkeySignupLink) {
-                            onboardingAny.passkeySignupLink.style.display = showPasskey
-                                ? ""
-                                : "none";
+                            onboardingAny.passkeySignupLink.style.display = showPasskey ? '' : 'none';
                         }
                         if (onboardingAny?.passkeyErrorElement) {
-                            onboardingAny.passkeyErrorElement.style.display = "none";
+                            onboardingAny.passkeyErrorElement.style.display = 'none';
                         }
                         // Show passkey divider if passkey is enabled and there are other auth methods
                         if (onboardingAny?.passkeyDivider) {
-                            onboardingAny.passkeyDivider.style.display =
-                                showPasskey &&
-                                    (showEmail || showGoogle || showTwitter || showDiscord)
-                                    ? ""
-                                    : "none";
+                            onboardingAny.passkeyDivider.style.display = (showPasskey && (showEmail || showGoogle || showTwitter || showDiscord)) ? '' : 'none';
                         }
                         // Show divider between email and social methods if both are enabled
                         if (onboardingAny?.divider) {
                             const hasSocialMethods = showGoogle || showTwitter || showDiscord;
-                            onboardingAny.divider.style.display =
-                                showEmail && hasSocialMethods ? "" : "none";
+                            onboardingAny.divider.style.display = (showEmail && hasSocialMethods) ? '' : 'none';
                         }
                         if (onboardingAny?.externalWalletDivider) {
-                            onboardingAny.externalWalletDivider.style.display = "";
+                            onboardingAny.externalWalletDivider.style.display = '';
                         }
                     } }) }));
         }
         catch (error) {
-            console.warn("Failed to update ExternalWalletButtons:", error);
+            console.warn('Failed to update ExternalWalletButtons:', error);
         }
     }, [value, externalWalletsEnabled]);
     return (_jsx(AbstraxnContext.Provider, { value: value, children: children }));
@@ -2895,19 +2937,18 @@ function AbstraxnProviderInner({ config, children, base, wagmi, }) {
 function canUseReactQuery() {
     try {
         // Check if React is available
-        if (typeof React === "undefined" || React === null) {
-            return { canUse: false, reason: "React is not available" };
+        if (typeof React === 'undefined' || React === null) {
+            return { canUse: false, reason: 'React is not available' };
         }
         // Check if React has the version property (indicates it's a valid React object)
         if (!React.version) {
-            return { canUse: false, reason: "React version is not available" };
+            return { canUse: false, reason: 'React version is not available' };
         }
         // Check if QueryClientProvider is available
-        if (typeof QueryClientProvider === "undefined" ||
-            QueryClientProvider === null) {
+        if (typeof QueryClientProvider === 'undefined' || QueryClientProvider === null) {
             return {
                 canUse: false,
-                reason: "@tanstack/react-query is not installed. Please install it: npm install @tanstack/react-query@^5.90.16",
+                reason: '@tanstack/react-query is not installed. Please install it: npm install @tanstack/react-query@^5.90.16'
             };
         }
         return { canUse: true };
@@ -2920,21 +2961,21 @@ function canUseReactQuery() {
  * Wrapper component that conditionally uses QueryClientProvider
  * Falls back to rendering children directly if React Query is not available
  */
-function QueryClientWrapper({ children, queryClient, }) {
+function QueryClientWrapper({ children, queryClient }) {
     // Check if we can safely use QueryClientProvider
     const queryCheck = canUseReactQuery();
     if (!queryCheck.canUse) {
-        console.error("❌ React Query is not available. External wallets are disabled.\n" +
-            `Reason: ${queryCheck.reason || "Unknown"}\n` +
-            "Please install @tanstack/react-query@^5.90.16 and ensure there is only one React instance.");
+        console.error('❌ React Query is not available. External wallets are disabled.\n' +
+            `Reason: ${queryCheck.reason || 'Unknown'}\n` +
+            'Please install @tanstack/react-query@^5.90.16 and ensure there is only one React instance.');
         // Return children without QueryClientProvider - external wallets won't work but app won't crash
         return _jsx(_Fragment, { children: children });
     }
     try {
-        return (_jsx(QueryClientProvider, { client: queryClient, children: children }));
+        return _jsx(QueryClientProvider, { client: queryClient, children: children });
     }
     catch (error) {
-        console.error("Failed to render QueryClientProvider:", error);
+        console.error('Failed to render QueryClientProvider:', error);
         // Fallback: render children without QueryClientProvider
         return _jsx(_Fragment, { children: children });
     }
@@ -2983,16 +3024,14 @@ export function AbstraxnProvider({ config, children }) {
         if (Array.isArray(chainConfig) && chainConfig.length > 0) {
             // Check if first item looks like a viem chain object (has id, name, nativeCurrency)
             const firstItem = chainConfig[0];
-            if (firstItem &&
-                typeof firstItem.id === "number" &&
-                firstItem.nativeCurrency) {
+            if (firstItem && typeof firstItem.id === 'number' && firstItem.nativeCurrency) {
                 hasViemChains = true;
                 // Store viem chains directly for wagmi
                 viemChainsForWagmi.push(...chainConfig);
                 // Also convert to core chain format for wallet instance
                 chainConfig.forEach((viemChain) => {
                     // Extract RPC URL from viem chain format
-                    let rpcUrl = "";
+                    let rpcUrl = '';
                     if (viemChain.rpcUrls?.default?.http) {
                         rpcUrl = Array.isArray(viemChain.rpcUrls.default.http)
                             ? viemChain.rpcUrls.default.http[0]
@@ -3013,23 +3052,16 @@ export function AbstraxnProvider({ config, children }) {
             }
         }
         // Priority 2: Check new chains config format (object with supportedEvmChains)
-        if (!hasViemChains &&
-            chainConfig &&
-            typeof chainConfig === "object" &&
-            !Array.isArray(chainConfig) &&
-            chainConfig.supportedEvmChains &&
-            chainConfig.supportedEvmChains.length > 0) {
+        if (!hasViemChains && chainConfig && typeof chainConfig === 'object' && !Array.isArray(chainConfig) && chainConfig.supportedEvmChains && chainConfig.supportedEvmChains.length > 0) {
             chainConfig.supportedEvmChains.forEach((chainName) => {
                 const chainData = EVM_CHAINS[chainName];
-                if (chainData && chainData.type === "evm") {
+                if (chainData && chainData.type === 'evm') {
                     chains.push(toCoreChain(chainData));
                 }
             });
         }
         // Priority 3: Check legacy supportedChains format
-        else if (!hasViemChains &&
-            config.supportedChains &&
-            config.supportedChains.length > 0) {
+        else if (!hasViemChains && config.supportedChains && config.supportedChains.length > 0) {
             chains.push(...config.supportedChains);
         }
         // Priority 4: Default chains
@@ -3050,50 +3082,43 @@ export function AbstraxnProvider({ config, children }) {
             return { wagmiConfig: config.wagmiConfig, configError: null };
         }
         try {
-            const configResult = createWagmiConfig(wagmiChains, config.externalWallets?.walletConnectProjectId, config.externalWallets?.connectors, config.ui?.theme || "dark");
+            const configResult = createWagmiConfig(wagmiChains, config.externalWallets?.walletConnectProjectId, config.externalWallets?.connectors, config.ui?.theme || 'dark', config.externalWallets?.ssr);
             return { wagmiConfig: configResult, configError: null };
         }
         catch (error) {
-            console.error("Failed to create wagmi config:", error);
+            console.error('Failed to create wagmi config:', error);
             return {
                 wagmiConfig: null,
-                configError: error instanceof Error
-                    ? error
-                    : new Error("Failed to create wagmi config"),
+                configError: error instanceof Error ? error : new Error('Failed to create wagmi config')
             };
         }
-    }, [
-        externalWalletsEnabled,
-        wagmiChains,
-        config.externalWallets?.walletConnectProjectId,
-        config.externalWallets?.connectors,
-    ]);
+    }, [externalWalletsEnabled, wagmiChains, config.externalWallets?.walletConnectProjectId, config.externalWallets?.connectors, config.wagmiConfig, config.externalWallets?.ssr]);
     // If external wallets are enabled, wrap with QueryClientProvider and WagmiProvider
     if (externalWalletsEnabled) {
         // Check if React Query is available BEFORE doing anything else
         // This prevents errors from happening in the first place
         const queryCheck = canUseReactQuery();
         if (!queryCheck.canUse) {
-            console.error("❌ External wallets are disabled because React Query is not available.\n" +
-                `Reason: ${queryCheck.reason || "Unknown"}\n` +
-                "Please install @tanstack/react-query@^5.90.16 and ensure there is only one React instance.\n" +
-                "Falling back to Abstraxn wallet only.");
-            return (_jsx(AbstraxnProviderWithoutWagmi, { config: config, children: children }));
+            console.error('❌ External wallets are disabled because React Query is not available.\n' +
+                `Reason: ${queryCheck.reason || 'Unknown'}\n` +
+                'Please install @tanstack/react-query@^5.90.16 and ensure there is only one React instance.\n' +
+                'Falling back to Abstraxn wallet only.');
+            return _jsx(AbstraxnProviderWithoutWagmi, { config: config, children: children });
         }
         if (configError) {
-            console.error("Failed to create wagmi config:", configError);
+            console.error('Failed to create wagmi config:', configError);
             // Fallback to provider without wagmi if config creation fails
-            return (_jsx(AbstraxnProviderWithoutWagmi, { config: config, children: children }));
+            return _jsx(AbstraxnProviderWithoutWagmi, { config: config, children: children });
         }
         if (!wagmiConfig) {
             // Show loading state while config is being created
             // Don't render AbstraxnProviderInner until wagmiConfig is ready
-            return (_jsx(QueryClientWrapper, { queryClient: queryClient, children: _jsx("div", { style: { display: "none" }, children: "Loading wallet connectors..." }) }));
+            return (_jsx(QueryClientWrapper, { queryClient: queryClient, children: _jsx("div", { style: { display: 'none' }, children: "Loading wallet connectors..." }) }));
         }
         return (_jsx(QueryClientWrapper, { queryClient: queryClient, children: _jsx(WagmiProvider, { config: wagmiConfig, initialState: config.initialState, children: _jsx(AbstraxnProviderWithWagmi, { config: config, children: children }) }) }));
     }
     // If external wallets are disabled, use the provider without wagmi
-    return (_jsx(AbstraxnProviderWithoutWagmi, { config: config, children: children }));
+    return _jsx(AbstraxnProviderWithoutWagmi, { config: config, children: children });
 }
 /**
  * Hook to access Abstraxn Wallet context
@@ -3101,7 +3126,7 @@ export function AbstraxnProvider({ config, children }) {
 export function useAbstraxnWallet() {
     const context = useContext(AbstraxnContext);
     if (!context) {
-        throw new Error("useAbstraxnWallet must be used within AbstraxnProvider");
+        throw new Error('useAbstraxnWallet must be used within AbstraxnProvider');
     }
     return context;
 }