@oxyhq/services 5.17.13 → 5.17.15

package/lib/typescript/ui/utils/avatarUtils.d.ts

@@ -12,6 +12,7 @@ import { QueryClient } from '@tanstack/react-query';
  */
 export declare function updateAvatarVisibility(fileId: string | undefined, oxyServices: OxyServices, contextName?: string): Promise<void>;
 /**
+ * @deprecated Use refreshAccountInStore instead for full profile sync
  * Refreshes avatar in accountStore with cache-busted URL to force image reload.
  *
  * @param sessionId - The session ID for the account to update
@@ -19,6 +20,15 @@ export declare function updateAvatarVisibility(fileId: string | undefined, oxySe
  * @param oxyServices - OxyServices instance to generate download URL
  */
 export declare function refreshAvatarInStore(sessionId: string, avatarFileId: string, oxyServices: OxyServices): void;
+/**
+ * Refreshes all user profile data in accountStore (username, displayName, avatar).
+ * This ensures accountStore stays in sync with profile changes.
+ *
+ * @param sessionId - The session ID for the account to update
+ * @param userData - The updated user data
+ * @param oxyServices - OxyServices instance to generate download URL
+ */
+export declare function refreshAccountInStore(sessionId: string, userData: Partial<User>, oxyServices: OxyServices): void;
 /**
  * Updates user profile with avatar and handles all side effects (query invalidation, accountStore update).
  * This function can be used from within OxyContext provider without requiring useOxy hook.

package/lib/typescript/ui/utils/avatarUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avatarUtils.d.ts","sourceRoot":"","sources":["../../../../src/ui/utils/avatarUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,WAAW,EAAE,WAAW,EACxB,WAAW,GAAE,MAAsB,GAClC,OAAO,CAAC,IAAI,CAAC,CAcf;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,GACvB,IAAI,CAON;AAED;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,MAAM,GAAG,IAAI,EAC9B,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CAyCf"}
+{"version":3,"file":"avatarUtils.d.ts","sourceRoot":"","sources":["../../../../src/ui/utils/avatarUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,WAAW,EAAE,WAAW,EACxB,WAAW,GAAE,MAAsB,GAClC,OAAO,CAAC,IAAI,CAAC,CAcf;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,GACvB,IAAI,CAON;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EACvB,WAAW,EAAE,WAAW,GACvB,IAAI,CAqBN;AAED;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,MAAM,GAAG,IAAI,EAC9B,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CAyCf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "5.17.13",
+  "version": "5.17.15",
   "description": "Reusable OxyHQ module to handle authentication, user management, karma system, device-based session management and more 🚀",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/index.ts

@@ -193,4 +193,12 @@ export {
   logPerformance
 } from './utils/loggerUtils';
 export * from './utils/asyncUtils';
-export * from './utils/hookUtils';
+export * from './utils/hookUtils';
+
+// Avatar and account utilities
+export { 
+  refreshAvatarInStore, 
+  refreshAccountInStore, 
+  updateAvatarVisibility,
+  updateProfileWithAvatar
+} from './ui/utils/avatarUtils';

package/src/ui/context/OxyContext.tsx

@@ -6,12 +6,12 @@ import {
   useRef,
   useState,
 } from 'react';
-import { useQueryClient, useQuery, useMutation } from '@tanstack/react-query';
+import { useQueryClient, useQuery } from '@tanstack/react-query';
 import { toast } from '../../lib/sonner';
 import { OxyServices } from '../../core';
 import type { User } from '../../models/interfaces';
 import type { ClientSession } from '../../models/session';
-import { logger as loggerUtil } from '../../utils/loggerUtils';
+import { logger as appLogger } from '../../utils/loggerUtils';
 import { useAuthOperations } from './hooks/useAuthOperations';
 import { useAvatarPicker } from '../hooks/useAvatarPicker';
 import { useSessionSocket } from '../hooks/useSessionSocket';
@@ -22,13 +22,13 @@ import { useSessionManagement } from '../hooks/useSessionManagement';
 import { useStorage } from '../hooks/useStorage';
 import { useAccountStore } from '../stores/accountStore';
 import { useAuthStore, type AuthState } from '../stores/authStore';
-import { queryKeys, invalidateAccountQueries, invalidateUserQueries } from '../hooks/queries/queryKeys';
+import { queryKeys } from '../hooks/queries/queryKeys';
 import { clearQueryCache } from '../hooks/queryClient';
 import type { RouteName } from '../navigation/routes';
 import { showBottomSheet as globalShowBottomSheet } from '../navigation/bottomSheetManager';
 import { getStorageKeys } from '../utils/storageHelpers';
 import { isInvalidSessionError, isTimeoutOrNetworkError } from '../utils/errorHandlers';
-import { refreshAvatarInStore } from '../utils/avatarUtils';
+import { useUpdateProfile as useUpdateProfileMutation } from '../hooks/mutations/useAccountMutations';
 import { useShallow } from 'zustand/react/shallow';
 
 import {
@@ -55,7 +55,7 @@ const loadUseFollowHook = (): UseFollowHook => {
     return cachedUseFollowHook;
   } catch (error) {
     if (__DEV__) {
-      loggerUtil.warn(
+      appLogger.warn(
         'useFollow hook is not available. Please import useFollow from @oxyhq/services directly.',
         { component: 'OxyContext', method: 'loadUseFollowHook' },
         error
@@ -174,41 +174,34 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     queryClient,
   });
 
-  const { data: userData } = useQuery({
+  const { data: userData, refetch: refetchUser } = useQuery({
     queryKey: queryKeys.accounts.current(),
     queryFn: async () => {
+      appLogger.debug('Fetching current user', {
+        component: 'OxyContext',
+        sessionId: activeSessionId ?? undefined
+      });
       if (!activeSessionId) {
         throw new Error('No active session');
       }
-      return await oxyServices.getUserBySession(activeSessionId);
+      const data = await oxyServices.getUserBySession(activeSessionId);
+      appLogger.debug('Current user fetched', {
+        component: 'OxyContext',
+        username: data.username
+      });
+      return data;
     },
     enabled: isAuthenticated && !!activeSessionId && tokenReady,
-    staleTime: 0,
-    gcTime: 0,
+    staleTime: 30000, // 30 seconds - reduces unnecessary refetches
+    gcTime: 5 * 60 * 1000, // 5 minutes - keeps data in cache longer
     retry: false,
+    refetchOnMount: 'always',
+    refetchOnWindowFocus: false,
   });
   const user = userData ?? null;
 
-  // Update profile mutation - handles cache invalidation automatically
-  const updateProfileMutation = useMutation({
-    mutationFn: async (updates: Partial<User>) => {
-      return await oxyServices.updateProfile(updates);
-    },
-    onSuccess: (data, updates) => {
-      // Update cache with server response
-      queryClient.setQueryData(queryKeys.accounts.current(), data);
-      if (activeSessionId) {
-        queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
-      }
-      // If avatar was updated, refresh accountStore with cache-busted URL
-      if (updates.avatar && activeSessionId && oxyServices) {
-        refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
-      }
-      // Invalidate all related queries to refresh everywhere
-      invalidateUserQueries(queryClient);
-      invalidateAccountQueries(queryClient);
-    },
-  });
+  // Use the shared profile update mutation hook
+  const updateProfileMutation = useUpdateProfileMutation();
 
   const updateProfile = useCallback(
     async (updates: Partial<User>): Promise<User> => {
@@ -360,7 +353,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
               logger('Session validation failed during init', validationError);
             } else if (__DEV__ && isTimeoutOrNetworkError(validationError)) {
               // Only log timeouts in dev mode for debugging
-              loggerUtil.debug('Session validation timeout (expected when offline)', { component: 'OxyContext', method: 'restoreSessionsFromStorage' }, validationError as unknown);
+              appLogger.debug('Session validation timeout (expected when offline)', { component: 'OxyContext', method: 'restoreSessionsFromStorage' }, validationError as unknown);
             }
           }
         }
@@ -385,7 +378,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
           } else if (isTimeoutOrNetworkError(switchError)) {
             // Timeout/network error - non-critical, don't block
             if (__DEV__) {
-              loggerUtil.debug('Active session validation timeout (expected when offline)', { component: 'OxyContext', method: 'restoreSessionsFromStorage' }, switchError as unknown);
+              appLogger.debug('Active session validation timeout (expected when offline)', { component: 'OxyContext', method: 'restoreSessionsFromStorage' }, switchError as unknown);
             }
           } else {
             // Only log unexpected errors
@@ -395,7 +388,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
       }
     } catch (error) {
       if (__DEV__) {
-        loggerUtil.error('Auth init error', error instanceof Error ? error : new Error(String(error)), { component: 'OxyContext', method: 'restoreSessionsFromStorage' });
+        appLogger.error('Auth init error', error, { component: 'OxyContext', method: 'restoreSessionsFromStorage' });
       }
       await clearSessionState();
     } finally {

package/src/ui/hooks/mutations/useAccountMutations.ts

@@ -4,7 +4,8 @@ import type { ClientSession } from '../../../models/session';
 import { queryKeys, invalidateAccountQueries, invalidateUserQueries } from '../queries/queryKeys';
 import { useOxy } from '../../context/OxyContext';
 import { toast } from '../../../lib/sonner';
-import { refreshAvatarInStore } from '../../utils/avatarUtils';
+import { refreshAccountInStore } from '../../utils/avatarUtils';
+import { logger } from '../../../utils/loggerUtils';
 
 const getDeviceIdForSession = (sessions: ClientSession[] = [], sessionId: string | null) =>
   sessionId ? sessions.find((s) => s.sessionId === sessionId)?.deviceId : undefined;
@@ -79,22 +80,29 @@ export const useUpdateProfile = () => {
       }
       toast.error(error instanceof Error ? error.message : 'Failed to update profile');
     },
-    // On success, invalidate and refetch
-    onSuccess: (data, updates) => {
+    // On success, update cache and sync to store
+    onSuccess: async (data, updates) => {
+      logger.debug('Profile update successful', {
+        component: 'useUpdateProfile',
+        username: data.username,
+        updatedFields: Object.keys(updates)
+      });
+
       // Update cache with server response
       queryClient.setQueryData(queryKeys.accounts.current(), data);
       if (activeSessionId) {
         queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
       }
-      
-      // If avatar was updated, refresh accountStore with cache-busted URL
-      if (updates.avatar && activeSessionId && oxyServices) {
-        refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
+
+      // Refresh accountStore with all updated profile data (synchronizes immediately)
+      if (activeSessionId && oxyServices) {
+        refreshAccountInStore(activeSessionId, data, oxyServices);
       }
-      
-      // Invalidate all related queries to refresh everywhere
-      invalidateUserQueries(queryClient);
+
+      // Only invalidate specific queries that need refresh (not everything)
       invalidateAccountQueries(queryClient);
+
+      logger.debug('Profile update complete', { component: 'useUpdateProfile' });
     },
   });
 };
@@ -168,21 +176,35 @@ export const useUploadAvatar = () => {
       }
       toast.error(error instanceof Error ? error.message : 'Failed to upload avatar');
     },
-    onSuccess: (data) => {
+    onSuccess: async (data) => {
+      logger.debug(
+        'Avatar upload successful',
+        { component: 'useUploadAvatar', method: 'onSuccess', data }
+      );
+      
       queryClient.setQueryData(queryKeys.accounts.current(), data);
       if (activeSessionId) {
         queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
       }
       
-      // Refresh accountStore with cache-busted URL if avatar was updated
-      if (data?.avatar && activeSessionId && oxyServices) {
-        refreshAvatarInStore(activeSessionId, data.avatar, oxyServices);
+      // Refresh accountStore with all updated profile data (including avatar)
+      if (activeSessionId && oxyServices) {
+        refreshAccountInStore(activeSessionId, data, oxyServices);
       }
       
       // Invalidate all related queries to refresh everywhere
-      invalidateUserQueries(queryClient);
-      invalidateAccountQueries(queryClient);
+      await invalidateUserQueries(queryClient);
+      await invalidateAccountQueries(queryClient);
+      
+      // Explicitly refetch to ensure UI updates
+      await queryClient.refetchQueries({ queryKey: queryKeys.accounts.current() });
+      
       toast.success('Avatar updated successfully');
+      
+      logger.debug(
+        'Avatar update complete - cache invalidated and refetched',
+        { component: 'useUploadAvatar', method: 'onSuccess' }
+      );
     },
   });
 };

package/src/ui/hooks/queries/useAccountQueries.ts

@@ -3,6 +3,7 @@ import type { User } from '../../../models/interfaces';
 import type { OxyServices } from '../../../core';
 import { queryKeys } from './queryKeys';
 import { useOxy } from '../../context/OxyContextBase';
+import { logger } from '../../../utils/loggerUtils';
 
 /**
  * Get user profile by session ID
@@ -19,8 +20,8 @@ export const useUserProfile = (sessionId: string | null, options?: { enabled?: b
       return await oxyServices.getUserBySession(sessionId);
     },
     enabled: (options?.enabled !== false) && !!sessionId,
-    staleTime: 0, // Always fetch fresh - Services never caches profile
-    gcTime: 0, // No garbage collection time - always fetch fresh
+    staleTime: 30000, // 30 seconds - reasonable freshness without constant refetching
+    gcTime: 5 * 60 * 1000, // 5 minutes - keep in cache for quick access
   });
 };
 
@@ -38,8 +39,8 @@ export const useUserProfiles = (sessionIds: string[], options?: { enabled?: bool
         return results[0]?.user || null;
       },
       enabled: (options?.enabled !== false) && !!sessionId,
-      staleTime: 0, // Always fetch fresh - Services never caches profile
-      gcTime: 0, // No garbage collection time - always fetch fresh
+      staleTime: 30000, // 30 seconds
+      gcTime: 5 * 60 * 1000, // 5 minutes
     })),
   });
 };
@@ -53,14 +54,25 @@ export const useCurrentUser = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: queryKeys.accounts.current(),
     queryFn: async () => {
+      logger.debug('Fetching current user', {
+        component: 'useCurrentUser',
+        sessionId: activeSessionId ?? undefined
+      });
       if (!activeSessionId) {
         throw new Error('No active session');
       }
-      return await oxyServices.getUserBySession(activeSessionId);
+      const userData = await oxyServices.getUserBySession(activeSessionId);
+      logger.debug('Current user fetched', {
+        component: 'useCurrentUser',
+        username: userData.username
+      });
+      return userData;
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!activeSessionId,
-    staleTime: 0, // Always fetch fresh - Services never caches profile
-    gcTime: 0, // No garbage collection time - always fetch fresh
+    staleTime: 30000, // 30 seconds - balances freshness with performance
+    gcTime: 5 * 60 * 1000, // 5 minutes
+    refetchOnMount: 'always', // Always refetch on mount
+    refetchOnWindowFocus: false,
   });
 };
 
@@ -79,8 +91,8 @@ export const useUserById = (userId: string | null, options?: { enabled?: boolean
       return await oxyServices.getUserById(userId);
     },
     enabled: (options?.enabled !== false) && !!userId,
-    staleTime: 0, // Always fetch fresh - Services never caches profile
-    gcTime: 0, // No garbage collection time - always fetch fresh
+    staleTime: 60000, // 1 minute - other users' profiles change less frequently
+    gcTime: 10 * 60 * 1000, // 10 minutes
   });
 };
 
@@ -99,8 +111,8 @@ export const useUserByUsername = (username: string | null, options?: { enabled?:
       return await oxyServices.getProfileByUsername(username);
     },
     enabled: (options?.enabled !== false) && !!username,
-    staleTime: 0, // Always fetch fresh - Services never caches profile
-    gcTime: 0, // No garbage collection time - always fetch fresh
+    staleTime: 60000, // 1 minute
+    gcTime: 10 * 60 * 1000, // 10 minutes
   });
 };
 
@@ -119,8 +131,8 @@ export const useUsersBySessions = (sessionIds: string[], options?: { enabled?: b
       return await oxyServices.getUsersBySessions(sessionIds);
     },
     enabled: (options?.enabled !== false) && sessionIds.length > 0,
-    staleTime: 0, // Always fetch fresh - Services never caches profile
-    gcTime: 0, // No garbage collection time - always fetch fresh
+    staleTime: 30000, // 30 seconds
+    gcTime: 5 * 60 * 1000, // 5 minutes
   });
 };
 
@@ -167,7 +179,7 @@ export const usePrivacySettings = (userId?: string, options?: { enabled?: boolea
       }
     },
     enabled: (options?.enabled !== false) && !!targetUserId,
-    staleTime: 0, // Always fetch fresh - Services never caches profile
-    gcTime: 0, // No garbage collection time - always fetch fresh
+    staleTime: 60000, // 1 minute - privacy settings don't change frequently
+    gcTime: 10 * 60 * 1000, // 10 minutes
   });
 };

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -215,9 +215,10 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
             // Only reset all fields if it's a new user or first load
             // Skip reset if it's just an avatar update
             if (shouldInitialize && !isAvatarOnlyUpdate) {
+                // Prioritize name.full over name.first for display name
                 const userDisplayName = typeof finalUser.name === 'string'
                     ? finalUser.name
-                    : finalUser.name?.first || finalUser.name?.full || '';
+                    : finalUser.name?.full || finalUser.name?.first || '';
                 const userLastName = typeof finalUser.name === 'object' ? finalUser.name?.last || '' : '';
                 setDisplayName(userDisplayName);
                 setLastName(userLastName);
@@ -362,7 +363,15 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
         try {
             switch (field) {
                 case 'displayName':
-                    await updateProfileMutation.mutateAsync({ name: { first: tempDisplayName, last: tempLastName } });
+                    // Send both first/last AND full name for proper synchronization
+                    const fullName = [tempDisplayName, tempLastName].filter(Boolean).join(' ').trim() || tempDisplayName;
+                    await updateProfileMutation.mutateAsync({
+                        name: {
+                            first: tempDisplayName,
+                            last: tempLastName,
+                            full: fullName
+                        }
+                    });
                     setDisplayName(tempDisplayName);
                     setLastName(tempLastName);
                     break;
@@ -467,7 +476,12 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
 
             // Handle name field
             if (displayName || lastName) {
-                updates.name = { first: displayName, last: lastName };
+                const fullName = [displayName, lastName].filter(Boolean).join(' ').trim() || displayName;
+                updates.name = {
+                    first: displayName,
+                    last: lastName,
+                    full: fullName
+                };
             }
 
             // Handle avatar

package/src/ui/stores/accountStore.ts

@@ -112,6 +112,8 @@ export const useAccountStore = create<AccountState>((set, get) => ({
                 return existing && 
                     existing.sessionId === newAccount.sessionId &&
                     existing.userId === newAccount.userId &&
+                    existing.username === newAccount.username &&
+                    existing.displayName === newAccount.displayName &&
                     existing.avatar === newAccount.avatar &&
                     existing.avatarUrl === newAccount.avatarUrl;
             });
@@ -150,7 +152,15 @@ export const useAccountStore = create<AccountState>((set, get) => ({
         if (!existing) return {} as any;
         
         const updated = { ...existing, ...updates };
-        if (existing.avatar === updated.avatar && existing.avatarUrl === updated.avatarUrl) {
+        // Check if any meaningful field has changed
+        const hasChanges = 
+            existing.username !== updated.username ||
+            existing.displayName !== updated.displayName ||
+            existing.avatar !== updated.avatar ||
+            existing.avatarUrl !== updated.avatarUrl ||
+            existing.userId !== updated.userId;
+        
+        if (!hasChanges) {
             return {} as any; // No change
         }
         

package/src/ui/utils/avatarUtils.ts

@@ -3,6 +3,7 @@ import type { User } from '../../models/interfaces';
 import { useAccountStore } from '../stores/accountStore';
 import { QueryClient } from '@tanstack/react-query';
 import { queryKeys, invalidateUserQueries, invalidateAccountQueries } from '../hooks/queries/queryKeys';
+import { logger } from '../../utils/loggerUtils';
 
 /**
  * Updates file visibility to public for avatar use.
@@ -34,6 +35,7 @@ export async function updateAvatarVisibility(
 }
 
 /**
+ * @deprecated Use refreshAccountInStore instead for full profile sync
  * Refreshes avatar in accountStore with cache-busted URL to force image reload.
  * 
  * @param sessionId - The session ID for the account to update
@@ -53,6 +55,41 @@ export function refreshAvatarInStore(
   });
 }
 
+/**
+ * Refreshes all user profile data in accountStore (username, displayName, avatar).
+ * This ensures accountStore stays in sync with profile changes.
+ * 
+ * @param sessionId - The session ID for the account to update
+ * @param userData - The updated user data
+ * @param oxyServices - OxyServices instance to generate download URL
+ */
+export function refreshAccountInStore(
+  sessionId: string,
+  userData: Partial<User>,
+  oxyServices: OxyServices
+): void {
+  const { updateAccount } = useAccountStore.getState();
+  
+  const displayName = userData.name?.full || userData.name?.first || userData.username || 'Account';
+  const avatarUrl = userData.avatar 
+    ? oxyServices.getFileDownloadUrl(userData.avatar, 'thumb') + `?t=${Date.now()}`
+    : undefined;
+  
+  logger.debug('Refreshing account in store', { 
+    component: 'AccountStore', 
+    sessionId,
+    username: userData.username,
+    hasAvatar: !!userData.avatar
+  });
+  
+  updateAccount(sessionId, {
+    username: userData.username,
+    displayName,
+    avatar: userData.avatar,
+    avatarUrl,
+  });
+}
+
 /**
  * Updates user profile with avatar and handles all side effects (query invalidation, accountStore update).
  * This function can be used from within OxyContext provider without requiring useOxy hook.
@@ -89,9 +126,9 @@ export async function updateProfileWithAvatar(
       queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
     }
     
-    // If avatar was updated, refresh accountStore with cache-busted URL
-    if (updates.avatar && activeSessionId) {
-      refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
+    // Refresh accountStore with all updated profile data
+    if (activeSessionId) {
+      refreshAccountInStore(activeSessionId, data, oxyServices);
     }
     
     // Invalidate all related queries to refresh everywhere