@oxyhq/services 22.12.1 → 22.12.2

package/lib/typescript/module/ui/screens/CreateAccountScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAU/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAgF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA+SlD,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAiF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAsQlD,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/lib/typescript/module/ui/screens/FileManagementScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileManagementScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/FileManagementScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAAyB,CAAC;AAiEzE,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CA4yC7D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"FileManagementScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/FileManagementScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAAyB,CAAC;AAiEzE,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAyzC7D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

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

@@ -16,6 +16,8 @@ export interface UseFileUploadStateParams {
     multiSelect: boolean;
     afterSelect: 'close' | 'back' | 'none';
     onSelect?: (file: FileMetadata) => void;
+    /** Forward-navigation picker: see {@link FileManagementScreenProps.onPicked}. */
+    onPicked?: (file: FileMetadata) => void;
     goBack?: () => void;
     onClose?: () => void;
     selectedIds: Set<string>;
@@ -42,6 +44,6 @@ export interface UseFileUploadStateResult {
  * orchestrator simply threads in the values these handlers depend on and
  * consumes the returned state/handlers.
  */
-export declare const useFileUploadState: ({ targetUserId, uploadFileMutation, defaultVisibility, selectMode, multiSelect, afterSelect, onSelect, goBack, onClose, selectedIds, setSelectedIds, t, }: UseFileUploadStateParams) => UseFileUploadStateResult;
+export declare const useFileUploadState: ({ targetUserId, uploadFileMutation, defaultVisibility, selectMode, multiSelect, afterSelect, onSelect, onPicked, goBack, onClose, selectedIds, setSelectedIds, t, }: UseFileUploadStateParams) => UseFileUploadStateResult;
 export default useFileUploadState;
 //# sourceMappingURL=useFileUploadState.d.ts.map

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,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,2JAahC,wBAAwB,KAAG,wBA+Y7B,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,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"}

package/lib/typescript/module/ui/types/fileManagement.d.ts

@@ -7,6 +7,16 @@ export interface FileManagementScreenProps extends BaseScreenProps {
     selectMode?: boolean;
     multiSelect?: boolean;
     onSelect?: (file: FileMetadata) => void;
+    /**
+     * Forward-navigation picker: called with the picked file in single-select
+     * mode when the picker is one FRAME of a larger in-surface flow. Unlike
+     * {@link onSelect}, the caller is expected to NAVIGATE the surface onward
+     * (e.g. the avatar flow pushes the cropper on top of this picker) — so on
+     * select the picker neither dismisses nor closes the session, and its
+     * Cancel/back pops THIS frame (returning to the frame that opened the picker)
+     * rather than closing. Takes precedence over `onSelect`/`dismiss` when set.
+     */
+    onPicked?: (file: FileMetadata) => void;
     onConfirmSelection?: OnConfirmFileSelection;
     initialSelectedIds?: string[];
     maxSelection?: number;

package/lib/typescript/module/ui/types/fileManagement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileManagement.d.ts","sourceRoot":"","sources":["../../../../../src/ui/types/fileManagement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAc,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;AAErE,MAAM,WAAW,yBAA0B,SAAQ,eAAe;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IAExC,kBAAkB,CAAC,EAAE,sBAAsB,CAAC;IAE5C,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACtD;;;OAGG;IACH,WAAW,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACL;AAED,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC;AAC3E,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AACvD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC"}
+{"version":3,"file":"fileManagement.d.ts","sourceRoot":"","sources":["../../../../../src/ui/types/fileManagement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAc,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;AAErE,MAAM,WAAW,yBAA0B,SAAQ,eAAe;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IAExC,kBAAkB,CAAC,EAAE,sBAAsB,CAAC;IAE5C,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACtD;;;OAGG;IACH,WAAW,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACL;AAED,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC;AAC3E,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AACvD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "22.12.1",
+  "version": "22.12.2",
   "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.3",
+    "@oxyhq/core": "^12.10.4",
     "@simplewebauthn/browser": "^13.3.0",
     "color": "^4.2.3"
   },
@@ -136,7 +136,7 @@
     "@commitlint/cli": "^17.6.5",
     "@commitlint/config-conventional": "^17.6.5",
     "@expo/vector-icons": "^15.0.3",
-    "@oxyhq/core": "12.10.3",
+    "@oxyhq/core": "12.10.4",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",
     "@react-native/babel-preset": "^0.86.0",
@@ -176,7 +176,7 @@
   },
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
-    "@oxyhq/bloom": "^0.50.0",
+    "@oxyhq/bloom": "^0.50.1",
     "@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/FollowButton.tsx

@@ -178,17 +178,14 @@ const FollowButtonMultiInner = memo(function FollowButtonMultiInner({
 
   const isLoading = isSubmitting || isAnyLoading;
 
-  // Populate the store with each member's follow status once on mount and again
-  // only when the SET of target users changes. `fetchAllStatuses` is referentially
-  // stable (its useFollow useCallback deps are [canUsePrivateApi, userIds,
-  // oxyServices]; `userIds` inside useFollow is memoized, and the outer wrapper
-  // memoizes `multiUserIds`), so depending on it plus the stable joined-string
-  // key cannot self-retrigger — `allFollowing`/loading are intentionally NOT in
+  // Populate the store with each member's follow status on mount and whenever
+  // the target set changes. `fetchAllStatuses` is recreated when `userIds`
+  // changes inside `useFollow`, so it is the sole effect dependency — no need
+  // for a joined-string key. `allFollowing`/loading are intentionally NOT in
   // the deps.
-  const userIdsKey = useMemo(() => userIds.join(','), [userIds]);
   useEffect(() => {
     fetchAllStatuses?.();
-  }, [userIdsKey, fetchAllStatuses]);
+  }, [fetchAllStatuses]);
 
   const handlePress = useCallback(async (event?: { preventDefault?: () => void; stopPropagation?: () => void }) => {
     if (preventParentActions && event?.preventDefault) {

package/src/ui/navigation/__tests__/surfaceNavStack.test.ts

@@ -45,8 +45,9 @@ describe('createSurfaceNavStack', () => {
     expect(stack.store.getState().closeResult).toBe('done');
   });
 
-  describe('result-bearing sub-flow (morphed-in avatar picker)', () => {
+  describe('result-bearing sub-flow (morphed-in avatar flow)', () => {
     it('resolves with the descendant dismiss result and pops back to the caller frame', async () => {
+      // Device / camera path: ChangeAvatar navigates straight to the cropper.
       const stack = createSurfaceNavStack('EditProfile');
       const flow = stack.beginFlow('ChangeAvatar');
       expect(stack.getTop().route).toBe('ChangeAvatar');
@@ -84,39 +85,70 @@ describe('createSurfaceNavStack', () => {
       await expect(flow).resolves.toBeUndefined();
     });
 
-    it('NESTS flows: the inner selector resolves first, then the outer avatar flow', async () => {
-      // ChangeAvatar (outer) → "My Oxy files" FileManagement (inner) → back → crop.
+    it('My Oxy files: the picker and cropper are FORWARD frames; the cropper confirm resolves the flow', async () => {
+      // EditProfile → (flow) ChangeAvatar → FileManagement picker → AvatarCrop, all
+      // plain forward frames in the ONE avatar flow. Selecting a file forward-
+      // navigates to the cropper (it does NOT resolve the flow); the cropper's
+      // confirm resolves the flow and pops all the way back to EditProfile.
       const stack = createSurfaceNavStack('EditProfile');
-      const avatarFlow = stack.beginFlow('ChangeAvatar');
-      const fileFlow = stack.beginFlow('FileManagement');
+      const flow = stack.beginFlow('ChangeAvatar');
+      stack.navigate('FileManagement', { selectMode: true }); // "My Oxy files" picker
+      stack.navigate('AvatarCrop', { imageFileId: 'file-1' }); // forward-nav on pick
+      stack.resolveFlowOrDismiss({ uri: 'file:///cropped.jpg' }); // cropper confirm
+      await expect(flow).resolves.toEqual({ uri: 'file:///cropped.jpg' });
+      expect(stack.getTop().route).toBe('EditProfile');
+      expect(stack.store.getState().closing).toBe(false);
+    });
+
+    it('My Oxy files: Back unwinds cropper → picker → list, then cancels the flow', async () => {
+      // The bug this fixes: Back from the cropper must return to the PICKER (re-pick),
+      // not straight to the ChangeAvatar list.
+      const stack = createSurfaceNavStack('EditProfile');
+      const flow = stack.beginFlow('ChangeAvatar');
+      stack.navigate('FileManagement', { selectMode: true });
+      stack.navigate('AvatarCrop', { imageFileId: 'file-1' });
+      expect(stack.goBack()).toBe(true); // crop -> picker (re-pick)
+      expect(stack.getTop().route).toBe('FileManagement');
+      expect(stack.goBack()).toBe(true); // picker -> ChangeAvatar
+      expect(stack.getTop().route).toBe('ChangeAvatar');
+      expect(stack.goBack()).toBe(true); // ChangeAvatar -> EditProfile (cancels flow)
+      await expect(flow).resolves.toBeUndefined();
+      expect(stack.getTop().route).toBe('EditProfile');
+      expect(stack.store.getState().closing).toBe(false);
+    });
+
+    // The stack still supports NESTED flows generically, even though no current
+    // caller opens a flow inside another (the avatar flow uses one flow + forward
+    // frames). These guard that capability.
+    it('supports NESTED flows: the inner flow resolves first, then the outer one', async () => {
+      const stack = createSurfaceNavStack('EditProfile');
+      const outer = stack.beginFlow('ChangeAvatar');
+      const inner = stack.beginFlow('FileManagement');
       expect(stack.getTop().route).toBe('FileManagement');
-      // Pick a file → inner flow resolves, pops back to ChangeAvatar (outer still open).
       stack.resolveFlowOrDismiss({ id: 'file-1' });
-      await expect(fileFlow).resolves.toEqual({ id: 'file-1' });
+      await expect(inner).resolves.toEqual({ id: 'file-1' });
       expect(stack.getTop().route).toBe('ChangeAvatar');
       expect(stack.store.getState().closing).toBe(false);
-      // Now drill to crop and confirm → outer flow resolves, pops to EditProfile.
       stack.navigate('AvatarCrop');
       stack.resolveFlowOrDismiss({ uri: 'file:///c.jpg' });
-      await expect(avatarFlow).resolves.toEqual({ uri: 'file:///c.jpg' });
+      await expect(outer).resolves.toEqual({ uri: 'file:///c.jpg' });
       expect(stack.getTop().route).toBe('EditProfile');
     });
 
-    it('cancelling the inner selector returns to the outer flow, leaving it open', async () => {
+    it('backing out of a NESTED inner flow leaves the outer flow pending', async () => {
       const stack = createSurfaceNavStack('EditProfile');
-      const avatarFlow = stack.beginFlow('ChangeAvatar');
-      const fileFlow = stack.beginFlow('FileManagement');
-      expect(stack.goBack()).toBe(true); // FileManagement -> ChangeAvatar (cancels inner)
-      await expect(fileFlow).resolves.toBeUndefined();
+      const outer = stack.beginFlow('ChangeAvatar');
+      const inner = stack.beginFlow('FileManagement');
+      expect(stack.goBack()).toBe(true); // inner entry backed out -> cancels inner only
+      await expect(inner).resolves.toBeUndefined();
       expect(stack.getTop().route).toBe('ChangeAvatar');
-      // The outer avatar flow is still pending.
       let outerSettled = false;
-      void avatarFlow.then(() => { outerSettled = true; });
+      void outer.then(() => { outerSettled = true; });
       await Promise.resolve();
       expect(outerSettled).toBe(false);
     });
 
-    it('tearing down the surface abandons ALL nested flows (undefined)', async () => {
+    it('tearing down the surface abandons ALL pending flows (undefined)', async () => {
       const stack = createSurfaceNavStack('EditProfile');
       const outer = stack.beginFlow('ChangeAvatar');
       const inner = stack.beginFlow('FileManagement');

package/src/ui/navigation/surfaceNavStack.ts

@@ -54,10 +54,13 @@ export interface SurfaceNavStack {
    * `dismiss(result)` resolves it with `result`, backing out of the flow's entry
    * frame resolves it with `undefined` (cancelled) — popping the surface back to
    * the frame that started the flow WITHOUT dismissing it. This is how a screen
-   * already living inside a surface (EditProfile, ManageAccount, ChangeAvatar)
-   * opens the avatar picker / media selector as a MORPH instead of a stacked
-   * surface while still awaiting its result. Flows NEST (ChangeAvatar → the "My
-   * Oxy files" selector → back), maintained as a stack.
+   * already living inside a surface (EditProfile, ManageAccount) opens the avatar
+   * flow as a MORPH instead of a stacked surface while still awaiting its result.
+   * The avatar flow is ONE flow (`ChangeAvatar`) with plain forward frames pushed
+   * on top (the "My Oxy files" `FileManagement` picker, then `AvatarCrop`); the
+   * cropper's `dismiss(result)` resolves THIS flow. Flows are kept as a STACK so
+   * they can nest generically, even though no current caller opens a flow inside
+   * another.
    */
   beginFlow(route: RouteName, props?: Record<string, unknown>): Promise<unknown>;
   /**
@@ -94,13 +97,14 @@ export function createSurfaceNavStack(
     return frames[frames.length - 1];
   };
 
-  // Result-bearing sub-flows currently running in this surface (the morphed-in
-  // avatar picker, and — NESTED within it — the "My Oxy files" media selector).
-  // A STACK: flows nest (ChangeAvatar → FileManagement → back to ChangeAvatar).
-  // Held OUTSIDE the store (resolvers are functions; flow presence must not
-  // re-render frames). Each flow's `returnLength` is the frame count BEFORE its
-  // entry frame was pushed, so settling pops back to exactly the frame that
-  // started it. `flowStack` is ordered outer → inner; the top is the innermost.
+  // Result-bearing sub-flows currently running in this surface (e.g. the morphed-
+  // in avatar flow, whose `ChangeAvatar → FileManagement picker → AvatarCrop`
+  // frames are plain forward pushes ON TOP of the ONE flow entry frame). Held as a
+  // STACK so flows can nest generically, and OUTSIDE the store (resolvers are
+  // functions; flow presence must not re-render frames). Each flow's `returnLength`
+  // is the frame count BEFORE its entry frame was pushed, so settling pops back to
+  // exactly the frame that started it. `flowStack` is ordered outer → inner; the
+  // top is the innermost.
   const flowStack: { returnLength: number; resolve: (result: unknown) => void }[] = [];
 
   const requestDismiss = (result?: unknown): void => {

package/src/ui/screens/ChangeAvatarScreen.tsx

@@ -4,11 +4,15 @@
  * Shows the current avatar large, then the four sources the user can pick from:
  * device gallery, camera, their existing Oxy files, and removing the current
  * photo. Every source that yields an image NAVIGATES WITHIN THIS SURFACE to
- * `AvatarCrop` (never presents it on top), so the panel morphs from this list's
- * size to the crop editor's and back — Cancel on the cropper returns here to
- * re-pick. One container reshaping, not two sheets. The forward morph is
- * flash-free because only the top frame renders and the cropper does all its own
- * async work (URL resolution + measurement), so this list is never left on screen
+ * `AvatarCrop` (never presents it on top), so the panel morphs from frame to
+ * frame instead of stacking sheets. The device / camera sources navigate straight
+ * to the cropper; the "My Oxy files" source first navigates to the `FileManagement`
+ * picker frame, which then forward-navigates to the cropper on selection — a real
+ * three-frame stack (this list → picker → cropper). So Cancel on the cropper
+ * returns to whichever frame opened it (the picker when re-picking from Oxy files,
+ * this list otherwise), and Cancel on the picker returns here. The forward morph
+ * is flash-free because only the top frame renders and the cropper does all its
+ * own async work (URL resolution + measurement), so no frame is left on screen
  * waiting.
  *
  * The surface resolves with an {@link AvatarCropResult} (the crop confirmed) or
@@ -37,10 +41,10 @@ import { surfaces as bloomSurfaces } from '@oxyhq/bloom/surfaces';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { toast } from '@oxyhq/bloom';
 import { getAccountDisplayName, logger } from '@oxyhq/core';
+import type { FileMetadata } from '@oxyhq/core';
 import { useOxy } from '../context/OxyContext';
 import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
-import { openWithinOrPresent } from '../navigation/surfaces';
 import { SettingsIcon } from '../components/SettingsIcon';
 import type { BaseScreenProps } from '../types/navigation';
 
@@ -229,44 +233,47 @@ const ChangeAvatarScreen: React.FC<BaseScreenProps> = ({ navigate, dismiss }) =>
     );
 
     /**
-     * Pick from the files the user already has on Oxy. The image-only media
-     * selector MORPHS into this surface (a nested sub-flow) like every other
-     * screen and resolves with the chosen file; picking one then morphs on to the
-     * crop editor. When triggered with no surface open it presents cold instead.
+     * Forward the file the user picked from their Oxy library on to the crop
+     * editor. Given to the `FileManagement` picker as its `onPicked` handler, so
+     * SELECTING a file pushes the cropper ON TOP of the picker frame — the picker
+     * stays below, and Cancel on the cropper returns to it to re-pick.
+     *
+     * The file's ID is handed straight to the cropper WITHOUT resolving its
+     * (usually private) download URL here: the cropper resolves it and shows its
+     * own loading state on the dark canvas, so the picker never lingers for the
+     * network round-trip (the "flash back to the avatar screen" the resolve-here
+     * approach caused).
      */
-    const pickFromOxyFiles = useCallback(async () => {
-        if (busy) return;
-        setBusy(true);
-        try {
-            const file = await openWithinOrPresent('FileManagement', {
-                selectMode: true,
-                multiSelect: false,
-                disabledMimeTypes: NON_IMAGE_MIME_TYPES,
-            });
-            if (!file) return;
-
+    const handleOxyFilePicked = useCallback(
+        (file: FileMetadata) => {
+            // The image-only picker never surfaces non-images, but guard
+            // defensively — a non-image would break the cropper.
             if (!file.contentType?.startsWith('image/')) {
                 toast.error(t('editProfile.toasts.selectImage'));
                 return;
             }
-
-            // Hand the file's ID straight to the cropper WITHOUT resolving its
-            // (usually private) download URL here. The cropper resolves it — and
-            // shows its own loading state on the dark canvas while it does — so
-            // this source list is never left on screen for the network round-trip
-            // that resolution takes (the "goes back to the avatar screen" flash).
             goToCrop({ imageFileId: file.id });
-        } catch (err) {
-            logger.error(
-                'Oxy files pick failed',
-                err instanceof Error ? err : new Error(String(err)),
-                { component: LOG_COMPONENT },
-            );
-            toast.error(t('changeAvatar.errors.loadImageFailed'));
-        } finally {
-            setBusy(false);
-        }
-    }, [busy, goToCrop, t]);
+        },
+        [goToCrop, t],
+    );
+
+    /**
+     * Pick from the files the user already has on Oxy. Navigates WITHIN this
+     * surface to the image-only `FileManagement` picker as a real frame (not a
+     * resolve-and-pop sub-flow): selecting a file forward-navigates to the crop
+     * editor via {@link handleOxyFilePicked}, giving a three-frame stack
+     * (ChangeAvatar → picker → crop). Back from the cropper returns to the picker
+     * to re-pick; back from the picker returns here. The cropper's confirm
+     * resolves the whole avatar flow with the crop result.
+     */
+    const pickFromOxyFiles = useCallback(() => {
+        navigate?.('FileManagement', {
+            selectMode: true,
+            multiSelect: false,
+            disabledMimeTypes: NON_IMAGE_MIME_TYPES,
+            onPicked: handleOxyFilePicked,
+        });
+    }, [navigate, handleOxyFilePicked]);
 
     /** Confirm, then resolve the surface with the removal so the caller writes it. */
     const removeCurrentPhoto = useCallback(async () => {
@@ -341,7 +348,7 @@ const ChangeAvatarScreen: React.FC<BaseScreenProps> = ({ navigate, dismiss }) =>
                     title={t('changeAvatar.sources.files.title')}
                     description={t('changeAvatar.sources.files.description')}
                     disabled={busy}
-                    onPress={() => void pickFromOxyFiles()}
+                    onPress={() => pickFromOxyFiles()}
                 />
                 <SettingsListItem
                     icon={<SettingsIcon name="trash-can-outline" color={bloomTheme.colors.error} />}