@oxyhq/services 26.0.1 → 26.0.4

package/src/ui/screens/FileManagementScreen.tsx

@@ -14,7 +14,7 @@ import {
 import { useQueryClient } from '@tanstack/react-query';
 import { Image as ExpoImage } from 'expo-image';
 import type { FileManagementScreenProps } from '../types/fileManagement';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import { surfaces } from '@oxyhq/bloom/surfaces';
 import * as Skeleton from '@oxyhq/bloom/skeleton';
 import Ionicons from '@expo/vector-icons/Ionicons';

package/src/ui/screens/FollowersListScreen.tsx

@@ -1,10 +1,13 @@
 import type React from 'react';
+import type { FollowGraphSort } from '@oxyhq/core';
 import type { BaseScreenProps } from '../types/navigation';
 import UserListScreen from './UserListScreen';
 
 interface FollowersListScreenProps extends BaseScreenProps {
   userId: string;
   initialCount?: number;
+  /** List ordering — see `UserListScreen`. Omitted ⇒ the server default. */
+  sort?: FollowGraphSort;
 }
 
 const FollowersListScreen: React.FC<FollowersListScreenProps> = (props) => {

package/src/ui/screens/FollowingListScreen.tsx

@@ -1,10 +1,13 @@
 import type React from 'react';
+import type { FollowGraphSort } from '@oxyhq/core';
 import type { BaseScreenProps } from '../types/navigation';
 import UserListScreen from './UserListScreen';
 
 interface FollowingListScreenProps extends BaseScreenProps {
   userId: string;
   initialCount?: number;
+  /** List ordering — see `UserListScreen`. Omitted ⇒ the server default. */
+  sort?: FollowGraphSort;
 }
 
 const FollowingListScreen: React.FC<FollowingListScreenProps> = (props) => {

package/src/ui/screens/HelpSupportScreen.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { View, Linking } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { SettingsIcon } from '../components/SettingsIcon';

package/src/ui/screens/HistoryViewScreen.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useCallback } from 'react';
 import { View } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import { Loading } from '@oxyhq/bloom/loading';
 import { Text } from '@oxyhq/bloom/typography';
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';
@@ -11,6 +11,7 @@ import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { useOxy } from '../context/OxyContext';
 import { surfaces } from '@oxyhq/bloom/surfaces';
+import { createPlatformStorage } from '../utils/storageHelpers';
 
 interface HistoryItem { id: string; query: string; type: 'search' | 'browse'; timestamp: Date; }
 
@@ -26,27 +27,11 @@ const HistoryViewScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
     const [isLoading, setIsLoading] = useState(true);
     const [isDeleting, setIsDeleting] = useState(false);
 
-    const getStorage = async () => {
-        const isRN = typeof navigator !== 'undefined' && navigator.product === 'ReactNative';
-        if (isRN) {
-            try {
-                const mod = await import('@react-native-async-storage/async-storage');
-                const s = mod.default as unknown as { getItem: (k: string) => Promise<string | null>; setItem: (k: string, v: string) => Promise<void>; removeItem: (k: string) => Promise<void> };
-                return { getItem: s.getItem.bind(s), setItem: s.setItem.bind(s), removeItem: s.removeItem.bind(s) };
-            } catch (e) { if (__DEV__) console.error('AsyncStorage not available:', e); throw new Error('AsyncStorage required'); }
-        }
-        return {
-            getItem: async (k: string) => typeof window !== 'undefined' && window.localStorage ? window.localStorage.getItem(k) : null,
-            setItem: async (k: string, v: string) => { if (typeof window !== 'undefined' && window.localStorage) window.localStorage.setItem(k, v); },
-            removeItem: async (k: string) => { if (typeof window !== 'undefined' && window.localStorage) window.localStorage.removeItem(k); },
-        };
-    };
-
     React.useEffect(() => {
         const load = async () => {
             try {
                 setIsLoading(true);
-                const storage = await getStorage();
+                const storage = await createPlatformStorage();
                 const stored = await storage.getItem(`history_${user?.id || 'guest'}`);
                 if (stored) { const parsed = JSON.parse(stored); setHistory(parsed.map((i: HistoryItem) => ({ ...i, timestamp: new Date(i.timestamp) }))); }
                 else setHistory([]);
@@ -69,7 +54,7 @@ const HistoryViewScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
             const cutoff = new Date(Date.now() - 15 * 60 * 1000);
             const filtered = history.filter(item => item.timestamp < cutoff);
             setHistory(filtered);
-            const storage = await getStorage();
+            const storage = await createPlatformStorage();
             await storage.setItem(`history_${user?.id || 'guest'}`, JSON.stringify(filtered));
             toast.success(t('history.deleteLast15Minutes.success') || 'Last 15 minutes deleted');
         } catch (e) { if (__DEV__) console.error('Failed to delete history:', e); toast.error(t('history.deleteLast15Minutes.error') || 'Failed to delete history'); }
@@ -87,7 +72,7 @@ const HistoryViewScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
         if (!confirmed) return;
         try {
             setIsDeleting(true); setHistory([]);
-            const storage = await getStorage();
+            const storage = await createPlatformStorage();
             await storage.removeItem(`history_${user?.id || 'guest'}`);
             toast.success(t('history.clearAll.success') || 'History cleared');
         } catch (e) { if (__DEV__) console.error('Failed to clear history:', e); toast.error(t('history.clearAll.error') || 'Failed to clear history'); }

package/src/ui/screens/LanguageSelectorScreen.tsx

@@ -3,7 +3,7 @@ import { View, StyleSheet, TouchableOpacity } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
 import { useTheme } from '@oxyhq/bloom/theme';
 import Ionicons from '@expo/vector-icons/Ionicons';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import { Text } from '@oxyhq/bloom/typography';
 import { Search } from '@oxyhq/bloom/search';
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';

package/src/ui/screens/LegalDocumentsScreen.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react';
 import { View, Linking } from 'react-native';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';
 import { logger } from '@oxyhq/core';

package/src/ui/screens/ManageAccountScreen.tsx

@@ -7,7 +7,7 @@ import {
     Platform,
 } from 'react-native';
 import Ionicons from '@expo/vector-icons/Ionicons';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import { surfaces } from '@oxyhq/bloom/surfaces';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { Text } from '@oxyhq/bloom/typography';
@@ -15,6 +15,7 @@ import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list'
 import {
     getAccountDisplayName,
     getAccountFallbackHandle,
+    getNormalizedUserHandle,
     logger as loggerUtil,
     packageInfo,
 } from '@oxyhq/core';
@@ -120,7 +121,13 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
     const [signingOutAllDevices, setSigningOutAllDevices] = useState(false);
     const [signingOut, setSigningOut] = useState(false);
 
-    const displayName = useMemo(() => getAccountDisplayName(user, locale), [user, locale]);
+    const displayName = useMemo(
+        () =>
+            user?.name?.displayName ??
+            getNormalizedUserHandle(user) ??
+            getAccountDisplayName(null, locale),
+        [user, locale],
+    );
     const handle = useMemo(() => getAccountFallbackHandle(user), [user]);
     const avatarUri = useMemo(() => {
         return user?.avatar

package/src/ui/screens/PremiumSubscriptionScreen.tsx

@@ -2,7 +2,7 @@ import type React from 'react';
 import { useState, useEffect, useCallback } from 'react';
 import { View, ScrollView, ActivityIndicator } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import { surfaces } from '@oxyhq/bloom/surfaces';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { Button } from '@oxyhq/bloom/button';
@@ -343,7 +343,7 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
         if (currentAppPackage) {
             loadSubscriptionData();
         }
-    }, [currentAppPackage, user?.isPremium]);
+    }, [currentAppPackage]);
 
     const detectCurrentApp = () => {
         const detectedApp = 'mention';
@@ -741,9 +741,9 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
                 </View>
 
                 <BenefitList className="mb-space-24">
-                    {plan.features.map((feature, index) => (
+                    {plan.features.map((feature) => (
                         <BenefitRow
-                            key={index}
+                            key={feature}
                             icon={<Ionicons name="checkmark" size={18} color={colors.success} />}
                             label={feature}
                         />

package/src/ui/screens/PrivacySettingsScreen.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useCallback, useEffect } from 'react';
 import { View } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';
 import { Switch } from '@oxyhq/bloom/switch';
 import { Button } from '@oxyhq/bloom/button';
@@ -14,7 +14,7 @@ import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 import { useSettingToggles } from '../hooks/useSettingToggle';
 import type { BlockedUser, RestrictedUser } from '@oxyhq/core';
-import { getAccountDisplayName } from '@oxyhq/core';
+import { getNormalizedUserHandle } from '@oxyhq/core';
 import { useOxy } from '../context/OxyContext';
 
 interface PrivacySettings {
@@ -68,7 +68,7 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
     // Privacy settings belong to the ACTIVE account (the org/project/bot when
     // switched, else the personal user).
     const { oxyServices, user } = useOxy();
-    const { t, locale } = useI18n();
+    const { t } = useI18n();
 
     useSurfaceHeader({ title: t('privacySettings.title') || 'Privacy Settings' });
     const bloomTheme = useTheme();
@@ -114,6 +114,7 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
     }, [user?.id, oxyServices, t, setValues]);
 
     // Load blocked and restricted users
+    // biome-ignore lint/correctness/useExhaustiveDependencies: reload when active account switches
     useEffect(() => {
         const loadUsers = async () => {
             if (!oxyServices) return;
@@ -175,35 +176,37 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
     }, [oxyServices, t]);
 
     // Helper to extract user info from blocked/restricted objects.
-    // Display names go through the canonical helper so the fallback chain is
-    // identical across every UI surface (name → username → publicKey → "Unnamed").
     const extractUserInfo = useCallback((
         item: BlockedUser | RestrictedUser,
         idField: 'blockedId' | 'restrictedId'
     ) => {
-        let userIdField: string | { _id: string; username?: string; avatar?: string };
-        let userShape: { username?: string };
+        let userIdField: string | { _id: string; username?: string; avatar?: string; name?: { displayName?: string } };
+        let userShape: { username?: string; name?: { displayName?: string } };
         let avatar: string | undefined;
 
         if (idField === 'blockedId' && 'blockedId' in item) {
             userIdField = item.blockedId;
             userShape = typeof item.blockedId === 'string'
                 ? { username: item.username }
-                : { username: item.blockedId.username };
+                : { username: item.blockedId.username, name: item.blockedId.name };
             avatar = typeof item.blockedId === 'string' ? item.avatar : item.blockedId.avatar;
         } else if (idField === 'restrictedId' && 'restrictedId' in item) {
             userIdField = item.restrictedId;
             userShape = typeof item.restrictedId === 'string'
                 ? { username: item.username }
-                : { username: item.restrictedId.username };
+                : { username: item.restrictedId.username, name: item.restrictedId.name };
             avatar = typeof item.restrictedId === 'string' ? item.avatar : item.restrictedId.avatar;
         } else {
-            return { userId: '', displayName: getAccountDisplayName(null, locale), avatar: undefined };
+            return { userId: '', displayName: getNormalizedUserHandle(null) ?? '', avatar: undefined };
         }
 
         const userId = typeof userIdField === 'string' ? userIdField : userIdField._id;
-        return { userId, displayName: getAccountDisplayName(userShape, locale), avatar };
-    }, [locale]);
+        return {
+            userId,
+            displayName: userShape.name?.displayName ?? getNormalizedUserHandle(userShape) ?? '',
+            avatar,
+        };
+    }, []);
 
     if (isLoading) {
         return (

package/src/ui/screens/ProfileScreen.tsx

@@ -14,7 +14,7 @@ import Ionicons from '@expo/vector-icons/Ionicons';
 import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 import { useOxy } from '../context/OxyContext';
-import { getAccountDisplayName, logger, normalizeProfileLinks } from '@oxyhq/core';
+import { getNormalizedUserHandle, logger, normalizeProfileLinks } from '@oxyhq/core';
 import { extractErrorMessage } from '../utils/errorHandlers';
 
 interface ProfileScreenProps extends BaseScreenProps {
@@ -42,7 +42,7 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
     } = useFollow(userId);
 
     const bloomTheme = useTheme();
-    const { t, locale } = useI18n();
+    const { t } = useI18n();
 
     // Check if current user is viewing their own profile
     // Normalize IDs by trimming whitespace to handle format mismatches
@@ -78,7 +78,9 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
                     );
                     throw err;
                 }),
-                oxyServices.getReputationBalance(userId)
+                (isOwnProfile
+                    ? oxyServices.getMyReputationBalance()
+                    : oxyServices.getReputationBalance(userId))
                     .then((balance): { total: number | undefined } => ({ total: balance.total }))
                     .catch((): { total: number | undefined } => ({ total: undefined })),
                 oxyServices.getUserStats
@@ -133,7 +135,14 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
     // title (a stable "Profile" fallback before it resolves), so the banner +
     // overlapping avatar scroll as content UNDER the shared gradient nav bar.
     // `onImage` tone keeps the title + close legible over the colored banner.
-    const displayName = profile ? getAccountDisplayName(profile, locale) : username || '';
+    // Ends in a string, deliberately: `getNormalizedUserHandle` answers `null` for a
+    // user it cannot normalise, and letting that null travel makes this `string | null`
+    // — which does not satisfy `Avatar.name` and does not typecheck. Empty is the honest
+    // bottom of the chain and every reader below already treats it as falsy
+    // (`displayName || t('profile.title')`), so nothing renders a literal "null".
+    const displayName = profile
+        ? (profile.name?.displayName ?? getNormalizedUserHandle(profile) ?? '')
+        : username || '';
     useSurfaceHeader({
         title: displayName || t('profile.title'),
         largeTitle: false,
@@ -187,8 +196,17 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
                 <View style={styles.avatarRow} className="px-screen-margin">
                     <View style={styles.avatarWrapper} className="border-bg bg-bg rounded-radius-max">
                         <Avatar
-                            source={profile?.avatar ? oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') : undefined}
-                            name={displayName || username}
+                            // `getFileDownloadUrl` answers `null` for a reference it cannot
+                            // resolve, and `Avatar.source` takes `undefined` for "no picture" —
+                            // the two spellings of absent do not meet, so the coalesce is the
+                            // whole fix. Without it this file does not typecheck, which blocks
+                            // `bun run build` and therefore every publish of this package.
+                            source={
+                                profile?.avatar
+                                    ? (oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') ?? undefined)
+                                    : undefined
+                            }
+                            name={displayName}
                             size={AVATAR_SIZE}
                         />
                     </View>

package/src/ui/screens/SavesCollectionsScreen.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { View } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import {
     SegmentedControl,
     SegmentedControlItem,

package/src/ui/screens/UserListScreen.tsx

@@ -18,8 +18,8 @@ import Ionicons from '@expo/vector-icons/Ionicons';
 import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 import { useOxy } from '../context/OxyContext';
-import { logger, getAccountDisplayName, getAccountFallbackHandle } from '@oxyhq/core';
-import type { User } from '@oxyhq/core';
+import { logger, getNormalizedUserHandle, getAccountFallbackHandle } from '@oxyhq/core';
+import type { User, FollowGraphSort } from '@oxyhq/core';
 
 type ListMode = 'followers' | 'following';
 
@@ -27,6 +27,12 @@ interface UserListScreenProps extends BaseScreenProps {
   userId: string;
   mode: ListMode;
   initialCount?: number;
+  /**
+   * Ordering of the list — `recent` (newest follow first) or `oldest`.
+   * Omitted ⇒ the server default (`recent`). Changing it re-fetches from
+   * offset 0, since a page boundary is meaningless across two orderings.
+   */
+  sort?: FollowGraphSort;
 }
 
 const PAGE_SIZE = 20;
@@ -46,6 +52,7 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
   userId,
   mode,
   initialCount,
+  sort,
   navigate,
 }) => {
   const { oxyServices, user: currentUser } = useOxy();
@@ -58,7 +65,7 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
   const [hasMore, setHasMore] = useState(true);
 
   const bloomTheme = useTheme();
-  const { t, locale } = useI18n();
+  const { t } = useI18n();
 
   const currentUserId = currentUser ? resolveUserId(currentUser) : '';
 
@@ -85,12 +92,12 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
         let hasMore: boolean;
 
         if (mode === 'followers') {
-          const result = await oxyServices.getUserFollowers(userId, { limit: PAGE_SIZE, offset });
+          const result = await oxyServices.getUserFollowers(userId, { limit: PAGE_SIZE, offset, sort });
           newUsers = result.followers;
           total = result.total;
           hasMore = result.hasMore;
         } else {
-          const result = await oxyServices.getUserFollowing(userId, { limit: PAGE_SIZE, offset });
+          const result = await oxyServices.getUserFollowing(userId, { limit: PAGE_SIZE, offset, sort });
           newUsers = result.following;
           total = result.total;
           hasMore = result.hasMore;
@@ -115,7 +122,10 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
         setIsRefreshing(false);
       }
     },
-    [userId, mode, oxyServices]
+    // `sort` belongs here: without it the callback would close over the first
+    // ordering forever, and the mount effect below (keyed on `fetchUsers`)
+    // would never re-run — flipping the control would change nothing.
+    [userId, mode, sort, oxyServices]
   );
 
   useEffect(() => {
@@ -147,7 +157,7 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
       const itemUserId = resolveUserId(item);
       const isCurrentUser = itemUserId === currentUserId;
       const description = typeof item.description === 'string' ? item.description : '';
-      const displayName = getAccountDisplayName(item, locale);
+      const displayName = item.name?.displayName ?? getNormalizedUserHandle(item) ?? '';
       const handle = getAccountFallbackHandle(item);
 
       return (
@@ -189,7 +199,7 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
         </TouchableOpacity>
       );
     },
-    [handleUserPress, currentUserId, oxyServices, locale]
+    [handleUserPress, currentUserId, oxyServices]
   );
 
   const renderEmpty = useCallback(() => {

package/src/ui/screens/WelcomeNewUserScreen.tsx

@@ -4,7 +4,7 @@ import { View, StyleSheet, Platform, Animated } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
 import { Avatar } from '@oxyhq/bloom/avatar';
 import Ionicons from '@expo/vector-icons/Ionicons';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { Button } from '@oxyhq/bloom/button';
 import { H1, Text } from '@oxyhq/bloom/typography';
@@ -13,7 +13,7 @@ import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 import { useOxy } from '../context/OxyContext';
 import { useUpdateProfile } from '../hooks/mutations/useAccountMutations';
-import { getAccountDisplayName, type User } from '@oxyhq/core';
+import { getNormalizedUserHandle, type User } from '@oxyhq/core';
 
 const GAP = 12;
 const INNER_GAP = 8;
@@ -63,10 +63,10 @@ const WelcomeNewUserScreen: React.FC<BaseScreenProps & { newUser?: User }> = ({
         ? oxyServices.getFileDownloadUrl(currentUser.avatar, 'thumb')
         : undefined;
 
-    // Steps content. Use the canonical helper so partially-onboarded accounts
-    // (publicKey only) still get a friendly greeting instead of a blank one.
-    const welcomeName = getAccountDisplayName(currentUser ?? null, locale);
-    const welcomeTitle = currentUser
+    // API DTO contract: explicit displayName, else the normalized handle.
+    const welcomeName =
+        currentUser?.name?.displayName ?? getNormalizedUserHandle(currentUser) ?? '';
+    const welcomeTitle = currentUser && welcomeName
         ? (t('welcomeNew.welcome.titleWithName', { username: welcomeName }) || `Welcome, ${welcomeName} 👋`)
         : (t('welcomeNew.welcome.title') || 'Welcome 👋');
     // Only ask the user for their name during onboarding when they don't have a

package/src/ui/screens/fileManagement/PhotoPickerSection.tsx

@@ -551,8 +551,8 @@ const PhotoPickerView: React.FC<PhotoPickerViewProps> = ({
                         importantForAccessibility="no-hide-descendants"
                     >
                         {Array.from({ length: skeletonTileCount }, (_, index) => (
-                            // biome-ignore lint/suspicious/noArrayIndexKey: fixed-size skeleton grid, order never changes
                             <Skeleton.Box
+                                // biome-ignore lint/suspicious/noArrayIndexKey: fixed-size skeleton grid, order never changes
                                 key={`skeleton-${index}`}
                                 width={cellSize}
                                 height={cellSize}

package/src/ui/screens/fileManagement/hooks/useFileUploadState.ts

@@ -1,7 +1,7 @@
 import type React from 'react';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
-import { toast } from '@oxyhq/bloom';
+import { toast } from '@oxyhq/bloom/toast';
 import type { AssetUploadInput, FileMetadata } from '@oxyhq/core';
 import type { useUploadFile } from '../../../hooks/mutations/useAccountMutations';
 import { queryKeys } from '../../../hooks/queries/queryKeys';
@@ -411,7 +411,11 @@ export const useFileUploadState = ({
         }
     };
 
-    const handleCancelUpload = () => {
+    // Memoized because the orchestrator builds the upload-preview header's back
+    // NODE from it (`fmHeaderBack`): a node can only be compared by identity, so
+    // a fresh closure here re-creates the node every render and thrashes the
+    // surface-header bridge into an unbounded update loop (React error #185).
+    const handleCancelUpload = useCallback(() => {
         clearPostSelectTimer();
 
         // Cleanup preview URLs
@@ -420,7 +424,7 @@ export const useFileUploadState = ({
         }
         setPendingFiles([]);
         setShowUploadPreview(false);
-    };
+    }, [clearPostSelectTimer, pendingFiles]);
 
     const removePendingFile = (id: string) => {
         const file = pendingFiles.find((pf) => pf.id === id);
@@ -438,8 +442,13 @@ export const useFileUploadState = ({
     /**
      * Handle file upload - opens document picker and processes selected files
      * Expo 54 compatible - works on web, iOS, and Android
+     *
+     * Memoized because the orchestrator feeds it to the picker header's
+     * `primaryAction` (the Upload CTA) through a `useMemo`: a fresh closure each
+     * render invalidates that memo every render, which is the input the
+     * surface-header bridge is guarding against.
      */
-    const handleFileUpload = async () => {
+    const handleFileUpload = useCallback(async () => {
         // Prevent concurrent document picker calls
         if (isPickingDocument) {
             toast.error(t('fileManagement.toasts.waitForSelection'));
@@ -538,7 +547,7 @@ export const useFileUploadState = ({
             // Always reset the picking state, even if there was an error
             setIsPickingDocument(false);
         }
-    };
+    }, [isPickingDocument, imagesOnly, handleFileSelection, t]);
 
     return {
         isPickingDocument,

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

@@ -1,7 +1,7 @@
 import type React from 'react';
 import { useEffect, useMemo, useState } from 'react';
 import { View, StyleSheet } from 'react-native';
-import type { ReputationTransaction, TrustTier } from '@oxyhq/core';
+import type { ReputationTransaction, TrustTier } from '@oxyhq/contracts';
 import Ionicons from '@expo/vector-icons/Ionicons';
 import { Chip } from '@oxyhq/bloom/chip';
 import { useTheme } from '@oxyhq/bloom/theme';
@@ -36,7 +36,7 @@ const TrustCenterScreen: React.FC<BaseScreenProps> = ({
         setIsLoading(true);
         setError(null);
         Promise.all([
-            oxyServices.getReputationBalance(user.id),
+            oxyServices.getMyReputationBalance(),
             oxyServices.getReputationTransactions(user.id, 20, 0),
         ])
             .then(([balance, txns]) => {

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

@@ -7,8 +7,8 @@ import {
     FlatList,
     TouchableOpacity,
 } from 'react-native';
-import type { ReputationLeaderboardEntry } from '@oxyhq/core';
-import { getAccountDisplayName, logger } from '@oxyhq/core';
+import type { ReputationLeaderboardEntry } from '@oxyhq/contracts';
+import { getNormalizedUserHandle, logger } from '@oxyhq/core';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { H6, Text } from '@oxyhq/bloom/typography';
 import { Chip } from '@oxyhq/bloom/chip';
@@ -29,7 +29,7 @@ const PODIUM_RANK = 3;
 
 const TrustLeaderboardScreen: React.FC<BaseScreenProps> = ({ navigate }) => {
     const { oxyServices, user: currentUser } = useOxy();
-    const { t, locale } = useI18n();
+    const { t } = useI18n();
     const bloomTheme = useTheme();
 
     const [leaderboard, setLeaderboard] = useState<ReputationLeaderboardEntry[]>([]);
@@ -72,7 +72,8 @@ const TrustLeaderboardScreen: React.FC<BaseScreenProps> = ({ navigate }) => {
 
     const renderEntry = useCallback(
         ({ item }: { item: ReputationLeaderboardEntry }) => {
-            const displayName = getAccountDisplayName(item.user, locale);
+            const displayName =
+                item.user.name?.displayName ?? getNormalizedUserHandle(item.user) ?? '';
             const isViewer = currentUserId !== '' && item.user.id === currentUserId;
             const isPodium = item.rank <= PODIUM_RANK;
             // Viewer's own row and podium ranks get a subtle highlighted surface.
@@ -115,7 +116,7 @@ const TrustLeaderboardScreen: React.FC<BaseScreenProps> = ({ navigate }) => {
                 </TouchableOpacity>
             );
         },
-        [oxyServices, locale, currentUserId, handleEntryPress, t],
+        [oxyServices, currentUserId, handleEntryPress, t],
     );
 
     const keyExtractor = useCallback(

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

@@ -97,7 +97,7 @@ const TrustRewardsScreen: React.FC<BaseScreenProps> = () => {
             return;
         }
         setIsLoading(true);
-        oxyServices.getReputationBalance(user.id)
+        oxyServices.getMyReputationBalance()
             .then((balance) => {
                 setReputationTotal(balance.total || 0);
             })

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

@@ -4,7 +4,7 @@ import { View, Text } from 'react-native';
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';
 import { Chip } from '@oxyhq/bloom/chip';
 import { useTheme } from '@oxyhq/bloom/theme';
-import type { ReputationRule, ReputationCategory } from '@oxyhq/core';
+import type { ReputationRule, ReputationCategory } from '@oxyhq/contracts';
 import type { BaseScreenProps } from '../../types/navigation';
 import { useSurfaceHeader } from '../../hooks/useSurfaceHeader';
 import { Loading } from '@oxyhq/bloom/loading';

package/src/ui/screens/trust/trustTier.ts

@@ -1,4 +1,4 @@
-import type { TrustTier } from '@oxyhq/core';
+import type { TrustTier } from '@oxyhq/contracts';
 
 type Translate = (key: string, vars?: Record<string, string | number>) => string;