@oxy.so/services 11.2.0-oxy-one.3 → 11.2.0-oxy-one.5

package/src/ui/screens/SearchSettingsScreen.tsx

@@ -14,117 +14,119 @@ import { useCurrentUser } from '../hooks/queries/useAccountQueries';
 import type { User } from '@oxy.so/core';
 
 interface SearchSettings {
-    safeSearch: boolean;
-    searchPersonalization: boolean;
+  safeSearch: boolean;
+  searchPersonalization: boolean;
 }
 
-const SearchSettingsScreen: React.FC<BaseScreenProps> = ({
-    onClose,
-    goBack,
-}) => {
-    // Search settings are persisted on the ACTIVE account's profile (the
-    // org/project/bot when switched, else the personal user); reads/writes
-    // authenticate as the active session, which IS that account.
-    const { oxyServices, user } = useOxy();
-    const { t } = useI18n();
+const SearchSettingsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
+  // Search settings are persisted on the ACTIVE account's profile (the
+  // org/project/bot when switched, else the personal user); reads/writes
+  // authenticate as the active session, which IS that account.
+  const { oxyServices, user } = useOxy();
+  const { t } = useI18n();
 
-    useSurfaceHeader({ title: t('searchSettings.title') || 'Search Settings' });
-    const bloomTheme = useTheme();
+  useSurfaceHeader({ title: t('searchSettings.title') || 'Search Settings' });
+  const bloomTheme = useTheme();
 
-    // Use the existing useSettingToggles hook for toggle management
-    const { values: settings, toggle, savingKeys, setValues } = useSettingToggles<SearchSettings>({
-        initialValues: { safeSearch: false, searchPersonalization: true },
-        onSave: async (key, value) => {
-            if (!user?.id || !oxyServices) return;
+  // Use the existing useSettingToggles hook for toggle management
+  const {
+    values: settings,
+    toggle,
+    savingKeys,
+    setValues,
+  } = useSettingToggles<SearchSettings>({
+    initialValues: { safeSearch: false, searchPersonalization: true },
+    onSave: async (key, value) => {
+      if (!user?.id || !oxyServices) return;
 
-            const fieldMap: Record<keyof SearchSettings, string> = {
-                safeSearch: 'autoFilter',
-                searchPersonalization: 'dataSharing',
-            };
+      const fieldMap: Record<keyof SearchSettings, string> = {
+        safeSearch: 'autoFilter',
+        searchPersonalization: 'dataSharing',
+      };
 
-            await oxyServices.users.updateMe({
-                privacySettings: {
-                    [fieldMap[key]]: value,
-                },
-            });
+      await oxyServices.users.updateMe({
+        privacySettings: {
+          [fieldMap[key]]: value,
         },
-        errorMessage: (key) => t(`searchSettings.${key}.error`) || `Failed to update ${key}`,
-    });
-
-    const isSaving = savingKeys.size > 0;
+      });
+    },
+    errorMessage: (key) => t(`searchSettings.${key}.error`) || `Failed to update ${key}`,
+  });
 
-    // The profile comes from the shared React Query cache (the same entry every
-    // account surface reads), not a fetch of its own on every mount.
-    const currentUser = useCurrentUser({ enabled: Boolean(user?.id) });
-    const isLoading = Boolean(user?.id) && currentUser.isPending;
-    const privacySettings = (currentUser.data as (User & { privacySettings?: { autoFilter?: boolean; dataSharing?: boolean } }) | undefined)
-        ?.privacySettings;
-    useEffect(() => {
-        if (!privacySettings) return;
-        setValues({
-            safeSearch: privacySettings.autoFilter ?? false,
-            searchPersonalization: privacySettings.dataSharing ?? true,
-        });
-    }, [privacySettings, setValues]);
+  const isSaving = savingKeys.size > 0;
 
-    if (isLoading) {
-        return (
-            <>
-                <Loading size="lg" color={bloomTheme.colors.text} />
-            </>
-        );
-    }
+  // The profile comes from the shared React Query cache (the same entry every
+  // account surface reads), not a fetch of its own on every mount.
+  const currentUser = useCurrentUser({ enabled: Boolean(user?.id) });
+  const isLoading = Boolean(user?.id) && currentUser.isPending;
+  const privacySettings = (
+    currentUser.data as
+      | (User & { privacySettings?: { autoFilter?: boolean; dataSharing?: boolean } })
+      | undefined
+  )?.privacySettings;
+  useEffect(() => {
+    if (!privacySettings) return;
+    setValues({
+      safeSearch: privacySettings.autoFilter ?? false,
+      searchPersonalization: privacySettings.dataSharing ?? true,
+    });
+  }, [privacySettings, setValues]);
 
+  if (isLoading) {
     return (
-        <>
+      <>
+        <Loading size="lg" color={bloomTheme.colors.text} />
+      </>
+    );
+  }
 
-            <View className="px-screen-margin pb-space-24">
-                    {/* SafeSearch */}
-                    <SettingsListGroup title={t('searchSettings.safeSearch.title') || 'SafeSearch'}>
-                        <SettingsListItem
-                            icon={
-                                <SettingsIcon
-                                    name="shield-search"
-                                    color={bloomTheme.colors.success}
-                                />
-                            }
-                            title={t('searchSettings.safeSearch.label') || 'Enable SafeSearch'}
-                            description={t('searchSettings.safeSearch.description') || 'Filter out explicit content from search results'}
-                            rightElement={
-                                <Switch
-                                    checked={settings.safeSearch}
-                                    onCheckedChange={() => toggle('safeSearch')}
-                                    disabled={isSaving}
-                                />
-                            }
-                            showChevron={false}
-                        />
-                    </SettingsListGroup>
+  return (
+    <>
+      <View className="px-screen-margin pb-space-24">
+        {/* SafeSearch */}
+        <SettingsListGroup title={t('searchSettings.safeSearch.title') || 'SafeSearch'}>
+          <SettingsListItem
+            icon={<SettingsIcon name="shield-search" color={bloomTheme.colors.success} />}
+            title={t('searchSettings.safeSearch.label') || 'Enable SafeSearch'}
+            description={
+              t('searchSettings.safeSearch.description') ||
+              'Filter out explicit content from search results'
+            }
+            rightElement={
+              <Switch
+                checked={settings.safeSearch}
+                onCheckedChange={() => toggle('safeSearch')}
+                disabled={isSaving}
+              />
+            }
+            showChevron={false}
+          />
+        </SettingsListGroup>
 
-                    {/* Search Personalization */}
-                    <SettingsListGroup title={t('searchSettings.personalization.title') || 'Search Personalization'}>
-                        <SettingsListItem
-                            icon={
-                                <SettingsIcon
-                                    name="account-search"
-                                    color={bloomTheme.colors.primary}
-                                />
-                            }
-                            title={t('searchSettings.personalization.label') || 'Personalized Search'}
-                            description={t('searchSettings.personalization.description') || 'Use your activity to improve search results'}
-                            rightElement={
-                                <Switch
-                                    checked={settings.searchPersonalization}
-                                    onCheckedChange={() => toggle('searchPersonalization')}
-                                    disabled={isSaving}
-                                />
-                            }
-                            showChevron={false}
-                        />
-                    </SettingsListGroup>
-                </View>
-        </>
-    );
+        {/* Search Personalization */}
+        <SettingsListGroup
+          title={t('searchSettings.personalization.title') || 'Search Personalization'}
+        >
+          <SettingsListItem
+            icon={<SettingsIcon name="account-search" color={bloomTheme.colors.primary} />}
+            title={t('searchSettings.personalization.label') || 'Personalized Search'}
+            description={
+              t('searchSettings.personalization.description') ||
+              'Use your activity to improve search results'
+            }
+            rightElement={
+              <Switch
+                checked={settings.searchPersonalization}
+                onCheckedChange={() => toggle('searchPersonalization')}
+                disabled={isSaving}
+              />
+            }
+            showChevron={false}
+          />
+        </SettingsListGroup>
+      </View>
+    </>
+  );
 };
 
 export default React.memo(SearchSettingsScreen);

package/src/ui/screens/UserLinksScreen.tsx

@@ -8,56 +8,61 @@ import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 
 interface UserLinksScreenProps extends BaseScreenProps {
-    userId: string;
-    links?: Array<{
-        url: string;
-        title?: string;
-        description?: string;
-        image?: string;
-        id: string;
-    }>;
+  userId: string;
+  links?: Array<{
+    url: string;
+    title?: string;
+    description?: string;
+    image?: string;
+    id: string;
+  }>;
 }
 
 const UserLinksScreen: React.FC<UserLinksScreenProps> = ({
-    userId,
-    links = [],
-    theme,
-    goBack,
-    navigate
+  userId,
+  links = [],
+  theme,
+  goBack,
+  navigate,
 }) => {
-    const bloomTheme = useTheme();
-    const { t } = useI18n();
+  const bloomTheme = useTheme();
+  const { t } = useI18n();
 
-    useSurfaceHeader({ title: t('userLinks.title'), subtitle: links.length !== 1 ? t('userLinks.linkCount_plural', { count: links.length }) : t('userLinks.linkCount', { count: links.length }) });
+  useSurfaceHeader({
+    title: t('userLinks.title'),
+    subtitle:
+      links.length !== 1
+        ? t('userLinks.linkCount_plural', { count: links.length })
+        : t('userLinks.linkCount', { count: links.length }),
+  });
 
-    const handleLinkPress = async (url: string) => {
-        try {
-            await Linking.openURL(url);
-        } catch (error) {
-            if (__DEV__) {
-                console.error('Error opening link:', error);
-            }
-        }
-    };
+  const handleLinkPress = async (url: string) => {
+    try {
+      await Linking.openURL(url);
+    } catch (error) {
+      if (__DEV__) {
+        console.error('Error opening link:', error);
+      }
+    }
+  };
 
-    return (
-        <>
-
-            <View className="px-screen-margin pb-space-24">
-                    <SettingsListGroup title={t('userLinks.title')}>
-                        {links.map((link) => (
-                            <SettingsListItem
-                                key={link.id}
-                                icon={<SettingsIcon name="link" color={bloomTheme.colors.success} />}
-                                title={link.title || link.url}
-                                description={link.description || link.url}
-                                onPress={() => handleLinkPress(link.url)}
-                            />
-                        ))}
-                    </SettingsListGroup>
-                </View>
-        </>
-    );
+  return (
+    <>
+      <View className="px-screen-margin pb-space-24">
+        <SettingsListGroup title={t('userLinks.title')}>
+          {links.map((link) => (
+            <SettingsListItem
+              key={link.id}
+              icon={<SettingsIcon name="link" color={bloomTheme.colors.success} />}
+              title={link.title || link.url}
+              description={link.description || link.url}
+              onPress={() => handleLinkPress(link.url)}
+            />
+          ))}
+        </SettingsListGroup>
+      </View>
+    </>
+  );
 };
 
 export default UserLinksScreen;

package/src/ui/screens/UserListScreen.tsx

@@ -1,12 +1,6 @@
 import type React from 'react';
 import { useEffect, useState, useCallback } from 'react';
-import {
-  View,
-  StyleSheet,
-  ActivityIndicator,
-  FlatList,
-  RefreshControl,
-} from 'react-native';
+import { View, StyleSheet, ActivityIndicator, FlatList, RefreshControl } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
 import { useTheme } from '@oxy.so/bloom/theme';
 import { H6, Text } from '@oxy.so/bloom/typography';
@@ -40,7 +34,7 @@ const ERROR_ICON_SIZE = 48;
 
 /**
  * Resolve a user's id from the canonical `id` field, falling back to the
- * Mongo `_id` exposed via `User`'s index signature — narrowed with a `typeof`
+ * raw `_id` exposed via `User`'s index signature — narrowed with a `typeof`
  * guard so we never reach for a cast.
  */
 const resolveUserId = (user: User): string =>
@@ -90,12 +84,20 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
         let hasMore: boolean;
 
         if (mode === 'followers') {
-          const result = await oxyServices.follows.followers(userId, { limit: PAGE_SIZE, offset, sort });
+          const result = await oxyServices.follows.followers(userId, {
+            limit: PAGE_SIZE,
+            offset,
+            sort,
+          });
           newUsers = result.followers;
           total = result.total;
           hasMore = result.hasMore;
         } else {
-          const result = await oxyServices.follows.following(userId, { limit: PAGE_SIZE, offset, sort });
+          const result = await oxyServices.follows.following(userId, {
+            limit: PAGE_SIZE,
+            offset,
+            sort,
+          });
           newUsers = result.following;
           total = result.total;
           hasMore = result.hasMore;
@@ -110,9 +112,13 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
         setTotal(total);
         setHasMore(hasMore);
       } catch (err) {
-        logger.error(`Failed to fetch ${mode}`, err instanceof Error ? err : new Error(String(err)), {
-          component: 'UserListScreen',
-        });
+        logger.error(
+          `Failed to fetch ${mode}`,
+          err instanceof Error ? err : new Error(String(err)),
+          {
+            component: 'UserListScreen',
+          },
+        );
         setError(`Failed to load ${mode}. Please try again.`);
       } finally {
         setIsLoading(false);
@@ -123,7 +129,7 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
     // `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]
+    [userId, mode, sort, oxyServices],
   );
 
   useEffect(() => {
@@ -147,7 +153,7 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
         navigate('Profile', { userId: targetUserId });
       }
     },
-    [navigate]
+    [navigate],
   );
 
   const renderUser = useCallback(
@@ -160,23 +166,37 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
 
       return (
         <View className="px-screen-margin flex-row items-center gap-space-12">
-          <ContactRow id={itemUserId || displayName} name={displayName}
+          <ContactRow
+            id={itemUserId || displayName}
+            name={displayName}
             subtitle={handle ? (item.username ? `@${handle}` : handle) : undefined}
             avatar={item.avatar ? oxyServices.assets.publicUrl(item.avatar, 'thumb') : undefined}
-            horizontalInset={0} style={{ flex: 1 }}
+            horizontalInset={0}
+            style={{ flex: 1 }}
             onPress={() => handleUserPress(item)}
-            identitySlot={<View style={styles.userInfo}>
-              <Text variant="body-medium" numberOfLines={1}>{displayName}</Text>
-              {handle ? <Text className="text-text-secondary text-sm mt-space-2" numberOfLines={1}>
-                {item.username ? `@${handle}` : handle}
-              </Text> : null}
-              {description ? <Text className="text-text-secondary text-sm mt-space-4" numberOfLines={2}>{description}</Text> : null}
-            </View>} />
+            identitySlot={
+              <View style={styles.userInfo}>
+                <Text variant="body-medium" numberOfLines={1}>
+                  {displayName}
+                </Text>
+                {handle ? (
+                  <Text className="text-text-secondary text-sm mt-space-2" numberOfLines={1}>
+                    {item.username ? `@${handle}` : handle}
+                  </Text>
+                ) : null}
+                {description ? (
+                  <Text className="text-text-secondary text-sm mt-space-4" numberOfLines={2}>
+                    {description}
+                  </Text>
+                ) : null}
+              </View>
+            }
+          />
           {!isCurrentUser && itemUserId ? <FollowButton userId={itemUserId} size="sm" /> : null}
         </View>
       );
     },
-    [handleUserPress, currentUserId, oxyServices]
+    [handleUserPress, currentUserId, oxyServices],
   );
 
   const renderEmpty = useCallback(() => {
@@ -195,8 +215,10 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
         </H6>
         <Text className="text-text-secondary text-sm text-center">
           {mode === 'followers'
-            ? t('userList.noFollowersDesc') || 'When people follow this user, they will appear here.'
-            : t('userList.noFollowingDesc') || 'When this user follows people, they will appear here.'}
+            ? t('userList.noFollowersDesc') ||
+              'When people follow this user, they will appear here.'
+            : t('userList.noFollowingDesc') ||
+              'When this user follows people, they will appear here.'}
         </Text>
       </View>
     );
@@ -211,9 +233,10 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
     );
   }, [isLoadingMore, bloomTheme]);
 
-  const title = mode === 'followers'
-    ? (t('userList.followers') || 'Followers')
-    : (t('userList.following') || 'Following');
+  const title =
+    mode === 'followers'
+      ? t('userList.followers') || 'Followers'
+      : t('userList.following') || 'Following';
 
   const headerSubtitle = total > 0 ? String(total) : undefined;
   useSurfaceHeader({ title, subtitle: headerSubtitle });