@b3dotfun/sdk 0.0.47 → 0.0.48-alpha.0

package/dist/esm/global-account/react/components/SignInWithB3/SignIn.js

@@ -9,10 +9,10 @@ import { useConnectedWallets, useSetActiveWallet, useWalletInfo } from "thirdweb
 import { ManageAccountButton } from "../custom/ManageAccountButton.js";
 export function SignIn(props) {
     const { className } = props;
-    const { automaticallySetFirstEoa } = useB3();
+    const { automaticallySetFirstEoa, partnerId } = useB3();
     const { wallet, address: globalAddress, ensName, connectedSmartWallet, connectedEOAWallet, isActiveSmartWallet, isActiveEOAWallet, smartWalletIcon, eoaWalletIcon, } = useAccountWallet();
     const isMobile = useIsMobile();
-    const { logout } = useAuthentication(String(process.env.NEXT_PUBLIC_THIRDWEB_PARTNER_ID));
+    const { logout } = useAuthentication(partnerId);
     const onDisconnect = async () => {
         await logout();
     };

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Button, StyleRoot, useAuthentication, useB3, useIsMobile, useModalStore, } from "../../../../global-account/react/index.js";
+import { Button, StyleRoot, useAuthStore, useB3, useIsMobile, useModalStore, } from "../../../../global-account/react/index.js";
 import { useEffect } from "react";
 import { ManageAccountButton } from "../custom/ManageAccountButton.js";
 import { Loading } from "../ui/Loading.js";
 export function SignInWithB3(props) {
     const { setB3ModalOpen, setB3ModalContentType, setEcoSystemAccountAddress } = useModalStore();
     const { account } = useB3();
-    const { isAuthenticating, isAuthenticated } = useAuthentication(props.partnerId, props.loginWithSiwe);
+    const { isAuthenticating, isAuthenticated } = useAuthStore();
     const isMobile = useIsMobile();
     useEffect(() => {
         if (account) {

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3Flow.d.ts

@@ -3,4 +3,4 @@ import { SignInWithB3ModalProps } from "../../../../global-account/react";
  * Component that manages the authentication flow for Sign In With B3
  * Handles different login providers, authentication steps, and session key management
  */
-export declare function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin, loginWithSiwe, source, signersEnabled, }: SignInWithB3ModalProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin, source, signersEnabled, }: SignInWithB3ModalProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3Flow.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Loading, useAuthStore, useB3, useGetAllTWSigners, useModalStore, useSiwe, } from "../../../../global-account/react/index.js";
+import { Loading, useAuthStore, useB3, useGetAllTWSigners, useModalStore, } from "../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useCallback, useEffect, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
@@ -12,16 +12,14 @@ const MAX_REFETCH_ATTEMPTS = 20;
  * Component that manages the authentication flow for Sign In With B3
  * Handles different login providers, authentication steps, and session key management
  */
-export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, loginWithSiwe = false, source = "signInWithB3Button", signersEnabled = false, }) {
-    const { setUser, automaticallySetFirstEoa } = useB3();
+export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, source = "signInWithB3Button", signersEnabled = false, }) {
+    const { automaticallySetFirstEoa } = useB3();
     const [step, setStep] = useState(source === "requestPermissions" ? null : "login");
     const [sessionKeyAdded, setSessionKeyAdded] = useState(source === "requestPermissions" ? true : false);
     const { setB3ModalContentType, setB3ModalOpen, isOpen } = useModalStore();
     const account = useActiveAccount();
-    const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
     const isAuthenticating = useAuthStore(state => state.isAuthenticating);
     const isConnected = useAuthStore(state => state.isConnected);
-    const setIsConnected = useAuthStore(state => state.setIsConnected);
     const [refetchCount, setRefetchCount] = useState(0);
     const [refetchError, setRefetchError] = useState(null);
     const { data: signers, refetch: refetchSigners, isFetching: isFetchingSigners, } = useGetAllTWSigners({
@@ -31,7 +29,6 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
             enabled: signersEnabled,
         },
     });
-    const { authenticate } = useSiwe();
     const [refetchQueued, setRefetchQueued] = useState(false);
     // Enhanced refetchSigners function that tracks number of attempts
     const handleRefetchSigners = useCallback(() => {
@@ -142,13 +139,11 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
             sessionKeyAddress,
             partnerId,
             closeAfterLogin,
-            loginWithSiwe,
             source: "requestPermissions",
         });
     }, [
         chain,
         closeAfterLogin,
-        loginWithSiwe,
         onError,
         onLoginSuccess,
         onSessionKeySuccess,
@@ -158,19 +153,8 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         strategies,
     ]);
     const handleLoginSuccess = useCallback(async (account) => {
-        debug("Authenticating with B3 via SIWE");
-        setIsConnected(true);
-        if (loginWithSiwe) {
-            debug("setIsAuthenticating:true:1");
-            setIsAuthenticating(true);
-            const userAuth = await authenticate(account, partnerId);
-            setUser(userAuth.user);
-        }
-        debug("handleLoginSuccess:account", account);
         onLoginSuccess?.(account);
-        debug("setIsAuthenticating:false:1");
-        setIsAuthenticating(false);
-    }, [loginWithSiwe, onLoginSuccess, authenticate, partnerId, setUser, setIsConnected, setIsAuthenticating]);
+    }, [onLoginSuccess]);
     useEffect(() => {
         if (step === "permissions") {
             setB3ModalContentType({
@@ -192,14 +176,14 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     if (step === "login") {
         // Custom strategy
         if (strategies?.[0] === "privy") {
-            return _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, partnerId: partnerId, chain: chain });
+            return _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
         }
         // Strategies are explicitly provided
         if (strategies) {
-            return (_jsx(LoginStepCustom, { strategies: strategies, partnerId: partnerId, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
+            return (_jsx(LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
         }
         // Default to handle all strategies we support
-        return _jsx(LoginStep, { partnerId: partnerId, chain: chain, onSuccess: handleLoginSuccess, onError: onError });
+        return _jsx(LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
     }
     return null;
 }

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3Privy.d.ts

@@ -4,8 +4,7 @@ interface SignInWithB3PrivyProps {
     onError?: (error: Error) => Promise<void>;
     onSuccess: (account: Account) => Promise<void>;
     accessToken?: string;
-    partnerId: string;
     chain: Chain;
 }
-export declare function SignInWithB3Privy({ onSuccess, onError, partnerId, chain }: SignInWithB3PrivyProps): import("react/jsx-runtime").JSX.Element;
+export declare function SignInWithB3Privy({ onSuccess, onError, chain }: SignInWithB3PrivyProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3Privy.js

@@ -1,10 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Loading, useAuthentication, useAuthStore, useHandleConnectWithPrivy, } from "../../../../global-account/react/index.js";
+import { Loading, useAuthentication, useAuthStore, useB3, useHandleConnectWithPrivy, } from "../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useEffect } from "react";
 const debug = debugB3React("SignInWithB3Privy");
-export function SignInWithB3Privy({ onSuccess, onError, partnerId, chain }) {
-    const { isLoading, connectTw, fullToken } = useHandleConnectWithPrivy(partnerId, chain, onSuccess);
+export function SignInWithB3Privy({ onSuccess, onError, chain }) {
+    const { partnerId } = useB3();
+    const { isLoading, connectTw, fullToken } = useHandleConnectWithPrivy(chain, onSuccess);
     const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
     const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
     const { logout } = useAuthentication(partnerId);

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStep.d.ts

@@ -9,7 +9,6 @@ interface LoginStepProps {
     /** Optional callback function called when an error occurs */
     onError?: (error: Error) => Promise<void>;
     /** Partner ID used for authentication */
-    partnerId: string;
     /** Blockchain chain information */
     chain: Chain;
     /** Optional authentication strategy options */
@@ -20,5 +19,5 @@ interface LoginStepContainerProps {
     partnerId?: string;
 }
 export declare function LoginStepContainer({ children, partnerId }: LoginStepContainerProps): import("react/jsx-runtime").JSX.Element;
-export declare function LoginStep({ onSuccess, onError, partnerId, chain }: LoginStepProps): import("react/jsx-runtime").JSX.Element;
+export declare function LoginStep({ onSuccess, chain }: LoginStepProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStep.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useAuthentication, useAuthStore, useB3, useQueryB3 } from "../../../../../global-account/react/index.js";
+import { useAuthentication, useB3, useQueryB3 } from "../../../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../../../shared/constants/index.js";
-import { debug } from "../../../../../shared/utils/debug.js";
 import { client } from "../../../../../shared/utils/thirdweb.js";
 import { ConnectEmbed, darkTheme, lightTheme } from "thirdweb/react";
 import { ecosystemWallet } from "thirdweb/wallets";
@@ -15,14 +14,12 @@ export function LoginStepContainer({ children, partnerId }) {
     const partnerLogo = partner?.data?.[0]?.loginCustomization?.logoUrl;
     return (_jsxs("div", { className: "flex flex-col items-center justify-center pt-6", children: [partnerLogo && (_jsx("img", { src: partnerLogo, alt: "Partner Logo", className: "partner-logo mb-6 h-12 w-auto object-contain" })), children, _jsxs("h2", { className: "mt-6 flex items-center gap-2 text-lg font-bold", children: ["Powered by", _jsx("img", { alt: "B3 Logo", className: "h-5", src: "https://cdn.b3.fun/b3_logo.svg" }), "Connect"] })] }));
 }
-export function LoginStep({ onSuccess, onError, partnerId, chain }) {
+export function LoginStep({ onSuccess, chain }) {
+    const { partnerId, theme } = useB3();
     const wallet = ecosystemWallet(ecosystemWalletId, {
         partnerId: partnerId,
     });
-    const { theme } = useB3();
-    const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
-    const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-    const { logout } = useAuthentication(partnerId);
+    const { onConnect } = useAuthentication(partnerId);
     return (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx(ConnectEmbed, { showThirdwebBranding: false, client: client, chain: chain, wallets: [wallet], theme: theme === "light"
                 ? lightTheme({
                     colors: {
@@ -33,50 +30,18 @@ export function LoginStep({ onSuccess, onError, partnerId, chain }) {
                     colors: {
                         modalBg: "hsl(var(--b3-react-background))",
                     },
-                }), autoConnect: true, style: {
+                }), style: {
                 width: "100%",
                 height: "100%",
                 border: 0,
-            }, 
-            // TODO: Integrate with SIWE in useSIWE
-            // auth={{
-            //   isLoggedIn: async (address) => {
-            //     console.log("checking if logged in!", { address });
-            //     return await isLoggedIn();
-            //   },
-            //   doLogin: async (params) => {
-            //     console.log("logging in!");
-            //     await login(params);
-            //   },
-            //   getLoginPayload: async ({ address }) =>
-            //     generatePayload({ address }),
-            //   doLogout: async () => {
-            //     console.log("logging out!");
-            //     await logout();
-            //   },
-            // }}
-            header: {
+            }, header: {
                 title: "Sign in with B3",
                 titleIcon: "https://cdn.b3.fun/b3_logo.svg",
             }, className: "b3-login-step", onConnect: async (wallet) => {
-                try {
-                    setIsAuthenticating(true);
-                    debug("setIsAuthenticating:true:6");
-                    const account = wallet.getAccount();
-                    if (!account)
-                        throw new Error("No account found");
-                    await onSuccess(account);
-                    setIsAuthenticated(true);
-                    console.log("connected!", wallet.id);
-                }
-                catch (error) {
-                    await onError?.(error);
-                    await logout();
-                    setIsAuthenticated(false);
-                }
-                finally {
-                    debug("setIsAuthenticating:false:6");
-                    setIsAuthenticating(false);
-                }
+                await onConnect(wallet);
+                const account = wallet.getAccount();
+                if (!account)
+                    throw new Error("No account found");
+                await onSuccess(account);
             } }) }));
 }

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStepCustom.d.ts

@@ -5,10 +5,9 @@ interface LoginStepCustomProps {
     automaticallySetFirstEoa: boolean;
     onSuccess: (account: Account) => Promise<void>;
     onError?: (error: Error) => Promise<void>;
-    partnerId: string;
     chain: Chain;
     strategies: AllowedStrategy[];
     maxInitialWallets?: number;
 }
-export declare function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategies, maxInitialWallets, automaticallySetFirstEoa, }: LoginStepCustomProps): import("react/jsx-runtime").JSX.Element;
+export declare function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInitialWallets, automaticallySetFirstEoa, }: LoginStepCustomProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStepCustom.js

@@ -1,12 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { AuthButton, Button, getConnectOptionsFromStrategy, isWalletType, LoginStepContainer, useAuthentication, useAuthStore, useConnect, WalletRow, } from "../../../../../global-account/react/index.js";
+import { AuthButton, Button, getConnectOptionsFromStrategy, isWalletType, LoginStepContainer, useAuthentication, useAuthStore, useB3, useConnect, WalletRow, } from "../../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../../shared/utils/debug.js";
 import { client } from "../../../../../shared/utils/thirdweb.js";
 import { useState } from "react";
 import { useConnect as useConnectTW } from "thirdweb/react";
 import { createWallet } from "thirdweb/wallets";
 const debug = debugB3React("LoginStepCustom");
-export function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
+export function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
+    const { partnerId } = useB3();
     const [isLoading, setIsLoading] = useState(false);
     const [showAllWallets, setShowAllWallets] = useState(false);
     const { connect } = useConnect(partnerId, chain);

package/dist/esm/global-account/react/components/custom/ManageAccountButton.js

@@ -1,9 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, StyleRoot, useAuthentication, useModalStore } from "../../../../global-account/react/index.js";
+import { Button, StyleRoot, useAuthentication, useB3, useModalStore } from "../../../../global-account/react/index.js";
 import { cn } from "../../../../shared/utils/index.js";
 export function ManageAccountButton(props) {
+    const { partnerId } = useB3();
     const { setB3ModalOpen, setB3ModalContentType } = useModalStore();
-    const { isConnected } = useAuthentication(props.partnerId, props.loginWithSiwe);
+    const { isConnected } = useAuthentication(partnerId);
     const handleClickManageAccount = () => {
         setB3ModalContentType({
             ...props,

package/dist/esm/global-account/react/hooks/useAuthentication.d.ts

@@ -1,5 +1,6 @@
+import { Wallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
-export declare function useAuthentication(partnerId: string, loginWithSiwe?: boolean): {
+export declare function useAuthentication(partnerId: string): {
     logout: (callback?: () => void) => Promise<void>;
     isAuthenticated: boolean;
     isReady: boolean;
@@ -7,6 +8,54 @@ export declare function useAuthentication(partnerId: string, loginWithSiwe?: boo
     isConnected: boolean;
     wallet: import("thirdweb/dist/types/wallets/in-app/core/wallet/types").EcosystemWallet;
     preAuthenticate: typeof preAuthenticate;
-    connect: (strategyOptions?: import("thirdweb/wallets").SingleStepAuthArgsType) => Promise<import("thirdweb/wallets").Wallet | null>;
+    connect: (wallet: Wallet) => Promise<void>;
     isAuthenticating: boolean;
+    onConnect: (wallet: Wallet) => Promise<void>;
+    user: {
+        email?: string | undefined;
+        username?: string | undefined;
+        telNumber?: string | undefined;
+        ens?: string | undefined;
+        avatar?: string | undefined;
+        preferences?: {} | undefined;
+        referredBy?: string | {} | undefined;
+        sourceApp?: string | undefined;
+        referralCode?: string | undefined;
+        userGroups?: number[] | undefined;
+        isMigratedFromBSMNT?: boolean | undefined;
+        privyLinkedAccounts?: {
+            name?: string | undefined;
+            address?: string | undefined;
+            email?: string | undefined;
+            chain_type?: string | undefined;
+            lv?: number | undefined;
+            wallet_client_type?: string | undefined;
+            smart_wallet_type?: string | undefined;
+            subject?: string | undefined;
+            type: string;
+        }[] | undefined;
+        twProfiles?: {
+            type: string;
+            details: {
+                id?: string | undefined;
+                name?: string | undefined;
+                address?: string | undefined;
+                email?: string | undefined;
+                phone?: string | undefined;
+                username?: string | undefined;
+                fid?: string | undefined;
+            };
+        }[] | undefined;
+        _id: string | {};
+        userId: string;
+        smartAccountAddress: string;
+        createdAt: number;
+        updatedAt: number;
+        partnerIds: {
+            privyId?: string | undefined;
+            thirdwebId?: string | undefined;
+        };
+    } | undefined;
+    refetchUser: (wallet?: Wallet) => Promise<void>;
+    setUser: (newUser?: import("@b3dotfun/b3-api").Users) => void;
 };

package/dist/esm/global-account/react/hooks/useAuthentication.js

@@ -1,117 +1,159 @@
 import app from "../../../global-account/app.js";
 import { authenticateWithB3JWT } from "../../../global-account/bsmnt.js";
-import { useAuthStore, useB3 } from "../../../global-account/react/index.js";
+import { useAuthStore, useSiwe } from "../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../shared/constants/index.js";
-import { b3MainnetThirdWeb } from "../../../shared/constants/chains/supported.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { client } from "../../../shared/utils/thirdweb.js";
-import { useEffect, useRef } from "react";
-import { useActiveWallet, useAutoConnect, useConnectedWallets, useDisconnect } from "thirdweb/react";
+import { getConnectors } from "@wagmi/core";
+import { useCallback, useEffect, useRef } from "react";
+import { useActiveWallet, useAutoConnect, useConnectedWallets, useDisconnect, useSetActiveWallet, } from "thirdweb/react";
 import { ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
-import { useConnect } from "./useConnect.js";
-import { useSiwe } from "./useSiwe.js";
+import { useAccount, useConnect, useSwitchAccount } from "wagmi";
+import { useUserQuery } from "./useUserQuery.js";
+import { useWagmiConfig } from "./useWagmiConfig.js";
 const debug = debugB3React("useAuthentication");
-export function useAuthentication(partnerId, loginWithSiwe) {
+export function useAuthentication(partnerId) {
     const { disconnect } = useDisconnect();
     const wallets = useConnectedWallets();
     const activeWallet = useActiveWallet();
-    const { authenticate } = useSiwe();
-    const { setUser } = useB3();
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
     const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-    const setIsConnecting = useAuthStore(state => state.setIsConnecting);
     const setIsConnected = useAuthStore(state => state.setIsConnected);
     const isConnecting = useAuthStore(state => state.isConnecting);
     const isConnected = useAuthStore(state => state.isConnected);
-    const useAutoConnectLoadingPrevious = useRef(false);
-    const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
     const isAuthenticating = useAuthStore(state => state.isAuthenticating);
-    const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
+    const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
     const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
-    const { connect } = useConnect(partnerId, b3MainnetThirdWeb);
+    const setActiveWallet = useSetActiveWallet();
+    const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
+    const { authenticate } = useSiwe();
+    const { user, setUser } = useUserQuery();
+    const useAutoConnectLoadingPrevious = useRef(false);
+    const wagmiConfig = useWagmiConfig(partnerId);
+    const { connect } = useConnect();
+    const activeWagmiAccount = useAccount();
+    const { switchAccount } = useSwitchAccount();
+    debug("@@activeWagmiAccount", activeWagmiAccount);
     const wallet = ecosystemWallet(ecosystemWalletId, {
         partnerId: partnerId,
     });
-    const { isLoading: useAutoConnectLoading } = useAutoConnect({
-        client,
-        wallets: [wallet],
-        onConnect: async (wallet) => {
-            setHasStartedConnecting(true);
-            try {
-                setIsConnected(true);
-                if (!loginWithSiwe) {
-                    debug("Skipping SIWE login", { loginWithSiwe });
-                    setIsAuthenticated(true);
-                    setIsAuthenticating(false);
+    const syncWagmi = useCallback(async () => {
+        function syncWagmiFunc() {
+            const connectors = getConnectors(wagmiConfig);
+            debug("@@syncWagmi", {
+                connectors,
+                wallets,
+            });
+            // For each that matchs a TW wallet on wallets, connect to the wagmi connector
+            // or, since ecosystem wallets is separate, connect those via in-app-wallet from wagmi
+            connectors.forEach(async (connector) => {
+                const twWallet = wallets.find(wallet => wallet.id === connector.id || connector.id === "in-app-wallet");
+                // If no TW wallet, do not prompt the user to connect
+                if (!twWallet) {
                     return;
                 }
-                debug("setIsAuthenticating:true:4");
-                const account = await wallet.getAccount();
-                if (!account) {
-                    throw new Error("No account found during auto-connect");
+                // Metamask will prompt to connect, we can just switch accounts here.
+                if (connector.id === "io.metamask") {
+                    return switchAccount({ connector });
                 }
-                // Try to re-authenticate first
-                try {
-                    const userAuth = await app.reAuthenticate();
-                    setUser(userAuth.user);
-                    setIsAuthenticated(true);
-                    setIsAuthenticating(false);
-                    debug("Re-authenticated successfully", { userAuth });
-                    // Authenticate on BSMNT with B3 JWT
-                    const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-                    console.log("@@b3Jwt", b3Jwt);
+                if (
+                // If it's not an in-app wallet or it is the ecosystem wallet, connect
+                connector.id !== "in-app-wallet" ||
+                    (connector.id === "in-app-wallet" && twWallet.id === ecosystemWalletId)) {
+                    try {
+                        const options = {
+                            wallet: twWallet, // the connected wallet
+                        };
+                        debug("@@syncWagmi:connecting", { twWallet, connector });
+                        connect({
+                            connector,
+                            ...options,
+                        });
+                    }
+                    catch (error) {
+                        console.error("@@syncWagmi:error", error);
+                    }
                 }
-                catch (error) {
-                    // If re-authentication fails, try fresh authentication
-                    debug("Re-authentication failed, attempting fresh authentication");
-                    const userAuth = await authenticate(account, partnerId);
-                    setUser(userAuth.user);
-                    setIsAuthenticated(true);
-                    setIsAuthenticating(false);
-                    debug("Fresh authentication successful", { userAuth });
-                    // Authenticate on BSMNT with B3 JWT
-                    const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-                    console.log("@@b3Jwt", b3Jwt);
+                else {
+                    debug("@@syncWagmi:not-connecting", connector);
                 }
-            }
-            catch (error) {
-                debug("Auto-connect authentication failed", { error });
-                setIsAuthenticated(false);
-                debug("setIsAuthenticating:false:4");
-                setUser();
-            }
-            setIsAuthenticating(false);
-        },
-    });
-    /**
-     * useAutoConnectLoading starts as false
-     */
+            });
+        }
+        syncWagmiFunc();
+        // wagmi config shouldn't change
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [partnerId, wallets]);
     useEffect(() => {
-        if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
+        syncWagmi();
+    }, [wallets, syncWagmi]);
+    const authenticateUser = useCallback(async (wallet) => {
+        setHasStartedConnecting(true);
+        const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
+        if (!account) {
+            throw new Error("No account found during auto-connect");
+        }
+        if (!account) {
+            throw new Error("No account found during auto-connect");
+        }
+        // Try to re-authenticate first
+        try {
+            const userAuth = await app.reAuthenticate();
+            setUser(userAuth.user);
+            setIsAuthenticated(true);
             setIsAuthenticating(false);
+            debug("Re-authenticated successfully", { userAuth });
+            // Authenticate on BSMNT with B3 JWT
+            const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+            debug("@@b3Jwt", b3Jwt);
         }
-        useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
-    }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
-    // Ensure isAuthenticating stays true until we're fully ready
-    useEffect(() => {
-        if (useAutoConnectLoading) {
-            setIsConnecting(true);
+        catch (error) {
+            // If re-authentication fails, try fresh authentication
+            debug("Re-authentication failed, attempting fresh authentication");
+            const userAuth = await authenticate(account, partnerId);
+            setUser(userAuth.user);
+            setIsAuthenticated(true);
+            setIsAuthenticating(false);
+            debug("Fresh authentication successful", { userAuth });
+            // Authenticate on BSMNT with B3 JWT
+            const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+            debug("@@b3Jwt", b3Jwt);
+        }
+    }, [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+    const onConnect = useCallback(async (wallet) => {
+        debug("@@useAuthentication:onConnect", { wallet });
+        try {
+            setHasStartedConnecting(true);
+            setIsConnected(true);
+            setIsAuthenticating(true);
+            await setActiveWallet(wallet);
+            await authenticateUser(wallet);
         }
-        else if (!isAuthenticated) {
-            // Only set isAuthenticating to false if we're not authenticated
-            // This prevents the flicker state where both isAuthenticating and isAuthenticated are false
-            const timeout = setTimeout(() => {
-                debug("setIsAuthenticating:false:5a");
-                setIsConnecting(false);
-            }, 100); // Add a small delay to prevent quick flickers
-            return () => clearTimeout(timeout);
+        catch (error) {
+            debug("@@useAuthentication:onConnect:failed", { error });
+            setIsAuthenticated(false);
+            setUser(undefined);
         }
-        else {
-            debug("setIsAuthenticating:false:5b");
-            setIsConnecting(false);
+        finally {
+            setIsAuthenticating(false);
         }
-    }, [useAutoConnectLoading, isAuthenticated, setIsConnecting, setIsConnected]);
+        debug({
+            isAuthenticated,
+            isAuthenticating,
+            isConnected,
+        });
+    }, [
+        authenticateUser,
+        isAuthenticated,
+        isAuthenticating,
+        isConnected,
+        setActiveWallet,
+        setHasStartedConnecting,
+        setIsAuthenticated,
+        setIsAuthenticating,
+        setIsConnected,
+        setUser,
+    ]);
     const logout = async (callback) => {
         if (activeWallet) {
             debug("@@logout:activeWallet", activeWallet);
@@ -137,7 +179,21 @@ export function useAuthentication(partnerId, loginWithSiwe) {
         setUser();
         callback?.();
     };
-    const isReady = isAuthenticated && !useAutoConnectLoading && !isAuthenticating;
+    const { isLoading: useAutoConnectLoading } = useAutoConnect({
+        client,
+        wallets: [wallet],
+        onConnect: onConnect,
+    });
+    /**
+     * useAutoConnectLoading starts as false
+     */
+    useEffect(() => {
+        if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
+            setIsAuthenticating(false);
+        }
+        useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
+    }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
+    const isReady = isAuthenticated && !isAuthenticating;
     return {
         logout,
         isAuthenticated,
@@ -146,7 +202,11 @@ export function useAuthentication(partnerId, loginWithSiwe) {
         isConnected,
         wallet,
         preAuthenticate,
-        connect,
+        connect: onConnect,
         isAuthenticating,
+        onConnect,
+        user,
+        refetchUser: authenticateUser,
+        setUser,
     };
 }