@oxyhq/services 5.13.1 → 5.13.3

package/src/ui/context/OxyContext.tsx

@@ -4,12 +4,15 @@ import type { UseFollowHook } from '../hooks/useFollow.types';
 import { OxyServices } from '../../core';
 import type { User, ApiError } from '../../models/interfaces';
 import type { SessionLoginResponse, ClientSession, MinimalUserData } from '../../models/session';
+import { normalizeAndSortSessions, mergeSessions, sessionsArraysEqual } from '../../utils/sessionUtils';
 import { DeviceManager } from '../../utils/deviceManager';
 import { useSessionSocket } from '../hooks/useSessionSocket';
 import { toast } from '../../lib/sonner';
 import { useAuthStore } from '../stores/authStore';
 import type { BottomSheetController } from '../navigation/types';
 import type { RouteName } from '../navigation/routes';
+import { getLanguageMetadata, getLanguageName, getNativeLanguageName, normalizeLanguageCode } from '../../utils/languageUtils';
+import type { LanguageMetadata } from '../../utils/languageUtils';
 
 // Define the context shape
 // NOTE: We intentionally avoid importing useFollow here to prevent a require cycle.
@@ -28,6 +31,9 @@ export interface OxyContextState {
 
   // Language state
   currentLanguage: string;
+  currentLanguageMetadata: LanguageMetadata | null; // Full language metadata (name, nativeName, etc.)
+  currentLanguageName: string; // Language name (e.g., 'English')
+  currentNativeLanguageName: string; // Native language name (e.g., 'Español')
 
   // Auth methods
   login: (username: string, password: string, deviceName?: string) => Promise<User>;
@@ -154,6 +160,7 @@ const getStorage = async (): Promise<StorageInterface> => {
 // Storage keys for sessions
 const getStorageKeys = (prefix = 'oxy_session') => ({
   activeSessionId: `${prefix}_active_session_id`, // Only store the active session ID
+  sessionIds: `${prefix}_session_ids`, // Store all session IDs for quick account loading
   language: `${prefix}_language`, // Store the selected language
 });
 
@@ -194,30 +201,23 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
   const [minimalUser, setMinimalUser] = useState<MinimalUserData | null>(null);
   const [sessions, setSessions] = useState<ClientSession[]>([]);
   const [activeSessionId, setActiveSessionId] = useState<string | null>(null);
+
+  // Track in-flight refresh to prevent duplicate calls
+  const refreshInFlightRef = useRef<Promise<void> | null>(null);
+
   const [storage, setStorage] = useState<StorageInterface | null>(null);
   const [currentLanguage, setCurrentLanguage] = useState<string>('en-US');
 
   // Storage keys (memoized to prevent infinite loops) - declared early for use in helpers
   const keys = useMemo(() => getStorageKeys(storageKeyPrefix), [storageKeyPrefix]);
 
-  // Normalize language codes to BCP-47 (e.g., en-US)
-  const normalizeLanguageCode = useCallback((lang?: string | null): string | null => {
-    if (!lang) return null;
-    if (lang.includes('-')) return lang;
-    const map: Record<string, string> = {
-      en: 'en-US', es: 'es-ES', ca: 'ca-ES', fr: 'fr-FR', de: 'de-DE', it: 'it-IT', pt: 'pt-PT',
-      ja: 'ja-JP', ko: 'ko-KR', zh: 'zh-CN', ar: 'ar-SA'
-    };
-    return map[lang] || lang;
-  }, []);
-
   // Helper to apply language preference from user/server
   const applyLanguagePreference = useCallback(async (user: User): Promise<void> => {
     const userLanguage = (user as Record<string, unknown>)?.language as string | undefined;
     if (!userLanguage || !storage) return;
 
     try {
-      const serverLang = normalizeLanguageCode(userLanguage) || userLanguage;
+      const serverLang = normalizeLanguageCode(userLanguage);
       await storage.setItem(keys.language, serverLang);
       setCurrentLanguage(serverLang);
     } catch (e) {
@@ -225,25 +225,58 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
         console.warn('Failed to apply server language preference', e);
       }
     }
-  }, [storage, keys.language, normalizeLanguageCode]);
+  }, [storage, keys.language]);
 
-  // Helper to map server sessions to client sessions
-  const mapServerSessionsToClient = useCallback((serverSessions: Array<{
+  const mapSessionsToClient = useCallback((sessions: Array<{
     sessionId: string;
-    deviceId: string;
+    deviceId?: string;
     expiresAt?: string;
     lastActive?: string;
+    user?: { id?: string; _id?: { toString(): string } };
     userId?: string;
-  }>, fallbackUserId?: string): ClientSession[] => {
-    return serverSessions.map(s => ({
+    isCurrent?: boolean;
+  }>, fallbackDeviceId?: string, fallbackUserId?: string): ClientSession[] => {
+    return sessions.map((s: any) => ({
       sessionId: s.sessionId,
-      deviceId: s.deviceId,
-      expiresAt: s.expiresAt || new Date().toISOString(),
+      deviceId: s.deviceId || fallbackDeviceId || '',
+      expiresAt: s.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
       lastActive: s.lastActive || new Date().toISOString(),
-      userId: s.userId || fallbackUserId
+      userId: s.user?.id || s.userId || (s.user?._id?.toString()) || fallbackUserId || '',
+      isCurrent: Boolean(s.isCurrent),
     }));
   }, []);
 
+  // Save all session IDs to storage for quick loading on initialization
+  const saveSessionIds = useCallback(async (sessionIds: string[]): Promise<void> => {
+    if (!storage) return;
+    try {
+      const uniqueIds = Array.from(new Set(sessionIds));
+      await storage.setItem(keys.sessionIds, JSON.stringify(uniqueIds));
+    } catch (err) {
+      if (__DEV__) {
+        console.warn('Failed to save session IDs:', err);
+      }
+    }
+  }, [storage, keys.sessionIds]);
+
+  const updateSessions = useCallback((newSessions: ClientSession[], mergeWithExisting = false) => {
+    setSessions((prevSessions) => {
+      const sessionsToProcess = mergeWithExisting
+        ? mergeSessions(prevSessions, newSessions, activeSessionId, false)
+        : normalizeAndSortSessions(newSessions, activeSessionId, false);
+      
+      // Save all session IDs to storage
+      if (storage) {
+        const allSessionIds = sessionsToProcess.map(s => s.sessionId);
+        saveSessionIds(allSessionIds).catch(() => {
+          // Ignore errors - non-critical
+        });
+      }
+      
+      return sessionsArraysEqual(prevSessions, sessionsToProcess) ? prevSessions : sessionsToProcess;
+    });
+  }, [activeSessionId, storage, saveSessionIds]);
+
   // Token ready state - start optimistically so children render immediately
   const [tokenReady, setTokenReady] = useState(true);
 
@@ -252,6 +285,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     if (!storage) return;
     try {
       await storage.removeItem(keys.activeSessionId);
+      await storage.removeItem(keys.sessionIds);
     } catch (err) {
       if (__DEV__) {
         console.error('Clear storage error:', err);
@@ -290,8 +324,49 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
           setCurrentLanguage(savedLanguage);
         }
 
+        // Load all stored session IDs and validate them
+        const storedSessionIdsJson = await storage.getItem(keys.sessionIds);
+        const storedSessionIds: string[] = storedSessionIdsJson ? JSON.parse(storedSessionIdsJson) : [];
+        
         // Try to restore active session from storage
         const storedActiveSessionId = await storage.getItem(keys.activeSessionId);
+        const validSessions: ClientSession[] = [];
+        
+        // If we have stored session IDs, validate them (even without active session)
+        if (storedSessionIds.length > 0) {
+          if (__DEV__) {
+            console.log('Loading stored sessions on init:', storedSessionIds.length);
+          }
+          
+          // Validate each stored session ID and build session list
+          for (const sessionId of storedSessionIds) {
+            try {
+              const validation = await oxyServices.validateSession(sessionId, { useHeaderValidation: true });
+              if (validation.valid && validation.user) {
+                validSessions.push({
+                  sessionId,
+                  userId: validation.user.id?.toString() || '',
+                  deviceId: '',
+                  expiresAt: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
+                  lastActive: new Date().toISOString(),
+                  isCurrent: sessionId === storedActiveSessionId,
+                });
+              }
+            } catch (e) {
+              // Session invalid, skip it
+              if (__DEV__) {
+                console.warn('Session validation failed for:', sessionId, e);
+              }
+            }
+          }
+          
+          // Update sessions list with validated sessions (even if no active session)
+          if (validSessions.length > 0) {
+            updateSessions(validSessions, false);
+          }
+        }
+        
+        // If we have an active session, authenticate with it
         if (storedActiveSessionId) {
           try {
             const validation = await oxyServices.validateSession(storedActiveSessionId, { useHeaderValidation: true });
@@ -304,34 +379,31 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
 
               await applyLanguagePreference(fullUser);
 
-              // Get all device sessions to support multiple accounts
               try {
                 const deviceSessions = await oxyServices.getDeviceSessions(storedActiveSessionId);
-                const allDeviceSessions = deviceSessions.map((ds: any) => ({
-                  sessionId: ds.sessionId,
-                  deviceId: ds.deviceId,
-                  expiresAt: ds.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
-                  lastActive: ds.lastActive || new Date().toISOString(),
-                  userId: ds.user?.id || ds.userId || fullUser.id,
-                }));
-                setSessions(allDeviceSessions);
+                const allDeviceSessions = mapSessionsToClient(deviceSessions, undefined, fullUser.id);
+                updateSessions(allDeviceSessions, true);
               } catch (e) {
-                // Fallback to user sessions
                 if (__DEV__) {
                   console.warn('Failed to get device sessions on init, falling back to user sessions:', e);
                 }
-              const serverSessions = await oxyServices.getSessionsBySessionId(storedActiveSessionId);
-              setSessions(mapServerSessionsToClient(serverSessions, fullUser.id));
+                const serverSessions = await oxyServices.getSessionsBySessionId(storedActiveSessionId);
+                updateSessions(mapSessionsToClient(serverSessions, undefined, fullUser.id), false);
               }
               onAuthStateChange?.(fullUser);
             } else {
-              await clearAllStorage();
+              // Active session invalid, remove it but keep other sessions
+              await storage.removeItem(keys.activeSessionId);
+              // Update session list to remove invalid active session
+              updateSessions(validSessions.filter(s => s.sessionId !== storedActiveSessionId), false);
             }
           } catch (e) {
             if (__DEV__) {
-              console.error('Session validation error', e);
+              console.error('Active session validation error', e);
             }
-            await clearAllStorage();
+            // Remove invalid active session but keep other sessions
+            await storage.removeItem(keys.activeSessionId);
+            updateSessions(validSessions.filter(s => s.sessionId !== storedActiveSessionId), false);
           }
         }
         setTokenReady(true);
@@ -344,7 +416,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
       }
     };
     initAuth();
-  }, [storage, oxyServices, keys, onAuthStateChange, loginSuccess, clearAllStorage, applyLanguagePreference, mapServerSessionsToClient]);
+  }, [storage, oxyServices, keys, onAuthStateChange, loginSuccess, clearAllStorage, applyLanguagePreference, mapSessionsToClient, updateSessions]);
 
   // Save active session ID to storage (only session ID, no user data)
   const saveActiveSessionId = useCallback(async (sessionId: string): Promise<void> => {
@@ -352,25 +424,22 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     await storage.setItem(keys.activeSessionId, sessionId);
   }, [storage, keys.activeSessionId]);
 
-  // Switch to a different session
   const switchToSession = useCallback(async (sessionId: string): Promise<void> => {
     try {
-      // Don't set isLoading - session switches should happen silently in background
-      // Validate session first before attempting to switch
       const validation = await oxyServices.validateSession(sessionId, { useHeaderValidation: true });
       if (!validation.valid) {
-        // Session is invalid, remove it from the sessions list
-        setSessions((prevSessions) => prevSessions.filter(s => s.sessionId !== sessionId));
+        updateSessions(sessions.filter(s => s.sessionId !== sessionId), false);
         throw new Error('Session is invalid or expired');
       }
 
-      // Get access token for this session
+      if (!validation.user) {
+        throw new Error('User data not available from session validation');
+      }
+
+      const fullUser = validation.user;
       await oxyServices.getTokenBySession(sessionId);
       setTokenReady(true);
 
-      // Load full user data - use user from validation if available, otherwise fetch
-      const fullUser = validation.user || await oxyServices.getUserBySession(sessionId);
-
       setActiveSessionId(sessionId);
       loginSuccess(fullUser);
       setMinimalUser({
@@ -381,57 +450,25 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
 
       await saveActiveSessionId(sessionId);
       await applyLanguagePreference(fullUser);
-      
-      // Refresh all device sessions after switching
-      // Preserve existing sessions from other users to avoid losing accounts
-      try {
-        const deviceSessions = await oxyServices.getDeviceSessions(sessionId);
-        const allDeviceSessions = deviceSessions.map((ds: any) => ({
-          sessionId: ds.sessionId,
-          deviceId: ds.deviceId,
-          expiresAt: ds.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
-          lastActive: ds.lastActive || new Date().toISOString(),
-          userId: ds.user?.id || ds.userId || fullUser.id,
-        }));
-        // Merge with existing sessions to preserve other accounts
-        setSessions((prevSessions) => {
-          const existingSessionIds = new Set(prevSessions.map(s => s.sessionId));
-          const newSessions = allDeviceSessions.filter(s => !existingSessionIds.has(s.sessionId));
-          // Combine existing sessions with new ones, prioritizing new data for existing sessions
-          const sessionMap = new Map(prevSessions.map(s => [s.sessionId, s]));
-          allDeviceSessions.forEach(s => sessionMap.set(s.sessionId, s));
-          return Array.from(sessionMap.values());
-        });
-      } catch (error) {
-        // Fallback to user sessions - merge with existing to preserve other accounts
-        if (__DEV__) {
-          console.warn('Failed to get device sessions after switch, falling back to user sessions:', error);
-        }
-        const serverSessions = await oxyServices.getSessionsBySessionId(sessionId);
-        const userSessions = mapServerSessionsToClient(serverSessions, fullUser.id);
-        // Merge with existing sessions to preserve other accounts
-        setSessions((prevSessions) => {
-          const existingSessionIds = new Set(prevSessions.map(s => s.sessionId));
-          const newSessions = userSessions.filter(s => !existingSessionIds.has(s.sessionId));
-          // Combine existing sessions with new ones, prioritizing new data for existing sessions
-          const sessionMap = new Map(prevSessions.map(s => [s.sessionId, s]));
-          userSessions.forEach(s => sessionMap.set(s.sessionId, s));
-          return Array.from(sessionMap.values());
+
+      oxyServices.getDeviceSessions(sessionId)
+        .then((deviceSessions) => {
+          const allDeviceSessions = mapSessionsToClient(deviceSessions, undefined, fullUser.id);
+          updateSessions(allDeviceSessions, true);
+        })
+        .catch((error) => {
+          if (__DEV__) console.warn('Failed to get device sessions after switch:', error);
         });
-      }
-      
+
       onAuthStateChange?.(fullUser);
     } catch (error: any) {
-      // Check if the error is due to invalid/expired session
-      const isInvalidSession = error?.response?.status === 401 || 
-                               error?.message?.includes('Invalid or expired session') ||
-                               error?.message?.includes('Session is invalid');
-      
+      const isInvalidSession = error?.response?.status === 401 ||
+        error?.message?.includes('Invalid or expired session') ||
+        error?.message?.includes('Session is invalid');
+
       if (isInvalidSession) {
-        // Remove invalid session from the sessions list
-        setSessions((prevSessions) => prevSessions.filter(s => s.sessionId !== sessionId));
-        
-        // If this was the active session, try to switch to another valid session
+        updateSessions(sessions.filter(s => s.sessionId !== sessionId), false);
+
         if (sessionId === activeSessionId && sessions.length > 1) {
           const otherSessions = sessions.filter(s => s.sessionId !== sessionId);
           for (const otherSession of otherSessions) {
@@ -448,7 +485,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
           }
         }
       }
-      
+
       const errorMessage = error instanceof Error ? error.message : 'Failed to switch session';
       if (__DEV__) {
         console.error('Switch session error:', error);
@@ -458,9 +495,8 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
       setTokenReady(false);
       throw error; // Re-throw so calling code can handle it
     }
-  }, [oxyServices, onAuthStateChange, loginSuccess, saveActiveSessionId, applyLanguagePreference, mapServerSessionsToClient, onError, activeSessionId, sessions]);
+  }, [oxyServices, onAuthStateChange, loginSuccess, saveActiveSessionId, applyLanguagePreference, mapSessionsToClient, onError, activeSessionId, sessions]);
 
-  // Login method - only store session ID, retrieve data from backend
   const login = useCallback(async (username: string, password: string, deviceName?: string): Promise<User> => {
     if (!storage) throw new Error('Storage not initialized');
     useAuthStore.setState({ isLoading: true, error: null });
@@ -494,45 +530,24 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
       await oxyServices.getTokenBySession(sessionResponse.sessionId);
       const fullUser = await oxyServices.getUserBySession(sessionResponse.sessionId);
 
-      // Get all device sessions to check for duplicates BEFORE setting the new session as active
-      // This returns all sessions on the device, not just for the current user
       let allDeviceSessions: ClientSession[] = [];
       try {
         const deviceSessions = await oxyServices.getDeviceSessions(sessionResponse.sessionId);
-        
-        // Map device sessions to client format
-        // Device sessions include user info, so we can map them directly
-        allDeviceSessions = deviceSessions.map((ds: any) => ({
-          sessionId: ds.sessionId,
-          deviceId: ds.deviceId || sessionResponse.deviceId,
-          expiresAt: ds.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
-          lastActive: ds.lastActive || new Date().toISOString(),
-          userId: ds.user?.id || ds.userId || (ds.user?._id?.toString()) || fullUser.id,
-        }));
+        allDeviceSessions = mapSessionsToClient(deviceSessions, sessionResponse.deviceId, fullUser.id);
       } catch (error) {
-        // Fallback to user sessions if device sessions fail
         if (__DEV__) {
           console.warn('Failed to get device sessions, falling back to user sessions:', error);
         }
         const serverSessions = await oxyServices.getSessionsBySessionId(sessionResponse.sessionId);
-        const userSessions = mapServerSessionsToClient(serverSessions, fullUser.id);
-        
-        // Merge with existing sessions to preserve other accounts
-        const existingSessionIds = new Set((sessions || []).map(s => s.sessionId));
-        const newSessions = userSessions.filter(s => !existingSessionIds.has(s.sessionId));
-        allDeviceSessions = [...(sessions || []), ...newSessions];
+        allDeviceSessions = mapSessionsToClient(serverSessions, undefined, fullUser.id);
       }
 
-      // Check if this user is already signed in with another session on this device
-      // Compare userId as string to handle both string and ObjectId formats
       const userUserId = fullUser.id?.toString();
       const existingSession = allDeviceSessions.find(
         s => s.userId?.toString() === userUserId && s.sessionId !== sessionResponse.sessionId
       );
-      
+
       if (existingSession) {
-        // User is already signed in on this device, switch to existing session instead
-        // Logout the newly created session to clean it up
         try {
           await oxyServices.logoutSession(sessionResponse.sessionId, sessionResponse.sessionId);
         } catch (logoutError) {
@@ -540,27 +555,19 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
             console.warn('Failed to logout duplicate session:', logoutError);
           }
         }
-        
-        // Switch to the existing session
         await switchToSession(existingSession.sessionId);
-      loginSuccess(fullUser);
-      setMinimalUser(sessionResponse.user);
-
-        // Update sessions list (excluding the duplicate we just created)
-        setSessions(allDeviceSessions.filter(s => s.sessionId !== sessionResponse.sessionId));
-        
+        loginSuccess(fullUser);
+        setMinimalUser(sessionResponse.user);
+        updateSessions(allDeviceSessions.filter(s => s.sessionId !== sessionResponse.sessionId), false);
         onAuthStateChange?.(fullUser);
         return fullUser;
       }
 
-      // No duplicate found, proceed with the new session
       setActiveSessionId(sessionResponse.sessionId);
       await saveActiveSessionId(sessionResponse.sessionId);
-
       loginSuccess(fullUser);
       setMinimalUser(sessionResponse.user);
-      
-      setSessions(allDeviceSessions);
+      updateSessions(allDeviceSessions, true);
 
       onAuthStateChange?.(fullUser);
       return fullUser;
@@ -572,7 +579,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     } finally {
       useAuthStore.setState({ isLoading: false });
     }
-  }, [storage, oxyServices, saveActiveSessionId, loginSuccess, onAuthStateChange, loginFailure, mapServerSessionsToClient, onError, sessions, switchToSession]);
+  }, [storage, oxyServices, saveActiveSessionId, loginSuccess, onAuthStateChange, loginFailure, mapSessionsToClient, onError, sessions, switchToSession]);
 
   // Logout method
   const logout = useCallback(async (targetSessionId?: string): Promise<void> => {
@@ -582,17 +589,13 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
       const sessionToLogout = targetSessionId || activeSessionId;
       await oxyServices.logoutSession(activeSessionId, sessionToLogout);
 
-      // Remove session from local state
       const filteredSessions = sessions.filter(s => s.sessionId !== sessionToLogout);
-      setSessions(filteredSessions);
+      updateSessions(filteredSessions, false);
 
-      // If logging out active session
       if (sessionToLogout === activeSessionId) {
         if (filteredSessions.length > 0) {
-          // Switch to another session
           await switchToSession(filteredSessions[0].sessionId);
         } else {
-          // No sessions left
           setActiveSessionId(null);
           logoutStore();
           setMinimalUser(null);
@@ -613,7 +616,6 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     }
   }, [activeSessionId, oxyServices, sessions, switchToSession, logoutStore, storage, keys.activeSessionId, onAuthStateChange, onError]);
 
-  // Logout all sessions
   const logoutAll = useCallback(async (): Promise<void> => {
     if (!activeSessionId) {
       const error = new Error('No active session found');
@@ -625,7 +627,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     try {
       await oxyServices.logoutAllSessions(activeSessionId);
 
-      setSessions([]);
+      updateSessions([], false);
       setActiveSessionId(null);
       logoutStore();
       setMinimalUser(null);
@@ -684,28 +686,17 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
       // Get all device sessions to support multiple accounts
       try {
         const deviceSessions = await oxyServices.getDeviceSessions(response.sessionId);
-        const allDeviceSessions = deviceSessions.map((ds: any) => ({
-          sessionId: ds.sessionId,
-          deviceId: ds.deviceId,
-          expiresAt: ds.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
-          lastActive: ds.lastActive || new Date().toISOString(),
-          userId: ds.user?.id || ds.userId || fullUser.id,
-        }));
-        setSessions(allDeviceSessions);
+        const allDeviceSessions = mapSessionsToClient(deviceSessions, undefined, fullUser.id);
+        updateSessions(allDeviceSessions, true);
       } catch (error) {
         // Fallback to user sessions if device sessions fail
         if (__DEV__) {
           console.warn('Failed to get device sessions for MFA, falling back to user sessions:', error);
         }
-      const serverSessions = await oxyServices.getSessionsBySessionId(response.sessionId);
-        const userSessions = mapServerSessionsToClient(serverSessions, fullUser.id);
-        
-        // Merge with existing sessions to preserve other accounts
-        setSessions((prevSessions) => {
-          const existingSessionIds = new Set(prevSessions.map(s => s.sessionId));
-          const newSessions = userSessions.filter(s => !existingSessionIds.has(s.sessionId));
-          return [...prevSessions, ...newSessions];
-        });
+        const serverSessions = await oxyServices.getSessionsBySessionId(response.sessionId);
+        const userSessions = mapSessionsToClient(serverSessions, undefined, fullUser.id);
+
+        updateSessions(userSessions, true);
       }
 
       onAuthStateChange?.(fullUser);
@@ -720,83 +711,77 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     }
   }, [storage, oxyServices, loginSuccess, loginFailure, saveActiveSessionId, onAuthStateChange, applyLanguagePreference, onError]);
 
-  // Switch session method (wrapper for consistency)
   const switchSession = useCallback(async (sessionId: string): Promise<void> => {
     await switchToSession(sessionId);
   }, [switchToSession]);
 
-  // Remove session method (wrapper for consistency)
   const removeSession = useCallback(async (sessionId: string): Promise<void> => {
     await logout(sessionId);
   }, [logout]);
 
-  // Refresh sessions method
   const refreshSessions = useCallback(async (): Promise<void> => {
     if (!activeSessionId) return;
 
-    try {
-      // Get all device sessions to support multiple accounts
-      const deviceSessions = await oxyServices.getDeviceSessions(activeSessionId);
-      const allDeviceSessions = deviceSessions.map((ds: any) => ({
-        sessionId: ds.sessionId,
-        deviceId: ds.deviceId,
-        expiresAt: ds.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
-        lastActive: ds.lastActive || new Date().toISOString(),
-        userId: ds.user?.id || ds.userId || user?.id,
-      }));
-      setSessions(allDeviceSessions);
-    } catch (error) {
-      // Fallback to user sessions if device sessions fail
-      // Merge with existing sessions to preserve other accounts
-      if (__DEV__) {
-        console.warn('Failed to refresh device sessions, falling back to user sessions:', error);
-      }
-    try {
-      const serverSessions = await oxyServices.getSessionsBySessionId(activeSessionId);
-      const userSessions = mapServerSessionsToClient(serverSessions, user?.id);
-      // Merge with existing sessions to preserve other accounts
-      setSessions((prevSessions) => {
-        const existingSessionIds = new Set(prevSessions.map(s => s.sessionId));
-        const newSessions = userSessions.filter(s => !existingSessionIds.has(s.sessionId));
-        // Combine existing sessions with new ones, prioritizing new data for existing sessions
-        const sessionMap = new Map(prevSessions.map(s => [s.sessionId, s]));
-        userSessions.forEach(s => sessionMap.set(s.sessionId, s));
-        return Array.from(sessionMap.values());
-      });
-      } catch (fallbackError) {
-      if (__DEV__) {
-          console.error('Refresh sessions error:', fallbackError);
-      }
+    // If a refresh is already in progress, return the existing promise
+    if (refreshInFlightRef.current) {
+      return refreshInFlightRef.current;
+    }
 
-      // If the current session is invalid, try to find another valid session
-      if (sessions.length > 1) {
-        const otherSessions = sessions.filter(s => s.sessionId !== activeSessionId);
+    // Create the refresh promise
+    const refreshPromise = (async () => {
+      try {
+        const deviceSessions = await oxyServices.getDeviceSessions(activeSessionId);
+        const allDeviceSessions = mapSessionsToClient(deviceSessions, undefined, user?.id);
+        updateSessions(allDeviceSessions, true);
+      } catch (error) {
+        if (__DEV__) {
+          console.warn('Failed to refresh device sessions, falling back to user sessions:', error);
+        }
+        try {
+          const serverSessions = await oxyServices.getSessionsBySessionId(activeSessionId);
+          const userSessions = mapSessionsToClient(serverSessions, undefined, user?.id);
+          updateSessions(userSessions, true);
+        } catch (fallbackError) {
+          if (__DEV__) {
+            console.error('Refresh sessions error:', fallbackError);
+          }
 
-        for (const session of otherSessions) {
-          try {
-            const validation = await oxyServices.validateSession(session.sessionId, {
-              useHeaderValidation: true
-            });
-            if (validation.valid) {
-              await switchToSession(session.sessionId);
-              return;
+          // If the current session is invalid, try to find another valid session
+          if (sessions.length > 1) {
+            const otherSessions = sessions.filter(s => s.sessionId !== activeSessionId);
+
+            for (const session of otherSessions) {
+              try {
+                const validation = await oxyServices.validateSession(session.sessionId, {
+                  useHeaderValidation: true
+                });
+                if (validation.valid) {
+                  await switchToSession(session.sessionId);
+                  return;
+                }
+              } catch {
+                continue;
+              }
             }
-          } catch {
-            continue;
           }
+
+          // No valid sessions found, clear all
+          updateSessions([], false);
+          setActiveSessionId(null);
+          logoutStore();
+          setMinimalUser(null);
+          await clearAllStorage();
+          onAuthStateChange?.(null);
         }
+      } finally {
+        // Clear the in-flight ref when done
+        refreshInFlightRef.current = null;
       }
+    })();
 
-      // No valid sessions found, clear all
-      setSessions([]);
-      setActiveSessionId(null);
-      logoutStore();
-      setMinimalUser(null);
-      await clearAllStorage();
-      onAuthStateChange?.(null);
-      }
-    }
-  }, [activeSessionId, oxyServices, user?.id, sessions, switchToSession, logoutStore, clearAllStorage, onAuthStateChange, mapServerSessionsToClient]);
+    refreshInFlightRef.current = refreshPromise;
+    return refreshPromise;
+  }, [activeSessionId, oxyServices, user?.id, updateSessions, sessions, switchToSession, logoutStore, clearAllStorage, onAuthStateChange, mapSessionsToClient]);
 
   // Device management methods
   const getDeviceSessions = useCallback(async (): Promise<Array<{
@@ -821,7 +806,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
 
     try {
       await oxyServices.logoutAllDeviceSessions(activeSessionId);
-      setSessions([]);
+      updateSessions([], false);
       setActiveSessionId(null);
       logoutStore();
       setMinimalUser(null);
@@ -941,6 +926,11 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     }
   };
 
+  // Compute language metadata from currentLanguage
+  const languageMetadata = useMemo(() => getLanguageMetadata(currentLanguage), [currentLanguage]);
+  const languageName = useMemo(() => getLanguageName(currentLanguage), [currentLanguage]);
+  const nativeLanguageName = useMemo(() => getNativeLanguageName(currentLanguage), [currentLanguage]);
+
   const contextValue: OxyContextState = useMemo(() => ({
     user,
     minimalUser,
@@ -951,6 +941,9 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     isTokenReady: tokenReady,
     error,
     currentLanguage,
+    currentLanguageMetadata: languageMetadata,
+    currentLanguageName: languageName,
+    currentNativeLanguageName: nativeLanguageName,
     login,
     logout,
     logoutAll,
@@ -978,6 +971,9 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     tokenReady,
     error,
     currentLanguage,
+    languageMetadata,
+    languageName,
+    nativeLanguageName,
     login,
     logout,
     logoutAll,