@oxyhq/services 10.2.10 → 10.3.0

package/src/ui/hooks/useProfileEditing.ts

@@ -1,38 +1,51 @@
 import { useCallback } from 'react';
-import { useI18n } from './useI18n';
 import { useUpdateProfile } from './mutations/useAccountMutations';
 import { useAuthStore } from '../stores/authStore';
+import type { UserProfileUpdate } from '@oxyhq/contracts';
+
+interface ProfileLocation {
+    id: string;
+    name: string;
+    label?: string;
+    coordinates?: { lat: number; lon: number };
+}
+
+interface ProfileLinkMetadata {
+    url: string;
+    title?: string;
+    description?: string;
+    image?: string;
+    id: string;
+}
 
 export interface ProfileUpdateData {
-    displayName?: string;
+    firstName?: string;
     lastName?: string;
     username?: string;
     email?: string;
     bio?: string;
     location?: string;
-    locations?: Array<{
-        id: string;
-        name: string;
-        label?: string;
-        coordinates?: { lat: number; lon: number };
-    }>;
+    locations?: ProfileLocation[];
     links?: string[];
-    linksMetadata?: Array<{
-        url: string;
-        title?: string;
-        description?: string;
-        image?: string;
-        id: string;
-    }>;
+    linksMetadata?: ProfileLinkMetadata[];
     avatar?: string;
 }
 
+type ProfileFieldValue = string | ProfileLocation[] | ProfileLinkMetadata[];
+
+function isProfileLocationArray(value: ProfileFieldValue): value is ProfileLocation[] {
+    return Array.isArray(value) && value.every((item) => typeof item === 'object' && item !== null && 'name' in item);
+}
+
+function isProfileLinkMetadataArray(value: ProfileFieldValue): value is ProfileLinkMetadata[] {
+    return Array.isArray(value) && value.every((item) => typeof item === 'object' && item !== null && 'url' in item);
+}
+
 /**
  * Hook for managing profile editing operations
  * Provides functions to update profile fields and handle saving
  */
 export const useProfileEditing = () => {
-    const { t } = useI18n();
     const updateProfileMutation = useUpdateProfile();
 
     /**
@@ -40,7 +53,7 @@ export const useProfileEditing = () => {
      */
     const saveProfile = useCallback(async (updates: ProfileUpdateData) => {
         // Prepare update object
-        const updateData: Record<string, any> = {};
+        const updateData: UserProfileUpdate = {};
 
         if (updates.username !== undefined) {
             updateData.username = updates.username;
@@ -70,11 +83,11 @@ export const useProfileEditing = () => {
         }
 
         // Handle name field
-        if (updates.displayName !== undefined || updates.lastName !== undefined) {
+        if (updates.firstName !== undefined || updates.lastName !== undefined) {
             const currentUser = useAuthStore.getState().user;
             const currentName = currentUser?.name;
             updateData.name = {
-                first: updates.displayName ?? (typeof currentName === 'object' ? currentName?.first : '') ?? '',
+                first: updates.firstName ?? (typeof currentName === 'object' ? currentName?.first : '') ?? '',
                 last: updates.lastName ?? (typeof currentName === 'object' ? currentName?.last : '') ?? '',
             };
         }
@@ -86,33 +99,39 @@ export const useProfileEditing = () => {
             // Error toast is handled by the mutation
             return false;
         }
-    }, [updateProfileMutation, t]);
+    }, [updateProfileMutation]);
 
     /**
      * Update a single profile field
      */
-    const updateField = useCallback(async (field: string, value: any) => {
+    const updateField = useCallback(async (field: string, value: ProfileFieldValue) => {
         const updates: ProfileUpdateData = {};
         
         switch (field) {
-            case 'displayName':
-                updates.displayName = value;
+            case 'firstName':
+                if (typeof value !== 'string') return false;
+                updates.firstName = value;
                 break;
             case 'username':
+                if (typeof value !== 'string') return false;
                 updates.username = value;
                 break;
             case 'email':
+                if (typeof value !== 'string') return false;
                 updates.email = value;
                 break;
             case 'bio':
+                if (typeof value !== 'string') return false;
                 updates.bio = value;
                 break;
             case 'location':
+                if (!isProfileLocationArray(value)) return false;
                 updates.locations = value;
                 break;
             case 'links':
+                if (!isProfileLinkMetadataArray(value)) return false;
                 updates.linksMetadata = value;
-                updates.links = value.map((link: any) => link.url || link);
+                updates.links = value.map((link) => link.url);
                 break;
             default:
                 return false;
@@ -129,9 +148,3 @@ export const useProfileEditing = () => {
 };
 
 
-
-
-
-
-
-

package/src/ui/screens/AppInfoScreen.tsx

@@ -20,7 +20,7 @@ import { SettingsIcon } from '../components/SettingsIcon';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { Colors } from '../constants/theme';
-import { normalizeColorScheme } from '../utils/themeUtils';
+import { normalizeColorScheme } from '@oxyhq/core';
 import { useOxy } from '../context/OxyContext';
 import { useI18n } from '../hooks/useI18n';
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';

package/src/ui/screens/ConnectedAppsScreen.tsx

@@ -15,7 +15,7 @@ import { useAuthorizedApps } from '../hooks/queries/useAccountQueries';
 import { useRevokeAuthorizedApp } from '../hooks/mutations/useAccountMutations';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { Colors } from '../constants/theme';
-import { normalizeColorScheme, normalizeTheme } from '../utils/themeUtils';
+import { normalizeColorScheme, normalizeTheme } from '@oxyhq/core';
 
 /**
  * Format an ISO-8601 timestamp as a human-readable relative time. Mirrors the

package/src/ui/screens/EditProfileFieldScreen.tsx

@@ -14,7 +14,7 @@ import {
 import { Ionicons } from '@expo/vector-icons';
 import type { BaseScreenProps } from '../types/navigation';
 import { useTheme } from '@oxyhq/bloom/theme';
-import { normalizeTheme } from '../utils/themeUtils';
+import { normalizeTheme } from '@oxyhq/core';
 import Header from '../components/Header';
 import { useI18n } from '../hooks/useI18n';
 import { useOxy } from '../context/OxyContext';
@@ -59,6 +59,17 @@ interface EditProfileFieldScreenProps extends BaseScreenProps {
     fieldType?: ProfileFieldType;
 }
 
+type EditableListItem = {
+    id: string;
+    name?: string;
+    label?: string;
+    url?: string;
+    title?: string;
+    description?: string;
+    image?: string;
+    coordinates?: { lat: number; lon: number };
+};
+
 /**
  * EditProfileFieldScreen - A dedicated screen for editing profile fields
  *
@@ -84,7 +95,7 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
     const [fieldErrors, setFieldErrors] = useState<Record<string, string | undefined>>({});
 
     // State for list fields (locations, links)
-    const [listItems, setListItems] = useState<Array<{ id: string; [key: string]: unknown }>>([]);
+    const [listItems, setListItems] = useState<EditableListItem[]>([]);
     const [newItemValue, setNewItemValue] = useState('');
 
     // Get field configuration based on fieldType
@@ -96,7 +107,7 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
                     subtitle: t('editProfile.items.displayName.subtitle') || 'This is how your name will appear to others',
                     fields: [
                         {
-                            key: 'displayName',
+                            key: 'firstName',
                             label: t('editProfile.items.displayName.firstName') || 'First Name',
                             placeholder: t('editProfile.items.displayName.firstNamePlaceholder') || 'Enter first name',
                         },
@@ -255,30 +266,29 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
 
         if (fieldConfig.isList) {
             if (fieldType === 'locations') {
-                const locations = Array.isArray(userData.locations) ? userData.locations as Array<Record<string, unknown>> : [];
+                const locations = Array.isArray(userData.locations) ? userData.locations : [];
                 setListItems(locations.map((loc, i) => ({
                     id: String(loc.id || `location-${i}`),
                     name: String(loc.name || ''),
                     ...loc,
                 })));
             } else if (fieldType === 'links') {
-                const linksMetadata = Array.isArray(userData.linksMetadata) ? userData.linksMetadata as Array<Record<string, unknown>> : [];
+                const linksMetadata = Array.isArray(userData.linksMetadata) ? userData.linksMetadata : [];
                 const links = Array.isArray(userData.links) ? userData.links : [];
                 // Use linksMetadata if available, otherwise convert links array
                 if (linksMetadata.length > 0) {
                     setListItems(linksMetadata.map((link, i) => ({
+                        ...link,
                         id: String(link.id || `link-${i}`),
-                        url: String(link.url || link.link || ''),
+                        url: String(link.url || ''),
                         title: String(link.title || ''),
-                        ...link,
                     })));
                 } else {
                     setListItems(links.map((item, i) => {
-                        const url = typeof item === 'string' ? item : (item.link || '');
                         return {
                             id: `link-${i}`,
-                            url,
-                            title: url.replace(/^https?:\/\//, '').replace(/\/$/, ''),
+                            url: item,
+                            title: item.replace(/^https?:\/\//, '').replace(/\/$/, ''),
                         };
                     }));
                 }
@@ -286,8 +296,8 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
         } else {
             const initialValues: Record<string, string> = {};
             fieldConfig.fields.forEach(field => {
-                if (field.key === 'displayName') {
-                    initialValues[field.key] = String(userData.displayName || userData.name?.first || '');
+                if (field.key === 'firstName') {
+                    initialValues[field.key] = String(userData.name?.first || '');
                 } else if (field.key === 'lastName') {
                     initialValues[field.key] = String(userData.lastName || userData.name?.last || '');
                 } else if (field.key === 'birthday') {
@@ -390,7 +400,7 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
             let success = false;
             if (fieldType === 'displayName') {
                 success = await saveProfile({
-                    displayName: fieldValues.displayName,
+                    firstName: fieldValues.firstName,
                     lastName: fieldValues.lastName,
                 });
             } else {
@@ -496,7 +506,7 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
                         <Text style={[styles.listTitle, { color: bloomTheme.colors.text }]}>
                             {listTitle} ({listItems.length})
                         </Text>
-                        {listItems.map((item: any) => (
+                        {listItems.map((item) => (
                             <View
                                 key={item.id}
                                 style={[

package/src/ui/screens/FeedbackScreen.tsx

@@ -13,7 +13,7 @@ import {
 } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
 import { useThemeColors } from '../styles/theme';
-import { normalizeTheme } from '../utils/themeUtils';
+import { normalizeTheme } from '@oxyhq/core';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { Ionicons } from '@expo/vector-icons';
 import { toast } from '@oxyhq/bloom';

package/src/ui/screens/HelpSupportScreen.tsx

@@ -13,7 +13,7 @@ import { useI18n } from '../hooks/useI18n';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { Colors } from '../constants/theme';
-import { normalizeColorScheme } from '../utils/themeUtils';
+import { normalizeColorScheme } from '@oxyhq/core';
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';
 
 const HelpSupportScreen: React.FC<BaseScreenProps> = ({

package/src/ui/screens/HistoryViewScreen.tsx

@@ -11,7 +11,7 @@ import { useI18n } from '../hooks/useI18n';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { Colors } from '../constants/theme';
-import { normalizeColorScheme } from '../utils/themeUtils';
+import { normalizeColorScheme } from '@oxyhq/core';
 import { useOxy } from '../context/OxyContext';
 import { Dialog, useDialogControl } from '@oxyhq/bloom';
 

package/src/ui/screens/LanguageSelectorScreen.tsx

@@ -9,7 +9,7 @@ import {
 } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
 import { useTheme } from '@oxyhq/bloom/theme';
-import { normalizeTheme } from '../utils/themeUtils';
+import { normalizeTheme } from '@oxyhq/core';
 import { Ionicons } from '@expo/vector-icons';
 import { toast } from '@oxyhq/bloom';
 import Header from '../components/Header';

package/src/ui/screens/LegalDocumentsScreen.tsx

@@ -15,7 +15,7 @@ import { useI18n } from '../hooks/useI18n';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { Colors } from '../constants/theme';
-import { normalizeColorScheme } from '../utils/themeUtils';
+import { normalizeColorScheme } from '@oxyhq/core';
 
 const LegalDocumentsScreen: React.FC<BaseScreenProps> = ({
     onClose,

package/src/ui/screens/ManageAccountScreen.tsx

@@ -32,7 +32,7 @@ import { useUserSubscription } from '../hooks/queries/usePaymentQueries';
 import { useDeviceSessions } from '../hooks/queries/useServicesQueries';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { Colors } from '../constants/theme';
-import { normalizeColorScheme, normalizeTheme } from '../utils/themeUtils';
+import { normalizeColorScheme, normalizeTheme } from '@oxyhq/core';
 import { screenContentStyle } from '../constants/spacing';
 
 interface DeviceSessionRow {

package/src/ui/screens/NotificationsScreen.tsx

@@ -14,7 +14,7 @@ import { useUpdateNotificationPreferences } from '../hooks/mutations/useAccountM
 import { useSettingToggles } from '../hooks/useSettingToggle';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { Colors } from '../constants/theme';
-import { normalizeColorScheme, normalizeTheme } from '../utils/themeUtils';
+import { normalizeColorScheme, normalizeTheme } from '@oxyhq/core';
 
 interface NotificationToggleValues {
     pushEnabled: boolean;

package/src/ui/screens/PaymentGatewayScreen.tsx

@@ -10,7 +10,7 @@ import {
 } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
 import { useThemeColors } from '../styles/theme';
-import { normalizeTheme } from '../utils/themeUtils';
+import { normalizeTheme } from '@oxyhq/core';
 import { Button } from '@oxyhq/bloom/button';
 import { Ionicons } from '@expo/vector-icons';
 import { useI18n } from '../hooks/useI18n';

package/src/ui/screens/PreferencesScreen.tsx

@@ -13,7 +13,7 @@ import { useCurrentUser } from '../hooks/queries/useAccountQueries';
 import { useUpdateUserPreferences } from '../hooks/mutations/useAccountMutations';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { Colors } from '../constants/theme';
-import { normalizeColorScheme, normalizeTheme } from '../utils/themeUtils';
+import { normalizeColorScheme, normalizeTheme } from '@oxyhq/core';
 
 type ThemePreference = 'light' | 'dark' | 'system';
 

package/src/ui/screens/ProfileScreen.tsx

@@ -9,7 +9,7 @@ import { useFollow } from '../hooks/useFollow';
 import { Ionicons } from '@expo/vector-icons';
 import { useI18n } from '../hooks/useI18n';
 import { useOxy } from '../context/OxyContext';
-import { logger } from '@oxyhq/core';
+import { getAccountDisplayName, logger } from '@oxyhq/core';
 import type { User } from '@oxyhq/core';
 import { extractErrorMessage } from '../utils/errorHandlers';
 
@@ -54,7 +54,7 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
 
     const bloomTheme = useTheme();
     const styles = createStyles();
-    const { t } = useI18n();
+    const { t, locale } = useI18n();
 
     // Check if current user is viewing their own profile
     // Normalize IDs by trimming whitespace to handle format mismatches
@@ -214,7 +214,7 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
                     <View style={styles.avatarWrapper} className="border-background bg-background">
                         <Avatar
                             uri={profile?.avatar ? oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') : undefined}
-                            name={profile?.username || username}
+                            name={profile ? getAccountDisplayName(profile, locale) : username}
                             size={96}
 
                         />
@@ -246,7 +246,7 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
                 {/* Profile Info */}
                 <View style={styles.header}>
                     <Text style={styles.displayName} className="text-foreground">
-                        {(profile && 'displayName' in profile && typeof profile.displayName === 'string' ? profile.displayName : null) || profile?.username || username || profile?.id || ''}
+                        {profile ? getAccountDisplayName(profile, locale) : username || ''}
                     </Text>
                     {profile?.username && (
                         <Text style={styles.subText} className="text-muted-foreground">@{profile.username}</Text>

package/src/ui/screens/SavesCollectionsScreen.tsx

@@ -17,7 +17,7 @@ import { useI18n } from '../hooks/useI18n';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { Colors } from '../constants/theme';
-import { normalizeColorScheme } from '../utils/themeUtils';
+import { normalizeColorScheme } from '@oxyhq/core';
 import { useOxy } from '../context/OxyContext';
 
 interface SavedItem {
@@ -25,7 +25,6 @@ interface SavedItem {
     title: string;
     type: 'post' | 'collection';
     savedAt: Date;
-    url?: string;
 }
 
 interface Collection {
@@ -67,14 +66,13 @@ const SavesCollectionsScreen: React.FC<BaseScreenProps> = ({
                         oxyServices.getSavedItems(user.id),
                         oxyServices.getCollections(user.id),
                     ]);
-                    setSavedItems(saved.map((item: any) => ({
+                    setSavedItems(saved.map((item) => ({
                         id: item.id,
                         title: item.title,
                         type: item.itemType === 'post' ? 'post' : 'collection',
                         savedAt: new Date(item.createdAt),
-                        url: item.url,
                     })));
-                    setCollections(cols.map((col: any) => ({
+                    setCollections(cols.map((col) => ({
                         id: col.id,
                         name: col.name,
                         description: col.description,
@@ -220,4 +218,3 @@ const styles = StyleSheet.create({
 });
 
 export default React.memo(SavesCollectionsScreen);
-

package/src/ui/screens/trust/TrustCenterScreen.tsx

@@ -16,7 +16,7 @@ import { useI18n } from '../../hooks/useI18n';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { useColorScheme } from '../../hooks/useColorScheme';
 import { Colors } from '../../constants/theme';
-import { normalizeColorScheme } from '../../utils/themeUtils';
+import { normalizeColorScheme } from '@oxyhq/core';
 import { darkenColor } from '../../utils/colorUtils';
 import { useOxy } from '../../context/OxyContext';
 import { getTrustTierLabel } from './trustTier';

package/src/ui/screens/trust/TrustFAQScreen.tsx

@@ -6,7 +6,7 @@ import Header from '../../components/Header';
 import { SettingsListItem } from '@oxyhq/bloom/settings-list';
 import { useI18n } from '../../hooks/useI18n';
 import { useTheme } from '@oxyhq/bloom/theme';
-import { normalizeColorScheme } from '../../utils/themeUtils';
+import { normalizeColorScheme } from '@oxyhq/core';
 import { useColorScheme } from '../../hooks/useColorScheme';
 import { Colors } from '../../constants/theme';
 

package/src/ui/screens/trust/TrustRewardsScreen.tsx

@@ -6,7 +6,7 @@ import Header from '../../components/Header';
 import { Ionicons } from '@expo/vector-icons';
 import { useI18n } from '../../hooks/useI18n';
 import { useTheme } from '@oxyhq/bloom/theme';
-import { normalizeColorScheme } from '../../utils/themeUtils';
+import { normalizeColorScheme } from '@oxyhq/core';
 import { useColorScheme } from '../../hooks/useColorScheme';
 import { Colors } from '../../constants/theme';
 import { useOxy } from '../../context/OxyContext';

package/src/ui/stores/authStore.ts

@@ -4,15 +4,6 @@ import type { User } from '@oxyhq/core';
 
 const debug = createDebugLogger('AuthStore');
 
-type LegacyUserIdentity = Partial<Omit<User, 'id' | 'publicKey' | 'username'>> & {
-  id?: string;
-  _id: string;
-  publicKey: string;
-  username: string;
-};
-
-type AuthStoreUserInput = User | LegacyUserIdentity;
-
 export interface AuthState {
   user: User | null;
   isAuthenticated: boolean;
@@ -20,11 +11,11 @@ export interface AuthState {
   error: string | null;
   lastUserFetch: number | null; // Timestamp of last user fetch for caching
   
-  loginSuccess: (user: AuthStoreUserInput) => void;
+  loginSuccess: (user: User) => void;
   loginFailure: (error: string) => void;
   logout: () => void;
   fetchUser: (oxyServices: { getCurrentUser: () => Promise<User> }, forceRefresh?: boolean) => Promise<void>;
-  setUser: (user: AuthStoreUserInput) => void; // Direct user setter for caching
+  setUser: (user: User) => void; // Direct user setter for caching
 }
 
 export const useAuthStore = create<AuthState>((set: (state: Partial<AuthState>) => void, get: () => AuthState) => ({
@@ -34,7 +25,7 @@ export const useAuthStore = create<AuthState>((set: (state: Partial<AuthState>)
   error: null,
   lastUserFetch: null,
 
-  loginSuccess: (user: AuthStoreUserInput) => set({
+  loginSuccess: (user: User) => set({
     isLoading: false,
     isAuthenticated: true,
     user: normalizeUserIdentity(user),
@@ -46,7 +37,7 @@ export const useAuthStore = create<AuthState>((set: (state: Partial<AuthState>)
     isAuthenticated: false,
     lastUserFetch: null,
   }),
-  setUser: (user: AuthStoreUserInput) => set({ user: normalizeUserIdentity(user), lastUserFetch: Date.now() }),
+  setUser: (user: User) => set({ user: normalizeUserIdentity(user), lastUserFetch: Date.now() }),
   fetchUser: async (oxyServices, forceRefresh = false) => {
     const state = get();
     const now = Date.now();

package/src/ui/stores/followStore.ts

@@ -1,5 +1,5 @@
 import { create } from 'zustand';
-import type { OxyServices } from '@oxyhq/core';
+import type { OxyServices, BulkFollowResult } from '@oxyhq/core';
 
 interface FollowState {
   followingUsers: Record<string, boolean>;
@@ -16,6 +16,8 @@ interface FollowState {
   resetFollowState: () => void;
   fetchFollowStatus: (userId: string, oxyServices: OxyServices) => Promise<void>;
   toggleFollowUser: (userId: string, oxyServices: OxyServices, isCurrentlyFollowing: boolean) => Promise<void>;
+  // Bulk follow — follows MANY users in one network call; never unfollows.
+  followManyUsers: (userIds: string[], oxyServices: OxyServices) => Promise<BulkFollowResult>;
   // New methods for follower counts
   setFollowerCount: (userId: string, count: number) => void;
   setFollowingCount: (userId: string, count: number) => void;
@@ -126,6 +128,50 @@ export const useFollowStore = create<FollowState>((set: any, get: any) => ({
       }));
     }
   },
+  followManyUsers: async (userIds: string[], oxyServices: OxyServices): Promise<BulkFollowResult> => {
+    set((state: FollowState) => {
+      const loadingUsers = { ...state.loadingUsers };
+      const errors = { ...state.errors };
+      for (const uid of userIds) {
+        loadingUsers[uid] = true;
+        errors[uid] = null;
+      }
+      return { loadingUsers, errors };
+    });
+    try {
+      const result = await oxyServices.followUsers(userIds);
+      set((state: FollowState) => {
+        const followingUsers = { ...state.followingUsers };
+        const loadingUsers = { ...state.loadingUsers };
+        const errors = { ...state.errors };
+        for (const uid of userIds) {
+          loadingUsers[uid] = false;
+        }
+        for (const entry of result.results) {
+          if (entry.success || entry.alreadyFollowing) {
+            followingUsers[entry.userId] = true;
+            errors[entry.userId] = null;
+          } else {
+            errors[entry.userId] = 'Failed to update follow status';
+          }
+        }
+        return { followingUsers, loadingUsers, errors };
+      });
+      return result;
+    } catch (error: unknown) {
+      const message = (error instanceof Error ? error.message : null) || 'Failed to update follow status';
+      set((state: FollowState) => {
+        const loadingUsers = { ...state.loadingUsers };
+        const errors = { ...state.errors };
+        for (const uid of userIds) {
+          loadingUsers[uid] = false;
+          errors[uid] = message;
+        }
+        return { loadingUsers, errors };
+      });
+      throw error;
+    }
+  },
   setFollowerCount: (userId: string, count: number) => set((state: FollowState) => ({
     followerCounts: { ...state.followerCounts, [userId]: count },
   })),

package/src/ui/types/navigation.ts

@@ -4,9 +4,6 @@ import type { RouteName } from '../navigation/routes';
 import type { User } from '@oxyhq/core';
 import type { ClientSession } from '@oxyhq/core';
 
-// Re-export RouteName from routes for convenience
-export type { RouteName };
-
 export interface StepController {
     canGoBack: () => boolean;
     goBack: () => void;
@@ -67,4 +64,3 @@ export interface OxyProviderProps {
     authRedirectUri?: string;
     queryClient?: QueryClient;
 }
-

package/src/ui/utils/avatarUtils.ts

@@ -1,5 +1,6 @@
 import { authenticatedApiCall } from '@oxyhq/core';
 import type { OxyServices, User } from '@oxyhq/core';
+import type { UserProfileUpdate } from '@oxyhq/contracts';
 import { useAccountStore } from '../stores/accountStore';
 import { useAuthStore } from '../stores/authStore';
 import type { QueryClient } from '@tanstack/react-query';
@@ -37,7 +38,7 @@ export function refreshAvatarInStore(
  * @returns Promise that resolves with updated user data
  */
 export async function updateProfileWithAvatar(
-  updates: Partial<User>,
+  updates: UserProfileUpdate,
   oxyServices: OxyServices,
   activeSessionId: string | null,
   queryClient: QueryClient,
@@ -60,7 +61,7 @@ export async function updateProfileWithAvatar(
   useAuthStore.getState().setUser(data);
 
   // If avatar was updated, refresh accountStore with cache-busted URL
-  if (updates.avatar && activeSessionId) {
+  if (typeof updates.avatar === 'string' && activeSessionId) {
     refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
   }