@oxyhq/services 13.0.2 → 13.0.3

package/src/ui/hooks/queries/usePaymentQueries.ts

@@ -34,10 +34,10 @@ import type {
  * API's `{ plan: 'basic' }` fallback when the user has never subscribed.
  */
 export const useUserSubscription = (options?: { enabled?: boolean }) => {
-  const { oxyServices, isAuthenticated, activeSessionId, activeAccount } = useOxy();
+  const { oxyServices, isAuthenticated, activeSessionId, user } = useOxy();
 
   return useQuery({
-    queryKey: queryKeys.payments.subscription(activeAccount?.id),
+    queryKey: queryKeys.payments.subscription(user?.id),
     queryFn: async () => {
       return authenticatedApiCall<Subscription>(
         oxyServices,
@@ -45,7 +45,7 @@ export const useUserSubscription = (options?: { enabled?: boolean }) => {
         () => oxyServices.getCurrentUserSubscription(),
       );
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!activeAccount?.id,
+    enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
     // Subscription state changes rarely; tolerate a longer fresh window.
     staleTime: 5 * 60 * 1000, // 5 minutes
     gcTime: 30 * 60 * 1000, // 30 minutes
@@ -59,10 +59,10 @@ export const useUserSubscription = (options?: { enabled?: boolean }) => {
  * returns the user's `deposit` and `purchase` transactions newest-first.
  */
 export const useUserPayments = (options?: { enabled?: boolean }) => {
-  const { oxyServices, isAuthenticated, activeSessionId, activeAccount } = useOxy();
+  const { oxyServices, isAuthenticated, activeSessionId, user } = useOxy();
 
   return useQuery({
-    queryKey: queryKeys.payments.history(activeAccount?.id),
+    queryKey: queryKeys.payments.history(user?.id),
     queryFn: async () => {
       return authenticatedApiCall<Payment[]>(
         oxyServices,
@@ -70,7 +70,7 @@ export const useUserPayments = (options?: { enabled?: boolean }) => {
         () => oxyServices.getUserPayments(),
       );
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!activeAccount?.id,
+    enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
     // Billing history is append-mostly; a short fresh window is fine.
     staleTime: 2 * 60 * 1000, // 2 minutes
     gcTime: 30 * 60 * 1000, // 30 minutes
@@ -84,10 +84,10 @@ export const useUserPayments = (options?: { enabled?: boolean }) => {
  * Balance changes frequently, so the fresh window is intentionally short.
  */
 export const useUserWallet = (options?: { enabled?: boolean }) => {
-  const { oxyServices, isAuthenticated, activeSessionId, activeAccount } = useOxy();
+  const { oxyServices, isAuthenticated, activeSessionId, user } = useOxy();
 
   return useQuery({
-    queryKey: queryKeys.payments.wallet(activeAccount?.id),
+    queryKey: queryKeys.payments.wallet(user?.id),
     queryFn: async () => {
       return authenticatedApiCall<Wallet>(
         oxyServices,
@@ -95,7 +95,7 @@ export const useUserWallet = (options?: { enabled?: boolean }) => {
         () => oxyServices.getCurrentUserWallet(),
       );
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!activeAccount?.id,
+    enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
     staleTime: 60 * 1000, // 1 minute (balance moves often)
     gcTime: 10 * 60 * 1000, // 10 minutes
   });
@@ -116,12 +116,12 @@ export const useUserWalletTransactions = (
   params?: { limit?: number; offset?: number },
   options?: { enabled?: boolean },
 ) => {
-  const { oxyServices, isAuthenticated, activeSessionId, activeAccount } = useOxy();
+  const { oxyServices, isAuthenticated, activeSessionId, user } = useOxy();
   const limit = params?.limit;
   const offset = params?.offset;
 
   return useQuery({
-    queryKey: queryKeys.payments.walletTransactions(limit, offset, activeAccount?.id),
+    queryKey: queryKeys.payments.walletTransactions(limit, offset, user?.id),
     queryFn: async () => {
       return authenticatedApiCall<WalletTransactionsResponse>(
         oxyServices,
@@ -129,7 +129,7 @@ export const useUserWalletTransactions = (
         () => oxyServices.getCurrentUserWalletTransactions({ limit, offset }),
       );
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!activeAccount?.id,
+    enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
     staleTime: 60 * 1000, // 1 minute (ledger updates frequently)
     gcTime: 10 * 60 * 1000, // 10 minutes
   });

package/src/ui/hooks/queries/useServicesQueries.ts

@@ -5,8 +5,11 @@ import { queryKeys } from './queryKeys';
 import { useOxy } from '../../context/OxyContext';
 import { fetchSessionsWithFallback, mapSessionsToClient } from '../../utils/sessionHelpers';
 
-const accountQueryScope = (activeSessionId: string | null, actingAs?: string | null): string =>
-  `${activeSessionId ?? 'no-session'}:${actingAs ?? 'self'}`;
+// Per-account query scope. In the real-session switch model the active session
+// id uniquely identifies the active account (switching mints a new session), so
+// it alone scopes the cache — no separate acting-as key is needed.
+const accountQueryScope = (activeSessionId: string | null): string =>
+  `${activeSessionId ?? 'no-session'}`;
 
 /**
  * Get all active sessions for the current user
@@ -93,10 +96,10 @@ export const useDeviceSessions = (options?: { enabled?: boolean }) => {
  * Get user devices
  */
 export const useUserDevices = (options?: { enabled?: boolean }) => {
-  const { oxyServices, isAuthenticated, activeSessionId, actingAs } = useOxy();
+  const { oxyServices, isAuthenticated, activeSessionId } = useOxy();
 
   return useQuery({
-    queryKey: queryKeys.devices.list(accountQueryScope(activeSessionId, actingAs)),
+    queryKey: queryKeys.devices.list(accountQueryScope(activeSessionId)),
     queryFn: async () => {
       return authenticatedApiCall(
         oxyServices,
@@ -135,10 +138,10 @@ export const useSecurityInfo = (options?: { enabled?: boolean }) => {
  * `useEffect` fetches.
  */
 export const useAccountStorageUsage = (options?: { enabled?: boolean }) => {
-  const { oxyServices, isAuthenticated, activeSessionId, actingAs } = useOxy();
+  const { oxyServices, isAuthenticated, activeSessionId } = useOxy();
 
   return useQuery<AccountStorageUsageResponse>({
-    queryKey: queryKeys.storage.usage(accountQueryScope(activeSessionId, actingAs)),
+    queryKey: queryKeys.storage.usage(accountQueryScope(activeSessionId)),
     queryFn: async () => {
       return authenticatedApiCall(
         oxyServices,

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -38,7 +38,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, nav
   const bloomTheme = useTheme();
   const colors = bloomTheme.colors;
   const { t } = useI18n();
-  const { oxyServices, canUsePrivateApi, actingAs, setActingAs } = useOxy();
+  const { oxyServices, canUsePrivateApi, user, accounts, switchToAccount } = useOxy();
   const queryClient = useQueryClient();
 
   const id = typeof accountId === 'string' ? accountId : '';
@@ -91,10 +91,14 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, nav
   const archiveMutation = useMutation({
     mutationKey: ['accounts', 'archive', id],
     mutationFn: () => oxyServices.archiveAccount(id),
-    onSuccess: () => {
-      // If this was the active account, drop back to the personal account.
-      if (actingAs === id) {
-        setActingAs(null);
+    onSuccess: async () => {
+      // If we archived the account we're currently signed in AS, switch back to
+      // the personal account so the app isn't left as an archived identity.
+      if (user?.id === id) {
+        const personal = accounts.find((node) => node.relationship === 'self');
+        if (personal) {
+          await switchToAccount(personal.accountId).catch(() => undefined);
+        }
       }
       queryClient.invalidateQueries({ queryKey: ['accounts'] });
       toast.success(t('accounts.settings.toasts.archived') || 'Account archived');

package/src/ui/screens/AccountSwitcherScreen.tsx

@@ -8,9 +8,9 @@ import { useI18n } from '../hooks/useI18n';
 
 /**
  * Bottom-sheet route wrapper around {@link AccountSwitcherView}. Used when the
- * switcher is opened as a sheet (e.g. from the `ActiveAccountBanner` cue or the
- * "Your accounts" entry in ManageAccount) rather than as the header-chip
- * popover (which uses the `AccountSwitcher` modal directly).
+ * switcher is opened as a sheet (e.g. from the "Your accounts" entry in
+ * ManageAccount) rather than as the header-chip popover (which uses the
+ * `AccountSwitcher` modal directly).
  */
 const AccountSwitcherScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, navigate }) => {
   const { t } = useI18n();

package/src/ui/screens/CreateAccountScreen.tsx

@@ -84,7 +84,7 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
   parentAccountId,
 }) => {
   const bloomTheme = useTheme();
-  const { oxyServices, createAccount, setActingAs } = useOxy();
+  const { oxyServices, createAccount, switchToAccount } = useOxy();
   const { t } = useI18n();
 
   const parentId = typeof parentAccountId === 'string' ? parentAccountId : undefined;
@@ -181,9 +181,11 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
 
       toast.success(t('accounts.create.toasts.success') || 'Account created');
 
-      // Switch to the new account
+      // Switch INTO the new account (real-session switch — the whole app becomes
+      // it). Best-effort: creation already succeeded, so a switch hiccup should
+      // not surface as a create failure.
       if (account.accountId) {
-        setActingAs(account.accountId);
+        await switchToAccount(account.accountId).catch(() => undefined);
       }
 
       onClose?.();
@@ -195,7 +197,7 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
     } finally {
       setIsCreating(false);
     }
-  }, [canCreate, kind, username, displayName, bio, parentId, createAccount, setActingAs, onClose, t]);
+  }, [canCreate, kind, username, displayName, bio, parentId, createAccount, switchToAccount, onClose, t]);
 
   // Status icon + color shown alongside the username field message
   const usernameIsInvalid = usernameStatus === 'taken' || usernameStatus === 'invalid';

package/src/ui/screens/EditProfileFieldScreen.tsx

@@ -88,10 +88,11 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
     theme,
     fieldType = 'displayName',
 }) => {
-    // Editing "my" profile targets the ACTIVE account — writes already route to
-    // it via the X-Acting-As header, so the initial field values must mirror the
-    // active account (an org/project/bot when switched, else the personal user).
-    const { activeAccount } = useOxy();
+    // Editing "my" profile targets the ACTIVE account — writes authenticate as
+    // the active session, which IS that account — so the initial field values
+    // must mirror the active account (an org/project/bot when switched, else the
+    // personal user).
+    const { user } = useOxy();
     const { t } = useI18n();
     const { saveProfile, updateField, isSaving } = useProfileEditing();
     const bloomTheme = useTheme();
@@ -267,9 +268,9 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
 
     // Initialize field values from the active account's data
     useEffect(() => {
-        if (!activeAccount) return;
+        if (!user) return;
 
-        const userData = activeAccount;
+        const userData = user;
 
         if (fieldConfig.isList) {
             if (fieldType === 'locations') {
@@ -319,7 +320,7 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
             });
             setFieldValues(initialValues);
         }
-    }, [activeAccount, fieldConfig, fieldType]);
+    }, [user, fieldConfig, fieldType]);
 
     // Field change handler
     const handleFieldChange = useCallback((key: string, value: string) => {

package/src/ui/screens/FileManagementScreen.tsx

@@ -766,8 +766,8 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
     // Use useOxy() hook for OxyContext values. Files are owned by the ACTIVE
     // account (the org/project/bot when switched, else the personal user): the
     // default file owner and every "is this mine?" ownership check resolve
-    // against `activeAccount`, so switching shows/manages that account's files.
-    const { activeAccount, oxyServices } = useOxy();
+    // against `user`, so switching shows/manages that account's files.
+    const { user, oxyServices } = useOxy();
     const { t } = useI18n();
     const uploadFileMutation = useUploadFile();
     // Prompt controls
@@ -1036,7 +1036,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
     const backgroundColor = colors.backgroundSecondary;
     const borderColor = colors.border;
 
-    const targetUserId = userId || activeAccount?.id;
+    const targetUserId = userId || user?.id;
 
     const storeSetUploading = useFileStore(s => s.setUploading);
     const storeSetUploadProgress = useFileStore(s => s.setUploadProgress);
@@ -2290,11 +2290,11 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                     <Ionicons name="images-outline" size={64} color={colors.textTertiary} />
                     <Text style={[fileManagementStyles.emptyStateTitle, { color: colors.text }]}>{t('fileManagement.emptyPhotos.title')}</Text>
                     <Text style={[fileManagementStyles.emptyStateDescription, { color: colors.textSecondary }]}> {
-                        activeAccount?.id === targetUserId
+                        user?.id === targetUserId
                             ? t('fileManagement.emptyPhotos.ownDescription')
                             : t('fileManagement.emptyPhotos.otherDescription')
                     } </Text>
-                    {activeAccount?.id === targetUserId && (
+                    {user?.id === targetUserId && (
                         <TouchableOpacity
                             style={[fileManagementStyles.emptyStateButton, { backgroundColor: colors.primary }]}
                             onPress={handleFileUpload}
@@ -2360,7 +2360,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
     }, [
         filteredFiles,
         colors,
-        activeAccount?.id,
+        user?.id,
         targetUserId,
         uploading,
         handleFileUpload,
@@ -2384,12 +2384,12 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
             <Ionicons name="folder-open-outline" size={64} color={colors.textTertiary} />
             <Text style={[fileManagementStyles.emptyStateTitle, { color: colors.text }]}>{t('fileManagement.emptyFiles.title')}</Text>
             <Text style={[fileManagementStyles.emptyStateDescription, { color: colors.textSecondary }]}>
-                {activeAccount?.id === targetUserId
+                {user?.id === targetUserId
                     ? t('fileManagement.emptyFiles.ownDescription')
                     : t('fileManagement.emptyFiles.otherDescription')
                 }
             </Text>
-            {activeAccount?.id === targetUserId && (
+            {user?.id === targetUserId && (
                 <TouchableOpacity
                     style={[fileManagementStyles.emptyStateButton, { backgroundColor: colors.primary }]}
                     onPress={handleFileUpload}
@@ -2599,7 +2599,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         const photosOnly = filteredFiles.filter(
             (file) => file.contentType.startsWith('image/'),
         );
-        const isOwner = activeAccount?.id === targetUserId;
+        const isOwner = user?.id === targetUserId;
         const allowUpload = isOwner && allowUploadInSelectMode;
 
         return (
@@ -2657,14 +2657,14 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                     onClose={handleCloseFile}
                     onDownload={handleFileDownload}
                     onDelete={confirmFileDelete}
-                    isOwner={activeAccount?.id === targetUserId}
+                    isOwner={user?.id === targetUserId}
                 />
                 <FileDetailsModal
                     control={fileDetailsControl}
                     file={selectedFile}
                     onDownload={handleFileDownload}
                     onDelete={confirmFileDelete}
-                    isOwner={activeAccount?.id === targetUserId}
+                    isOwner={user?.id === targetUserId}
                 />
             </>
         );
@@ -2840,7 +2840,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                         color={colors.textSecondary}
                     />
                 </TouchableOpacity>
-                {activeAccount?.id === targetUserId && (!selectMode || (selectMode && allowUploadInSelectMode)) && (
+                {user?.id === targetUserId && (!selectMode || (selectMode && allowUploadInSelectMode)) && (
                     <TouchableOpacity
                         style={[
                             fileManagementStyles.uploadButton,
@@ -3013,7 +3013,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                     file={selectedFile}
                     onDownload={handleFileDownload}
                     onDelete={confirmFileDelete}
-                    isOwner={activeAccount?.id === targetUserId}
+                    isOwner={user?.id === targetUserId}
                 />
             )}
 

package/src/ui/screens/HistoryViewScreen.tsx

@@ -17,7 +17,7 @@ interface HistoryItem { id: string; query: string; type: 'search' | 'browse'; ti
 const HistoryViewScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
     // History is scoped to the ACTIVE account so a switch into an org/project/bot
     // shows that account's history, not the device-session owner's.
-    const { activeAccount } = useOxy();
+    const { user } = useOxy();
     const { t } = useI18n();
     const bloomTheme = useTheme();
     const [history, setHistory] = useState<HistoryItem[]>([]);
@@ -47,13 +47,13 @@ const HistoryViewScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
             try {
                 setIsLoading(true);
                 const storage = await getStorage();
-                const stored = await storage.getItem(`history_${activeAccount?.id || 'guest'}`);
+                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([]);
             } catch { setHistory([]); } finally { setIsLoading(false); }
         };
         load();
-    }, [activeAccount?.id]);
+    }, [user?.id]);
 
     const handleDeleteLast15Minutes = useCallback(async () => {
         try {
@@ -62,21 +62,21 @@ const HistoryViewScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
             const filtered = history.filter(item => item.timestamp < cutoff);
             setHistory(filtered);
             const storage = await getStorage();
-            await storage.setItem(`history_${activeAccount?.id || 'guest'}`, JSON.stringify(filtered));
+            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'); }
         finally { setIsDeleting(false); }
-    }, [history, activeAccount?.id, t]);
+    }, [history, user?.id, t]);
 
     const handleClearAll = useCallback(async () => {
         try {
             setIsDeleting(true); setHistory([]);
             const storage = await getStorage();
-            await storage.removeItem(`history_${activeAccount?.id || 'guest'}`);
+            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'); }
         finally { setIsDeleting(false); }
-    }, [activeAccount?.id, t]);
+    }, [user?.id, t]);
 
     const formatTime = (date: Date) => {
         const diff = new Date().getTime() - date.getTime();

package/src/ui/screens/LanguageSelectorScreen.tsx

@@ -34,9 +34,9 @@ const LanguageSelectorScreen: React.FC<LanguageSelectorScreenProps> = ({
     theme,
 }) => {
     // Use useOxy() hook for OxyContext values. The language preference persists
-    // on the ACTIVE account's profile via the X-Acting-As header, so gate the
-    // server sync on the active account.
-    const { activeAccount, currentLanguage, setLanguage, oxyServices, isAuthenticated } = useOxy();
+    // on the ACTIVE account's profile — the active session IS that account — so
+    // gate the server sync on the active account.
+    const { user, currentLanguage, setLanguage, oxyServices, isAuthenticated } = useOxy();
     const { t } = useI18n();
     const bloomTheme = useTheme();
     const normalizedTheme = normalizeTheme(theme);
@@ -55,7 +55,7 @@ const LanguageSelectorScreen: React.FC<LanguageSelectorScreenProps> = ({
             let serverSyncFailed = false;
 
             // If signed in, persist preference to backend user settings
-            if (isAuthenticated && activeAccount?.id) {
+            if (isAuthenticated && user?.id) {
                 try {
                     await oxyServices.updateProfile({ language: languageId });
                 } catch (e: unknown) {
@@ -92,7 +92,7 @@ const LanguageSelectorScreen: React.FC<LanguageSelectorScreenProps> = ({
             toast.error(t('language.saveFailed'));
             setIsLoading(false);
         }
-    }, [currentLanguage, isLoading, isAuthenticated, activeAccount?.id, oxyServices, setLanguage, t, onClose, goBack]);
+    }, [currentLanguage, isLoading, isAuthenticated, user?.id, oxyServices, setLanguage, t, onClose, goBack]);
 
     // Filter the supported languages by the search query (name + native name).
     const filteredLanguages = useMemo(() => {

package/src/ui/screens/ManageAccountScreen.tsx

@@ -89,7 +89,6 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
     const { t, locale } = useI18n();
     const {
         user: contextUser,
-        activeAccount,
         isAuthenticated,
         oxyServices,
         activeSessionId,
@@ -101,11 +100,11 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
     const { data: userFromQuery, isLoading: userLoading } = useCurrentUser({
         enabled: isAuthenticated,
     });
-    // `user` is the device-session OWNER (the human login) — used only for
-    // account/session MANAGEMENT and GDPR-level actions (sign-out, device
-    // sessions, download-data, delete-account). Identity-of-me surfaces (the
-    // profile header, preview-profile target, premium state) read
-    // `activeAccount` so a switch into an org/project/bot is reflected here.
+    // `user` IS the active account. In the real-session switch model, switching
+    // into an org/project/bot makes it the active session, so `useOxy().user`
+    // (and the freshest `useCurrentUser` copy) already reflects the switched
+    // account everywhere — identity-of-me surfaces and management/GDPR actions
+    // alike read this single `user`.
     const user = userFromQuery ?? contextUser;
 
     const { data: subscription } = useUserSubscription({ enabled: isAuthenticated });
@@ -127,13 +126,13 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
     const [signingOutAllDevices, setSigningOutAllDevices] = useState(false);
     const [signingOut, setSigningOut] = useState(false);
 
-    const displayName = useMemo(() => getAccountDisplayName(activeAccount, locale), [activeAccount, locale]);
-    const handle = useMemo(() => getAccountFallbackHandle(activeAccount), [activeAccount]);
+    const displayName = useMemo(() => getAccountDisplayName(user, locale), [user, locale]);
+    const handle = useMemo(() => getAccountFallbackHandle(user), [user]);
     const avatarUri = useMemo(() => {
-        return activeAccount?.avatar
-            ? oxyServices.getFileDownloadUrl(activeAccount.avatar, 'thumb')
+        return user?.avatar
+            ? oxyServices.getFileDownloadUrl(user.avatar, 'thumb')
             : undefined;
-    }, [activeAccount?.avatar, oxyServices]);
+    }, [user?.avatar, oxyServices]);
 
     const handleSignOut = useCallback(async () => {
         if (signingOut) {
@@ -361,12 +360,12 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                     </H4>
                     {handle ? (
                         <Text className="text-text-secondary text-sm mt-space-2" numberOfLines={1}>
-                            {activeAccount?.username ? `@${handle}` : handle}
+                            {user?.username ? `@${handle}` : handle}
                         </Text>
                     ) : null}
-                    {activeAccount?.email ? (
+                    {user?.email ? (
                         <Text className="text-text-secondary text-sm mt-space-2" numberOfLines={1}>
-                            {activeAccount.email}
+                            {user.email}
                         </Text>
                     ) : null}
                 </View>
@@ -418,9 +417,9 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                             || 'See how your profile looks to others'
                         }
                         onPress={() =>
-                            activeAccount?.id ? navigate?.('Profile', { userId: activeAccount.id }) : undefined
+                            user?.id ? navigate?.('Profile', { userId: user.id }) : undefined
                         }
-                        disabled={!activeAccount?.id}
+                        disabled={!user?.id}
                     />
                     <SettingsListItem
                         icon={
@@ -587,13 +586,13 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                             t('accountOverview.items.premium.title') || 'Oxy+'
                         }
                         description={
-                            activeAccount?.isPremium
+                            user?.isPremium
                                 ? (t('accountOverview.items.premium.manage') || 'Manage your premium plan')
                                 : (t('accountOverview.items.premium.upgrade') || 'Upgrade to premium features')
                         }
                         onPress={() => navigate?.('PremiumSubscription')}
                     />
-                    {activeAccount?.isPremium || subscription?.status === 'active' ? (
+                    {user?.isPremium || subscription?.status === 'active' ? (
                         <SettingsListItem
                             icon={
                                 <SettingsIcon

package/src/ui/screens/PremiumSubscriptionScreen.tsx

@@ -93,7 +93,7 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
 }) => {
     // Premium state belongs to the ACTIVE account (the org/project/bot when
     // switched, else the personal user), not the device-session owner.
-    const { activeAccount } = useOxy();
+    const { user } = useOxy();
     const [loading, setLoading] = useState(true);
     const [subscription, setSubscription] = useState<UserSubscription | null>(null);
     const [plans, setPlans] = useState<SubscriptionPlan[]>([]);
@@ -329,7 +329,7 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
         if (currentAppPackage) {
             loadSubscriptionData();
         }
-    }, [currentAppPackage, activeAccount?.isPremium]);
+    }, [currentAppPackage, user?.isPremium]);
 
     const detectCurrentApp = () => {
         const detectedApp = 'mention';
@@ -346,7 +346,7 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
             setPlans(availablePlans);
 
             let currentSubscription: UserSubscription | null = null;
-            if (activeAccount?.isPremium) {
+            if (user?.isPremium) {
                 currentSubscription = {
                     id: 'sub_12345',
                     planId: 'oxy-insider',

package/src/ui/screens/PrivacySettingsScreen.tsx

@@ -67,7 +67,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, activeAccount } = useOxy();
+    const { oxyServices, user } = useOxy();
     const { t, locale } = useI18n();
     const bloomTheme = useTheme();
     const [isLoading, setIsLoading] = useState(true);
@@ -79,8 +79,8 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
     const { values: settings, toggle, savingKeys, setValues } = useSettingToggles<PrivacySettings>({
         initialValues: DEFAULT_PRIVACY_SETTINGS,
         onSave: async (key, value) => {
-            if (!activeAccount?.id || !oxyServices) return;
-            await oxyServices.updatePrivacySettings({ [key]: value }, activeAccount.id);
+            if (!user?.id || !oxyServices) return;
+            await oxyServices.updatePrivacySettings({ [key]: value }, user.id);
         },
         errorMessage: t('privacySettings.updateError') || 'Failed to update privacy setting',
     });
@@ -92,8 +92,8 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
         const loadSettings = async () => {
             try {
                 setIsLoading(true);
-                if (activeAccount?.id && oxyServices) {
-                    const privacySettings = await oxyServices.getPrivacySettings(activeAccount.id);
+                if (user?.id && oxyServices) {
+                    const privacySettings = await oxyServices.getPrivacySettings(user.id);
                     if (privacySettings) {
                         setValues(privacySettings);
                     }
@@ -109,7 +109,7 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
         };
 
         loadSettings();
-    }, [activeAccount?.id, oxyServices, t, setValues]);
+    }, [user?.id, oxyServices, t, setValues]);
 
     // Load blocked and restricted users
     useEffect(() => {
@@ -134,9 +134,9 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
 
         loadUsers();
         // Re-load when the active account changes so the block/restrict lists
-        // reflect the account currently switched into (they resolve via the
-        // X-Acting-As header).
-    }, [oxyServices, activeAccount?.id]);
+        // reflect the account currently switched into (they resolve from the
+        // active session, which IS that account).
+    }, [oxyServices, user?.id]);
 
     const handleUnblock = useCallback(async (userId: string) => {
         if (!oxyServices) return;

package/src/ui/screens/ProfileScreen.tsx

@@ -31,7 +31,7 @@ const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme,
     // and the own-profile fallback is the ACTIVE account (the account switched
     // into), so previewing my profile while switched into an org/project/bot
     // resolves "this is mine" against that account, not the session owner.
-    const { oxyServices, activeAccount: currentUser } = useOxy();
+    const { oxyServices, user: currentUser } = useOxy();
     const [profile, setProfile] = useState<User | null>(null);
     const [reputationTotal, setReputationTotal] = useState<number | null>(null);
     const [postsCount, setPostsCount] = useState<number | null>(null);

package/src/ui/screens/SavesCollectionsScreen.tsx

@@ -40,7 +40,7 @@ const SavesCollectionsScreen: React.FC<BaseScreenProps> = ({
 }) => {
     // Saves & collections belong to the ACTIVE account (the org/project/bot when
     // switched, else the personal user).
-    const { oxyServices, activeAccount } = useOxy();
+    const { oxyServices, user } = useOxy();
     const { t } = useI18n();
     const bloomTheme = useTheme();
     const [savedItems, setSavedItems] = useState<SavedItem[]>([]);
@@ -53,10 +53,10 @@ const SavesCollectionsScreen: React.FC<BaseScreenProps> = ({
         const loadData = async () => {
             try {
                 setIsLoading(true);
-                if (activeAccount?.id && oxyServices) {
+                if (user?.id && oxyServices) {
                     const [saved, cols] = await Promise.all([
-                        oxyServices.getSavedItems(activeAccount.id),
-                        oxyServices.getCollections(activeAccount.id),
+                        oxyServices.getSavedItems(user.id),
+                        oxyServices.getCollections(user.id),
                     ]);
                     setSavedItems(saved.map((item) => ({
                         id: item.id,
@@ -80,7 +80,7 @@ const SavesCollectionsScreen: React.FC<BaseScreenProps> = ({
         };
 
         loadData();
-    }, [activeAccount?.id, oxyServices, t]);
+    }, [user?.id, oxyServices, t]);
 
     const formatDate = (date: Date) => {
         return date.toLocaleDateString();