@oxyhq/services 5.6.0 → 5.6.2

package/src/ui/context/OxyContext.tsx

@@ -1,10 +1,11 @@
-import React, { createContext, useContext, useState, useEffect, useCallback, ReactNode, useMemo } from 'react';
+import React, { createContext, useContext, useEffect, useCallback, ReactNode, useMemo } from 'react';
 import { OxyServices } from '../../core';
 import { User } from '../../models/interfaces';
 import { SecureLoginResponse, SecureClientSession, MinimalUserData } from '../../models/secureSession';
 import { DeviceManager } from '../../utils/deviceManager';
 import { useSessionSocket } from '../hooks/useSessionSocket';
 import { toast } from '../../lib/sonner';
+import { useAuthStore } from '../stores/authStore';
 
 // Define the context shape
 export interface OxyContextState {
@@ -95,7 +96,7 @@ const getStorage = async (): Promise<StorageInterface> => {
     if (!AsyncStorage) {
       try {
         const asyncStorageModule = await import('@react-native-async-storage/async-storage');
-        AsyncStorage = asyncStorageModule.default;
+        AsyncStorage = (asyncStorageModule.default as unknown) as StorageInterface;
       } catch (error) {
         console.error('Failed to import AsyncStorage:', error);
         throw new Error('AsyncStorage is required in React Native environment');
@@ -120,14 +121,22 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
   onAuthStateChange,
   bottomSheetRef,
 }) => {
-  // Authentication state
-  const [user, setUser] = useState<User | null>(null);
-  const [minimalUser, setMinimalUser] = useState<MinimalUserData | null>(null);
-  const [sessions, setSessions] = useState<SecureClientSession[]>([]);
-  const [activeSessionId, setActiveSessionId] = useState<string | null>(null);
-  const [isLoading, setIsLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-  const [storage, setStorage] = useState<StorageInterface | null>(null);
+  // Zustand state
+  const user = useAuthStore((state) => state.user);
+  const isAuthenticated = useAuthStore((state) => state.isAuthenticated);
+  const isLoading = useAuthStore((state) => state.isLoading);
+  const error = useAuthStore((state) => state.error);
+  const loginSuccess = useAuthStore((state) => state.loginSuccess);
+  const loginFailure = useAuthStore((state) => state.loginFailure);
+  const logoutStore = useAuthStore((state) => state.logout);
+
+  // Local state for non-auth fields
+  const [minimalUser, setMinimalUser] = React.useState<MinimalUserData | null>(null);
+  const [sessions, setSessions] = React.useState<SecureClientSession[]>([]);
+  const [activeSessionId, setActiveSessionId] = React.useState<string | null>(null);
+  const [storage, setStorage] = React.useState<StorageInterface | null>(null);
+  // Add a new state to track token restoration
+  const [tokenReady, setTokenReady] = React.useState(false);
 
   // Storage keys (memoized to prevent infinite loops)
   const keys = useMemo(() => getSecureStorageKeys(storageKeyPrefix), [storageKeyPrefix]);
@@ -140,7 +149,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
         setStorage(platformStorage);
       } catch (error) {
         console.error('Failed to initialize storage:', error);
-        setError('Failed to initialize storage');
+        useAuthStore.setState({ error: 'Failed to initialize storage' });
       }
     };
 
@@ -152,7 +161,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     const initAuth = async () => {
       if (!storage) return;
 
-      setIsLoading(true);
+      useAuthStore.setState({ isLoading: true });
       try {
         // Load stored sessions
         const sessionsData = await storage.getItem(keys.sessions);
@@ -216,7 +225,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
 
                   // Load full user data
                   const fullUser = await oxyServices.getUserBySession(activeSession.sessionId);
-                  setUser(fullUser);
+                  loginSuccess(fullUser);
                   setMinimalUser({
                     id: fullUser.id,
                     username: fullUser.username,
@@ -241,7 +250,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
         console.error('Secure auth initialization error:', err);
         await clearAllStorage();
       } finally {
-        setIsLoading(false);
+        useAuthStore.setState({ isLoading: false });
       }
     };
 
@@ -250,6 +259,26 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     }
   }, [storage, oxyServices, keys, onAuthStateChange]);
 
+  // Effect to restore token on app load or session switch
+  useEffect(() => {
+    const restoreToken = async () => {
+      if (activeSessionId && oxyServices) {
+        try {
+          await oxyServices.getTokenBySession(activeSessionId);
+          setTokenReady(true);
+        } catch (err) {
+          // If token restoration fails, force logout
+          await logout();
+          setTokenReady(false);
+        }
+      } else {
+        setTokenReady(true); // No session, so token is not needed
+      }
+    };
+    restoreToken();
+    // Only run when activeSessionId or oxyServices changes
+  }, [activeSessionId, oxyServices]);
+
   // Remove invalid session
   const removeInvalidSession = useCallback(async (sessionId: string): Promise<void> => {
     const filteredSessions = sessions.filter(s => s.sessionId !== sessionId);
@@ -262,7 +291,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     } else {
       // No valid sessions left
       setActiveSessionId(null);
-      setUser(null);
+      logoutStore();
       setMinimalUser(null);
       await storage?.removeItem(keys.activeSessionId);
 
@@ -270,7 +299,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
         onAuthStateChange(null);
       }
     }
-  }, [sessions, storage, keys, onAuthStateChange]);
+  }, [sessions, storage, keys, onAuthStateChange, logoutStore]);
 
   // Save sessions to storage
   const saveSessionsToStorage = useCallback(async (sessionsList: SecureClientSession[]): Promise<void> => {
@@ -298,7 +327,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
   // Switch to a different session
   const switchToSession = useCallback(async (sessionId: string): Promise<void> => {
     try {
-      setIsLoading(true);
+      useAuthStore.setState({ isLoading: true });
 
       // Get access token for this session
       await oxyServices.getTokenBySession(sessionId);
@@ -307,7 +336,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       const fullUser = await oxyServices.getUserBySession(sessionId);
 
       setActiveSessionId(sessionId);
-      setUser(fullUser);
+      loginSuccess(fullUser);
       setMinimalUser({
         id: fullUser.id,
         username: fullUser.username,
@@ -321,18 +350,16 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       }
     } catch (error) {
       console.error('Switch session error:', error);
-      setError('Failed to switch session');
+      useAuthStore.setState({ error: 'Failed to switch session' });
     } finally {
-      setIsLoading(false);
+      useAuthStore.setState({ isLoading: false });
     }
-  }, [oxyServices, onAuthStateChange, saveActiveSessionId]);
+  }, [oxyServices, onAuthStateChange, loginSuccess, saveActiveSessionId]);
 
   // Secure login method
   const login = async (username: string, password: string, deviceName?: string): Promise<User> => {
     if (!storage) throw new Error('Storage not initialized');
-
-    setIsLoading(true);
-    setError(null);
+    useAuthStore.setState({ isLoading: true, error: null });
 
     try {
       // Get device fingerprint for enhanced device identification
@@ -398,7 +425,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
 
       // Load full user data
       const fullUser = await oxyServices.getUserBySession(response.sessionId);
-      setUser(fullUser);
+      loginSuccess(fullUser);
       setMinimalUser(response.user);
 
       if (onAuthStateChange) {
@@ -407,10 +434,10 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
 
       return fullUser;
     } catch (error: any) {
-      setError(error.message || 'Login failed');
+      loginFailure(error.message || 'Login failed');
       throw error;
     } finally {
-      setIsLoading(false);
+      useAuthStore.setState({ isLoading: false });
     }
   };
 
@@ -435,7 +462,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
         } else {
           // No sessions left
           setActiveSessionId(null);
-          setUser(null);
+          logoutStore();
           setMinimalUser(null);
           await storage?.removeItem(keys.activeSessionId);
 
@@ -446,7 +473,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       }
     } catch (error) {
       console.error('Logout error:', error);
-      setError('Logout failed');
+      useAuthStore.setState({ error: 'Logout failed' });
     }
   };
 
@@ -456,13 +483,13 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
 
     if (!activeSessionId) {
       console.error('No active session ID found, cannot logout all');
-      setError('No active session found');
+      useAuthStore.setState({ error: 'No active session found' });
       throw new Error('No active session found');
     }
 
     if (!oxyServices) {
       console.error('OxyServices not initialized');
-      setError('Service not available');
+      useAuthStore.setState({ error: 'Service not available' });
       throw new Error('Service not available');
     }
 
@@ -474,7 +501,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       // Clear all local data
       setSessions([]);
       setActiveSessionId(null);
-      setUser(null);
+      logoutStore();
       setMinimalUser(null);
       await clearAllStorage();
       console.log('Local storage cleared');
@@ -485,7 +512,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       }
     } catch (error) {
       console.error('Logout all error:', error);
-      setError(`Logout all failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
+      useAuthStore.setState({ error: `Logout all failed: ${error instanceof Error ? error.message : 'Unknown error'}` });
       throw error;
     }
   };
@@ -494,8 +521,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
   const signUp = async (username: string, email: string, password: string): Promise<User> => {
     if (!storage) throw new Error('Storage not initialized');
 
-    setIsLoading(true);
-    setError(null);
+    useAuthStore.setState({ isLoading: true, error: null });
 
     try {
       // Create new account using the OxyServices signUp method
@@ -509,10 +535,10 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
 
       return user;
     } catch (error: any) {
-      setError(error.message || 'Sign up failed');
+      loginFailure(error.message || 'Sign up failed');
       throw error;
     } finally {
-      setIsLoading(false);
+      useAuthStore.setState({ isLoading: false });
     }
   };
 
@@ -569,7 +595,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       // Clear all local sessions since we logged out from all devices
       setSessions([]);
       setActiveSessionId(null);
-      setUser(null);
+      logoutStore();
       setMinimalUser(null);
       await clearAllStorage();
 
@@ -640,16 +666,6 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     }
   }, [bottomSheetRef]);
 
-  // Compute comprehensive authentication status
-  // This is the single source of truth for authentication across the entire app
-  const isAuthenticated = useMemo(() => {
-    // User is authenticated if:
-    // 1. We have a full user object loaded, OR
-    // 2. We have an active session with a valid token
-    // This covers both the loaded state and the loading-but-authenticated state
-    return !!user || (!!activeSessionId && !!oxyServices?.getCurrentUserId());
-  }, [user, activeSessionId, oxyServices]);
-
   // Integrate socket for real-time session updates
   console.log('OxyContextProvider: userId', user?.id, 'baseURL', oxyServices.getBaseURL());
   useSessionSocket({
@@ -675,20 +691,28 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     error,
     login,
     logout,
-    logoutAll,
-    signUp,
-    switchSession,
-    removeSession,
-    refreshSessions,
-    getDeviceSessions,
-    logoutAllDeviceSessions,
-    updateDeviceName,
+    logoutAll: async () => { await logout(); },
+    signUp: async (username, email, password) => {
+      await signUp(username, email, password);
+      return user as User; // Return the latest user from Zustand
+    },
+    switchSession: async (sessionId) => { await switchToSession(sessionId); },
+    removeSession: async (sessionId) => { await removeSession(sessionId); },
+    refreshSessions: async () => { await refreshSessions(); },
+    getDeviceSessions: async () => { return await getDeviceSessions(); },
+    logoutAllDeviceSessions: async () => { await logoutAllDeviceSessions(); },
+    updateDeviceName: async (deviceName) => { await updateDeviceName(deviceName); },
     oxyServices,
     bottomSheetRef,
     showBottomSheet,
     hideBottomSheet,
   };
 
+  // Wrap children rendering to block until token is ready
+  if (!tokenReady) {
+    return <div>Loading authentication...</div>;
+  }
+
   return (
     <OxyContext.Provider value={contextValue}>
       {children}

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -19,6 +19,7 @@ import { Ionicons } from '@expo/vector-icons';
 import { toast } from '../../lib/sonner';
 import { fontFamilies } from '../styles/fonts';
 import { confirmAction } from '../utils/confirmAction';
+import { useAuthStore } from '../stores/authStore';
 
 const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
     onClose,
@@ -27,6 +28,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
     navigate,
 }) => {
     const { user, oxyServices, isLoading: authLoading, isAuthenticated } = useOxy();
+    const updateUser = useAuthStore((state) => state.updateUser);
     const [isLoading, setIsLoading] = useState(false);
     const [isSaving, setIsSaving] = useState(false);
 
@@ -35,11 +37,12 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
 
     // Form state
     const [displayName, setDisplayName] = useState('');
+    const [lastName, setLastName] = useState('');
     const [username, setUsername] = useState('');
     const [email, setEmail] = useState('');
     const [bio, setBio] = useState('');
     const [location, setLocation] = useState('');
-    const [website, setWebsite] = useState('');
+    const [links, setLinks] = useState<string[]>([]);
     const [avatarUrl, setAvatarUrl] = useState('');
 
     // Editing states
@@ -47,11 +50,12 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
 
     // Temporary input states for inline editing
     const [tempDisplayName, setTempDisplayName] = useState('');
+    const [tempLastName, setTempLastName] = useState('');
     const [tempUsername, setTempUsername] = useState('');
     const [tempEmail, setTempEmail] = useState('');
     const [tempBio, setTempBio] = useState('');
     const [tempLocation, setTempLocation] = useState('');
-    const [tempWebsite, setTempWebsite] = useState('');
+    const [tempLinks, setTempLinks] = useState<string[]>([]);
 
     // Memoize theme-related calculations to prevent unnecessary recalculations
     const themeStyles = useMemo(() => {
@@ -78,14 +82,19 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
         if (user) {
             const userDisplayName = typeof user.name === 'string'
                 ? user.name
-                : user.name?.full || user.name?.first || '';
-
+                : user.name?.first || user.name?.full || '';
+            const userLastName = typeof user.name === 'object' ? user.name?.last || '' : '';
             setDisplayName(userDisplayName);
+            setLastName(userLastName);
             setUsername(user.username || '');
             setEmail(user.email || '');
             setBio(user.bio || '');
             setLocation(user.location || '');
-            setWebsite(user.website || '');
+            setLinks(
+                Array.isArray(user.links)
+                    ? user.links.map(l => typeof l === 'string' ? l : l.link).filter(Boolean)
+                    : user.website ? [user.website] : []
+            );
             setAvatarUrl(user.avatar?.url || '');
         }
     }, [user]);
@@ -102,12 +111,12 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
                 email,
                 bio,
                 location,
-                website,
+                links,
             };
 
             // Handle name field
-            if (displayName) {
-                updates.name = displayName;
+            if (displayName || lastName) {
+                updates.name = { first: displayName, last: lastName };
             }
 
             // Handle avatar
@@ -115,7 +124,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
                 updates.avatar = { url: avatarUrl };
             }
 
-            await oxyServices.updateProfile(updates);
+            await updateUser(updates, oxyServices);
             toast.success('Profile updated successfully');
 
             animateSaveButton(1); // Scale back to normal
@@ -144,7 +153,8 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
     const startEditing = (type: string, currentValue: string) => {
         switch (type) {
             case 'displayName':
-                setTempDisplayName(currentValue);
+                setTempDisplayName(displayName);
+                setTempLastName(lastName);
                 break;
             case 'username':
                 setTempUsername(currentValue);
@@ -158,8 +168,8 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
             case 'location':
                 setTempLocation(currentValue);
                 break;
-            case 'website':
-                setTempWebsite(currentValue);
+            case 'links':
+                setTempLinks([...links]);
                 break;
         }
         setEditingField(type);
@@ -171,6 +181,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
         switch (type) {
             case 'displayName':
                 setDisplayName(tempDisplayName);
+                setLastName(tempLastName);
                 break;
             case 'username':
                 setUsername(tempUsername);
@@ -184,8 +195,8 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
             case 'location':
                 setLocation(tempLocation);
                 break;
-            case 'website':
-                setWebsite(tempWebsite);
+            case 'links':
+                setLinks(tempLinks);
                 break;
         }
 
@@ -207,7 +218,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
             email: 'Email',
             bio: 'Bio',
             location: 'Location',
-            website: 'Website'
+            links: 'Links'
         };
         return labels[type as keyof typeof labels] || 'Field';
     };
@@ -219,19 +230,52 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
             email: { name: 'mail', color: '#FF9500' },
             bio: { name: 'document-text', color: '#34C759' },
             location: { name: 'location', color: '#FF3B30' },
-            website: { name: 'link', color: '#32D74B' }
+            links: { name: 'link', color: '#32D74B' }
         };
         return icons[type as keyof typeof icons] || { name: 'person', color: '#007AFF' };
     };
 
     const renderEditingField = (type: string) => {
+        if (type === 'displayName') {
+            return (
+                <View style={styles.editingFieldContainer}>
+                    <View style={styles.editingFieldContent}>
+                        <View style={[styles.newValueSection, { flexDirection: 'row', gap: 12 }]}>
+                            <View style={{ flex: 1 }}>
+                                <Text style={styles.editingFieldLabel}>First Name</Text>
+                                <TextInput
+                                    style={styles.editingFieldInput}
+                                    value={tempDisplayName}
+                                    onChangeText={setTempDisplayName}
+                                    placeholder="Enter your first name"
+                                    placeholderTextColor={themeStyles.isDarkTheme ? '#aaa' : '#999'}
+                                    autoFocus
+                                    selectionColor={themeStyles.primaryColor}
+                                />
+                            </View>
+                            <View style={{ flex: 1 }}>
+                                <Text style={styles.editingFieldLabel}>Last Name</Text>
+                                <TextInput
+                                    style={styles.editingFieldInput}
+                                    value={tempLastName}
+                                    onChangeText={setTempLastName}
+                                    placeholder="Enter your last name"
+                                    placeholderTextColor={themeStyles.isDarkTheme ? '#aaa' : '#999'}
+                                    selectionColor={themeStyles.primaryColor}
+                                />
+                            </View>
+                        </View>
+                    </View>
+                </View>
+            );
+        }
         const fieldConfig = {
             displayName: { label: 'Display Name', value: displayName, placeholder: 'Enter your display name', icon: 'person', color: '#007AFF', multiline: false, keyboardType: 'default' as const },
             username: { label: 'Username', value: username, placeholder: 'Choose a username', icon: 'at', color: '#5856D6', multiline: false, keyboardType: 'default' as const },
             email: { label: 'Email', value: email, placeholder: 'Enter your email address', icon: 'mail', color: '#FF9500', multiline: false, keyboardType: 'email-address' as const },
             bio: { label: 'Bio', value: bio, placeholder: 'Tell people about yourself...', icon: 'document-text', color: '#34C759', multiline: true, keyboardType: 'default' as const },
             location: { label: 'Location', value: location, placeholder: 'Enter your location', icon: 'location', color: '#FF3B30', multiline: false, keyboardType: 'default' as const },
-            website: { label: 'Website', value: website, placeholder: 'Enter your website URL', icon: 'link', color: '#32D74B', multiline: false, keyboardType: 'url' as const }
+            links: { label: 'Links', value: links.join(', '), placeholder: 'Enter your links (comma separated)', icon: 'link', color: '#32D74B', multiline: false, keyboardType: 'url' as const }
         };
 
         const config = fieldConfig[type as keyof typeof fieldConfig];
@@ -244,7 +288,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
                 case 'email': return tempEmail;
                 case 'bio': return tempBio;
                 case 'location': return tempLocation;
-                case 'website': return tempWebsite;
+                case 'links': return tempLinks.join(', ');
                 default: return '';
             }
         })();
@@ -256,7 +300,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
                 case 'email': setTempEmail(text); break;
                 case 'bio': setTempBio(text); break;
                 case 'location': setTempLocation(text); break;
-                case 'website': setTempWebsite(text); break;
+                case 'links': setTempLinks(text.split(',').map(s => s.trim()).filter(Boolean)); break;
             }
         };
 
@@ -446,7 +490,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
                             {renderField(
                                 'displayName',
                                 'Display Name',
-                                displayName,
+                                [displayName, lastName].filter(Boolean).join(' '), // Show full name
                                 'Add your display name',
                                 'person',
                                 '#007AFF',
@@ -514,10 +558,10 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
                             )}
 
                             {renderField(
-                                'website',
-                                'Website',
-                                website,
-                                'Add your website',
+                                'links',
+                                'Links',
+                                links.join(', '),
+                                'Add your links',
                                 'link',
                                 '#32D74B',
                                 false,

package/src/ui/stores/authStore.ts

@@ -10,6 +10,8 @@ interface AuthState {
   loginSuccess: (user: User) => void;
   loginFailure: (error: string) => void;
   logout: () => void;
+  fetchUser: (oxyServices: any) => Promise<void>;
+  updateUser: (updates: Partial<User>, oxyServices: any) => Promise<void>;
 }
 
 export const useAuthStore = create<AuthState>((set: (state: Partial<AuthState>) => void) => ({
@@ -21,4 +23,23 @@ export const useAuthStore = create<AuthState>((set: (state: Partial<AuthState>)
   loginSuccess: (user: User) => set({ isLoading: false, isAuthenticated: true, user }),
   loginFailure: (error: string) => set({ isLoading: false, error }),
   logout: () => set({ user: null, isAuthenticated: false }),
+  fetchUser: async (oxyServices) => {
+    set({ isLoading: true, error: null });
+    try {
+      const user = await oxyServices.getCurrentUser();
+      set({ user, isLoading: false, isAuthenticated: true });
+    } catch (error: any) {
+      set({ error: error.message || 'Failed to fetch user', isLoading: false });
+    }
+  },
+  updateUser: async (updates, oxyServices) => {
+    set({ isLoading: true, error: null });
+    try {
+      await oxyServices.updateProfile(updates);
+      // Immediately fetch the latest user data after update
+      await useAuthStore.getState().fetchUser(oxyServices);
+    } catch (error: any) {
+      set({ error: error.message || 'Failed to update user', isLoading: false });
+    }
+  },
 })); 

package/src/utils/deviceManager.ts

@@ -35,12 +35,20 @@ export class DeviceManager {
   /**
    * Get appropriate storage for the platform
    */
-  private static async getStorage() {
+  private static async getStorage(): Promise<{
+    getItem: (key: string) => Promise<string | null>;
+    setItem: (key: string, value: string) => Promise<void>;
+    removeItem: (key: string) => Promise<void>;
+  }> {
     if (this.isReactNative()) {
-      // Try to import AsyncStorage for React Native
       try {
-        const AsyncStorage = await import('@react-native-async-storage/async-storage');
-        return AsyncStorage.default;
+        const asyncStorageModule = await import('@react-native-async-storage/async-storage');
+        const storage = (asyncStorageModule.default as unknown) as import('@react-native-async-storage/async-storage').AsyncStorageStatic;
+        return {
+          getItem: storage.getItem.bind(storage),
+          setItem: storage.setItem.bind(storage),
+          removeItem: storage.removeItem.bind(storage),
+        };
       } catch (error) {
         console.error('AsyncStorage not available in React Native:', error);
         throw new Error('AsyncStorage is required in React Native environment');