@oxyhq/services 13.0.1 → 13.0.2

package/src/ui/screens/ManageAccountScreen.tsx

@@ -89,6 +89,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
     const { t, locale } = useI18n();
     const {
         user: contextUser,
+        activeAccount,
         isAuthenticated,
         oxyServices,
         activeSessionId,
@@ -100,6 +101,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.
     const user = userFromQuery ?? contextUser;
 
     const { data: subscription } = useUserSubscription({ enabled: isAuthenticated });
@@ -121,13 +127,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 handle = useMemo(() => getAccountFallbackHandle(user), [user]);
+    const displayName = useMemo(() => getAccountDisplayName(activeAccount, locale), [activeAccount, locale]);
+    const handle = useMemo(() => getAccountFallbackHandle(activeAccount), [activeAccount]);
     const avatarUri = useMemo(() => {
-        return user?.avatar
-            ? oxyServices.getFileDownloadUrl(user.avatar, 'thumb')
+        return activeAccount?.avatar
+            ? oxyServices.getFileDownloadUrl(activeAccount.avatar, 'thumb')
             : undefined;
-    }, [user?.avatar, oxyServices]);
+    }, [activeAccount?.avatar, oxyServices]);
 
     const handleSignOut = useCallback(async () => {
         if (signingOut) {
@@ -355,12 +361,12 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                     </H4>
                     {handle ? (
                         <Text className="text-text-secondary text-sm mt-space-2" numberOfLines={1}>
-                            {user?.username ? `@${handle}` : handle}
+                            {activeAccount?.username ? `@${handle}` : handle}
                         </Text>
                     ) : null}
-                    {user?.email ? (
+                    {activeAccount?.email ? (
                         <Text className="text-text-secondary text-sm mt-space-2" numberOfLines={1}>
-                            {user.email}
+                            {activeAccount.email}
                         </Text>
                     ) : null}
                 </View>
@@ -412,9 +418,9 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                             || 'See how your profile looks to others'
                         }
                         onPress={() =>
-                            user?.id ? navigate?.('Profile', { userId: user.id }) : undefined
+                            activeAccount?.id ? navigate?.('Profile', { userId: activeAccount.id }) : undefined
                         }
-                        disabled={!user?.id}
+                        disabled={!activeAccount?.id}
                     />
                     <SettingsListItem
                         icon={
@@ -581,13 +587,13 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                             t('accountOverview.items.premium.title') || 'Oxy+'
                         }
                         description={
-                            user?.isPremium
+                            activeAccount?.isPremium
                                 ? (t('accountOverview.items.premium.manage') || 'Manage your premium plan')
                                 : (t('accountOverview.items.premium.upgrade') || 'Upgrade to premium features')
                         }
                         onPress={() => navigate?.('PremiumSubscription')}
                     />
-                    {user?.isPremium || subscription?.status === 'active' ? (
+                    {activeAccount?.isPremium || subscription?.status === 'active' ? (
                         <SettingsListItem
                             icon={
                                 <SettingsIcon

package/src/ui/screens/PremiumSubscriptionScreen.tsx

@@ -91,8 +91,9 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
     navigate,
     goBack,
 }) => {
-    // Use useOxy() hook for OxyContext values
-    const { user } = useOxy();
+    // 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 [loading, setLoading] = useState(true);
     const [subscription, setSubscription] = useState<UserSubscription | null>(null);
     const [plans, setPlans] = useState<SubscriptionPlan[]>([]);
@@ -328,7 +329,7 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
         if (currentAppPackage) {
             loadSubscriptionData();
         }
-    }, [currentAppPackage, user?.isPremium]);
+    }, [currentAppPackage, activeAccount?.isPremium]);
 
     const detectCurrentApp = () => {
         const detectedApp = 'mention';
@@ -345,7 +346,7 @@ const PremiumSubscriptionScreen: React.FC<BaseScreenProps> = ({
             setPlans(availablePlans);
 
             let currentSubscription: UserSubscription | null = null;
-            if (user?.isPremium) {
+            if (activeAccount?.isPremium) {
                 currentSubscription = {
                     id: 'sub_12345',
                     planId: 'oxy-insider',

package/src/ui/screens/PrivacySettingsScreen.tsx

@@ -65,7 +65,9 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
     onClose,
     goBack,
 }) => {
-    const { oxyServices, user } = useOxy();
+    // Privacy settings belong to the ACTIVE account (the org/project/bot when
+    // switched, else the personal user).
+    const { oxyServices, activeAccount } = useOxy();
     const { t, locale } = useI18n();
     const bloomTheme = useTheme();
     const [isLoading, setIsLoading] = useState(true);
@@ -77,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 (!user?.id || !oxyServices) return;
-            await oxyServices.updatePrivacySettings({ [key]: value }, user.id);
+            if (!activeAccount?.id || !oxyServices) return;
+            await oxyServices.updatePrivacySettings({ [key]: value }, activeAccount.id);
         },
         errorMessage: t('privacySettings.updateError') || 'Failed to update privacy setting',
     });
@@ -90,8 +92,8 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
         const loadSettings = async () => {
             try {
                 setIsLoading(true);
-                if (user?.id && oxyServices) {
-                    const privacySettings = await oxyServices.getPrivacySettings(user.id);
+                if (activeAccount?.id && oxyServices) {
+                    const privacySettings = await oxyServices.getPrivacySettings(activeAccount.id);
                     if (privacySettings) {
                         setValues(privacySettings);
                     }
@@ -107,7 +109,7 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
         };
 
         loadSettings();
-    }, [user?.id, oxyServices, t, setValues]);
+    }, [activeAccount?.id, oxyServices, t, setValues]);
 
     // Load blocked and restricted users
     useEffect(() => {
@@ -131,7 +133,10 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
         };
 
         loadUsers();
-    }, [oxyServices]);
+        // 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]);
 
     const handleUnblock = useCallback(async (userId: string) => {
         if (!oxyServices) return;

package/src/ui/screens/ProfileScreen.tsx

@@ -27,8 +27,11 @@ const AVATAR_OVERLAP = -56;
 const INFO_ICON_SIZE = 18;
 
 const ProfileScreen: React.FC<ProfileScreenProps> = ({ userId, username, theme, goBack, navigate }) => {
-    // Use useOxy() hook for OxyContext values
-    const { oxyServices, user: currentUser } = useOxy();
+    // Use useOxy() hook for OxyContext values. "Me" for own-profile detection
+    // 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 [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

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

package/src/ui/screens/SearchSettingsScreen.tsx

@@ -21,7 +21,10 @@ const SearchSettingsScreen: React.FC<BaseScreenProps> = ({
     onClose,
     goBack,
 }) => {
-    const { oxyServices, user } = useOxy();
+    // Search settings are persisted on the ACTIVE account's profile (the
+    // org/project/bot when switched, else the personal user); the read/write
+    // route to it via the X-Acting-As header.
+    const { oxyServices, activeAccount } = useOxy();
     const { t } = useI18n();
     const bloomTheme = useTheme();
     const [isLoading, setIsLoading] = useState(true);
@@ -30,7 +33,7 @@ const SearchSettingsScreen: React.FC<BaseScreenProps> = ({
     const { values: settings, toggle, savingKeys, setValues } = useSettingToggles<SearchSettings>({
         initialValues: { safeSearch: false, searchPersonalization: true },
         onSave: async (key, value) => {
-            if (!user?.id || !oxyServices) return;
+            if (!activeAccount?.id || !oxyServices) return;
 
             const fieldMap: Record<keyof SearchSettings, string> = {
                 safeSearch: 'autoFilter',
@@ -53,7 +56,7 @@ const SearchSettingsScreen: React.FC<BaseScreenProps> = ({
         const loadSettings = async () => {
             try {
                 setIsLoading(true);
-                if (user?.id && oxyServices) {
+                if (activeAccount?.id && oxyServices) {
                     const userData = await oxyServices.getCurrentUser() as User & { privacySettings?: { autoFilter?: boolean; dataSharing?: boolean } };
                     const privacySettings = userData?.privacySettings || {};
 
@@ -72,7 +75,7 @@ const SearchSettingsScreen: React.FC<BaseScreenProps> = ({
         };
 
         loadSettings();
-    }, [user?.id, oxyServices, setValues]);
+    }, [activeAccount?.id, oxyServices, setValues]);
 
     if (isLoading) {
         return (

package/src/ui/screens/WelcomeNewUserScreen.tsx

@@ -63,11 +63,14 @@ const WelcomeNewUserScreen: React.FC<BaseScreenProps & { newUser?: any }> = ({
     theme,
     newUser,
 }) => {
-    // Use useOxy() hook for OxyContext values
-    const { user, oxyServices } = useOxy();
+    // Use useOxy() hook for OxyContext values. The greeting/avatar identity is
+    // the ACTIVE account (the personal user during onboarding, but read through
+    // `activeAccount` so this stays correct everywhere), with the freshly
+    // registered `newUser` as the pre-store-hydration fallback.
+    const { activeAccount, oxyServices } = useOxy();
     const { t, locale } = useI18n();
     const updateProfileMutation = useUpdateProfile();
-    const currentUser = user || newUser; // fallback
+    const currentUser = activeAccount || newUser; // fallback
     const bloomTheme = useTheme();
     const colors = {
         primary: bloomTheme.colors.primary,
@@ -88,14 +91,14 @@ const WelcomeNewUserScreen: React.FC<BaseScreenProps & { newUser?: any }> = ({
     const [lastName, setLastName] = useState(() => (currentUser?.name?.last ?? '').trim());
     const [savingName, setSavingName] = useState(false);
 
-    // Update selectedAvatarId when user changes
+    // Update selectedAvatarId when the active account's avatar changes
     useEffect(() => {
-        if (user?.avatar) {
-            setSelectedAvatarId(user.avatar);
+        if (activeAccount?.avatar) {
+            setSelectedAvatarId(activeAccount.avatar);
         } else if (newUser?.avatar) {
             setSelectedAvatarId(newUser.avatar);
         }
-    }, [user?.avatar, newUser?.avatar]);
+    }, [activeAccount?.avatar, newUser?.avatar]);
 
     const avatarUri = selectedAvatarId ? oxyServices.getFileDownloadUrl(selectedAvatarId, 'thumb') : undefined;
 

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

@@ -20,8 +20,9 @@ const TrustCenterScreen: React.FC<BaseScreenProps> = ({
     goBack,
     navigate,
 }) => {
-    // Use useOxy() hook for OxyContext values
-    const { user, oxyServices, isAuthenticated } = useOxy();
+    // Reputation/trust is the ACTIVE account's standing (the org/project/bot
+    // when switched, else the personal user).
+    const { activeAccount, oxyServices, isAuthenticated } = useOxy();
     const { t } = useI18n();
     const [reputationTotal, setReputationTotal] = useState<number | null>(null);
     const [trustTier, setTrustTier] = useState<TrustTier | null>(null);
@@ -33,12 +34,12 @@ const TrustCenterScreen: React.FC<BaseScreenProps> = ({
     const primaryColor = bloomTheme.colors.primary;
 
     useEffect(() => {
-        if (!user) return;
+        if (!activeAccount) return;
         setIsLoading(true);
         setError(null);
         Promise.all([
-            oxyServices.getReputationBalance(user.id),
-            oxyServices.getReputationTransactions(user.id, 20, 0),
+            oxyServices.getReputationBalance(activeAccount.id),
+            oxyServices.getReputationTransactions(activeAccount.id, 20, 0),
         ])
             .then(([balance, txns]) => {
                 setReputationTotal(balance.total);
@@ -52,7 +53,7 @@ const TrustCenterScreen: React.FC<BaseScreenProps> = ({
                 );
             })
             .finally(() => setIsLoading(false));
-    }, [user, oxyServices, t]);
+    }, [activeAccount, oxyServices, t]);
 
     const trustTierLabel = useMemo(
         () => (trustTier ? getTrustTierLabel(trustTier, t) : null),

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

@@ -77,7 +77,9 @@ const LOCKED_OPACITY = 0.5;
 
 const TrustRewardsScreen: React.FC<BaseScreenProps> = ({ goBack }) => {
     const { t } = useI18n();
-    const { user, oxyServices, isAuthenticated } = useOxy();
+    // Reputation/trust is the ACTIVE account's standing (the org/project/bot
+    // when switched, else the personal user).
+    const { activeAccount, oxyServices, isAuthenticated } = useOxy();
     const [reputationTotal, setReputationTotal] = useState<number>(0);
     const [, setIsLoading] = useState(true);
 
@@ -85,12 +87,12 @@ const TrustRewardsScreen: React.FC<BaseScreenProps> = ({ goBack }) => {
     const colors = bloomTheme.colors;
 
     useEffect(() => {
-        if (!user || !isAuthenticated) {
+        if (!activeAccount || !isAuthenticated) {
             setIsLoading(false);
             return;
         }
         setIsLoading(true);
-        oxyServices.getReputationBalance(user.id)
+        oxyServices.getReputationBalance(activeAccount.id)
             .then((balance) => {
                 setReputationTotal(balance.total || 0);
             })
@@ -98,7 +100,7 @@ const TrustRewardsScreen: React.FC<BaseScreenProps> = ({ goBack }) => {
                 setReputationTotal(0);
             })
             .finally(() => setIsLoading(false));
-    }, [user, isAuthenticated, oxyServices]);
+    }, [activeAccount, isAuthenticated, oxyServices]);
 
     const achievements: Achievement[] = useMemo(() => [
         {