@oxyhq/services 22.13.0 → 23.0.0

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

@@ -39,10 +39,10 @@
  * It is a cache write only — zero network, one `setQueryData` per key.
  */
 
-import type { QueryClient } from '@tanstack/react-query';
-import type { UserNameResponse } from '@oxyhq/contracts';
-import { queryKeys } from './queryKeys';
-import { useAuthStore } from '../../stores/authStore';
+import type { UserNameResponse } from "@oxyhq/contracts";
+import type { QueryClient } from "@tanstack/react-query";
+import { useAuthStore } from "../../stores/authStore";
+import { queryKeys } from "./queryKeys";
 
 /**
  * A user-shaped object that can be upserted into the cache. Intentionally
@@ -53,30 +53,30 @@ import { useAuthStore } from '../../stores/authStore';
  * pass through untouched (so the upsert never has to know the full DTO shape).
  */
 export interface CacheableUser {
-  id?: string;
-  /** Some sources (post/notification actors) carry the id as Mongo `_id`. */
-  _id?: string;
-  username?: string;
-  /**
-   * Canonical structured name (`UserNameResponse`) OR a plain display string on
-   * the looser actor objects. Normalized to the object shape on write.
-   */
-  name?: string | UserNameResponse;
-  /** Avatar file id. `null`/`''` are treated as "no avatar" (never degrade). */
-  avatar?: string | null;
-  /** Social counts. A partial `_count` never replaces a fuller one. */
-  _count?: { followers?: number; following?: number } | null;
-  /**
-   * Viewer-relative follow relationship. Present ONLY on an authenticated
-   * single-profile fetch; `null`/absent for anon/self/bulk/feed. Never stripped
-   * from an existing entry by a source that lacks it.
-   */
-  relationship?: { isFollowing?: boolean; followsYou?: boolean } | null;
-  [key: string]: unknown;
+	id?: string;
+	/** Some sources (post/notification actors) carry the id as Mongo `_id`. */
+	_id?: string;
+	username?: string;
+	/**
+	 * Canonical structured name (`UserNameResponse`) OR a plain display string on
+	 * the looser actor objects. Normalized to the object shape on write.
+	 */
+	name?: string | UserNameResponse;
+	/** Avatar file id. `null`/`''` are treated as "no avatar" (never degrade). */
+	avatar?: string | null;
+	/** Social counts. A partial `_count` never replaces a fuller one. */
+	_count?: { followers?: number; following?: number } | null;
+	/**
+	 * Viewer-relative follow relationship. Present ONLY on an authenticated
+	 * single-profile fetch; `null`/absent for anon/self/bulk/feed. Never stripped
+	 * from an existing entry by a source that lacks it.
+	 */
+	relationship?: { isFollowing?: boolean; followsYou?: boolean } | null;
+	[key: string]: unknown;
 }
 
 /** The degraded display-name sentinel (ghost-author rule). */
-const DEGRADED_DISPLAY_NAME = 'Unknown user';
+const DEGRADED_DISPLAY_NAME = "Unknown user";
 
 /** A cache entry always carries a resolved string `id`. */
 type CachedUser = CacheableUser & { id: string; name?: UserNameResponse };
@@ -88,28 +88,34 @@ type CachedUser = CacheableUser & { id: string; name?: UserNameResponse };
  * meaningful (a real `verified: false` or `_count.followers: 0`).
  */
 function isMeaningful(value: unknown): boolean {
-  if (value === undefined || value === null) return false;
-  if (typeof value === 'string') return value.trim() !== '';
-  return true;
+	if (value === undefined || value === null) return false;
+	if (typeof value === "string") return value.trim() !== "";
+	return true;
 }
 
 /** A display name is meaningful only when non-empty AND not the degraded sentinel. */
 function isMeaningfulDisplayName(value: unknown): value is string {
-  return typeof value === 'string' && value.trim() !== '' && value !== DEGRADED_DISPLAY_NAME;
+	return (
+		typeof value === "string" &&
+		value.trim() !== "" &&
+		value !== DEGRADED_DISPLAY_NAME
+	);
 }
 
 function isPlainObject(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
+	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
 /** Normalize the polymorphic `name` (string | object | nullish) to the canonical object shape. */
-function normalizeName(name: CacheableUser['name']): UserNameResponse | undefined {
-  if (name === undefined || name === null) return undefined;
-  if (typeof name === 'string') {
-    const trimmed = name.trim();
-    return trimmed ? { displayName: trimmed } : undefined;
-  }
-  return name;
+function normalizeName(
+	name: CacheableUser["name"],
+): UserNameResponse | undefined {
+	if (name === undefined || name === null) return undefined;
+	if (typeof name === "string") {
+		const trimmed = name.trim();
+		return trimmed ? { displayName: trimmed } : undefined;
+	}
+	return name;
 }
 
 /**
@@ -119,12 +125,12 @@ function normalizeName(name: CacheableUser['name']): UserNameResponse | undefine
  * object so the cache never holds a bare-string name).
  */
 function toCachedUser(user: CacheableUser, fallbackId: string): CachedUser {
-  const { name: rawName, ...rest } = user;
-  const id = String(user.id ?? user._id ?? fallbackId);
-  const name = normalizeName(rawName);
-  const normalized: CachedUser = { ...rest, id };
-  if (name !== undefined) normalized.name = name;
-  return normalized;
+	const { name: rawName, ...rest } = user;
+	const id = String(user.id ?? user._id ?? fallbackId);
+	const name = normalizeName(rawName);
+	const normalized: CachedUser = { ...rest, id };
+	if (name !== undefined) normalized.name = name;
+	return normalized;
 }
 
 /**
@@ -132,39 +138,43 @@ function toCachedUser(user: CacheableUser, fallbackId: string): CachedUser {
  * when no id can be resolved (nothing to key on).
  */
 function normalizeIncoming(user: CacheableUser): CachedUser | null {
-  const cached = toCachedUser(user, '');
-  return cached.id ? cached : null;
+	const cached = toCachedUser(user, "");
+	return cached.id ? cached : null;
 }
 
 /** Merge two `name` objects field-by-field, with anti-degradation on `displayName`. */
 function mergeName(
-  existing: UserNameResponse | undefined,
-  incoming: UserNameResponse | undefined,
+	existing: UserNameResponse | undefined,
+	incoming: UserNameResponse | undefined,
 ): UserNameResponse | undefined {
-  if (incoming === undefined) return existing;
-  if (existing === undefined) return incoming;
-  const merged: UserNameResponse = { ...existing };
-  for (const [key, value] of Object.entries(incoming)) {
-    if (key === 'displayName') continue;
-    if (isMeaningful(value)) merged[key] = value;
-  }
-  // Never let an empty / `'Unknown user'` displayName overwrite a real one.
-  if (isMeaningfulDisplayName(incoming.displayName)) {
-    merged.displayName = incoming.displayName;
-  }
-  return merged;
+	if (incoming === undefined) return existing;
+	if (existing === undefined) return incoming;
+	const merged: UserNameResponse = { ...existing };
+	for (const [key, value] of Object.entries(incoming)) {
+		if (key === "displayName") continue;
+		if (isMeaningful(value)) merged[key] = value;
+	}
+	// Never let an empty / `'Unknown user'` displayName overwrite a real one.
+	if (isMeaningfulDisplayName(incoming.displayName)) {
+		merged.displayName = incoming.displayName;
+	}
+	return merged;
 }
 
 /** Merge `_count` field-by-field so a partial count never replaces a fuller one. */
 function mergeCount(
-  existing: CacheableUser['_count'],
-  incoming: CacheableUser['_count'],
-): CacheableUser['_count'] {
-  if (!isPlainObject(incoming)) return existing;
-  const merged: { followers?: number; following?: number } = { ...(isPlainObject(existing) ? existing : {}) };
-  if (typeof incoming.followers === 'number') merged.followers = incoming.followers;
-  if (typeof incoming.following === 'number') merged.following = incoming.following;
-  return merged;
+	existing: CacheableUser["_count"],
+	incoming: CacheableUser["_count"],
+): CacheableUser["_count"] {
+	if (!isPlainObject(incoming)) return existing;
+	const merged: { followers?: number; following?: number } = {
+		...(isPlainObject(existing) ? existing : {}),
+	};
+	if (typeof incoming.followers === "number")
+		merged.followers = incoming.followers;
+	if (typeof incoming.following === "number")
+		merged.following = incoming.following;
+	return merged;
 }
 
 /**
@@ -172,16 +182,18 @@ function mergeCount(
  * or an anon/self/bulk `null`) must NEVER strip an existing viewer relationship.
  */
 function mergeRelationship(
-  existing: CacheableUser['relationship'],
-  incoming: CacheableUser['relationship'],
-): CacheableUser['relationship'] {
-  if (!isPlainObject(incoming)) return existing;
-  const merged: { isFollowing?: boolean; followsYou?: boolean } = {
-    ...(isPlainObject(existing) ? existing : {}),
-  };
-  if (typeof incoming.isFollowing === 'boolean') merged.isFollowing = incoming.isFollowing;
-  if (typeof incoming.followsYou === 'boolean') merged.followsYou = incoming.followsYou;
-  return merged;
+	existing: CacheableUser["relationship"],
+	incoming: CacheableUser["relationship"],
+): CacheableUser["relationship"] {
+	if (!isPlainObject(incoming)) return existing;
+	const merged: { isFollowing?: boolean; followsYou?: boolean } = {
+		...(isPlainObject(existing) ? existing : {}),
+	};
+	if (typeof incoming.isFollowing === "boolean")
+		merged.isFollowing = incoming.isFollowing;
+	if (typeof incoming.followsYou === "boolean")
+		merged.followsYou = incoming.followsYou;
+	return merged;
 }
 
 /**
@@ -193,54 +205,63 @@ function mergeRelationship(
  * only the by-username key carries it (`useUserByUsername`).
  */
 function mergeUsers(
-  existing: CachedUser,
-  incoming: CachedUser,
-  options?: { includeRelationship?: boolean },
+	existing: CachedUser,
+	incoming: CachedUser,
+	options?: { includeRelationship?: boolean },
 ): CachedUser {
-  const includeRelationship = options?.includeRelationship ?? true;
-  const merged: CachedUser = { ...existing };
-  for (const [key, value] of Object.entries(incoming)) {
-    if (key === 'name' || key === '_count' || key === 'relationship') continue;
-    if (key === 'id') {
-      merged.id = incoming.id;
-      continue;
-    }
-    if (isMeaningful(value)) merged[key] = value;
-  }
-  const name = mergeName(existing.name, incoming.name);
-  if (name !== undefined) merged.name = name;
-  const count = mergeCount(existing._count, incoming._count);
-  if (count !== undefined) merged._count = count;
-  if (includeRelationship) {
-    const relationship = mergeRelationship(existing.relationship, incoming.relationship);
-    if (relationship !== undefined) merged.relationship = relationship;
-  } else {
-    delete merged.relationship;
-  }
-  return merged;
+	const includeRelationship = options?.includeRelationship ?? true;
+	const merged: CachedUser = { ...existing };
+	for (const [key, value] of Object.entries(incoming)) {
+		if (key === "name" || key === "_count" || key === "relationship") continue;
+		if (key === "id") {
+			merged.id = incoming.id;
+			continue;
+		}
+		if (isMeaningful(value)) merged[key] = value;
+	}
+	const name = mergeName(existing.name, incoming.name);
+	if (name !== undefined) merged.name = name;
+	const count = mergeCount(existing._count, incoming._count);
+	if (count !== undefined) merged._count = count;
+	if (includeRelationship) {
+		const relationship = mergeRelationship(
+			existing.relationship,
+			incoming.relationship,
+		);
+		if (relationship !== undefined) merged.relationship = relationship;
+	} else {
+		merged.relationship = undefined;
+	}
+	return merged;
 }
 
 /** Merge-upsert a normalized user into one cache key (see module docs for semantics). */
 function upsertOneKey(
-  queryClient: QueryClient,
-  key: readonly unknown[],
-  incoming: CachedUser,
-  options: { includeRelationship: boolean },
+	queryClient: QueryClient,
+	key: readonly unknown[],
+	incoming: CachedUser,
+	options: { includeRelationship: boolean },
 ): void {
-  const mergeOpts = { includeRelationship: options.includeRelationship };
-  const existing = queryClient.getQueryData<CacheableUser>(key);
-  if (existing === undefined) {
-    // Cold slot: seed the full incoming object, STALE, so react-query refetches
-    // the full authoritative profile (relationship, counts, createdAt, …).
-    const seeded = mergeUsers({ id: incoming.id }, incoming, mergeOpts);
-    queryClient.setQueryData<CachedUser>(key, seeded, { updatedAt: 0 });
-    return;
-  }
-  // Existing entry: merge and leave its freshness lifecycle untouched. The
-  // existing entry is keyed by `incoming.id`, so use it as the fallback id.
-  const merged = mergeUsers(toCachedUser(existing, incoming.id), incoming, mergeOpts);
-  const dataUpdatedAt = queryClient.getQueryState(key)?.dataUpdatedAt ?? 0;
-  queryClient.setQueryData<CachedUser>(key, merged, { updatedAt: dataUpdatedAt });
+	const mergeOpts = { includeRelationship: options.includeRelationship };
+	const existing = queryClient.getQueryData<CacheableUser>(key);
+	if (existing === undefined) {
+		// Cold slot: seed the full incoming object, STALE, so react-query refetches
+		// the full authoritative profile (relationship, counts, createdAt, …).
+		const seeded = mergeUsers({ id: incoming.id }, incoming, mergeOpts);
+		queryClient.setQueryData<CachedUser>(key, seeded, { updatedAt: 0 });
+		return;
+	}
+	// Existing entry: merge and leave its freshness lifecycle untouched. The
+	// existing entry is keyed by `incoming.id`, so use it as the fallback id.
+	const merged = mergeUsers(
+		toCachedUser(existing, incoming.id),
+		incoming,
+		mergeOpts,
+	);
+	const dataUpdatedAt = queryClient.getQueryState(key)?.dataUpdatedAt ?? 0;
+	queryClient.setQueryData<CachedUser>(key, merged, {
+		updatedAt: dataUpdatedAt,
+	});
 }
 
 /**
@@ -251,7 +272,7 @@ function upsertOneKey(
  * empty string is honoured (anonymous scope).
  */
 function resolveViewerId(viewerId?: string): string {
-  return viewerId ?? useAuthStore.getState().user?.id ?? '';
+	return viewerId ?? useAuthStore.getState().user?.id ?? "";
 }
 
 /**
@@ -265,29 +286,29 @@ function resolveViewerId(viewerId?: string): string {
  *                    the current auth-store user id.
  */
 export function upsertCachedUser(
-  queryClient: QueryClient,
-  user: CacheableUser,
-  viewerId?: string,
+	queryClient: QueryClient,
+	user: CacheableUser,
+	viewerId?: string,
 ): void {
-  const incoming = normalizeIncoming(user);
-  if (!incoming) return;
+	const incoming = normalizeIncoming(user);
+	if (!incoming) return;
 
-  // By-id identity entry (read by `useUserById`). Not viewer-scoped — never store
-  // the viewer-relative `relationship` here or one viewer's follow state leaks
-  // into every other viewer's by-id cache entry.
-  upsertOneKey(queryClient, queryKeys.users.detail(incoming.id), incoming, {
-    includeRelationship: false,
-  });
+	// By-id identity entry (read by `useUserById`). Not viewer-scoped — never store
+	// the viewer-relative `relationship` here or one viewer's follow state leaks
+	// into every other viewer's by-id cache entry.
+	upsertOneKey(queryClient, queryKeys.users.detail(incoming.id), incoming, {
+		includeRelationship: false,
+	});
 
-  const username = incoming.username;
-  if (typeof username === 'string' && username.trim() !== '') {
-    // By-username entry (read by `useUserByUsername`). Viewer-scoped because the
-    // authenticated single-profile fetch embeds the viewer `relationship`. Build
-    // the key through the SAME helper the hook uses so username normalization
-    // (`trim().toLowerCase()`) matches byte-for-byte.
-    const key = queryKeys.users.byUsername(username, resolveViewerId(viewerId));
-    upsertOneKey(queryClient, key, incoming, { includeRelationship: true });
-  }
+	const username = incoming.username;
+	if (typeof username === "string" && username.trim() !== "") {
+		// By-username entry (read by `useUserByUsername`). Viewer-scoped because the
+		// authenticated single-profile fetch embeds the viewer `relationship`. Build
+		// the key through the SAME helper the hook uses so username normalization
+		// (`trim().toLowerCase()`) matches byte-for-byte.
+		const key = queryKeys.users.byUsername(username, resolveViewerId(viewerId));
+		upsertOneKey(queryClient, key, incoming, { includeRelationship: true });
+	}
 }
 
 /**
@@ -296,13 +317,13 @@ export function upsertCachedUser(
  * appears twice merges both slices into the single cache entry.
  */
 export function upsertCachedUsers(
-  queryClient: QueryClient,
-  users: readonly CacheableUser[] | null | undefined,
-  viewerId?: string,
+	queryClient: QueryClient,
+	users: readonly CacheableUser[] | null | undefined,
+	viewerId?: string,
 ): void {
-  if (!Array.isArray(users) || users.length === 0) return;
-  const resolvedViewerId = resolveViewerId(viewerId);
-  for (const user of users) {
-    if (user) upsertCachedUser(queryClient, user, resolvedViewerId);
-  }
+	if (!Array.isArray(users) || users.length === 0) return;
+	const resolvedViewerId = resolveViewerId(viewerId);
+	for (const user of users) {
+		if (user) upsertCachedUser(queryClient, user, resolvedViewerId);
+	}
 }

package/src/ui/hooks/useAssets.ts

@@ -48,7 +48,7 @@ export const useAssets = () => {
   // Upload asset with progress tracking
   const upload = useCallback(async (
     file: File, 
-    metadata?: Record<string, any>
+    metadata?: Record<string, unknown>
   ): Promise<Asset | null> => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');

package/src/ui/hooks/useAsyncAction.ts

@@ -7,11 +7,11 @@ interface UseAsyncActionOptions<T> {
     /** Success message to display */
     successMessage?: string;
     /** Error message to display (or function to get message from error) */
-    errorMessage?: string | ((error: any) => string);
+    errorMessage?: string | ((error: unknown) => string);
     /** Callback on success */
     onSuccess?: (result: T) => void;
     /** Callback on error */
-    onError?: (error: any) => void;
+    onError?: (error: unknown) => void;
     /** Show loading toast */
     showLoadingToast?: boolean;
     /** Loading message */

package/src/ui/hooks/useAuth.ts

@@ -17,8 +17,10 @@
  * }
  * ```
  *
- * Cross-domain session (zero cookies):
- * - Web: silent OAuth (`prompt=none`) on cold boot; hub-ticket sync to auth.oxy.so after sign-in
+ * Session restore (zero cookies):
+ * - Web: this origin's own persisted `{deviceId, deviceSecret}` — a signed-out
+ *   origin stays signed out until the user presses "Continue with Oxy". There is
+ *   no cross-origin silent SSO: the SDK never navigates the tab on its own.
  * - Native: shared Keychain / app-group identity (Commons)
  * - Realtime sync: Socket.IO `session_state` on `device:<deviceId>` once authenticated
  * - Manual sign-in: signIn() opens the in-app account dialog (web + native)

package/src/ui/hooks/useOnlineStatus.ts

@@ -2,8 +2,9 @@
  * useOnlineStatus
  *
  * Reactive boolean reflecting TanStack Query's `onlineManager` state.
- * Mirrors browser `online`/`offline` events on web and NetInfo updates on
- * native (both wired up in `OxyProvider`).
+ * Mirrors browser `online`/`offline` events on web and NetInfo reachability
+ * updates on native (both wired up in `OxyProvider`, aligned with Bloom's
+ * `ConnectionStatusToasts` semantics).
  *
  * Use this for surfacing offline UI — an OfflineBanner, a disabled "Sync"
  * button, an inline "queued" badge on pending writes, etc. For pending /

package/src/ui/hooks/useSessionManagement.ts

@@ -9,7 +9,6 @@ import type { OxyServices } from '@oxyhq/core';
 import type { QueryClient } from '@tanstack/react-query';
 import { clearQueryCache } from './queryClient';
 import { isWebBrowser } from '../utils/isWebBrowser';
-import { clearCrossOriginRestoreGuards } from '../utils/crossOriginRestore';
 import { resetSessionScopedStores } from '../stores/resetSessionScopedStores';
 
 export interface UseSessionManagementOptions {
@@ -197,7 +196,6 @@ export const useSessionManagement = ({
     }
     
     await clearSessionStorage();
-    clearCrossOriginRestoreGuards();
     onAuthStateChange?.(null);
   }, [clearSessionStorage, logoutStore, onAuthStateChange, oxyServices, queryClient, storage, logger]);
 

package/src/ui/screens/AccountMembersScreen.tsx

@@ -5,7 +5,7 @@ import {
   TouchableOpacity,
   ActivityIndicator,
 } from 'react-native';
-import { Ionicons } from '@expo/vector-icons';
+import Ionicons from '@expo/vector-icons/Ionicons';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { toast } from '@oxyhq/bloom';
 import { surfaces } from '@oxyhq/bloom/surfaces';

package/src/ui/screens/ConnectedAppsScreen.tsx

@@ -108,7 +108,7 @@ const ConnectedAppsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) =>
                 </Text>
             </View>
         ),
-        [t, bloomTheme.colors.textSecondary],
+        [t],
     );
 
     const renderItem = useCallback(

package/src/ui/screens/CreateAccountScreen.tsx

@@ -1,7 +1,7 @@
 import type React from 'react';
 import { useState, useCallback, useRef, useEffect } from 'react';
 import { View, ActivityIndicator } from 'react-native';
-import { Ionicons } from '@expo/vector-icons';
+import Ionicons from '@expo/vector-icons/Ionicons';
 import type { AccountKind, CreateAccountInput, OrganizationCategory } from '@oxyhq/core';
 import { ORGANIZATION_CATEGORIES } from '@oxyhq/core';
 import type { BaseScreenProps } from '../types/navigation';

package/src/ui/screens/EditProfileFieldScreen.tsx

@@ -6,7 +6,7 @@ import {
     TouchableOpacity,
     type TextInputProps,
 } from 'react-native';
-import { Ionicons } from '@expo/vector-icons';
+import Ionicons from '@expo/vector-icons/Ionicons';
 import type { BaseScreenProps } from '../types/navigation';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { Text } from '@oxyhq/bloom/typography';

package/src/ui/screens/FAQScreen.tsx

@@ -1,7 +1,7 @@
 import type React from 'react';
 import { useState, useEffect, useCallback, useMemo } from 'react';
 import { View, ScrollView, StyleSheet } from 'react-native';
-import { Ionicons } from '@expo/vector-icons';
+import Ionicons from '@expo/vector-icons/Ionicons';
 import { toast } from '@oxyhq/bloom';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { Search } from '@oxyhq/bloom/search';