@oxyhq/services 22.12.2 → 22.12.4

package/lib/typescript/module/ui/screens/fileManagement/hooks/useFileUploadState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFileUploadState.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/screens/fileManagement/hooks/useFileUploadState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iDAA8C,CAAC;AAQlF,OAAO,EAEH,KAAK,iBAAiB,EAQzB,MAAM,cAAW,CAAC;AAEnB,qDAAqD;AACrD,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB;AAsBD,8EAA8E;AAC9E,MAAM,WAAW,wBAAwB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IACrD,iBAAiB,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AAED,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uEAAuE;IACvE,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,cAAc,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACnD,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,iBAAiB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,qKAchC,wBAAwB,KAAG,wBAsZ7B,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"useFileUploadState.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/screens/fileManagement/hooks/useFileUploadState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iDAA8C,CAAC;AAQlF,OAAO,EAEH,KAAK,iBAAiB,EAQzB,MAAM,cAAW,CAAC;AAEnB,qDAAqD;AACrD,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB;AAsBD,8EAA8E;AAC9E,MAAM,WAAW,wBAAwB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IACrD,iBAAiB,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,iFAAiF;IACjF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,mFAAmF;IACnF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AAED,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uEAAuE;IACvE,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,cAAc,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACnD,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,iBAAiB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,iLAehC,wBAAwB,KAAG,wBA8b7B,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/lib/typescript/module/ui/utils/crossOriginRestore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crossOriginRestore.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/crossOriginRestore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAqB/C,8EAA8E;AAC9E,wBAAgB,2BAA2B,IAAI,OAAO,CAOrD;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,IAAI,IAAI,CAKtD;AAED,qEAAqE;AACrE,wBAAgB,6BAA6B,IAAI,IAAI,CAMpD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAIrE;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,OAAO,CAAC,CAiDlB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,gBAAgB,GAAG,kBAAkB,GAAG,IAAI,CAsBtF"}
+{"version":3,"file":"crossOriginRestore.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/crossOriginRestore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAsB/C,8EAA8E;AAC9E,wBAAgB,2BAA2B,IAAI,OAAO,CAOrD;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,IAAI,IAAI,CAKtD;AAED,qEAAqE;AACrE,wBAAgB,6BAA6B,IAAI,IAAI,CAMpD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAIrE;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,OAAO,CAAC,CAiDlB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,gBAAgB,GAAG,kBAAkB,GAAG,IAAI,CA8BtF"}

package/lib/typescript/module/ui/utils/oauthReturn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauthReturn.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/oauthReturn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3D;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE,GAAG,OAAO,CAAC,OAAO,CAAC,CA8DnB;AAeD;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CAmB/C"}
+{"version":3,"file":"oauthReturn.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/oauthReturn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAU/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3D;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE,GAAG,OAAO,CAAC,OAAO,CAAC,CA8DnB;AAuBD;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CAmB/C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "22.12.2",
+  "version": "22.12.4",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -127,7 +127,7 @@
   },
   "dependencies": {
     "@oxyhq/contracts": "0.17.0",
-    "@oxyhq/core": "^12.10.4",
+    "@oxyhq/core": "^12.10.5",
     "@simplewebauthn/browser": "^13.3.0",
     "color": "^4.2.3"
   },
@@ -176,7 +176,7 @@
   },
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
-    "@oxyhq/bloom": "^0.50.1",
+    "@oxyhq/bloom": "^0.50.2",
     "@oxyhq/core": "^12.10.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",

package/src/ui/components/oauthNavigation.ts

@@ -9,7 +9,7 @@
  */
 
 import { Linking } from 'react-native';
-import { logger } from '@oxyhq/core';
+import { logger, persistOAuthReturnPath } from '@oxyhq/core';
 
 /** Minimal shape of the optional `expo-web-browser` auth-session result. */
 interface WebBrowserAuthResult {
@@ -37,9 +37,19 @@ export interface OpenAuthorizeResult {
  * Web: hand the TOP-LEVEL document to the OAuth authorize URL (a full-page
  * redirect, not a popup) so the RP returns to its registered `redirect_uri`.
  * No-op where `location` is unavailable (SSR / non-browser hosts).
+ *
+ * Records the current page first. `redirect_uri` is a registered apex origin
+ * (see `normalizeOAuthRedirectUri`), so the IdP always returns the tab to `/`,
+ * and the return handlers restore this path. Doing it here rather than at each
+ * call site is deliberate: every web authorize redirect — silent restore,
+ * interactive sign-in, the passkey hub — funnels through this function, so a
+ * new flow cannot forget to preserve the page the visitor came from.
  */
 export function redirectToAuthorize(url: string): void {
-    (globalThis as { location?: Location }).location?.assign(url);
+    const location = (globalThis as { location?: Location }).location;
+    if (!location) return;
+    persistOAuthReturnPath(`${location.pathname}${location.search}${location.hash}`);
+    location.assign(url);
 }
 
 /**

package/src/ui/hooks/useSurfaceHeader.ts

@@ -1,4 +1,4 @@
-import { createContext, useContext, useLayoutEffect } from 'react';
+import { createContext, useContext, useLayoutEffect, useRef } from 'react';
 import type { DialogHeaderConfig } from '@oxyhq/bloom/dialog';
 
 /**
@@ -42,21 +42,78 @@ interface SurfaceHeaderContextValue {
  */
 export const SurfaceHeaderContext = createContext<SurfaceHeaderContextValue | null>(null);
 
+/**
+ * Shallow value-equality for a surface's header contribution.
+ *
+ * Scalars (`title`/`subtitle`/`largeTitle`/`tone`) compare by value; the object
+ * and node fields (`titleContent`/`left`/`right`/`primaryAction`/`actions`/
+ * `search`/`segments`/`progress`) compare by identity — callers memoize them, per
+ * this hook's contract. Function-typed affordances compare by PRESENCE, never
+ * identity: `onBack` legitimately gets a fresh closure each render, and its
+ * identity never changes what the header renders, so it must not count as a
+ * change (that is exactly what would drive the update loop).
+ */
+function surfaceHeaderContentEqual(
+  a: SurfaceHeaderContent | null,
+  b: SurfaceHeaderContent | null,
+): boolean {
+  if (a === b) return true;
+  if (!a || !b) return false;
+  return (
+    a.title === b.title &&
+    a.titleContent === b.titleContent &&
+    a.subtitle === b.subtitle &&
+    a.largeTitle === b.largeTitle &&
+    a.left === b.left &&
+    a.right === b.right &&
+    !!a.onBack === !!b.onBack &&
+    a.primaryAction === b.primaryAction &&
+    a.actions === b.actions &&
+    a.search === b.search &&
+    a.segments === b.segments &&
+    a.tone === b.tone &&
+    a.progress === b.progress
+  );
+}
+
 /**
  * Declare the Dialog nav header's content from within a surface screen — its
  * title/subtitle and any action slot. Merges over nothing (the host owns
  * back/close), replaces on change, and clears on unmount. Call it unconditionally;
  * it is a no-op outside a header-mode surface.
+ *
+ * Screens pass an INLINE `content` object (a fresh reference every render), so the
+ * push is guarded by {@link surfaceHeaderContentEqual}: the host's `setContent` is
+ * called only when the VALUE actually changes. Without that guard the setState
+ * would fire every render → the screen re-renders → the effect runs again → an
+ * infinite update loop (React error #185) in any consumer that does not memoize
+ * the object for us (i.e. anything not compiled by the React Compiler).
  */
 export function useSurfaceHeader(content: SurfaceHeaderContent | null | undefined): void {
   const ctx = useContext(SurfaceHeaderContext);
   const set = ctx?.setContent;
-  // Set synchronously in the commit's layout phase so the bar/title fill in
-  // BEFORE the browser paints — no first-frame flash of an empty bar.
+  const setRef = useRef(set);
+  setRef.current = set;
+  // The last value pushed to the host; `undefined` until the first push.
+  const lastRef = useRef<SurfaceHeaderContent | null | undefined>(undefined);
+
+  // Runs after EVERY commit (no deps array) so the bar/title fill in the same
+  // layout phase — but only pushes on a real value change, never on reference churn.
   useLayoutEffect(() => {
-    if (!set) return;
-    set(content ?? null);
-    return () => set(null);
-    // Callers must memoize `content` (especially slot nodes) so the header does not thrash.
-  }, [set, content]);
+    const s = setRef.current;
+    if (!s) return;
+    const next = content ?? null;
+    if (lastRef.current !== undefined && surfaceHeaderContentEqual(lastRef.current, next)) return;
+    lastRef.current = next;
+    s(next);
+  });
+
+  // Clear this surface's contribution when the screen unmounts.
+  useLayoutEffect(
+    () => () => {
+      lastRef.current = undefined;
+      setRef.current?.(null);
+    },
+    [],
+  );
 }

package/src/ui/navigation/surfaces.ts

@@ -5,7 +5,6 @@ import {
   type PresentOptions,
   type SurfaceControls,
 } from '@oxyhq/bloom/surfaces';
-import SurfaceScreen from '../components/SurfaceScreen';
 import type { RouteName } from './routes';
 import {
   getSurfaceConfig,
@@ -154,6 +153,15 @@ function presentInternal<K extends RouteName>(
   const config = getSurfaceConfig(route, props);
   const bloomOpts: PresentOptions = { label: route, ...bloomOptionsFor(config), ...opts };
 
+  // Lazy-resolved to break the surfaces.ts <-> SurfaceScreen module cycle: a
+  // mounted SurfaceScreen presents further surfaces (it imports these presenters),
+  // while presenting one renders a SurfaceScreen. Deferring the component to call
+  // time (both modules are initialized by then) makes the import graph one-way —
+  // the same idiom `routes.ts` uses to lazy-load screen components.
+  const SurfaceScreen = (
+    require('../components/SurfaceScreen') as typeof import('../components/SurfaceScreen')
+  ).default;
+
   const result = bloomSurfaces.present<SurfaceResult<K>>((surface: SurfaceControls) =>
     createElement(SurfaceScreen, {
       navStack,

package/src/ui/screens/CreateAccountScreen.tsx

@@ -1,5 +1,5 @@
 import type React from 'react';
-import { useState, useCallback, useRef } from 'react';
+import { useState, useCallback, useRef, useEffect } from 'react';
 import { View, ActivityIndicator } from 'react-native';
 import { Ionicons } from '@expo/vector-icons';
 import type { AccountKind, CreateAccountInput, OrganizationCategory } from '@oxyhq/core';
@@ -118,6 +118,14 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
   const [isCreating, setIsCreating] = useState(false);
 
   const debounceTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const usernameCheckSeqRef = useRef(0);
+
+  useEffect(() => () => {
+    usernameCheckSeqRef.current += 1;
+    if (debounceTimerRef.current) {
+      clearTimeout(debounceTimerRef.current);
+    }
+  }, []);
 
   // Debounced username availability check
   const checkUsername = useCallback((value: string) => {
@@ -146,9 +154,11 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
     setUsernameStatus('checking');
     setUsernameMessage('');
 
+    const seq = ++usernameCheckSeqRef.current;
     debounceTimerRef.current = setTimeout(async () => {
       try {
         const result = await oxyServices.checkUsernameAvailability(value);
+        if (seq !== usernameCheckSeqRef.current) return;
         setUsernameStatus(result.available ? 'available' : 'taken');
         setUsernameMessage(
           result.message
@@ -157,6 +167,7 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
             : (t('accounts.create.username.taken') || 'Username is taken')),
         );
       } catch {
+        if (seq !== usernameCheckSeqRef.current) return;
         setUsernameStatus('idle');
         setUsernameMessage(t('accounts.create.username.checkFailed') || 'Could not check availability');
       }
@@ -222,7 +233,7 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
   const title = t('accounts.create.title') || 'Create account';
 
   return (
-    <View className="px-screen-margin pt-space-16 pb-space-32">
+    <View className="gap-space-16 px-screen-margin pt-space-16 pb-space-32">
 
       {/* Account type — canonical grouped selection rows (checkmark on the chosen one) */}
       <SettingsListGroup title={t('accounts.create.typeSection') || 'Account type'}>

package/src/ui/screens/FileManagementScreen.tsx

@@ -437,6 +437,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         onPicked,
         goBack,
         onClose,
+        imagesOnly: isImageOnlyPicker,
         selectedIds,
         setSelectedIds,
         t,

package/src/ui/screens/fileManagement/PhotoPickerSection.tsx

@@ -305,7 +305,6 @@ const PhotoPickerCell = React.memo(function PhotoPickerCell(props: PhotoPickerCe
                 {isSelected && (
                     <Animated.View
                         ref={startRingPulse}
-                        pointerEvents="none"
                         style={{
                             position: 'absolute',
                             top: 0,
@@ -316,14 +315,14 @@ const PhotoPickerCell = React.memo(function PhotoPickerCell(props: PhotoPickerCe
                             borderWidth: SELECTION_RING_WIDTH,
                             borderColor: primaryColor,
                             transform: [{ scale: ringScale }],
+                            pointerEvents: 'none',
                         }}
                     />
                 )}
                 {isSelected && (
                     <View
-                        pointerEvents="none"
                         className="absolute top-1.5 right-1.5 min-w-[22px] h-[22px] px-1.5 rounded-full items-center justify-center"
-                        style={{ backgroundColor: primaryColor }}
+                        style={{ backgroundColor: primaryColor, pointerEvents: 'none' }}
                     >
                         <Text className="text-white text-[12px] font-bold leading-[14px]">
                             {selectionIndex > 0 ? String(selectionIndex) : ''}
@@ -546,12 +545,12 @@ const PhotoPickerView: React.FC<PhotoPickerViewProps> = ({
                        because the last tile in each row carries no right margin (a
                        full row + gutters fits the measured width by construction). */
                     <View
-                        style={{ flexDirection: 'row', flexWrap: 'wrap' }}
-                        pointerEvents="none"
+                        style={{ flexDirection: 'row', flexWrap: 'wrap', pointerEvents: 'none' }}
                         accessibilityElementsHidden
                         importantForAccessibility="no-hide-descendants"
                     >
                         {Array.from({ length: skeletonTileCount }, (_, index) => (
+                            // biome-ignore lint/suspicious/noArrayIndexKey: fixed-size skeleton grid, order never changes
                             <Skeleton.Box
                                 key={`skeleton-${index}`}
                                 width={cellSize}

package/src/ui/screens/fileManagement/UploadBar.tsx

@@ -1,5 +1,5 @@
 import type React from 'react';
-import { View, Text, ActivityIndicator, StyleSheet } from 'react-native';
+import { View, Text, ActivityIndicator, StyleSheet, Platform, type ViewStyle } from 'react-native';
 import { Ionicons } from '@expo/vector-icons';
 
 export interface UploadBarProps {
@@ -13,15 +13,19 @@ export interface UploadBarProps {
 }
 
 // The banner drop-shadow has no Bloom/Tailwind token equivalent, so it stays an
-// inline style (genuinely-required exception).
+// inline style. `boxShadow` on web (RN-Web deprecated the `shadow*` props);
+// RN `shadow*`/`elevation` on native.
 const shadowStyle = StyleSheet.create({
-    banner: {
-        shadowColor: '#000',
-        shadowOpacity: 0.1,
-        shadowRadius: 6,
-        shadowOffset: { width: 0, height: 2 },
-        elevation: 2,
-    },
+    banner: Platform.select({
+        web: { boxShadow: '0px 2px 6px rgba(0, 0, 0, 0.1)' },
+        default: {
+            shadowColor: '#000',
+            shadowOpacity: 0.1,
+            shadowRadius: 6,
+            shadowOffset: { width: 0, height: 2 },
+            elevation: 2,
+        },
+    }) as ViewStyle,
 });
 
 /**
@@ -30,7 +34,10 @@ const shadowStyle = StyleSheet.create({
  * gates rendering on `!selectMode && uploading`.
  */
 const UploadBar: React.FC<UploadBarProps> = ({ uploadProgress, isDark, colors, t }) => (
-    <View pointerEvents="none" className="absolute top-[72px] left-0 right-0 items-center z-50">
+    <View
+        className="absolute top-[72px] left-0 right-0 items-center z-50"
+        style={{ pointerEvents: 'none' }}
+    >
         <View
             className="flex-row items-center px-3.5 py-2.5 rounded-[24px] gap-2.5 border min-w-[200px]"
             style={[shadowStyle.banner, { backgroundColor: isDark ? '#222831EE' : '#FFFFFFEE', borderColor: colors.border }]}

package/src/ui/screens/fileManagement/hooks/useFileUploadState.ts

@@ -1,5 +1,5 @@
 import type React from 'react';
-import { useCallback, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
 import { toast } from '@oxyhq/bloom';
 import type { AssetUploadInput, FileMetadata } from '@oxyhq/core';
@@ -62,6 +62,8 @@ export interface UseFileUploadStateParams {
     onPicked?: (file: FileMetadata) => void;
     goBack?: () => void;
     onClose?: () => void;
+    /** When true, the document picker and pre-upload validation accept images only. */
+    imagesOnly?: boolean;
     selectedIds: Set<string>;
     setSelectedIds: React.Dispatch<React.SetStateAction<Set<string>>>;
     t: (key: string, vars?: Record<string, string | number>) => string;
@@ -99,6 +101,7 @@ export const useFileUploadState = ({
     onPicked,
     goBack,
     onClose,
+    imagesOnly = false,
     selectedIds,
     setSelectedIds,
     t,
@@ -111,16 +114,45 @@ export const useFileUploadState = ({
 
     const queryClient = useQueryClient();
     const uploadStartRef = useRef<number | null>(null);
+    const postSelectTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+    const endUploadTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+    const isActiveRef = useRef(true);
+
+    const clearPostSelectTimer = useCallback(() => {
+        if (postSelectTimerRef.current) {
+            clearTimeout(postSelectTimerRef.current);
+            postSelectTimerRef.current = null;
+        }
+    }, []);
+
+    const clearEndUploadTimer = useCallback(() => {
+        if (endUploadTimerRef.current) {
+            clearTimeout(endUploadTimerRef.current);
+            endUploadTimerRef.current = null;
+        }
+    }, []);
+
+    useEffect(() => {
+        isActiveRef.current = true;
+        return () => {
+            isActiveRef.current = false;
+            clearPostSelectTimer();
+            clearEndUploadTimer();
+        };
+    }, [clearPostSelectTimer, clearEndUploadTimer]);
 
     const endUpload = useCallback(() => {
         const started = uploadStartRef.current;
         const elapsed = started ? Date.now() - started : MIN_BANNER_MS;
         const remaining = elapsed < MIN_BANNER_MS ? MIN_BANNER_MS - elapsed : 0;
-        setTimeout(() => {
+        clearEndUploadTimer();
+        endUploadTimerRef.current = setTimeout(() => {
+            endUploadTimerRef.current = null;
+            if (!isActiveRef.current) return;
             setUploading(false);
             uploadStartRef.current = null;
         }, remaining);
-    }, []);
+    }, [clearEndUploadTimer]);
 
     const processFileUploads = async (selectedFiles: UploadCandidate[]): Promise<FileMetadata[]> => {
         if (selectedFiles.length === 0) return [];
@@ -277,6 +309,11 @@ export const useFileUploadState = ({
 
             const fileType = candidateType(file);
 
+            if (imagesOnly && !fileType.startsWith('image/')) {
+                toast.error(t('fileManagement.toasts.imagesOnlyRequired'));
+                continue;
+            }
+
             // Generate preview for images - unified approach
             let preview: string | undefined;
             if (fileType.startsWith('image/')) {
@@ -311,7 +348,7 @@ export const useFileUploadState = ({
         // Show preview modal for user to review files before upload
         setPendingFiles(processedFiles);
         setShowUploadPreview(true);
-    }, [t]);
+    }, [imagesOnly, t]);
 
     const handleConfirmUpload = async () => {
         if (pendingFiles.length === 0) return;
@@ -335,7 +372,11 @@ export const useFileUploadState = ({
             // If in selectMode, automatically select the uploaded file(s)
             if (selectMode && uploadedFiles.length > 0) {
                 // Defer one tick so the query cache has settled before selecting.
-                setTimeout(() => {
+                clearPostSelectTimer();
+                postSelectTimerRef.current = setTimeout(() => {
+                    postSelectTimerRef.current = null;
+                    if (!isActiveRef.current) return;
+
                     const fileToSelect = uploadedFiles[0];
                     if (!multiSelect && fileToSelect) {
                         if (onPicked) {
@@ -371,6 +412,8 @@ export const useFileUploadState = ({
     };
 
     const handleCancelUpload = () => {
+        clearPostSelectTimer();
+
         // Cleanup preview URLs
         for (const pf of pendingFiles) {
             revokePreviewUrl(pf.preview);
@@ -412,7 +455,7 @@ export const useFileUploadState = ({
             // Use expo-document-picker (works on all platforms including web)
             // On web, it uses the native file input and provides File objects directly
             const result = await picker.getDocumentAsync({
-                type: '*/*',
+                type: imagesOnly ? 'image/*' : '*/*',
                 multiple: true,
                 copyToCacheDirectory: true,
             });

package/src/ui/utils/crossOriginRestore.ts

@@ -9,6 +9,7 @@ import {
   OXY_CROSS_ORIGIN_RESTORE_ATTEMPTED_KEY,
   OXY_SILENT_OAUTH_ATTEMPTED_KEY,
   persistOAuthHandshake,
+  consumeOAuthReturnPath,
   normalizeOAuthRedirectUri,
   logger,
 } from '@oxyhq/core';
@@ -157,7 +158,15 @@ export function consumeSilentOAuthError(): 'login_required' | 'consent_required'
     url.searchParams.delete('error');
     url.searchParams.delete('error_description');
     url.searchParams.delete('state');
-    history.replaceState(history.state, '', `${url.pathname}${url.search}${url.hash}`);
+    // Silent restore failed, but the visitor still asked for a specific page.
+    // Put them back on it rather than leaving them on the bare origin the IdP
+    // redirected to.
+    const returnPath = consumeOAuthReturnPath();
+    history.replaceState(
+      history.state,
+      '',
+      returnPath ?? `${url.pathname}${url.search}${url.hash}`,
+    );
   }
   return error;
 }

package/src/ui/utils/oauthReturn.ts

@@ -1,6 +1,7 @@
 import type { OxyServices } from '@oxyhq/core';
 import {
   clearOAuthHandshake,
+  consumeOAuthReturnPath,
   logger,
   normalizeOAuthRedirectUri,
   readOAuthHandshake,
@@ -100,7 +101,15 @@ function stripOAuthParamsFromUrl(): void {
   url.searchParams.delete('error');
   url.searchParams.delete('error_description');
   url.searchParams.delete('hub_sync');
-  history.replaceState(history.state, '', `${url.pathname}${url.search}${url.hash}`);
+  // The authorize round trip lands on the registered apex origin, so restore
+  // the page the visit started on. Applies to the success path too: signing in
+  // from a deep link should return you to that link, not to the home page.
+  const returnPath = consumeOAuthReturnPath();
+  history.replaceState(
+    history.state,
+    '',
+    returnPath ?? `${url.pathname}${url.search}${url.hash}`,
+  );
 }
 
 /**