@b3dotfun/sdk 0.0.81 → 0.0.82-alpha.0

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

@@ -165,7 +165,7 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
             isOpen,
             source,
         });
-        if (isConnected && isAuthenticated) {
+        if (isConnected && isAuthenticated && user) {
             // Mark that login just completed BEFORE opening manage account or closing modal
             // This allows Turnkey modal to show (if enableTurnkey is true)
             if (closeAfterLogin) {

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

@@ -2,7 +2,7 @@ import { Users } from "@b3dotfun/b3-api";
 /**
  * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
  *
- * Custom hook to manage user state with react-query
+ * Custom hook to manage user state with Zustand
  * This allows for invalidation and refetching of user data
  */
 export declare function useUserQuery(): {
@@ -59,7 +59,7 @@ export declare function useUserQuery(): {
         };
     } | undefined;
     setUser: (newUser?: Users) => void;
-    refetchUser: () => Promise<void>;
+    refetchUser: () => Promise<any>;
     clearUser: () => void;
     queryKey: string[];
 };

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

@@ -2,79 +2,100 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useUserQuery = useUserQuery;
 const debug_1 = require("../../../shared/utils/debug");
-const react_query_1 = require("@tanstack/react-query");
+const react_1 = require("react");
+const zustand_1 = require("zustand");
+const middleware_1 = require("zustand/middleware");
 const debug = (0, debug_1.debugB3React)("useUserQuery");
 const USER_QUERY_KEY = ["b3-user"];
 /**
- * Retrieves the user from localStorage
+ * Zustand store for managing user state
+ * Persists user data to localStorage
  */
-function getUserFromStorage() {
-    if (typeof window === "undefined") {
-        return null;
-    }
-    try {
-        const storedUser = localStorage.getItem("b3-user");
-        return storedUser ? JSON.parse(storedUser) : null;
-    }
-    catch (error) {
-        console.warn("Failed to restore user from localStorage:", error);
-        return null;
-    }
-}
-/**
- * Saves user to localStorage
- */
-function saveUserToStorage(user) {
-    if (typeof window === "undefined") {
-        return;
-    }
-    if (user) {
-        localStorage.setItem("b3-user", JSON.stringify(user));
-    }
-    else {
-        localStorage.removeItem("b3-user");
-    }
-}
+const useUserStore = (0, zustand_1.create)()((0, middleware_1.persist)(set => ({
+    user: null,
+    setUser: (newUser) => {
+        const userToSave = newUser ?? null;
+        set({ user: userToSave });
+        debug("User updated", userToSave);
+    },
+    clearUser: () => {
+        set({ user: null });
+        debug("User cleared");
+    },
+}), {
+    name: "b3-user",
+    onRehydrateStorage: () => (_, error) => {
+        if (error) {
+            console.warn("Failed to rehydrate user store:", error);
+        }
+    },
+}));
 /**
  * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
  *
- * Custom hook to manage user state with react-query
+ * Custom hook to manage user state with Zustand
  * This allows for invalidation and refetching of user data
  */
 function useUserQuery() {
-    const queryClient = (0, react_query_1.useQueryClient)();
-    // Query to get user data (primarily from cache/localStorage)
-    const { data: user } = (0, react_query_1.useQuery)({
-        queryKey: USER_QUERY_KEY,
-        queryFn: getUserFromStorage,
-        staleTime: Infinity, // User data doesn't go stale automatically
-        gcTime: Infinity, // Keep in cache indefinitely
-        initialData: getUserFromStorage,
-    });
-    // Mutation to update user
-    const setUserMutation = (0, react_query_1.useMutation)({
-        mutationFn: async (newUser) => {
-            const userToSave = newUser ?? null;
-            saveUserToStorage(userToSave);
-            return userToSave;
-        },
-        onSuccess: data => {
-            queryClient.setQueryData(USER_QUERY_KEY, data);
-            debug("User updated", data);
-        },
-    });
+    const user = useUserStore(state => state.user);
+    const setUserStore = useUserStore(state => state.setUser);
+    const clearUserStore = useUserStore(state => state.clearUser);
+    // Listen for storage events from other tabs/windows
+    (0, react_1.useEffect)(() => {
+        const handleStorageChange = (e) => {
+            if (e.key === "b3-user") {
+                // Sync with changes from other tabs/windows
+                const stored = e.newValue;
+                if (stored) {
+                    try {
+                        const parsed = JSON.parse(stored);
+                        // Zustand persist format: { state: { user: ... }, version: ... }
+                        const userData = parsed?.state?.user ?? parsed?.user ?? null;
+                        useUserStore.setState({ user: userData });
+                    }
+                    catch (error) {
+                        console.warn("Failed to parse user from storage event:", error);
+                    }
+                }
+                else {
+                    useUserStore.setState({ user: null });
+                }
+            }
+        };
+        window.addEventListener("storage", handleStorageChange);
+        return () => {
+            window.removeEventListener("storage", handleStorageChange);
+        };
+    }, []);
     // Helper function to set user (maintains backward compatibility)
     const setUser = (newUser) => {
-        setUserMutation.mutate(newUser);
+        setUserStore(newUser);
     };
     // Helper function to invalidate and refetch user
     const refetchUser = async () => {
-        await queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-        return queryClient.refetchQueries({ queryKey: USER_QUERY_KEY });
+        // Re-read from localStorage and update store
+        // Zustand persist stores data as { state: { user: ... }, version: ... }
+        const stored = localStorage.getItem("b3-user");
+        if (stored) {
+            try {
+                const parsed = JSON.parse(stored);
+                // Zustand persist format: { state: { user: ... }, version: ... }
+                const userData = parsed?.state?.user ?? parsed?.user ?? null;
+                useUserStore.setState({ user: userData });
+                return userData ?? undefined;
+            }
+            catch (error) {
+                console.warn("Failed to refetch user from localStorage:", error);
+                // Fallback to current store state
+                return useUserStore.getState().user ?? undefined;
+            }
+        }
+        useUserStore.setState({ user: null });
+        return undefined;
     };
     // Helper function to clear user
     const clearUser = () => {
-        setUser(undefined);
+        clearUserStore();
     };
     return {
         user: user ?? undefined,

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

@@ -162,7 +162,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
             isOpen,
             source,
         });
-        if (isConnected && isAuthenticated) {
+        if (isConnected && isAuthenticated && user) {
             // Mark that login just completed BEFORE opening manage account or closing modal
             // This allows Turnkey modal to show (if enableTurnkey is true)
             if (closeAfterLogin) {

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

@@ -2,7 +2,7 @@ import { Users } from "@b3dotfun/b3-api";
 /**
  * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
  *
- * Custom hook to manage user state with react-query
+ * Custom hook to manage user state with Zustand
  * This allows for invalidation and refetching of user data
  */
 export declare function useUserQuery(): {
@@ -59,7 +59,7 @@ export declare function useUserQuery(): {
         };
     } | undefined;
     setUser: (newUser?: Users) => void;
-    refetchUser: () => Promise<void>;
+    refetchUser: () => Promise<any>;
     clearUser: () => void;
     queryKey: string[];
 };

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

@@ -1,77 +1,98 @@
 import { debugB3React } from "../../../shared/utils/debug.js";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect } from "react";
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
 const debug = debugB3React("useUserQuery");
 const USER_QUERY_KEY = ["b3-user"];
 /**
- * Retrieves the user from localStorage
+ * Zustand store for managing user state
+ * Persists user data to localStorage
  */
-function getUserFromStorage() {
-    if (typeof window === "undefined") {
-        return null;
-    }
-    try {
-        const storedUser = localStorage.getItem("b3-user");
-        return storedUser ? JSON.parse(storedUser) : null;
-    }
-    catch (error) {
-        console.warn("Failed to restore user from localStorage:", error);
-        return null;
-    }
-}
-/**
- * Saves user to localStorage
- */
-function saveUserToStorage(user) {
-    if (typeof window === "undefined") {
-        return;
-    }
-    if (user) {
-        localStorage.setItem("b3-user", JSON.stringify(user));
-    }
-    else {
-        localStorage.removeItem("b3-user");
-    }
-}
+const useUserStore = create()(persist(set => ({
+    user: null,
+    setUser: (newUser) => {
+        const userToSave = newUser ?? null;
+        set({ user: userToSave });
+        debug("User updated", userToSave);
+    },
+    clearUser: () => {
+        set({ user: null });
+        debug("User cleared");
+    },
+}), {
+    name: "b3-user",
+    onRehydrateStorage: () => (_, error) => {
+        if (error) {
+            console.warn("Failed to rehydrate user store:", error);
+        }
+    },
+}));
 /**
  * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
  *
- * Custom hook to manage user state with react-query
+ * Custom hook to manage user state with Zustand
  * This allows for invalidation and refetching of user data
  */
 export function useUserQuery() {
-    const queryClient = useQueryClient();
-    // Query to get user data (primarily from cache/localStorage)
-    const { data: user } = useQuery({
-        queryKey: USER_QUERY_KEY,
-        queryFn: getUserFromStorage,
-        staleTime: Infinity, // User data doesn't go stale automatically
-        gcTime: Infinity, // Keep in cache indefinitely
-        initialData: getUserFromStorage,
-    });
-    // Mutation to update user
-    const setUserMutation = useMutation({
-        mutationFn: async (newUser) => {
-            const userToSave = newUser ?? null;
-            saveUserToStorage(userToSave);
-            return userToSave;
-        },
-        onSuccess: data => {
-            queryClient.setQueryData(USER_QUERY_KEY, data);
-            debug("User updated", data);
-        },
-    });
+    const user = useUserStore(state => state.user);
+    const setUserStore = useUserStore(state => state.setUser);
+    const clearUserStore = useUserStore(state => state.clearUser);
+    // Listen for storage events from other tabs/windows
+    useEffect(() => {
+        const handleStorageChange = (e) => {
+            if (e.key === "b3-user") {
+                // Sync with changes from other tabs/windows
+                const stored = e.newValue;
+                if (stored) {
+                    try {
+                        const parsed = JSON.parse(stored);
+                        // Zustand persist format: { state: { user: ... }, version: ... }
+                        const userData = parsed?.state?.user ?? parsed?.user ?? null;
+                        useUserStore.setState({ user: userData });
+                    }
+                    catch (error) {
+                        console.warn("Failed to parse user from storage event:", error);
+                    }
+                }
+                else {
+                    useUserStore.setState({ user: null });
+                }
+            }
+        };
+        window.addEventListener("storage", handleStorageChange);
+        return () => {
+            window.removeEventListener("storage", handleStorageChange);
+        };
+    }, []);
     // Helper function to set user (maintains backward compatibility)
     const setUser = (newUser) => {
-        setUserMutation.mutate(newUser);
+        setUserStore(newUser);
     };
     // Helper function to invalidate and refetch user
     const refetchUser = async () => {
-        await queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-        return queryClient.refetchQueries({ queryKey: USER_QUERY_KEY });
+        // Re-read from localStorage and update store
+        // Zustand persist stores data as { state: { user: ... }, version: ... }
+        const stored = localStorage.getItem("b3-user");
+        if (stored) {
+            try {
+                const parsed = JSON.parse(stored);
+                // Zustand persist format: { state: { user: ... }, version: ... }
+                const userData = parsed?.state?.user ?? parsed?.user ?? null;
+                useUserStore.setState({ user: userData });
+                return userData ?? undefined;
+            }
+            catch (error) {
+                console.warn("Failed to refetch user from localStorage:", error);
+                // Fallback to current store state
+                return useUserStore.getState().user ?? undefined;
+            }
+        }
+        useUserStore.setState({ user: null });
+        return undefined;
     };
     // Helper function to clear user
     const clearUser = () => {
-        setUser(undefined);
+        clearUserStore();
     };
     return {
         user: user ?? undefined,

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

@@ -2,7 +2,7 @@ import { Users } from "@b3dotfun/b3-api";
 /**
  * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
  *
- * Custom hook to manage user state with react-query
+ * Custom hook to manage user state with Zustand
  * This allows for invalidation and refetching of user data
  */
 export declare function useUserQuery(): {
@@ -59,7 +59,7 @@ export declare function useUserQuery(): {
         };
     } | undefined;
     setUser: (newUser?: Users) => void;
-    refetchUser: () => Promise<void>;
+    refetchUser: () => Promise<any>;
     clearUser: () => void;
     queryKey: string[];
 };

package/package.json

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

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

@@ -198,7 +198,7 @@ export function SignInWithB3Flow({
       source,
     });
 
-    if (isConnected && isAuthenticated) {
+    if (isConnected && isAuthenticated && user) {
       // Mark that login just completed BEFORE opening manage account or closing modal
       // This allows Turnkey modal to show (if enableTurnkey is true)
       if (closeAfterLogin) {

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

@@ -1,88 +1,116 @@
 import { Users } from "@b3dotfun/b3-api";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect } from "react";
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
 
 const debug = debugB3React("useUserQuery");
 
 const USER_QUERY_KEY = ["b3-user"];
 
-/**
- * Retrieves the user from localStorage
- */
-function getUserFromStorage(): Users | null {
-  if (typeof window === "undefined") {
-    return null;
-  }
-
-  try {
-    const storedUser = localStorage.getItem("b3-user");
-    return storedUser ? JSON.parse(storedUser) : null;
-  } catch (error) {
-    console.warn("Failed to restore user from localStorage:", error);
-    return null;
-  }
+interface UserStore {
+  user: Users | null;
+  setUser: (user: Users | undefined) => void;
+  clearUser: () => void;
 }
 
 /**
- * Saves user to localStorage
+ * Zustand store for managing user state
+ * Persists user data to localStorage
  */
-function saveUserToStorage(user: Users | null) {
-  if (typeof window === "undefined") {
-    return;
-  }
-
-  if (user) {
-    localStorage.setItem("b3-user", JSON.stringify(user));
-  } else {
-    localStorage.removeItem("b3-user");
-  }
-}
+const useUserStore = create<UserStore>()(
+  persist(
+    set => ({
+      user: null,
+      setUser: (newUser: Users | undefined) => {
+        const userToSave = newUser ?? null;
+        set({ user: userToSave });
+        debug("User updated", userToSave);
+      },
+      clearUser: () => {
+        set({ user: null });
+        debug("User cleared");
+      },
+    }),
+    {
+      name: "b3-user",
+      onRehydrateStorage: () => (_, error) => {
+        if (error) {
+          console.warn("Failed to rehydrate user store:", error);
+        }
+      },
+    },
+  ),
+);
 
 /**
  * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
  *
- * Custom hook to manage user state with react-query
+ * Custom hook to manage user state with Zustand
  * This allows for invalidation and refetching of user data
  */
 export function useUserQuery() {
-  const queryClient = useQueryClient();
+  const user = useUserStore(state => state.user);
+  const setUserStore = useUserStore(state => state.setUser);
+  const clearUserStore = useUserStore(state => state.clearUser);
 
-  // Query to get user data (primarily from cache/localStorage)
-  const { data: user } = useQuery<Users | null>({
-    queryKey: USER_QUERY_KEY,
-    queryFn: getUserFromStorage,
-    staleTime: Infinity, // User data doesn't go stale automatically
-    gcTime: Infinity, // Keep in cache indefinitely
-    initialData: getUserFromStorage,
-  });
+  // Listen for storage events from other tabs/windows
+  useEffect(() => {
+    const handleStorageChange = (e: StorageEvent) => {
+      if (e.key === "b3-user") {
+        // Sync with changes from other tabs/windows
+        const stored = e.newValue;
+        if (stored) {
+          try {
+            const parsed = JSON.parse(stored);
+            // Zustand persist format: { state: { user: ... }, version: ... }
+            const userData = parsed?.state?.user ?? parsed?.user ?? null;
+            useUserStore.setState({ user: userData });
+          } catch (error) {
+            console.warn("Failed to parse user from storage event:", error);
+          }
+        } else {
+          useUserStore.setState({ user: null });
+        }
+      }
+    };
 
-  // Mutation to update user
-  const setUserMutation = useMutation({
-    mutationFn: async (newUser: Users | undefined) => {
-      const userToSave = newUser ?? null;
-      saveUserToStorage(userToSave);
-      return userToSave;
-    },
-    onSuccess: data => {
-      queryClient.setQueryData(USER_QUERY_KEY, data);
-      debug("User updated", data);
-    },
-  });
+    window.addEventListener("storage", handleStorageChange);
+    return () => {
+      window.removeEventListener("storage", handleStorageChange);
+    };
+  }, []);
 
   // Helper function to set user (maintains backward compatibility)
   const setUser = (newUser?: Users) => {
-    setUserMutation.mutate(newUser);
+    setUserStore(newUser);
   };
 
   // Helper function to invalidate and refetch user
   const refetchUser = async () => {
-    await queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-    return queryClient.refetchQueries({ queryKey: USER_QUERY_KEY });
+    // Re-read from localStorage and update store
+    // Zustand persist stores data as { state: { user: ... }, version: ... }
+    const stored = localStorage.getItem("b3-user");
+    if (stored) {
+      try {
+        const parsed = JSON.parse(stored);
+        // Zustand persist format: { state: { user: ... }, version: ... }
+        const userData = parsed?.state?.user ?? parsed?.user ?? null;
+        useUserStore.setState({ user: userData });
+        return userData ?? undefined;
+      } catch (error) {
+        console.warn("Failed to refetch user from localStorage:", error);
+        // Fallback to current store state
+        return useUserStore.getState().user ?? undefined;
+      }
+    }
+    useUserStore.setState({ user: null });
+    return undefined;
   };
 
   // Helper function to clear user
   const clearUser = () => {
-    setUser(undefined);
+    clearUserStore();
   };
 
   return {