@oxy.so/services 11.14.0 → 11.15.0

package/src/ui/navigation/routes.ts

@@ -1,7 +1,6 @@
-import { lazy, type ComponentType } from 'react';
+import type { ComponentType } from 'react';
 import type { BaseScreenProps } from '../types/navigation';
 
-// Define all available route names
 export type RouteName =
   | 'Supervision'
   | 'ManageAccount' // Unified "Manage your Oxy Account" surface
@@ -14,10 +13,11 @@ export type RouteName =
   | 'FileManagement'
   | 'FileTrash' // The person's trash: restore, or delete permanently (ADR 0043 D5)
   | 'HelpSupport'
+  | 'ReportBug'
+  | 'OxyOne'
   | 'LegalDocuments'
   | 'AppInfo'
   | 'WelcomeNewUser'
-  | 'UserLinks'
   | 'HistoryView'
   | 'EditProfile' // Profile-editing hub: one row per editable field
   | 'EditProfileField' // Dedicated screen for editing a single profile field
@@ -45,105 +45,77 @@ export type RouteName =
   | 'SignInAuthenticator' // The account's authenticator app and backup codes
   | 'AccountDialog'; // Unified account switcher + sign-in surface (OxyAccountDialogScreen body)
 
-/**
- * The component for each route, loaded on demand.
- *
- * Every entry is `lazy(() => import(...))`: the screen module is fetched and
- * evaluated the first time its surface is presented, never at import time. That
- * matters twice over — screens import `OxyContext`, which reaches back here, so
- * eager evaluation would run screens mid-cycle; and it keeps native-only screen
- * dependencies out of the evaluation path of every consumer that merely touches
- * the SDK.
- *
- * What defers the load must NOT be `require()`. `@oxy.so/services` ships an ESM
- * build, and a `require()` in ESM output forces web bundlers into CommonJS
- * interop: rolldown-vite defers every module in the required subgraph behind a
- * lazy initializer and then hands a consumer that statically imported one of
- * them the still-`undefined` binding. That is how `OxySignInRequestSurface`
- * reached auth.oxy.so/authorize as `undefined` and blanked the page with React
- * error #130 — this registry pulled `OxyAccountDialogScreen`, and the whole
- * sign-in surface subgraph with it, through `require()`.
- *
- * The value type is `ComponentType<never>`, which every screen satisfies. A few
- * screens (`Profile`, `PaymentGateway`, `UserLinks`, `FollowersList`,
- * `FollowingList`) declare props BEYOND {@link BaseScreenProps} — `userId`,
- * `amount` — that only reach them through the route's untyped props bag
- * (`present(route, props)`), so this map cannot prove they are satisfied. The
- * previous `require()` returned `any` and hid that entirely; stating it here
- * confines the gap to one documented widening in {@link getScreenComponent}.
- */
-const screenComponents: Record<RouteName, ComponentType<never>> = {
-  Supervision: lazy(() => import('../screens/SupervisionScreen')),
-  ManageAccount: lazy(() => import('../screens/ManageAccountScreen')),
-  AccountVerification: lazy(() => import('../screens/AccountVerificationScreen')),
-  PaymentGateway: lazy(() => import('../screens/PaymentGatewayScreen')),
-  Profile: lazy(() => import('../screens/ProfileScreen')),
-  LanguageSelector: lazy(() => import('../screens/LanguageSelectorScreen')),
-  PrivacySettings: lazy(() => import('../screens/PrivacySettingsScreen')),
-  SearchSettings: lazy(() => import('../screens/SearchSettingsScreen')),
-  FileManagement: lazy(() => import('../screens/FileManagementScreen')),
-  FileTrash: lazy(() => import('../screens/FileTrashScreen')),
-  HelpSupport: lazy(() => import('../screens/HelpSupportScreen')),
-  LegalDocuments: lazy(() => import('../screens/LegalDocumentsScreen')),
-  AppInfo: lazy(() => import('../screens/AppInfoScreen')),
-  WelcomeNewUser: lazy(() => import('../screens/WelcomeNewUserScreen')),
-  UserLinks: lazy(() => import('../screens/UserLinksScreen')),
-  HistoryView: lazy(() => import('../screens/HistoryViewScreen')),
-  EditProfile: lazy(() => import('../screens/EditProfileScreen')),
-  EditProfileField: lazy(() => import('../screens/EditProfileFieldScreen')),
-  // Informational screens
-  LearnMoreUsernames: lazy(() => import('../screens/LearnMoreUsernamesScreen')),
-  // Oxy Trust screens
-  TrustCenter: lazy(() => import('../screens/trust/TrustCenterScreen')),
-  TrustLeaderboard: lazy(() => import('../screens/trust/TrustLeaderboardScreen')),
-  TrustRewards: lazy(() => import('../screens/trust/TrustRewardsScreen')),
-  TrustRules: lazy(() => import('../screens/trust/TrustRulesScreen')),
-  AboutTrust: lazy(() => import('../screens/trust/TrustAboutScreen')),
-  TrustFAQ: lazy(() => import('../screens/trust/TrustFAQScreen')),
-  // User list screens (followers/following)
-  FollowersList: lazy(() => import('../screens/FollowersListScreen')),
-  FollowingList: lazy(() => import('../screens/FollowingListScreen')),
-  CreateAccount: lazy(() => import('../screens/CreateAccountScreen')),
-  AccountMembers: lazy(() => import('../screens/AccountMembersScreen')),
-  AccountSettings: lazy(() => import('../screens/AccountSettingsScreen')),
-  ChangeAvatar: lazy(() => import('../screens/ChangeAvatarScreen')),
-  AvatarCrop: lazy(() => import('../screens/AvatarCropScreen')),
-  Notifications: lazy(() => import('../screens/NotificationsScreen')),
-  Domains: lazy(() => import('../screens/DomainsScreen')),
-  ConnectedApps: lazy(() => import('../screens/ConnectedAppsScreen')),
-  Preferences: lazy(() => import('../screens/PreferencesScreen')),
-  // The account's own sign-in security, in its settings.
-  DeleteAccount: lazy(() => import('../screens/DeleteAccountScreen')),
-  LinkCommons: lazy(() => import('../screens/LinkCommonsScreen')),
-  SignInPassword: lazy(() => import('../screens/SignInPasswordScreen')),
-  SignInAuthenticator: lazy(() => import('../screens/SignInAuthenticatorScreen')),
-  // Unified account switcher + sign-in surface. Its body lives in the
-  // `OxyAccountDialogScreen` component (folded from the standalone dialog); the
-  // surface stack provides the Dialog chrome around it.
-  AccountDialog: lazy(() => import('../components/OxyAccountDialogScreen')),
-};
+type ScreenComponents = Record<RouteName, ComponentType<never>>;
+let components: ScreenComponents | undefined;
+let loading: Promise<void> | undefined;
 
-/**
- * Resolve the component for a route.
- *
- * The map is total over {@link RouteName} — the compiler enforces that at its
- * declaration — so this returns `undefined` only for a caller that reached here
- * with an unchecked string; {@link isValidRoute} is how such a caller narrows.
- *
- * The surface host renders the result with {@link BaseScreenProps} merged with
- * the route's own props bag, so that is the type it is handed back as. This one
- * widening is where the gap documented on {@link screenComponents} lives: the map
- * dispatches on a string key, so a screen's extra prop requirements are met at
- * `present(route, props)` call sites, not provable here. No caching is needed —
- * React memoizes each `lazy()` component's module after its first load.
- */
-export const getScreenComponent = (
-  routeName: RouteName,
-): ComponentType<BaseScreenProps> | undefined =>
-  screenComponents[routeName] as ComponentType<BaseScreenProps>;
+export function registerScreens(screens: ScreenComponents): void {
+  components = screens;
+}
 
-// Helper function to check if a route exists
-// Uses the screenComponents map to check existence without loading the screen
-export const isValidRoute = (routeName: string): routeName is RouteName => {
-  return routeName in screenComponents;
-};
+export function screensReady(): boolean {
+  return components !== undefined;
+}
+
+/** The lean client warms all screen code at provider startup, before navigation. */
+export function loadScreens(): Promise<void> {
+  if (components) return Promise.resolve();
+  loading ??= import('./screenComponents')
+    .then(({ screenComponents }) => {
+      registerScreens(screenComponents);
+    })
+    .catch((error: unknown) => {
+      loading = undefined;
+      throw error;
+    });
+  return loading;
+}
+
+export const getScreenComponent = (route: RouteName): ComponentType<BaseScreenProps> | undefined =>
+  components?.[route] as ComponentType<BaseScreenProps> | undefined;
+
+const ROUTES: ReadonlySet<string> = new Set([
+  'Supervision',
+  'FileTrash',
+  'ManageAccount',
+  'AccountVerification',
+  'PaymentGateway',
+  'Profile',
+  'LanguageSelector',
+  'PrivacySettings',
+  'SearchSettings',
+  'FileManagement',
+  'HelpSupport',
+  'ReportBug',
+  'OxyOne',
+  'LegalDocuments',
+  'AppInfo',
+  'WelcomeNewUser',
+  'HistoryView',
+  'EditProfile',
+  'EditProfileField',
+  'LearnMoreUsernames',
+  'TrustCenter',
+  'TrustLeaderboard',
+  'TrustRewards',
+  'TrustRules',
+  'AboutTrust',
+  'TrustFAQ',
+  'FollowersList',
+  'FollowingList',
+  'CreateAccount',
+  'AccountMembers',
+  'AccountSettings',
+  'ChangeAvatar',
+  'AvatarCrop',
+  'Notifications',
+  'Domains',
+  'ConnectedApps',
+  'Preferences',
+  'DeleteAccount',
+  'LinkCommons',
+  'SignInPassword',
+  'SignInAuthenticator',
+  'AccountDialog',
+]);
+export const isValidRoute = (name: string): name is RouteName => ROUTES.has(name);

package/src/ui/navigation/screenComponents.ts

@@ -0,0 +1,96 @@
+import type { ComponentType } from 'react';
+import type { RouteName } from './routes';
+import SupervisionScreenComponent from '../screens/SupervisionScreen';
+import FileTrashScreenComponent from '../screens/FileTrashScreen';
+import ManageAccountScreenComponent from '../screens/ManageAccountScreen';
+import AccountVerificationScreenComponent from '../screens/AccountVerificationScreen';
+import PaymentGatewayScreenComponent from '../screens/PaymentGatewayScreen';
+import ProfileScreenComponent from '../screens/ProfileScreen';
+import LanguageSelectorScreenComponent from '../screens/LanguageSelectorScreen';
+import PrivacySettingsScreenComponent from '../screens/PrivacySettingsScreen';
+import SearchSettingsScreenComponent from '../screens/SearchSettingsScreen';
+import FileManagementScreenComponent from '../screens/FileManagementScreen';
+import OxyOneScreenComponent from '../screens/OxyOneScreen';
+import ReportBugScreenComponent from '../screens/ReportBugScreen';
+import HelpSupportScreenComponent from '../screens/HelpSupportScreen';
+import LegalDocumentsScreenComponent from '../screens/LegalDocumentsScreen';
+import AppInfoScreenComponent from '../screens/AppInfoScreen';
+import WelcomeNewUserScreenComponent from '../screens/WelcomeNewUserScreen';
+import HistoryViewScreenComponent from '../screens/HistoryViewScreen';
+import EditProfileScreenComponent from '../screens/EditProfileScreen';
+import EditProfileFieldScreenComponent from '../screens/EditProfileFieldScreen';
+import LearnMoreUsernamesScreenComponent from '../screens/LearnMoreUsernamesScreen';
+import TrustCenterScreenComponent from '../screens/trust/TrustCenterScreen';
+import TrustLeaderboardScreenComponent from '../screens/trust/TrustLeaderboardScreen';
+import TrustRewardsScreenComponent from '../screens/trust/TrustRewardsScreen';
+import TrustRulesScreenComponent from '../screens/trust/TrustRulesScreen';
+import AboutTrustScreenComponent from '../screens/trust/TrustAboutScreen';
+import TrustFAQScreenComponent from '../screens/trust/TrustFAQScreen';
+import FollowersListScreenComponent from '../screens/FollowersListScreen';
+import FollowingListScreenComponent from '../screens/FollowingListScreen';
+import CreateAccountScreenComponent from '../screens/CreateAccountScreen';
+import AccountMembersScreenComponent from '../screens/AccountMembersScreen';
+import AccountSettingsScreenComponent from '../screens/AccountSettingsScreen';
+import ChangeAvatarScreenComponent from '../screens/ChangeAvatarScreen';
+import AvatarCropScreenComponent from '../screens/AvatarCropScreen';
+import NotificationsScreenComponent from '../screens/NotificationsScreen';
+import DomainsScreenComponent from '../screens/DomainsScreen';
+import ConnectedAppsScreenComponent from '../screens/ConnectedAppsScreen';
+import PreferencesScreenComponent from '../screens/PreferencesScreen';
+import DeleteAccountScreenComponent from '../screens/DeleteAccountScreen';
+import LinkCommonsScreenComponent from '../screens/LinkCommonsScreen';
+import SignInPasswordScreenComponent from '../screens/SignInPasswordScreen';
+import SignInAuthenticatorScreenComponent from '../screens/SignInAuthenticatorScreen';
+import AccountDialogScreenComponent from '../components/OxyAccountDialogScreen';
+
+export const screenComponents: Record<RouteName, ComponentType<never>> = {
+  Supervision: SupervisionScreenComponent,
+  FileTrash: FileTrashScreenComponent,
+  ManageAccount: ManageAccountScreenComponent,
+  AccountVerification: AccountVerificationScreenComponent,
+  PaymentGateway: PaymentGatewayScreenComponent,
+  Profile: ProfileScreenComponent,
+  LanguageSelector: LanguageSelectorScreenComponent,
+  PrivacySettings: PrivacySettingsScreenComponent,
+  SearchSettings: SearchSettingsScreenComponent,
+  FileManagement: FileManagementScreenComponent,
+  HelpSupport: HelpSupportScreenComponent,
+  ReportBug: ReportBugScreenComponent,
+  OxyOne: OxyOneScreenComponent,
+  LegalDocuments: LegalDocumentsScreenComponent,
+  AppInfo: AppInfoScreenComponent,
+  WelcomeNewUser: WelcomeNewUserScreenComponent,
+  HistoryView: HistoryViewScreenComponent,
+  EditProfile: EditProfileScreenComponent,
+  EditProfileField: EditProfileFieldScreenComponent,
+  // Informational screens
+  LearnMoreUsernames: LearnMoreUsernamesScreenComponent,
+  // Oxy Trust screens
+  TrustCenter: TrustCenterScreenComponent,
+  TrustLeaderboard: TrustLeaderboardScreenComponent,
+  TrustRewards: TrustRewardsScreenComponent,
+  TrustRules: TrustRulesScreenComponent,
+  AboutTrust: AboutTrustScreenComponent,
+  TrustFAQ: TrustFAQScreenComponent,
+  // User list screens (followers/following)
+  FollowersList: FollowersListScreenComponent,
+  FollowingList: FollowingListScreenComponent,
+  CreateAccount: CreateAccountScreenComponent,
+  AccountMembers: AccountMembersScreenComponent,
+  AccountSettings: AccountSettingsScreenComponent,
+  ChangeAvatar: ChangeAvatarScreenComponent,
+  AvatarCrop: AvatarCropScreenComponent,
+  Notifications: NotificationsScreenComponent,
+  Domains: DomainsScreenComponent,
+  ConnectedApps: ConnectedAppsScreenComponent,
+  Preferences: PreferencesScreenComponent,
+  // The account's own sign-in security, in its settings.
+  DeleteAccount: DeleteAccountScreenComponent,
+  LinkCommons: LinkCommonsScreenComponent,
+  SignInPassword: SignInPasswordScreenComponent,
+  SignInAuthenticator: SignInAuthenticatorScreenComponent,
+  // Unified account switcher + sign-in surface. Its body lives in the
+  // `OxyAccountDialogScreen` component (folded from the standalone dialog); the
+  // surface stack provides the Dialog chrome around it.
+  AccountDialog: AccountDialogScreenComponent,
+};

package/src/ui/navigation/surfaceBackBridge.ts

@@ -37,7 +37,7 @@ function installEscapeHandler(): void {
     'keydown',
     (event) => {
       if (event.key !== 'Escape' || handlerStack.length === 0) return;
-      invokeTopHandler();
+      if (!invokeTopHandler()) return;
       event.stopImmediatePropagation();
       event.preventDefault();
     },

package/src/ui/navigation/surfaceNavStack.ts

@@ -28,6 +28,8 @@ export interface NavFrame {
 export interface NavStackState {
   /** Bottom → top; the last frame is the visible screen. */
   frames: NavFrame[];
+  /** Direction of the last in-dialog navigation for Bloom's content transition. */
+  direction: 'forward' | 'backward' | 'none';
   /** Flipped once a dismiss is requested; the host resolves the Bloom surface. */
   closing: boolean;
   /** The value the surface's `present()` promise resolves with on dismissal. */
@@ -40,7 +42,7 @@ export interface SurfaceNavStack {
   navigate(route: RouteName, props?: Record<string, unknown>): void;
   /** Swap the top frame in place (no history entry). */
   replace(route: RouteName, props?: Record<string, unknown>): void;
-  /** Pop one frame. Returns `false` when already at the root frame. */
+  /** Return to the prior wizard step, then pop a frame. False at the root with no prior step. */
   goBack(): boolean;
   /** Whether a back is possible (a deeper frame OR a prior wizard step). */
   canGoBack(): boolean;
@@ -88,6 +90,7 @@ export function createSurfaceNavStack(
 ): SurfaceNavStack {
   const store = createStore<NavStackState>(() => ({
     frames: [makeFrame(route, props)],
+    direction: 'none',
     closing: false,
     closeResult: undefined,
   }));
@@ -117,9 +120,17 @@ export function createSurfaceNavStack(
 
   const goBack = (): boolean => {
     const { frames } = store.getState();
+    const current = frames[frames.length - 1];
+    if (current.step > 0) {
+      store.setState({
+        frames: [...frames.slice(0, -1), { ...current, step: current.step - 1 }],
+        direction: 'backward',
+      });
+      return true;
+    }
     if (frames.length <= 1) return false;
     const nextLength = frames.length - 1;
-    store.setState({ frames: frames.slice(0, -1) });
+    store.setState({ frames: frames.slice(0, -1), direction: 'backward' });
     // Backing out past a sub-flow's entry frame cancels it (resolve undefined).
     // A single pop crosses at most one boundary, but loop for safety.
     while (flowStack.length && nextLength <= flowStack[flowStack.length - 1].returnLength) {
@@ -134,11 +145,15 @@ export function createSurfaceNavStack(
     requestDismiss,
     goBack,
     navigate(nextRoute, nextProps) {
-      store.setState((state) => ({ frames: [...state.frames, makeFrame(nextRoute, nextProps)] }));
+      store.setState((state) => ({
+        frames: [...state.frames, makeFrame(nextRoute, nextProps)],
+        direction: 'forward',
+      }));
     },
     replace(nextRoute, nextProps) {
       store.setState((state) => ({
         frames: [...state.frames.slice(0, -1), makeFrame(nextRoute, nextProps)],
+        direction: 'forward',
       }));
     },
     canGoBack() {
@@ -149,13 +164,22 @@ export function createSurfaceNavStack(
       store.setState((state) => {
         const frames = state.frames.slice();
         const index = frames.length - 1;
+        const direction =
+          step === frames[index].step
+            ? state.direction
+            : step < frames[index].step
+              ? 'backward'
+              : 'forward';
         frames[index] = { ...frames[index], step };
-        return { frames };
+        return { frames, direction };
       });
     },
     beginFlow(nextRoute, nextProps) {
       const returnLength = store.getState().frames.length;
-      store.setState((state) => ({ frames: [...state.frames, makeFrame(nextRoute, nextProps)] }));
+      store.setState((state) => ({
+        frames: [...state.frames, makeFrame(nextRoute, nextProps)],
+        direction: 'forward',
+      }));
       return new Promise<unknown>((resolve) => {
         flowStack.push({ returnLength, resolve });
       });
@@ -167,7 +191,10 @@ export function createSurfaceNavStack(
         requestDismiss(result);
         return;
       }
-      store.setState((state) => ({ frames: state.frames.slice(0, flow.returnLength) }));
+      store.setState((state) => ({
+        frames: state.frames.slice(0, flow.returnLength),
+        direction: 'backward',
+      }));
       flow.resolve(result);
     },
     abandonActiveFlow() {

package/src/ui/navigation/surfaceRegistry.ts

@@ -1,3 +1,4 @@
+import type { AppColorName } from '@oxy.so/bloom/theme';
 import type { ReactNode } from 'react';
 import type { AccountDialogView } from '@oxy.so/core/session';
 import type { FileMetadata } from '@oxy.so/core';
@@ -42,10 +43,11 @@ export interface SurfaceRegistry {
   /** The person's trash (ADR 0043 D5), opened from the file manager. */
   FileTrash: SurfaceRoute;
   HelpSupport: SurfaceRoute;
+  ReportBug: SurfaceRoute;
+  OxyOne: SurfaceRoute;
   LegalDocuments: SurfaceRoute;
   AppInfo: SurfaceRoute;
   WelcomeNewUser: SurfaceRoute;
-  UserLinks: SurfaceRoute;
   HistoryView: SurfaceRoute;
   EditProfile: SurfaceRoute;
   EditProfileField: SurfaceRoute;
@@ -136,6 +138,9 @@ export type SurfacePresentation = 'sheet' | 'center' | 'drawer' | 'fullScreen';
 export interface SurfaceRouteConfig {
   /** Which surface hosts the route. */
   presentation: SurfacePresentation;
+  /** Scoped Bloom recipe for the full panel, including navigation chrome. */
+  colorPreset?: AppColorName;
+  typography?: 'default' | 'system';
   /**
    * When `false`, the route owns its own scroll container (a FlatList /
    * SectionList / VirtualizedList, or its own ScrollView) and the host must not
@@ -263,6 +268,7 @@ export const getSurfaceConfig = (
   route: RouteName,
   props: Record<string, unknown>,
 ): SurfaceRouteConfig => {
+  if (route === 'OxyOne') return { ...DEFAULT_SURFACE_CONFIG, colorPreset: 'blue' };
   if (route === 'FileManagement' && isFileManagementImageOnlyPicker(props)) {
     // The flagship photo picker MORPHS in place like every other screen. It is an
     // own-scroller (`PhotoPickerView`'s FlatList) that paints its full-bleed black

package/src/ui/navigation/surfaces.ts

@@ -5,7 +5,7 @@ import {
   type PresentOptions,
   type SurfaceControls,
 } from '@oxy.so/bloom/surfaces';
-import type { RouteName } from './routes';
+import { loadScreens, screensReady, type RouteName } from './routes';
 import {
   getSurfaceConfig,
   type SurfaceProps,
@@ -76,6 +76,7 @@ function bloomOptionsFor(config: SurfaceRouteConfig): PresentOptions {
       // programmatic-only dismiss — matching the shipped image-picker Dialog.
       return {
         placement: SHEET_PLACEMENT,
+        header,
         contentPadding: 0,
         maxWidth: 640,
         maxHeightRatio: 0.9,
@@ -154,20 +155,26 @@ function presentInternal<K extends RouteName>(
   const config = getSurfaceConfig(route, props);
   const bloomOpts: PresentOptions = { label: route, ...bloomOptionsFor(config), ...opts };
 
-  // `SurfaceScreen` is statically imported but only READ here, at presentation
-  // time. That keeps the surfaces.ts <-> SurfaceScreen cycle safe (a mounted
-  // SurfaceScreen imports these presenters, while presenting one renders a
-  // SurfaceScreen) without a `require()` — which ESM output must never contain,
-  // see the note on `screenComponents` in `./routes`.
-  const result = bloomSurfaces.present<SurfaceResult<K>>(
-    (surface: SurfaceControls) =>
-      createElement(SurfaceScreen, {
-        navStack,
-        surface,
-        dismissOnBackdrop: bloomOpts.dismissOnBackdrop ?? true,
-      }),
-    bloomOpts,
-  );
+  const open = () =>
+    bloomSurfaces.present<SurfaceResult<K>>(
+      (surface: SurfaceControls) =>
+        createElement(SurfaceScreen, {
+          navStack,
+          surface,
+          navigation: surfaceNavigation,
+          dismissOnBackdrop: bloomOpts.dismissOnBackdrop ?? true,
+        }),
+      bloomOpts,
+    );
+
+  // Never mount a partially-loaded frame. Full UI entries take the sync path;
+  // the lean entry's startup preload normally finishes before the first press.
+  const result = screensReady()
+    ? open()
+    : loadScreens().then(() => {
+        if (navStack.store.getState().closing) return undefined;
+        return open();
+      });
 
   const instance: SurfaceInstance<K> = {
     route,
@@ -355,3 +362,11 @@ export const surfaces = {
 export function useSurfaces(): typeof surfaces {
   return surfaces;
 }
+
+// Pass commands into the screen so rendering never imports its own presenter.
+const surfaceNavigation = {
+  closeAllRouteSurfaces,
+  navigateWithinOrPresent,
+  presentRoute,
+  replaceWithinOrPresent,
+};

package/src/ui/one-video.tsx

@@ -0,0 +1,44 @@
+/** Optional video entry: never re-export from services or its UI root barrels. */
+import { useEffect } from 'react';
+import { AppState, Image, StyleSheet, View } from 'react-native';
+import { useVideoPlayer } from 'expo-video';
+import { VideoView } from '@oxy.so/bloom/video-view';
+import { useReducedMotion } from 'react-native-reanimated';
+import floralVideo from '../assets/one/floral.mp4';
+import floralPoster from '../assets/one/floral.jpg';
+
+/** Muted decorative artwork. Bloom's SubscriptionPlans owns its fade and layout. */
+export function OxyOneVideo() {
+  const reducedMotion = useReducedMotion();
+  const player = useVideoPlayer(reducedMotion ? null : floralVideo, (video) => {
+    video.muted = true;
+    video.loop = true;
+  });
+  useEffect(() => {
+    const update = (state: string | null | undefined) => {
+      if (!reducedMotion && state === 'active') player.play();
+      else player.pause();
+    };
+    update(AppState.currentState);
+    const subscription = AppState.addEventListener('change', update);
+    return () => subscription.remove();
+  }, [player, reducedMotion]);
+  return (
+    <View
+      style={StyleSheet.absoluteFill}
+      accessibilityElementsHidden
+      importantForAccessibility="no-hide-descendants"
+    >
+      <Image source={floralPoster} resizeMode="cover" style={StyleSheet.absoluteFill} />
+      {!reducedMotion && (
+        <VideoView
+          player={player}
+          nativeControls={false}
+          contentFit="cover"
+          surfaceType="textureView"
+          style={StyleSheet.absoluteFill}
+        />
+      )}
+    </View>
+  );
+}

package/src/ui/runtime/createOxyRuntime.ts

@@ -465,7 +465,13 @@ export function createOxyRuntime(config: OxyRuntimeConfig): OxyRuntime {
         touch();
       }
       for (const resolved of users) {
-        facts.profiles.set(resolved.id, resolved);
+        // Bulk profiles are public and cannot replace the owner's locale
+        // preferences learned from a self-profile read or a confirmed write.
+        const known = facts.profiles.get(resolved.id);
+        facts.profiles.set(
+          resolved.id,
+          known?.languages !== undefined ? { ...resolved, languages: known.languages } : resolved,
+        );
       }
       const projected = normalizeAndSortSessions(
         deviceStateToClientSessions(latest, facts.profiles, pinnedAccountId),

package/src/ui/screens/AccountMembersScreen.tsx

@@ -5,7 +5,7 @@ import {
 } from '@oxy.so/bloom/segmented-control';
 import type React from 'react';
 import { useCallback, useMemo, useState } from 'react';
-import { View, ActivityIndicator } from 'react-native';
+import { View } from 'react-native';
 import Ionicons from '../icons/Ionicons';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { toast } from '@oxy.so/bloom/toast';
@@ -18,7 +18,7 @@ import { Divider } from '@oxy.so/bloom/divider';
 import type { AccountMember, AccountRole } from '@oxy.so/core';
 import { accountRoleLabel, getNormalizedUserHandle } from '@oxy.so/core';
 import type { BaseScreenProps } from '../types/navigation';
-import { useOxy } from '../context/OxyContext';
+import { useOxy } from '../context/oxyRuntimeContext';
 import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 
@@ -44,7 +44,7 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
     title: t('accounts.members.title') || 'Members',
     subtitle: t('accounts.members.subtitle') || 'People with access to this account.',
   });
-  const { oxyServices, canUsePrivateApi } = useOxy();
+  const { oxyServices, canUsePrivateApi, accounts } = useOxy();
   const queryClient = useQueryClient();
 
   const id = typeof accountId === 'string' ? accountId : '';
@@ -56,6 +56,8 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
 
   const accountQuery = useQuery({
     queryKey: ['accounts', 'detail', id],
+    initialData: accounts?.find((account) => account.accountId === id),
+    initialDataUpdatedAt: 0,
     queryFn: () => oxyServices.accounts.get(id),
     enabled: canUsePrivateApi && id.length > 0,
   });
@@ -388,9 +390,7 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
       {canRead ? (
         <View className="gap-space-8">
           {membersQuery.isLoading ? (
-            <View className="items-center py-space-24">
-              <ActivityIndicator color={colors.primary} />
-            </View>
+            <View className="items-center py-space-24">{null}</View>
           ) : members.length === 0 ? (
             <Text className="text-body font-body text-text-secondary text-center py-space-24">
               {t('accounts.members.empty') || 'No members yet.'}