Patch video player to add a ton of debug logging

2026-01-08 15:18:37 +02:00
907 changed files with 173949 additions and 224362 deletions
@@ -28,24 +28,11 @@ EXPO_PUBLIC_CHAT_PROXY_DID=
 #
 #

-# Bluesky's metrics API
-EXPO_PUBLIC_METRICS_API_HOST=
-
-# Growthbook config
-EXPO_PUBLIC_GROWTHBOOK_API_HOST=
-EXPO_PUBLIC_GROWTHBOOK_CLIENT_KEY=
-
 # Sentry DSN for telemetry
 EXPO_PUBLIC_SENTRY_DSN=

 # Bitdrift API key. If undefined, Bitdrift will be disabled.
 EXPO_PUBLIC_BITDRIFT_API_KEY=

-# geolocation web worker URL
-GEOLOCATION_DEV_URL=
-
-# live-events web worker URL
-LIVE_EVENTS_DEV_URL=
-
-# app-config web worker URL
-APP_CONFIG_DEV_URL=
+# bapp-config web worker URL
+BAPP_CONFIG_DEV_URL=
@@ -0,0 +1,126 @@
+module.exports = {
+  root: true,
+  extends: [
+    '@react-native',
+    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:react-native-a11y/ios',
+    'prettier',
+  ],
+  parser: '@typescript-eslint/parser',
+  plugins: [
+    '@typescript-eslint',
+    'react',
+    'lingui',
+    'simple-import-sort',
+    'bsky-internal',
+    'eslint-plugin-react-compiler',
+    'import',
+  ],
+  rules: {
+    'react/no-unescaped-entities': 0,
+    'react/prop-types': 0,
+    'react-native/no-inline-styles': 0,
+    'bsky-internal/avoid-unwrapped-text': [
+      'error',
+      {
+        impliedTextComponents: [
+          'H1',
+          'H2',
+          'H3',
+          'H4',
+          'H5',
+          'H6',
+          'P',
+          'Admonition',
+          'Admonition.Admonition',
+          'Toast.Action',
+          'AgeAssuranceAdmonition',
+          'Span',
+          'StackedButton',
+        ],
+        impliedTextProps: [],
+        suggestedTextWrappers: {
+          Button: 'ButtonText',
+          'ToggleButton.Button': 'ToggleButton.ButtonText',
+          'SegmentedControl.Item': 'SegmentedControl.ItemText',
+        },
+      },
+    ],
+    'bsky-internal/use-exact-imports': 'error',
+    'bsky-internal/use-typed-gates': 'error',
+    'bsky-internal/use-prefixed-imports': 'error',
+    'simple-import-sort/imports': [
+      'error',
+      {
+        groups: [
+          // Side effect imports.
+          ['^\\u0000'],
+          // Node.js builtins prefixed with `node:`.
+          ['^node:'],
+          // Packages.
+          // Things that start with a letter (or digit or underscore), or `@` followed by a letter.
+          // React/React Native priortized, followed by expo
+          // Followed by all packages excluding unprefixed relative ones
+          [
+            '^(react\\/(.*)$)|^(react$)|^(react-native(.*)$)',
+            '^(expo(.*)$)|^(expo$)',
+            '^(?!(?:alf|components|lib|locale|logger|platform|screens|state|view)(?:$|\\/))@?\\w',
+          ],
+          // Relative imports.
+          // Ideally, anything that starts with a dot or #
+          // due to unprefixed relative imports being used, we whitelist the relative paths we use
+          // (?:$|\\/) matches end of string or /
+          [
+            '^(?:#\\/)?(?:lib|state|logger|platform|locale)(?:$|\\/)',
+            '^(?:#\\/)?view(?:$|\\/)',
+            '^(?:#\\/)?screens(?:$|\\/)',
+            '^(?:#\\/)?alf(?:$|\\/)',
+            '^(?:#\\/)?components(?:$|\\/)',
+            '^#\\/',
+            '^\\.',
+          ],
+          // anything else - hopefully we don't have any of these
+          ['^'],
+        ],
+      },
+    ],
+    'simple-import-sort/exports': 'error',
+    'react-compiler/react-compiler': 'warn',
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': [
+      'error',
+      {argsIgnorePattern: '^_', varsIgnorePattern: '^_.+'},
+    ],
+    '@typescript-eslint/consistent-type-imports': [
+      'warn',
+      {prefer: 'type-imports', fixStyle: 'inline-type-imports'},
+    ],
+    'import/consistent-type-specifier-style': ['warn', 'prefer-inline'],
+  },
+  ignorePatterns: [
+    '**/__mocks__/*.ts',
+    'src/platform/polyfills.ts',
+    'src/third-party',
+    'ios',
+    'android',
+    'coverage',
+    '*.lock',
+    '.husky',
+    'patches',
+    '*.html',
+    'bskyweb',
+    'bskyembed',
+    'src/locale/locales/_build/',
+    'src/locale/locales/**/*.js',
+    '*.e2e.ts',
+    '*.e2e.tsx',
+  ],
+  settings: {
+    componentWrapperFunctions: ['observer'],
+  },
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 'latest',
+  },
+}
@@ -16,9 +16,6 @@ jobs:
    if: github.repository == 'bluesky-social/social-app'
    name: Build and Submit Android
    runs-on: Linux-x64-32core
-    concurrency:
-      group: android-build
-      cancel-in-progress: false
    steps:
      - name: Check for EXPO_TOKEN
        run: >
@@ -16,9 +16,6 @@ jobs:
    if: github.repository == 'bluesky-social/social-app'
    name: Build and Submit iOS
    runs-on: macos-26-xlarge
-    concurrency:
-      group: ios-build
-      cancel-in-progress: false
    steps:
      - name: Check for EXPO_TOKEN
        run: >
@@ -157,8 +157,8 @@ jobs:
    name: Build and Submit iOS
    runs-on: macos-26
    concurrency:
-      group: ios-build
-      cancel-in-progress: false
+      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-ios
+      cancel-in-progress: true
    needs: [bundleDeploy]
    # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
    # available here
@@ -262,7 +262,7 @@ jobs:
    name: Build and Submit Android
    runs-on: ubuntu-latest
    concurrency:
-      group: android-build
+      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-android
      cancel-in-progress: false
    needs: [bundleDeploy]
    # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
@@ -1,54 +0,0 @@
-name: Claude Code
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude:
-    if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-      actions: read # Required for Claude to read CI results on PRs
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code
-        id: claude
-        uses: anthropics/claude-code-action@v1
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # This is an optional setting that allows Claude to read CI results on PRs
-          additional_permissions: |
-            actions: read
-
-          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
-          # prompt: 'Update the pull request description to include a summary of changes.'
-
-          # Optional: Add claude_args to customize behavior and configuration
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://code.claude.com/docs/en/cli-reference for available options
-          # claude_args: '--allowed-tools Bash(gh pr:*)'
-
-          # NOTE(sfn): we can add a custom system prompt here
-
-          claude_args: |
-            --model claude-opus-4-5-20251101
@@ -15,11 +15,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Git Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
      - name: Set up Go tooling
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v3
        with:
-          go-version-file: bskyweb/go.mod
+          go-version: "1.25"
      - name: Dummy Static Files
        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
      - name: Check
@@ -32,11 +32,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Git Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
      - name: Set up Go tooling
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v3
        with:
-          go-version-file: bskyweb/go.mod
+          go-version: "1.25"
      - name: Dummy Static Files
        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
      - name: Lint
@@ -110,9 +110,7 @@ google-services.json

 # i18n
 src/locale/locales/_build/
-src/locale/locales/**/messages.js
-src/locale/locales/**/messages.mjs
-src/locale/locales/**/messages.ts
+src/locale/locales/**/*.js

 # local builds
 *.apk
@@ -1,755 +0,0 @@
-# CLAUDE.md - Bluesky Social App Development Guide
-
-This document provides guidance for working effectively in the Bluesky Social app codebase.
-
-## Project Overview
-
-Bluesky Social is a cross-platform social media application built with React Native and Expo. It runs on iOS, Android, and Web, connecting to the AT Protocol (atproto) decentralized social network.
-
-**Tech Stack:**
- React Native 0.81 with Expo 54
- TypeScript
- React Navigation for routing
- TanStack Query (React Query) for data fetching
- Lingui for internationalization
- Custom design system called ALF (Application Layout Framework)
-
-## Essential Commands
-
-```bash
-# Development
-yarn start              # Start Expo dev server
-yarn web                # Start web version
-yarn android            # Run on Android
-yarn ios                # Run on iOS
-
-# Testing & Quality
-# IMPORTANT: Always use these yarn scripts, never call the underlying tools directly
-yarn test               # Run Jest tests
-yarn lint               # Run ESLint
-yarn typecheck          # Run TypeScript type checking
-
-# Internationalization
-# DO NOT run these commands - extraction and compilation are handled by CI
-yarn intl:extract       # Extract translation strings (nightly CI job)
-yarn intl:compile       # Compile translations for runtime (nightly CI job)
-
-# Build
-yarn build-web          # Build web version
-yarn prebuild           # Generate native projects
-```
-
-## Project Structure
-
-```
-src/
-├── alf/                    # Design system (ALF) - themes, atoms, tokens
-├── components/             # Shared UI components (Button, Dialog, Menu, etc.)
-├── screens/                # Full-page screen components (newer pattern)
-├── features/               # Macro-features that bridge components/screens
-├── view/
-│   ├── screens/            # Full-page screens (legacy location)
-│   ├── com/                # Reusable view components
-│   └── shell/              # App shell (navigation bars, tabs)
-├── state/
-│   ├── queries/            # TanStack Query hooks
-│   ├── preferences/        # User preferences (React Context)
-│   ├── session/            # Authentication state
-│   └── persisted/          # Persistent storage layer
-├── lib/                    # Utilities, constants, helpers
-├── locale/                 # i18n configuration and language files
-└── Navigation.tsx          # Main navigation configuration
-```
-
-### Project Structure in Depth
-
-When building new things, follow these guidelines for where to put code.
-
-#### Components vs Screens vs Features
-
-**Components** are reusable UI elements that are not full screens. Should be
-platform-agnostic when possible. Examples: Button, Dialog, Menu, TextField. Put
-these in `/components` if they are shared across screens.
-
-**Screens** are full-page components that represent a route in the app. They
-often contain multiple components and handle layout for a page. New screens
-should go in `/screens` (not `/view/screens`) to encourage better organization
-and separation from legacy code.
-
-For complex screens that have specific components or data needs that _are not
-shared by other screens_, we encourage subdirectoreis within `/screens/<name>`
-e.g. `/screens/ProfileScreen/ProfileScreen.tsx` and
-`/screens/ProfileScreen/components/`.
-
-**Features** are higher-level modules that may include context, data fetching,
-components, and utilities related to a specific feature e.g.
-`/features/liveNow`. They don't neatly fit into components or screens and often
-span multiple screens. This is an optional pattern for organizing complex
-features.
-
-#### Legacy Directories
-
-For the most part, avoid writing new files into the `/view` directory and
-subdirectories. This is the older pattern for organizing screens and components,
-and it has become a bit disorganized over time. New development should go into
-`/screens`, `/components`, and `/features`.
-
-#### State
-
-The `/state` directory is where we've historically put all our data fetching and
-state management logic. This is perfectly fine, but for new features, consider
-organizing state logic closer to the components that use it, either within a
-feature directory or co-located with a screen. The key is to keep related code
-together and avoid having "god files" with too much unrelated logic.
-
-#### Lib
-
-The `/lib` directory is for utilities and helpers that don't fit into other
-categories. This can include things like API clients, formatting functions,
-constants, and other shared logic.
-
-#### Top Level Directories
-
-Avoid writing new top-level subdirectories within `/src`. We've done this for a
-few things in the past that, but we have stronger patterns now. Examples:
-`/logger` should probably have been written into `/lib`. And `ageAssurance` is
-better classified within `/features`. We will probably migrate these things
-eventually.
-
-### File and Directory Naming Conventions
-
-Typically JS style for variables, functions, etc. We use ProudCamelCase for
-components, and camelCase directories and files.
-
-When organizing new code, consider if it fits into a single file, or if it
-should be broken down into multiple files. For "macro" component cases, or
-things that live in `/features` or `/screens`, we often follow a pattern of
-having an `index.tsx` for the main component, and then co-locating related
-components, hooks, and utilities in the same directory. For example:
-
-```
-src
-├── screens/
-│   ├── ProfileScreen/
-│   │   ├── index.tsx          # Main screen component
-│   │   ├── components/       # Sub-components used only by this screen
-```
-
-Similar patterns can be found in `/features` and `/components`. The idea here is
-to keep related code together and make it easier to navigate.
-
-You should ask yourself: if someone new was looking for the code related to this
-feature or screen, where would they expect to find it? Organizing code in a way
-that matches developer expectations can make the codebase much more
-approachable. Being able to say "Live Now stuff lives in `/features/liveNow`" is
-easier to understand than having it scattered across multiple directories.
-
-No need to go overboard with this. If a component or feature fits into a single
-file, there's no reason to have a `/Component/index.tsx` file when it could just
-be `/Component.tsx`. Use your judgment based on the complexity and amount of
-related code.
-
-#### Platform Specific Files
-
-We have conflicting patterns in the app for this. The preferred approach is to
-group platform-specific files into a directory as much as possible. For example,
-rather than having `Component.tsx`, `Component.web.tsx`, and
-`Component.native.tsx` in the same directory, we prefer to have a `Component/`
-directory with `index.tsx`, `index.web.tsx`, and `index.native.tsx`. This keeps
-related code together and gives us a better visual cue that there are probably
-other files contained within this "macro" feature, whereas `Component.tsx` on
-its own looks more like a single component file.
-
-### Documentation and Tests Within Features
-
-For larger features or components, it's helpful to include a README.md file
-within the directory that explains the purpose of the feature, how it works, and
-any important implementation details. The `/Component/index.tsx` pattern lends
-itself well to this, since the `index.tsx` can be the main component file, and
-the `README.md` can provide documentation for the whole feature. This is
-optional, but can be a nice way to keep documentation close to the code it
-describes.
-
-Similarly, if there are tests that are specific to a component or feature, it
-can be helpful to include them in the same directory, either as
-`Component.test.tsx` or in a `__tests__/` subdirectory. This keeps everything
-related to the component or feature in one place and makes it easier to find and
-maintain tests.
-
-## Styling System (ALF)
-
-ALF is the custom design system. It uses Tailwind-inspired naming with underscores instead of hyphens.
-
-### Basic Usage
-
-```tsx
-import {atoms as a, useTheme} from '#/alf'
-
-function MyComponent() {
-  const t = useTheme()
-
-  return (
-    <View style={[a.flex_row, a.gap_md, a.p_lg, t.atoms.bg]}>
-      <Text style={[a.text_md, a.font_bold, t.atoms.text]}>
-        Hello
-      </Text>
-    </View>
-  )
-}
-```
-
-### Key Concepts
-
-**Static Atoms** - Theme-independent styles imported from `atoms`:
-```tsx
-import {atoms as a} from '#/alf'
-// a.flex_row, a.p_md, a.gap_sm, a.rounded_md, a.text_lg, etc.
-```
-
-**Theme Atoms** - Theme-dependent colors from `useTheme()`:
-```tsx
-const t = useTheme()
-// t.atoms.bg, t.atoms.text, t.atoms.border_contrast_low, etc.
-// t.palette.primary_500, t.palette.negative_400, etc.
-```
-
-**Platform Utilities** - For platform-specific styles:
-```tsx
-import {web, native, ios, android, platform} from '#/alf'
-
-const styles = [
-  a.p_md,
-  web({cursor: 'pointer'}),
-  native({paddingBottom: 20}),
-  platform({ios: {...}, android: {...}, web: {...}}),
-]
-```
-
-**Breakpoints** - Responsive design:
-```tsx
-import {useBreakpoints} from '#/alf'
-
-const {gtPhone, gtMobile, gtTablet} = useBreakpoints()
-if (gtMobile) {
-  // Tablet or desktop layout
-}
-```
-
-### Naming Conventions
-
- Spacing: `2xs`, `xs`, `sm`, `md`, `lg`, `xl`, `2xl` (t-shirt sizes)
- Text: `text_xs`, `text_sm`, `text_md`, `text_lg`, `text_xl`
- Gaps/Padding: `gap_sm`, `p_md`, `px_lg`, `py_xl`
- Flex: `flex_row`, `flex_1`, `align_center`, `justify_between`
- Borders: `border`, `border_t`, `rounded_md`, `rounded_full`
-
-## Component Patterns
-
-### Dialog Component
-
-Dialogs use a bottom sheet on native and a modal on web. Use `useDialogControl()` hook to manage state.
-
-```tsx
-import * as Dialog from '#/components/Dialog'
-
-function MyFeature() {
-  const control = Dialog.useDialogControl()
-
-  return (
-    <>
-      <Button label="Open" onPress={control.open}>
-        <ButtonText>Open Dialog</ButtonText>
-      </Button>
-
-      <Dialog.Outer control={control}>
-        {/* Typically the inner part is in its own component */}
-        <Dialog.Handle />  {/* Native-only drag handle */}
-        <Dialog.ScrollableInner label={_(msg`My Dialog`)}>
-          <Dialog.Header>
-            <Dialog.HeaderText>Title</Dialog.HeaderText>
-          </Dialog.Header>
-
-          <Text>Dialog content here</Text>
-
-          <Button label="Done" onPress={() => control.close()}>
-            <ButtonText>Done</ButtonText>
-          </Button>
-          <Dialog.Close /> {/* Web-only X button in top left */}
-        </Dialog.ScrollableInner>
-      </Dialog.Outer>
-    </>
-  )
-}
-```
-
-### Menu Component
-
-Menus render as a dropdown on web and a bottom sheet dialog on native.
-
-```tsx
-import * as Menu from '#/components/Menu'
-
-function MyMenu() {
-  return (
-    <Menu.Root>
-      <Menu.Trigger label="Open menu">
-        {({props}) => (
-          <Button {...props} label="Menu">
-            <ButtonIcon icon={DotsHorizontal} />
-          </Button>
-        )}
-      </Menu.Trigger>
-
-      <Menu.Outer>
-        <Menu.Group>
-          <Menu.Item label="Edit" onPress={handleEdit}>
-            <Menu.ItemIcon icon={Pencil} />
-            <Menu.ItemText>Edit</Menu.ItemText>
-          </Menu.Item>
-          <Menu.Item label="Delete" onPress={handleDelete}>
-            <Menu.ItemIcon icon={Trash} />
-            <Menu.ItemText>Delete</Menu.ItemText>
-          </Menu.Item>
-        </Menu.Group>
-      </Menu.Outer>
-    </Menu.Root>
-  )
-}
-```
-
-### Button Component
-
-```tsx
-import {Button, ButtonText, ButtonIcon} from '#/components/Button'
-
-// Solid primary button (most common)
-<Button label="Save" onPress={handleSave} color="primary" size="large">
-  <ButtonText>Save</ButtonText>
-</Button>
-
-// With icon
-<Button label="Share" onPress={handleShare} color="secondary" size="small">
-  <ButtonIcon icon={Share} />
-  <ButtonText>Share</ButtonText>
-</Button>
-
-// Icon-only button
-<Button label="Close" onPress={handleClose} color="secondary" size="small" shape="round">
-  <ButtonIcon icon={XIcon} />
-</Button>
-
-// Ghost variant (deprecated - use color prop)
-<Button label="Cancel" variant="ghost" color="secondary" size="small">
-  <ButtonText>Cancel</ButtonText>
-</Button>
-```
-
-**Button Props:**
- `color`: `'primary'` | `'secondary'` | `'negative'` | `'primary_subtle'` | `'negative_subtle'` | `'secondary_inverted'`
- `size`: `'tiny'` | `'small'` | `'large'`
- `shape`: `'default'` (pill) | `'round'` | `'square'` | `'rectangular'`
- `variant`: `'solid'` | `'outline'` | `'ghost'` (deprecated, use `color`)
-
-### Typography
-
-```tsx
-import {Text, H1, H2, P} from '#/components/Typography'
-
-<H1 style={[a.text_xl, a.font_bold]}>Heading</H1>
-<P>Paragraph text with default styling.</P>
-<Text style={[a.text_sm, t.atoms.text_contrast_medium]}>Custom text</Text>
-
-// For text with emoji, add the emoji prop
-<Text emoji>Hello! 👋</Text>
-```
-
-### TextField
-
-```tsx
-import * as TextField from '#/components/forms/TextField'
-
-<TextField.LabelText>Email</TextField.LabelText>
-<TextField.Root>
-  <TextField.Icon icon={AtSign} />
-  <TextField.Input
-    label="Email address"
-    placeholder="you@example.com"
-    defaultValue={email}
-    onChangeText={setEmail}
-    keyboardType="email-address"
-    autoCapitalize="none"
-  />
-</TextField.Root>
-```
-
-## Internationalization (i18n)
-
-All user-facing strings must be wrapped for translation using Lingui.
-
-```tsx
-import {msg, plural} from '@lingui/core/macro'
-import {Trans} from '@lingui/react/macro'
-import {useLingui} from '@lingui/react'
-
-function MyComponent() {
-  const {_} = useLingui()
-
-  // Simple strings - use msg() with _() function
-  const title = _(msg`Settings`)
-  const errorMessage = _(msg`Something went wrong`)
-
-  // Strings with variables
-  const greeting = _(msg`Hello, ${name}!`)
-
-  // Pluralization
-  const countLabel = _(plural(count, {
-    one: '# item',
-    other: '# items',
-  }))
-
-  // JSX content - use Trans component
-  return (
-    <Text>
-      <Trans>Welcome to <Text style={a.font_bold}>Bluesky</Text></Trans>
-    </Text>
-  )
-}
-```
-
-**Commands:**
-```bash
-# DO NOT run these commands - extraction and compilation are handled by a nightly CI job
-yarn intl:extract    # Extract new strings to locale files
-yarn intl:compile    # Compile translations for runtime
-```
-
-## State Management
-
-### TanStack Query (Data Fetching)
-
-```tsx
-// src/state/queries/profile.ts
-import {useQuery, useMutation, useQueryClient} from '@tanstack/react-query'
-
-// Query key pattern
-const RQKEY_ROOT = 'profile'
-export const RQKEY = (did: string) => [RQKEY_ROOT, did]
-
-// Query hook
-export function useProfileQuery({did}: {did: string}) {
-  const agent = useAgent()
-
-  return useQuery({
-    queryKey: RQKEY(did),
-    queryFn: async () => {
-      const res = await agent.getProfile({actor: did})
-      return res.data
-    },
-    staleTime: STALE.MINUTES.FIVE,
-    enabled: !!did,
-  })
-}
-
-// Mutation hook
-export function useUpdateProfile() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (data) => {
-      // Update logic
-    },
-    onSuccess: (_, variables) => {
-      queryClient.invalidateQueries({queryKey: RQKEY(variables.did)})
-    },
-    onError: (error) => {
-      if (isNetworkError(error)) {
-        // don't log, but inform user
-      } else if (error instanceof AppBskyExampleProcedure.ExampleError) {
-        // XRPC APIs often have typed errors, allows nicer handling
-      } else {
-        // Log unexpected errors to Sentry
-        logger.error('Error updating profile', {safeMessage: error})
-      }
-    }
-  })
-}
-```
-
-**Stale Time Constants** (from `src/state/queries/index.ts`):
-```tsx
-STALE.SECONDS.FIFTEEN  // 15 seconds
-STALE.MINUTES.ONE      // 1 minute
-STALE.MINUTES.FIVE     // 5 minutes
-STALE.HOURS.ONE        // 1 hour
-STALE.INFINITY         // Never stale
-```
-
-**Paginated APIs:** Many atproto APIs return paginated results with a `cursor`. Use `useInfiniteQuery` for these:
-
-```tsx
-export function useDraftsQuery() {
-  const agent = useAgent()
-
-  return useInfiniteQuery({
-    queryKey: ['drafts'],
-    queryFn: async ({pageParam}) => {
-      const res = await agent.app.bsky.draft.getDrafts({cursor: pageParam})
-      return res.data
-    },
-    initialPageParam: undefined as string | undefined,
-    getNextPageParam: page => page.cursor,
-  })
-}
-```
-
-To get all items from pages: `data?.pages.flatMap(page => page.items) ?? []`
-
-### Preferences (React Context)
-
-```tsx
-// Simple boolean preference pattern
-import {useAutoplayDisabled, useSetAutoplayDisabled} from '#/state/preferences'
-
-function SettingsScreen() {
-  const autoplayDisabled = useAutoplayDisabled()
-  const setAutoplayDisabled = useSetAutoplayDisabled()
-
-  return (
-    <Toggle
-      value={autoplayDisabled}
-      onValueChange={setAutoplayDisabled}
-    />
-  )
-}
-```
-
-### Session State
-
-```tsx
-import {useSession, useAgent} from '#/state/session'
-
-function MyComponent() {
-  const {hasSession, currentAccount} = useSession()
-  const agent = useAgent()
-
-  if (!hasSession) {
-    return <LoginPrompt />
-  }
-
-  // Use agent for API calls
-  const response = await agent.getProfile({actor: currentAccount.did})
-}
-```
-
-## Navigation
-
-Navigation uses React Navigation with type-safe route parameters.
-
-```tsx
-// Screen component
-import {type NativeStackScreenProps} from '@react-navigation/native-stack'
-import {type CommonNavigatorParams} from '#/lib/routes/types'
-
-type Props = NativeStackScreenProps<CommonNavigatorParams, 'Profile'>
-
-export function ProfileScreen({route, navigation}: Props) {
-  const {name} = route.params  // Type-safe params
-
-  return (
-    <Layout.Screen>
-      {/* Screen content */}
-    </Layout.Screen>
-  )
-}
-
-// Programmatic navigation
-import {useNavigation} from '@react-navigation/native'
-
-const navigation = useNavigation()
-navigation.navigate('Profile', {name: 'alice.bsky.social'})
-
-// Or use the navigate helper
-import {navigate} from '#/Navigation'
-navigate('Profile', {name: 'alice.bsky.social'})
-```
-
-## Platform-Specific Code
-
-Use file extensions for platform-specific implementations:
-
-```
-Component.tsx          # Shared/default
-Component.web.tsx      # Web-only
-Component.native.tsx   # iOS + Android
-Component.ios.tsx      # iOS-only
-Component.android.tsx  # Android-only
-```
-
-Example from Dialog:
- `src/components/Dialog/index.tsx` - Native (uses BottomSheet)
- `src/components/Dialog/index.web.tsx` - Web (uses modal with Radix primitives)
-
-**Important:** The bundler automatically resolves platform-specific files. Just import normally:
-
-```tsx
-// CORRECT - bundler picks storage.ts or storage.web.ts automatically
-import * as storage from '#/state/drafts/storage'
-
-// WRONG - don't use require() or conditional imports for platform files
-const storage = IS_NATIVE
-  ? require('#/state/drafts/storage')
-  : require('#/state/drafts/storage.web')
-```
-
-Platform detection (for runtime logic, not imports):
-```tsx
-import {IS_WEB, IS_NATIVE, IS_IOS, IS_ANDROID} from '#/env'
-
-if (IS_NATIVE) {
-  // Native-specific logic
-}
-```
-
-## Import Aliases
-
-Always use the `#/` alias for absolute imports:
-
-```tsx
-// Good
-import {useSession} from '#/state/session'
-import {atoms as a, useTheme} from '#/alf'
-import {Button} from '#/components/Button'
-
-// Avoid
-import {useSession} from '../../../state/session'
-```
-
-## Footguns
-
-Common pitfalls to avoid in this codebase:
-
-### Dialog Close Callback (Critical)
-
-**Always use `control.close(() => ...)` when performing actions after closing a dialog.** The callback ensures the action runs after the dialog's close animation completes. Failing to do this causes race conditions with React state updates.
-
-```tsx
-// WRONG - causes bugs with state updates, navigation, opening other dialogs
-const onConfirm = () => {
-  control.close()
-  navigation.navigate('Home')  // May race with dialog animation
-}
-
-// WRONG - same problem
-const onConfirm = () => {
-  control.close()
-  otherDialogControl.open()  // Will likely fail or cause visual glitches
-}
-
-// CORRECT - action runs after dialog fully closes
-const onConfirm = () => {
-  control.close(() => {
-    navigation.navigate('Home')
-  })
-}
-
-// CORRECT - opening another dialog after close
-const onConfirm = () => {
-  control.close(() => {
-    otherDialogControl.open()
-  })
-}
-
-// CORRECT - state updates after close
-const onConfirm = () => {
-  control.close(() => {
-    setSomeState(newValue)
-    onCallback?.()
-  })
-}
-```
-
-This applies to:
- Navigation (`navigation.navigate()`, `navigation.push()`)
- Opening other dialogs or menus
- State updates that affect UI (`setState`, `queryClient.invalidateQueries`)
- Callbacks passed from parent components
-
-The Menu component on iOS specifically uses this pattern - see `src/components/Menu/index.tsx:151`.
-
-### Controlled vs Uncontrolled Inputs
-
-Prefer `defaultValue` over `value` for TextInput on the old architecture:
-
-```tsx
-// Preferred - uncontrolled
-<TextField.Input
-  defaultValue={initialEmail}
-  onChangeText={setEmail}
-/>
-
-// Avoid when possible - controlled (can cause performance issues)
-<TextField.Input
-  value={email}
-  onChangeText={setEmail}
-/>
-```
-
-### Platform-Specific Behavior
-
-Some components behave differently across platforms:
- `Dialog.Handle` - Only renders on native (drag handle for bottom sheet)
- `Dialog.Close` - Only renders on web (X button)
- `Menu.Divider` - Only renders on web
- `Menu.ContainerItem` - Only works on native
-
-Always test on multiple platforms when using these components.
-
-### React Compiler is Enabled
-
-This codebase uses React Compiler, so **don't proactively add `useMemo` or `useCallback`**. The compiler handles memoization automatically.
-
-```tsx
-// UNNECESSARY - React Compiler handles this
-const handlePress = useCallback(() => {
-  doSomething()
-}, [doSomething])
-
-// JUST WRITE THIS
-const handlePress = () => {
-  doSomething()
-}
-```
-
-Only use `useMemo`/`useCallback` when you have a specific reason, such as:
- The value is immediately used in an effect's dependency array
- You're passing a callback to a non-React library that needs referential stability
-
-## Best Practices
-
-1. **Accessibility**: Always provide `label` prop for interactive elements, use `accessibilityHint` where helpful
-
-2. **Translations**: Wrap ALL user-facing strings with `msg()` or `<Trans>`
-
-3. **Styling**: Combine static atoms with theme atoms, use platform utilities for platform-specific styles
-
-4. **State**: Use TanStack Query for server state, React Context for UI preferences
-
-5. **Components**: Check if a component exists in `#/components/` before creating new ones
-
-6. **Types**: Define explicit types for props, use `NativeStackScreenProps` for screens
-
-7. **Testing**: Components should have `testID` props for E2E testing
-
-## Key Files Reference
-
-| Purpose | Location |
-|---------|----------|
-| Theme definitions | `src/alf/themes.ts` |
-| Design tokens | `src/alf/tokens.ts` |
-| Static atoms | `src/alf/atoms.ts` (extends `@bsky.app/alf`) |
-| Navigation config | `src/Navigation.tsx` |
-| Route definitions | `src/routes.ts` |
-| Route types | `src/lib/routes/types.ts` |
-| Query hooks | `src/state/queries/*.ts` |
-| Session state | `src/state/session/index.tsx` |
-| i18n setup | `src/locale/i18n.ts` |
@@ -1,4 +1,4 @@
-Copyright 2023–2026 Bluesky Social PBC
+Copyright 2023–2025 Bluesky Social PBC

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

@@ -39,6 +39,7 @@ appId: xyz.blueskyweb.app
    id: "editListNameInput"
 - eraseText
 - inputText: "Bad Ppl"
+- hideKeyboard
 - tapOn:
    id: "editListDescriptionInput"
 - eraseText
@@ -35,12 +35,9 @@ appId: xyz.blueskyweb.app
    id: "menuItemButton-Feeds"
 - tapOn:
    id: "editFeedsBtn"
- swipe:
-    label: "Drag feed down"
-    from:
-      id: "feed-drag-handle"
-    direction: "DOWN"
-    duration: 1000
+- tapOn:
+    label: "Tap on down arrow"
+    id: "feed-timeline-moveDown"
 - tapOn:
      label: "Save button"
      id: "saveChangesBtn"
@@ -58,12 +55,9 @@ appId: xyz.blueskyweb.app
    id: "menuItemButton-Feeds"
 - tapOn:
    id: "editFeedsBtn"
- swipe:
-    label: "Drag feed down"
-    from:
-      id: "feed-drag-handle"
-    direction: "DOWN"
-    duration: 1000
+- tapOn:
+    label: "Tap on down arrow"
+    id: "feed-feed-moveDown"
 - tapOn:
    label: "Save button"
    id: "saveChangesBtn"
@@ -15,11 +15,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "customServerTextInput"
 - inputText: "http://localhost:3000"
- runFlow:
-    when:
-      platform: Android
-    commands:
-      - hideKeyboard
 - tapOn: "Done"
 - tapOn:
    id: "loginUsernameInput"
@@ -26,7 +26,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "report:details"
 - inputText: "This is a test report"
- hideKeyboard
 - tapOn:
    id: "report:submit"
 - assertNotVisible:
@@ -3,29 +3,15 @@ appId: xyz.blueskyweb.app
 - launchApp:
    appId: "xyz.blueskyweb.app"
    clearState: true
-    arguments:
-      "-EXDevMenuIsOnboardingFinished": true
- runFlow:
-    when:
-      platform: iOS
-    commands:
-      - openLink: "exp+bluesky://expo-development-client/?url=http%3A%2F%2Flocalhost%3A8081"
-      - runFlow:
-          when:
-            visible: 'Open in "Bluesky"'
-          commands:
-            - tapOn: Open
- runFlow:
-    when:
-      platform: Android
-    commands:
-      - tapOn: 'http://localhost:8081'
-      - runFlow:
-          label: "Dismiss Expo dev menu"
-          when:
-            visible: "Continue"
-          commands:
-            - back
+- waitForAnimationToEnd
+- tapOn: "http://localhost:8081"
+- waitForAnimationToEnd
+- extendedWaitUntil:
+    visible: "Continue"
+- swipe:
+    from: "Bluesky"
+    direction: DOWN
+    duration: 100
 - tapOn:
    id: e2eProxyHeaderInput
 - inputText: ${output.result}
@@ -0,0 +1,6 @@
+export default {
+  requestPermission: jest.fn(),
+  onForegroundEvent: jest.fn(),
+  setBadgeCount: jest.fn(),
+  displayNotification: jest.fn(),
+}
@@ -0,0 +1,9 @@
+export const CameraRoll = {
+  getPhotos: jest.fn().mockResolvedValue({
+    edges: [
+      {node: {image: {uri: 'path/to/image1.jpg'}}},
+      {node: {image: {uri: 'path/to/image2.jpg'}}},
+      {node: {image: {uri: 'path/to/image3.jpg'}}},
+    ],
+  }),
+}
@@ -0,0 +1,4 @@
+export default {
+  configure: jest.fn().mockResolvedValue(0),
+  finish: jest.fn(),
+}
@@ -0,0 +1 @@
+export default {}
@@ -0,0 +1,10 @@
+jest.mock('rn-fetch-blob', () => {
+  return {
+    __esModule: true,
+    default: {
+      fs: {
+        unlink: jest.fn(),
+      },
+    },
+  }
+})
@@ -0,0 +1,2 @@
+export const DropdownMenu = jest.fn().mockImplementation(() => {})
+export const create = jest.fn().mockImplementation(() => {})
@@ -1,5 +1,4 @@
 import {RichText} from '@atproto/api'
-import {i18n} from '@lingui/core'

 import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player'
 import {
@@ -7,7 +6,6 @@ import {
  createStarterPackLinkFromAndroidReferrer,
  parseStarterPackUri,
 } from '#/lib/strings/starter-pack'
-import {messages} from '#/locale/locales/en/messages'
 import {tenorUrlToBskyGifUrl} from '#/state/queries/tenor'
 import {cleanError} from '../../src/lib/strings/errors'
 import {createFullHandle, makeValidHandle} from '../../src/lib/strings/handles'
@@ -204,9 +202,6 @@ describe('enforceLen', () => {
 })

 describe('cleanError', () => {
-  // cleanError uses lingui
-  i18n.loadAndActivate({locale: 'en', messages})
-
  const inputs = [
    'TypeError: Network request failed',
    'Error: Aborted',
@@ -332,7 +327,6 @@ describe('shortenLinks', () => {
      expect(outputRT.text).toEqual(outputs[i][0])
      expect(outputRT.facets?.length).toEqual(outputs[i][1].length)
      for (let j = 0; j < outputs[i][1].length; j++) {
-        // @ts-expect-error whatever
        expect(outputRT.facets![j].features[0].uri).toEqual(outputs[i][1][j])
      }
    }
@@ -443,13 +437,6 @@ describe('parseEmbedPlayerFromUrl', () => {

    'https://www.flickr.com/groups/898944@N23/',
    'https://www.flickr.com/groups',
-
-    'https://maxblansjaar.bandcamp.com/album/false-comforts',
-    'https://grmnygrmny.bandcamp.com/track/fluid',
-    'https://sufjanstevens.bandcamp.com/',
-    'https://sufjanstevens.bandcamp.com',
-    'https://bandcamp.com/',
-    'https://bandcamp.com',
  ]

  const outputs = [
@@ -828,23 +815,6 @@ describe('parseEmbedPlayerFromUrl', () => {

    undefined,
    undefined,
-
-    {
-      type: 'bandcamp_album',
-      source: 'bandcamp',
-      playerUri:
-        'https://bandcamp.com/EmbeddedPlayer/url=https%3A%2F%2Fmaxblansjaar.bandcamp.com%2Falbum%2Ffalse-comforts/size=large/bgcol=ffffff/linkcol=0687f5/minimal=true/transparent=true/',
-    },
-    {
-      type: 'bandcamp_track',
-      source: 'bandcamp',
-      playerUri:
-        'https://bandcamp.com/EmbeddedPlayer/url=https%3A%2F%2Fgrmnygrmny.bandcamp.com%2Ftrack%2Ffluid/size=large/bgcol=ffffff/linkcol=0687f5/minimal=true/transparent=true/',
-    },
-    undefined,
-    undefined,
-    undefined,
-    undefined,
  ]

  it('correctly grabs the correct id from uri', () => {
@@ -1,10 +1,5 @@
-// @ts-check
 const pkg = require('./package.json')

-/**
- * @param {import('@expo/config-types').ExpoConfig} _config
- * @returns {{ expo: import('@expo/config-types').ExpoConfig }}
- */
 module.exports = function (_config) {
  /**
   * App version number. Should be incremented as part of a release cycle.
@@ -20,7 +15,7 @@ module.exports = function (_config) {

  const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
  const IS_PRODUCTION = process.env.EXPO_PUBLIC_ENV === 'production'
-  const IS_DEV = !IS_TESTFLIGHT && !IS_PRODUCTION
+  const IS_DEV = !IS_TESTFLIGHT || !IS_PRODUCTION

  const ASSOCIATED_DOMAINS = [
    'applinks:bsky.app',
@@ -35,13 +30,6 @@ module.exports = function (_config) {

  const USE_SENTRY = Boolean(process.env.SENTRY_AUTH_TOKEN)

-  const IOS_ICON_FILE =
-    PLATFORM === 'web' // web build doesn't like .icon files
-      ? './assets/app-icons/ios_icon_default_next.png'
-      : IS_TESTFLIGHT
-        ? './assets/app-icons/ios_icon_testflight.icon'
-        : './assets/app-icons/ios_icon_default.icon'
-
  return {
    expo: {
      version: VERSION,
@@ -62,7 +50,10 @@ module.exports = function (_config) {
        config: {
          usesNonExemptEncryption: false,
        },
-        icon: IOS_ICON_FILE,
+        icon:
+          PLATFORM === 'web' // web build doesn't like .icon files
+            ? './assets/app-icons/ios_icon_default_next.png'
+            : './assets/app-icons/ios_icon_default.icon',
        infoPlist: {
          UIBackgroundModes: ['remote-notification'],
          NSCameraUsageDescription:
@@ -116,13 +107,13 @@ module.exports = function (_config) {
            'zh-Hans',
            'zh-Hant',
          ],
+          UIDesignRequiresCompatibility: true,
        },
        associatedDomains: ASSOCIATED_DOMAINS,
        entitlements: {
          'com.apple.developer.kernel.increased-memory-limit': true,
          'com.apple.developer.kernel.extended-virtual-addressing': true,
          'com.apple.security.application-groups': 'group.app.bsky',
-          // 'com.apple.developer.device-information.user-assigned-device-name': true,
        },
        privacyManifests: {
          NSPrivacyCollectedDataTypes: [
@@ -201,14 +192,10 @@ module.exports = function (_config) {
                scheme: 'https',
                host: 'bsky.app',
              },
-              ...(IS_DEV
-                ? [
-                    {
-                      scheme: 'http',
-                      host: 'localhost:19006',
-                    },
-                  ]
-                : []),
+              IS_DEV && {
+                scheme: 'http',
+                host: 'localhost:19006',
+              },
            ],
            category: ['BROWSABLE', 'DEFAULT'],
          },
@@ -240,32 +227,20 @@ module.exports = function (_config) {
          'react-native-edge-to-edge',
          {android: {enforceNavigationBarContrast: false}},
        ],
-        ...(USE_SENTRY
-          ? [
-              /** @type {[string, any]} */ ([
-                '@sentry/react-native/expo',
-                {
-                  organization: 'blueskyweb',
-                  project: 'app',
-                  url: 'https://sentry.io',
-                },
-              ]),
-            ]
-          : []),
+        USE_SENTRY && [
+          '@sentry/react-native/expo',
+          {
+            organization: 'blueskyweb',
+            project: 'app',
+            url: 'https://sentry.io',
+          },
+        ],
        [
          'expo-build-properties',
          {
            ios: {
              deploymentTarget: '15.1',
              buildReactNativeFromSource: true,
-              ccacheEnabled: IS_DEV,
-              extraPods: [
-                {
-                  name: 'MCEmojiPicker',
-                  git: 'https://github.com/bluesky-social/MCEmojiPicker.git',
-                  branch: 'main',
-                },
-              ],
            },
            android: {
              compileSdkVersion: 35,
@@ -322,25 +297,25 @@ module.exports = function (_config) {
          'expo-splash-screen',
          {
            ios: {
-              enableFullScreenImage_legacy: true, // iOS only
-              backgroundColor: '#006AFF', // primary_500
-              image: './assets/splash/splash.png',
+              enableFullScreenImage_legacy: true,
+              backgroundColor: '#ffffff',
+              image: './assets/splash.png',
              resizeMode: 'cover',
              dark: {
-                enableFullScreenImage_legacy: true, // iOS only
-                backgroundColor: '#002861', // primary_900
-                image: './assets/splash/splash-dark.png',
+                enableFullScreenImage_legacy: true,
+                backgroundColor: '#001429',
+                image: './assets/splash-dark.png',
                resizeMode: 'cover',
              },
            },
            android: {
-              backgroundColor: '#006AFF', // primary_500
-              image: './assets/splash/android-splash-logo-white.png',
-              imageWidth: 102, // even division of 306px
+              backgroundColor: '#0c7cff',
+              image: './assets/splash-android-icon.png',
+              imageWidth: 150,
              dark: {
-                backgroundColor: '#002861', // primary_900
-                image: './assets/splash/android-splash-logo-white.png',
-                imageWidth: 102,
+                backgroundColor: '#0c2a49',
+                image: './assets/splash-android-icon-dark.png',
+                imageWidth: 150,
              },
            },
          },
@@ -421,7 +396,7 @@ module.exports = function (_config) {
              'I agree to allow Bluesky to use my contacts for friend discovery until I opt out.',
          },
        ],
-      ],
+      ].filter(Boolean),
      extra: {
        eas: {
          build: {
@@ -1,113 +0,0 @@
-{
-  "fill" : {
-    "automatic-gradient" : "srgb:1.00000,1.00000,1.00000,1.00000"
-  },
-  "groups" : [
-    {
-      "blend-mode-specializations" : [
-        {
-          "value" : "overlay"
-        },
-        {
-          "appearance" : "dark",
-          "value" : "screen"
-        },
-        {
-          "appearance" : "tinted",
-          "value" : "screen"
-        }
-      ],
-      "blur-material-specializations" : [
-        {
-          "value" : 0.5
-        },
-        {
-          "appearance" : "dark",
-          "value" : 0.5
-        },
-        {
-          "appearance" : "tinted",
-          "value" : null
-        }
-      ],
-      "hidden" : false,
-      "layers" : [
-        {
-          "image-name" : "TestFlight notice.png",
-          "name" : "TestFlight notice"
-        }
-      ],
-      "lighting" : "individual",
-      "position" : {
-        "scale" : 0.4,
-        "translation-in-points" : [
-          0,
-          350
-        ]
-      },
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "specular-specializations" : [
-        {
-          "value" : false
-        },
-        {
-          "appearance" : "dark",
-          "value" : false
-        },
-        {
-          "appearance" : "tinted",
-          "value" : false
-        }
-      ],
-      "translucency-specializations" : [
-        {
-          "value" : {
-            "enabled" : true,
-            "value" : 0.5
-          }
-        },
-        {
-          "appearance" : "dark",
-          "value" : {
-            "enabled" : true,
-            "value" : 0.5
-          }
-        },
-        {
-          "appearance" : "tinted",
-          "value" : {
-            "enabled" : true,
-            "value" : 0.5
-          }
-        }
-      ]
-    },
-    {
-      "layers" : [
-        {
-          "fill" : "none",
-          "glass" : false,
-          "image-name" : "iOS transparent.png",
-          "name" : "iOS transparent"
-        }
-      ],
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M9 17a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm-6-7a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4ZM9 3a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 64 64"><path fill="#000" d="M32.457 7c1.68 0 3.29.668 4.478 1.855L49.813 21.73a6.33 6.33 0 0 1 1.854 4.479v24.458A6.333 6.333 0 0 1 45.333 57H18.666a6.334 6.334 0 0 1-6.333-6.333V13.333A6.334 6.334 0 0 1 18.666 7h13.791ZM18.666 9a4.334 4.334 0 0 0-4.333 4.333v37.334A4.334 4.334 0 0 0 18.666 55h26.667a4.333 4.333 0 0 0 4.333-4.333V26.209c0-.418-.061-.829-.177-1.223a1 1 0 0 1-.155.014H40a6.334 6.334 0 0 1-6.325-6.008l-.008-.326V9.333q0-.08.013-.156A4.3 4.3 0 0 0 32.457 9H18.666Zm18.627 22.293a1 1 0 1 1 1.414 1.414L33.414 38l5.293 5.293a1 1 0 1 1-1.414 1.414L32 39.414l-5.293 5.293a1 1 0 1 1-1.414-1.414L30.586 38l-5.293-5.293a1 1 0 1 1 1.414-1.414L32 36.586l5.293-5.293Zm-1.626-12.627.006.224A4.333 4.333 0 0 0 40 23h8.253L35.667 10.414v8.252Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12.233 2a4.433 4.433 0 1 0 0 8.867 4.433 4.433 0 0 0 0-8.867Zm0 10.133c-3.888 0-6.863 2.263-8.071 5.435-.346.906-.11 1.8.44 2.436.535.619 1.36.996 2.25.996h10.762c.89 0 1.716-.377 2.25-.996.55-.636.786-1.53.441-2.436-1.208-3.173-4.184-5.435-8.072-5.435Z"/></svg>
@@ -16,7 +16,7 @@ module.exports = function (api) {
      ],
    ],
    plugins: [
-      '@lingui/babel-plugin-lingui-macro',
+      'macros',
      ['babel-plugin-react-compiler', {target: '19'}],
      [
        'module:react-native-dotenv',
@@ -0,0 +1,22 @@
+module.exports = {
+  root: true,
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint', 'simple-import-sort'],
+  extends: [
+    'eslint:recommended',
+    'preact',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:@typescript-eslint/recommended-requiring-type-checking',
+  ],
+  rules: {
+    'simple-import-sort/imports': 'warn',
+    'simple-import-sort/exports': 'warn',
+    'no-else-return': 'off',
+  },
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 'latest',
+    project: ['./tsconfig.json'],
+    tsconfigRootDir: __dirname,
+  },
+}
@@ -1,52 +0,0 @@
-// @ts-check
-import js from '@eslint/js'
-import tseslint from 'typescript-eslint'
-import simpleImportSort from 'eslint-plugin-simple-import-sort'
-import globals from 'globals'
-
-export default tseslint.config(
-  // Global ignores
-  {
-    ignores: ['dist/**', 'node_modules/**'],
-  },
-
-  // Base JS recommended rules
-  js.configs.recommended,
-
-  // TypeScript rules with type checking
-  ...tseslint.configs.recommendedTypeChecked,
-
-  // Main configuration
-  {
-    files: ['**/*.{js,jsx,ts,tsx}'],
-    plugins: {
-      'simple-import-sort': simpleImportSort,
-    },
-    languageOptions: {
-      ecmaVersion: 'latest',
-      sourceType: 'module',
-      globals: {
-        ...globals.browser,
-      },
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: import.meta.dirname,
-      },
-    },
-    rules: {
-      'simple-import-sort/imports': 'warn',
-      'simple-import-sort/exports': 'warn',
-      'no-else-return': 'off',
-      '@typescript-eslint/no-require-imports': 'off',
-      '@typescript-eslint/no-unused-vars': [
-        'error',
-        {
-          argsIgnorePattern: '^_',
-          varsIgnorePattern: '^_.+',
-          caughtErrors: 'none',
-          ignoreRestSiblings: true,
-        },
-      ],
-    },
-  },
-)
@@ -7,7 +7,7 @@
    "dev-snippet": "tsc --project tsconfig.snippet.json && serve -s dist -p 3000 -n",
    "build": "tsc && vite build",
    "build-snippet": "tsc --project tsconfig.snippet.json",
-    "lint": "eslint --cache src",
+    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src",
    "typecheck": "tsc --noEmit"
  },
  "dependencies": {
@@ -17,21 +17,16 @@
  "devDependencies": {
    "@preact/preset-vite": "^2.10.2",
    "@vitejs/plugin-legacy": "^7.0.0",
-    "@eslint/js": "^9.18.0",
    "autoprefixer": "^10.4.19",
-    "eslint": "^9.18.0",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
-    "globals": "^15.14.0",
+    "eslint": "^8.19.0",
+    "eslint-config-preact": "^1.3.0",
+    "eslint-plugin-simple-import-sort": "^12.0.0",
    "postcss": "^8.4.38",
-    "typescript-eslint": "^8.20.0",
    "serve": "^14.2.5",
    "tailwindcss": "^3.4.3",
    "terser": "^5.43.1",
    "typescript": "^5.8.3",
    "vite": "^7.0.4",
    "vite-tsconfig-paths": "^5.1.4"
-  },
-  "resolutions": {
-    "@types/estree": "1.0.6"
  }
 }
@@ -1,21 +1,10 @@
 import React from 'react'

-function detectMime(buf: Buffer): string {
-  if (buf[0] === 0xff && buf[1] === 0xd8) return 'image/jpeg'
-  if (buf[0] === 0x89 && buf[1] === 0x50) return 'image/png'
-  if (buf[0] === 0x52 && buf[1] === 0x49) return 'image/webp'
-  if (buf[0] === 0x47 && buf[1] === 0x49) return 'image/gif'
-  return 'image/jpeg'
-}
-
 export function Img(
  props: Omit<React.ImgHTMLAttributes<HTMLImageElement>, 'src'> & {src: Buffer},
 ) {
  const {src, ...others} = props
  return (
-    <img
-      {...others}
-      src={`data:${detectMime(src)};base64,${src.toString('base64')}`}
-    />
+    <img {...others} src={`data:image/jpeg;base64,${src.toString('base64')}`} />
  )
 }
@@ -6,26 +6,21 @@ To build the SPA bundle (`bundle.web.js`), first get a JavaScript development
 environment set up. Either follow the top-level README, or something quick
 like:

-```bash
-# install nodejs
-nvm install
-nvm use
-npm install --global yarn
+    # install nodejs
+    nvm install
+    nvm use
+    npm install --global yarn

-# setup tools and deps (in top level of this repo)
-yarn install --frozen-lockfile
+    # setup tools and deps (in top level of this repo)
+    yarn install --frozen-lockfile

-# run yarn web dev server, if you wanted
-yarn web
-```
+    # run yarn web dev server, if you wanted
+    yarn web

 Then build and copy over the big 'ol `bundle.web.js` file:

-
-```bash
-# in the top level of this repo
-yarn build-web
-```
+    # in the top level of this repo
+    yarn build-web

 ### Golang Daemon

@@ -33,13 +28,11 @@ Install golang. We generally develop against the current stable release of the l

 In this directory (`bskyweb/`):

-```bash
-# re-build and run daemon
-go run ./cmd/bskyweb serve
+    # re-build and run daemon
+    go run ./cmd/bskyweb serve

-# build and output a binary
-go build -o bskyweb ./cmd/bskyweb/
-```
+    # build and output a binary
+    go build -o bskyweb ./cmd/bskyweb/

 The easiest way to configure the daemon is to copy `example.env` to `.env` and
 fill in auth values there.
@@ -2,14 +2,12 @@ package main

 import (
 	"net/url"
-	"strings"

 	"github.com/flosch/pongo2/v6"
 )

 func init() {
 	pongo2.RegisterFilter("canonicalize_url", filterCanonicalizeURL)
-	pongo2.RegisterFilter("avatar_thumbnail", filterAvatarThumbnail)
 }

 func filterCanonicalizeURL(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {
@@ -28,8 +26,3 @@ func filterCanonicalizeURL(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value
 	// Return the cleaned URL
 	return pongo2.AsValue(parsedURL.String()), nil
 }
-
-func filterAvatarThumbnail(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {
-	urlStr := in.String()
-	return pongo2.AsValue(strings.Replace(urlStr, "/img/avatar/plain/", "/img/avatar_thumbnail/plain/", 1)), nil
-}
@@ -574,10 +574,7 @@ func (srv *Server) WebPost(c echo.Context) error {

 	if postView.Embed != nil && !isEmbedHidden {
 		hasImages := postView.Embed.EmbedImages_View != nil
-		hasVideo := postView.Embed.EmbedVideo_View != nil
-		hasMedia := postView.Embed.EmbedRecordWithMedia_View != nil && postView.Embed.EmbedRecordWithMedia_View.Media != nil
-		hasMediaImages := hasMedia && postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View != nil
-		hasMediaVideo := hasMedia && postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View != nil
+		hasMedia := postView.Embed.EmbedRecordWithMedia_View != nil && postView.Embed.EmbedRecordWithMedia_View.Media != nil && postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View != nil

 		if hasImages {
 			var thumbUrls []string
@@ -585,20 +582,12 @@ func (srv *Server) WebPost(c echo.Context) error {
 				thumbUrls = append(thumbUrls, postView.Embed.EmbedImages_View.Images[i].Thumb)
 			}
 			data["imgThumbUrls"] = thumbUrls
-		} else if hasVideo {
-			if postView.Embed.EmbedVideo_View.Thumbnail != nil {
-				data["imgThumbUrls"] = []string{*postView.Embed.EmbedVideo_View.Thumbnail}
-			}
-		} else if hasMediaImages {
+		} else if hasMedia {
 			var thumbUrls []string
 			for i := range postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View.Images {
 				thumbUrls = append(thumbUrls, postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View.Images[i].Thumb)
 			}
 			data["imgThumbUrls"] = thumbUrls
-		} else if hasMediaVideo {
-			if postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.Thumbnail != nil {
-				data["imgThumbUrls"] = []string{*postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.Thumbnail}
-			}
 		}
 	}

@@ -178,13 +178,6 @@ func serve(cctx *cli.Context) error {
 		return http.FS(fsys)
 	}())

-	// Create CORS middleware for oembed
-	oembedCORS := middleware.CORSWithConfig(middleware.CORSConfig{
-			AllowOrigins: []string{"*"},
-			AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodOptions},
-			AllowHeaders: []string{"Origin", "Content-Type", "Accept"},
-	})
-
 	e.GET("/robots.txt", echo.WrapHandler(staticHandler))
 	e.GET("/ips-v4", echo.WrapHandler(staticHandler))
 	e.GET("/ips-v6", echo.WrapHandler(staticHandler))
@@ -212,7 +205,7 @@ func serve(cctx *cli.Context) error {
 	e.GET("/", server.WebHome)
 	e.GET("/iframe-resize.js", echo.WrapHandler(staticHandler))
 	e.GET("/embed.js", echo.WrapHandler(staticHandler))
-	e.GET("/oembed", server.WebOEmbed, oembedCORS)
+	e.GET("/oembed", server.WebOEmbed)
 	e.GET("/embed/:did/app.bsky.feed.post/:rkey", server.WebPostEmbed)

 	// Start the server.
@@ -37,6 +37,14 @@
      font-style: italic;
      font-display: swap;
    }
+    html {
+      background-color: white;
+    }
+    @media (prefers-color-scheme: dark) {
+      html {
+        background-color: black;
+      }
+    }
    html,
    body {
      margin: 0px;
@@ -51,19 +59,6 @@
      -ms-overflow-style: scrollbar;
      font-synthesis-weight: none;
    }
-    :root {
-      --text: black;
-      --background: white;
-      --backgroundLight: #e2e7ee;
-    }
-    @media (prefers-color-scheme: dark) {
-      :root {
-        color-scheme: dark;
-        --text: white;
-        --background: black;
-        --backgroundLight: #232e3e;
-      }
-    }
    html,
    body,
    #root {
@@ -72,32 +67,6 @@
      min-height: 100%;
      width: 100%;
    }
-    html.theme--light,
-    html.theme--light body,
-    html.theme--light #root {
-      background-color: white;
-      --text: black;
-      --background: white;
-      --backgroundLight: #DCE2EA;
-    }
-    html.theme--dark,
-    html.theme--dark body,
-    html.theme--dark #root {
-      color-scheme: dark;
-      background-color: black;
-      --text: white;
-      --background: black;
-      --backgroundLight: #232E3E;
-    }
-    html.theme--dim,
-    html.theme--dim body,
-    html.theme--dim #root {
-      color-scheme: dark;
-      background-color: #151D28;
-      --text: white;
-      --background: #151D28;
-      --backgroundLight: #2C3A4E;
-    }
    #splash {
      display: flex;
      position: fixed;
@@ -124,12 +93,6 @@
      overflow-y: scroll;
    }
  </style>
-  <script>
-    const theme = localStorage.getItem('ALF_THEME')
-    if (theme) {
-      document.documentElement.classList.add(`theme--${theme}`)
-    }
-  </script>

  {% include "scripts.html" %}
  <link rel="apple-touch-icon" sizes="180x180" href="{{ staticCDNHost }}/static/apple-touch-icon.png">
@@ -148,11 +111,11 @@
 </head>
 <body>
 {%- block body_all %}
-  <div id="splash">
-    <!-- Bluesky SVG -->
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 57"><path fill="#006AFF" d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805ZM50.127 3.805C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745Z"/></svg>
-  </div>
  <div id="root">
+    <div id="splash">
+      <!-- Bluesky SVG -->
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 57"><path fill="#006AFF" d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805ZM50.127 3.805C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745Z"/></svg>
+    </div>
  </div>

  <noscript>
@@ -35,8 +35,8 @@
  {% endfor %}
  <meta name="twitter:card" content="summary_large_image">
  {% else %}
-  <meta property="og:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">
-  <meta property="twitter:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">
+  <meta property="og:image" content="{{ postView.Author.Avatar }}">
+  <meta property="twitter:image" content="{{ postView.Author.Avatar }}">
  <meta name="twitter:card" content="summary">
  {% endif %}
  <meta name="twitter:label1" content="Posted At">
@@ -1,6 +0,0 @@
-{
-    "scripts": {
-        "setup": "yarn install",
-        "run": "yarn web --port $CONDUCTOR_PORT"
-    }
-}
@@ -164,8 +164,8 @@ See [testing.md](./testing.md).
 `./platform/polyfills.*.ts` adds polyfills to the environment. Currently, this includes:

 - TextEncoder / TextDecoder
+- react-native-url-polyfill
 - Array#findLast (on web)
- setImmediate (on web)

 ### Sentry sourcemaps

@@ -73,7 +73,7 @@ import { Text } from "react-native";
 ```jsx
 // After
 import { Text } from "react-native";
-import { Trans } from "@lingui/react/macro";
+import { Trans } from "@lingui/macro";

 <Text><Trans>Hello World</Trans></Text>
 ```
@@ -90,33 +90,18 @@ const text = "Hello World";
 ```
 In this case, you can use the `useLingui()` hook:
 ```jsx
-import { msg } from "@lingui/core/macro";
+import { msg } from "@lingui/macro";
 import { useLingui } from "@lingui/react";

 const { _ } = useLingui();
 return <Text accessibilityLabel={_(msg`Label is here`)}>{text}</Text>
 ```

-NEW: the latest Lingui version introduced a new macro version of the `useLingui` hook which lets you do this:
-
+If you want to do this outside of a React component, you can use the `t` macro instead (note: this won't react to changes if the locale is switched dynamically within the app):
 ```jsx
-import { useLingui } from "@lingui/react/macro";
+import { t } from "@lingui/macro";

-const { t } = useLingui();
-return <Text accessibilityLabel={t`Label is here`}>{text}</Text>
-```
-
-If you want to do this outside of a React component, you can use the global `t` macro instead (note: this won't react to changes if the locale is switched dynamically within the app):
-```jsx
-import { t } from "@lingui/core/macro";
-
-// not ideal - t only gets called once at module evaluation time
 const text = t`Hello World`;
-
-// however, this is suitable for strings that are ephemeral:
-function sayHello() {
-  Toast.show(t`Hello World`); // Each time the toast shows, the current locale at that moment is used
-}
 ```

 We can then run `yarn intl:extract` to update the catalog in `src/locale/locales/{locale}/messages.po`. This will add the new string to the catalog.
@@ -136,7 +121,7 @@ So the workflow is as follows:
 These pitfalls are memoization pitfalls that will cause the components to not re-render when the locale is changed -- causing stale translations to be shown.

 ```jsx
-import { msg } from "@lingui/core/macro";
+import { msg } from "@lingui/macro";
 import { i18n } from "@lingui/core";

 const welcomeMessage = msg`Welcome!`;
@@ -9,14 +9,6 @@ values.
 2. You can write Maestro tests in `/.maestro/flows/` directory by creating a new `.yml` file or by modifying an existing one.
 3. You can also use [Maestro Studio](https://maestro.mobile.dev/getting-started/maestro-studio) which automatically generates commands by recording your actions on the app. Therefore, you can create realistic tests without having to manually write any code. Use the `maestro studio` command to start recording your actions.

-### Running on Android
-
-You will need to allow your device access to the port that the mock server is running on.
-
-```
-adb reverse tcp:3000 tcp:3000
-```
-
 ### Running Maestro tests

 - In one tab, run `yarn e2e:mock-server`
@@ -1,271 +0,0 @@
-// @ts-check
-import js from '@eslint/js'
-import tseslint from 'typescript-eslint'
-import { defineConfig } from 'eslint/config';
-import react from 'eslint-plugin-react'
-import reactHooks from 'eslint-plugin-react-hooks'
-// @ts-expect-error no types
-import reactNative from 'eslint-plugin-react-native'
-// @ts-expect-error no types
-import reactNativeA11y from 'eslint-plugin-react-native-a11y'
-import simpleImportSort from 'eslint-plugin-simple-import-sort'
-import importX from 'eslint-plugin-import-x'
-import lingui from 'eslint-plugin-lingui'
-import reactCompiler from 'eslint-plugin-react-compiler'
-import bskyInternal from 'eslint-plugin-bsky-internal'
-import globals from 'globals'
-import tsParser from '@typescript-eslint/parser'
-
-export default defineConfig(
-  /**
-   * Global ignores
-   */
-  {
-    ignores: [
-      '**/__mocks__/*.ts',
-      'ios/**',
-      'android/**',
-      'coverage/**',
-      '*.lock',
-      '.husky/**',
-      'patches/**',
-      '*.html',
-      'bskyweb/**',
-      'bskyembed/**',
-      'src/locale/locales/_build/**',
-      'src/locale/locales/**/*.js',
-      '*.e2e.ts',
-      '*.e2e.tsx',
-      'eslint.config.mjs',
-    ],
-  },
-
-  /**
-   * Base configurations
-   */
-  js.configs.recommended,
-  tseslint.configs.recommendedTypeChecked,
-  reactHooks.configs.flat.recommended,
-  // @ts-expect-error https://github.com/un-ts/eslint-plugin-import-x/issues/439
-  importX.flatConfigs.recommended,
-  importX.flatConfigs.typescript,
-  importX.flatConfigs['react-native'],
-
-  /**
-   * Main configuration for all JS/TS/JSX/TSX files
-   */
-  {
-    files: ['**/*.{js,jsx,ts,tsx}'],
-    plugins: {
-      react,
-      'react-native': reactNative,
-      'react-native-a11y': reactNativeA11y,
-      'simple-import-sort': simpleImportSort,
-      lingui,
-      'react-compiler': reactCompiler,
-      'bsky-internal': bskyInternal,
-    },
-    languageOptions: {
-      ecmaVersion: 'latest',
-      sourceType: 'module',
-      globals: {
-        ...globals.browser,
-        ...globals.node,
-      },
-      parserOptions: {
-        parser: tsParser,
-        projectService: true,
-        tsconfigRootDir: import.meta.dirname,
-        ecmaFeatures: {
-          jsx: true,
-        },
-      },
-    },
-    settings: {
-      react: {
-        version: 'detect',
-      },
-      componentWrapperFunctions: ['observer'],
-    },
-    rules: {
-      /**
-       * Custom rules
-       */
-      'bsky-internal/avoid-unwrapped-text': [
-        'error',
-        {
-          impliedTextComponents: [
-            'H1',
-            'H2',
-            'H3',
-            'H4',
-            'H5',
-            'H6',
-            'P',
-            'Admonition',
-            'Admonition.Admonition',
-            'Toast.Action',
-            'AgeAssuranceAdmonition',
-            'Span',
-            'StackedButton',
-          ],
-          impliedTextProps: [],
-          suggestedTextWrappers: {
-            Button: 'ButtonText',
-            'ToggleButton.Button': 'ToggleButton.ButtonText',
-            'SegmentedControl.Item': 'SegmentedControl.ItemText',
-          },
-        },
-      ],
-      'bsky-internal/use-exact-imports': 'error',
-      'bsky-internal/use-prefixed-imports': 'error',
-      'bsky-internal/lingui-msg-rule': 'error',
-
-      /**
-       * React & React Native
-       */
-      ...react.configs.recommended.rules,
-      ...react.configs['jsx-runtime'].rules,
-      'react/no-unescaped-entities': 'off',
-      'react/prop-types': 'off',
-      'react-native/no-inline-styles': 'off',
-      ...reactNativeA11y.configs.all.rules,
-      'react-compiler/react-compiler': 'warn',
-      // TODO: Fix these and set to error
-      'react-hooks/set-state-in-effect': 'warn',
-      'react-hooks/purity': 'warn',
-      'react-hooks/refs': 'warn',
-      'react-hooks/immutability': 'warn',
-
-      /**
-       * Import sorting
-       */
-      'simple-import-sort/imports': [
-        'error',
-        {
-          groups: [
-            // Side effect imports.
-            ['^\\u0000'],
-            // Node.js builtins prefixed with `node:`.
-            ['^node:'],
-            // Packages.
-            // Things that start with a letter (or digit or underscore), or `@` followed by a letter.
-            // React/React Native prioritized, followed by expo
-            // Followed by all packages excluding unprefixed relative ones
-            [
-              '^(react\\/(.*)$)|^(react$)|^(react-native(.*)$)',
-              '^(expo(.*)$)|^(expo$)',
-              '^(?!(?:alf|components|lib|locale|logger|platform|screens|state|view)(?:$|\\/))@?\\w',
-            ],
-            // Relative imports.
-            // Ideally, anything that starts with a dot or #
-            // due to unprefixed relative imports being used, we whitelist the relative paths we use
-            // (?:$|\\/) matches end of string or /
-            [
-              '^(?:#\\/)?(?:lib|state|logger|platform|locale)(?:$|\\/)',
-              '^(?:#\\/)?view(?:$|\\/)',
-              '^(?:#\\/)?screens(?:$|\\/)',
-              '^(?:#\\/)?alf(?:$|\\/)',
-              '^(?:#\\/)?components(?:$|\\/)',
-              '^#\\/',
-              '^\\.',
-            ],
-            // anything else - hopefully we don't have any of these
-            ['^'],
-          ],
-        },
-      ],
-      'simple-import-sort/exports': 'error',
-
-      /**
-       * Import linting
-       */
-      'import-x/consistent-type-specifier-style': ['warn', 'prefer-inline'],
-      'import-x/no-unresolved': ['error', {
-        /*
-         * The `postinstall` hook runs `compile-if-needed` locally, but not in
-         * CI. For CI-sake, ignore this.
-         */
-        ignore: ['^#\/locale\/locales\/.+\/messages'],
-      }],
-
-      /**
-       * TypeScript-specific rules
-       */
-      'no-unused-vars': 'off', // off, we use TS-specific rule below
-      '@typescript-eslint/no-unused-vars': [
-        'error',
-        {
-          argsIgnorePattern: '^_',
-          varsIgnorePattern: '^_.+',
-          caughtErrors: 'none',
-          ignoreRestSiblings: true,
-        },
-      ],
-      '@typescript-eslint/consistent-type-imports': [
-        'warn',
-        {prefer: 'type-imports', fixStyle: 'inline-type-imports'},
-      ],
-      '@typescript-eslint/no-require-imports': 'off',
-      '@typescript-eslint/no-unused-expressions': ['error', {
-        allowTernary: true,
-      }],
-      /**
-       * Maintain previous behavior - these are stricter in typescript-eslint
-       * v8 `warn` ones are probably worth fixing. `off` ones are a bit too
-       * nit-picky
-       */
-      '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/ban-ts-comment': 'off',
-      '@typescript-eslint/no-empty-object-type': 'off',
-      '@typescript-eslint/no-unsafe-function-type': 'off',
-      '@typescript-eslint/no-unsafe-assignment': 'off',
-      '@typescript-eslint/unbound-method': 'off',
-      '@typescript-eslint/no-unsafe-argument': 'off',
-      '@typescript-eslint/no-unsafe-return': 'off',
-      '@typescript-eslint/no-unsafe-member-access': 'warn',
-      '@typescript-eslint/no-unsafe-call': 'warn',
-      '@typescript-eslint/no-floating-promises': 'warn',
-      '@typescript-eslint/no-misused-promises': 'warn',
-      '@typescript-eslint/require-await': 'warn',
-      '@typescript-eslint/no-unsafe-enum-comparison': 'warn',
-      '@typescript-eslint/no-unnecessary-type-assertion': 'warn',
-      '@typescript-eslint/no-redundant-type-constituents': 'warn',
-      '@typescript-eslint/no-duplicate-type-constituents': 'warn',
-      '@typescript-eslint/no-base-to-string': 'warn',
-      '@typescript-eslint/prefer-promise-reject-errors': 'warn',
-      '@typescript-eslint/await-thenable': 'warn',
-
-      /**
-       * Turn off rules that we haven't enforced thus far
-       */
-      'no-empty-pattern': 'off',
-      'no-async-promise-executor': 'off',
-      'no-constant-binary-expression': 'warn',
-      'prefer-const': 'off',
-      'no-empty': 'off',
-      'no-unsafe-optional-chaining': 'off',
-      'no-prototype-builtins': 'off',
-      'no-var': 'off',
-      'prefer-rest-params': 'off',
-      'no-case-declarations': 'off',
-      'no-irregular-whitespace': 'off',
-      'no-useless-escape': 'off',
-      'no-sparse-arrays': 'off',
-      'no-fallthrough': 'off',
-      'no-control-regex': 'off',
-    },
-  },
-
-  /**
-   * Test files configuration
-   */
-  {
-    files: ['**/__tests__/**/*.{js,jsx,ts,tsx}', '**/*.test.{js,jsx,ts,tsx}'],
-    languageOptions: {
-      globals: {
-        ...globals.jest,
-      }
-    },
-  },
-)
@@ -1,17 +1,14 @@
 const {RuleTester} = require('eslint')
-const tseslint = require('typescript-eslint')
 const avoidUnwrappedText = require('../avoid-unwrapped-text')

 const ruleTester = new RuleTester({
-  languageOptions: {
-    parser: tseslint.parser,
-    parserOptions: {
-      ecmaFeatures: {
-        jsx: true,
-      },
-      ecmaVersion: 'latest',
-      sourceType: 'module',
+  parser: require.resolve('@typescript-eslint/parser'),
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
    },
+    ecmaVersion: 6,
+    sourceType: 'module',
  },
 })

@@ -776,6 +773,15 @@ function MyText({ foo }) {
        errors: 1,
      },

+      {
+        code: `
+<View>
+  <Trans>{'foo'}</Trans>
+</View>
+       `,
+        errors: 1,
+      },
+
      {
        code: `
 <View prop={
@@ -1,188 +0,0 @@
-const {RuleTester} = require('eslint')
-const tseslint = require('typescript-eslint')
-const linguiMsgRule = require('../lingui-msg-rule')
-
-const ruleTester = new RuleTester({
-  languageOptions: {
-    parser: tseslint.parser,
-    parserOptions: {
-      ecmaFeatures: {
-        jsx: true,
-      },
-      ecmaVersion: 'latest',
-      sourceType: 'module',
-    },
-  },
-})
-
-describe('lingui-msg-rule', () => {
-  const tests = {
-    valid: [
-      // msg template literal
-      {
-        code: `
-const {_} = useLingui()
-const x = _(msg\`Hello\`)
-        `,
-      },
-      // msg template literal with interpolation
-      {
-        code: `
-const {_} = useLingui()
-const name = 'World'
-const x = _(msg\`Hello \${name}\`)
-        `,
-      },
-      // plural macro
-      {
-        code: `
-const {_} = useLingui()
-const count = 5
-const x = _(plural(count, {one: '# item', other: '# items'}))
-        `,
-      },
-      // select macro
-      {
-        code: `
-const {_} = useLingui()
-const gender = 'female'
-const x = _(select(gender, {male: 'He', female: 'She', other: 'They'}))
-        `,
-      },
-      // selectOrdinal macro
-      {
-        code: `
-const {_} = useLingui()
-const position = 1
-const x = _(selectOrdinal(position, {one: '#st', two: '#nd', few: '#rd', other: '#th'}))
-        `,
-      },
-      // msg function call with object (descriptor form)
-      {
-        code: `
-const {_} = useLingui()
-const x = _(msg({message: 'Hello'}))
-        `,
-      },
-      // msg function call with object and context
-      {
-        code: `
-const {_} = useLingui()
-const x = _(msg({message: 'Hello', context: 'greeting'}))
-        `,
-      },
-    ],
-    invalid: [
-      // Plain string literal (single quotes) - with auto-fix
-      {
-        code: `
-const {_} = useLingui()
-const x = _('Bad')
-        `,
-        output: `
-const {_} = useLingui()
-const x = _(msg\`Bad\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Plain string literal (double quotes) - with auto-fix
-      {
-        code: `
-const {_} = useLingui()
-const x = _("Bad")
-        `,
-        output: `
-const {_} = useLingui()
-const x = _(msg\`Bad\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Template literal without msg tag - with auto-fix
-      {
-        code: `
-const {_} = useLingui()
-const x = _(\`Bad\`)
-        `,
-        output: `
-const {_} = useLingui()
-const x = _(msg\`Bad\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Template literal with interpolation - with auto-fix
-      {
-        code: `
-const {_} = useLingui()
-const name = 'World'
-const x = _(\`Hello \${name}\`)
-        `,
-        output: `
-const {_} = useLingui()
-const name = 'World'
-const x = _(msg\`Hello \${name}\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // String with backticks that need escaping
-      {
-        code: `
-const {_} = useLingui()
-const x = _('Use \\\`code\\\` here')
-        `,
-        output: `
-const {_} = useLingui()
-const x = _(msg\`Use \\\`code\\\` here\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Variable/identifier - no auto-fix possible
-      {
-        code: `
-const {_} = useLingui()
-const message = 'Hello'
-const x = _(message)
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Arbitrary function call - no auto-fix possible
-      {
-        code: `
-const {_} = useLingui()
-const x = _(getMessage())
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Empty call - no auto-fix possible
-      {
-        code: `
-const {_} = useLingui()
-const x = _()
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Tagged template with wrong tag - no auto-fix (would need to replace tag)
-      {
-        code: `
-const {_} = useLingui()
-const x = _(html\`Hello\`)
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Number literal - no auto-fix possible
-      {
-        code: `
-const {_} = useLingui()
-const x = _(123)
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-    ],
-  }
-
-  ruleTester.run('lingui-msg-rule', linguiMsgRule, tests)
-})
@@ -29,331 +29,303 @@ function getTagName(node) {
  return reversedIdentifiers.reverse().join('.')
 }

-module.exports = {
-  meta: {
-    type: 'problem',
-    docs: {
-      description: 'Enforce text strings are wrapped in <Text> components',
-    },
-    schema: [
-      {
-        type: 'object',
-        properties: {
-          impliedTextComponents: {
-            type: 'array',
-            items: {type: 'string'},
-          },
-          impliedTextProps: {
-            type: 'array',
-            items: {type: 'string'},
-          },
-          suggestedTextWrappers: {
-            type: 'object',
-            additionalProperties: {type: 'string'},
-          },
-        },
-        additionalProperties: false,
-      },
-    ],
-  },
-  create(context) {
-    const options = context.options[0] || {}
-    const impliedTextProps = options.impliedTextProps ?? []
-    const impliedTextComponents = options.impliedTextComponents ?? []
-    const suggestedTextWrappers = options.suggestedTextWrappers ?? {}
-    const textProps = [...impliedTextProps]
-    const textComponents = ['Text', ...impliedTextComponents]
+exports.create = function create(context) {
+  const options = context.options[0] || {}
+  const impliedTextProps = options.impliedTextProps ?? []
+  const impliedTextComponents = options.impliedTextComponents ?? []
+  const suggestedTextWrappers = options.suggestedTextWrappers ?? {}
+  const textProps = [...impliedTextProps]
+  const textComponents = ['Text', ...impliedTextComponents]

-    function isTextComponent(tagName) {
-      return textComponents.includes(tagName) || tagName.endsWith('Text')
-    }
+  function isTextComponent(tagName) {
+    return textComponents.includes(tagName) || tagName.endsWith('Text')
+  }

-    return {
-      JSXText(node) {
-        if (typeof node.value !== 'string' || hasOnlyLineBreak(node.value)) {
-          return
-        }
-        let parent = node.parent
-        while (parent) {
-          if (parent.type === 'JSXElement') {
-            const tagName = getTagName(parent)
-            if (isTextComponent(tagName)) {
-              // We're good.
-              return
-            }
-            if (tagName === 'Trans') {
-              // Exit and rely on the traversal for <Trans> JSXElement (code below).
-              // TODO: Maybe validate that it's present.
-              return
-            }
-            const suggestedWrapper = suggestedTextWrappers[tagName]
-            let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
-            if (tagName !== 'View' && !suggestedWrapper) {
-              message +=
-                ' If <' +
-                tagName +
-                '> is guaranteed to render <Text>, ' +
-                'rename it to <' +
-                tagName +
-                'Text> or add it to impliedTextComponents.'
-            }
-            context.report({
-              node,
-              message,
-            })
+  return {
+    JSXText(node) {
+      if (typeof node.value !== 'string' || hasOnlyLineBreak(node.value)) {
+        return
+      }
+      let parent = node.parent
+      while (parent) {
+        if (parent.type === 'JSXElement') {
+          const tagName = getTagName(parent)
+          if (isTextComponent(tagName)) {
+            // We're good.
            return
          }
-
-          if (
-            parent.type === 'JSXAttribute' &&
-            parent.name.type === 'JSXIdentifier' &&
-            parent.parent.type === 'JSXOpeningElement' &&
-            parent.parent.parent.type === 'JSXElement'
-          ) {
-            const tagName = getTagName(parent.parent.parent)
-            const propName = parent.name.name
-            if (
-              textProps.includes(tagName + ' ' + propName) ||
-              propName === 'text' ||
-              propName.endsWith('Text')
-            ) {
-              // We're good.
-              return
-            }
-            const message =
-              'Wrap this string in <Text>.' +
-              ' If `' +
-              propName +
-              '` is guaranteed to be wrapped in <Text>, ' +
-              'rename it to `' +
-              propName +
-              'Text' +
-              '` or add it to impliedTextProps.'
-            context.report({
-              node,
-              message,
-            })
+          if (tagName === 'Trans') {
+            // Exit and rely on the traversal for <Trans> JSXElement (code below).
+            // TODO: Maybe validate that it's present.
            return
          }
-
-          parent = parent.parent
-          continue
-        }
-      },
-      Literal(node) {
-        if (typeof node.value !== 'string' && typeof node.value !== 'number') {
-          return
-        }
-        let parent = node.parent
-        while (parent) {
-          if (parent.type === 'JSXElement') {
-            const tagName = getTagName(parent)
-            if (isTextComponent(tagName)) {
-              // We're good.
-              return
-            }
-            if (tagName === 'Trans') {
-              // Exit and rely on the traversal for <Trans> JSXElement (code below).
-              // TODO: Maybe validate that it's present.
-              return
-            }
-            const suggestedWrapper = suggestedTextWrappers[tagName]
-            let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
-            if (tagName !== 'View' && !suggestedWrapper) {
-              message +=
-                ' If <' +
-                tagName +
-                '> is guaranteed to render <Text>, ' +
-                'rename it to <' +
-                tagName +
-                'Text> or add it to impliedTextComponents.'
-            }
-            context.report({
-              node,
-              message,
-            })
-            return
+          const suggestedWrapper = suggestedTextWrappers[tagName]
+          let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
+          if (tagName !== 'View' && !suggestedWrapper) {
+            message +=
+              ' If <' +
+              tagName +
+              '> is guaranteed to render <Text>, ' +
+              'rename it to <' +
+              tagName +
+              'Text> or add it to impliedTextComponents.'
          }
-
-          if (parent.type === 'BinaryExpression' && parent.operator === '+') {
-            parent = parent.parent
-            continue
-          }
-
-          if (
-            parent.type === 'JSXExpressionContainer' ||
-            parent.type === 'LogicalExpression'
-          ) {
-            parent = parent.parent
-            continue
-          }
-
-          // Be conservative for other types.
-          return
-        }
-      },
-      TemplateLiteral(node) {
-        let parent = node.parent
-        while (parent) {
-          if (parent.type === 'JSXElement') {
-            const tagName = getTagName(parent)
-            if (isTextComponent(tagName)) {
-              // We're good.
-              return
-            }
-            if (tagName === 'Trans') {
-              // Exit and rely on the traversal for <Trans> JSXElement (code below).
-              // TODO: Maybe validate that it's present.
-              return
-            }
-            const suggestedWrapper = suggestedTextWrappers[tagName]
-            let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
-            if (tagName !== 'View' && !suggestedWrapper) {
-              message +=
-                ' If <' +
-                tagName +
-                '> is guaranteed to render <Text>, ' +
-                'rename it to <' +
-                tagName +
-                'Text> or add it to impliedTextComponents.'
-            }
-            context.report({
-              node,
-              message,
-            })
-            return
-          }
-
-          if (
-            parent.type === 'CallExpression' &&
-            parent.callee.type === 'Identifier' &&
-            parent.callee.name === '_'
-          ) {
-            // This is a user-facing string, keep going up.
-            parent = parent.parent
-            continue
-          }
-
-          if (parent.type === 'BinaryExpression' && parent.operator === '+') {
-            parent = parent.parent
-            continue
-          }
-
-          if (
-            parent.type === 'JSXExpressionContainer' ||
-            parent.type === 'LogicalExpression' ||
-            parent.type === 'TaggedTemplateExpression'
-          ) {
-            parent = parent.parent
-            continue
-          }
-
-          // Be conservative for other types.
-          return
-        }
-      },
-      JSXElement(node) {
-        if (getTagName(node) !== 'Trans') {
-          return
-        }
-        let parent = node.parent
-        while (parent) {
-          if (parent.type === 'JSXElement') {
-            const tagName = getTagName(parent)
-            if (isTextComponent(tagName)) {
-              // We're good.
-              return
-            }
-            if (tagName === 'Trans') {
-              // Exit and rely on the traversal for this JSXElement.
-              // TODO: Should nested <Trans> even be allowed?
-              return
-            }
-            const suggestedWrapper = suggestedTextWrappers[tagName]
-            let message = `Wrap this <Trans> in <${suggestedWrapper ?? 'Text'}>.`
-            if (tagName !== 'View' && !suggestedWrapper) {
-              message +=
-                ' If <' +
-                tagName +
-                '> is guaranteed to render <Text>, ' +
-                'rename it to <' +
-                tagName +
-                'Text> or add it to impliedTextComponents.'
-            }
-            context.report({
-              node,
-              message,
-            })
-            return
-          }
-
-          if (
-            parent.type === 'JSXAttribute' &&
-            parent.name.type === 'JSXIdentifier' &&
-            parent.parent.type === 'JSXOpeningElement' &&
-            parent.parent.parent.type === 'JSXElement'
-          ) {
-            const tagName = getTagName(parent.parent.parent)
-            const propName = parent.name.name
-            if (
-              textProps.includes(tagName + ' ' + propName) ||
-              propName === 'text' ||
-              propName.endsWith('Text')
-            ) {
-              // We're good.
-              return
-            }
-            const message =
-              'Wrap this <Trans> in <Text>.' +
-              ' If `' +
-              propName +
-              '` is guaranteed to be wrapped in <Text>, ' +
-              'rename it to `' +
-              propName +
-              'Text' +
-              '` or add it to impliedTextProps.'
-            context.report({
-              node,
-              message,
-            })
-            return
-          }
-
-          parent = parent.parent
-          continue
-        }
-      },
-      ReturnStatement(node) {
-        let fnScope = context.sourceCode.getScope(node)
-        while (fnScope && fnScope.type !== 'function') {
-          fnScope = fnScope.upper
-        }
-        if (!fnScope) {
-          return
-        }
-        const fn = fnScope.block
-        if (!fn.id || fn.id.type !== 'Identifier' || !fn.id.name) {
-          return
-        }
-        if (!/^[A-Z]\w*Text$/.test(fn.id.name)) {
-          return
-        }
-        if (!node.argument || node.argument.type !== 'JSXElement') {
-          return
-        }
-        const openingEl = node.argument.openingElement
-        if (openingEl.name.type !== 'JSXIdentifier') {
-          return
-        }
-        const returnedComponentName = openingEl.name.name
-        if (!isTextComponent(returnedComponentName)) {
          context.report({
            node,
-            message:
-              'Components ending with *Text must return <Text> or <SomeText>.',
+            message,
          })
+          return
        }
-      },
-    }
-  },
+
+        if (
+          parent.type === 'JSXAttribute' &&
+          parent.name.type === 'JSXIdentifier' &&
+          parent.parent.type === 'JSXOpeningElement' &&
+          parent.parent.parent.type === 'JSXElement'
+        ) {
+          const tagName = getTagName(parent.parent.parent)
+          const propName = parent.name.name
+          if (
+            textProps.includes(tagName + ' ' + propName) ||
+            propName === 'text' ||
+            propName.endsWith('Text')
+          ) {
+            // We're good.
+            return
+          }
+          const message =
+            'Wrap this string in <Text>.' +
+            ' If `' +
+            propName +
+            '` is guaranteed to be wrapped in <Text>, ' +
+            'rename it to `' +
+            propName +
+            'Text' +
+            '` or add it to impliedTextProps.'
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        parent = parent.parent
+        continue
+      }
+    },
+    Literal(node) {
+      if (typeof node.value !== 'string' && typeof node.value !== 'number') {
+        return
+      }
+      let parent = node.parent
+      while (parent) {
+        if (parent.type === 'JSXElement') {
+          const tagName = getTagName(parent)
+          if (isTextComponent(tagName)) {
+            // We're good.
+            return
+          }
+          if (tagName === 'Trans') {
+            // Exit and rely on the traversal for <Trans> JSXElement (code below).
+            // TODO: Maybe validate that it's present.
+            return
+          }
+          const suggestedWrapper = suggestedTextWrappers[tagName]
+          let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
+          if (tagName !== 'View' && !suggestedWrapper) {
+            message +=
+              ' If <' +
+              tagName +
+              '> is guaranteed to render <Text>, ' +
+              'rename it to <' +
+              tagName +
+              'Text> or add it to impliedTextComponents.'
+          }
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        if (parent.type === 'BinaryExpression' && parent.operator === '+') {
+          parent = parent.parent
+          continue
+        }
+
+        if (
+          parent.type === 'JSXExpressionContainer' ||
+          parent.type === 'LogicalExpression'
+        ) {
+          parent = parent.parent
+          continue
+        }
+
+        // Be conservative for other types.
+        return
+      }
+    },
+    TemplateLiteral(node) {
+      let parent = node.parent
+      while (parent) {
+        if (parent.type === 'JSXElement') {
+          const tagName = getTagName(parent)
+          if (isTextComponent(tagName)) {
+            // We're good.
+            return
+          }
+          if (tagName === 'Trans') {
+            // Exit and rely on the traversal for <Trans> JSXElement (code below).
+            // TODO: Maybe validate that it's present.
+            return
+          }
+          const suggestedWrapper = suggestedTextWrappers[tagName]
+          let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
+          if (tagName !== 'View' && !suggestedWrapper) {
+            message +=
+              ' If <' +
+              tagName +
+              '> is guaranteed to render <Text>, ' +
+              'rename it to <' +
+              tagName +
+              'Text> or add it to impliedTextComponents.'
+          }
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        if (
+          parent.type === 'CallExpression' &&
+          parent.callee.type === 'Identifier' &&
+          parent.callee.name === '_'
+        ) {
+          // This is a user-facing string, keep going up.
+          parent = parent.parent
+          continue
+        }
+
+        if (parent.type === 'BinaryExpression' && parent.operator === '+') {
+          parent = parent.parent
+          continue
+        }
+
+        if (
+          parent.type === 'JSXExpressionContainer' ||
+          parent.type === 'LogicalExpression' ||
+          parent.type === 'TaggedTemplateExpression'
+        ) {
+          parent = parent.parent
+          continue
+        }
+
+        // Be conservative for other types.
+        return
+      }
+    },
+    JSXElement(node) {
+      if (getTagName(node) !== 'Trans') {
+        return
+      }
+      let parent = node.parent
+      while (parent) {
+        if (parent.type === 'JSXElement') {
+          const tagName = getTagName(parent)
+          if (isTextComponent(tagName)) {
+            // We're good.
+            return
+          }
+          if (tagName === 'Trans') {
+            // Exit and rely on the traversal for this JSXElement.
+            // TODO: Should nested <Trans> even be allowed?
+            return
+          }
+          const suggestedWrapper = suggestedTextWrappers[tagName]
+          let message = `Wrap this <Trans> in <${suggestedWrapper ?? 'Text'}>.`
+          if (tagName !== 'View' && !suggestedWrapper) {
+            message +=
+              ' If <' +
+              tagName +
+              '> is guaranteed to render <Text>, ' +
+              'rename it to <' +
+              tagName +
+              'Text> or add it to impliedTextComponents.'
+          }
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        if (
+          parent.type === 'JSXAttribute' &&
+          parent.name.type === 'JSXIdentifier' &&
+          parent.parent.type === 'JSXOpeningElement' &&
+          parent.parent.parent.type === 'JSXElement'
+        ) {
+          const tagName = getTagName(parent.parent.parent)
+          const propName = parent.name.name
+          if (
+            textProps.includes(tagName + ' ' + propName) ||
+            propName === 'text' ||
+            propName.endsWith('Text')
+          ) {
+            // We're good.
+            return
+          }
+          const message =
+            'Wrap this <Trans> in <Text>.' +
+            ' If `' +
+            propName +
+            '` is guaranteed to be wrapped in <Text>, ' +
+            'rename it to `' +
+            propName +
+            'Text' +
+            '` or add it to impliedTextProps.'
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        parent = parent.parent
+        continue
+      }
+    },
+    ReturnStatement(node) {
+      let fnScope = context.getScope()
+      while (fnScope && fnScope.type !== 'function') {
+        fnScope = fnScope.upper
+      }
+      if (!fnScope) {
+        return
+      }
+      const fn = fnScope.block
+      if (!fn.id || fn.id.type !== 'Identifier' || !fn.id.name) {
+        return
+      }
+      if (!/^[A-Z]\w*Text$/.test(fn.id.name)) {
+        return
+      }
+      if (!node.argument || node.argument.type !== 'JSXElement') {
+        return
+      }
+      const openingEl = node.argument.openingElement
+      if (openingEl.name.type !== 'JSXIdentifier') {
+        return
+      }
+      const returnedComponentName = openingEl.name.name
+      if (!isTextComponent(returnedComponentName)) {
+        context.report({
+          node,
+          message:
+            'Components ending with *Text must return <Text> or <SomeText>.',
+        })
+      }
+    },
+  }
 }
@@ -1,16 +1,10 @@
 'use strict'

-const plugin = {
-  meta: {
-    name: 'eslint-plugin-bsky-internal',
-    version: '1.0.0',
-  },
+module.exports = {
  rules: {
    'avoid-unwrapped-text': require('./avoid-unwrapped-text'),
    'use-exact-imports': require('./use-exact-imports'),
+    'use-typed-gates': require('./use-typed-gates'),
    'use-prefixed-imports': require('./use-prefixed-imports'),
-    'lingui-msg-rule': require('./lingui-msg-rule'),
  },
 }
-
-module.exports = plugin
@@ -1,110 +0,0 @@
-'use strict'
-
-/**
- * @type {import('eslint').Rule.RuleModule}
- */
-module.exports = {
-  meta: {
-    type: 'problem',
-    docs: {
-      description:
-        'Enforce that Lingui _() function is called with msg`` template literal or plural/select macros',
-      recommended: true,
-    },
-    fixable: 'code',
-    messages: {
-      missingMsg:
-        'Lingui _() must be called with msg`...` or msg({...}) or plural/select/selectOrdinal. Example: _(msg`Hello`)',
-    },
-    schema: [],
-  },
-
-  create(context) {
-    // Valid Lingui macro functions that can be passed to _()
-    const VALID_MACRO_FUNCTIONS = new Set([
-      'msg',
-      'plural',
-      'select',
-      'selectOrdinal',
-    ])
-
-    /**
-     * Escape backticks and backslashes for template literal
-     */
-    function escapeForTemplateLiteral(str) {
-      return str.replace(/\\`/g, '`').replace(/`/g, '\\`')
-    }
-
-    /**
-     * Try to get a fixer for the given argument
-     * Returns null if we can't safely fix it
-     */
-    function getFixer(firstArg) {
-      const sourceCode = context.sourceCode ?? context.getSourceCode()
-
-      // Fix string literals: _('foo') -> _(msg`foo`)
-      if (firstArg.type === 'Literal' && typeof firstArg.value === 'string') {
-        const escaped = escapeForTemplateLiteral(firstArg.value)
-        return function (fixer) {
-          return fixer.replaceText(firstArg, 'msg`' + escaped + '`')
-        }
-      }
-
-      // Fix untagged template literals: _(`foo`) -> _(msg`foo`)
-      if (firstArg.type === 'TemplateLiteral') {
-        const text = sourceCode.getText(firstArg)
-        return function (fixer) {
-          return fixer.replaceText(firstArg, 'msg' + text)
-        }
-      }
-
-      return null
-    }
-
-    return {
-      CallExpression(node) {
-        // Check if this is a call to _()
-        if (node.callee.type !== 'Identifier' || node.callee.name !== '_') {
-          return
-        }
-
-        // Must have at least one argument
-        if (node.arguments.length === 0) {
-          context.report({
-            node,
-            messageId: 'missingMsg',
-          })
-          return
-        }
-
-        const firstArg = node.arguments[0]
-
-        // Valid: _(msg`...`)
-        if (
-          firstArg.type === 'TaggedTemplateExpression' &&
-          firstArg.tag.type === 'Identifier' &&
-          firstArg.tag.name === 'msg'
-        ) {
-          return
-        }
-
-        // Valid: _(msg(...)), _(plural(...)), _(select(...)), _(selectOrdinal(...))
-        if (
-          firstArg.type === 'CallExpression' &&
-          firstArg.callee.type === 'Identifier' &&
-          VALID_MACRO_FUNCTIONS.has(firstArg.callee.name)
-        ) {
-          return
-        }
-
-        // Everything else is invalid
-        const fix = getFixer(firstArg)
-        context.report({
-          node,
-          messageId: 'missingMsg',
-          fix,
-        })
-      },
-    }
-  },
-}
@@ -3,29 +3,20 @@ const BANNED_IMPORTS = [
  '@fortawesome/free-solid-svg-icons',
 ]

-module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Prevent importing entire icon packages',
+exports.create = function create(context) {
+  return {
+    ImportDeclaration(node) {
+      const source = node.source
+      if (typeof source.value !== 'string') {
+        return
+      }
+      if (BANNED_IMPORTS.includes(source.value)) {
+        context.report({
+          node,
+          message:
+            'Import the specific thing you want instead of the entire package',
+        })
+      }
    },
-    schema: [],
-  },
-  create(context) {
-    return {
-      ImportDeclaration(node) {
-        const source = node.source
-        if (typeof source.value !== 'string') {
-          return
-        }
-        if (BANNED_IMPORTS.includes(source.value)) {
-          context.report({
-            node,
-            message:
-              'Import the specific thing you want instead of the entire package',
-          })
-        }
-      },
-    }
-  },
+  }
 }
@@ -13,11 +13,7 @@ const BANNED_IMPORT_PREFIXES = [
 module.exports = {
  meta: {
    type: 'suggestion',
-    docs: {
-      description: 'Enforce using prefixed imports for internal paths',
-    },
    fixable: 'code',
-    schema: [],
  },
  create(context) {
    return {
@@ -0,0 +1,31 @@
+'use strict'
+
+exports.create = function create(context) {
+  return {
+    ImportSpecifier(node) {
+      if (
+        !node.local ||
+        node.local.type !== 'Identifier' ||
+        node.local.name !== 'useGate'
+      ) {
+        return
+      }
+      if (
+        node.parent.type !== 'ImportDeclaration' ||
+        !node.parent.source ||
+        node.parent.source.type !== 'Literal'
+      ) {
+        return
+      }
+      const source = node.parent.source.value
+      if (source.startsWith('statsig') || source.startsWith('@statsig')) {
+        context.report({
+          node,
+          message:
+            "Use useGate() from '#/lib/statsig/statsig' instead of the one on npm.",
+        })
+      }
+      // TODO: Verify gate() call results aren't stored in variables.
+    },
+  }
+}
@@ -1,5 +1,7 @@
 /* global jest */
 import 'react-native-gesture-handler/jestSetup'
+// IMPORTANT: this is what's used in the native runtime
+import 'react-native-url-polyfill/auto'

 import {configure} from '@testing-library/react-native'

@@ -34,7 +36,6 @@ jest.mock('react-native-safe-area-context', () => {
 jest.mock('expo-file-system/legacy', () => ({
  getInfoAsync: jest.fn().mockResolvedValue({exists: true, size: 100}),
  deleteAsync: jest.fn(),
-  moveAsync: jest.fn().mockResolvedValue(undefined),
  createDownloadResumable: jest.fn(),
 }))

@@ -44,7 +45,6 @@ jest.mock('expo-image-manipulator', () => ({
  }),
  SaveFormat: {
    JPEG: 'jpeg',
-    WEBP: 'webp',
  },
 }))

@@ -99,9 +99,20 @@ jest.mock('expo-modules-core', () => ({
  requireNativeViewManager: jest.fn().mockImplementation(_ => {
    return () => null
  }),
-  createPermissionHook: () => () => [true],
 }))

 jest.mock('expo-localization', () => ({
  getLocales: () => [],
 }))
+
+jest.mock('statsig-react-native-expo', () => ({
+  Statsig: {
+    initialize() {},
+    initializeCalled() {
+      return false
+    },
+  },
+}))
+
+jest.mock('../src/logger/bitdrift/lib', () => ({}))
+jest.mock('../src/lib/statsig/statsig', () => ({}))
@@ -1,7 +1,5 @@
-import {defineConfig} from '@lingui/cli'
-
-export default defineConfig({
-  sourceLocale: 'en',
+/** @type {import('@lingui/conf').LinguiConfig} */
+module.exports = {
  locales: [
    'en',
    'an',
@@ -51,5 +49,5 @@ export default defineConfig({
      include: ['src'],
    },
  ],
-  compileNamespace: 'ts',
-})
+  format: 'po',
+}
@@ -44,6 +44,6 @@ android {

 dependencies {
  implementation project(':expo-modules-core')
-  implementation 'com.google.android.material:material:1.13.0'
+  implementation 'com.google.android.material:material:1.12.0'
  implementation "com.facebook.react:react-native:+"
 }
@@ -48,8 +48,6 @@ class BottomSheetModule : Module() {
        Prop("preventExpansion") { view: BottomSheetView, prop: Boolean ->
          view.preventExpansion = prop
        }
-
-        Prop("sourceViewTag") { _: BottomSheetView, _: Int? -> }
      }
    }
 }
@@ -5,12 +5,8 @@ import android.util.DisplayMetrics
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewStructure
-import android.view.Window
 import android.view.accessibility.AccessibilityEvent
 import android.widget.FrameLayout
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.allViews
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactContext
@@ -19,7 +15,6 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.internal.EdgeToEdgeUtils
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -34,26 +29,22 @@ class BottomSheetView(

  private lateinit var dialogRootViewGroup: DialogRootViewGroup
  private var eventDispatcher: EventDispatcher? = null
-  private var isKeyboardVisible: Boolean = false

-  private val screenHeight =
+  private val rawScreenHeight =
    context.resources.displayMetrics.heightPixels
      .toFloat()
+  private val safeScreenHeight = (rawScreenHeight - getNavigationBarHeight()).toFloat()

  private fun getNavigationBarHeight(): Int {
    val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android")
    return if (resourceId > 0) resources.getDimensionPixelSize(resourceId) else 0
  }

-  private fun getStatusBarHeight(): Int {
-    val resourceId = resources.getIdentifier("status_bar_height", "dimen", "android")
-    return if (resourceId > 0) resources.getDimensionPixelSize(resourceId) else 0
-  }
-
  private val onAttemptDismiss by EventDispatcher()
  private val onSnapPointChange by EventDispatcher()
  private val onStateChange by EventDispatcher()

+  // Props
  var disableDrag = false
    set(value) {
      field = value
@@ -65,31 +56,48 @@ class BottomSheetView(
      field = value
      this.dialog?.setCancelable(!value)
    }
-
  var preventExpansion = false

  var minHeight = 0f
    set(value) {
-      field = if (value < 0) 0f else dpToPx(value)
+      field =
+        if (value < 0) {
+          0f
+        } else {
+          dpToPx(value)
+        }
    }

-  var maxHeight = this.screenHeight
+  var maxHeight = this.safeScreenHeight
    set(value) {
      val px = dpToPx(value)
-      field = if (px > this.screenHeight) this.screenHeight else px
+      field =
+        if (px > this.safeScreenHeight) {
+          this.safeScreenHeight
+        } else {
+          px
+        }
    }

  private var isOpen: Boolean = false
    set(value) {
      field = value
-      onStateChange(mapOf("state" to if (value) "open" else "closed"))
+      onStateChange(
+        mapOf(
+          "state" to if (value) "open" else "closed",
+        ),
+      )
    }

  private var isOpening: Boolean = false
    set(value) {
      field = value
      if (value) {
-        onStateChange(mapOf("state" to "opening"))
+        onStateChange(
+          mapOf(
+            "state" to "opening",
+          ),
+        )
      }
    }

@@ -97,21 +105,33 @@ class BottomSheetView(
    set(value) {
      field = value
      if (value) {
-        onStateChange(mapOf("state" to "closing"))
+        onStateChange(
+          mapOf(
+            "state" to "closing",
+          ),
+        )
      }
    }

  private var selectedSnapPoint = 0
    set(value) {
      if (field == value) return
+
      field = value
-      onSnapPointChange(mapOf("snapPoint" to value))
+      onSnapPointChange(
+        mapOf(
+          "snapPoint" to value,
+        ),
+      )
    }

+  // Lifecycle
+
  init {
    (appContext.reactContext as? ReactContext)?.let {
      it.addLifecycleEventListener(this)
      this.eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(it, this.id)
+
      this.dialogRootViewGroup = DialogRootViewGroup(context)
      this.dialogRootViewGroup.eventDispatcher = this.eventDispatcher
    }
@@ -141,55 +161,27 @@ class BottomSheetView(
  private fun getHalfExpandedRatio(contentHeight: Float): Float =
    when {
      // Full height sheets
-      contentHeight >= screenHeight -> 0.99f
-      else -> this.clampRatio(this.getTargetHeight() / screenHeight)
+      contentHeight >= safeScreenHeight -> 0.99f
+      // Medium height sheets (>50% but <100%)
+      contentHeight >= safeScreenHeight / 2 ->
+        this.clampRatio(this.getTargetHeight() / safeScreenHeight)
+      // Small height sheets (<50%)
+      else ->
+        this.clampRatio(this.getTargetHeight() / rawScreenHeight)
    }

  private fun present() {
    if (this.isOpen || this.isOpening || this.isClosing) return

    val contentHeight = this.getContentHeight()
-
-    var activityWindow: Window? = null
-    var currentContext = context
-    while (currentContext != null) {
-      if (currentContext is android.app.Activity) {
-        activityWindow = currentContext.window
-        break
-      }
-      currentContext = (currentContext as? android.content.ContextWrapper)?.baseContext
-    }
-
-    val originalStatusBarAppearance =
-      activityWindow?.let { window ->
-        WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightStatusBars
-      }
-    val originalNavBarAppearance =
-      activityWindow?.let { window ->
-        WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightNavigationBars
-      }
-
-    val dialog = BottomSheetDialog(context, R.style.EdgeToEdgeBottomSheetDialogTheme)
+    val dialog = BottomSheetDialog(context)
    dialog.setContentView(dialogRootViewGroup)
    dialog.setCancelable(!preventDismiss)
-    dialog.setDismissWithAnimation(true)
    dialog.setOnDismissListener {
      this.isClosing = true
      this.destroy()
    }

-    dialog.setOnShowListener {
-      dialog.window?.let { window ->
-        val insetsController = WindowInsetsControllerCompat(window, window.decorView)
-        if (originalNavBarAppearance != null) {
-          insetsController.isAppearanceLightNavigationBars = originalNavBarAppearance
-        }
-        if (originalStatusBarAppearance != null) {
-          EdgeToEdgeUtils.setLightStatusBar(window, originalStatusBarAppearance)
-        }
-      }
-    }
-
    val bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
    bottomSheet?.let {
      it.setBackgroundColor(0)
@@ -202,17 +194,7 @@ class BottomSheetView(
      behavior.isDraggable = true
      behavior.isHideable = true

-      if (preventExpansion) {
-        behavior.maxHeight = (behavior.halfExpandedRatio * screenHeight).toInt()
-      } else {
-        behavior.maxHeight = (screenHeight - getStatusBarHeight()).toInt()
-      }
-
-      val targetHeight = this.getTargetHeight()
-      val availableHeight = screenHeight - getStatusBarHeight() - getNavigationBarHeight()
-      val shouldBeExpanded = targetHeight >= availableHeight
-
-      if (shouldBeExpanded) {
+      if (contentHeight >= this.safeScreenHeight || this.minHeight >= this.safeScreenHeight) {
        behavior.state = BottomSheetBehavior.STATE_EXPANDED
        this.selectedSnapPoint = 2
      } else {
@@ -227,10 +209,18 @@ class BottomSheetView(
            newState: Int,
          ) {
            when (newState) {
-              BottomSheetBehavior.STATE_EXPANDED -> selectedSnapPoint = 2
-              BottomSheetBehavior.STATE_COLLAPSED -> selectedSnapPoint = 1
-              BottomSheetBehavior.STATE_HALF_EXPANDED -> selectedSnapPoint = 1
-              BottomSheetBehavior.STATE_HIDDEN -> selectedSnapPoint = 0
+              BottomSheetBehavior.STATE_EXPANDED -> {
+                selectedSnapPoint = 2
+              }
+              BottomSheetBehavior.STATE_COLLAPSED -> {
+                selectedSnapPoint = 1
+              }
+              BottomSheetBehavior.STATE_HALF_EXPANDED -> {
+                selectedSnapPoint = 1
+              }
+              BottomSheetBehavior.STATE_HIDDEN -> {
+                selectedSnapPoint = 0
+              }
            }
          }

@@ -241,26 +231,9 @@ class BottomSheetView(
        },
      )
    }
-
    this.isOpening = true
    dialog.show()
    this.dialog = dialog
-
-    ViewCompat.setOnApplyWindowInsetsListener(dialogRootViewGroup) { view, insets ->
-      val imeVisible = insets.isVisible(WindowInsetsCompat.Type.ime())
-      val bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
-      val behavior = bottomSheet?.let { BottomSheetBehavior.from(it) }
-
-      val wasKeyboardVisible = isKeyboardVisible
-      isKeyboardVisible = imeVisible
-
-      if (imeVisible && behavior?.state == BottomSheetBehavior.STATE_HALF_EXPANDED) {
-        behavior.state = BottomSheetBehavior.STATE_EXPANDED
-      } else if (!imeVisible && wasKeyboardVisible) {
-        updateLayout()
-      }
-      insets
-    }
  }

  fun updateLayout() {
@@ -273,24 +246,12 @@ class BottomSheetView(
      val currentState = behavior.state

      val oldRatio = behavior.halfExpandedRatio
-      val newRatio = getHalfExpandedRatio(contentHeight)
+      var newRatio = getHalfExpandedRatio(contentHeight)
      behavior.halfExpandedRatio = newRatio

-      if (preventExpansion) {
-        behavior.maxHeight = (behavior.halfExpandedRatio * screenHeight).toInt()
-      }
-
-      val targetHeight = this.getTargetHeight()
-      val availableHeight = screenHeight - getStatusBarHeight() - getNavigationBarHeight()
-      val shouldBeExpanded = targetHeight >= availableHeight
-
-      if (isKeyboardVisible) {
-        if (behavior.state != BottomSheetBehavior.STATE_EXPANDED) {
-          behavior.state = BottomSheetBehavior.STATE_EXPANDED
-        }
-      } else if (shouldBeExpanded && behavior.state != BottomSheetBehavior.STATE_EXPANDED && !preventExpansion) {
+      if (contentHeight > this.safeScreenHeight && behavior.state != BottomSheetBehavior.STATE_EXPANDED) {
        behavior.state = BottomSheetBehavior.STATE_EXPANDED
-      } else if (!shouldBeExpanded && behavior.state != BottomSheetBehavior.STATE_HALF_EXPANDED) {
+      } else if (contentHeight < this.safeScreenHeight && behavior.state != BottomSheetBehavior.STATE_HALF_EXPANDED) {
        behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
      } else if (currentState == BottomSheetBehavior.STATE_HALF_EXPANDED && oldRatio != newRatio) {
        behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
@@ -318,19 +279,25 @@ class BottomSheetView(

  private fun getTargetHeight(): Float {
    val contentHeight = this.getContentHeight()
-    return when {
-      contentHeight > maxHeight -> maxHeight
-      contentHeight < minHeight -> minHeight
-      else -> contentHeight
-    }
+    val height =
+      if (contentHeight > maxHeight) {
+        maxHeight
+      } else if (contentHeight < minHeight) {
+        minHeight
+      } else {
+        contentHeight
+      }
+    return height
  }

-  private fun clampRatio(ratio: Float): Float =
-    when {
-      ratio < 0.01 -> 0.01f
-      ratio > 0.99 -> 0.99f
-      else -> ratio
+  private fun clampRatio(ratio: Float): Float {
+    if (ratio < 0.01) {
+      return 0.01f
+    } else if (ratio > 0.99) {
+      return 0.99f
    }
+    return ratio
+  }

  private fun setDraggable(draggable: Boolean) {
    val dialog = this.dialog ?: return
@@ -355,7 +322,9 @@ class BottomSheetView(
  // View overrides to pass to DialogRootViewGroup instead

  override fun dispatchProvideStructure(structure: ViewStructure?) {
-    if (structure == null) return
+    if (structure == null) {
+      return
+    }
    dialogRootViewGroup.dispatchProvideStructure(structure)
  }

@@ -394,6 +363,7 @@ class BottomSheetView(
  // https://stackoverflow.com/questions/11862391/getheight-px-or-dpi
  fun dpToPx(dp: Float): Float {
    val displayMetrics = context.resources.displayMetrics
-    return dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)
+    val px = dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)
+    return px
  }
 }
@@ -52,8 +52,6 @@ class DialogRootViewGroup(
    if (ReactFeatureFlags.dispatchPointerEvents) {
      jSPointerDispatcher = JSPointerDispatcher(this)
    }
-
-    fitsSystemWindows = false
  }

  override fun onSizeChanged(
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="EdgeToEdgeBottomSheetDialogTheme" parent="Theme.Material3.DayNight.BottomSheetDialog">
-        <!-- Enable edge-to-edge -->
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowIsFloating">false</item>
-        <item name="enableEdgeToEdge">true</item>
-
-        <!-- Configure bottom sheet to respect system window insets -->
-        <item name="bottomSheetStyle">@style/EdgeToEdgeBottomSheet</item>
-    </style>
-
-    <style name="EdgeToEdgeBottomSheet" parent="Widget.Material3.BottomSheet">
-        <item name="paddingBottomSystemWindowInsets">false</item>
-        <item name="paddingLeftSystemWindowInsets">true</item>
-        <item name="paddingRightSystemWindowInsets">true</item>
-        <item name="paddingTopSystemWindowInsets">false</item>
-    </style>
-</resources>
@@ -42,10 +42,6 @@ public class BottomSheetModule: Module {
      Prop("preventExpansion") { (view: SheetView, prop: Bool) in
        view.preventExpansion = prop
      }
-
-      Prop("sourceViewTag") { (view: SheetView, prop: Int?) in
-        view.sourceViewTag = prop
-      }
    }
  }
 }
@@ -26,7 +26,6 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
  var preventDismiss = false
  var preventExpansion = false
  var cornerRadius: CGFloat?
-  var sourceViewTag: Int?
  var minHeight = 0.0
  var maxHeight: CGFloat! {
    didSet {
@@ -136,15 +135,6 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
    }
    sheetVc.view.addSubview(innerView)

-    if #available(iOS 26.0, *),
-       let tag = self.sourceViewTag,
-       let bridge = self.appContext?.reactBridge,
-       let sourceView = bridge.uiManager.view(forReactTag: NSNumber(value: tag)) {
-      sheetVc.preferredTransition = .zoom { _ in
-        return sourceView
-      }
-    }
-
    self.sheetVc = sheetVc
    self.isOpening = true

@@ -27,19 +27,6 @@ class SheetViewController: UIViewController {
      return
    }

-    // On iOS 26, the floaty sheet presentation adds the device bottom safe area
-    // on top of the custom detent value, creating visible padding inside the pill.
-    // Subtract it so the pill height matches our actual content.
-    var bottomSafeAreaAdjustment: CGFloat = 0
-    if #available(iOS 26.0, *) {
-      if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-         let window = windowScene.windows.first {
-        bottomSafeAreaAdjustment = window.safeAreaInsets.bottom
-      }
-    }
-
-    let adjustedHeight = contentHeight - bottomSafeAreaAdjustment
-
    if #available(iOS 16.0, *) {
      if contentHeight > screenHeight - 100 {
        sheet.detents = [
@@ -49,7 +36,7 @@ class SheetViewController: UIViewController {
      } else {
        sheet.detents = [
          .custom { _ in
-            return adjustedHeight
+            return contentHeight
          }
        ]
        if !preventExpansion {
@@ -1,4 +1,5 @@
-import {type ColorValue, type NativeSyntheticEvent} from 'react-native'
+import React from 'react'
+import {ColorValue, NativeSyntheticEvent} from 'react-native'

 export type BottomSheetState = 'closed' | 'closing' | 'open' | 'opening'

@@ -24,7 +25,6 @@ export interface BottomSheetViewProps {
  backgroundColor?: ColorValue
  containerBackgroundColor?: ColorValue
  disableDrag?: boolean
-  sourceViewTag?: number

  minHeight?: number
  maxHeight?: number
@@ -5,22 +5,21 @@ import {
  type NativeSyntheticEvent,
  Platform,
  type StyleProp,
-  useWindowDimensions,
  View,
  type ViewStyle,
 } from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {requireNativeModule, requireNativeViewManager} from 'expo-modules-core'

-import {IS_IOS} from '#/env'
+import {isIOS} from '#/platform/detection'
 import {
  type BottomSheetState,
  type BottomSheetViewProps,
 } from './BottomSheet.types'
-import {
-  BottomSheetPortalProvider,
-  Context as PortalContext,
-} from './BottomSheetPortal'
+import {BottomSheetPortalProvider} from './BottomSheetPortal'
+import {Context as PortalContext} from './BottomSheetPortal'
+
+const screenHeight = Dimensions.get('screen').height

 const NativeView: React.ComponentType<
  BottomSheetViewProps & {
@@ -31,7 +30,7 @@ const NativeView: React.ComponentType<

 const NativeModule = requireNativeModule('BottomSheet')

-const IS_IOS15 =
+const isIOS15 =
  Platform.OS === 'ios' &&
  // semvar - can be 3 segments, so can't use Number(Platform.Version)
  Number(Platform.Version.split('.').at(0)) < 16
@@ -92,8 +91,7 @@ export class BottomSheetNativeComponent extends React.Component<
    }

    let extraStyles
-    if (IS_IOS15 && this.state.viewHeight) {
-      const screenHeight = Dimensions.get('screen').height
+    if (isIOS15 && this.state.viewHeight) {
      const {viewHeight} = this.state
      const cornerRadius = this.props.cornerRadius ?? 0
      if (viewHeight < screenHeight / 2) {
@@ -114,7 +112,7 @@ export class BottomSheetNativeComponent extends React.Component<
          onStateChange={this.onStateChange}
          extraStyles={extraStyles}
          onLayout={e => {
-            if (IS_IOS15) {
+            if (isIOS15) {
              const {height} = e.nativeEvent.layout
              this.setState({viewHeight: height})
            }
@@ -154,9 +152,8 @@ function BottomSheetNativeComponentInner({
 }) {
  const insets = useSafeAreaInsets()
  const cornerRadius = rest.cornerRadius ?? 0
-  const {height: screenHeight} = useWindowDimensions()

-  const sheetHeight = IS_IOS ? screenHeight - insets.top : screenHeight
+  const sheetHeight = isIOS ? screenHeight - insets.top : screenHeight

  return (
    <NativeView
@@ -178,7 +175,6 @@ function BottomSheetNativeComponentInner({
          Platform.OS === 'android' && {
            borderTopLeftRadius: cornerRadius,
            borderTopRightRadius: cornerRadius,
-            overflow: 'hidden',
          },
          extraStyles,
        ]}>
@@ -34,15 +34,12 @@ class NotificationPrefs(
            is Boolean -> {
              putBoolean(key, value)
            }
-
            is String -> {
              putString(key, value)
            }
-
            is Array<*> -> {
              putStringSet(key, value.map { it.toString() }.toSet())
            }
-
            is Map<*, *> -> {
              putStringSet(key, value.map { it.toString() }.toSet())
            }
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
  s.static_framework = true

  s.dependency 'ExpoModulesCore'
-  s.dependency 'MCEmojiPicker'
+  s.dependency 'MCEmojiPicker', '1.2.3'

  # Swift/Objective-C compatibility
  s.pod_target_xcconfig = {
@@ -117,7 +117,7 @@ class ExpoReceiveAndroidIntentsModule : Module() {

  private fun handleImageIntents(
    uris: List<Uri>,
-    text: String?,
+    text: String?
  ) {
    var allParams = ""

@@ -145,7 +145,7 @@ class ExpoReceiveAndroidIntentsModule : Module() {

  private fun handleVideoIntents(
    uris: List<Uri>,
-    text: String?,
+    text: String?
  ) {
    val uri = uris[0]
    // If there is no extension for the file, substringAfterLast returns the original string - not
@@ -1,6 +1,6 @@
 {
  "name": "bsky.app",
-  "version": "1.118.0",
+  "version": "1.113.1",
  "private": true,
  "engines": {
    "node": ">=20"
@@ -16,13 +16,6 @@
          "expo-image-picker"
        ]
      }
-    },
-    "install": {
-      "exclude": [
-        "react-native-reanimated",
-        "@sentry/react-native",
-        "react-native-pager-view"
-      ]
    }
  },
  "scripts": {
@@ -48,15 +41,15 @@
    "test-watch": "NODE_ENV=test jest --watchAll",
    "test-ci": "NODE_ENV=test jest --ci --forceExit --reporters=default --reporters=jest-junit",
    "test-coverage": "NODE_ENV=test jest --coverage",
-    "lint": "eslint --cache --quiet src",
+    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src",
    "lint-native": "swiftlint ./modules && ktlint ./modules",
    "lint-native:fix": "swiftlint --fix ./modules && ktlint --format ./modules",
    "typecheck": "tsc --project ./tsconfig.check.json",
    "e2e:mock-server": "NODE_ENV=development ./jest/dev-infra/with-test-redis-and-db.sh ts-node --project tsconfig.e2e.json __e2e__/mock-server.ts",
    "e2e:build": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:ios",
    "e2e:build-android": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:android",
-    "e2e:start": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo start -c",
-    "e2e:run": "maestro test",
+    "e2e:start": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo start",
+    "e2e:run": "maestro test __e2e__",
    "perf:test": "NODE_ENV=test maestro test",
    "perf:test:run": "NODE_ENV=test maestro test __e2e__/perf-test.yml",
    "perf:test:measure": "NODE_ENV=test flashlight test --bundleId xyz.blueskyweb.app --testCommand \"yarn perf:test\" --duration 150000 --resultsFilePath .perf/results.json",
@@ -66,7 +59,7 @@
    "intl:extract": "lingui extract --clean --locale en",
    "intl:extract:all": "lingui extract --clean",
    "intl:compile": "lingui compile",
-    "intl:compile-if-needed": "is-ci || [ -f src/locale/locales/en/messages.ts ] || yarn intl:compile",
+    "intl:compile-if-needed": "is-ci || [ -f src/locale/locales/en/messages.js ] || yarn intl:compile",
    "intl:pull": "crowdin download translations --verbose -b main",
    "intl:push": "crowdin push translations --verbose -b main",
    "intl:push-sources": "crowdin push sources --verbose -b main",
@@ -80,15 +73,13 @@
    "icons:optimize": "svgo -f ./assets/icons"
  },
  "dependencies": {
-    "@atproto/api": "^0.19.3",
+    "@atproto/api": "^0.18.8",
    "@bitdrift/react-native": "^0.6.8",
    "@braintree/sanitize-url": "^6.0.2",
-    "@bsky.app/alf": "^0.1.7",
+    "@bsky.app/alf": "^0.1.6",
    "@bsky.app/expo-image-crop-tool": "^0.5.0",
-    "@bsky.app/expo-translate-text": "^0.2.7",
    "@bsky.app/react-native-mmkv": "2.12.5",
    "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
-    "@emoji-mart/data": "^1.2.1",
    "@emoji-mart/react": "^1.1.1",
    "@expo/html-elements": "^0.12.5",
    "@expo/webpack-config": "^19.0.1",
@@ -102,12 +93,9 @@
    "@fortawesome/free-regular-svg-icons": "^6.1.1",
    "@fortawesome/free-solid-svg-icons": "^6.1.1",
    "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@growthbook/growthbook": "^1.6.5",
-    "@growthbook/growthbook-react": "^1.6.5",
    "@haileyok/bluesky-video": "0.3.2",
    "@ipld/dag-cbor": "^9.2.0",
-    "@lingui/core": "^5.9.2",
-    "@lingui/react": "^5.9.2",
+    "@lingui/react": "^4.14.1",
    "@mattermost/react-native-paste-input": "mattermost/react-native-paste-input",
    "@miblanchard/react-native-slider": "^2.6.0",
    "@mozzius/expo-dynamic-app-icon": "^1.8.0",
@@ -134,13 +122,15 @@
    "@types/invariant": "^2.2.37",
    "@types/lodash.throttle": "^4.1.9",
    "@types/node": "^20.14.3",
+    "@zxing/text-encoding": "^0.9.0",
    "array.prototype.findlast": "^1.2.3",
+    "await-lock": "^2.2.2",
    "babel-plugin-transform-remove-console": "^6.9.4",
    "bcp-47": "^2.1.0",
    "bcp-47-match": "^2.0.3",
    "date-fns": "^2.30.0",
    "email-validator": "^2.0.4",
-    "emoji-mart": "^5.6.0",
+    "emoji-mart": "^5.5.2",
    "emoji-regex": "^10.4.0",
    "eventemitter3": "^5.0.1",
    "expo": "^54.0.27",
@@ -166,20 +156,19 @@
    "expo-location": "~19.0.8",
    "expo-media-library": "~18.2.1",
    "expo-notifications": "~0.32.14",
-    "expo-privacy-sensitive": "^0.1.0",
    "expo-screen-orientation": "~9.0.8",
    "expo-sharing": "~14.0.8",
    "expo-sms": "^14.0.7",
    "expo-splash-screen": "~31.0.12",
    "expo-system-ui": "~6.0.9",
+    "expo-task-manager": "~14.0.9",
    "expo-updates": "~29.0.14",
    "expo-video": "~3.0.15",
-    "expo-video-thumbnails": "^10.0.8",
    "expo-web-browser": "~15.0.10",
    "fast-deep-equal": "^3.1.3",
    "fast-text-encoding": "^1.0.6",
+    "history": "^5.3.0",
    "hls.js": "^1.6.2",
-    "idb-keyval": "^6.2.2",
    "js-sha256": "^0.9.0",
    "jwt-decode": "^4.0.0",
    "lande": "^1.0.10",
@@ -208,7 +197,8 @@
    "react-native-drawer-layout": "^4.2.1",
    "react-native-edge-to-edge": "^1.6.0",
    "react-native-gesture-handler": "~2.28.0",
-    "react-native-keyboard-controller": "^1.20.7",
+    "react-native-get-random-values": "~1.11.0",
+    "react-native-keyboard-controller": "1.18.5",
    "react-native-pager-view": "6.8.0",
    "react-native-progress": "bluesky-social/react-native-progress",
    "react-native-qrcode-styled": "^0.3.3",
@@ -217,6 +207,7 @@
    "react-native-screens": "^4.19.0",
    "react-native-svg": "15.12.1",
    "react-native-uitextview": "^1.4.0",
+    "react-native-url-polyfill": "^1.3.0",
    "react-native-uuid": "^2.0.3",
    "react-native-view-shot": "^4.0.3",
    "react-native-web": "^0.21.0",
@@ -225,9 +216,9 @@
    "react-remove-scroll-bar": "^2.3.8",
    "react-responsive": "^10.0.1",
    "react-textarea-autosize": "^8.5.3",
-    "setimmediate": "^1.0.5",
    "sonner": "^2.0.7",
    "sonner-native": "^0.21.0",
+    "statsig-react-native-expo": "^4.6.1",
    "tippy.js": "^6.3.7",
    "tlds": "^1.234.0",
    "tldts": "^6.1.46",
@@ -235,19 +226,19 @@
    "zod": "^3.20.2"
  },
  "devDependencies": {
-    "@atproto/dev-env": "^0.3.209",
+    "@atproto/dev-env": "^0.3.196",
    "@babel/core": "^7.26.0",
    "@babel/preset-env": "^7.26.0",
    "@babel/runtime": "^7.26.0",
-    "@eslint/js": "^9.39.2",
    "@expo/config-plugins": "~54.0.1",
-    "@lingui/babel-plugin-lingui-macro": "^5.9.2",
-    "@lingui/cli": "^5.9.2",
+    "@lingui/cli": "^4.14.1",
+    "@lingui/macro": "^4.14.1",
    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
    "@react-native/babel-preset": "0.81.5",
    "@react-native/eslint-config": "^0.81.5",
    "@react-native/typescript-config": "^0.81.5",
    "@sentry/webpack-plugin": "^3.2.2",
+    "@testing-library/jest-native": "^5.4.3",
    "@testing-library/react-native": "^13.2.0",
    "@types/jest": "29.5.14",
    "@types/lodash.chunk": "^4.2.7",
@@ -256,23 +247,23 @@
    "@types/psl": "^1.1.1",
    "@types/react": "^19.1.12",
    "@types/react-dom": "^19.1.9",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
    "babel-jest": "^29.7.0",
+    "babel-plugin-macros": "^3.1.0",
    "babel-plugin-module-resolver": "^5.0.2",
    "babel-plugin-react-compiler": "^19.1.0-rc.3",
    "babel-preset-expo": "~54.0.0",
-    "eslint": "^9.39.2",
-    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint": "^8.19.0",
    "eslint-plugin-bsky-internal": "link:./eslint",
-    "eslint-plugin-import-x": "^4.16.1",
-    "eslint-plugin-lingui": "^0.11.0",
-    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-ft-flow": "^2.0.3",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-lingui": "^0.2.0",
+    "eslint-plugin-react": "^7.33.2",
    "eslint-plugin-react-compiler": "^19.1.0-rc.2",
-    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-native": "^5.0.0",
-    "eslint-plugin-react-native-a11y": "^3.5.1",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-react-native-a11y": "^3.3.0",
+    "eslint-plugin-simple-import-sort": "^12.0.0",
    "file-loader": "6.2.0",
-    "globals": "^17.0.0",
    "husky": "^8.0.3",
    "is-ci": "^3.0.1",
    "jest": "^29.7.0",
@@ -286,20 +277,18 @@
    "svgo": "^3.3.2",
    "ts-node": "^10.9.1",
    "ts-plugin-sort-import-suggestions": "^1.0.4",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.0",
+    "typescript": "^5.9.2",
    "webpack-bundle-analyzer": "^4.10.1"
  },
  "resolutions": {
    "@react-native/babel-preset": "0.81.5",
    "@react-native/normalize-colors": "0.81.5",
    "**/@expo/image-utils": "0.8.7",
-    "**/@react-native-async-storage/async-storage": "2.2.0",
    "**/expo-constants": "18.0.8",
    "**/expo-device": "7.1.4",
+    "**/zod": "3.23.8",
    "**/multiformats": "9.9.0",
-    "unicode-segmenter": "0.14.5",
-    "@types/estree": "1.0.6"
+    "unicode-segmenter": "0.14.5"
  },
  "jest": {
    "preset": "jest-expo/ios",
@@ -0,0 +1,10 @@
+diff --git a/node_modules/@lingui/core/dist/index.mjs b/node_modules/@lingui/core/dist/index.mjs
+index 9759736..881f67b 100644
+--- a/node_modules/@lingui/core/dist/index.mjs
+++ b/node_modules/@lingui/core/dist/index.mjs
+@@ -1,4 +1,4 @@
+-import unraw from 'unraw';
+import { unraw } from 'unraw';
+ import { compileMessage } from '@lingui/message-utils/compileMessage';
+ 
+ const isString = (s) => typeof s === "string";
@@ -1,16 +0,0 @@
-diff --git a/node_modules/expo-font/ios/FontLoaderModule.swift b/node_modules/expo-font/ios/FontLoaderModule.swift
-index 183480f..7b64f6e 100644
--- a/node_modules/expo-font/ios/FontLoaderModule.swift
-+++ b/node_modules/expo-font/ios/FontLoaderModule.swift
-@@ -2,10 +2,9 @@ import ExpoModulesCore
- 
- public final class FontLoaderModule: Module {
-   // could be a Set, but to be able to pass to JS we keep it as an array
-  private var registeredFonts: [String]
-+  private lazy var registeredFonts: [String] = queryCustomNativeFonts()
- 
-   public required init(appContext: AppContext) {
-    self.registeredFonts = queryCustomNativeFonts()
-     super.init(appContext: appContext)
-   }
- 
@@ -1,103 +0,0 @@
-diff --git a/node_modules/expo-image/build/Image.types.d.ts b/node_modules/expo-image/build/Image.types.d.ts
-index 022ae48..416504f 100644
--- a/node_modules/expo-image/build/Image.types.d.ts
-+++ b/node_modules/expo-image/build/Image.types.d.ts
-@@ -152,6 +152,16 @@ export interface ImageProps extends Omit<ViewProps, 'style' | 'children'> {
-      * @default 'normal'
-      */
-     priority?: 'low' | 'normal' | 'high' | null;
-+    /**
-+     * The loading behavior for the image. Maps to the native HTML `loading` attribute on web.
-+     *
-+     * - `'lazy'` - Defers loading until the image is near the viewport.
-+     * - `'eager'` - Loads the image immediately.
-+     *
-+     * @default undefined
-+     * @platform web
-+     */
-+    loading?: 'lazy' | 'eager' | null;
-     /**
-      * Determines whether to cache the image and where: on the disk, in the memory or both.
-      *
-diff --git a/node_modules/expo-image/src/ExpoImage.web.tsx b/node_modules/expo-image/src/ExpoImage.web.tsx
-index 2a49ff0..1c3de93 100644
--- a/node_modules/expo-image/src/ExpoImage.web.tsx
-+++ b/node_modules/expo-image/src/ExpoImage.web.tsx
-@@ -70,6 +70,7 @@ export default function ExpoImage({
-   onLoadEnd,
-   onDisplay,
-   priority,
-+  loading,
-   blurRadius,
-   recyclingKey,
-   style,
-@@ -118,6 +119,7 @@ export default function ExpoImage({
-               accessibilityLabel={accessibilityLabel ?? alt}
-               cachePolicy={cachePolicy}
-               priority={priority}
-+              loading={loading}
-               tintColor={tintColor}
-             />
-           ),
-@@ -149,6 +151,7 @@ export default function ExpoImage({
-           className={className}
-           cachePolicy={cachePolicy}
-           priority={priority}
-+          loading={loading}
-           contentPosition={selectedSource ? contentPosition : { top: '50%', left: '50%' }}
-           hashPlaceholderContentPosition={contentPosition}
-           hashPlaceholderStyle={imageHashStyle}
-diff --git a/node_modules/expo-image/src/Image.types.ts b/node_modules/expo-image/src/Image.types.ts
-index 9dec0e7..61c1621 100644
--- a/node_modules/expo-image/src/Image.types.ts
-+++ b/node_modules/expo-image/src/Image.types.ts
-@@ -178,6 +178,17 @@ export interface ImageProps extends Omit<ViewProps, 'style' | 'children'> {
-    */
-   priority?: 'low' | 'normal' | 'high' | null;
- 
-+  /**
-+   * The loading behavior for the image. Maps to the native HTML `loading` attribute on web.
-+   *
-+   * - `'lazy'` - Defers loading until the image is near the viewport.
-+   * - `'eager'` - Loads the image immediately.
-+   *
-+   * @default undefined
-+   * @platform web
-+   */
-+  loading?: 'lazy' | 'eager' | null;
-+
-   /**
-    * Determines whether to cache the image and where: on the disk, in the memory or both.
-    *
-diff --git a/node_modules/expo-image/src/web/ImageWrapper.tsx b/node_modules/expo-image/src/web/ImageWrapper.tsx
-index e8f891d..89a5cb1 100644
--- a/node_modules/expo-image/src/web/ImageWrapper.tsx
-+++ b/node_modules/expo-image/src/web/ImageWrapper.tsx
-@@ -30,6 +30,7 @@ const ImageWrapper = React.forwardRef(
-       contentPosition,
-       hashPlaceholderContentPosition,
-       priority,
-+      loading,
-       style,
-       hashPlaceholderStyle,
-       tintColor,
-@@ -82,6 +83,7 @@ const ImageWrapper = React.forwardRef(
-           // @ts-ignore
-           // eslint-disable-next-line react/no-unknown-property
-           fetchPriority={getFetchPriorityFromImagePriority(priority || 'normal')}
-+          loading={loading || undefined}
-           {...getImageWrapperEventHandler(events, sourceWithHeaders)}
-           {...getImgPropsFromSource(source)}
-           {...props}
-diff --git a/node_modules/expo-image/src/web/ImageWrapper.types.ts b/node_modules/expo-image/src/web/ImageWrapper.types.ts
-index 19bbe2f..179837f 100644
--- a/node_modules/expo-image/src/web/ImageWrapper.types.ts
-+++ b/node_modules/expo-image/src/web/ImageWrapper.types.ts
-@@ -29,6 +29,7 @@ export type ImageWrapperProps = {
-   contentPosition?: ImageContentPositionObject;
-   hashPlaceholderContentPosition?: ImageContentPositionObject;
-   priority?: string | null;
-+  loading?: 'lazy' | 'eager' | null;
-   style: CSSProperties;
-   tintColor?: string | null;
-   hashPlaceholderStyle?: CSSProperties;
@@ -1,30 +0,0 @@
-diff --git a/node_modules/react-native-pager-view/ios/RNCPagerView.m b/node_modules/react-native-pager-view/ios/RNCPagerView.m
-index adfc7c6..366df60 100644
--- a/node_modules/react-native-pager-view/ios/RNCPagerView.m
-+++ b/node_modules/react-native-pager-view/ios/RNCPagerView.m
-@@ -498,6 +498,25 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
-         return YES;
-     }
- 
-+    // iOS 26+ full-screen back gesture (interactiveContentPopGestureRecognizer)
-+    if (@available(iOS 26, *)) {
-+        if (gestureRecognizer == self.panGestureRecognizer &&
-+            otherGestureRecognizer == self.reactViewController.navigationController.interactiveContentPopGestureRecognizer) {
-+            UIPanGestureRecognizer* panGestureRecognizer = (UIPanGestureRecognizer*) gestureRecognizer;
-+            CGPoint velocity = [panGestureRecognizer velocityInView:self];
-+            BOOL isLTR = [self isLtrLayout];
-+            BOOL isBackGesture = (isLTR && velocity.x > 0) || (!isLTR && velocity.x < 0);
-+
-+            if (self.currentIndex == 0 && isBackGesture) {
-+                self.scrollView.panGestureRecognizer.enabled = false;
-+            } else {
-+                self.scrollView.panGestureRecognizer.enabled = self.scrollEnabled;
-+            }
-+
-+            return YES;
-+        }
-+    }
-+
-     self.scrollView.panGestureRecognizer.enabled = self.scrollEnabled;
-     return NO;
- }
@@ -1,11 +0,0 @@
-# react-native-pager-view+6.8.0.patch
-
-Adds support for iOS 26's `interactiveContentPopGestureRecognizer` (full-screen back gesture).
-
-The pager already handles `RNSPanGestureRecognizer` (react-native-screens' custom full-screen gesture for pre-iOS 26) in `shouldRecognizeSimultaneouslyWithGestureRecognizer:`. It checks if the user is on the leftmost page and swiping right - if so, it disables the scrollview's pan gesture to let the back gesture through.
-
-This patch adds the same logic for iOS 26's native `interactiveContentPopGestureRecognizer`, so the back gesture works on the leftmost page while the pager still handles swipes on other pages.
-
-Related issues:
- https://github.com/software-mansion/react-native-screens/issues/3512
- https://github.com/software-mansion/react-native-screens/pull/3420
@@ -1,11 +1,11 @@
 diff --git a/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift b/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift
-index c34ba71..3602856 100644
+index c34ba71..13d576a 100644
 --- a/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift
 +++ b/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift
-@@ -159,13 +159,25 @@ class RNUITextViewShadow: RCTShadowView {
+@@ -159,13 +159,23 @@ class RNUITextViewShadow: RCTShadowView {
     let maxSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(MAXFLOAT))
     let textSize = self.attributedText.boundingRect(with: maxSize, options: .usesLineFragmentOrigin, context: nil)
- 
+     
 -    var totalLines = self.lineHeight == 0.0 ? 0 : Int(ceil(textSize.height / self.lineHeight))
 -
 -    if self.numberOfLines != 0, totalLines > self.numberOfLines {
@@ -27,8 +27,6 @@ index c34ba71..3602856 100644
     }
 
 -    self.frameSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(CGFloat(totalLines) * self.lineHeight))
-+    finalHeight = ceil(finalHeight)
-+
 +    self.frameSize = CGSize(width: CGFloat(maxWidth), height: finalHeight)
     return YGSize(width: Float(self.frameSize.width), height: Float(self.frameSize.height))
   }
@@ -1,9 +1,9 @@
 import '#/logger/sentry/setup'
+import '#/logger/bitdrift/setup'
 import '#/view/icons'

 import React, {useEffect, useState} from 'react'
 import {GestureHandlerRootView} from 'react-native-gesture-handler'
-import {KeyboardProvider as KeyboardControllerProvider} from 'react-native-keyboard-controller'
 import {
  initialWindowMetrics,
  SafeAreaProvider,
@@ -11,22 +11,20 @@ import {
 import * as ScreenOrientation from 'expo-screen-orientation'
 import * as SplashScreen from 'expo-splash-screen'
 import * as SystemUI from 'expo-system-ui'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import * as Sentry from '@sentry/react-native'

+import {KeyboardControllerProvider} from '#/lib/hooks/useEnableKeyboardController'
 import {Provider as HideBottomBarBorderProvider} from '#/lib/hooks/useHideBottomBarBorder'
 import {QueryProvider} from '#/lib/react-query'
+import {Provider as StatsigProvider, tryFetchGates} from '#/lib/statsig/statsig'
 import {s} from '#/lib/styles'
 import {ThemeProvider} from '#/lib/ThemeContext'
-import {Provider as TranslateOnDeviceProvider} from '#/lib/translation'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
+import {isAndroid, isIOS} from '#/platform/detection'
 import {Provider as A11yProvider} from '#/state/a11y'
-import {
-  prefetchAppConfig,
-  Provider as AppConfigProvider,
-} from '#/state/appConfig'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {Provider as EmailVerificationProvider} from '#/state/email-verification'
@@ -69,31 +67,18 @@ import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdate
 import {Provider as PortalProvider} from '#/components/Portal'
 import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
 import {ToastOutlet} from '#/components/Toast'
-import {
-  prefetchAgeAssuranceConfig,
-  Provider as AgeAssuranceV2Provider,
-} from '#/ageAssurance'
-import {
-  AnalyticsContext,
-  AnalyticsFeaturesContext,
-  features,
-  setupDeviceId,
-} from '#/analytics'
-import {IS_ANDROID, IS_IOS} from '#/env'
-import {
-  prefetchLiveEvents,
-  Provider as LiveEventsProvider,
-} from '#/features/liveEvents/context'
+import {Provider as AgeAssuranceV2Provider} from '#/ageAssurance'
+import {prefetchAgeAssuranceConfig} from '#/ageAssurance'
 import * as Geo from '#/geolocation'
 import {Splash} from '#/Splash'
 import {BottomSheetProvider} from '../modules/bottom-sheet'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'

 SplashScreen.preventAutoHideAsync()
-if (IS_IOS) {
+if (isIOS) {
  SystemUI.setBackgroundColorAsync('black')
 }
-if (IS_ANDROID) {
+if (isAndroid) {
  // iOS is handled by the config plugin -sfn
  ScreenOrientation.lockAsync(
    ScreenOrientation.OrientationLock.PORTRAIT_UP,
@@ -107,8 +92,6 @@ if (IS_ANDROID) {
 */
 Geo.resolve()
 prefetchAgeAssuranceConfig()
-prefetchLiveEvents()
-prefetchAppConfig()

 function InnerApp() {
  const [isReady, setIsReady] = React.useState(false)
@@ -125,7 +108,7 @@ function InnerApp() {
        if (account) {
          await resumeSession(account)
        } else {
-          await features.init
+          await tryFetchGates(undefined, 'prefer-fresh-gates')
        }
      } catch (e) {
        logger.error(`session: resume failed`, {message: e})
@@ -155,59 +138,55 @@ function InnerApp() {
              <React.Fragment
                // Resets the entire tree below when it changes:
                key={currentAccount?.did}>
-                <AnalyticsFeaturesContext>
-                  <QueryProvider currentDid={currentAccount?.did}>
-                    <PolicyUpdateOverlayProvider>
-                      <LiveEventsProvider>
-                        <AgeAssuranceV2Provider>
-                          <ComposerProvider>
-                            <MessagesProvider>
-                              {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
-                              <LabelDefsProvider>
-                                <ModerationOptsProvider>
-                                  <LoggedOutViewProvider>
-                                    <SelectedFeedProvider>
-                                      <HiddenRepliesProvider>
-                                        <HomeBadgeProvider>
-                                          <UnreadNotifsProvider>
-                                            <BackgroundNotificationPreferencesProvider>
-                                              <MutedThreadsProvider>
-                                                <ProgressGuideProvider>
-                                                  <ServiceAccountManager>
-                                                    <EmailVerificationProvider>
-                                                      <HideBottomBarBorderProvider>
-                                                        <GestureHandlerRootView
-                                                          style={s.h100pct}>
-                                                          <GlobalGestureEventsProvider>
-                                                            <IntentDialogProvider>
-                                                              <TranslateOnDeviceProvider>
-                                                                <TestCtrls />
-                                                                <Shell />
-                                                                <ToastOutlet />
-                                                              </TranslateOnDeviceProvider>
-                                                            </IntentDialogProvider>
-                                                          </GlobalGestureEventsProvider>
-                                                        </GestureHandlerRootView>
-                                                      </HideBottomBarBorderProvider>
-                                                    </EmailVerificationProvider>
-                                                  </ServiceAccountManager>
-                                                </ProgressGuideProvider>
-                                              </MutedThreadsProvider>
-                                            </BackgroundNotificationPreferencesProvider>
-                                          </UnreadNotifsProvider>
-                                        </HomeBadgeProvider>
-                                      </HiddenRepliesProvider>
-                                    </SelectedFeedProvider>
-                                  </LoggedOutViewProvider>
-                                </ModerationOptsProvider>
-                              </LabelDefsProvider>
-                            </MessagesProvider>
-                          </ComposerProvider>
-                        </AgeAssuranceV2Provider>
-                      </LiveEventsProvider>
-                    </PolicyUpdateOverlayProvider>
-                  </QueryProvider>
-                </AnalyticsFeaturesContext>
+                <QueryProvider currentDid={currentAccount?.did}>
+                  <PolicyUpdateOverlayProvider>
+                    <StatsigProvider>
+                      <AgeAssuranceV2Provider>
+                        <ComposerProvider>
+                          <MessagesProvider>
+                            {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
+                            <LabelDefsProvider>
+                              <ModerationOptsProvider>
+                                <LoggedOutViewProvider>
+                                  <SelectedFeedProvider>
+                                    <HiddenRepliesProvider>
+                                      <HomeBadgeProvider>
+                                        <UnreadNotifsProvider>
+                                          <BackgroundNotificationPreferencesProvider>
+                                            <MutedThreadsProvider>
+                                              <ProgressGuideProvider>
+                                                <ServiceAccountManager>
+                                                  <EmailVerificationProvider>
+                                                    <HideBottomBarBorderProvider>
+                                                      <GestureHandlerRootView
+                                                        style={s.h100pct}>
+                                                        <GlobalGestureEventsProvider>
+                                                          <IntentDialogProvider>
+                                                            <TestCtrls />
+                                                            <Shell />
+                                                            <ToastOutlet />
+                                                          </IntentDialogProvider>
+                                                        </GlobalGestureEventsProvider>
+                                                      </GestureHandlerRootView>
+                                                    </HideBottomBarBorderProvider>
+                                                  </EmailVerificationProvider>
+                                                </ServiceAccountManager>
+                                              </ProgressGuideProvider>
+                                            </MutedThreadsProvider>
+                                          </BackgroundNotificationPreferencesProvider>
+                                        </UnreadNotifsProvider>
+                                      </HomeBadgeProvider>
+                                    </HiddenRepliesProvider>
+                                  </SelectedFeedProvider>
+                                </LoggedOutViewProvider>
+                              </ModerationOptsProvider>
+                            </LabelDefsProvider>
+                          </MessagesProvider>
+                        </ComposerProvider>
+                      </AgeAssuranceV2Provider>
+                    </StatsigProvider>
+                  </PolicyUpdateOverlayProvider>
+                </QueryProvider>
              </React.Fragment>
            </VideoVolumeProvider>
          </Splash>
@@ -221,7 +200,7 @@ function App() {
  const [isReady, setReady] = useState(false)

  React.useEffect(() => {
-    Promise.all([initPersistedState(), Geo.resolve(), setupDeviceId]).then(() =>
+    Promise.all([initPersistedState(), Geo.resolve()]).then(() =>
      setReady(true),
    )
  }, [])
@@ -236,40 +215,36 @@ function App() {
   */
  return (
    <Geo.Provider>
-      <AppConfigProvider>
-        <A11yProvider>
-          <KeyboardControllerProvider>
-            <OnboardingProvider>
-              <AnalyticsContext>
-                <SessionProvider>
-                  <PrefsStateProvider>
-                    <I18nProvider>
-                      <ShellStateProvider>
-                        <ModalStateProvider>
-                          <DialogStateProvider>
-                            <LightboxStateProvider>
-                              <PortalProvider>
-                                <BottomSheetProvider>
-                                  <StarterPackProvider>
-                                    <SafeAreaProvider
-                                      initialMetrics={initialWindowMetrics}>
-                                      <InnerApp />
-                                    </SafeAreaProvider>
-                                  </StarterPackProvider>
-                                </BottomSheetProvider>
-                              </PortalProvider>
-                            </LightboxStateProvider>
-                          </DialogStateProvider>
-                        </ModalStateProvider>
-                      </ShellStateProvider>
-                    </I18nProvider>
-                  </PrefsStateProvider>
-                </SessionProvider>
-              </AnalyticsContext>
-            </OnboardingProvider>
-          </KeyboardControllerProvider>
-        </A11yProvider>
-      </AppConfigProvider>
+      <A11yProvider>
+        <KeyboardControllerProvider>
+          <OnboardingProvider>
+            <SessionProvider>
+              <PrefsStateProvider>
+                <I18nProvider>
+                  <ShellStateProvider>
+                    <ModalStateProvider>
+                      <DialogStateProvider>
+                        <LightboxStateProvider>
+                          <PortalProvider>
+                            <BottomSheetProvider>
+                              <StarterPackProvider>
+                                <SafeAreaProvider
+                                  initialMetrics={initialWindowMetrics}>
+                                  <InnerApp />
+                                </SafeAreaProvider>
+                              </StarterPackProvider>
+                            </BottomSheetProvider>
+                          </PortalProvider>
+                        </LightboxStateProvider>
+                      </DialogStateProvider>
+                    </ModalStateProvider>
+                  </ShellStateProvider>
+                </I18nProvider>
+              </PrefsStateProvider>
+            </SessionProvider>
+          </OnboardingProvider>
+        </KeyboardControllerProvider>
+      </A11yProvider>
    </Geo.Provider>
  )
 }
@@ -2,22 +2,18 @@ import '#/logger/sentry/setup' // must be near top
 import '#/view/icons'
 import './style.css'

-import {Fragment, useEffect, useState} from 'react'
+import React, {useEffect, useState} from 'react'
 import {SafeAreaProvider} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import * as Sentry from '@sentry/react-native'

 import {QueryProvider} from '#/lib/react-query'
+import {Provider as StatsigProvider} from '#/lib/statsig/statsig'
 import {ThemeProvider} from '#/lib/ThemeContext'
-import {Provider as TranslateOnDeviceProvider} from '#/lib/translation'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
 import {Provider as A11yProvider} from '#/state/a11y'
-import {
-  prefetchAppConfig,
-  Provider as AppConfigProvider,
-} from '#/state/appConfig'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {Provider as EmailVerificationProvider} from '#/state/email-verification'
@@ -59,20 +55,8 @@ import {Provider as PortalProvider} from '#/components/Portal'
 import {Provider as ActiveVideoProvider} from '#/components/Post/Embed/VideoEmbed/ActiveVideoWebContext'
 import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
 import {ToastOutlet} from '#/components/Toast'
-import {
-  prefetchAgeAssuranceConfig,
-  Provider as AgeAssuranceV2Provider,
-} from '#/ageAssurance'
-import {
-  AnalyticsContext,
-  AnalyticsFeaturesContext,
-  features,
-  setupDeviceId,
-} from '#/analytics'
-import {
-  prefetchLiveEvents,
-  Provider as LiveEventsProvider,
-} from '#/features/liveEvents/context'
+import {Provider as AgeAssuranceV2Provider} from '#/ageAssurance'
+import {prefetchAgeAssuranceConfig} from '#/ageAssurance'
 import * as Geo from '#/geolocation'
 import {Splash} from '#/Splash'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
@@ -83,11 +67,9 @@ import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottom
 */
 Geo.resolve()
 prefetchAgeAssuranceConfig()
-prefetchLiveEvents()
-prefetchAppConfig()

 function InnerApp() {
-  const [isReady, setIsReady] = useState(false)
+  const [isReady, setIsReady] = React.useState(false)
  const {currentAccount} = useSession()
  const {resumeSession} = useSessionApi()
  const theme = useColorModeTheme()
@@ -100,8 +82,6 @@ function InnerApp() {
      try {
        if (account) {
          await resumeSession(account)
-        } else {
-          await features.init
        }
      } catch (e) {
        logger.error(`session: resumeSession failed`, {message: e})
@@ -122,69 +102,66 @@ function InnerApp() {
    })
  }, [_])

+  // wait for session to resume
+  if (!isReady || !hasCheckedReferrer) return <Splash isReady />
+
  return (
    <Alf theme={theme}>
      <ThemeProvider theme={theme}>
        <ContextMenuProvider>
-          <Splash isReady={isReady && hasCheckedReferrer}>
-            <VideoVolumeProvider>
-              <ActiveVideoProvider>
-                <Fragment
-                  // Resets the entire tree below when it changes:
-                  key={currentAccount?.did}>
-                  <AnalyticsFeaturesContext>
-                    <QueryProvider currentDid={currentAccount?.did}>
-                      <PolicyUpdateOverlayProvider>
-                        <LiveEventsProvider>
-                          <AgeAssuranceV2Provider>
-                            <ComposerProvider>
-                              <MessagesProvider>
-                                {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
-                                <LabelDefsProvider>
-                                  <ModerationOptsProvider>
-                                    <LoggedOutViewProvider>
-                                      <SelectedFeedProvider>
-                                        <HiddenRepliesProvider>
-                                          <HomeBadgeProvider>
-                                            <UnreadNotifsProvider>
-                                              <BackgroundNotificationPreferencesProvider>
-                                                <MutedThreadsProvider>
-                                                  <SafeAreaProvider>
-                                                    <ProgressGuideProvider>
-                                                      <ServiceConfigProvider>
-                                                        <EmailVerificationProvider>
-                                                          <HideBottomBarBorderProvider>
-                                                            <IntentDialogProvider>
-                                                              <TranslateOnDeviceProvider>
-                                                                <Shell />
-                                                                <ToastOutlet />
-                                                              </TranslateOnDeviceProvider>
-                                                            </IntentDialogProvider>
-                                                          </HideBottomBarBorderProvider>
-                                                        </EmailVerificationProvider>
-                                                      </ServiceConfigProvider>
-                                                    </ProgressGuideProvider>
-                                                  </SafeAreaProvider>
-                                                </MutedThreadsProvider>
-                                              </BackgroundNotificationPreferencesProvider>
-                                            </UnreadNotifsProvider>
-                                          </HomeBadgeProvider>
-                                        </HiddenRepliesProvider>
-                                      </SelectedFeedProvider>
-                                    </LoggedOutViewProvider>
-                                  </ModerationOptsProvider>
-                                </LabelDefsProvider>
-                              </MessagesProvider>
-                            </ComposerProvider>
-                          </AgeAssuranceV2Provider>
-                        </LiveEventsProvider>
-                      </PolicyUpdateOverlayProvider>
-                    </QueryProvider>
-                  </AnalyticsFeaturesContext>
-                </Fragment>
-              </ActiveVideoProvider>
-            </VideoVolumeProvider>
-          </Splash>
+          <VideoVolumeProvider>
+            <ActiveVideoProvider>
+              <React.Fragment
+                // Resets the entire tree below when it changes:
+                key={currentAccount?.did}>
+                <QueryProvider currentDid={currentAccount?.did}>
+                  <PolicyUpdateOverlayProvider>
+                    <StatsigProvider>
+                      <AgeAssuranceV2Provider>
+                        <ComposerProvider>
+                          <MessagesProvider>
+                            {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
+                            <LabelDefsProvider>
+                              <ModerationOptsProvider>
+                                <LoggedOutViewProvider>
+                                  <SelectedFeedProvider>
+                                    <HiddenRepliesProvider>
+                                      <HomeBadgeProvider>
+                                        <UnreadNotifsProvider>
+                                          <BackgroundNotificationPreferencesProvider>
+                                            <MutedThreadsProvider>
+                                              <SafeAreaProvider>
+                                                <ProgressGuideProvider>
+                                                  <ServiceConfigProvider>
+                                                    <EmailVerificationProvider>
+                                                      <HideBottomBarBorderProvider>
+                                                        <IntentDialogProvider>
+                                                          <Shell />
+                                                          <ToastOutlet />
+                                                        </IntentDialogProvider>
+                                                      </HideBottomBarBorderProvider>
+                                                    </EmailVerificationProvider>
+                                                  </ServiceConfigProvider>
+                                                </ProgressGuideProvider>
+                                              </SafeAreaProvider>
+                                            </MutedThreadsProvider>
+                                          </BackgroundNotificationPreferencesProvider>
+                                        </UnreadNotifsProvider>
+                                      </HomeBadgeProvider>
+                                    </HiddenRepliesProvider>
+                                  </SelectedFeedProvider>
+                                </LoggedOutViewProvider>
+                              </ModerationOptsProvider>
+                            </LabelDefsProvider>
+                          </MessagesProvider>
+                        </ComposerProvider>
+                      </AgeAssuranceV2Provider>
+                    </StatsigProvider>
+                  </PolicyUpdateOverlayProvider>
+                </QueryProvider>
+              </React.Fragment>
+            </ActiveVideoProvider>
+          </VideoVolumeProvider>
        </ContextMenuProvider>
      </ThemeProvider>
    </Alf>
@@ -194,14 +171,14 @@ function InnerApp() {
 function App() {
  const [isReady, setReady] = useState(false)

-  useEffect(() => {
-    Promise.all([initPersistedState(), Geo.resolve(), setupDeviceId]).then(() =>
+  React.useEffect(() => {
+    Promise.all([initPersistedState(), Geo.resolve()]).then(() =>
      setReady(true),
    )
  }, [])

  if (!isReady) {
-    return null
+    return <Splash isReady />
  }

  /*
@@ -210,33 +187,29 @@ function App() {
   */
  return (
    <Geo.Provider>
-      <AppConfigProvider>
-        <A11yProvider>
-          <OnboardingProvider>
-            <AnalyticsContext>
-              <SessionProvider>
-                <PrefsStateProvider>
-                  <I18nProvider>
-                    <ShellStateProvider>
-                      <ModalStateProvider>
-                        <DialogStateProvider>
-                          <LightboxStateProvider>
-                            <PortalProvider>
-                              <StarterPackProvider>
-                                <InnerApp />
-                              </StarterPackProvider>
-                            </PortalProvider>
-                          </LightboxStateProvider>
-                        </DialogStateProvider>
-                      </ModalStateProvider>
-                    </ShellStateProvider>
-                  </I18nProvider>
-                </PrefsStateProvider>
-              </SessionProvider>
-            </AnalyticsContext>
-          </OnboardingProvider>
-        </A11yProvider>
-      </AppConfigProvider>
+      <A11yProvider>
+        <OnboardingProvider>
+          <SessionProvider>
+            <PrefsStateProvider>
+              <I18nProvider>
+                <ShellStateProvider>
+                  <ModalStateProvider>
+                    <DialogStateProvider>
+                      <LightboxStateProvider>
+                        <PortalProvider>
+                          <StarterPackProvider>
+                            <InnerApp />
+                          </StarterPackProvider>
+                        </PortalProvider>
+                      </LightboxStateProvider>
+                    </DialogStateProvider>
+                  </ModalStateProvider>
+                </ShellStateProvider>
+              </I18nProvider>
+            </PrefsStateProvider>
+          </SessionProvider>
+        </OnboardingProvider>
+      </A11yProvider>
    </Geo.Provider>
  )
 }
@@ -1,8 +1,8 @@
 import {type JSX, useCallback, useRef} from 'react'
-import * as Linking from 'expo-linking'
+import {Linking} from 'react-native'
 import * as Notifications from 'expo-notifications'
 import {i18n, type MessageDescriptor} from '@lingui/core'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {
  type BottomTabBarProps,
  createBottomTabNavigator,
@@ -28,7 +28,7 @@ import {
  storePayloadForAccountSwitch,
 } from '#/lib/hooks/useNotificationHandler'
 import {useWebScrollRestoration} from '#/lib/hooks/useWebScrollRestoration'
-import {useCallOnce} from '#/lib/once'
+import {logger as notyLogger} from '#/lib/notifications/util'
 import {buildStateObject} from '#/lib/routes/helpers'
 import {
  type AllNavigatorParams,
@@ -38,11 +38,13 @@ import {
  type MessagesTabNavigatorParams,
  type MyProfileTabNavigatorParams,
  type NotificationsTabNavigatorParams,
-  type RouteParams,
  type SearchTabNavigatorParams,
-  type State,
 } from '#/lib/routes/types'
+import {type RouteParams, type State} from '#/lib/routes/types'
+import {attachRouteToLogEvents, logEvent} from '#/lib/statsig/statsig'
 import {bskyTitle} from '#/lib/strings/headings'
+import {logger} from '#/logger'
+import {isNative, isWeb} from '#/platform/detection'
 import {useUnreadNotifications} from '#/state/queries/notifications/unread'
 import {useSession} from '#/state/session'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
@@ -136,9 +138,6 @@ import {
  EmailDialogScreenID,
  useEmailDialogControl,
 } from '#/components/dialogs/EmailDialog'
-import {useAnalytics} from '#/analytics'
-import {setNavigationMetadata} from '#/analytics/metadata'
-import {IS_LIQUID_GLASS, IS_NATIVE, IS_WEB} from '#/env'
 import {router} from '#/routes'
 import {Referrer} from '../modules/expo-bluesky-swiss-army'

@@ -685,30 +684,10 @@ function screenOptions(t: Theme) {
 function HomeTabNavigator() {
  const t = useTheme()

-  const BLURRED_SCROLL_EDGE_EFFECT = IS_LIQUID_GLASS
-    ? ({
-        headerShown: true,
-        headerTransparent: true,
-        headerTitle: '',
-        headerBackVisible: false,
-        scrollEdgeEffects: {
-          top: 'soft',
-        },
-      } as const)
-    : {}
-
  return (
    <HomeTab.Navigator screenOptions={screenOptions(t)} initialRouteName="Home">
-      <HomeTab.Screen
-        name="Home"
-        getComponent={() => HomeScreen}
-        options={BLURRED_SCROLL_EDGE_EFFECT}
-      />
-      <HomeTab.Screen
-        name="Start"
-        getComponent={() => HomeScreen}
-        options={BLURRED_SCROLL_EDGE_EFFECT}
-      />
+      <HomeTab.Screen name="Home" getComponent={() => HomeScreen} />
+      <HomeTab.Screen name="Start" getComponent={() => HomeScreen} />
      {commonScreens(HomeTab as typeof Flat)}
    </HomeTab.Navigator>
  )
@@ -863,11 +842,11 @@ const LINKING = {
    // native, since the home tab and the home screen are defined as initial routes, we don't need to return a state
    // since it will be created by react-navigation.
    if (path.includes('intent/')) {
-      if (IS_NATIVE) return
+      if (isNative) return
      return buildStateObject('Flat', 'Home', params)
    }

-    if (IS_NATIVE) {
+    if (isNative) {
      if (name === 'Search') {
        return buildStateObject('SearchTab', 'Search', params)
      }
@@ -894,17 +873,19 @@ const LINKING = {
  },
 } satisfies LinkingOptions<AllNavigatorParams>

+/**
+ * Used to ensure we don't handle the same notification twice
+ */
+let lastHandledNotificationDateDedupe: number | undefined
+
 function RoutesContainer({children}: React.PropsWithChildren<{}>) {
-  const ax = useAnalytics()
-  const notyLogger = ax.logger.useChild(ax.logger.Context.Notifications)
  const theme = useColorSchemeStyle(DefaultTheme, DarkTheme)
  const {currentAccount, accounts} = useSession()
  const {onPressSwitchAccount} = useAccountSwitcher()
  const {setShowLoggedOut} = useLoggedOutViewControls()
-  const previousScreen = useRef<string | undefined>(undefined)
+  const prevLoggedRouteName = useRef<string | undefined>(undefined)
  const emailDialogControl = useEmailDialogControl()
  const closeAllActiveElements = useCloseAllActiveElements()
-  const linkingUrl = Linking.useLinkingURL()

  /**
   * Handle navigation to a conversation, or prepares for account switch.
@@ -939,36 +920,36 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
    },
  )

-  function handlePushNotificationEntry() {
-    if (!IS_NATIVE) return
+  async function handlePushNotificationEntry() {
+    if (!isNative) return

-    // intent urls are handled by `useIntentHandler`
-    if (linkingUrl) return
+    // deep links take precedence - on android,
+    // getLastNotificationResponseAsync returns a "notification"
+    // that is actually a deep link. avoid handling it twice -sfn
+    if (await Linking.getInitialURL()) {
+      return
+    }

-    const notificationResponse = Notifications.getLastNotificationResponse()
+    /**
+     * The notification that caused the app to open, if applicable
+     */
+    const response = await Notifications.getLastNotificationResponseAsync()

-    if (notificationResponse) {
-      notyLogger.debug(`handlePushNotificationEntry: response`, {
-        response: notificationResponse,
-      })
+    if (response) {
+      notyLogger.debug(`handlePushNotificationEntry: response`, {response})

-      // Clear the last notification response to ensure it's not used again
-      try {
-        Notifications.clearLastNotificationResponse()
-      } catch (error) {
-        notyLogger.error(
-          `handlePushNotificationEntry: error clearing notification response`,
-          {error},
-        )
-      }
+      if (response.notification.date === lastHandledNotificationDateDedupe)
+        return
+      lastHandledNotificationDateDedupe = response.notification.date

-      const payload = getNotificationPayload(notificationResponse.notification)
+      const payload = getNotificationPayload(response.notification)

      if (payload) {
-        ax.metric('notifications:openApp', {
-          reason: payload.reason,
-          causedBoot: true,
-        })
+        notyLogger.metric(
+          'notifications:openApp',
+          {reason: payload.reason, causedBoot: true},
+          {statsig: false},
+        )

        if (payload.reason === 'chat-message') {
          handleChatMessage(payload)
@@ -992,72 +973,47 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
    }
  }

-  const onNavigationReady = useCallOnce(() => {
-    const currentScreen = getCurrentRouteName()
-    setNavigationMetadata({
-      previousScreen: currentScreen,
-      currentScreen,
-    })
-    previousScreen.current = currentScreen
-
-    handlePushNotificationEntry()
-
-    ax.metric('router:navigate', {})
-
+  function onReady() {
+    prevLoggedRouteName.current = getCurrentRouteName()
    if (currentAccount && shouldRequestEmailConfirmation(currentAccount)) {
      emailDialogControl.open({
        id: EmailDialogScreenID.VerificationReminder,
      })
      snoozeEmailConfirmationPrompt()
    }
-
-    ax.metric('init', {
-      initMs: Math.round(
-        // @ts-ignore Emitted by Metro in the bundle prelude
-        performance.now() - global.__BUNDLE_START_TIME__,
-      ),
-    })
-
-    if (IS_WEB) {
-      const referrerInfo = Referrer.getReferrerInfo()
-      if (referrerInfo && referrerInfo.hostname !== 'bsky.app') {
-        ax.metric('deepLink:referrerReceived', {
-          to: window.location.href,
-          referrer: referrerInfo?.referrer,
-          hostname: referrerInfo?.hostname,
-        })
-      }
-    }
-
-    // temp, just testing
-    void ax.features.enabled(ax.features.AATest)
-  })
+  }

  return (
-    <NavigationContainer
-      ref={navigationRef}
-      linking={LINKING}
-      theme={theme}
-      onStateChange={() => {
-        const currentScreen = getCurrentRouteName()
-        // do this before metric
-        setNavigationMetadata({
-          previousScreen: previousScreen.current,
-          currentScreen,
-        })
-        ax.metric('router:navigate', {from: previousScreen.current})
-        previousScreen.current = currentScreen
-      }}
-      onReady={onNavigationReady}
-      // WARNING: Implicit navigation to nested navigators is depreciated in React Navigation 7.x
-      // However, there's a fair amount of places we do that, especially in when popping to the top of stacks.
-      // See BottomBar.tsx for an example of how to handle nested navigators in the tabs correctly.
-      // I'm scared of missing a spot (esp. with push notifications etc) so let's enable this legacy behaviour for now.
-      // We will need to confirm we handle nested navigators correctly by the time we migrate to React Navigation 8.x
-      // -sfn
-      navigationInChildEnabled>
-      {children}
-    </NavigationContainer>
+    <>
+      <NavigationContainer
+        ref={navigationRef}
+        linking={LINKING}
+        theme={theme}
+        onStateChange={() => {
+          logger.metric(
+            'router:navigate',
+            {from: prevLoggedRouteName.current},
+            {statsig: false},
+          )
+          prevLoggedRouteName.current = getCurrentRouteName()
+        }}
+        onReady={() => {
+          attachRouteToLogEvents(getCurrentRouteName)
+          logModuleInitTime()
+          onReady()
+          logger.metric('router:navigate', {}, {statsig: false})
+          handlePushNotificationEntry()
+        }}
+        // WARNING: Implicit navigation to nested navigators is depreciated in React Navigation 7.x
+        // However, there's a fair amount of places we do that, especially in when popping to the top of stacks.
+        // See BottomBar.tsx for an example of how to handle nested navigators in the tabs correctly.
+        // I'm scared of missing a spot (esp. with push notifications etc) so let's enable this legacy behaviour for now.
+        // We will need to confirm we handle nested navigators correctly by the time we migrate to React Navigation 8.x
+        // -sfn
+        navigationInChildEnabled>
+        {children}
+      </NavigationContainer>
+    </>
  )
 }

@@ -1113,7 +1069,7 @@ function reset(): Promise<void> {
    navigationRef.dispatch(
      CommonActions.reset({
        index: 0,
-        routes: [{name: IS_NATIVE ? 'HomeTab' : 'Home'}],
+        routes: [{name: isNative ? 'HomeTab' : 'Home'}],
      }),
    )
    return Promise.race([
@@ -1131,6 +1087,44 @@ function reset(): Promise<void> {
  }
 }

+let didInit = false
+function logModuleInitTime() {
+  if (didInit) {
+    return
+  }
+  didInit = true
+
+  const initMs = Math.round(
+    // @ts-ignore Emitted by Metro in the bundle prelude
+    performance.now() - global.__BUNDLE_START_TIME__,
+  )
+  console.log(`Time to first paint: ${initMs} ms`)
+  logEvent('init', {
+    initMs,
+  })
+
+  if (isWeb) {
+    const referrerInfo = Referrer.getReferrerInfo()
+    if (referrerInfo && referrerInfo.hostname !== 'bsky.app') {
+      logEvent('deepLink:referrerReceived', {
+        to: window.location.href,
+        referrer: referrerInfo?.referrer,
+        hostname: referrerInfo?.hostname,
+      })
+    }
+  }
+
+  if (__DEV__) {
+    // This log is noisy, so keep false committed
+    const shouldLog = false
+    // Relies on our patch to polyfill.js in metro-runtime
+    const initLogs = (global as any).__INIT_LOGS__
+    if (shouldLog && Array.isArray(initLogs)) {
+      console.log(initLogs.join('\n'))
+    }
+  }
+}
+
 export {
  FlatNavigator,
  navigate,
@@ -21,9 +21,9 @@ import * as SplashScreen from 'expo-splash-screen'

 import {Logotype} from '#/view/icons/Logotype'
 // @ts-ignore
-import splashImagePointer from '../assets/splash/splash.png'
+import splashImagePointer from '../assets/splash.png'
 // @ts-ignore
-import darkSplashImagePointer from '../assets/splash/splash-dark.png'
+import darkSplashImagePointer from '../assets/splash-dark.png'
 const splashImageUri = RNImage.resolveAssetSource(splashImagePointer).uri
 const darkSplashImageUri = RNImage.resolveAssetSource(
  darkSplashImagePointer,
@@ -146,8 +146,7 @@ export function Splash(props: React.PropsWithChildren<Props>) {
            withTiming(
              1,
              {duration: 400, easing: Easing.out(Easing.cubic)},
-              () => {
-                'worklet'
+              async () => {
                // set these values to check animation at specific point
                outroLogo.set(() =>
                  withTiming(
@@ -4,94 +4,26 @@
 * the app is ready to go.
 */

-import {useEffect, useRef, useState} from 'react'
+import {View} from 'react-native'
 import Svg, {Path} from 'react-native-svg'

-import {atoms as a, flatten} from '#/alf'
+import {atoms as a} from '#/alf'

 const size = 100
 const ratio = 57 / 64

-export function Splash({
-  isReady,
-  children,
-}: React.PropsWithChildren<{
-  isReady: boolean
-}>) {
-  const [isAnimationComplete, setIsAnimationComplete] = useState(false)
-  const splashRef = useRef<HTMLDivElement>(null)
-
-  // hide the static one that's baked into the HTML - gets replaced by our React version below
-  useEffect(() => {
-    // double rAF ensures that the React version gets painted first
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        const splash = document.getElementById('splash')
-        if (splash) {
-          splash.remove()
-        }
-      })
-    })
-  }, [])
-
-  // when ready, we fade/scale out
-  useEffect(() => {
-    if (!isReady) return
-
-    const reduceMotion = window.matchMedia(
-      '(prefers-reduced-motion: reduce)',
-    ).matches
-    const node = splashRef.current
-    if (!node || reduceMotion) {
-      setIsAnimationComplete(true)
-      return
-    }
-
-    const animation = node.animate(
-      [
-        {opacity: 1, transform: 'scale(1)'},
-        {opacity: 0, transform: 'scale(1.5)'},
-      ],
-      {
-        duration: 300,
-        easing: 'cubic-bezier(0.25, 0.46, 0.45, 0.94)',
-        fill: 'forwards',
-      },
-    )
-    animation.onfinish = () => setIsAnimationComplete(true)
-
-    return () => {
-      animation.cancel()
-    }
-  }, [isReady])
-
+export function Splash() {
  return (
-    <>
-      {isReady && children}
-
-      {!isAnimationComplete && (
-        <div
-          ref={splashRef}
-          style={flatten([
-            a.fixed,
-            a.inset_0,
-            a.flex,
-            a.align_center,
-            a.justify_center,
-            // to compensate for the `top: -50px` below
-            {transformOrigin: 'center calc(50% - 50px)'},
-          ])}>
-          <Svg
-            fill="none"
-            viewBox="0 0 64 57"
-            style={[a.relative, {width: size, height: size * ratio, top: -50}]}>
-            <Path
-              fill="#006AFF"
-              d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805ZM50.127 3.805C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745Z"
-            />
-          </Svg>
-        </div>
-      )}
-    </>
+    <View style={[a.fixed, a.inset_0, a.align_center, a.justify_center]}>
+      <Svg
+        fill="none"
+        viewBox="0 0 64 57"
+        style={[a.relative, {width: size, height: size * ratio, top: -50}]}>
+        <Path
+          fill="#006AFF"
+          d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805ZM50.127 3.805C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745Z"
+        />
+      </Svg>
+    </View>
  )
 }
@@ -1,15 +1,17 @@
 import {useCallback, useEffect} from 'react'
 import {ScrollView, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
+import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'

 import {
  SupportCode,
  useCreateSupportLink,
 } from '#/lib/hooks/useCreateSupportLink'
 import {dateDiff, useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
+import {logger} from '#/logger'
+import {isWeb} from '#/platform/detection'
+import {isNative} from '#/platform/detection'
 import {useIsBirthdateUpdateAllowed} from '#/state/birthdate'
 import {useSessionApi} from '#/state/session'
 import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
@@ -36,8 +38,6 @@ import {
  isLegacyBirthdateBug,
  useAgeAssuranceRegionConfig,
 } from '#/ageAssurance/util'
-import {useAnalytics} from '#/analytics'
-import {IS_NATIVE, IS_WEB} from '#/env'
 import {useDeviceGeolocationApi} from '#/geolocation'

 const textStyles = [a.text_md, a.leading_snug]
@@ -45,7 +45,6 @@ const textStyles = [a.text_md, a.leading_snug]
 export function NoAccessScreen() {
  const t = useTheme()
  const {_} = useLingui()
-  const ax = useAnalytics()
  const {gtPhone} = useBreakpoints()
  const insets = useSafeAreaInsets()
  const birthdateControl = useDialogControl()
@@ -64,8 +63,8 @@ export function NoAccessScreen() {

  useEffect(() => {
    // just counting overall hits here
-    ax.metric(`blockedGeoOverlay:shown`, {})
-    ax.metric(`ageAssurance:noAccessScreen:shown`, {
+    logger.metric(`blockedGeoOverlay:shown`, {})
+    logger.metric(`ageAssurance:noAccessScreen:shown`, {
      accountCreatedAt: data?.accountCreatedAt || 'unknown',
      isAARegion,
      hasDeclaredAge,
@@ -75,7 +74,7 @@ export function NoAccessScreen() {
  }, [])

  const onPressLogout = useCallback(() => {
-    if (IS_WEB) {
+    if (isWeb) {
      // We're switching accounts, which remounts the entire app.
      // On mobile, this gets us Home, but on the web we also need reset the URL.
      // We can't change the URL via a navigate() call because the navigator
@@ -104,7 +103,10 @@ export function NoAccessScreen() {
            label={_(msg`Click here to update your birthdate`)}
            style={[textStyles]}
            {...createStaticClick(() => {
-              ax.metric('ageAssurance:noAccessScreen:openBirthdateDialog', {})
+              logger.metric(
+                'ageAssurance:noAccessScreen:openBirthdateDialog',
+                {},
+              )
              birthdateControl.open()
            })}>
            clicking here
@@ -137,7 +139,7 @@ export function NoAccessScreen() {
          contentContainerStyle={[
            a.px_2xl,
            {
-              paddingTop: IS_WEB
+              paddingTop: isWeb
                ? a.p_5xl.padding
                : insets.top + a.p_2xl.padding,
              paddingBottom: 100,
@@ -175,19 +177,10 @@ export function NoAccessScreen() {
                        </Trans>
                      </Text>

-                      {!aa.flags.isOverRegionMinAccessAge && (
-                        <Text style={[textStyles]}>
-                          <Trans>
-                            Unfortunately, your declared age indicates that you
-                            are not old enough to access Bluesky in your region.
-                          </Trans>
-                        </Text>
-                      )}
-
                      {!isBlocked && birthdateUpdateText}
                    </View>

-                    {aa.flags.isOverRegionMinAccessAge && <AccessSection />}
+                    <AccessSection />
                  </>
                ) : (
                  <View style={[a.gap_lg]}>
@@ -270,7 +263,6 @@ export function NoAccessScreen() {
 function AccessSection() {
  const t = useTheme()
  const {_, i18n} = useLingui()
-  const ax = useAnalytics()
  const control = useDialogControl()
  const appealControl = Dialog.useDialogControl()
  const locationControl = Dialog.useDialogControl()
@@ -304,7 +296,7 @@ function AccessSection() {
                label={_(msg`Contact our moderation team`)}
                {...createStaticClick(() => {
                  appealControl.open()
-                  ax.metric('ageAssurance:appealDialogOpen', {})
+                  logger.metric('ageAssurance:appealDialogOpen', {})
                })}>
                contact our moderation team
              </SimpleInlineLinkText>{' '}
@@ -320,7 +312,7 @@ function AccessSection() {
                color={hasInitiated ? 'secondary' : 'primary'}
                onPress={() => {
                  control.open()
-                  ax.metric('ageAssurance:initDialogOpen', {
+                  logger.metric('ageAssurance:initDialogOpen', {
                    hasInitiatedPreviously: hasInitiated,
                  })
                }}>
@@ -358,7 +350,7 @@ function AccessSection() {
        )}

        <View style={[a.gap_xs]}>
-          {IS_NATIVE && (
+          {isNative && (
            <>
              <Admonition>
                <Trans>
@@ -9,13 +9,14 @@ import {
 } from 'react'
 import {Dimensions, View} from 'react-native'
 import * as Linking from 'expo-linking'
-import {msg} from '@lingui/core/macro'
+import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'

 import {retry} from '#/lib/async/retry'
 import {wait} from '#/lib/async/wait'
 import {parseLinkingUrl} from '#/lib/parseLinkingUrl'
+import {isWeb} from '#/platform/detection'
+import {isIOS} from '#/platform/detection'
 import {useAgent, useSession} from '#/state/session'
 import {atoms as a, platform, useBreakpoints, useTheme} from '#/alf'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
@@ -26,8 +27,7 @@ import {CircleInfo_Stroke2_Corner0_Rounded as ErrorIcon} from '#/components/icon
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {refetchAgeAssuranceServerState} from '#/ageAssurance'
-import {useAnalytics} from '#/analytics'
-import {IS_IOS, IS_WEB} from '#/env'
+import {logger} from '#/ageAssurance'

 export type RedirectOverlayState = {
  result: 'success' | 'unknown'
@@ -92,7 +92,7 @@ export function Provider({children}: {children?: React.ReactNode}) {
      actorDid: params.get('actorDid') ?? undefined,
    })

-    if (IS_WEB) {
+    if (isWeb) {
      // Clear the URL parameters so they don't re-trigger
      history.pushState(null, '', '/')
    }
@@ -145,7 +145,7 @@ export function RedirectOverlay() {
          // setting a zIndex when using FullWindowOverlay on iOS
          // means the taps pass straight through to the underlying content (???)
          // so don't set it on iOS. FullWindowOverlay already does the job.
-          !IS_IOS && {zIndex: 9999},
+          !isIOS && {zIndex: 9999},
          t.atoms.bg,
          gtMobile ? a.p_2xl : a.p_xl,
          a.align_center,
@@ -174,7 +174,6 @@ export function RedirectOverlay() {

 function Inner() {
  const t = useTheme()
-  const ax = useAnalytics()
  const {_} = useLingui()
  const agent = useAgent()
  const polling = useRef(false)
@@ -188,7 +187,7 @@ function Inner() {

    polling.current = true

-    ax.metric('ageAssurance:redirectDialogOpen', {})
+    logger.metric('ageAssurance:redirectDialogOpen', {})

    wait(
      3e3,
@@ -219,18 +218,18 @@ function Inner() {

        setSuccess(true)

-        ax.metric('ageAssurance:redirectDialogSuccess', {})
+        logger.metric('ageAssurance:redirectDialogSuccess', {})
      })
      .catch(() => {
        if (unmounted.current) return
        setError(true)
-        ax.metric('ageAssurance:redirectDialogFail', {})
+        logger.metric('ageAssurance:redirectDialogFail', {})
      })

    return () => {
      unmounted.current = true
    }
-  }, [ax, agent])
+  }, [agent])

  if (success) {
    return (
@@ -6,6 +6,7 @@ import {
  AtpAgent,
  getAgeAssuranceRegionConfig,
 } from '@atproto/api'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 import {createAsyncStoragePersister} from '@tanstack/query-async-storage-persister'
 import {focusManager, QueryClient, useQuery} from '@tanstack/react-query'
 import {persistQueryClient} from '@tanstack/react-query-persist-client'
@@ -13,7 +14,6 @@ import debounce from 'lodash.debounce'

 import {networkRetry} from '#/lib/async/retry'
 import {PUBLIC_BSKY_SERVICE} from '#/lib/constants'
-import {createPersistedQueryStorage} from '#/lib/persisted-query-storage'
 import {getAge} from '#/lib/strings/time'
 import {
  hasSnoozedBirthdateUpdateForDid,
@@ -45,7 +45,7 @@ const qc = new QueryClient({
  },
 })
 const persister = createAsyncStoragePersister({
-  storage: createPersistedQueryStorage('age-assurance'),
+  storage: AsyncStorage,
  key: 'age-assurance-query-client',
 })
 const [, cacheHydrationPromise] = persistQueryClient({
@@ -136,15 +136,6 @@ export async function prefetchConfig() {
    }
  })
 }
-export async function refetchConfig() {
-  logger.debug(`refetchConfig: fetching...`)
-  const res = await getConfig()
-  qc.setQueryData<AppBskyAgeassuranceGetConfig.OutputSchema>(
-    configQueryKey,
-    res,
-  )
-  return res
-}
 export function useConfigQuery() {
  return useQuery(
    {
@@ -155,10 +146,6 @@ export function useConfigQuery() {
       * @see https://tanstack.com/query/latest/docs/framework/react/guides/initial-query-data#initial-data-from-the-cache-with-initialdataupdatedat
       */
      staleTime: IS_DEV ? 5e3 : 1000 * 60 * 60,
-      /**
-       * N.B. if prefetch failed above, we'll have no `initialData`, and this
-       * query will run on startup.
-       */
      initialData: getConfigFromCache(),
      initialDataUpdatedAt: () =>
        qc.getQueryState(configQueryKey)?.dataUpdatedAt,
@@ -17,32 +17,18 @@ export const geolocation: Geolocation | undefined = enabled
    }
  : undefined

-const deviceGeolocationEnabled = false || IS_E2E
-export const deviceGeolocation: Geolocation | undefined =
-  enabled && deviceGeolocationEnabled
-    ? {
-        countryCode: 'AA',
-        regionCode: undefined,
-      }
-    : undefined
+export const deviceGeolocation: Geolocation | undefined = enabled
+  ? {
+      countryCode: 'AA',
+      regionCode: undefined,
+    }
+  : undefined

 export const config: AppBskyAgeassuranceDefs.Config = {
  regions: [
    {
      countryCode: 'AA',
      regionCode: undefined,
-      minAccessAge: 13,
-      rules: [
-        {
-          $type: ids.Default,
-          access: 'full',
-        },
-      ],
-    },
-    {
-      countryCode: 'BB',
-      regionCode: undefined,
-      minAccessAge: 16,
      rules: [
        {
          $type: ids.Default,
@@ -14,11 +14,7 @@ import {
  type AgeAssuranceState,
  AgeAssuranceStatus,
 } from '#/ageAssurance/types'
-import {
-  isUnderAge,
-  MIN_ACCESS_AGE,
-  useAgeAssuranceRegionConfigWithFallback,
-} from '#/ageAssurance/util'
+import {isUserUnderAdultAge} from '#/ageAssurance/util'

 export {
  prefetchConfig as prefetchAgeAssuranceConfig,
@@ -28,7 +24,6 @@ export {
  usePatchServerState as usePatchAgeAssuranceServerState,
 } from '#/ageAssurance/data'
 export {logger} from '#/ageAssurance/logger'
-export {MIN_ACCESS_AGE} from '#/ageAssurance/util'

 const AgeAssuranceStateContext = createContext<{
  Access: typeof AgeAssuranceAccess
@@ -37,8 +32,6 @@ const AgeAssuranceStateContext = createContext<{
  flags: {
    adultContentDisabled: boolean
    chatDisabled: boolean
-    isOverRegionMinAccessAge: boolean
-    isOverAppMinAccessAge: boolean
  }
 }>({
  Access: AgeAssuranceAccess,
@@ -51,8 +44,6 @@ const AgeAssuranceStateContext = createContext<{
  flags: {
    adultContentDisabled: false,
    chatDisabled: false,
-    isOverRegionMinAccessAge: false,
-    isOverAppMinAccessAge: false,
  },
 })

@@ -78,7 +69,6 @@ export function Provider({children}: {children: React.ReactNode}) {
 function InnerProvider({children}: {children: React.ReactNode}) {
  const state = useAgeAssuranceState()
  const {data} = useAgeAssuranceDataContext()
-  const config = useAgeAssuranceRegionConfigWithFallback()
  const getAndRegisterPushToken = useGetAndRegisterPushToken()

  const handleAccessUpdate = useCallback(
@@ -99,17 +89,11 @@ function InnerProvider({children}: {children: React.ReactNode}) {
    <AgeAssuranceStateContext.Provider
      value={useMemo(() => {
        const chatDisabled = state.access !== AgeAssuranceAccess.Full
-        const isUnderAdultAge = data?.birthdate
-          ? isUnderAge(data.birthdate, 18)
+        const isUnderage = data?.birthdate
+          ? isUserUnderAdultAge(data.birthdate)
          : true
-        const isOverRegionMinAccessAge = data?.birthdate
-          ? !isUnderAge(data.birthdate, config.minAccessAge)
-          : false
-        const isOverAppMinAccessAge = data?.birthdate
-          ? !isUnderAge(data.birthdate, MIN_ACCESS_AGE)
-          : false
        const adultContentDisabled =
-          state.access !== AgeAssuranceAccess.Full || isUnderAdultAge
+          state.access !== AgeAssuranceAccess.Full || isUnderage
        return {
          Access: AgeAssuranceAccess,
          Status: AgeAssuranceStatus,
@@ -117,11 +101,9 @@ function InnerProvider({children}: {children: React.ReactNode}) {
          flags: {
            adultContentDisabled,
            chatDisabled,
-            isOverRegionMinAccessAge,
-            isOverAppMinAccessAge,
          },
        }
-      }, [state, data, config])}>
+      }, [state, data])}>
      {children}
    </AgeAssuranceStateContext.Provider>
  )
@@ -30,19 +30,12 @@ export function useAgeAssuranceState(): AgeAssuranceState {
        access: AgeAssuranceAccess.Safe,
      }

-    /**
-     * This can happen if the prefetch fails (such as due to network issues).
-     * The query handler will try it again, but if it continues to fail, of
-     * course we won't have config.
-     *
-     * In this case, fail open to avoid blocking users.
-     */
+    // should never happen, but need to guard
    if (!config) {
      logger.warn('useAgeAssuranceState: missing config')
      return {
        status: AgeAssuranceStatus.Unknown,
-        access: AgeAssuranceAccess.Safe,
-        error: 'config',
+        access: AgeAssuranceAccess.Unknown,
      }
    }

@@ -18,7 +18,6 @@ export type AgeAssuranceState = {
  lastInitiatedAt?: string
  status: AgeAssuranceStatus
  access: AgeAssuranceAccess
-  error?: 'config' // maybe other specific cases in the future
 }

 export function parseStatusFromString(raw: string) {
@@ -12,7 +12,6 @@ import {isNetworkError} from '#/lib/hooks/useCleanError'
 import {useAgent} from '#/state/session'
 import {usePatchAgeAssuranceServerState} from '#/ageAssurance'
 import {logger} from '#/ageAssurance/logger'
-import {useAnalytics} from '#/analytics'
 import {BLUESKY_PROXY_DID} from '#/env'
 import {useGeolocation} from '#/geolocation'

@@ -20,7 +19,6 @@ const IS_DEV_ENV = BLUESKY_PROXY_DID !== PUBLIC_APPVIEW_DID
 const APPVIEW = IS_DEV_ENV ? DEV_ENV_APPVIEW : PUBLIC_APPVIEW

 export function useBeginAgeAssurance() {
-  const ax = useAnalytics()
  const agent = useAgent()
  const geolocation = useGeolocation()
  const patchAgeAssuranceStateResponse = usePatchAgeAssuranceServerState()
@@ -50,11 +48,15 @@ export function useBeginAgeAssurance() {
      appView.sessionManager.session.accessJwt = token
      appView.sessionManager.session.refreshJwt = ''

-      ax.metric('ageAssurance:api:begin', {
-        platform: Platform.OS,
-        countryCode,
-        regionCode,
-      })
+      logger.metric(
+        'ageAssurance:api:begin',
+        {
+          platform: Platform.OS,
+          countryCode,
+          regionCode,
+        },
+        {statsig: false},
+      )

      /*
       * 2s wait is good actually. Email sending takes a hot sec and this helps
@@ -12,23 +12,7 @@ import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
 import {AgeAssuranceAccess} from '#/ageAssurance/types'
 import {type Geolocation, useGeolocation} from '#/geolocation'

-export const MIN_ACCESS_AGE = 13
-const FALLBACK_REGION_CONFIG: AppBskyAgeassuranceDefs.ConfigRegion = {
-  countryCode: '*',
-  regionCode: undefined,
-  minAccessAge: MIN_ACCESS_AGE,
-  rules: [
-    {
-      $type: ids.IfDeclaredOverAge,
-      age: MIN_ACCESS_AGE,
-      access: AgeAssuranceAccess.Full,
-    },
-    {
-      $type: ids.Default,
-      access: AgeAssuranceAccess.None,
-    },
-  ],
-}
+const DEFAULT_MIN_AGE = 13

 /**
 * Get age assurance region config based on geolocation, with fallback to
@@ -46,7 +30,23 @@ export function getAgeAssuranceRegionConfigWithFallback(
    regionCode: geolocation.regionCode,
  })

-  return region || FALLBACK_REGION_CONFIG
+  return (
+    region || {
+      countryCode: '*',
+      regionCode: undefined,
+      rules: [
+        {
+          $type: ids.IfDeclaredOverAge,
+          age: DEFAULT_MIN_AGE,
+          access: AgeAssuranceAccess.Full,
+        },
+        {
+          $type: ids.Default,
+          access: AgeAssuranceAccess.None,
+        },
+      ],
+    }
+  )
 }

 /**
@@ -67,14 +67,6 @@ export function useAgeAssuranceRegionConfig() {
  }, [config, geolocation])
 }

-/**
- * Hook to get the age assurance region config based on current geolocation.
- * Falls back to our app defaults if no region config is found.
- */
-export function useAgeAssuranceRegionConfigWithFallback() {
-  return useAgeAssuranceRegionConfig() || FALLBACK_REGION_CONFIG
-}
-
 /**
 * Some users may have erroneously set their birth date to the current date
 * if one wasn't set on their account. We previously didn't do validation on
@@ -86,11 +78,15 @@ export function isLegacyBirthdateBug(birthDate: string) {
 }

 /**
- * Returns whether the date (converted to an age as a whole integer) is under
- * the provided minimum age.
+ * Returns whether the user is under the minimum age required to use the app.
+ * This applies to all regions.
 */
-export function isUnderAge(birthDate: string, age: number) {
-  return getAge(new Date(birthDate)) < age
+export function isUserUnderMinimumAge(birthDate: string) {
+  return getAge(new Date(birthDate)) < DEFAULT_MIN_AGE
+}
+
+export function isUserUnderAdultAge(birthDate: string) {
+  return getAge(new Date(birthDate)) < 18
 }

 export function getBirthdateStringFromAge(age: number) {
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M9 17a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm-6-7a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4ZM9 3a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4Z"/></svg>`
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 64 64"><path fill="#000" d="M32.457 7c1.68 0 3.29.668 4.478 1.855L49.813 21.73a6.33 6.33 0 0 1 1.854 4.479v24.458A6.333 6.333 0 0 1 45.333 57H18.666a6.334 6.334 0 0 1-6.333-6.333V13.333A6.334 6.334 0 0 1 18.666 7h13.791ZM18.666 9a4.334 4.334 0 0 0-4.333 4.333v37.334A4.334 4.334 0 0 0 18.666 55h26.667a4.333 4.333 0 0 0 4.333-4.333V26.209c0-.418-.061-.829-.177-1.223a1 1 0 0 1-.155.014H40a6.334 6.334 0 0 1-6.325-6.008l-.008-.326V9.333q0-.08.013-.156A4.3 4.3 0 0 0 32.457 9H18.666Zm18.627 22.293a1 1 0 1 1 1.414 1.414L33.414 38l5.293 5.293a1 1 0 1 1-1.414 1.414L32 39.414l-5.293 5.293a1 1 0 1 1-1.414-1.414L30.586 38l-5.293-5.293a1 1 0 1 1 1.414-1.414L32 36.586l5.293-5.293Zm-1.626-12.627.006.224A4.333 4.333 0 0 0 40 23h8.253L35.667 10.414v8.252Z"/></svg>