@b3dotfun/sdk 0.0.19-alpha.0 → 0.0.19-alpha.2

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Loading, useB3, useGetAllTWSigners, useModalStore, useSiwe, } from "../../../../global-account/react/index.js";
+import { Loading, useAuthStore, useB3, useGetAllTWSigners, useModalStore, useSiwe, } from "../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useCallback, useEffect, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
@@ -16,9 +16,12 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     const { setUser, automaticallySetFirstEoa } = useB3();
     const [step, setStep] = useState(source === "requestPermissions" ? null : "login");
     const [sessionKeyAdded, setSessionKeyAdded] = useState(source === "requestPermissions" ? true : false);
-    const { setB3ModalContentType, setB3ModalOpen } = useModalStore();
+    const { setB3ModalContentType, setB3ModalOpen, isOpen } = useModalStore();
     const account = useActiveAccount();
-    const [loginComplete, setLoginComplete] = useState(source === "requestPermissions" ? true : false);
+    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({
@@ -29,7 +32,6 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         },
     });
     const { authenticate } = useSiwe();
-    const [authenticatingWithB3, setAuthenticatingWithB3] = useState(false);
     const [refetchQueued, setRefetchQueued] = useState(false);
     // Enhanced refetchSigners function that tracks number of attempts
     const handleRefetchSigners = useCallback(() => {
@@ -55,11 +57,14 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     // Handle post-login flow after signers are loaded
     useEffect(() => {
         debug("@@SignInWithB3Flow:useEffect", {
-            loginComplete,
+            isConnected,
+            isAuthenticating,
             isFetchingSigners,
+            closeAfterLogin,
+            isOpen,
             source,
         });
-        if (loginComplete && !isFetchingSigners) {
+        if (isConnected) {
             // Check if we already have a signer for this partner
             const hasExistingSigner = signers?.some(signer => signer.partner.id === partnerId);
             if (hasExistingSigner) {
@@ -99,7 +104,6 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         signers,
         isFetchingSigners,
         partnerId,
-        loginComplete,
         handleRefetchSigners,
         source,
         closeAfterLogin,
@@ -108,6 +112,9 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         onSessionKeySuccess,
         setB3ModalOpen,
         signersEnabled,
+        isConnected,
+        isAuthenticating,
+        isOpen,
     ]);
     debug("render", {
         step,
@@ -152,16 +159,16 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     ]);
     const handleLoginSuccess = useCallback(async (account) => {
         debug("Authenticating with B3 via SIWE");
+        setIsConnected(true);
         if (loginWithSiwe) {
-            setAuthenticatingWithB3(true);
+            setIsAuthenticating(true);
             const userAuth = await authenticate(account, partnerId);
             setUser(userAuth.user);
         }
         debug("handleLoginSuccess:account", account);
         onLoginSuccess?.(account);
-        setLoginComplete(true);
-        setAuthenticatingWithB3(false);
-    }, [authenticate, loginWithSiwe, onLoginSuccess, setUser, partnerId]);
+        setIsAuthenticating(false);
+    }, [loginWithSiwe, onLoginSuccess, setIsAuthenticating, authenticate, partnerId, setUser, setIsConnected]);
     useEffect(() => {
         if (step === "permissions") {
             setB3ModalContentType({
@@ -177,7 +184,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     if (refetchError) {
         return (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "p-4 text-center text-red-500", children: refetchError }) }));
     }
-    if (authenticatingWithB3 || (isFetchingSigners && step === "login") || source === "requestPermissions") {
+    if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
         return (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "mt-8 flex items-center justify-center", children: _jsx(Loading, { variant: "white", size: "lg" }) }) }));
     }
     if (step === "login") {

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

@@ -3,7 +3,7 @@ import { Button, StyleRoot, useAuthentication, useModalStore } from "../../../..
 import { cn } from "../../../../shared/utils/index.js";
 export function ManageAccountButton(props) {
     const { setB3ModalOpen, setB3ModalContentType } = useModalStore();
-    const { isAuthenticated } = useAuthentication(props.partnerId, props.loginWithSiwe);
+    const { isConnected } = useAuthentication(props.partnerId, props.loginWithSiwe);
     const handleClickManageAccount = () => {
         setB3ModalContentType({
             ...props,
@@ -11,7 +11,7 @@ export function ManageAccountButton(props) {
         });
         setB3ModalOpen(true);
     };
-    if (!isAuthenticated)
+    if (!isConnected)
         return null;
     return (_jsx(StyleRoot, { children: _jsxs(Button, { onClick: handleClickManageAccount, style: { backgroundColor: "#3368ef" }, className: cn("b3-manage-account-button flex items-center gap-2 text-white", props.className), children: [props.withLogo !== false && (_jsx("img", { src: "https://cdn.b3.fun/b3_logo_white.svg", alt: "B3 Logo", className: "h-5 w-5" })), props.loggedInButtonText || "Manage Account"] }) }));
 }

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

@@ -4,6 +4,8 @@ export declare function useAuthentication(partnerId: string, loginWithSiwe?: boo
     isAuthenticating: boolean;
     isAuthenticated: boolean;
     isReady: boolean;
+    isConnecting: boolean;
+    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>;

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

@@ -21,6 +21,10 @@ export function useAuthentication(partnerId, loginWithSiwe) {
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
     const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
     const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
+    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 { connect } = useConnect(partnerId, b3MainnetThirdWeb);
     const wallet = ecosystemWallet(ecosystemWalletId, {
         partnerId: partnerId,
@@ -30,6 +34,7 @@ export function useAuthentication(partnerId, loginWithSiwe) {
         wallets: [wallet],
         onConnect: async (wallet) => {
             try {
+                setIsConnected(true);
                 if (!loginWithSiwe) {
                     debug("Skipping SIWE login", { loginWithSiwe });
                     setIsAuthenticated(true);
@@ -67,19 +72,22 @@ export function useAuthentication(partnerId, loginWithSiwe) {
     useEffect(() => {
         if (useAutoConnectLoading) {
             setIsAuthenticating(true);
+            setIsConnecting(true);
         }
         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(() => {
                 setIsAuthenticating(false);
+                setIsConnecting(false);
             }, 100); // Add a small delay to prevent quick flickers
             return () => clearTimeout(timeout);
         }
         else {
             setIsAuthenticating(false);
+            setIsConnecting(false);
         }
-    }, [useAutoConnectLoading, isAuthenticated, setIsAuthenticating]);
+    }, [useAutoConnectLoading, isAuthenticated, setIsAuthenticating, setIsConnecting, setIsConnected]);
     const logout = async (callback) => {
         if (activeWallet) {
             debug("@@logout:activeWallet", activeWallet);
@@ -102,6 +110,7 @@ export function useAuthentication(partnerId, loginWithSiwe) {
         app.logout();
         debug("@@logout:loggedOut");
         setIsAuthenticated(false);
+        setIsConnected(false);
         setUser();
         callback?.();
     };
@@ -111,6 +120,8 @@ export function useAuthentication(partnerId, loginWithSiwe) {
         isAuthenticating: useAutoConnectLoading || isAuthenticating,
         isAuthenticated,
         isReady,
+        isConnecting,
+        isConnected,
         wallet,
         preAuthenticate,
         connect,

package/dist/esm/global-account/react/stores/useAuthStore.d.ts

@@ -7,10 +7,14 @@ interface AuthState {
     chain?: Chain;
     isAuthenticating: boolean;
     isAuthenticated: boolean;
+    isConnecting: boolean;
+    isConnected: boolean;
     onSuccess?: (account: any) => void;
     onError?: (error: Error) => void;
     setB3ModalOpen: (isOpen: boolean) => void;
     setStep: (step: "login" | "permissions") => void;
+    setIsConnecting: (isConnecting: boolean) => void;
+    setIsConnected: (isConnected: boolean) => void;
     setIsAuthenticating: (isAuthenticating: boolean) => void;
     setIsAuthenticated: (isAuthenticated: boolean) => void;
     startAuth: (params: {

package/dist/esm/global-account/react/stores/useAuthStore.js

@@ -7,10 +7,14 @@ export const useAuthStore = create(set => ({
     chain: undefined,
     isAuthenticating: false,
     isAuthenticated: false,
+    isConnecting: false,
+    isConnected: false,
     onSuccess: undefined,
     onError: undefined,
     setB3ModalOpen: isOpen => set({ isOpen }),
     setStep: step => set({ step }),
+    setIsConnecting: isConnecting => set({ isConnecting }),
+    setIsConnected: isConnected => set({ isConnected }),
     setIsAuthenticating: isAuthenticating => set({ isAuthenticating }),
     setIsAuthenticated: isAuthenticated => set({ isAuthenticated }),
     startAuth: params => set({

package/dist/types/anyspend/react/hooks/useAnyspendCreateOnrampOrder.d.ts

@@ -5,7 +5,6 @@ export type OnrampOptions = {
     paymentMethod: string;
     country: string;
     redirectUrl: string;
-    ipAddress?: string;
 };
 export type CreateOnrampOrderParams = Omit<CreateOrderParams, "srcChain" | "srcToken" | "srcAmount"> & {
     srcFiatAmount: string;

package/dist/types/anyspend/react/hooks/useStripeSupport.d.ts

@@ -1,5 +1,5 @@
 import { VisitorData } from "@b3dotfun/sdk/anyspend/types/fingerprint";
-export declare function useStripeSupport(isMainnet: boolean, ipAddress: string, usdAmount?: string, visitorData?: VisitorData, isLoadingVisitorData?: boolean): {
+export declare function useStripeSupport(isMainnet: boolean, usdAmount?: string, visitorData?: VisitorData, isLoadingVisitorData?: boolean): {
     isStripeOnrampSupported: boolean;
     stripeWeb2Support: {
         isSupport: false;

package/dist/types/anyspend/services/anyspend.d.ts

@@ -30,7 +30,7 @@ export declare const anyspendService: {
     getOrderAndTransactions: (isMainnet: boolean, orderId: string | undefined) => Promise<GetOrderAndTxsResponse>;
     getOrderHistory: (isMainnet: boolean, creatorAddress: string | undefined, limit?: number, offset?: number) => Promise<GetOrderHistoryResponse>;
     getCoinbaseOnrampOptions: (isMainnet: boolean, country: string, visitorData?: VisitorData) => Promise<GetCoinbaseOnrampOptionsResponse>;
-    checkStripeSupport: (isMainnet: boolean, ipAddress: string, usdAmount?: string, visitorData?: VisitorData) => Promise<{
+    checkStripeSupport: (isMainnet: boolean, usdAmount?: string, visitorData?: VisitorData) => Promise<{
         stripeOnramp: boolean;
         stripeWeb2: components["schemas"]["StripeWeb2Support"];
     }>;

package/dist/types/anyspend/types/api.d.ts

@@ -238,12 +238,7 @@ export interface paths {
          */
         get: {
             parameters: {
-                query: {
-                    /**
-                     * @description IP address to check location-based support
-                     * @example 192.168.1.1
-                     */
-                    ipAddress: string;
+                query?: {
                     /**
                      * @description Optional USD amount for transaction limit checks
                      * @example 100.00
@@ -903,11 +898,6 @@ export interface components {
              * @example
              */
             paymentMethod?: string;
-            /**
-             * @description User's IP address
-             * @example 96.225.86.216
-             */
-            ipAddress?: string;
             /**
              * @description Redirect URL after payment
              * @example https://www.anyspend.com
@@ -936,11 +926,6 @@ export interface components {
              * @example SG
              */
             country?: string;
-            /**
-             * @description User's IP address
-             * @example 149.88.23.87
-             */
-            ipAddress?: string;
             /**
              * @description URL to redirect after payment
              * @example https://www.anyspend.com

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

@@ -4,6 +4,8 @@ export declare function useAuthentication(partnerId: string, loginWithSiwe?: boo
     isAuthenticating: boolean;
     isAuthenticated: boolean;
     isReady: boolean;
+    isConnecting: boolean;
+    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>;

package/dist/types/global-account/react/stores/useAuthStore.d.ts

@@ -7,10 +7,14 @@ interface AuthState {
     chain?: Chain;
     isAuthenticating: boolean;
     isAuthenticated: boolean;
+    isConnecting: boolean;
+    isConnected: boolean;
     onSuccess?: (account: any) => void;
     onError?: (error: Error) => void;
     setB3ModalOpen: (isOpen: boolean) => void;
     setStep: (step: "login" | "permissions") => void;
+    setIsConnecting: (isConnecting: boolean) => void;
+    setIsConnected: (isConnected: boolean) => void;
     setIsAuthenticating: (isAuthenticating: boolean) => void;
     setIsAuthenticated: (isAuthenticated: boolean) => void;
     startAuth: (params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.0.19-alpha.0",
+  "version": "0.0.19-alpha.2",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",

package/src/anyspend/react/components/AnySpend.tsx

@@ -878,7 +878,6 @@ function AnySpendInner({
           vendor: vendor,
           paymentMethod: paymentMethodString,
           country: geoData?.country || "US",
-          ipAddress: geoData?.ip,
           redirectUrl:
             window.location.origin === "https://basement.fun" ? "https://basement.fun/deposit" : window.location.origin,
         },

package/src/anyspend/react/components/AnySpendCustom.tsx

@@ -440,7 +440,6 @@ export function AnySpendCustom({
             vendor: onramp.vendor,
             paymentMethod: onramp.paymentMethod,
             country: geoData?.country || "US",
-            ipAddress: geoData?.ip,
             redirectUrl:
               window.location.origin === "https://basement.fun"
                 ? "https://basement.fun/deposit"

package/src/anyspend/react/components/common/PanelOnrampPayment.tsx

@@ -143,7 +143,6 @@ function PanelOnrampPaymentInner(props: PanelOnrampPaymentProps) {
           vendor: vendor,
           paymentMethod: paymentMethod || "",
           country: geoData?.country || "US",
-          ipAddress: geoData?.ip,
           redirectUrl:
             window.location.origin === "https://basement.fun" ? "https://basement.fun/deposit" : window.location.origin,
         },

package/src/anyspend/react/components/webview/WebviewOnrampPayment.tsx

@@ -213,7 +213,6 @@ function WebviewOnrampPaymentInner({
               vendor: "stripe-web2",
               paymentMethod: "",
               country: geoData.country || "US",
-              ipAddress: geoData.ip,
               redirectUrl: `${window.location.origin}${userId ? `?userId=${userId}` : ""}`,
             },
             expectedDstAmount: anyspendQuote.data?.currencyOut?.amount?.toString() || "0",

package/src/anyspend/react/hooks/useAnyspendCreateOnrampOrder.ts

@@ -16,7 +16,6 @@ export type OnrampOptions = {
   paymentMethod: string;
   country: string;
   redirectUrl: string;
-  ipAddress?: string; // Required for Stripe
 };
 
 export type CreateOnrampOrderParams = Omit<CreateOrderParams, "srcChain" | "srcToken" | "srcAmount"> & {
@@ -60,11 +59,6 @@ export function useAnyspendCreateOnrampOrder({ onSuccess, onError }: UseAnyspend
       } = params;
 
       try {
-        // Validate Stripe onramp options
-        if (onramp.vendor === "stripe" && !onramp.ipAddress) {
-          throw new Error("IP address is required for Stripe onramp");
-        }
-
         // Validate required onramp fields
         if (!onramp.vendor || !onramp.country) {
           throw new Error("Missing required onramp fields: vendor, country");

package/src/anyspend/react/hooks/useGeoOnrampOptions.ts

@@ -22,7 +22,6 @@ export function useGeoOnrampOptions(isMainnet: boolean, srcFiatAmount: string) {
     useCoinbaseOnrampOptions(isMainnet, geoData?.country, visitorData);
   const { isStripeOnrampSupported, stripeWeb2Support, isLoadingStripeSupport, stripeSupportError } = useStripeSupport(
     isMainnet,
-    geoData?.ip || "",
     srcFiatAmount,
     visitorData,
   );

package/src/anyspend/react/hooks/useStripeSupport.ts

@@ -5,15 +5,14 @@ import { useMemo } from "react";
 
 export function useStripeSupport(
   isMainnet: boolean,
-  ipAddress: string,
   usdAmount?: string,
   visitorData?: VisitorData,
   isLoadingVisitorData?: boolean,
 ) {
   const { data, isLoading, error, refetch } = useQuery({
-    queryKey: ["useStripeSupport", isMainnet, ipAddress, usdAmount, visitorData?.requestId, visitorData?.visitorId],
-    queryFn: () => anyspendService.checkStripeSupport(isMainnet, ipAddress, usdAmount, visitorData),
-    enabled: !!ipAddress && !isLoadingVisitorData,
+    queryKey: ["useStripeSupport", isMainnet, usdAmount, visitorData?.requestId, visitorData?.visitorId],
+    queryFn: () => anyspendService.checkStripeSupport(isMainnet, usdAmount, visitorData),
+    enabled: !isLoadingVisitorData,
   });
 
   return useMemo(

package/src/anyspend/services/anyspend.ts

@@ -170,12 +170,10 @@ export const anyspendService = {
 
   checkStripeSupport: async (
     isMainnet: boolean,
-    ipAddress: string,
     usdAmount?: string,
     visitorData?: VisitorData,
   ): Promise<{ stripeOnramp: boolean; stripeWeb2: components["schemas"]["StripeWeb2Support"] }> => {
     const params = new URLSearchParams({
-      ipAddress,
       usdAmount: usdAmount || "",
     });
     const response = await fetch(

package/src/anyspend/types/api.ts

@@ -239,12 +239,7 @@ export interface paths {
      */
     get: {
       parameters: {
-        query: {
-          /**
-           * @description IP address to check location-based support
-           * @example 192.168.1.1
-           */
-          ipAddress: string;
+        query?: {
           /**
            * @description Optional USD amount for transaction limit checks
            * @example 100.00
@@ -909,11 +904,6 @@ export interface components {
        * @example
        */
       paymentMethod?: string;
-      /**
-       * @description User's IP address
-       * @example 96.225.86.216
-       */
-      ipAddress?: string;
       /**
        * @description Redirect URL after payment
        * @example https://www.anyspend.com
@@ -942,11 +932,6 @@ export interface components {
        * @example SG
        */
       country?: string;
-      /**
-       * @description User's IP address
-       * @example 149.88.23.87
-       */
-      ipAddress?: string;
       /**
        * @description URL to redirect after payment
        * @example https://www.anyspend.com

package/src/global-account/react/components/SignInWithB3/SignInWithB3.tsx

@@ -21,7 +21,7 @@ export type SignInWithB3Props = Omit<SignInWithB3ModalProps, "type" | "showBackB
 export function SignInWithB3(props: SignInWithB3Props) {
   const { setB3ModalOpen, setB3ModalContentType, setEcoSystemAccountAddress } = useModalStore();
   const { account } = useB3();
-  const { isAuthenticating, isAuthenticated } = useAuthentication(props.partnerId, props.loginWithSiwe);
+  const { isAuthenticating, isConnected } = useAuthentication(props.partnerId, props.loginWithSiwe);
   const isMobile = useIsMobile();
 
   useEffect(() => {
@@ -39,7 +39,7 @@ export function SignInWithB3(props: SignInWithB3Props) {
     setB3ModalOpen(true);
   };
 
-  if (isAuthenticated) {
+  if (isConnected) {
     return <ManageAccountButton {...props} />;
   }
 

package/src/global-account/react/components/SignInWithB3/SignInWithB3Flow.tsx

@@ -1,6 +1,7 @@
 import {
   Loading,
   SignInWithB3ModalProps,
+  useAuthStore,
   useB3,
   useGetAllTWSigners,
   useModalStore,
@@ -37,9 +38,12 @@ export function SignInWithB3Flow({
   const { setUser, automaticallySetFirstEoa } = useB3();
   const [step, setStep] = useState<"login" | "permissions" | null>(source === "requestPermissions" ? null : "login");
   const [sessionKeyAdded, setSessionKeyAdded] = useState(source === "requestPermissions" ? true : false);
-  const { setB3ModalContentType, setB3ModalOpen } = useModalStore();
+  const { setB3ModalContentType, setB3ModalOpen, isOpen } = useModalStore();
   const account = useActiveAccount();
-  const [loginComplete, setLoginComplete] = useState(source === "requestPermissions" ? true : false);
+  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<string | null>(null);
   const {
@@ -54,7 +58,6 @@ export function SignInWithB3Flow({
     },
   });
   const { authenticate } = useSiwe();
-  const [authenticatingWithB3, setAuthenticatingWithB3] = useState(false);
   const [refetchQueued, setRefetchQueued] = useState(false);
 
   // Enhanced refetchSigners function that tracks number of attempts
@@ -86,12 +89,15 @@ export function SignInWithB3Flow({
   // Handle post-login flow after signers are loaded
   useEffect(() => {
     debug("@@SignInWithB3Flow:useEffect", {
-      loginComplete,
+      isConnected,
+      isAuthenticating,
       isFetchingSigners,
+      closeAfterLogin,
+      isOpen,
       source,
     });
 
-    if (loginComplete && !isFetchingSigners) {
+    if (isConnected) {
       // Check if we already have a signer for this partner
       const hasExistingSigner = signers?.some(signer => signer.partner.id === partnerId);
       if (hasExistingSigner) {
@@ -128,7 +134,6 @@ export function SignInWithB3Flow({
     signers,
     isFetchingSigners,
     partnerId,
-    loginComplete,
     handleRefetchSigners,
     source,
     closeAfterLogin,
@@ -137,6 +142,9 @@ export function SignInWithB3Flow({
     onSessionKeySuccess,
     setB3ModalOpen,
     signersEnabled,
+    isConnected,
+    isAuthenticating,
+    isOpen,
   ]);
 
   debug("render", {
@@ -186,17 +194,17 @@ export function SignInWithB3Flow({
   const handleLoginSuccess = useCallback(
     async (account: Account) => {
       debug("Authenticating with B3 via SIWE");
+      setIsConnected(true);
       if (loginWithSiwe) {
-        setAuthenticatingWithB3(true);
+        setIsAuthenticating(true);
         const userAuth = await authenticate(account, partnerId);
         setUser(userAuth.user);
       }
       debug("handleLoginSuccess:account", account);
       onLoginSuccess?.(account);
-      setLoginComplete(true);
-      setAuthenticatingWithB3(false);
+      setIsAuthenticating(false);
     },
-    [authenticate, loginWithSiwe, onLoginSuccess, setUser, partnerId],
+    [loginWithSiwe, onLoginSuccess, setIsAuthenticating, authenticate, partnerId, setUser, setIsConnected],
   );
 
   useEffect(() => {
@@ -220,7 +228,7 @@ export function SignInWithB3Flow({
     );
   }
 
-  if (authenticatingWithB3 || (isFetchingSigners && step === "login") || source === "requestPermissions") {
+  if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
     return (
       <LoginStepContainer partnerId={partnerId}>
         <div className="mt-8 flex items-center justify-center">

package/src/global-account/react/components/custom/ManageAccountButton.tsx

@@ -4,7 +4,7 @@ import { SignInWithB3Props } from "../SignInWithB3/SignInWithB3";
 
 export function ManageAccountButton(props: SignInWithB3Props & { className?: string }) {
   const { setB3ModalOpen, setB3ModalContentType } = useModalStore();
-  const { isAuthenticated } = useAuthentication(props.partnerId, props.loginWithSiwe);
+  const { isConnected } = useAuthentication(props.partnerId, props.loginWithSiwe);
 
   const handleClickManageAccount = () => {
     setB3ModalContentType({
@@ -14,7 +14,7 @@ export function ManageAccountButton(props: SignInWithB3Props & { className?: str
     setB3ModalOpen(true);
   };
 
-  if (!isAuthenticated) return null;
+  if (!isConnected) return null;
 
   return (
     <StyleRoot>

package/src/global-account/react/hooks/useAuthentication.ts

@@ -23,6 +23,10 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
   const isAuthenticated = useAuthStore(state => state.isAuthenticated);
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
+  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 { connect } = useConnect(partnerId, b3MainnetThirdWeb);
 
   const wallet = ecosystemWallet(ecosystemWalletId, {
@@ -34,6 +38,7 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
     wallets: [wallet],
     onConnect: async wallet => {
       try {
+        setIsConnected(true);
         if (!loginWithSiwe) {
           debug("Skipping SIWE login", { loginWithSiwe });
           setIsAuthenticated(true);
@@ -72,17 +77,20 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
   useEffect(() => {
     if (useAutoConnectLoading) {
       setIsAuthenticating(true);
+      setIsConnecting(true);
     } 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(() => {
         setIsAuthenticating(false);
+        setIsConnecting(false);
       }, 100); // Add a small delay to prevent quick flickers
       return () => clearTimeout(timeout);
     } else {
       setIsAuthenticating(false);
+      setIsConnecting(false);
     }
-  }, [useAutoConnectLoading, isAuthenticated, setIsAuthenticating]);
+  }, [useAutoConnectLoading, isAuthenticated, setIsAuthenticating, setIsConnecting, setIsConnected]);
 
   const logout = async (callback?: () => void) => {
     if (activeWallet) {
@@ -110,6 +118,7 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
     debug("@@logout:loggedOut");
 
     setIsAuthenticated(false);
+    setIsConnected(false);
     setUser();
     callback?.();
   };
@@ -121,6 +130,8 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
     isAuthenticating: useAutoConnectLoading || isAuthenticating,
     isAuthenticated,
     isReady,
+    isConnecting,
+    isConnected,
     wallet,
     preAuthenticate,
     connect,