@oxyhq/services 5.17.14 → 5.17.15

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

@@ -5,6 +5,7 @@ import { queryKeys, invalidateAccountQueries, invalidateUserQueries } from '../q
 import { useOxy } from '../../context/OxyContext';
 import { toast } from '../../../lib/sonner';
 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,43 +80,29 @@ export const useUpdateProfile = () => {
       }
       toast.error(error instanceof Error ? error.message : 'Failed to update profile');
     },
-    // On success, invalidate and refetch
+    // On success, update cache and sync to store
     onSuccess: async (data, updates) => {
-      if (__DEV__) {
-        console.log('[useUpdateProfile] Profile update successful:', data);
-        console.log('[useUpdateProfile] Updated fields:', Object.keys(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);
       }
-      
-      // Refresh accountStore with all updated profile data (not just avatar)
+
+      // Refresh accountStore with all updated profile data (synchronizes immediately)
       if (activeSessionId && oxyServices) {
         refreshAccountInStore(activeSessionId, data, oxyServices);
       }
-      
-      // Invalidate all related queries to refresh everywhere
-      await Promise.all([
-        invalidateUserQueries(queryClient),
-        invalidateAccountQueries(queryClient),
-      ]);
-      
-      // Force immediate refetch to update UI - refetch ALL active queries
-      await queryClient.refetchQueries({ 
-        queryKey: queryKeys.accounts.current(), 
-        type: 'active',
-        exact: false // Also refetch derived queries
-      });
-      
-      if (__DEV__) {
-        console.log('[useUpdateProfile] Profile update complete - cache invalidated and refetched');
-        // Log current cache state
-        const currentUser = queryClient.getQueryData(queryKeys.accounts.current());
-        console.log('[useUpdateProfile] Current cached user:', currentUser);
-      }
+
+      // Only invalidate specific queries that need refresh (not everything)
+      invalidateAccountQueries(queryClient);
+
+      logger.debug('Profile update complete', { component: 'useUpdateProfile' });
     },
   });
 };
@@ -190,9 +177,10 @@ export const useUploadAvatar = () => {
       toast.error(error instanceof Error ? error.message : 'Failed to upload avatar');
     },
     onSuccess: async (data) => {
-      if (__DEV__) {
-        console.log('[useUploadAvatar] Avatar upload successful:', data);
-      }
+      logger.debug(
+        'Avatar upload successful',
+        { component: 'useUploadAvatar', method: 'onSuccess', data }
+      );
       
       queryClient.setQueryData(queryKeys.accounts.current(), data);
       if (activeSessionId) {
@@ -213,9 +201,10 @@ export const useUploadAvatar = () => {
       
       toast.success('Avatar updated successfully');
       
-      if (__DEV__) {
-        console.log('[useUploadAvatar] Avatar update complete - cache invalidated and refetched');
-      }
+      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,21 +54,23 @@ export const useCurrentUser = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: queryKeys.accounts.current(),
     queryFn: async () => {
-      if (__DEV__) {
-        console.log('[useCurrentUser] Fetching user data for session:', activeSessionId);
-      }
+      logger.debug('Fetching current user', {
+        component: 'useCurrentUser',
+        sessionId: activeSessionId ?? undefined
+      });
       if (!activeSessionId) {
         throw new Error('No active session');
       }
       const userData = await oxyServices.getUserBySession(activeSessionId);
-      if (__DEV__) {
-        console.log('[useCurrentUser] Fetched user:', userData.username, userData.name);
-      }
+      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,
   });
@@ -88,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
   });
 };
 
@@ -108,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
   });
 };
 
@@ -128,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
   });
 };
 
@@ -176,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/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.
@@ -74,14 +75,12 @@ export function refreshAccountInStore(
     ? oxyServices.getFileDownloadUrl(userData.avatar, 'thumb') + `?t=${Date.now()}`
     : undefined;
   
-  if (__DEV__) {
-    console.log('[AccountStore] Refreshing account in store:', {
-      sessionId,
-      username: userData.username,
-      displayName,
-      avatar: userData.avatar,
-    });
-  }
+  logger.debug('Refreshing account in store', { 
+    component: 'AccountStore', 
+    sessionId,
+    username: userData.username,
+    hasAvatar: !!userData.avatar
+  });
   
   updateAccount(sessionId, {
     username: userData.username,