@oxyhq/services 5.16.10 → 5.16.11

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

@@ -3,6 +3,7 @@ import type { User } from '../../../models/interfaces';
 import { queryKeys, invalidateAccountQueries, invalidateUserQueries } from '../queries/queryKeys';
 import { useOxy } from '../../context/OxyContext';
 import { toast } from '../../../lib/sonner';
+import { refreshAvatarInStore } from '../../utils/avatarUtils';
 
 /**
  * Update user profile with optimistic updates and offline queue support
@@ -99,22 +100,21 @@ export const useUpdateProfile = () => {
       toast.error(error instanceof Error ? error.message : 'Failed to update profile');
     },
     // On success, invalidate and refetch
-    onSuccess: (data) => {
+    onSuccess: (data, updates) => {
       // Update cache with server response
       queryClient.setQueryData(queryKeys.accounts.current(), data);
       if (activeSessionId) {
         queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
       }
       
-      // Invalidate related queries
-      invalidateUserQueries(queryClient);
-    },
-    // Always refetch after error or success
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: queryKeys.accounts.current() });
-      if (activeSessionId) {
-        queryClient.invalidateQueries({ queryKey: queryKeys.users.profile(activeSessionId) });
+      // 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);
     },
   });
 };

package/src/ui/screens/WelcomeNewUserScreen.tsx

@@ -12,6 +12,7 @@ import GroupedPillButtons from '../components/internal/GroupedPillButtons';
 import { useI18n } from '../hooks/useI18n';
 import { useOxy } from '../context/OxyContext';
 import { useUpdateProfile } from '../hooks/mutations/useAccountMutations';
+import { updateAvatarVisibility } from '../utils/avatarUtils';
 
 const GAP = 12;
 const INNER_GAP = 8;
@@ -147,18 +148,8 @@ const WelcomeNewUserScreen: React.FC<BaseScreenProps & { newUser?: any }> = ({
                     return;
                 }
                 try {
-                    // Update file visibility to public for avatar (skip if temporary asset ID)
-                    if (file.id && !file.id.startsWith('temp-')) {
-                        try {
-                            await oxyServices.assetUpdateVisibility(file.id, 'public');
-                            console.log('[WelcomeNewUser] Avatar visibility updated to public');
-                        } catch (visError: any) {
-                            // Only log non-404 errors (404 means asset doesn't exist yet, which is OK)
-                            if (visError?.response?.status !== 404) {
-                                console.warn('[WelcomeNewUser] Failed to update avatar visibility, continuing anyway:', visError);
-                            }
-                        }
-                    }
+                    // Update file visibility to public for avatar
+                    await updateAvatarVisibility(file.id, oxyServices, 'WelcomeNewUser');
 
                     // Update the avatar immediately in local state
                     setSelectedAvatarId(file.id);

package/src/ui/utils/avatarUtils.ts

@@ -0,0 +1,53 @@
+import type { OxyServices } from '../../core';
+import { useAccountStore } from '../stores/accountStore';
+
+/**
+ * Updates file visibility to public for avatar use.
+ * Handles errors gracefully, only logging non-404 errors.
+ * 
+ * @param fileId - The file ID to update visibility for
+ * @param oxyServices - OxyServices instance
+ * @param contextName - Optional context name for logging
+ * @returns Promise that resolves when visibility is updated (or skipped)
+ */
+export async function updateAvatarVisibility(
+  fileId: string | undefined,
+  oxyServices: OxyServices,
+  contextName: string = 'AvatarUtils'
+): Promise<void> {
+  // Skip if temporary asset ID or no file ID
+  if (!fileId || fileId.startsWith('temp-')) {
+    return;
+  }
+
+  try {
+    await oxyServices.assetUpdateVisibility(fileId, 'public');
+    console.log(`[${contextName}] Avatar visibility updated to public`);
+  } catch (visError: any) {
+    // Only log non-404 errors (404 means asset doesn't exist yet, which is OK)
+    if (visError?.response?.status !== 404) {
+      console.warn(`[${contextName}] Failed to update avatar visibility, continuing anyway:`, visError);
+    }
+  }
+}
+
+/**
+ * Refreshes avatar in accountStore with cache-busted URL to force image reload.
+ * 
+ * @param sessionId - The session ID for the account to update
+ * @param avatarFileId - The new avatar file ID
+ * @param oxyServices - OxyServices instance to generate download URL
+ */
+export function refreshAvatarInStore(
+  sessionId: string,
+  avatarFileId: string,
+  oxyServices: OxyServices
+): void {
+  const { updateAccount } = useAccountStore.getState();
+  const cacheBustedUrl = oxyServices.getFileDownloadUrl(avatarFileId, 'thumb') + `?t=${Date.now()}`;
+  updateAccount(sessionId, {
+    avatar: avatarFileId,
+    avatarUrl: cacheBustedUrl,
+  });
+}
+

package/src/ui/utils/fileManagement.ts

@@ -3,6 +3,7 @@ import type { FileMetadata } from '../../models/interfaces';
 import { File as ExpoFile } from 'expo-file-system';
 import { toast } from '../../lib/sonner';
 import type { RouteName } from '../navigation/routes';
+import { updateAvatarVisibility } from './avatarUtils';
 
 /**
  * Format file size in bytes to human-readable string
@@ -263,18 +264,8 @@ export function createAvatarPickerHandler(config: AvatarPickerConfig): () => voi
                 }
                 
                 try {
-                    // Update file visibility to public for avatar (skip if temporary asset ID)
-                    if (file.id && !file.id.startsWith('temp-')) {
-                        try {
-                            await oxyServices.assetUpdateVisibility(file.id, 'public');
-                            console.log(`[${contextName}] Avatar visibility updated to public`);
-                        } catch (visError: any) {
-                            // Only log non-404 errors (404 means asset doesn't exist yet, which is OK)
-                            if (visError?.response?.status !== 404) {
-                                console.warn(`[${contextName}] Failed to update avatar visibility, continuing anyway:`, visError);
-                            }
-                        }
-                    }
+                    // Update file visibility to public for avatar
+                    await updateAvatarVisibility(file.id, oxyServices, contextName);
 
                     // Update local state if callback provided
                     if (onAvatarSelected) {