@oxyhq/services 22.11.0 → 22.12.0

package/lib/typescript/module/ui/navigation/surfaceRegistry.d.ts

@@ -167,10 +167,9 @@ export interface SurfaceRouteConfig {
     /**
      * Whether the surface renders the Dialog's OWN navigation header (sticky
      * gradient nav bar + large collapsing title over the surface's scroll content).
-     * `true` for every route screen — screens render NO header of their own and
-     * declare their title/subtitle (+ any action slot) via `useSurfaceHeader`.
-     * `false` for surfaces with their own chrome (the account dialog, the flagship
-     * full-bleed image picker).
+     * `true` for EVERY route — the whole SDK UI is unified on the shared header:
+     * screens render NO header of their own and declare their title/subtitle (+ any
+     * action slot / `onBack`) via `useSurfaceHeader`. No route opts out anymore.
      */
     header: boolean;
     /** Body-pan activation strategy — reserved (owned by Bloom's Dialog surface). */
@@ -182,11 +181,11 @@ export interface SurfaceRouteConfig {
 }
 /**
  * Resolve the surface configuration for a route + props. Every route defaults to
- * the responsive sheet and MORPHS in place when navigated to from within a surface
- * (no route stacks — genuine overlays are Bloom-raw `surfaces.present`/`confirm`
- * calls, outside this registry). The image-only FileManagement picker is a normal
- * sheet that owns its own scroll + translucent bar (no Dialog nav header); every
- * other own-scroller is marked `scrollable: false`.
+ * the responsive sheet, renders the SHARED Dialog nav header, and MORPHS in place
+ * when navigated to from within a surface (no route stacks — genuine overlays are
+ * Bloom-raw `surfaces.present`/`confirm` calls, outside this registry). The
+ * image-only FileManagement picker is a normal sheet that owns its own scroll and
+ * grows to a large morph target; every other own-scroller is `scrollable: false`.
  */
 export declare const getSurfaceConfig: (route: RouteName, props: Record<string, unknown>) => SurfaceRouteConfig;
 /** Convenience: just the presentation taxonomy for a route + props. */

package/lib/typescript/module/ui/navigation/surfaceRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"surfaceRegistry.d.ts","sourceRoot":"","sources":["../../../../../src/ui/navigation/surfaceRegistry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"surfaceRegistry.d.ts","sourceRoot":"","sources":["../../../../../src/ui/navigation/surfaceRegistry.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"AvatarCropScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/AvatarCropScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA+B/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAK3D,mDAAmD;AACnD,MAAM,WAAW,gBAAgB;IAC7B,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,IAAI,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC1D,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAuPD,QAAA,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAs0BrD,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"AvatarCropScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/AvatarCropScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA8B/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAK3D,mDAAmD;AACnD,MAAM,WAAW,gBAAgB;IAC7B,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,IAAI,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC1D,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAuPD,QAAA,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CA8zBrD,CAAC;AAEF,eAAe,gBAAgB,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,KAAiD,MAAM,OAAO,CAAC;AActE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAAyB,CAAC;AAiEzE,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CA8vC7D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"FileManagementScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/FileManagementScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiD,MAAM,OAAO,CAAC;AActE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAAyB,CAAC;AAiEzE,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CA0yC7D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"PaymentGatewayScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/PaymentGatewayScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAQ/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAc3D,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAe,MAAM,gCAA6B,CAAC;AAElG,YAAY,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;AAElD,UAAU,yBAA0B,SAAQ,eAAe;IACvD,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACzD,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAOD,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAmP7D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"PaymentGatewayScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/PaymentGatewayScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAQ/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAe3D,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAe,MAAM,gCAA6B,CAAC;AAElG,YAAY,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;AAElD,UAAU,yBAA0B,SAAQ,eAAe;IACvD,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACzD,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAOD,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CA6P7D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"ProfileScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/ProfileScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAe3D,UAAU,kBAAmB,SAAQ,eAAe;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAOD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA+S/C,CAAC;AAwCF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"ProfileScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/ProfileScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAe3D,UAAU,kBAAmB,SAAQ,eAAe;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAOD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAgS/C,CAAC;AAuCF,eAAe,aAAa,CAAC"}

package/lib/typescript/module/ui/screens/WelcomeNewUserScreen.d.ts

@@ -1,5 +1,6 @@
 import type React from 'react';
 import type { BaseScreenProps } from '../types/navigation.js';
+import { type User } from '@oxyhq/core';
 /**
  * Post-signup welcome & onboarding screen.
  * - Greets the newly registered user
@@ -7,7 +8,7 @@ import type { BaseScreenProps } from '../types/navigation.js';
  * - Only when the user presses "Continue" do we invoke onAuthenticated to finish flow & close sheet
  */
 declare const WelcomeNewUserScreen: React.FC<BaseScreenProps & {
-    newUser?: any;
+    newUser?: User;
 }>;
 export default WelcomeNewUserScreen;
 //# sourceMappingURL=WelcomeNewUserScreen.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"WelcomeNewUserScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/WelcomeNewUserScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAiD3D;;;;;GAKG;AACH,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAsRvE,CAAC;AAkFF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"WelcomeNewUserScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/WelcomeNewUserScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAY3D,OAAO,EAAyB,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AAK/D;;;;;GAKG;AACH,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,IAAI,CAAA;CAAE,CA6RxE,CAAC;AAoEF,eAAe,oBAAoB,CAAC"}

package/lib/typescript/module/ui/screens/fileManagement/PhotoPickerSection.d.ts

@@ -14,10 +14,6 @@ export interface PhotoPickerViewProps {
     refreshing: boolean;
     uploading: boolean;
     isPickingDocument: boolean;
-    uploadProgress: {
-        current: number;
-        total: number;
-    } | null;
     hasMore: boolean;
     loadingMore: boolean;
     /**
@@ -40,8 +36,6 @@ export interface PhotoPickerViewProps {
     onUpload: () => void;
     onRefresh: () => void;
     onLoadMore: () => void;
-    onCancel: () => void;
-    onConfirm: () => void;
     t: (key: string, vars?: Record<string, string | number>) => string;
 }
 declare const PhotoPickerView: React.FC<PhotoPickerViewProps>;

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

@@ -1 +1 @@
-{"version":3,"file":"PhotoPickerSection.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/fileManagement/PhotoPickerSection.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAgBtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA4FhD;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,SAAS,EAAE,OAAO,CAAC;IACnB,iEAAiE;IACjE,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,MAAM,GAAG,SAAS,CAAC;IACxD,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IAC7C,cAAc,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IAC9C,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AA4LD,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAwZnD,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"PhotoPickerSection.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/fileManagement/PhotoPickerSection.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiD,MAAM,OAAO,CAAC;AAgBtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAiFhD;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,SAAS,EAAE,OAAO,CAAC;IACnB,iEAAiE;IACjE,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,MAAM,GAAG,SAAS,CAAC;IACxD,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IAC7C,cAAc,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IAC9C,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AA+MD,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA2SnD,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "22.11.0",
+  "version": "22.12.0",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -109,7 +109,7 @@
     "delete-debug-view": "rm -rf ./lib/commonjs/components/bottomSheetDebugView ./lib/module/components/bottomSheetDebugView ./lib/typescript/components/bottomSheetDebugView || true",
     "delete-dts.js": "find ./lib/commonjs -name '*.d.js*' -delete && find ./lib/module -name '*.d.js*' -delete",
     "release": "rm -rf lib && bun run build && release-it",
-    "prepublishOnly": "bun run typescript && bun run test && bun run build"
+    "prepublishOnly": "node ../../scripts/assert-bun-publish.mjs && bun run typescript && bun run test && bun run build"
   },
   "release-it": {
     "git": {
@@ -127,7 +127,7 @@
   },
   "dependencies": {
     "@oxyhq/contracts": "0.17.0",
-    "@oxyhq/core": "^12.10.1",
+    "@oxyhq/core": "^12.10.3",
     "@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.2",
+    "@oxyhq/core": "12.10.3",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",
     "@react-native/babel-preset": "^0.86.0",
@@ -176,8 +176,8 @@
   },
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
-    "@oxyhq/bloom": ">=0.48.0",
-    "@oxyhq/core": "^12.9.0",
+    "@oxyhq/bloom": "^0.49.1",
+    "@oxyhq/core": "^12.10.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",
     "@tanstack/query-async-storage-persister": "^5.101",

package/src/ui/components/OxyAuthChooser.tsx

@@ -396,7 +396,7 @@ const OxyAuthChooser: React.FC<OxyAuthChooserProps> = ({ onComplete }) => {
       onOpenSettings: () => openUrl(ACCOUNTS_APP_URL),
       onOpenData: () => openUrl(`${ACCOUNTS_APP_URL}/data`),
       onManageStorage: () => openUrl(`${ACCOUNTS_APP_URL}/storage`),
-      onUpgradeStorage: () => openUrl(`${ACCOUNTS_APP_URL}/storage`),
+      onUpgradeStorage: () => openUrl(`${ACCOUNTS_APP_URL}/payments`),
       onHelp: () => openSheet('HelpSupport'),
       onPrivacy: () => openSheet({ screen: 'LegalDocuments', props: { initialStep: 1 } }),
       onTerms: () => openSheet({ screen: 'LegalDocuments', props: { initialStep: 2 } }),

package/src/ui/hooks/useSurfaceHeader.ts

@@ -6,14 +6,28 @@ import type { DialogHeaderConfig } from '@oxyhq/bloom/dialog';
  * (translated) title/subtitle and optional slot nodes. Back/close affordances
  * are owned by the surface host (`SurfaceScreen`) — a screen never wires them.
  *
- * A `right` slot is the canonical place for a screen-state action (e.g. a Save
- * button whose disabled/loading state reflects the form). Slot nodes MUST be
- * referentially stable (memoize them with `useMemo`) so the header does not
- * thrash.
+ * Alongside the classic slots (`left`/`right`) a screen can declare the rich
+ * design-system fields Bloom's nav header supports: the single trailing
+ * `primaryAction` CTA (Upload / Save), a trailing icon `actions` row, a header
+ * `search` / `segments` in the large-title zone, an `onImage` `tone` over media,
+ * and a wizard `progress` bar. Object/slot fields MUST be referentially stable
+ * (memoize them with `useMemo`) so the header does not thrash.
  */
 export type SurfaceHeaderContent = Pick<
   DialogHeaderConfig,
-  'title' | 'titleContent' | 'subtitle' | 'largeTitle' | 'left' | 'right' | 'onBack'
+  | 'title'
+  | 'titleContent'
+  | 'subtitle'
+  | 'largeTitle'
+  | 'left'
+  | 'right'
+  | 'onBack'
+  | 'primaryAction'
+  | 'actions'
+  | 'search'
+  | 'segments'
+  | 'tone'
+  | 'progress'
 >;
 
 interface SurfaceHeaderContextValue {
@@ -53,5 +67,11 @@ export function useSurfaceHeader(content: SurfaceHeaderContent | null | undefine
     content?.left,
     content?.right,
     content?.onBack,
+    content?.primaryAction,
+    content?.actions,
+    content?.search,
+    content?.segments,
+    content?.tone,
+    content?.progress,
   ]);
 }

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

@@ -24,9 +24,12 @@ describe('getSurfaceConfig presentation', () => {
         expect(config.presentation).toBe('sheet');
         expect(config.stacks).toBe(false);
         // PhotoPickerView owns its own FlatList → the host must not wrap it in a
-        // ScrollView; and its own translucent bar → no Dialog nav header.
+        // ScrollView. It now renders the SHARED Dialog nav header (Cancel / title /
+        // Upload) like every other screen — its bespoke bar is gone.
         expect(config.scrollable).toBe(false);
-        expect(config.header).toBe(false);
+        expect(config.header).toBe(true);
+        // …and it grows to the large morph target so the grid has room.
+        expect(config.frameSize).toEqual({ heightRatio: 0.9, maxWidth: 640 });
     });
 
     it('morphs the surface for every route, the picker included', () => {
@@ -73,6 +76,17 @@ describe('getSurfaceConfig presentation', () => {
         expect(getSurfaceConfig('AvatarCrop', {}).header).toBe(true);
     });
 
+    it('renders the shared nav header on every route — nothing is headerless', () => {
+        // The whole SDK UI is unified on the Dialog nav header. The last four
+        // holdouts (Profile / PaymentGateway / WelcomeNewUser + the image picker)
+        // now declare their chrome through `useSurfaceHeader` like every screen.
+        expect(getSurfaceConfig('Profile', {}).header).toBe(true);
+        expect(getSurfaceConfig('PaymentGateway', {}).header).toBe(true);
+        expect(getSurfaceConfig('WelcomeNewUser', {}).header).toBe(true);
+        expect(getSurfaceConfig('ManageAccount', {}).header).toBe(true);
+        expect(getSurfaceConfig('FileManagement', imageOnlyPickerProps).header).toBe(true);
+    });
+
     it('keeps FileManagement on the sheet when it is not an image-only picker', () => {
         // Browse mode (no selectMode) — the standard file manager.
         expect(getSurfaceConfig('FileManagement', {}).presentation).toBe('sheet');

package/src/ui/navigation/surfaceRegistry.ts

@@ -181,10 +181,9 @@ export interface SurfaceRouteConfig {
   /**
    * Whether the surface renders the Dialog's OWN navigation header (sticky
    * gradient nav bar + large collapsing title over the surface's scroll content).
-   * `true` for every route screen — screens render NO header of their own and
-   * declare their title/subtitle (+ any action slot) via `useSurfaceHeader`.
-   * `false` for surfaces with their own chrome (the account dialog, the flagship
-   * full-bleed image picker).
+   * `true` for EVERY route — the whole SDK UI is unified on the shared header:
+   * screens render NO header of their own and declare their title/subtitle (+ any
+   * action slot / `onBack`) via `useSurfaceHeader`. No route opts out anymore.
    */
   header: boolean;
   /** Body-pan activation strategy — reserved (owned by Bloom's Dialog surface). */
@@ -206,30 +205,6 @@ const DEFAULT_SURFACE_CONFIG: SurfaceRouteConfig = {
   dynamicBackdrop: true,
 };
 
-/**
- * Routes that render NO Dialog nav header — they own their chrome:
- * - `PaymentGateway` — the payment surface owns its controls.
- * - `WelcomeNewUser` — a full-bleed onboarding wizard with its own step chrome.
- * - `Profile` — a full profile view, no nav-header chrome.
- * (The flagship full-bleed image picker is handled separately below.)
- *
- * `AccountDialog` used to be here — it now uses the SHARED Dialog nav header like
- * every other screen (its per-view title/subtitle + view-back go through
- * `useSurfaceHeader`), so the account/sign-in surface no longer feels bespoke.
- *
- * `AvatarCrop` used to be here too, for its own translucent Cancel/title/Done
- * bar. It is now reached ONLY by navigating within a `ChangeAvatar` surface, and
- * the Dialog's `header` is fixed for a surface's whole life — a headerless frame
- * inside a header-mode surface would stack two bars. So the crop declares its
- * title + its "Use photo" action through `useSurfaceHeader` like every other
- * screen, and keeps only its dark crop stage.
- */
-const HEADERLESS_ROUTES: ReadonlySet<RouteName> = new Set<RouteName>([
-  'PaymentGateway',
-  'WelcomeNewUser',
-  'Profile',
-]);
-
 /**
  * Predicate matching `FileManagementScreen`'s internal `isImageOnlyPicker`
  * derivation. When the consumer restricts to image MIME types (no videos, no
@@ -272,11 +247,11 @@ const OWN_SCROLL_CONTAINER_ROUTES: ReadonlySet<RouteName> = new Set<RouteName>([
 
 /**
  * Resolve the surface configuration for a route + props. Every route defaults to
- * the responsive sheet and MORPHS in place when navigated to from within a surface
- * (no route stacks — genuine overlays are Bloom-raw `surfaces.present`/`confirm`
- * calls, outside this registry). The image-only FileManagement picker is a normal
- * sheet that owns its own scroll + translucent bar (no Dialog nav header); every
- * other own-scroller is marked `scrollable: false`.
+ * the responsive sheet, renders the SHARED Dialog nav header, and MORPHS in place
+ * when navigated to from within a surface (no route stacks — genuine overlays are
+ * Bloom-raw `surfaces.present`/`confirm` calls, outside this registry). The
+ * image-only FileManagement picker is a normal sheet that owns its own scroll and
+ * grows to a large morph target; every other own-scroller is `scrollable: false`.
  */
 export const getSurfaceConfig = (
   route: RouteName,
@@ -284,21 +259,18 @@ export const getSurfaceConfig = (
 ): SurfaceRouteConfig => {
   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 OWN full-bleed
-    // black canvas + translucent top bar INSIDE the themed panel, so it takes no
-    // Dialog nav header. It needs ROOM for the photo grid, so it declares an
-    // explicit LARGE morph target — the panel grows UP to a near-full-height,
-    // wider card on entry (and back down on pick→crop), the grid scrolling within.
+    // own-scroller (`PhotoPickerView`'s FlatList) that paints its full-bleed black
+    // photo canvas as CONTENT under the SHARED Dialog nav header (Cancel / title /
+    // Upload), exactly like the crop stage under the same bar. It needs ROOM for
+    // the photo grid, so it declares an explicit LARGE morph target — the panel
+    // grows UP to a near-full-height, wider card on entry (and back down on
+    // pick→crop), the grid scrolling within.
     return {
       ...DEFAULT_SURFACE_CONFIG,
       scrollable: false,
-      header: false,
       frameSize: { heightRatio: 0.9, maxWidth: 640 },
     };
   }
-  if (HEADERLESS_ROUTES.has(route)) {
-    return { ...DEFAULT_SURFACE_CONFIG, header: false };
-  }
   if (OWN_SCROLL_CONTAINER_ROUTES.has(route)) {
     // Own-scroller list screens keep the nav header (static, non-collapsing —
     // there is no Dialog scroll offset to drive the large-title collapse).

package/src/ui/screens/AvatarCropScreen.tsx

@@ -50,12 +50,11 @@ import Animated, {
 } from 'react-native-reanimated';
 import { useQuery, keepPreviousData } from '@tanstack/react-query';
 import { useTheme } from '@oxyhq/bloom/theme';
-import { Button } from '@oxyhq/bloom/button';
 import { logger } from '@oxyhq/core';
 import { useOxy } from '../context/OxyContext';
 import { useI18n } from '../hooks/useI18n';
 import { useReduceMotion } from '../hooks/useReduceMotion';
-import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
+import { useSurfaceHeader, type SurfaceHeaderContent } from '../hooks/useSurfaceHeader';
 import { toast } from '@oxyhq/bloom';
 import type { BaseScreenProps } from '../types/navigation';
 
@@ -863,27 +862,19 @@ const AvatarCropScreen: React.FC<AvatarCropScreenProps> = ({
     }, [baseFit, effectiveUri, naturalSize, dismiss, t]);
 
     /**
-     * The surface's primary action, mounted into the Dialog nav bar's right slot
-     * (which is why it must stay referentially stable). While processing it keeps
-     * its width and shows a spinner; the a11y label carries the "Saving…" state
-     * the visible label can no longer show.
+     * The surface's "Use photo" CTA, declared through the Dialog header's
+     * `primaryAction` (a real Bloom Button with a loading spinner + disabled
+     * state) — the standardized trailing action, no bespoke node. Memoized so the
+     * header does not thrash.
      */
-    const doneAction = useMemo(
-        () => (
-            <Button
-                variant="primary"
-                size="small"
-                onPress={() => void handleConfirm()}
-                disabled={isProcessing || !baseFit}
-                loading={isProcessing}
-                accessibilityLabel={
-                    isProcessing ? t('editProfile.crop.saving') : t('editProfile.crop.confirm')
-                }
-            >
-                {t('editProfile.crop.confirm')}
-            </Button>
-        ),
-        [baseFit, handleConfirm, isProcessing, t],
+    const donePrimaryAction = useMemo<SurfaceHeaderContent['primaryAction']>(
+        () => ({
+            label: t('editProfile.crop.confirm'),
+            onPress: () => void handleConfirm(),
+            disabled: isProcessing || !baseFit,
+            loading: isProcessing,
+        }),
+        [t, handleConfirm, isProcessing, baseFit],
     );
 
     // No bar of our own: the surface owns the chrome. `goBack` pops back to the
@@ -892,7 +883,7 @@ const AvatarCropScreen: React.FC<AvatarCropScreenProps> = ({
     useSurfaceHeader({
         title: t('editProfile.crop.title'),
         largeTitle: false,
-        right: doneAction,
+        primaryAction: donePrimaryAction,
         onBack: goBack,
     });
 

package/src/ui/screens/FileManagementScreen.tsx

@@ -21,7 +21,7 @@ import { Pressable } from 'react-native';
 import type { FileMetadata } from '@oxyhq/core';
 import { queryKeys } from '../hooks/queries/queryKeys';
 import { useUserFilesInfinite, removeFileFromCache, patchFileMetadataInCache } from '../hooks/queries/useFileQueries';
-import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
+import { useSurfaceHeader, type SurfaceHeaderContent } from '../hooks/useSurfaceHeader';
 import { SurfaceHeaderAction } from '../components/SurfaceHeaderAction';
 import JustifiedPhotoGrid from '../components/photogrid/JustifiedPhotoGrid';
 import { useTheme } from '@oxyhq/bloom/theme';
@@ -990,6 +990,51 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         </Pressable>
     ), [handleCancelUpload, colors.text, t]);
 
+    // --- Image-only picker: shared-header chrome -----------------------------
+    // The flagship photo picker now rides the SAME Dialog nav header as every
+    // screen (Cancel / "Choose Photo" / Upload) instead of painting its own bar.
+    // Ownership + upload permission gate the Upload action, mirroring the picker's
+    // empty-state upload button.
+    const isOwner = user?.id === targetUserId;
+    const allowUpload = isOwner && allowUploadInSelectMode;
+
+    // Cancel = the nav bar's back affordance. Legacy callback callers keep their
+    // close/back behaviour; the promise-based avatar picker dismisses its surface.
+    const pickerCancel = useCallback(() => {
+        if (onSelect || onConfirmSelection) {
+            if (onClose) onClose();
+            else goBack?.();
+        } else {
+            dismiss?.();
+        }
+    }, [onSelect, onConfirmSelection, onClose, goBack, dismiss]);
+
+    // The picker's ONE trailing CTA, declared through the Dialog header's
+    // `primaryAction` (a proper Bloom Button with loading/disabled) — the
+    // multi-select confirm ("Done (N)") or, single-select, the Upload action whose
+    // loading state reflects an in-flight device upload. Memoized so the header
+    // does not thrash.
+    const pickerPrimaryAction = useMemo<SurfaceHeaderContent['primaryAction']>(() => {
+        if (multiSelect) {
+            return {
+                label: t('fileManagement.doneWithCount', { count: selectedIds.size }),
+                onPress: confirmMultiSelection,
+                disabled: selectedIds.size === 0,
+            };
+        }
+        if (isOwner && allowUpload) {
+            return {
+                label: t('fileManagement.upload'),
+                onPress: handleFileUpload,
+                loading: uploading || isPickingDocument,
+            };
+        }
+        return undefined;
+    }, [
+        multiSelect, selectedIds.size, confirmMultiSelection, isOwner, allowUpload,
+        t, handleFileUpload, uploading, isPickingDocument,
+    ]);
+
     useSurfaceHeader(
         showUploadPreview
             ? {
@@ -998,16 +1043,26 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                 left: fmHeaderBack,
                 largeTitle: false,
             }
-            : {
-                title: selectMode
-                    ? (multiSelect ? (maxSelection ? t('fileManagement.selectedWithMax', { count: selectedIds.size, max: maxSelection }) : t('fileManagement.selected', { count: selectedIds.size })) : t('fileManagement.selectFile'))
-                    : (viewMode === 'photos' ? t('fileManagement.photos') : t('fileManagement.title')),
-                subtitle: selectMode
-                    ? (multiSelect ? t('fileManagement.available', { count: filteredFiles.length }) : t('fileManagement.tapToSelect'))
-                    : (filteredFiles.length === 1 ? t('fileManagement.itemCount', { count: filteredFiles.length }) : t('fileManagement.itemCount_plural', { count: filteredFiles.length })),
-                right: fmHeaderRight,
-                largeTitle: false,
-            },
+            : isImageOnlyPicker
+                ? {
+                    // ONE shared header — Cancel (back) / "Choose Photo" / Upload — in
+                    // `onImage` tone so the chrome stays legible over the black grid.
+                    title: t('fileManagement.choosePhoto'),
+                    largeTitle: false,
+                    onBack: pickerCancel,
+                    primaryAction: pickerPrimaryAction,
+                    tone: 'onImage',
+                }
+                : {
+                    title: selectMode
+                        ? (multiSelect ? (maxSelection ? t('fileManagement.selectedWithMax', { count: selectedIds.size, max: maxSelection }) : t('fileManagement.selected', { count: selectedIds.size })) : t('fileManagement.selectFile'))
+                        : (viewMode === 'photos' ? t('fileManagement.photos') : t('fileManagement.title')),
+                    subtitle: selectMode
+                        ? (multiSelect ? t('fileManagement.available', { count: filteredFiles.length }) : t('fileManagement.tapToSelect'))
+                        : (filteredFiles.length === 1 ? t('fileManagement.itemCount', { count: filteredFiles.length }) : t('fileManagement.itemCount_plural', { count: filteredFiles.length })),
+                    right: fmHeaderRight,
+                    largeTitle: false,
+                },
     );
 
     if (isLoadingFiles && !isImageOnlyPicker) {
@@ -1067,9 +1122,10 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         const photosOnly = filteredFiles.filter(
             (file) => file.contentType.startsWith('image/'),
         );
-        const isOwner = user?.id === targetUserId;
-        const allowUpload = isOwner && allowUploadInSelectMode;
 
+        // Chrome (Cancel / "Choose Photo" / Upload) lives on the shared Dialog nav
+        // header (see the `useSurfaceHeader` call above); the picker owns only the
+        // full-bleed photo grid as content.
         return (
             <PhotoPickerView
                 photos={photosOnly}
@@ -1080,7 +1136,6 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                 refreshing={isRefreshingFiles}
                 uploading={uploading}
                 isPickingDocument={isPickingDocument}
-                uploadProgress={uploadProgress}
                 hasMore={hasMoreFiles}
                 loadingMore={isFetchingMore}
                 loading={isLoadingFiles}
@@ -1096,17 +1151,6 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                 onUpload={handleFileUpload}
                 onRefresh={() => filesQuery.refetch()}
                 onLoadMore={() => filesQuery.fetchNextPage()}
-                onCancel={() => {
-                    if (onSelect || onConfirmSelection) {
-                        // Legacy callback caller: preserve close/back behaviour.
-                        if (onClose) onClose();
-                        else goBack?.();
-                    } else {
-                        // Promise picker (avatar): dismiss just this surface.
-                        dismiss?.();
-                    }
-                }}
-                onConfirm={confirmMultiSelection}
                 t={t}
             />
         );

package/src/ui/screens/PaymentGatewayScreen.tsx

@@ -12,6 +12,7 @@ import { useTheme } from '@oxyhq/bloom/theme';
 import { H4 } from '@oxyhq/bloom/typography';
 import { Ionicons } from '@expo/vector-icons';
 import { useI18n } from '../hooks/useI18n';
+import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 import QRCode from 'react-native-qrcode-svg';
 
 import PaymentSummaryStep from '../components/payment/PaymentSummaryStep';
@@ -175,6 +176,16 @@ const PaymentGatewayScreen: React.FC<PaymentGatewayScreenProps> = (props) => {
         }
     }, [onPaymentResult, onClose, goBack]);
 
+    // Shared Dialog nav header: a stable "Payment" title + a back affordance that
+    // steps the wizard back once past the first step (the step components keep
+    // their own bottom Back/Continue CTAs; the header's close dismisses, matching
+    // the pre-existing backdrop-dismiss).
+    useSurfaceHeader({
+        title: t('payment.title'),
+        largeTitle: false,
+        onBack: currentStep > 0 ? prevStep : undefined,
+    });
+
     // Validate amount
     if (!amount || Number.isNaN(Number(amount)) || Number(amount) <= 0) {
         return (