@b3dotfun/sdk 0.0.34-alpha.1 → 0.0.34-alpha.3

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

@@ -4,7 +4,7 @@ import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { b3MainnetThirdWeb } from "@b3dotfun/sdk/shared/constants/chains/supported";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { useActiveWallet, useAutoConnect, useConnectedWallets, useDisconnect } from "thirdweb/react";
 import { ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
@@ -27,6 +27,11 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
   const setIsConnected = useAuthStore(state => state.setIsConnected);
   const isConnecting = useAuthStore(state => state.isConnecting);
   const isConnected = useAuthStore(state => state.isConnected);
+  const useAutoConnectLoadingPrevious = useRef(false);
+  const setIsAuthenticatingV2 = useAuthStore(state => state.setIsAuthenticatingV2);
+  const isAuthenticatingV2 = useAuthStore(state => state.isAuthenticatingV2);
+  const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
+  const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
   const { connect } = useConnect(partnerId, b3MainnetThirdWeb);
 
   const wallet = ecosystemWallet(ecosystemWalletId, {
@@ -37,11 +42,15 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
     client,
     wallets: [wallet],
     onConnect: async wallet => {
+      setHasStartedConnecting(true);
+
       try {
         setIsConnected(true);
         if (!loginWithSiwe) {
           debug("Skipping SIWE login", { loginWithSiwe });
           setIsAuthenticated(true);
+
+          setIsAuthenticatingV2(false);
           return;
         }
         debug("setIsAuthenticating:true:4");
@@ -56,6 +65,7 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
           const userAuth = await app.reAuthenticate();
           setUser(userAuth.user);
           setIsAuthenticated(true);
+          setIsAuthenticatingV2(false);
           debug("Re-authenticated successfully", { userAuth });
         } catch (error) {
           // If re-authentication fails, try fresh authentication
@@ -63,6 +73,7 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
           const userAuth = await authenticate(account, partnerId);
           setUser(userAuth.user);
           setIsAuthenticated(true);
+          setIsAuthenticatingV2(false);
           debug("Fresh authentication successful", { userAuth });
         }
       } catch (error) {
@@ -71,9 +82,20 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
         debug("setIsAuthenticating:false:4");
         setUser();
       }
+      setIsAuthenticatingV2(false);
     },
   });
 
+  /**
+   * useAutoConnectLoading starts as false
+   */
+  useEffect(() => {
+    if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
+      setIsAuthenticatingV2(false);
+    }
+    useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
+  }, [useAutoConnectLoading]);
+
   // Ensure isAuthenticating stays true until we're fully ready
   useEffect(() => {
     if (useAutoConnectLoading) {
@@ -137,5 +159,6 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
     wallet,
     preAuthenticate,
     connect,
+    isAuthenticatingV2,
   };
 }

package/src/global-account/react/stores/useAuthStore.ts

@@ -27,6 +27,10 @@ interface AuthState {
     onError?: (error: Error) => void;
   }) => void;
   reset: () => void;
+  isAuthenticatingV2: boolean;
+  setIsAuthenticatingV2: (isAuthenticating: boolean) => void;
+  hasStartedConnecting: boolean;
+  setHasStartedConnecting: (hasStartedConnecting: boolean) => void;
 }
 
 export const useAuthStore = create<AuthState>(set => ({
@@ -69,4 +73,8 @@ export const useAuthStore = create<AuthState>(set => ({
       onSuccess: undefined,
       onError: undefined,
     }),
+  isAuthenticatingV2: true,
+  setIsAuthenticatingV2: isAuthenticating => set({ isAuthenticatingV2: isAuthenticating }),
+  hasStartedConnecting: false,
+  setHasStartedConnecting: hasStartedConnecting => set({ hasStartedConnecting }),
 }));

package/src/styles/index.css

@@ -343,8 +343,7 @@ Dark version
   @apply bg-b3-react-background;
 }
 .b3-modal .css-1m9ejup,
-.b3-modal .css-1cv2836,
-.b3-modal .css-1d4s0we img[width="24"] {
+.b3-modal .css-1cv2836 {
   display: none !important;
 }
 
@@ -386,6 +385,10 @@ Dark version
 }
 
 .b3-login-step {
+  & > div > div > div > div > div > div > div > img {
+    display: none;
+  }
+
   /* Input fields styling */
   & input {
     color: hsl(var(--b3-react-foreground)) !important;