@oxy.so/services 12.14.0 → 13.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxy.so/services",
-  "version": "12.14.0",
+  "version": "13.1.0",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -140,6 +140,7 @@
     "verify:package": "node scripts/verify-package.mjs",
     "generate:icon-fonts": "node scripts/generate-icon-font-subsets.mjs",
     "check:icon-fonts": "node scripts/check-icon-font-subsets.mjs",
+    "check:compat-expo-54": "bun compat/expo-54/check.mjs",
     "build:js": "bun x react-native-builder-bob build --target commonjs && bun x react-native-builder-bob build --target module && bun run copy-assets",
     "test": "jest --passWithNoTests",
     "test:watch": "jest --watch",
@@ -150,7 +151,7 @@
     "delete-dts.js": "find ./lib/commonjs -name '*.d.js*' -delete && find ./lib/module -name '*.d.js*' -delete"
   },
   "dependencies": {
-    "@oxy.so/contracts": "^5.8.0",
+    "@oxy.so/contracts": "^6.0.0",
     "color": "^5.0.3",
     "@peable.to/sdk": "0.4.1"
   },
@@ -159,11 +160,10 @@
     "@commitlint/config-conventional": "^21.2.0",
     "@expo/app-integrity": "~58.0.2",
     "@expo/vector-icons": "^15.0.3",
-    "@oxy.so/core": "6.17.0",
+    "@oxy.so/core": "7.1.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^12.0.1",
     "@react-native/babel-preset": "^0.88.0",
-    "@release-it/conventional-changelog": "^12.0.2",
     "@tanstack/query-async-storage-persister": "^5.101",
     "@tanstack/query-sync-storage-persister": "^5.101",
     "@tanstack/react-query": "^5.101",
@@ -176,26 +176,26 @@
     "@types/react": "*",
     "@oxy.so/bloom": "15.18.0",
     "copyfiles": "^2.4.1",
-    "expo-clipboard": "~58.0.3",
-    "expo-constants": "~58.0.12",
-    "expo-file-system": "~58.0.9",
+    "expo-clipboard": "~58.0.4",
+    "expo-constants": "~58.0.13",
+    "expo-file-system": "~58.0.11",
     "expo-haptics": "~58.0.7",
-    "expo-image": "~58.0.15",
-    "expo-image-manipulator": "~58.0.14",
+    "expo-image": "~58.0.17",
+    "expo-image-manipulator": "~58.0.15",
     "expo-linear-gradient": "~58.0.3",
-    "expo-notifications": "~58.1.5",
-    "expo-modules-core": "~58.0.22",
+    "expo-notifications": "~58.1.6",
+    "expo-modules-core": "~58.0.26",
     "expo-secure-store": "~58.0.2",
     "expo-web-browser": "~58.0.6",
     "husky": "^4.3.8",
     "jest": "^30.5.1",
     "lint-staged": "^15.2.4",
-    "nativewind": "5.0.0-preview.3",
+    "nativewind": "5.0.0-rc.0",
     "react": "19.3.0",
     "react-dom": "19.3.0",
     "react-native": "0.88.0",
     "react-native-builder-bob": "^0.43.0",
-    "react-native-css": "^3.0.6",
+    "react-native-css": "3.1.0-rc.0",
     "react-native-gesture-handler": "~3.3.0",
     "react-native-keyboard-controller": "1.22.7",
     "react-native-qrcode-svg": "^6.3.0",
@@ -206,15 +206,16 @@
     "ts-jest": "^29.4.12",
     "typescript": "^5.9.2",
     "zustand": "^5.0.14",
-    "expo-video": "~58.0.11"
+    "expo-video": "~58.0.12"
   },
   "//@oxy.so/bloom": "Bloom 11.1.0 adds the shared grouped sections, usage card, subscription plans, frame appearance and overlay navigation APIs used by this SDK. First-party Bloom peers remain open above this tested minimum.",
   "//@oxy.so/core": "Core 6.16.0 supplies `requireServerVerdict` and `onHolderRejected`, with which the cold boot checks a session it painted from the cache; 6.13.0 supplies the `accounts.settings.*` strings (picture, categories) the account settings speak in every language; 6.12.0 supplies `fileManagement.contentLost` and the `lost` file status a lost file is listed with; 6.11.0 supplies the `follow.errors.*` strings the follow error codes are worded with; 6.4.0 the `follow.*` strings the follow buttons read for every verb and language; 6.1.0 the `oxy.auth.email.{startChange,change,remove}` and `oxy.auth.password.remove` the sign-in & security panels call. Keep one Core instance per app; raise this floor with the root catalogue when new runtime APIs are required.",
+  "//react-native": "React Native 0.81 to 0.88, React 19.1+ and Expo SDK 54 to 58. The floors are the Expo SDK 54 stack (react-native 0.81.6, react 19.1.4, react-native-web 0.21.4, expo 54.0.38 and the module versions its bundledNativeModules.json pins), which compat/expo-54 installs as an external consumer and checks on every CI run (`bun check.mjs`): every peer here admits that stack, services' published src typechecks against its types, and <OxyProvider> mounts and settles its cold boot on iOS (React Native 0.81), web (react-native-web 0.21) and react-native-macos 0.81 with the native modules macOS lacks absent. Astro, Oxy's browser, runs react-native-macos 0.81 (0.83 is its latest release), which is why the floor is not 0.85. The SDK 56 floors these replaced were the versions current when the ranges were first written, not measurements.",
   "peerDependencies": {
-    "@expo/app-integrity": ">=56.0.0 <59.0.0",
+    "@expo/app-integrity": ">=0.1.10 <59.0.0",
     "@expo/vector-icons": "^15.0.3",
     "@oxy.so/bloom": ">=11.1.0",
-    "@oxy.so/core": "^6.16.0",
+    "@oxy.so/core": "^7.0.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": ">=11.4.1 <13.0.0",
     "@tanstack/query-async-storage-persister": "^5.101",
@@ -223,31 +224,31 @@
     "@tanstack/react-query-persist-client": "^5.101",
     "@types/react": "<20.0.0",
     "@types/react-native": "<1.0.0",
-    "expo": ">=56.0.0 <59.0.0",
-    "expo-clipboard": ">=56.0.0 <59.0.0",
-    "expo-constants": ">=56.0.0 <59.0.0",
-    "expo-document-picker": ">=56.0.0 <59.0.0",
-    "expo-file-system": ">=56.0.0 <59.0.0",
-    "expo-haptics": ">=56.0.0 <59.0.0",
+    "expo": ">=54.0.0 <59.0.0",
+    "expo-clipboard": ">=8.0.0 <59.0.0",
+    "expo-constants": ">=18.0.0 <59.0.0",
+    "expo-document-picker": ">=14.0.0 <59.0.0",
+    "expo-file-system": ">=19.0.0 <59.0.0",
+    "expo-haptics": ">=15.0.0 <59.0.0",
     "expo-image": ">=2.0.0 <59.0.0",
-    "expo-image-manipulator": ">=56.0.0 <59.0.0",
-    "expo-image-picker": ">=56.0.0 <59.0.0",
-    "expo-linear-gradient": ">=56.0.0 <59.0.0",
+    "expo-image-manipulator": ">=14.0.0 <59.0.0",
+    "expo-image-picker": ">=17.0.0 <59.0.0",
+    "expo-linear-gradient": ">=15.0.0 <59.0.0",
     "expo-modules-core": "<59.0.0",
-    "expo-notifications": ">=56.0.0 <59.0.0",
-    "expo-web-browser": ">=56.0.0 <59.0.0",
+    "expo-notifications": ">=0.32.0 <59.0.0",
+    "expo-web-browser": ">=15.0.0 <59.0.0",
     "nativewind": ">=5.0.0-preview.3 <6.0.0",
     "react-native-css": "^3.0.6 || 3.1.0-rc.0",
     "react": ">=18.0.0 <20.0.0",
-    "react-native": ">=0.85.0 <0.89.0",
-    "react-native-gesture-handler": ">=2.31.1 <4.0.0",
-    "react-native-keyboard-controller": ">=1.21.0 <2.0.0",
+    "react-native": ">=0.81.0 <0.89.0",
+    "react-native-gesture-handler": ">=2.28.0 <4.0.0",
+    "react-native-keyboard-controller": ">=1.18.5 <2.0.0",
     "react-native-qrcode-svg": "^6.3.0",
-    "react-native-reanimated": ">=4.3.0 <5.0.0",
-    "react-native-safe-area-context": ">=5.7.0 <6.0.0",
-    "react-native-svg": ">=15.15.0 <16.0.0",
+    "react-native-reanimated": ">=4.1.0 <5.0.0",
+    "react-native-safe-area-context": ">=5.6.0 <6.0.0",
+    "react-native-svg": ">=15.12.1 <16.0.0",
     "zustand": "^5.0.0",
-    "expo-video": ">=57.0.0 <59.0.0"
+    "expo-video": ">=3.0.0 <59.0.0"
   },
   "peerDependenciesMeta": {
     "nativewind": {

package/src/ui/components/ExpoImage.macos.tsx

@@ -0,0 +1,59 @@
+/**
+ * react-native-macos fork of `ExpoImage.tsx`. expo-image ships no macOS
+ * podspec, and importing it throws there (`requireNativeModule('ExpoImage')`
+ * runs at import), so on macOS the SDK draws with react-native's `Image`,
+ * which react-native-macos backs with NSImage. Fresco, the reason the other
+ * platforms avoid react-native's `Image`, is Android-only.
+ *
+ * It accepts expo-image's props, so every call site typechecks once against the
+ * default fork, and maps the ones the SDK uses; the rest (transition, cache
+ * policy, placeholders) have no macOS equivalent here and are dropped.
+ */
+import type { ImageContentFit, ImageProps, ImageSource } from 'expo-image';
+import { Image, type ImageResizeMode, type ImageSourcePropType } from 'react-native';
+
+const RESIZE_MODE: Record<ImageContentFit, ImageResizeMode> = {
+  cover: 'cover',
+  contain: 'contain',
+  fill: 'stretch',
+  none: 'center',
+  'scale-down': 'contain',
+};
+
+function toImageSource(source: ImageProps['source']): ImageSourcePropType | undefined {
+  if (source == null) return undefined;
+  if (typeof source === 'number') return source;
+  if (typeof source === 'string') return { uri: source };
+  if (Array.isArray(source)) return source.length > 0 ? toImageSource(source[0]) : undefined;
+  if (typeof source === 'object' && 'uri' in source) {
+    const { uri, headers, width, height } = source as ImageSource;
+    return { uri, headers, width: width ?? undefined, height: height ?? undefined };
+  }
+  return undefined;
+}
+
+export function ExpoImage({
+  source,
+  contentFit = 'cover',
+  onError,
+  style,
+  blurRadius,
+  accessible,
+  accessibilityLabel,
+  testID,
+  className,
+}: ImageProps & { className?: string }) {
+  return (
+    <Image
+      source={toImageSource(source) ?? { uri: '' }}
+      resizeMode={RESIZE_MODE[contentFit]}
+      onError={onError ? () => onError({ error: 'The image could not be loaded' }) : undefined}
+      style={style}
+      blurRadius={blurRadius}
+      accessible={accessible}
+      accessibilityLabel={accessibilityLabel}
+      testID={testID}
+      {...(className ? { className } : null)}
+    />
+  );
+}

package/src/ui/components/ExpoImage.tsx

@@ -0,0 +1,11 @@
+/**
+ * The image every SDK surface draws with: expo-image's `Image` (Glide on
+ * Android, SDWebImage on iOS, an `<img>` on web), never react-native's
+ * (`__tests__/packaging/rnImageBoundary.test.ts`).
+ *
+ * Its one fork, `ExpoImage.macos.tsx`, exists because expo-image has no macOS
+ * implementation: its module calls `requireNativeModule('ExpoImage')` when it
+ * is first imported, so on react-native-macos merely importing this file's
+ * target would throw and take the whole SDK down with it.
+ */
+export { Image as ExpoImage } from 'expo-image';

package/src/ui/components/KeyboardBoundary.macos.tsx

@@ -0,0 +1,8 @@
+import type { FC, ReactNode } from 'react';
+
+/**
+ * react-native-macos fork: react-native-keyboard-controller has no macOS
+ * implementation and throws when imported without its native module, and a
+ * desktop keyboard never covers the window, so there is nothing to track.
+ */
+export const KeyboardBoundary: FC<{ children: ReactNode }> = ({ children }) => <>{children}</>;

package/src/ui/components/OxyConsentScreen.tsx

@@ -73,6 +73,8 @@ export interface OxyConsentResource {
 }
 
 export interface OxyConsentScreenProps {
+  /** Presentation only: own sign-in has no permission grant. External MCP stays consent. */
+  mode?: 'consent' | 'sign-in';
   /** The resolved requesting application. */
   application: OxyConsentApplication;
   /** OAuth scopes requested by the client (mapped to friendly labels). */
@@ -215,6 +217,7 @@ function ConsentLink({
 
 export function OxyConsentScreen({
   application,
+  mode = 'consent',
   scopes,
   user,
   resource,
@@ -269,10 +272,12 @@ export function OxyConsentScreen({
           </View>
         </View>
         <Text style={[styles.title, { color: theme.colors.text }]}>
-          {t('consent.title', { app: appName })}
+          {mode === 'sign-in' ? t('signin.title') : t('consent.title', { app: appName })}
         </Text>
         <Text style={[styles.subtitle, { color: theme.colors.textSecondary }]}>
-          {t('consent.subtitle', { app: appName })}
+          {mode === 'sign-in'
+            ? t('signin.chooser.subtitleToApp', { app: appName })
+            : t('consent.subtitle', { app: appName })}
         </Text>
       </View>
 
@@ -333,36 +338,38 @@ export function OxyConsentScreen({
         </View>
       ) : null}
 
-      {/* Requested permissions */}
-      <View style={styles.section}>
-        <Text style={[styles.sectionLabel, { color: theme.colors.textSecondary }]}>
-          {t('consent.permissions.title')}
-        </Text>
-        <View
-          style={[
-            styles.card,
-            { borderColor: theme.colors.border, backgroundColor: theme.colors.card },
-          ]}
-        >
-          {permissionRows.length > 0 ? (
-            permissionRows.map((row) => (
-              <View key={row.scope} testID={`consent-scope-${row.scope}`} style={styles.row}>
+      {/* Own sign-in has no permissions section, including the basic fallback. */}
+      {mode === 'consent' ? (
+        <View style={styles.section}>
+          <Text style={[styles.sectionLabel, { color: theme.colors.textSecondary }]}>
+            {t('consent.permissions.title')}
+          </Text>
+          <View
+            style={[
+              styles.card,
+              { borderColor: theme.colors.border, backgroundColor: theme.colors.card },
+            ]}
+          >
+            {permissionRows.length > 0 ? (
+              permissionRows.map((row) => (
+                <View key={row.scope} testID={`consent-scope-${row.scope}`} style={styles.row}>
+                  <View style={[styles.bullet, { backgroundColor: theme.colors.primary }]} />
+                  <Text style={[styles.rowText, { color: theme.colors.text }]}>
+                    {permissionRowLabel(row, t)}
+                  </Text>
+                </View>
+              ))
+            ) : (
+              <View testID="consent-scope-basic" style={styles.row}>
                 <View style={[styles.bullet, { backgroundColor: theme.colors.primary }]} />
                 <Text style={[styles.rowText, { color: theme.colors.text }]}>
-                  {permissionRowLabel(row, t)}
+                  {t('consent.permissions.basic')}
                 </Text>
               </View>
-            ))
-          ) : (
-            <View testID="consent-scope-basic" style={styles.row}>
-              <View style={[styles.bullet, { backgroundColor: theme.colors.primary }]} />
-              <Text style={[styles.rowText, { color: theme.colors.text }]}>
-                {t('consent.permissions.basic')}
-              </Text>
-            </View>
-          )}
+            )}
+          </View>
         </View>
-      </View>
+      ) : null}
 
       {resource && resource.writeActions.length > 0 ? (
         <View style={styles.section}>
@@ -479,7 +486,7 @@ export function OxyConsentScreen({
           loading={busy}
           style={styles.actionButton}
         >
-          {t('consent.allow', { app: appName })}
+          {mode === 'sign-in' ? t('signin.actions.continue') : t('consent.allow', { app: appName })}
         </Button>
         <Button
           testID="consent-deny"
@@ -493,9 +500,11 @@ export function OxyConsentScreen({
         </Button>
       </View>
 
-      <Text style={[styles.disclaimer, { color: theme.colors.textSecondary }]}>
-        {t('consent.disclaimer', { app: appName })}
-      </Text>
+      {mode === 'consent' ? (
+        <Text style={[styles.disclaimer, { color: theme.colors.textSecondary }]}>
+          {t('consent.disclaimer', { app: appName })}
+        </Text>
+      ) : null}
     </ScrollView>
   );
 }

package/src/ui/components/__tests__/OxyConsentScreen.test.tsx

@@ -25,6 +25,7 @@ function renderScreen(props: Partial<OxyConsentScreenProps> = {}) {
       scopes={props.scopes ?? ['openid', 'profile']}
       user={props.user}
       resource={props.resource}
+      mode={props.mode}
       onAllow={props.onAllow ?? onAllow}
       onDeny={props.onDeny ?? onDeny}
       busy={props.busy}
@@ -36,6 +37,18 @@ function renderScreen(props: Partial<OxyConsentScreenProps> = {}) {
 }
 
 describe('OxyConsentScreen', () => {
+  it('renders own sign-in without any permission grant language or rows', () => {
+    const { queryByTestId, queryByText, getByTestId } = renderScreen({
+      mode: 'sign-in',
+      scopes: ['files:write'],
+      application: { name: 'Inbox', isOfficial: true },
+    });
+    expect(queryByTestId('consent-scope-files:write')).toBeNull();
+    expect(queryByTestId('consent-scope-basic')).toBeNull();
+    expect(queryByText('Permissions requested')).toBeNull();
+    expect(getByTestId('consent-allow').textContent).toContain('Continue');
+  });
+
   it('renders every requested scope with a friendly label and falls back to the raw scope for unknown ones', () => {
     const { getByTestId } = renderScreen({ scopes: ['openid', 'files:write', 'custom:thing'] });
 

package/src/ui/components/fileManagement/FileViewer.tsx

@@ -4,7 +4,7 @@ import { useMemo, useState, useEffect } from 'react';
 import { View, ScrollView, StyleSheet } from 'react-native';
 import { Button } from '@oxy.so/bloom/button';
 import { Text } from '@oxy.so/bloom/typography';
-import { Image as ExpoImage } from 'expo-image';
+import { ExpoImage } from '../ExpoImage';
 import MaterialCommunityIcons from '../../icons/MaterialCommunityIcons';
 import { useTheme } from '@oxy.so/bloom/theme';
 import type { FileMetadata } from '@oxy.so/core';

package/src/ui/components/fileManagement/UploadPreview.tsx

@@ -3,7 +3,7 @@ import { View, ScrollView, StyleSheet } from 'react-native';
 import { Button } from '@oxy.so/bloom/button';
 import { Card } from '@oxy.so/bloom/card';
 import { Text } from '@oxy.so/bloom/typography';
-import { Image as ExpoImage } from 'expo-image';
+import { ExpoImage } from '../ExpoImage';
 import Ionicons from '../../icons/Ionicons';
 import { Dialog, type DialogControlProps } from '@oxy.so/bloom/dialog';
 import { useTheme } from '@oxy.so/bloom/theme';

package/src/ui/context/oxyContextTypes.ts

@@ -129,7 +129,8 @@ export interface OxyContextState {
 
   /**
    * Ask the already-authenticated user for explicit OAuth consent to exact
-   * application scopes. Must be called from a user gesture. Works on web and
+   * external application scopes. Own Oxy apps do not use this operation.
+   * Must be called from a user gesture. Works on web and
    * native and commits only a callback bound to the same user, state, PKCE pair
    * and byte-exact redirect URI.
    */

package/src/ui/oauth/__tests__/explicitOAuthConsent.test.ts

@@ -82,6 +82,23 @@ describe('requestOAuthConsent', () => {
     jest.restoreAllMocks();
   });
 
+  it.each(['first_party', 'internal', 'system'])(
+    'does not request consent for an own %s application',
+    async (type) => {
+      const context = makeContext('native');
+      const apps = context.oxyServices.apps.getPublic as jest.Mock;
+      apps.mockResolvedValue({ id: 'own-app', type, scopes: [...EXACT_SCOPES] });
+      expect(
+        await requestOAuthConsent(context, {
+          redirectUri: NATIVE_REDIRECT_URI,
+          scopes: EXACT_SCOPES,
+        }),
+      ).toEqual({ status: 'unsupported', reason: 'first-party-application' });
+      expect(openNative).not.toHaveBeenCalled();
+      expect(context.commitSession).not.toHaveBeenCalled();
+    },
+  );
+
   it('uses the existing web popup transport with exact scopes and redirect', async () => {
     const popup = fakePopup();
     jest.spyOn(window, 'open').mockReturnValue(popup as unknown as Window);

package/src/ui/oauth/explicitOAuthConsent.ts

@@ -1,11 +1,9 @@
 /**
  * Explicit OAuth consent for an already-authenticated Oxy user.
  *
- * This is deliberately separate from sign-in routing. First-party applications
- * normally use the account dialog, but a consent-required scope (for example
- * `acting-as:offline`) still has to go through the OAuth authorize surface. The
- * caller must invoke this operation from a real user gesture; it never runs on
- * mount, retries silently, or grants anything locally.
+ * External applications may request additional scopes through OAuth. Own Oxy
+ * applications use the account dialog and never create OAuth consent grants.
+ * The caller invokes this operation from a user gesture.
  */
 
 import type { OxyServices, PublicApplication } from "@oxy.so/core";
@@ -44,6 +42,7 @@ export type OAuthConsentFailureReason =
 
 export type OAuthConsentUnsupportedReason =
 	| "missing-client-id"
+	| "first-party-application"
 	| "identity-bound"
 	| "not-authenticated"
 	| "unsupported-platform";
@@ -173,6 +172,12 @@ export async function requestOAuthConsent(
 		return { status: "failed", reason: "client-resolution-failed" };
 	}
 
+	if (application.isOfficial || application.isInternal ||
+		["first_party", "internal", "system"].includes(application.type)) {
+		closeOAuthPopup(popup);
+		return { status: "unsupported", reason: "first-party-application" };
+	}
+
 	const configuredScopes = new Set(application.scopes);
 	if (options.scopes.some((scope) => !configuredScopes.has(scope))) {
 		closeOAuthPopup(popup);

package/src/ui/oauth/nativeAuthTransport.ts

@@ -87,7 +87,11 @@ export async function startNativeOAuthSignIn(
     if (!redirectUrl.startsWith(prefix) || redirectUrl.includes('#'))
       return { status: 'failed', reason: 'native-callback-invalid' };
     const parameters = new URLSearchParams(redirectUrl.slice(prefix.length));
-    if ([...new URL(options.redirectUri).searchParams.keys()].some((key) => parameters.has(key)))
+    if (
+      Array.from(new URL(options.redirectUri).searchParams, ([key]) => key).some((key) =>
+        parameters.has(key),
+      )
+    )
       return { status: 'failed', reason: 'native-callback-invalid' };
     if (
       ['code', 'state', 'error', 'error_description'].some(

package/src/ui/screens/AvatarCropScreen.tsx

@@ -46,7 +46,7 @@ import Animated, {
   withTiming,
 } from 'react-native-reanimated';
 import { useQuery, keepPreviousData } from '@tanstack/react-query';
-import { Image as ExpoImage } from 'expo-image';
+import { ExpoImage } from '../components/ExpoImage';
 import { useTheme } from '@oxy.so/bloom/theme';
 import { logger } from '@oxy.so/core';
 import { useOxy } from '../context/oxyRuntimeContext';

package/src/ui/screens/EditProfileFieldScreen.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useCallback, useMemo } from 'react';
 import { View, StyleSheet, type TextInputProps } from 'react-native';
-import { Image as ExpoImage } from 'expo-image';
+import { ExpoImage } from '../components/ExpoImage';
 import Ionicons from '../icons/Ionicons';
 import type { BaseScreenProps } from '../types/navigation';
 import { useTheme } from '@oxy.so/bloom/theme';

package/src/ui/screens/FileManagementScreen.tsx

@@ -8,7 +8,7 @@ import { type ComponentRef, useState, useCallback, useMemo, useRef } from 'react
 import { View, StyleSheet, ScrollView, RefreshControl, useWindowDimensions } from 'react-native';
 import { Text } from '@oxy.so/bloom/typography';
 import { useQueryClient } from '@tanstack/react-query';
-import { Image as ExpoImage } from 'expo-image';
+import { ExpoImage } from '../components/ExpoImage';
 import type { FileManagementScreenProps } from '../types/fileManagement';
 import { toast } from '@oxy.so/bloom/toast';
 import { surfaces } from '@oxy.so/bloom/surfaces';

package/src/ui/screens/OxyOneScreen.tsx

@@ -1,6 +1,6 @@
 import { useContext, useState } from 'react';
 import { Linking, View } from 'react-native';
-import { Image as ExpoImage } from 'expo-image';
+import { ExpoImage } from '../components/ExpoImage';
 import { SubscriptionPlans } from '@oxy.so/bloom/subscription-plans';
 import {
   SegmentedControl,

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

@@ -12,7 +12,7 @@ import {
   type LayoutChangeEvent,
 } from 'react-native';
 import { Text } from '@oxy.so/bloom/typography';
-import { Image as ExpoImage } from 'expo-image';
+import { ExpoImage } from '../../components/ExpoImage';
 import Ionicons from '../../icons/Ionicons';
 import MaterialCommunityIcons from '../../icons/MaterialCommunityIcons';
 import type { FileMetadata } from '@oxy.so/core';

package/src/ui/utils/imageSize.macos.ts

@@ -0,0 +1,18 @@
+/**
+ * react-native-macos fork of `imageSize.ts`: expo-image has no macOS
+ * implementation (see `components/ExpoImage.macos.tsx`), so the size comes
+ * from react-native's `Image.getSize`, which react-native-macos answers through
+ * NSImage. Fresco, the reason the Android fork avoids it, is Android-only.
+ */
+import { Image } from 'react-native';
+
+export interface ImageSize {
+  width: number;
+  height: number;
+}
+
+export function getImageSize(uri: string): Promise<ImageSize> {
+  return new Promise<ImageSize>((resolve, reject) => {
+    Image.getSize(uri, (width, height) => resolve({ width, height }), reject);
+  });
+}