@oxy.so/services 6.2.0 → 8.1.0

package/src/ui/screens/ManageAccountScreen.tsx

@@ -14,7 +14,6 @@ import { useTheme } from '@oxy.so/bloom/theme';
 import { Text } from '@oxy.so/bloom/typography';
 import { SettingsListGroup, SettingsListItem } from '@oxy.so/bloom/settings-list';
 import {
-    AUTH_WEB_ORIGIN,
     getAccountDisplayName,
     getAccountFallbackHandle,
     getNormalizedUserHandle,
@@ -27,7 +26,6 @@ import ProfileSummaryCard from '../components/ProfileSummaryCard';
 import { SettingsIcon } from '../components/SettingsIcon';
 import { presentDeleteAccount } from '../components/modals/DeleteAccountModal';
 import { runAccountDeletionHandoff } from '../utils/accountDeletionHandoff';
-import { presentActionSheet } from '../components/surfaces/ActionSheetSurface';
 import { useOxy } from '../context/OxyContext';
 import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
@@ -130,7 +128,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
     const handle = useMemo(() => getAccountFallbackHandle(user), [user]);
     const avatarUri = useMemo(() => {
         return user?.avatar
-            ? oxyServices.getFileDownloadUrl(user.avatar, 'thumb')
+            ? oxyServices.assets.publicUrl(user.avatar, 'thumb')
             : undefined;
     }, [user?.avatar, oxyServices]);
 
@@ -178,7 +176,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
         }
         setRemovingDeviceId(device.sessionId);
         try {
-            await oxyServices.logoutSession(activeSessionId, device.sessionId);
+            await oxyServices.session.logout(activeSessionId, device.sessionId);
             await refetchDeviceSessions();
             toast.success(
                 t('manageAccount.toasts.deviceRemoved', { name: deviceSessionTitle(device, t) }),
@@ -212,7 +210,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
         }
         setSigningOutAllDevices(true);
         try {
-            await oxyServices.logoutAllDeviceSessions(activeSessionId);
+            await oxyServices.devices.logoutAll(activeSessionId);
             await refetchDeviceSessions();
             toast.success(
                 t('manageAccount.toasts.allDevicesSignedOut')
@@ -229,8 +227,10 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
         }
     }, [activeSessionId, signingOutAllDevices, deviceSessions, oxyServices, refetchDeviceSessions, t]);
 
-    const performDownload = useCallback(
-        async (format: 'json' | 'csv') => {
+    // The signed, open-format export (`GET /users/me/export`): one JSON bundle
+    // carrying Oxy's provenance attestation — the "credible exit" snapshot.
+    const handleDownloadData = useCallback(
+        async () => {
             if (!user) {
                 toast.error(
                     t('accountOverview.items.downloadData.error') || 'Service not available',
@@ -242,12 +242,13 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                     t('accountOverview.items.downloadData.downloading')
                     || 'Preparing download...',
                 );
-                const blob = await oxyServices.downloadAccountData(format);
+                const bundle = await oxyServices.identity.export();
                 if (Platform.OS === 'web') {
+                    const blob = new Blob([JSON.stringify(bundle, null, 2)], { type: 'application/json' });
                     const url = URL.createObjectURL(blob);
                     const link = document.createElement('a');
                     link.href = url;
-                    link.download = `account-data-${Date.now()}.${format}`;
+                    link.download = `oxy-export-${Date.now()}.json`;
                     document.body.appendChild(link);
                     link.click();
                     document.body.removeChild(link);
@@ -284,7 +285,8 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                     || 'Service not available',
                 );
             }
-            await oxyServices.deleteAccount(confirmText);
+            // Native deletion is signed with the identity key held on this device.
+            await oxyServices.users.deleteMe(confirmText, { deviceKey: true });
             toast.success(
                 t('accountOverview.items.deleteAccount.success')
                 || 'Account deleted successfully',
@@ -293,29 +295,6 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
         [oxyServices, user, t],
     );
 
-    const handleDownloadData = useCallback(async () => {
-        if (!user) {
-            toast.error(
-                t('accountOverview.items.downloadData.error') || 'Service not available',
-            );
-            return;
-        }
-        const format = await presentActionSheet<'json' | 'csv'>({
-            title: t('accountOverview.items.downloadData.confirmTitle') || 'Download account data',
-            message:
-                t('accountOverview.items.downloadData.confirmMessage')
-                || 'Choose the format for your account data export:',
-            options: [
-                { label: 'JSON', value: 'json' },
-                { label: 'CSV', value: 'csv' },
-            ],
-            cancelLabel: t('common.cancel') || 'Cancel',
-        });
-        if (format) {
-            await performDownload(format);
-        }
-    }, [user, t, performDownload]);
-
     const handleDeleteAccount = useCallback(async () => {
         if (!user) {
             toast.error(
@@ -323,12 +302,11 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
             );
             return;
         }
-        // Web: a passkey account confirms its deletion with its passkey, which
-        // only auth.oxy.so asserts — the deletion happens there, never on this page.
-        if (isWebBrowser()) {
-            await Linking.openURL(`${AUTH_WEB_ORIGIN}/delete-account`).catch(() => {
-                toast.error(t('accountSwitcher.linkOpenFailed'));
-            });
+        // An account without a key confirms its deletion with a code by email,
+        // right here; the panel also tells a keyed account on the web where its
+        // key is.
+        if (!user.publicKey || isWebBrowser()) {
+            navigate?.('DeleteAccount');
             return;
         }
         // Native: the deletion is signed with the identity key. When this app
@@ -353,7 +331,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
             await logout();
             onClose?.();
         }
-    }, [user, t, handleConfirmDelete, hasIdentity, logout, onClose]);
+    }, [user, t, handleConfirmDelete, hasIdentity, logout, onClose, navigate]);
 
     if (!isAuthenticated) {
         return (
@@ -598,23 +576,28 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                         }
                         onPress={() => navigate?.('PrivacySettings')}
                     />
-                    <SettingsListItem
-                        icon={
-                            <SettingsIcon
-                                name="star"
-                                color={bloomTheme.colors.warning}
+                    {user && !user.publicKey ? (
+                        <>
+                            <SettingsListItem
+                                icon={<SettingsIcon name="key" color={bloomTheme.colors.primary} />}
+                                title={t('signInSecurity.password.title')}
+                                description={t('signInSecurity.password.row')}
+                                onPress={() => navigate?.('SignInPassword')}
                             />
-                        }
-                        title={
-                            t('accountOverview.items.premium.title') || 'Oxy+'
-                        }
-                        description={
-                            user?.isPremium
-                                ? (t('accountOverview.items.premium.manage') || 'Manage your premium plan')
-                                : (t('accountOverview.items.premium.upgrade') || 'Upgrade to premium features')
-                        }
-                        onPress={() => navigate?.('PremiumSubscription')}
-                    />
+                            <SettingsListItem
+                                icon={<SettingsIcon name="shield-check" color={bloomTheme.colors.primary} />}
+                                title={t('signInSecurity.totp.title')}
+                                description={t('signInSecurity.totp.row')}
+                                onPress={() => navigate?.('SignInAuthenticator')}
+                            />
+                            <SettingsListItem
+                                icon={<SettingsIcon name="link" color={bloomTheme.colors.primary} />}
+                                title={t('linkCommons.title')}
+                                description={t('linkCommons.row')}
+                                onPress={() => navigate?.('LinkCommons')}
+                            />
+                        </>
+                    ) : null}
                     {user?.isPremium || subscription?.status === 'active' ? (
                         <SettingsListItem
                             icon={
@@ -650,19 +633,6 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                         }
                         onPress={() => navigate?.('HistoryView')}
                     />
-                    <SettingsListItem
-                        icon={
-                            <SettingsIcon name="bookmark" color={bloomTheme.colors.info} />
-                        }
-                        title={
-                            t('accountOverview.items.saves.title') || 'Saves & Collections'
-                        }
-                        description={
-                            t('accountOverview.items.saves.subtitle')
-                            || 'View your saved items and collections'
-                        }
-                        onPress={() => navigate?.('SavesCollections')}
-                    />
                     <SettingsListItem
                         icon={
                             <SettingsIcon name="folder" color={bloomTheme.colors.info} />
@@ -799,6 +769,14 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                         }
                         onPress={() => navigate?.('ConnectedApps')}
                     />
+                    <SettingsListItem
+                        icon={
+                            <SettingsIcon name="web" color={bloomTheme.colors.success} />
+                        }
+                        title={t('domains.title')}
+                        description={t('domains.subtitle')}
+                        onPress={() => navigate?.('Domains')}
+                    />
                     <SettingsListItem
                         icon={
                             <SettingsIcon name="magnify" color={bloomTheme.colors.primary} />
@@ -829,19 +807,6 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                         }
                         onPress={() => navigate?.('HelpSupport')}
                     />
-                    <SettingsListItem
-                        icon={
-                            <SettingsIcon
-                                name="message-text"
-                                color={bloomTheme.colors.info}
-                            />
-                        }
-                        title={t('feedback.title') || 'Send feedback'}
-                        description={
-                            t('feedback.subtitle') || 'Tell us what you think'
-                        }
-                        onPress={() => navigate?.('Feedback')}
-                    />
                     <SettingsListItem
                         icon={
                             <SettingsIcon name="information" color={bloomTheme.colors.success} />

package/src/ui/screens/PrivacySettingsScreen.tsx

@@ -1,4 +1,5 @@
-import React, { useState, useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { View } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
 import { toast } from '@oxy.so/bloom/toast';
@@ -16,6 +17,8 @@ import { useSettingToggles } from '../hooks/useSettingToggle';
 import type { BlockedUser, RestrictedUser } from '@oxy.so/core';
 import { getNormalizedUserHandle } from '@oxy.so/core';
 import { useOxy } from '../context/OxyContext';
+import { usePrivacySettings } from '../hooks/queries/useAccountQueries';
+import { queryKeys } from '../hooks/queries/queryKeys';
 
 interface PrivacySettings {
     isPrivateAccount: boolean;
@@ -72,83 +75,64 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
 
     useSurfaceHeader({ title: t('privacySettings.title') || 'Privacy Settings' });
     const bloomTheme = useTheme();
-    const [isLoading, setIsLoading] = useState(true);
-    const [blockedUsers, setBlockedUsers] = useState<BlockedUser[]>([]);
-    const [restrictedUsers, setRestrictedUsers] = useState<RestrictedUser[]>([]);
-    const [isLoadingUsers, setIsLoadingUsers] = useState(false);
+    const queryClient = useQueryClient();
 
     // Use the existing useSettingToggles hook for toggle management
     const { values: settings, toggle, savingKeys, setValues } = useSettingToggles<PrivacySettings>({
         initialValues: DEFAULT_PRIVACY_SETTINGS,
         onSave: async (key, value) => {
             if (!user?.id || !oxyServices) return;
-            await oxyServices.updatePrivacySettings({ [key]: value }, user.id);
+            await oxyServices.privacy.updateSettings({ [key]: value }, user.id);
         },
         errorMessage: t('privacySettings.updateError') || 'Failed to update privacy setting',
     });
 
     const isSaving = savingKeys.size > 0;
 
-    // Load settings
+    // Settings and the block/restrict lists come from React Query, keyed on the
+    // active account — switching accounts reads that account's lists.
+    const settingsQuery = usePrivacySettings(user?.id);
+    const isLoading = Boolean(user?.id) && settingsQuery.isPending;
     useEffect(() => {
-        const loadSettings = async () => {
-            try {
-                setIsLoading(true);
-                if (user?.id && oxyServices) {
-                    const privacySettings = await oxyServices.getPrivacySettings(user.id);
-                    if (privacySettings) {
-                        setValues(privacySettings);
-                    }
-                }
-            } catch (error) {
-                if (__DEV__) {
-                    console.error('Failed to load privacy settings:', error);
-                }
-                toast.error(t('privacySettings.loadError') || 'Failed to load privacy settings');
-            } finally {
-                setIsLoading(false);
-            }
-        };
+        if (settingsQuery.data) setValues(settingsQuery.data);
+    }, [settingsQuery.data, setValues]);
+    useEffect(() => {
+        if (settingsQuery.error) {
+            toast.error(t('privacySettings.loadError') || 'Failed to load privacy settings');
+        }
+    }, [settingsQuery.error, t]);
 
-        loadSettings();
-    }, [user?.id, oxyServices, t, setValues]);
+    const listsKey = useMemo(() => queryKeys.privacy.lists(user?.id), [user?.id]);
+    const listsQuery = useQuery({
+        queryKey: listsKey,
+        enabled: Boolean(oxyServices),
+        queryFn: async () => {
+            const [blocked, restricted] = await Promise.all([
+                oxyServices.privacy.blocked(),
+                oxyServices.privacy.restricted(),
+            ]);
+            return { blocked, restricted };
+        },
+    });
+    const blockedUsers: BlockedUser[] = listsQuery.data?.blocked ?? [];
+    const restrictedUsers: RestrictedUser[] = listsQuery.data?.restricted ?? [];
+    const isLoadingUsers = listsQuery.isPending;
 
-    // Load blocked and restricted users
-    // biome-ignore lint/correctness/useExhaustiveDependencies: reload when active account switches
-    useEffect(() => {
-        const loadUsers = async () => {
-            if (!oxyServices) return;
-            try {
-                setIsLoadingUsers(true);
-                const [blocked, restricted] = await Promise.all([
-                    oxyServices.getBlockedUsers(),
-                    oxyServices.getRestrictedUsers(),
-                ]);
-                setBlockedUsers(blocked);
-                setRestrictedUsers(restricted);
-            } catch (error) {
-                if (__DEV__) {
-                    console.error('Failed to load blocked/restricted users:', error);
-                }
-            } finally {
-                setIsLoadingUsers(false);
+    const removeFromLists = useCallback((userId: string, list: 'blocked' | 'restricted') => {
+        queryClient.setQueryData<{ blocked: BlockedUser[]; restricted: RestrictedUser[] }>(listsKey, (prev) => {
+            if (!prev) return prev;
+            if (list === 'blocked') {
+                return { ...prev, blocked: prev.blocked.filter((u) => (typeof u.blockedId === 'string' ? u.blockedId : u.blockedId._id) !== userId) };
             }
-        };
-
-        loadUsers();
-        // Re-load when the active account changes so the block/restrict lists
-        // reflect the account currently switched into (they resolve from the
-        // active session, which IS that account).
-    }, [oxyServices, user?.id]);
+            return { ...prev, restricted: prev.restricted.filter((u) => (typeof u.restrictedId === 'string' ? u.restrictedId : u.restrictedId._id) !== userId) };
+        });
+    }, [queryClient, listsKey]);
 
     const handleUnblock = useCallback(async (userId: string) => {
         if (!oxyServices) return;
         try {
-            await oxyServices.unblockUser(userId);
-            setBlockedUsers(prev => prev.filter(u => {
-                const id = typeof u.blockedId === 'string' ? u.blockedId : u.blockedId._id;
-                return id !== userId;
-            }));
+            await oxyServices.privacy.unblock(userId);
+            removeFromLists(userId, 'blocked');
             toast.success(t('privacySettings.userUnblocked') || 'User unblocked');
         } catch (error) {
             if (__DEV__) {
@@ -156,16 +140,13 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
             }
             toast.error(t('privacySettings.unblockError') || 'Failed to unblock user');
         }
-    }, [oxyServices, t]);
+    }, [oxyServices, t, removeFromLists]);
 
     const handleUnrestrict = useCallback(async (userId: string) => {
         if (!oxyServices) return;
         try {
-            await oxyServices.unrestrictUser(userId);
-            setRestrictedUsers(prev => prev.filter(u => {
-                const id = typeof u.restrictedId === 'string' ? u.restrictedId : u.restrictedId._id;
-                return id !== userId;
-            }));
+            await oxyServices.privacy.unrestrict(userId);
+            removeFromLists(userId, 'restricted');
             toast.success(t('privacySettings.userUnrestricted') || 'User unrestricted');
         } catch (error) {
             if (__DEV__) {
@@ -173,7 +154,7 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
             }
             toast.error(t('privacySettings.unrestrictError') || 'Failed to unrestrict user');
         }
-    }, [oxyServices, t]);
+    }, [oxyServices, t, removeFromLists]);
 
     // Helper to extract user info from blocked/restricted objects.
     const extractUserInfo = useCallback((
@@ -359,7 +340,7 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
                         ) : (
                             blockedUsers.map((blocked) => {
                                 const { userId, displayName, avatar } = extractUserInfo(blocked, 'blockedId');
-                                const avatarUri = avatar && oxyServices ? oxyServices.getFileDownloadUrl(avatar, 'thumb') : undefined;
+                                const avatarUri = avatar && oxyServices ? oxyServices.assets.publicUrl(avatar, 'thumb') : undefined;
                                 return (
                                     <SettingsListItem
                                         key={userId}
@@ -392,7 +373,7 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
                         ) : (
                             restrictedUsers.map((restricted) => {
                                 const { userId, displayName, avatar } = extractUserInfo(restricted, 'restrictedId');
-                                const avatarUri = avatar && oxyServices ? oxyServices.getFileDownloadUrl(avatar, 'thumb') : undefined;
+                                const avatarUri = avatar && oxyServices ? oxyServices.assets.publicUrl(avatar, 'thumb') : undefined;
                                 return (
                                     <SettingsListItem
                                         key={userId}

package/src/ui/screens/ProfileScreen.tsx

@@ -65,11 +65,9 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
         enabled: !!userId,
         retry: false,
         queryFn: async () => {
-            // Follower/following counts come from the `useFollow` hook; the stats
-            // read is kept for parity (it warms server-side counters) but its
-            // result is not surfaced in this view, so it is not bound.
+            // Follower/following counts come from the `useFollow` hook.
             const [profileRes, reputationRes] = await Promise.all([
-                oxyServices.getUserById(userId).catch((err: unknown) => {
+                oxyServices.users.get(userId).catch((err: unknown) => {
                     if (isOwnProfile) return currentUser;
                     logger.error(
                         'Profile loading error',
@@ -79,13 +77,10 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
                     throw err;
                 }),
                 (isOwnProfile
-                    ? oxyServices.getMyReputationBalance()
-                    : oxyServices.getReputationBalance(userId))
+                    ? oxyServices.reputation.balance()
+                    : oxyServices.reputation.balance(userId))
                     .then((balance): { total: number | undefined } => ({ total: balance.total }))
                     .catch((): { total: number | undefined } => ({ total: undefined })),
-                oxyServices.getUserStats
-                    ? oxyServices.getUserStats(userId).catch(() => ({ postCount: 0, commentCount: 0 }))
-                    : Promise.resolve({ postCount: 0, commentCount: 0 }),
             ]);
             if (!profileRes) {
                 throw new Error('Profile data is not available');
@@ -203,7 +198,7 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
                             // `bun run build` and therefore every publish of this package.
                             source={
                                 profile?.avatar
-                                    ? (oxyServices.getFileDownloadUrl(profile.avatar, 'thumb') ?? undefined)
+                                    ? (oxyServices.assets.publicUrl(profile.avatar, 'thumb') ?? undefined)
                                     : undefined
                             }
                             name={displayName}

package/src/ui/screens/SearchSettingsScreen.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import { View } from 'react-native';
 import type { BaseScreenProps } from '../types/navigation';
 import { Loading } from '@oxy.so/bloom/loading';
@@ -10,6 +10,7 @@ import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 import { useSettingToggles } from '../hooks/useSettingToggle';
 import { useOxy } from '../context/OxyContext';
+import { useCurrentUser } from '../hooks/queries/useAccountQueries';
 import type { User } from '@oxy.so/core';
 
 interface SearchSettings {
@@ -29,7 +30,6 @@ const SearchSettingsScreen: React.FC<BaseScreenProps> = ({
 
     useSurfaceHeader({ title: t('searchSettings.title') || 'Search Settings' });
     const bloomTheme = useTheme();
-    const [isLoading, setIsLoading] = useState(true);
 
     // Use the existing useSettingToggles hook for toggle management
     const { values: settings, toggle, savingKeys, setValues } = useSettingToggles<SearchSettings>({
@@ -42,7 +42,7 @@ const SearchSettingsScreen: React.FC<BaseScreenProps> = ({
                 searchPersonalization: 'dataSharing',
             };
 
-            await oxyServices.updateProfile({
+            await oxyServices.users.updateMe({
                 privacySettings: {
                     [fieldMap[key]]: value,
                 },
@@ -53,31 +53,19 @@ const SearchSettingsScreen: React.FC<BaseScreenProps> = ({
 
     const isSaving = savingKeys.size > 0;
 
-    // Load initial settings
+    // 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(() => {
-        const loadSettings = async () => {
-            try {
-                setIsLoading(true);
-                if (user?.id && oxyServices) {
-                    const userData = await oxyServices.getCurrentUser() as User & { privacySettings?: { autoFilter?: boolean; dataSharing?: boolean } };
-                    const privacySettings = userData?.privacySettings || {};
-
-                    setValues({
-                        safeSearch: privacySettings.autoFilter ?? false,
-                        searchPersonalization: privacySettings.dataSharing ?? true,
-                    });
-                }
-            } catch (error) {
-                if (__DEV__) {
-                    console.error('Failed to load search settings:', error);
-                }
-            } finally {
-                setIsLoading(false);
-            }
-        };
-
-        loadSettings();
-    }, [user?.id, oxyServices, setValues]);
+        if (!privacySettings) return;
+        setValues({
+            safeSearch: privacySettings.autoFilter ?? false,
+            searchPersonalization: privacySettings.dataSharing ?? true,
+        });
+    }, [privacySettings, setValues]);
 
     if (isLoading) {
         return (

package/src/ui/screens/SignInAuthenticatorScreen.tsx

@@ -0,0 +1,13 @@
+import type React from 'react';
+import { OxyAuthenticatorPanel } from '../components/signIn/OxyAuthenticatorPanel';
+import type { BaseScreenProps } from '../types/navigation';
+import { AccountSecurityPanelFrame } from './AccountSecurityPanelScreen';
+
+/** `SignInAuthenticator`: the account's authenticator app and its backup codes. */
+const SignInAuthenticatorScreen: React.FC<BaseScreenProps> = () => (
+  <AccountSecurityPanelFrame>
+    <OxyAuthenticatorPanel />
+  </AccountSecurityPanelFrame>
+);
+
+export default SignInAuthenticatorScreen;

package/src/ui/screens/SignInPasswordScreen.tsx

@@ -0,0 +1,13 @@
+import type React from 'react';
+import { OxyPasswordPanel } from '../components/signIn/OxyPasswordPanel';
+import type { BaseScreenProps } from '../types/navigation';
+import { AccountSecurityPanelFrame } from './AccountSecurityPanelScreen';
+
+/** `SignInPassword`: set or change the account's password. */
+const SignInPasswordScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => (
+  <AccountSecurityPanelFrame>
+    <OxyPasswordPanel onDone={goBack ?? onClose} onCancel={goBack ?? onClose} />
+  </AccountSecurityPanelFrame>
+);
+
+export default SignInPasswordScreen;

package/src/ui/screens/UserListScreen.tsx

@@ -90,12 +90,12 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
         let hasMore: boolean;
 
         if (mode === 'followers') {
-          const result = await oxyServices.getUserFollowers(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.getUserFollowing(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;
@@ -162,7 +162,7 @@ const UserListScreen: React.FC<UserListScreenProps> = ({
         <View className="px-screen-margin flex-row items-center gap-space-12">
           <ContactRow id={itemUserId || displayName} name={displayName}
             subtitle={handle ? (item.username ? `@${handle}` : handle) : undefined}
-            avatar={item.avatar ? oxyServices.getFileDownloadUrl(item.avatar, 'thumb') : undefined}
+            avatar={item.avatar ? oxyServices.assets.publicUrl(item.avatar, 'thumb') : undefined}
             horizontalInset={0} style={{ flex: 1 }}
             onPress={() => handleUserPress(item)}
             identitySlot={<View style={styles.userInfo}>

package/src/ui/screens/WelcomeNewUserScreen.tsx

@@ -60,7 +60,7 @@ const WelcomeNewUserScreen: React.FC<BaseScreenProps & { newUser?: User }> = ({
     // user removes their photo, which a "last non-empty value" mirror could not
     // represent.
     const avatarUri = currentUser?.avatar
-        ? oxyServices.getFileDownloadUrl(currentUser.avatar, 'thumb')
+        ? oxyServices.assets.publicUrl(currentUser.avatar, 'thumb')
         : undefined;
 
     // API DTO contract: explicit displayName, else the normalized handle.