Merge upstream develop

Author: github-actions[bot]

apps/polycentric/app.config.ts

@@ -64,6 +64,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       },
     ],
     'expo-font',
+    'expo-sqlite',
     'expo-web-browser',
     [
       'expo-dev-client',

apps/polycentric/package.json

@@ -13,71 +13,69 @@
     "build:web": "expo export --platform web",
     "test": "jest",
     "lint": "expo lint",
-    "prebuild": "APP_VARIANT=dev expo prebuild --clean"
+    "prebuild": "APP_VARIANT=dev expo prebuild --clean",
+    "typecheck": "tsc && tsc -p tsconfig.test.json"
   },
   "dependencies": {
     "@codeherence/react-native-header": "^1.0.1",
-    "@expo/dom-webview": "~55.0.6",
-    "@expo/metro-runtime": "~55.0.11",
+    "@expo/metro-runtime": "~57.0.3",
     "@expo/vector-icons": "^15.1.1",
     "@gorhom/bottom-sheet": "^5.2.14",
     "@lodev09/react-native-true-sheet": "^3.10.1",
     "@noble/hashes": "catalog:",
     "@polycentric/react-native": "workspace:*",
     "@react-native-async-storage/async-storage": "^2.2.0",
-    "@react-navigation/bottom-tabs": "^7.17.2",
-    "@react-navigation/elements": "^2.9.22",
-    "@react-navigation/native": "^7.3.0",
     "@rn-primitives/dropdown-menu": "^1.4.0",
     "@rn-primitives/hover-card": "^1.4.0",
     "@rn-primitives/popover": "^1.4.0",
     "@rn-primitives/portal": "^1.4.0",
     "@rn-primitives/radio-group": "^1.4.0",
     "@rn-primitives/toast": "^1.4.0",
-    "@shopify/flash-list": "^2.3.1",
+    "@shopify/flash-list": "^2.3.2",
     "@types/react-native-web": "^0.19.2",
     "better-sqlite3": "^12.10.0",
-    "expo": "~55.0.26",
-    "expo-blur": "~55.0.14",
-    "expo-build-properties": "~55.0.14",
-    "expo-clipboard": "~55.0.13",
-    "expo-constants": "~55.0.16",
-    "expo-dev-client": "~55.0.35",
-    "expo-device": "~55.0.17",
-    "expo-document-picker": "~55.0.13",
-    "expo-file-system": "~55.0.22",
-    "expo-font": "~55.0.8",
-    "expo-haptics": "~55.0.14",
-    "expo-image": "~55.0.11",
-    "expo-image-manipulator": "~55.0.17",
-    "expo-image-picker": "~55.0.20",
-    "expo-linking": "~55.0.15",
-    "expo-notifications": "~55.0.23",
-    "expo-router": "~55.0.16",
-    "expo-screen-orientation": "~55.0.16",
-    "expo-server": "~55.0.11",
-    "expo-splash-screen": "~55.0.21",
-    "expo-sqlite": "~55.0.16",
-    "expo-status-bar": "~55.0.6",
-    "expo-symbols": "~55.0.9",
-    "expo-system-ui": "~55.0.18",
-    "expo-web-browser": "~55.0.16",
-    "react": "19.2.7",
-    "react-dom": "19.2.7",
-    "react-native": "0.83.9",
+    "expo": "~57.0.4",
+    "expo-blur": "~57.0.0",
+    "expo-build-properties": "~57.0.3",
+    "expo-clipboard": "~57.0.0",
+    "expo-constants": "~57.0.3",
+    "expo-dev-client": "~57.0.5",
+    "expo-device": "~57.0.0",
+    "expo-document-picker": "~57.0.0",
+    "expo-file-system": "~57.0.0",
+    "expo-font": "~57.0.0",
+    "expo-haptics": "~57.0.0",
+    "expo-image": "~57.0.0",
+    "expo-image-manipulator": "~57.0.2",
+    "expo-image-picker": "~57.0.2",
+    "expo-linking": "~57.0.2",
+    "expo-notifications": "~57.0.3",
+    "expo-router": "~57.0.4",
+    "expo-screen-orientation": "~57.0.0",
+    "expo-server": "~57.0.0",
+    "expo-splash-screen": "~57.0.2",
+    "expo-sqlite": "~57.0.0",
+    "expo-status-bar": "~57.0.0",
+    "expo-symbols": "~57.0.0",
+    "expo-system-ui": "~57.0.0",
+    "expo-web-browser": "~57.0.0",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "react-native": "0.86.0",
     "react-native-draggable-flatlist": "^4.0.3",
-    "react-native-gesture-handler": "~2.30.1",
+    "react-native-gesture-handler": "~2.32.0",
     "react-native-nitro-image": "^0.15.1",
     "react-native-nitro-modules": "^0.36.0",
     "react-native-qrcode-svg": "^6.3.21",
-    "react-native-reanimated": "~4.2.3",
-    "react-native-safe-area-context": "5.8.0",
-    "react-native-screens": "~4.23.0",
+    "react-native-reanimated": "~4.5.0",
+    "react-native-safe-area-context": "5.7.0",
+    "react-native-screens": "~4.25.2",
+    "react-native-svg": "15.15.4",
     "react-native-toast-message": "^2.3.3",
     "react-native-vision-camera": "^5.0.0",
     "react-native-web": "~0.21.2",
     "react-native-webview": "13.16.1",
-    "react-native-worklets": "0.7.2",
+    "react-native-worklets": "0.10.0",
     "rn-emoji-picker": "^1.1.6",
     "zustand": "^5.0.14"
   },
@@ -88,12 +86,17 @@
     "@types/react": "~19.2.17",
     "@types/react-test-renderer": "^19.1.0",
     "eslint": "^10.0.0",
-    "eslint-config-expo": "~55.0.1",
+    "eslint-config-expo": "~57.0.0",
     "jest": "^29.7.0",
-    "jest-expo": "~55.0.18",
+    "jest-expo": "~57.0.1",
     "only-allow": "^1.2.2",
     "prettier": "^3.8.4",
-    "react-test-renderer": "19.2.7",
-    "typescript": "catalog:"
+    "react-test-renderer": "19.2.3",
+    "typescript": "~6.0.3"
+  },
+  "expo": {
+    "install": {
+      "exclude": ["@shopify/flash-list"]
+    }
   }
 }

apps/polycentric/src/common/components/primitives/IconButton.tsx

@@ -138,7 +138,11 @@ const styles = StyleSheet.create({
     overflow: 'hidden',
   },
   surface: {
-    ...StyleSheet.absoluteFillObject,
+    position: 'absolute',
+    top: 0,
+    right: 0,
+    bottom: 0,
+    left: 0,
     alignItems: 'center',
     justifyContent: 'center',
   },

apps/polycentric/src/common/components/sheet/Sheet.tsx

@@ -7,7 +7,6 @@ import {
 } from '@/src/common/theme';
 import { isWeb } from '@/src/common/util/platform';
 import { TrueSheet, type SheetDetent } from '@lodev09/react-native-true-sheet';
-import type { NavigationProp, ParamListBase } from '@react-navigation/native';
 import { Portal } from '@rn-primitives/portal';
 import { router, useNavigation } from 'expo-router';
 import {
@@ -59,7 +58,7 @@ export type SheetProps =
 
 export function Sheet(props: SheetProps) {
   const portalId = useId();
-  const navigation = useNavigation<NavigationProp<ParamListBase>>();
+  const navigation = useSheetNavigation();
   if (props.open === false) return null;
   return (
     <Portal name={`sheet-${portalId}`}>
@@ -159,8 +158,13 @@ Sheet.Header = SheetHeader;
 Sheet.Content = SheetContent;
 Sheet.Footer = SheetFooter;
 
+// `ReturnType` can't see a generic hook's default type; the non-generic
+// wrapper pins it down without importing react-navigation's types.
+const useSheetNavigation = () => useNavigation();
+type Navigation = ReturnType<typeof useSheetNavigation>;
+
 type WithNavigation<T> = T & {
-  navigation: NavigationProp<ParamListBase>;
+  navigation: Navigation;
 };
 type NativeInternalProps = WithNavigation<SheetProps>;
 type WebInternalProps = WithNavigation<SheetProps>;

apps/polycentric/src/common/theme/provider.tsx

@@ -1,6 +1,9 @@
 import { Fonts } from '@/src/common/assets';
-import * as ReactNavigation from '@react-navigation/native';
 import { useFonts } from 'expo-font';
+import {
+  DefaultTheme,
+  ThemeProvider as NavigationThemeProvider,
+} from 'expo-router';
 import {
   createContext,
   useCallback,
@@ -65,7 +68,7 @@ export function ThemeProvider({ children }: PropsWithChildren) {
     return null;
   }
 
-  const navTheme: ReactNavigation.Theme = {
+  const navTheme: typeof DefaultTheme = {
     dark: theme.scheme === 'dark',
     colors: {
       primary: theme.palette.primary_500,
@@ -75,14 +78,14 @@ export function ThemeProvider({ children }: PropsWithChildren) {
       border: theme.palette.neutral_200,
       notification: theme.palette.negative_500,
     },
-    fonts: ReactNavigation.DefaultTheme.fonts,
+    fonts: DefaultTheme.fonts,
   };
 
   return (
     <Context.Provider value={value}>
-      <ReactNavigation.ThemeProvider value={navTheme}>
+      <NavigationThemeProvider value={navTheme}>
         {children}
-      </ReactNavigation.ThemeProvider>
+      </NavigationThemeProvider>
     </Context.Provider>
   );
 }

apps/polycentric/src/common/theme/tokens.ts

@@ -10,6 +10,7 @@ export const Spacing = {
   xl: 20,
   '2xl': 24,
   '3xl': 32,
+  '4xl': 40,
 } as const;
 
 export type SpacingToken = keyof typeof Spacing;
@@ -63,7 +64,7 @@ export const Breakpoints = {
   '2xl': 1400,
 } as const;
 
-export const Atoms = StyleSheet.create({
+const atomStyles = {
   /**
    * Position
    */
@@ -676,4 +677,5 @@ export const Atoms = StyleSheet.create({
     outlineStyle: 'none',
     outlineWidth: 0,
   } as unknown as ViewStyle,
-});
+} satisfies Record<string, ViewStyle | TextStyle>;
+export const Atoms = StyleSheet.create(atomStyles);

apps/polycentric/src/features/composer/ComposerFields.tsx

@@ -276,7 +276,11 @@ function AttachmentThumb({
             Atoms.items_center,
             Atoms.justify_center,
             {
-              ...StyleSheet.absoluteFillObject,
+              position: 'absolute',
+              top: 0,
+              right: 0,
+              bottom: 0,
+              left: 0,
               backgroundColor: withHexOpacity(
                 status === 'error'
                   ? theme.palette.negative_500

apps/polycentric/tsconfig.json

@@ -3,8 +3,10 @@
   "compilerOptions": {
     "strict": true,
     "jsx": "react-jsx",
-    "baseUrl": ".",
+    "types": ["node", "react-native-web"],
     "paths": { "@/*": ["./*"] }
   },
-  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts"]
+  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts"],
+  // Overriding `exclude` drops the base config's list, so restate it.
+  "exclude": ["node_modules", "android", "ios", "**/*.test.ts", "**/*.test.tsx"]
 }

apps/polycentric/tsconfig.test.json

@@ -0,0 +1,15 @@
+{
+  // Test files only: brings in the jest globals the app config doesn't need.
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": ["jest", "node", "react-native-web"]
+  },
+  "include": [
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "src/types/**/*.d.ts",
+    ".expo/types/**/*.ts",
+    "expo-env.d.ts"
+  ],
+  "exclude": ["node_modules", "android", "ios"]
+}

package.json

@@ -29,8 +29,5 @@
     "lint-staged": "^17.0.7",
     "turbo": "^2.9.14",
     "typescript-eslint": "^8.46.2"
-  },
-  "dependencies": {
-    "expo": "^55.0.15"
   }
 }