@b3dotfun/sdk 0.0.47 → 0.0.48-alpha.0

package/dist/cjs/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/cjs/global-account/react/components/SignInWithB3/SignInWithB3Flow.js

@@ -15,16 +15,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
  */
-function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, loginWithSiwe = false, source = "signInWithB3Button", signersEnabled = false, }) {
-    const { setUser, automaticallySetFirstEoa } = (0, react_1.useB3)();
+function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, source = "signInWithB3Button", signersEnabled = false, }) {
+    const { automaticallySetFirstEoa } = (0, react_1.useB3)();
     const [step, setStep] = (0, react_2.useState)(source === "requestPermissions" ? null : "login");
     const [sessionKeyAdded, setSessionKeyAdded] = (0, react_2.useState)(source === "requestPermissions" ? true : false);
     const { setB3ModalContentType, setB3ModalOpen, isOpen } = (0, react_1.useModalStore)();
     const account = (0, react_3.useActiveAccount)();
-    const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
     const isAuthenticating = (0, react_1.useAuthStore)(state => state.isAuthenticating);
     const isConnected = (0, react_1.useAuthStore)(state => state.isConnected);
-    const setIsConnected = (0, react_1.useAuthStore)(state => state.setIsConnected);
     const [refetchCount, setRefetchCount] = (0, react_2.useState)(0);
     const [refetchError, setRefetchError] = (0, react_2.useState)(null);
     const { data: signers, refetch: refetchSigners, isFetching: isFetchingSigners, } = (0, react_1.useGetAllTWSigners)({
@@ -34,7 +32,6 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
             enabled: signersEnabled,
         },
     });
-    const { authenticate } = (0, react_1.useSiwe)();
     const [refetchQueued, setRefetchQueued] = (0, react_2.useState)(false);
     // Enhanced refetchSigners function that tracks number of attempts
     const handleRefetchSigners = (0, react_2.useCallback)(() => {
@@ -145,13 +142,11 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
             sessionKeyAddress,
             partnerId,
             closeAfterLogin,
-            loginWithSiwe,
             source: "requestPermissions",
         });
     }, [
         chain,
         closeAfterLogin,
-        loginWithSiwe,
         onError,
         onLoginSuccess,
         onSessionKeySuccess,
@@ -161,19 +156,8 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         strategies,
     ]);
     const handleLoginSuccess = (0, react_2.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]);
     (0, react_2.useEffect)(() => {
         if (step === "permissions") {
             setB3ModalContentType({
@@ -195,14 +179,14 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
     if (step === "login") {
         // Custom strategy
         if (strategies?.[0] === "privy") {
-            return (0, jsx_runtime_1.jsx)(SignInWithB3Privy_1.SignInWithB3Privy, { onSuccess: handleLoginSuccess, partnerId: partnerId, chain: chain });
+            return (0, jsx_runtime_1.jsx)(SignInWithB3Privy_1.SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
         }
         // Strategies are explicitly provided
         if (strategies) {
-            return ((0, jsx_runtime_1.jsx)(LoginStepCustom_1.LoginStepCustom, { strategies: strategies, partnerId: partnerId, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
+            return ((0, jsx_runtime_1.jsx)(LoginStepCustom_1.LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
         }
         // Default to handle all strategies we support
-        return (0, jsx_runtime_1.jsx)(LoginStep_1.LoginStep, { partnerId: partnerId, chain: chain, onSuccess: handleLoginSuccess, onError: onError });
+        return (0, jsx_runtime_1.jsx)(LoginStep_1.LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
     }
     return null;
 }

package/dist/cjs/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/cjs/global-account/react/components/SignInWithB3/SignInWithB3Privy.js

@@ -6,8 +6,9 @@ const react_1 = require("../../../../global-account/react");
 const debug_1 = require("../../../../shared/utils/debug");
 const react_2 = require("react");
 const debug = (0, debug_1.debugB3React)("SignInWithB3Privy");
-function SignInWithB3Privy({ onSuccess, onError, partnerId, chain }) {
-    const { isLoading, connectTw, fullToken } = (0, react_1.useHandleConnectWithPrivy)(partnerId, chain, onSuccess);
+function SignInWithB3Privy({ onSuccess, onError, chain }) {
+    const { partnerId } = (0, react_1.useB3)();
+    const { isLoading, connectTw, fullToken } = (0, react_1.useHandleConnectWithPrivy)(chain, onSuccess);
     const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
     const setIsAuthenticated = (0, react_1.useAuthStore)(state => state.setIsAuthenticated);
     const { logout } = (0, react_1.useAuthentication)(partnerId);

package/dist/cjs/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/cjs/global-account/react/components/SignInWithB3/steps/LoginStep.js

@@ -5,7 +5,6 @@ exports.LoginStep = LoginStep;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../../global-account/react");
 const constants_1 = require("../../../../../shared/constants");
-const debug_1 = require("../../../../../shared/utils/debug");
 const thirdweb_1 = require("../../../../../shared/utils/thirdweb");
 const react_2 = require("thirdweb/react");
 const wallets_1 = require("thirdweb/wallets");
@@ -19,14 +18,12 @@ function LoginStepContainer({ children, partnerId }) {
     const partnerLogo = partner?.data?.[0]?.loginCustomization?.logoUrl;
     return ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col items-center justify-center pt-6", children: [partnerLogo && ((0, jsx_runtime_1.jsx)("img", { src: partnerLogo, alt: "Partner Logo", className: "partner-logo mb-6 h-12 w-auto object-contain" })), children, (0, jsx_runtime_1.jsxs)("h2", { className: "mt-6 flex items-center gap-2 text-lg font-bold", children: ["Powered by", (0, jsx_runtime_1.jsx)("img", { alt: "B3 Logo", className: "h-5", src: "https://cdn.b3.fun/b3_logo.svg" }), "Connect"] })] }));
 }
-function LoginStep({ onSuccess, onError, partnerId, chain }) {
+function LoginStep({ onSuccess, chain }) {
+    const { partnerId, theme } = (0, react_1.useB3)();
     const wallet = (0, wallets_1.ecosystemWallet)(constants_1.ecosystemWalletId, {
         partnerId: partnerId,
     });
-    const { theme } = (0, react_1.useB3)();
-    const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
-    const setIsAuthenticated = (0, react_1.useAuthStore)(state => state.setIsAuthenticated);
-    const { logout } = (0, react_1.useAuthentication)(partnerId);
+    const { onConnect } = (0, react_1.useAuthentication)(partnerId);
     return ((0, jsx_runtime_1.jsx)(LoginStepContainer, { partnerId: partnerId, children: (0, jsx_runtime_1.jsx)(react_2.ConnectEmbed, { showThirdwebBranding: false, client: thirdweb_1.client, chain: chain, wallets: [wallet], theme: theme === "light"
                 ? (0, react_2.lightTheme)({
                     colors: {
@@ -37,50 +34,18 @@ 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);
-                    (0, debug_1.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 {
-                    (0, debug_1.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/cjs/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/cjs/global-account/react/components/SignInWithB3/steps/LoginStepCustom.js

@@ -9,7 +9,8 @@ const react_2 = require("react");
 const react_3 = require("thirdweb/react");
 const wallets_1 = require("thirdweb/wallets");
 const debug = (0, debug_1.debugB3React)("LoginStepCustom");
-function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
+function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
+    const { partnerId } = (0, react_1.useB3)();
     const [isLoading, setIsLoading] = (0, react_2.useState)(false);
     const [showAllWallets, setShowAllWallets] = (0, react_2.useState)(false);
     const { connect } = (0, react_1.useConnect)(partnerId, chain);

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

@@ -5,8 +5,9 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../global-account/react");
 const utils_1 = require("../../../../shared/utils");
 function ManageAccountButton(props) {
+    const { partnerId } = (0, react_1.useB3)();
     const { setB3ModalOpen, setB3ModalContentType } = (0, react_1.useModalStore)();
-    const { isConnected } = (0, react_1.useAuthentication)(props.partnerId, props.loginWithSiwe);
+    const { isConnected } = (0, react_1.useAuthentication)(partnerId);
     const handleClickManageAccount = () => {
         setB3ModalContentType({
             ...props,

package/dist/cjs/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/cjs/global-account/react/hooks/useAuthentication.js

@@ -8,116 +8,158 @@ const app_1 = __importDefault(require("../../../global-account/app"));
 const bsmnt_1 = require("../../../global-account/bsmnt");
 const react_1 = require("../../../global-account/react");
 const constants_1 = require("../../../shared/constants");
-const supported_1 = require("../../../shared/constants/chains/supported");
 const debug_1 = require("../../../shared/utils/debug");
 const thirdweb_1 = require("../../../shared/utils/thirdweb");
+const core_1 = require("@wagmi/core");
 const react_2 = require("react");
 const react_3 = require("thirdweb/react");
 const wallets_1 = require("thirdweb/wallets");
 const in_app_1 = require("thirdweb/wallets/in-app");
-const useConnect_1 = require("./useConnect");
-const useSiwe_1 = require("./useSiwe");
+const wagmi_1 = require("wagmi");
+const useUserQuery_1 = require("./useUserQuery");
+const useWagmiConfig_1 = require("./useWagmiConfig");
 const debug = (0, debug_1.debugB3React)("useAuthentication");
-function useAuthentication(partnerId, loginWithSiwe) {
+function useAuthentication(partnerId) {
     const { disconnect } = (0, react_3.useDisconnect)();
     const wallets = (0, react_3.useConnectedWallets)();
     const activeWallet = (0, react_3.useActiveWallet)();
-    const { authenticate } = (0, useSiwe_1.useSiwe)();
-    const { setUser } = (0, react_1.useB3)();
     const isAuthenticated = (0, react_1.useAuthStore)(state => state.isAuthenticated);
     const setIsAuthenticated = (0, react_1.useAuthStore)(state => state.setIsAuthenticated);
-    const setIsConnecting = (0, react_1.useAuthStore)(state => state.setIsConnecting);
     const setIsConnected = (0, react_1.useAuthStore)(state => state.setIsConnected);
     const isConnecting = (0, react_1.useAuthStore)(state => state.isConnecting);
     const isConnected = (0, react_1.useAuthStore)(state => state.isConnected);
-    const useAutoConnectLoadingPrevious = (0, react_2.useRef)(false);
-    const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
     const isAuthenticating = (0, react_1.useAuthStore)(state => state.isAuthenticating);
-    const hasStartedConnecting = (0, react_1.useAuthStore)(state => state.hasStartedConnecting);
+    const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
     const setHasStartedConnecting = (0, react_1.useAuthStore)(state => state.setHasStartedConnecting);
-    const { connect } = (0, useConnect_1.useConnect)(partnerId, supported_1.b3MainnetThirdWeb);
+    const setActiveWallet = (0, react_3.useSetActiveWallet)();
+    const hasStartedConnecting = (0, react_1.useAuthStore)(state => state.hasStartedConnecting);
+    const { authenticate } = (0, react_1.useSiwe)();
+    const { user, setUser } = (0, useUserQuery_1.useUserQuery)();
+    const useAutoConnectLoadingPrevious = (0, react_2.useRef)(false);
+    const wagmiConfig = (0, useWagmiConfig_1.useWagmiConfig)(partnerId);
+    const { connect } = (0, wagmi_1.useConnect)();
+    const activeWagmiAccount = (0, wagmi_1.useAccount)();
+    const { switchAccount } = (0, wagmi_1.useSwitchAccount)();
+    debug("@@activeWagmiAccount", activeWagmiAccount);
     const wallet = (0, wallets_1.ecosystemWallet)(constants_1.ecosystemWalletId, {
         partnerId: partnerId,
     });
-    const { isLoading: useAutoConnectLoading } = (0, react_3.useAutoConnect)({
-        client: thirdweb_1.client,
-        wallets: [wallet],
-        onConnect: async (wallet) => {
-            setHasStartedConnecting(true);
-            try {
-                setIsConnected(true);
-                if (!loginWithSiwe) {
-                    debug("Skipping SIWE login", { loginWithSiwe });
-                    setIsAuthenticated(true);
-                    setIsAuthenticating(false);
+    const syncWagmi = (0, react_2.useCallback)(async () => {
+        function syncWagmiFunc() {
+            const connectors = (0, core_1.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_1.default.reAuthenticate();
-                    setUser(userAuth.user);
-                    setIsAuthenticated(true);
-                    setIsAuthenticating(false);
-                    debug("Re-authenticated successfully", { userAuth });
-                    // Authenticate on BSMNT with B3 JWT
-                    const b3Jwt = await (0, bsmnt_1.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 === constants_1.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 (0, bsmnt_1.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]);
     (0, react_2.useEffect)(() => {
-        if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
+        syncWagmi();
+    }, [wallets, syncWagmi]);
+    const authenticateUser = (0, react_2.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_1.default.reAuthenticate();
+            setUser(userAuth.user);
+            setIsAuthenticated(true);
             setIsAuthenticating(false);
+            debug("Re-authenticated successfully", { userAuth });
+            // Authenticate on BSMNT with B3 JWT
+            const b3Jwt = await (0, bsmnt_1.authenticateWithB3JWT)(userAuth.accessToken);
+            debug("@@b3Jwt", b3Jwt);
         }
-        useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
-    }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
-    // Ensure isAuthenticating stays true until we're fully ready
-    (0, react_2.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 (0, bsmnt_1.authenticateWithB3JWT)(userAuth.accessToken);
+            debug("@@b3Jwt", b3Jwt);
+        }
+    }, [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+    const onConnect = (0, react_2.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);
@@ -143,7 +185,21 @@ function useAuthentication(partnerId, loginWithSiwe) {
         setUser();
         callback?.();
     };
-    const isReady = isAuthenticated && !useAutoConnectLoading && !isAuthenticating;
+    const { isLoading: useAutoConnectLoading } = (0, react_3.useAutoConnect)({
+        client: thirdweb_1.client,
+        wallets: [wallet],
+        onConnect: onConnect,
+    });
+    /**
+     * useAutoConnectLoading starts as false
+     */
+    (0, react_2.useEffect)(() => {
+        if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
+            setIsAuthenticating(false);
+        }
+        useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
+    }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
+    const isReady = isAuthenticated && !isAuthenticating;
     return {
         logout,
         isAuthenticated,
@@ -152,7 +208,11 @@ function useAuthentication(partnerId, loginWithSiwe) {
         isConnected,
         wallet,
         preAuthenticate: in_app_1.preAuthenticate,
-        connect,
+        connect: onConnect,
         isAuthenticating,
+        onConnect,
+        user,
+        refetchUser: authenticateUser,
+        setUser,
     };
 }

package/dist/cjs/global-account/react/hooks/useHandleConnectWithPrivy.d.ts

@@ -4,7 +4,7 @@ import { Account } from "thirdweb/wallets";
  * This essentially wraps our useConnect hook to handle the Privy auth flow.
  * Currently, this is for the basement-privy strategy
  */
-export declare function useHandleConnectWithPrivy(partnerId: string, chain?: Chain, onSuccess?: (account: Account) => void): {
+export declare function useHandleConnectWithPrivy(chain?: Chain, onSuccess?: (account: Account) => void): {
     connectTw: () => Promise<import("thirdweb/wallets").Wallet | null | undefined>;
     isLoading: boolean;
     fullToken: string | null;

package/dist/cjs/global-account/react/hooks/useHandleConnectWithPrivy.js

@@ -10,7 +10,8 @@ const debug = (0, debug_1.debugB3React)("@@b3:useHandleConnectWithPrivy");
  * This essentially wraps our useConnect hook to handle the Privy auth flow.
  * Currently, this is for the basement-privy strategy
  */
-function useHandleConnectWithPrivy(partnerId, chain, onSuccess) {
+function useHandleConnectWithPrivy(chain, onSuccess) {
+    const { partnerId } = (0, react_1.useB3)();
     if (!chain) {
         throw new Error("Chain is required");
     }