4 -> 5

.env.example

@@ -34,8 +34,5 @@ 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=
+# bapp-config web worker URL
+BAPP_CONFIG_DEV_URL=

.eslintrc.js

@@ -35,7 +35,6 @@ module.exports = {
           'Admonition',
           'Admonition.Admonition',
           'Toast.Action',
-          'toast.Action',
           'AgeAssuranceAdmonition',
           'Span',
           'StackedButton',

.github/workflows/build-submit-android.yml

@@ -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: >

.github/workflows/build-submit-ios.yml

@@ -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: >

.github/workflows/bundle-deploy-eas-update.yml

@@ -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

.github/workflows/claude.yml

@@ -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

CLAUDE.md

@@ -1,591 +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
-yarn test               # Run Jest tests
-yarn lint               # Run ESLint
-yarn typecheck          # Run TypeScript type checking
-
-# Internationalization
-yarn intl:extract       # Extract translation strings
-yarn intl:compile       # Compile translations for runtime
-
-# 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)
-├── 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
-```
-
-## 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: `xxs`, `xs`, `sm`, `md`, `lg`, `xl`, `xxl` (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}>
-        <Dialog.Handle />  {/* Native drag handle */}
-        <Dialog.ScrollableInner label={_(msg`My Dialog`)}>
-          <Dialog.Header>
-            <Dialog.HeaderText>Title</Dialog.HeaderText>
-          </Dialog.Header>
-
-          <Text>Dialog content here</Text>
-
-          <Button label="Close" onPress={() => control.close()}>
-            <ButtonText>Close</ButtonText>
-          </Button>
-        </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={X} />
-</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'`
-- `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, Trans, plural} from '@lingui/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
-yarn intl:extract    # Extract new strings to locale files
-yarn intl:compile    # Compile for runtime (required after changes)
-```
-
-## 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)})
-    },
-  })
-}
-```
-
-**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
-```
-
-### 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)
-
-Platform detection:
-```tsx
-import {isWeb, isNative, isIOS, isAndroid} from '#/platform/detection'
-
-if (isNative) {
-  // 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` |

app.config.js

@@ -246,7 +246,7 @@ module.exports = function (_config) {
               compileSdkVersion: 35,
               targetSdkVersion: 35,
               buildToolsVersion: '35.0.0',
-              buildReactNativeFromSource: IS_PRODUCTION,
+              buildReactNativeFromSource: true,
             },
           },
         ],

bskyweb/templates/base.html

@@ -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">

conductor.json

@@ -1,6 +0,0 @@
-{
-    "scripts": {
-        "setup": "yarn install",
-        "run": "yarn web --port $CONDUCTOR_PORT"
-    }
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bsky.app",
-  "version": "1.114.0",
+  "version": "1.113.1",
   "private": true,
   "engines": {
     "node": ">=20"
@@ -73,7 +73,7 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.18.15",
+    "@atproto/api": "^0.18.8",
     "@bitdrift/react-native": "^0.6.8",
     "@braintree/sanitize-url": "^6.0.2",
     "@bsky.app/alf": "^0.1.6",
@@ -96,7 +96,6 @@
     "@haileyok/bluesky-video": "0.3.2",
     "@ipld/dag-cbor": "^9.2.0",
     "@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",
     "@react-native-async-storage/async-storage": "2.2.0",
@@ -156,7 +155,6 @@
     "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",
@@ -227,7 +225,7 @@
     "zod": "^3.20.2"
   },
   "devDependencies": {
-    "@atproto/dev-env": "^0.3.204",
+    "@atproto/dev-env": "^0.3.196",
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@babel/runtime": "^7.26.0",
@@ -285,7 +283,6 @@
     "@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",

patches/@haileyok+bluesky-video+0.3.2.patch

@@ -18,119 +18,3 @@ index 0000000..3b5b864
 @@ -0,0 +1,2 @@
 +# Keep FullscreenActivity from being stripped by R8/ProGuard
 +-keep class expo.modules.blueskyvideo.FullscreenActivity { *; }
-diff --git a/node_modules/@haileyok/bluesky-video/android/src/main/java/expo/modules/blueskyvideo/BlueskyVideoView.kt b/node_modules/@haileyok/bluesky-video/android/src/main/java/expo/modules/blueskyvideo/BlueskyVideoView.kt
-index fdabd84..eda8c7c 100644
---- a/node_modules/@haileyok/bluesky-video/android/src/main/java/expo/modules/blueskyvideo/BlueskyVideoView.kt
-+++ b/node_modules/@haileyok/bluesky-video/android/src/main/java/expo/modules/blueskyvideo/BlueskyVideoView.kt
-@@ -1,8 +1,11 @@
- package expo.modules.blueskyvideo
- 
-+import android.app.Activity
- import android.content.Context
- import android.content.Intent
- import android.graphics.Color
-+import android.os.Build
-+import android.util.Log
- import android.graphics.Rect
- import android.net.Uri
- import android.view.ViewGroup
-@@ -237,9 +240,44 @@ class BlueskyVideoView(
-     // Fullscreen handling
- 
-     fun enterFullscreen(keepDisplayOn: Boolean) {
--        val currentActivity = this.appContext.currentActivity ?: return
-+        val tag = "BlueskyVideo"
-+
-+        Log.d(tag, "enterFullscreen() called - keepDisplayOn=$keepDisplayOn")
-+        Log.d(tag, "  isFullscreen=$isFullscreen, isPlaying=$isPlaying, isMuted=$isMuted")
-+        Log.d(tag, "  player=${player != null}, url=$url")
-+        Log.d(tag, "  isAttachedToWindow=$isAttachedToWindow, isShown=$isShown")
-+        Log.d(tag, "  Android SDK: ${Build.VERSION.SDK_INT}, Device: ${Build.MANUFACTURER} ${Build.MODEL}")
-+
-+        val currentActivity = this.appContext.currentActivity
-+        if (currentActivity == null) {
-+            Log.e(tag, "enterFullscreen() FAILED: currentActivity is null")
-+            Log.e(tag, "  appContext=$appContext")
-+            onError(mapOf("error" to "Cannot enter fullscreen: no current activity"))
-+            return
-+        }
-+
-+        Log.d(tag, "  currentActivity=$currentActivity")
-+        Log.d(tag, "  activity.isFinishing=${currentActivity.isFinishing}")
-+        Log.d(tag, "  activity.isDestroyed=${currentActivity.isDestroyed}")
-+        Log.d(tag, "  activity.lifecycle=${(currentActivity as? androidx.lifecycle.LifecycleOwner)?.lifecycle?.currentState}")
-+        Log.d(tag, "  activity.hasWindowFocus=${currentActivity.hasWindowFocus()}")
-+        Log.d(tag, "  activity.window.isActive=${currentActivity.window?.isActive}")
-+
-+        // Check if activity is in a valid state to start another activity
-+        if (currentActivity.isFinishing) {
-+            Log.e(tag, "enterFullscreen() FAILED: currentActivity is finishing")
-+            onError(mapOf("error" to "Cannot enter fullscreen: activity is finishing"))
-+            return
-+        }
-+
-+        if (currentActivity.isDestroyed) {
-+            Log.e(tag, "enterFullscreen() FAILED: currentActivity is destroyed")
-+            onError(mapOf("error" to "Cannot enter fullscreen: activity is destroyed"))
-+            return
-+        }
- 
-         this.enteredFullscreenMuteState = this.isMuted
-+        Log.d(tag, "  saved enteredFullscreenMuteState=$enteredFullscreenMuteState")
- 
-         // We always want to start with unmuted state and playing. Fire those from here so the
-         // event dispatcher gets called
-@@ -247,18 +285,51 @@ class BlueskyVideoView(
-         if (!this.isPlaying) {
-             this.play()
-         }
-+        Log.d(tag, "  after unmute/play: isPlaying=$isPlaying, isMuted=$isMuted")
- 
-         // Remove the player from this view, but don't null the player!
-         this.playerView.player = null
-+        Log.d(tag, "  detached player from playerView")
- 
-         // create the intent and give it a view
-         val intent = Intent(context, FullscreenActivity::class.java)
-         intent.putExtra("keepDisplayOn", keepDisplayOn)
-         FullscreenActivity.asscVideoView = WeakReference(this)
- 
-+        Log.d(tag, "  intent created: $intent")
-+        Log.d(tag, "  intent.component=${intent.component}")
-+        Log.d(tag, "  intent.flags=${intent.flags} (0x${Integer.toHexString(intent.flags)})")
-+        Log.d(tag, "  context for intent=$context")
-+        Log.d(tag, "  FullscreenActivity.asscVideoView set to WeakReference(this)")
-+
-         // fire the fullscreen event and launch the intent
--        this.isFullscreen = true
--        currentActivity.startActivity(intent)
-+        try {
-+            Log.d(tag, "  calling startActivity()...")
-+            currentActivity.startActivity(intent)
-+            this.isFullscreen = true
-+            Log.d(tag, "  startActivity() SUCCESS - isFullscreen set to true")
-+        } catch (e: Exception) {
-+            Log.e(tag, "enterFullscreen() FAILED: startActivity() threw exception", e)
-+            Log.e(tag, "  exception class: ${e.javaClass.name}")
-+            Log.e(tag, "  exception message: ${e.message}")
-+            Log.e(tag, "  exception cause: ${e.cause}")
-+            e.printStackTrace()
-+
-+            // Restore state since fullscreen failed
-+            this.playerView.player = this.player
-+            Log.d(tag, "  restored player to playerView after failure")
-+
-+            if (this.enteredFullscreenMuteState) {
-+                this.mute()
-+                Log.d(tag, "  restored mute state after failure")
-+            }
-+
-+            onError(mapOf(
-+                "error" to "Failed to enter fullscreen: ${e.message}",
-+                "exceptionClass" to e.javaClass.name,
-+                "exceptionMessage" to (e.message ?: "unknown")
-+            ))
-+        }
-     }
- 
-     fun onExitFullscreen() {

patches/@mattermost+react-native-paste-input+0.8.1.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteTextInputManager.kt b/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteTextInputManager.kt
-index 4ed2307..ede1181 100644
---- a/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteTextInputManager.kt
-+++ b/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteTextInputManager.kt
-@@ -54,7 +54,7 @@ class PasteTextInputManager(context: ReactApplicationContext) : ReactTextInputMa
-   }
- 
-   override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any> {
--    val map = super.getExportedCustomBubblingEventTypeConstants()!!
-+    val map = super.getExportedCustomBubblingEventTypeConstants().toMutableMap()
-     map["onPaste"] = MapBuilder.of(
-       "phasedRegistrationNames",
-       MapBuilder.of("bubbled", "onPaste")

patches/@mattermost+react-native-paste-input+0.8.1.patch.disabled

@@ -1,264 +0,0 @@
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-index e916023..5049c33 100644
---- a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-@@ -4,6 +4,7 @@
- //
- //  Created by Elias Nahum on 04-11-20.
- //  Copyright © 2020 Facebook. All rights reserved.
-+//  Updated to remove parent’s default text view
- //
- 
- #import "PasteInputView.h"
-@@ -12,49 +13,78 @@
- 
- @implementation PasteInputView
- {
--    PasteInputTextView *_backedTextInputView;
-+  // We'll store the custom text view in this ivar
-+  PasteInputTextView *_customBackedTextView;
- }
- 
- - (instancetype)initWithBridge:(RCTBridge *)bridge
- {
-+  // Must call the super’s designated initializer
-   if (self = [super initWithBridge:bridge]) {
--    _backedTextInputView = [[PasteInputTextView alloc] initWithFrame:self.bounds];
--    _backedTextInputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
--    _backedTextInputView.textInputDelegate = self;
-+    // 1. The parent (RCTMultilineTextInputView) has already created
-+    //    its own _backedTextInputView = [RCTUITextView new] in super init.
-+    //    We can remove that subview:
- 
--    [self addSubview:_backedTextInputView];
--  }
-+    id<RCTBackedTextInputViewProtocol> parentInputView = super.backedTextInputView;
-+    if ([parentInputView isKindOfClass:[UIView class]]) {
-+      UIView *parentSubview = (UIView *)parentInputView;
-+      if (parentSubview.superview == self) {
-+        [parentSubview removeFromSuperview];
-+      }
-+    }
- 
-+    // 2. Now create our custom PasteInputTextView
-+    _customBackedTextView = [[PasteInputTextView alloc] initWithFrame:self.bounds];
-+    _customBackedTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-+    _customBackedTextView.textInputDelegate = self;
-+
-+    // Optional: disable inline predictions for iOS 17+
-+    if (@available(iOS 17.0, *)) {
-+      _customBackedTextView.inlinePredictionType = UITextInlinePredictionTypeNo;
-+    }
-+
-+    // 3. Add your custom text view as the only subview
-+    [self addSubview:_customBackedTextView];
-+  }
-   return self;
- }
- 
-+/**
-+ * Override the parent's accessor so that anywhere in RN that calls
-+ * `self.backedTextInputView` will get the custom PasteInputTextView.
-+ */
- - (id<RCTBackedTextInputViewProtocol>)backedTextInputView
- {
--  return _backedTextInputView;
-+  return _customBackedTextView;
- }
- 
--- (void)setDisableCopyPaste:(BOOL)disableCopyPaste {
--    _backedTextInputView.disableCopyPaste = disableCopyPaste;
-+#pragma mark - Setters for React Props
-+
-+- (void)setDisableCopyPaste:(BOOL)disableCopyPaste
-+{
-+  _customBackedTextView.disableCopyPaste = disableCopyPaste;
- }
- 
--- (void)setOnPaste:(RCTDirectEventBlock)onPaste {
--    _backedTextInputView.onPaste = onPaste;
-+- (void)setOnPaste:(RCTDirectEventBlock)onPaste
-+{
-+  _customBackedTextView.onPaste = onPaste;
- }
- 
--- (void)setSmartPunctuation:(NSString *)smartPunctuation {
--    if ([smartPunctuation isEqualToString:@"enable"]) {
--        [_backedTextInputView setSmartDashesType:UITextSmartDashesTypeYes];
--        [_backedTextInputView setSmartQuotesType:UITextSmartQuotesTypeYes];
--        [_backedTextInputView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeYes];
--    } else if ([smartPunctuation isEqualToString:@"disable"]) {
--        [_backedTextInputView setSmartDashesType:UITextSmartDashesTypeNo];
--        [_backedTextInputView setSmartQuotesType:UITextSmartQuotesTypeNo];
--        [_backedTextInputView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeNo];
--    } else {
--        [_backedTextInputView setSmartDashesType:UITextSmartDashesTypeDefault];
--        [_backedTextInputView setSmartQuotesType:UITextSmartQuotesTypeDefault];
--        [_backedTextInputView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeDefault];
--    }
-+- (void)setSmartPunctuation:(NSString *)smartPunctuation
-+{
-+  if ([smartPunctuation isEqualToString:@"enable"]) {
-+    [_customBackedTextView setSmartDashesType:UITextSmartDashesTypeYes];
-+    [_customBackedTextView setSmartQuotesType:UITextSmartQuotesTypeYes];
-+    [_customBackedTextView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeYes];
-+  } else if ([smartPunctuation isEqualToString:@"disable"]) {
-+    [_customBackedTextView setSmartDashesType:UITextSmartDashesTypeNo];
-+    [_customBackedTextView setSmartQuotesType:UITextSmartQuotesTypeNo];
-+    [_customBackedTextView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeNo];
-+  } else {
-+    [_customBackedTextView setSmartDashesType:UITextSmartDashesTypeDefault];
-+    [_customBackedTextView setSmartQuotesType:UITextSmartQuotesTypeDefault];
-+    [_customBackedTextView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeDefault];
-+  }
- }
- 
- #pragma mark - UIScrollViewDelegate
-@@ -62,7 +92,6 @@ - (void)setSmartPunctuation:(NSString *)smartPunctuation {
- - (void)scrollViewDidScroll:(UIScrollView *)scrollView
- {
-   RCTDirectEventBlock onScroll = self.onScroll;
--
-   if (onScroll) {
-     CGPoint contentOffset = scrollView.contentOffset;
-     CGSize contentSize = scrollView.contentSize;
-@@ -71,22 +100,22 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
- 
-     onScroll(@{
-       @"contentOffset": @{
--        @"x": @(contentOffset.x),
--        @"y": @(contentOffset.y)
-+          @"x": @(contentOffset.x),
-+          @"y": @(contentOffset.y)
-       },
-       @"contentInset": @{
--        @"top": @(contentInset.top),
--        @"left": @(contentInset.left),
--        @"bottom": @(contentInset.bottom),
--        @"right": @(contentInset.right)
-+          @"top": @(contentInset.top),
-+          @"left": @(contentInset.left),
-+          @"bottom": @(contentInset.bottom),
-+          @"right": @(contentInset.right)
-       },
-       @"contentSize": @{
--        @"width": @(contentSize.width),
--        @"height": @(contentSize.height)
-+          @"width": @(contentSize.width),
-+          @"height": @(contentSize.height)
-       },
-       @"layoutMeasurement": @{
--        @"width": @(size.width),
--        @"height": @(size.height)
-+          @"width": @(size.width),
-+          @"height": @(size.height)
-       },
-       @"zoomScale": @(scrollView.zoomScale ?: 1),
-     });
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm
-index dd50053..2ed7017 100644
---- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm
-@@ -122,8 +122,8 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
-   const auto &newTextInputProps = static_cast<const PasteTextInputProps &>(*props);
- 
-   // Traits:
--  if (newTextInputProps.traits.multiline != oldTextInputProps.traits.multiline) {
--    [self _setMultiline:newTextInputProps.traits.multiline];
-+  if (newTextInputProps.multiline != oldTextInputProps.multiline) {
-+    [self _setMultiline:newTextInputProps.multiline];
-   }
- 
-   if (newTextInputProps.traits.autocapitalizationType != oldTextInputProps.traits.autocapitalizationType) {
-@@ -421,7 +421,7 @@ - (void)textInputDidChangeSelection
-     return;
-   }
-   const auto &props = static_cast<const PasteTextInputProps &>(*_props);
--  if (props.traits.multiline && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
-+  if (props.multiline && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
-     [self textInputDidChange];
-     _ignoreNextTextInputCall = YES;
-   }
-@@ -708,11 +708,11 @@ - (BOOL)_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldTe
- - (SubmitBehavior)getSubmitBehavior
- {
-   const auto &props = static_cast<const PasteTextInputProps &>(*_props);
--  const SubmitBehavior submitBehaviorDefaultable = props.traits.submitBehavior;
-+  const SubmitBehavior submitBehaviorDefaultable = props.submitBehavior;
- 
-   // We should always have a non-default `submitBehavior`, but in case we don't, set it based on multiline.
-   if (submitBehaviorDefaultable == SubmitBehavior::Default) {
--    return props.traits.multiline ? SubmitBehavior::Newline : SubmitBehavior::BlurAndSubmit;
-+    return props.multiline ? SubmitBehavior::Newline : SubmitBehavior::BlurAndSubmit;
-   }
- 
-   return submitBehaviorDefaultable;
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.cpp b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.cpp
-index 29e094f..7ef519a 100644
---- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.cpp
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.cpp
-@@ -22,8 +22,7 @@ PasteTextInputProps::PasteTextInputProps(
-     const PropsParserContext &context,
-     const PasteTextInputProps &sourceProps,
-     const RawProps& rawProps)
--    : ViewProps(context, sourceProps, rawProps),
--    BaseTextProps(context, sourceProps, rawProps),
-+    : BaseTextInputProps(context, sourceProps, rawProps),
-     traits(convertRawProp(context, rawProps, sourceProps.traits, {})),
-     smartPunctuation(convertRawProp(context, rawProps, "smartPunctuation", sourceProps.smartPunctuation, {})),
-     disableCopyPaste(convertRawProp(context, rawProps, "disableCopyPaste", sourceProps.disableCopyPaste, {false})),
-@@ -133,7 +132,7 @@ TextAttributes PasteTextInputProps::getEffectiveTextAttributes(Float fontSizeMul
- ParagraphAttributes PasteTextInputProps::getEffectiveParagraphAttributes() const {
-     auto result = paragraphAttributes;
- 
--    if (!traits.multiline) {
-+    if (!multiline) {
-         result.maximumNumberOfLines = 1;
-     }
- 
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.h b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.h
-index 723d00c..31cfe66 100644
---- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.h
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.h
-@@ -15,6 +15,7 @@
- #include <react/renderer/components/iostextinput/conversions.h>
- #include <react/renderer/components/iostextinput/primitives.h>
- #include <react/renderer/components/text/BaseTextProps.h>
-+#include <react/renderer/components/textinput/BaseTextInputProps.h>
- #include <react/renderer/components/view/ViewProps.h>
- #include <react/renderer/core/Props.h>
- #include <react/renderer/core/PropsParserContext.h>
-@@ -25,7 +26,7 @@
- 
- namespace facebook::react {
- 
--class PasteTextInputProps final : public ViewProps, public BaseTextProps {
-+class PasteTextInputProps final : public BaseTextInputProps {
- public:
-     PasteTextInputProps() = default;
-     PasteTextInputProps(const PropsParserContext& context, const PasteTextInputProps& sourceProps, const RawProps& rawProps);
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/ShadowNodes.cpp b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/ShadowNodes.cpp
-index 31e07e3..7f0ebfb 100644
---- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/ShadowNodes.cpp
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/ShadowNodes.cpp
-@@ -91,20 +91,11 @@ void PasteTextInputShadowNode::updateStateIfNeeded(
-   const auto& state = getStateData();
- 
-   react_native_assert(textLayoutManager_);
--  react_native_assert(
--      (!state.layoutManager || state.layoutManager == textLayoutManager_) &&
--      "`StateData` refers to a different `TextLayoutManager`");
--
--  if (state.reactTreeAttributedString == reactTreeAttributedString &&
--      state.layoutManager == textLayoutManager_) {
--    return;
--  }
- 
-   auto newState = TextInputState{};
-   newState.attributedStringBox = AttributedStringBox{reactTreeAttributedString};
-   newState.paragraphAttributes = getConcreteProps().paragraphAttributes;
-   newState.reactTreeAttributedString = reactTreeAttributedString;
--  newState.layoutManager = textLayoutManager_;
-   newState.mostRecentEventCount = getConcreteProps().mostRecentEventCount;
-   setStateData(std::move(newState));
- }

patches/expo-font+14.0.10.patch

@@ -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)
-   }
- 

patches/expo-image+3.0.10.patch

@@ -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;

patches/react-native+0.81.5+005+TextInput-onPaste.patch

@@ -0,0 +1,719 @@
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js b/node_modules/react-native/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
+index 8cc1369..6b42a26 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
+@@ -449,6 +449,21 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
+     }>,
+   >,
+ 
++  /**
++   * Invoked when the user performs the paste action.
++   */
++  onPaste?: ?DirectEventHandler<
++    $ReadOnly<{
++      target: Int32,
++      items: $ReadOnlyArray<
++        $ReadOnly<{
++          type: string,
++          data: string,
++        }>,
++      >,
++    }>,
++  >,
++
+   /**
+    * The string that will be rendered before text input has been entered.
+    */
+@@ -640,6 +655,9 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
+     topScroll: {
+       registrationName: 'onScroll',
+     },
++    topPaste: {
++      registrationName: 'onPaste',
++    },
+   },
+   validAttributes: {
+     acceptDragAndDropTypes: true,
+@@ -694,6 +712,7 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
+     secureTextEntry: true,
+     textBreakStrategy: true,
+     onScroll: true,
++    onPaste: true,
+     onContentSizeChange: true,
+     disableFullscreenUI: true,
+     includeFontPadding: true,
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js b/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
+index 05bddcb..69c11a2 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
+@@ -82,6 +82,9 @@ const RCTTextInputViewConfig: PartialViewConfigWithoutName = {
+     topContentSizeChange: {
+       registrationName: 'onContentSizeChange',
+     },
++    topPaste: {
++      registrationName: 'onPaste',
++    },
+     topChangeSync: {
+       registrationName: 'onChangeSync',
+     },
+@@ -160,6 +163,7 @@ const RCTTextInputViewConfig: PartialViewConfigWithoutName = {
+       onSelectionChange: true,
+       onContentSizeChange: true,
+       onScroll: true,
++      onPaste: true,
+       onChangeSync: true,
+       onKeyPressSync: true,
+     }),
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts b/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
+index b3ca156..2807af2 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
++++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
+@@ -565,6 +565,16 @@ export interface TextInputSubmitEditingEventData {
+ export type TextInputSubmitEditingEvent =
+   NativeSyntheticEvent<TextInputSubmitEditingEventData>;
+ 
++/**
++  * @see TextInputProps.onPaste
++  */
++export interface TextInputPasteEventData extends TargetedEvent {
++items: Array<{
++    type: string;
++    data: string;
++  }>;
++}
++
+ /**
+  * @see https://reactnative.dev/docs/textinput#props
+  */
+@@ -896,6 +906,13 @@ export interface TextInputProps
+    */
+   onKeyPress?: ((e: TextInputKeyPressEvent) => void) | undefined;
+ 
++  /**
++    * Invoked when the user performs the paste action.
++    */
++  onPaste?:
++    | ((e: NativeSyntheticEvent<TextInputPasteEventData>) => void)
++    | undefined;
++
+   /**
+    * The string that will be rendered before text input has been entered
+    */
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/TextInput.flow.js b/node_modules/react-native/Libraries/Components/TextInput/TextInput.flow.js
+index 5fa8811..ad2bf61 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.flow.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.flow.js
+@@ -137,6 +137,18 @@ export type TextInputSubmitEditingEvent =
+ export type TextInputEditingEvent =
+   NativeSyntheticEvent<TextInputEndEditingEventData>;
+ 
++export type PasteEvent = SyntheticEvent<
++  $ReadOnly<{
++    target: number,
++    items: $ReadOnlyArray<
++      $ReadOnly<{
++        type: string,
++        data: string,
++      }>,
++    >,
++  }>,
++>;
++
+ type DataDetectorTypesType =
+   | 'phoneNumber'
+   | 'link'
+@@ -884,6 +896,11 @@ type TextInputBaseProps = $ReadOnly<{
+    */
+   onScroll?: ?(e: ScrollEvent) => mixed,
+ 
++  /**
++   * Invoked when the user performs the paste action.
++   */
++  onPaste?: ?(e: PasteEvent) => mixed,
++
+   /**
+    * The string that will be rendered before text input has been entered.
+    */
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm b/node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
+index 6e9c384..2c509eb 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
+@@ -13,6 +13,10 @@
+ #import <React/RCTBackedTextInputDelegateAdapter.h>
+ #import <React/RCTTextAttributes.h>
+ 
++#import <MobileCoreServices/MobileCoreServices.h>
++#import <MobileCoreServices/UTType.h>
++#import <UIKit/UIKit.h>
++
+ @implementation RCTUITextView {
+   UILabel *_placeholderView;
+   UITextView *_detachedTextView;
+@@ -209,7 +213,31 @@ - (void)scrollRangeToVisible:(NSRange)range
+ - (void)paste:(id)sender
+ {
+   _textWasPasted = YES;
+-  [super paste:sender];
++  UIPasteboard *clipboard = [UIPasteboard generalPasteboard];
++  if (clipboard.hasImages) {
++    for (NSItemProvider *itemProvider in clipboard.itemProviders) {
++      if ([itemProvider hasItemConformingToTypeIdentifier:(NSString *)kUTTypeImage]) {
++        for (NSString *identifier in itemProvider.registeredTypeIdentifiers) {
++          if (UTTypeConformsTo((__bridge CFStringRef)identifier, kUTTypeImage)) {
++            NSString *MIMEType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)identifier, kUTTagClassMIMEType);
++            NSString *fileExtension = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)identifier, kUTTagClassFilenameExtension);
++            NSString *filePath = RCTTempFilePath(fileExtension, nil);
++            NSURL *fileURL = [NSURL fileURLWithPath:filePath];
++            NSData *fileData = [clipboard dataForPasteboardType:identifier];
++            [fileData writeToFile:filePath atomically:YES];
++            [_textInputDelegateAdapter didPaste:MIMEType withData:[fileURL absoluteString]];
++            break;
++          }
++        }
++        break;
++      }
++    }
++  } else {
++    if (clipboard.hasStrings) {
++      [_textInputDelegateAdapter didPaste:@"text/plain" withData:clipboard.string];
++    }
++    [super paste:sender];
++  }
+ }
+ 
+ // Turn off scroll animation to fix flaky scrolling.
+@@ -301,6 +329,10 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+     return NO;
+   }
+ 
++  if (action == @selector(paste:) && [UIPasteboard generalPasteboard].hasImages) {
++    return YES;
++  }
++
+   return [super canPerformAction:action withSender:sender];
+ }
+ 
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
+index 7187177..da00893 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
+@@ -37,6 +37,8 @@ NS_ASSUME_NONNULL_BEGIN
+ 
+ - (void)textInputDidChangeSelection;
+ 
++- (void)textInputDidPaste:(NSString *)type withData:(NSString *)data;
++
+ @optional
+ 
+ - (void)scrollViewDidScroll:(UIScrollView *)scrollView;
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
+index f1c32e6..0ce9dfe 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
+@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
+ 
+ - (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)textRange;
+ - (void)selectedTextRangeWasSet;
++- (void)didPaste:(NSString *)type withData:(NSString *)data;
+ 
+ @end
+ 
+@@ -30,6 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
+ - (instancetype)initWithTextView:(UITextView<RCTBackedTextInputViewProtocol> *)backedTextInputView;
+ 
+ - (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)textRange;
++- (void)didPaste:(NSString *)type withData:(NSString *)data;
+ 
+ @end
+ 
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
+index 82d9a79..8cc48ec 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
+@@ -148,6 +148,11 @@ - (void)selectedTextRangeWasSet
+   [self textFieldProbablyDidChangeSelection];
+ }
+ 
++- (void)didPaste:(NSString *)type withData:(NSString *)data
++{
++  [_backedTextInputView.textInputDelegate textInputDidPaste:type withData:data];
++}
++
+ #pragma mark - Generalization
+ 
+ - (void)textFieldProbablyDidChangeSelection
+@@ -330,6 +335,11 @@ - (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)tex
+   _previousSelectedTextRange = textRange;
+ }
+ 
++- (void)didPaste:(NSString *)type withData:(NSString *)data
++{
++  [_backedTextInputView.textInputDelegate textInputDidPaste:type withData:data];
++}
++
+ #pragma mark - Generalization
+ 
+ - (void)textViewProbablyDidChangeSelection
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h
+index 4804624..90b7081 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h
+@@ -37,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
+ @property (nonatomic, copy, nullable) RCTDirectEventBlock onChange;
+ @property (nonatomic, copy, nullable) RCTDirectEventBlock onChangeSync;
+ @property (nonatomic, copy, nullable) RCTDirectEventBlock onScroll;
++@property (nonatomic, copy, nullable) RCTDirectEventBlock onPaste;
+ 
+ @property (nonatomic, assign) NSInteger mostRecentEventCount;
+ @property (nonatomic, assign, readonly) NSInteger nativeEventCount;
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
+index 6a2d4f8..b6e6060 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
+@@ -599,6 +599,26 @@ - (void)textInputDidChangeSelection
+   });
+ }
+ 
++- (void)textInputDidPaste:(NSString *)type withData:(NSString *)data
++{
++  if (!_onPaste) {
++    return;
++  }
++
++  NSMutableArray *items = [NSMutableArray new];
++  [items addObject:@{
++    @"type" : type,
++    @"data" : data,
++  }];
++
++  NSDictionary *payload = @{
++    @"target" : self.reactTag,
++    @"items" : items,
++  };
++
++  _onPaste(payload);
++}
++
+ - (void)updateLocalData
+ {
+   [self enforceTextAttributesIfNeeded];
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
+index 47adc53..1865e0a 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
+@@ -70,6 +70,7 @@ @implementation RCTBaseTextInputViewManager {
+ RCT_EXPORT_VIEW_PROPERTY(onChangeSync, RCTDirectEventBlock)
+ RCT_EXPORT_VIEW_PROPERTY(onSelectionChange, RCTDirectEventBlock)
+ RCT_EXPORT_VIEW_PROPERTY(onScroll, RCTDirectEventBlock)
++RCT_EXPORT_VIEW_PROPERTY(onPaste, RCTDirectEventBlock)
+ 
+ RCT_EXPORT_SHADOW_PROPERTY(text, NSString)
+ RCT_EXPORT_SHADOW_PROPERTY(placeholder, NSString)
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm b/node_modules/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
+index 377f41e..b8f48e6 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
+@@ -12,6 +12,10 @@
+ #import <React/RCTUtils.h>
+ #import <React/UIView+React.h>
+ 
++#import <MobileCoreServices/MobileCoreServices.h>
++#import <MobileCoreServices/UTType.h>
++#import <UIKit/UIKit.h>
++
+ @implementation RCTUITextField {
+   RCTBackedTextFieldDelegateAdapter *_textInputDelegateAdapter;
+   NSDictionary<NSAttributedStringKey, id> *_defaultTextAttributes;
+@@ -180,6 +184,10 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+     return NO;
+   }
+ 
++  if (action == @selector(paste:) && [UIPasteboard generalPasteboard].hasImages) {
++    return YES;
++  }
++
+   return [super canPerformAction:action withSender:sender];
+ }
+ 
+@@ -263,7 +271,31 @@ - (void)scrollRangeToVisible:(NSRange)range
+ - (void)paste:(id)sender
+ {
+   _textWasPasted = YES;
+-  [super paste:sender];
++  UIPasteboard *clipboard = [UIPasteboard generalPasteboard];
++  if (clipboard.hasImages) {
++    for (NSItemProvider *itemProvider in clipboard.itemProviders) {
++      if ([itemProvider hasItemConformingToTypeIdentifier:(NSString *)kUTTypeImage]) {
++        for (NSString *identifier in itemProvider.registeredTypeIdentifiers) {
++          if (UTTypeConformsTo((__bridge CFStringRef)identifier, kUTTypeImage)) {
++            NSString *MIMEType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)identifier, kUTTagClassMIMEType);
++            NSString *fileExtension = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)identifier, kUTTagClassFilenameExtension);
++            NSString *filePath = RCTTempFilePath(fileExtension, nil);
++            NSURL *fileURL = [NSURL fileURLWithPath:filePath];
++            NSData *fileData = [clipboard dataForPasteboardType:identifier];
++            [fileData writeToFile:filePath atomically:YES];
++            [_textInputDelegateAdapter didPaste:MIMEType withData:[fileURL absoluteString]];
++            break;
++          }
++        }
++        break;
++      }
++    }
++  } else {
++    if (clipboard.hasStrings) {
++      [_textInputDelegateAdapter didPaste:@"text/plain" withData:clipboard.string];
++    }
++    [super paste:sender];
++  }
+ }
+ 
+ #pragma mark - Layout
+diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+index 577bebe..bbde7fd 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
++++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+@@ -516,6 +516,13 @@ - (void)textInputDidChangeSelection
+   }
+ }
+ 
++- (void)textInputDidPaste:(NSString *)type withData:(NSString *)data
++{
++  if (_eventEmitter) {
++    static_cast<const TextInputEventEmitter &>(*_eventEmitter).onPaste(std::string([type UTF8String]), std::string([data UTF8String]));
++  }
++}
++
+ #pragma mark - RCTBackedTextInputDelegate (UIScrollViewDelegate)
+ 
+ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/PasteWatcher.kt b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/PasteWatcher.kt
+new file mode 100644
+index 0000000..a684b87
+--- /dev/null
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/PasteWatcher.kt
+@@ -0,0 +1,17 @@
++/*
++ * Copyright (c) Meta Platforms, Inc. and affiliates.
++ *
++ * This source code is licensed under the MIT license found in the
++ * LICENSE file in the root directory of this source tree.
++ */
++
++package com.facebook.react.views.textinput
++
++/**
++ * Implement this interface to be informed of paste event in the
++ * ReactTextEdit This is used by the ReactTextInputManager to forward events
++ * from the EditText to JS
++ */
++public fun interface PasteWatcher {
++  public fun onPaste(type: String, data: String)
++}
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt
+index 42f6e03..158e4e4 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt
+@@ -8,6 +8,10 @@
+ package com.facebook.react.views.textinput
+ 
+ import android.annotation.SuppressLint
++import android.content.ClipboardManager
++import android.content.ClipData
++import android.content.ClipDescription
++import android.content.ContentResolver
+ import android.content.Context
+ import android.content.res.Configuration
+ import android.graphics.Canvas
+@@ -15,7 +19,12 @@ import android.graphics.Color
+ import android.graphics.Paint
+ import android.graphics.Rect
+ import android.graphics.drawable.Drawable
++import android.net.Uri
++import com.facebook.react.uimanager.UIManagerHelper.getReactContext
+ import android.os.Build
++import java.io.File
++import java.io.FileOutputStream
++import java.io.InputStream
+ import android.os.Bundle
+ import android.text.Editable
+ import android.text.InputType
+@@ -128,6 +137,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
+   private var selectionWatcher: SelectionWatcher? = null
+   private var contentSizeWatcher: ContentSizeWatcher? = null
+   private var scrollWatcher: ScrollWatcher?
++  private var pasteWatcher: PasteWatcher?
+   private var keyListener: InternalKeyListener? = null
+   private var detectScrollMovement = false
+   private var onKeyPress = false
+@@ -212,6 +222,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
+       keyListener = InternalKeyListener()
+     }
+     scrollWatcher = null
++    pasteWatcher = null
+     textAttributes = TextAttributes()
+ 
+     applyTextAttributes()
+@@ -356,9 +367,57 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
+    * Called when a context menu option for the text view is selected.
+    * React Native replaces copy (as rich text) with copy as plain text.
+    */
+-  override fun onTextContextMenuItem(id: Int): Boolean =
+-      super.onTextContextMenuItem(
+-          if (id == android.R.id.paste) android.R.id.pasteAsPlainText else id)
++  override fun onTextContextMenuItem(id: Int): Boolean {
++    val modifiedId = if (id == android.R.id.paste || id == android.R.id.pasteAsPlainText) {
++        android.R.id.pasteAsPlainText
++    } else {
++        id
++    }
++
++    if (modifiedId == android.R.id.pasteAsPlainText) {
++      val clipboardManager = getContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
++      val clipData = clipboardManager.primaryClip
++      if (clipData != null) {
++          val item = clipData.getItemAt(0)
++          val itemUri = item.uri
++          var type: String? = null
++          var data: String? = null
++
++          if (itemUri != null) {
++              // First try to get MIME type from ClipData description (more reliable for FileProvider URIs)
++              type = if (clipData.description.mimeTypeCount > 0) {
++                  clipData.description.getMimeType(0)
++              } else {
++                  // Fall back to ContentResolver
++                  val cr = getReactContext(this).contentResolver
++                  cr.getType(itemUri)
++              }
++              if (type != null && type != ClipDescription.MIMETYPE_TEXT_PLAIN) {
++                  // Copy content URI to cache and get file:// URI
++                  data = copyContentUriToCache(itemUri, type)
++                  if (data != null && pasteWatcher != null) {
++                      pasteWatcher?.onPaste(type, data)
++                  }
++                  // Prevents default behavior to avoid inserting raw binary data into the text field
++                  return true
++              }
++          }
++
++          if (clipData.description.hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
++              type = ClipDescription.MIMETYPE_TEXT_PLAIN
++              val text: CharSequence? = item.text
++              if (text != null) {
++                  data = text.toString()
++                  if (pasteWatcher != null) {
++                      pasteWatcher?.onPaste(type, data)
++                  }
++              // Don't return - let the system proceed with default text pasting behavior
++          }
++      }
++    }
++  }
++    return super.onTextContextMenuItem(id)
++  }
+ 
+   internal fun clearFocusAndMaybeRefocus() {
+     if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P || !isInTouchMode) {
+@@ -421,6 +480,45 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
+     this.scrollWatcher = scrollWatcher
+   }
+ 
++  public fun setPasteWatcher(pasteWatcher: PasteWatcher?) {
++    this.pasteWatcher = pasteWatcher
++  }
++
++  /**
++   * Copies a content URI to the cache directory and returns a file:// URI
++   */
++  private fun copyContentUriToCache(contentUri: Uri, mimeType: String?): String? {
++    try {
++      val cr = getReactContext(this).contentResolver
++      val inputStream: InputStream = cr.openInputStream(contentUri) ?: return null
++
++      // Generate filename with appropriate extension
++      val extension = when (mimeType) {
++        "image/jpeg", "image/jpg" -> "jpg"
++        "image/png" -> "png"
++        "image/gif" -> "gif"
++        "image/webp" -> "webp"
++        else -> "jpg"
++      }
++      val fileName = "paste_${System.currentTimeMillis()}.$extension"
++
++      val cacheDir = context.cacheDir
++      val outputFile = File(cacheDir, fileName)
++      val outputStream = FileOutputStream(outputFile)
++
++      inputStream.use { input ->
++        outputStream.use { output ->
++          input.copyTo(output)
++        }
++      }
++
++      return "file://${outputFile.absolutePath}"
++    } catch (e: Exception) {
++      e.printStackTrace()
++      return null
++    }
++  }
++
+   /**
+    * Attempt to set a selection or fail silently. Intentionally meant to handle bad inputs.
+    * EventCounter is the same one used as with text.
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt
+index 42c13a1..c39e240 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt
+@@ -133,6 +133,8 @@ public open class ReactTextInputManager public constructor() :
+     val eventTypeConstants = baseEventTypeConstants ?: mutableMapOf()
+     eventTypeConstants.putAll(
+         mapOf(getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll")))
++    eventTypeConstants.putAll(
++            mapOf("topPaste" to mapOf("registrationName" to "onPaste")))
+     return eventTypeConstants
+   }
+ 
+@@ -327,6 +329,15 @@ public open class ReactTextInputManager public constructor() :
+     }
+   }
+ 
++  @ReactProp(name = "onPaste", defaultBoolean = false)
++  public fun setOnPaste(view: ReactEditText, onPaste: Boolean) {
++    if (onPaste) {
++      view.setPasteWatcher(ReactPasteWatcher(view))
++    } else {
++      view.setPasteWatcher(null)
++    }
++  }
++
+   @ReactProp(name = "onKeyPress", defaultBoolean = false)
+   public fun setOnKeyPress(view: ReactEditText, onKeyPress: Boolean) {
+     view.setOnKeyPress(onKeyPress)
+@@ -944,6 +955,24 @@ public open class ReactTextInputManager public constructor() :
+     }
+   }
+ 
++  private class ReactPasteWatcher(editText: ReactEditText) : PasteWatcher {
++    private val mReactEditText: ReactEditText = editText
++    private val mEventDispatcher: EventDispatcher?
++    private val mSurfaceId: Int
++
++    init {
++      val reactContext = UIManagerHelper.getReactContext(editText)
++      mEventDispatcher = getEventDispatcher(reactContext, editText)
++      mSurfaceId = UIManagerHelper.getSurfaceId(reactContext)
++    }
++
++    override fun onPaste(type: String, data: String) {
++      mEventDispatcher?.dispatchEvent(
++        ReactTextInputPasteEvent(mSurfaceId, mReactEditText.id, type, data)
++      )
++    }
++  }
++
+   override fun getExportedViewConstants(): Map<String, Any> =
+       mapOf(
+           "AutoCapitalizationType" to
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputPasteEvent.kt b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputPasteEvent.kt
+new file mode 100644
+index 0000000..6f5b10b
+--- /dev/null
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputPasteEvent.kt
+@@ -0,0 +1,61 @@
++/*
++ * Copyright (c) Meta Platforms, Inc. and affiliates.
++ *
++ * This source code is licensed under the MIT license found in the
++ * LICENSE file in the root directory of this source tree.
++ */
++
++package com.facebook.react.views.textinput
++
++import androidx.annotation.Nullable
++import com.facebook.react.bridge.Arguments
++import com.facebook.react.bridge.WritableMap
++import com.facebook.react.bridge.WritableArray
++import com.facebook.react.uimanager.common.ViewUtil
++import com.facebook.react.uimanager.events.Event
++
++/**
++ * Event emitted by EditText native view when clipboard content is pasted
++ */
++public class ReactTextInputPasteEvent : Event<ReactTextInputPasteEvent> {
++
++    public companion object {
++        private const val EVENT_NAME = "topPaste"
++    }
++
++    private val mType: String
++    private val mData: String
++
++    @Deprecated("Use constructor with surfaceId")
++    public constructor(viewId: Int, type: String, data: String) :
++        this(ViewUtil.NO_SURFACE_ID, viewId, type, data)
++
++    public constructor(surfaceId: Int, viewId: Int, type: String, data: String) :
++        super(surfaceId, viewId) {
++        mType = type
++        mData = data
++    }
++
++    override fun getEventName(): String {
++        return EVENT_NAME
++    }
++
++    override fun canCoalesce(): Boolean {
++        return false
++    }
++
++    @Nullable
++    override fun getEventData(): WritableMap? {
++        val eventData = Arguments.createMap()
++
++        val items: WritableArray = Arguments.createArray()
++        val item: WritableMap = Arguments.createMap()
++        item.putString("type", mType)
++        item.putString("data", mData)
++        items.pushMap(item)
++
++        eventData.putArray("items", items)
++
++        return eventData
++    }
++}
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.cpp b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.cpp
+index a9bc219..7ebec12 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.cpp
++++ b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.cpp
+@@ -177,6 +177,19 @@ void TextInputEventEmitter::onScroll(const Metrics& textInputMetrics) const {
+   });
+ }
+ 
++void TextInputEventEmitter::onPaste(const std::string& type, const std::string& data) const {
++  dispatchEvent("onPaste", [type, data](jsi::Runtime& runtime) {
++    auto payload = jsi::Object(runtime);
++    auto items = jsi::Array(runtime, 1);
++    auto item = jsi::Object(runtime);
++    item.setProperty(runtime, "type", type);
++    item.setProperty(runtime, "data", data);
++    items.setValueAtIndex(runtime, 0, item);
++    payload.setProperty(runtime, "items", items);
++    return payload;
++  });
++}
++
+ void TextInputEventEmitter::dispatchTextInputEvent(
+     const std::string& name,
+     const Metrics& textInputMetrics,
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h
+index dbce575..5b03581 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h
++++ b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h
+@@ -44,6 +44,7 @@ class TextInputEventEmitter : public ViewEventEmitter {
+   void onSubmitEditing(const Metrics& textInputMetrics) const;
+   void onKeyPress(const KeyPressMetrics& keyPressMetrics) const;
+   void onScroll(const Metrics& textInputMetrics) const;
++  void onPaste(const std::string& type, const std::string& data) const;
+ 
+  private:
+   void dispatchTextInputEvent(

patches/react-native-pager-view+6.8.0.patch

@@ -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;
- }

patches/react-native-pager-view+6.8.0.patch.md

@@ -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

src/App.native.tsx

@@ -69,10 +69,6 @@ import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbe
 import {ToastOutlet} from '#/components/Toast'
 import {Provider as AgeAssuranceV2Provider} from '#/ageAssurance'
 import {prefetchAgeAssuranceConfig} from '#/ageAssurance'
-import {
-  prefetchLiveEvents,
-  Provider as LiveEventsProvider,
-} from '#/features/liveEvents/context'
 import * as Geo from '#/geolocation'
 import {Splash} from '#/Splash'
 import {BottomSheetProvider} from '../modules/bottom-sheet'
@@ -96,7 +92,6 @@ if (isAndroid) {
  */
 Geo.resolve()
 prefetchAgeAssuranceConfig()
-prefetchLiveEvents()
 
 function InnerApp() {
   const [isReady, setIsReady] = React.useState(false)
@@ -146,51 +141,49 @@ function InnerApp() {
                 <QueryProvider currentDid={currentAccount?.did}>
                   <PolicyUpdateOverlayProvider>
                     <StatsigProvider>
-                      <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>
-                                                              <TestCtrls />
-                                                              <Shell />
-                                                              <ToastOutlet />
-                                                            </IntentDialogProvider>
-                                                          </GlobalGestureEventsProvider>
-                                                        </GestureHandlerRootView>
-                                                      </HideBottomBarBorderProvider>
-                                                    </EmailVerificationProvider>
-                                                  </ServiceAccountManager>
-                                                </ProgressGuideProvider>
-                                              </MutedThreadsProvider>
-                                            </BackgroundNotificationPreferencesProvider>
-                                          </UnreadNotifsProvider>
-                                        </HomeBadgeProvider>
-                                      </HiddenRepliesProvider>
-                                    </SelectedFeedProvider>
-                                  </LoggedOutViewProvider>
-                                </ModerationOptsProvider>
-                              </LabelDefsProvider>
-                            </MessagesProvider>
-                          </ComposerProvider>
-                        </AgeAssuranceV2Provider>
-                      </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>
+                                                            <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>

src/App.web.tsx

@@ -57,10 +57,6 @@ import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbe
 import {ToastOutlet} from '#/components/Toast'
 import {Provider as AgeAssuranceV2Provider} from '#/ageAssurance'
 import {prefetchAgeAssuranceConfig} from '#/ageAssurance'
-import {
-  prefetchLiveEvents,
-  Provider as LiveEventsProvider,
-} from '#/features/liveEvents/context'
 import * as Geo from '#/geolocation'
 import {Splash} from '#/Splash'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
@@ -71,7 +67,6 @@ import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottom
  */
 Geo.resolve()
 prefetchAgeAssuranceConfig()
-prefetchLiveEvents()
 
 function InnerApp() {
   const [isReady, setIsReady] = React.useState(false)
@@ -122,47 +117,45 @@ function InnerApp() {
                 <QueryProvider currentDid={currentAccount?.did}>
                   <PolicyUpdateOverlayProvider>
                     <StatsigProvider>
-                      <LiveEventsProvider>
-                        <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>
-                      </LiveEventsProvider>
+                      <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>

src/ageAssurance/components/NoAccessScreen.tsx

@@ -177,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]}>

src/ageAssurance/data.tsx

@@ -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,

src/ageAssurance/debug.ts

@@ -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,

src/ageAssurance/index.tsx

@@ -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>
   )

src/ageAssurance/state.ts

@@ -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,
       }
     }
 

src/ageAssurance/types.ts

@@ -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) {

src/ageAssurance/util.ts

@@ -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) {

src/alf/index.tsx

@@ -11,12 +11,7 @@ import {
 import {themes} from '#/alf/themes'
 import {type Device} from '#/storage'
 
-export {
-  type TextStyleProp,
-  type Theme,
-  utils,
-  type ViewStyleProp,
-} from '@bsky.app/alf'
+export {type TextStyleProp, type Theme, type ViewStyleProp} from '@bsky.app/alf'
 export {atoms} from '#/alf/atoms'
 export * from '#/alf/breakpoints'
 export * from '#/alf/fonts'

src/alf/util/useColorModeTheme.ts

@@ -51,7 +51,6 @@ function updateDocument(theme: ThemeName) {
     html.classList.add(`theme--${theme}`)
     // set color to 'theme-color' meta tag
     meta?.setAttribute('content', getBackgroundColor(theme))
-    window.localStorage.setItem('ALF_THEME', theme)
   }
 }
 

src/components/Dialog/index.tsx

@@ -359,13 +359,7 @@ export function FlatListFooter({children}: {children: React.ReactNode}) {
   )
 }
 
-export function Handle({
-  difference = false,
-  fill,
-}: {
-  difference?: boolean
-  fill?: string
-}) {
+export function Handle({difference = false}: {difference?: boolean}) {
   const t = useTheme()
   const {_} = useLingui()
   const {screenReaderEnabled} = useA11y()
@@ -396,7 +390,7 @@ export function Handle({
                   opacity: 0.75,
                 }
               : {
-                  backgroundColor: fill || t.palette.contrast_975,
+                  backgroundColor: t.palette.contrast_975,
                   opacity: 0.5,
                 },
           ]}

src/components/FeedCard.tsx

@@ -1,4 +1,4 @@
-import React, {useMemo} from 'react'
+import React from 'react'
 import {type GestureResponderEvent, View} from 'react-native'
 import {
   type AppBskyFeedDefs,
@@ -21,21 +21,19 @@ import {
 import {useSession} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
-import {atoms as a, select, useTheme} from '#/alf'
+import {atoms as a, useTheme} from '#/alf'
 import {
   Button,
   ButtonIcon,
   type ButtonProps,
   ButtonText,
 } from '#/components/Button'
-import {Live_Stroke2_Corner0_Rounded as LiveIcon} from '#/components/icons/Live'
 import {Pin_Stroke2_Corner0_Rounded as PinIcon} from '#/components/icons/Pin'
 import {Link as InternalLink, type LinkProps} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import * as Prompt from '#/components/Prompt'
 import {RichText, type RichTextProps} from '#/components/RichText'
 import {Text} from '#/components/Typography'
-import {useActiveLiveEventFeedUris} from '#/features/liveEvents/context'
 import type * as bsky from '#/types/bsky'
 import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from './icons/Trash'
 
@@ -51,11 +49,7 @@ export function Default(props: Props) {
       <Outer>
         <Header>
           <Avatar src={view.avatar} />
-          <TitleAndByline
-            title={view.displayName}
-            creator={view.creator}
-            uri={view.uri}
-          />
+          <TitleAndByline title={view.displayName} creator={view.creator} />
           <SaveButton view={view} pin />
         </Header>
         <Description description={view.description} />
@@ -124,40 +118,14 @@ export function AvatarPlaceholder({size = 40}: Omit<AvatarProps, 'src'>) {
 export function TitleAndByline({
   title,
   creator,
-  uri,
 }: {
   title: string
   creator?: bsky.profile.AnyProfileView
-  uri?: string
 }) {
   const t = useTheme()
-  const activeLiveEvents = useActiveLiveEventFeedUris()
-  const liveColor = useMemo(
-    () =>
-      select(t.name, {
-        dark: t.palette.negative_600,
-        dim: t.palette.negative_600,
-        light: t.palette.negative_500,
-      }),
-    [t],
-  )
 
   return (
     <View style={[a.flex_1]}>
-      {uri && activeLiveEvents.has(uri) && (
-        <View style={[a.flex_row, a.align_center, a.gap_2xs]}>
-          <LiveIcon size="xs" fill={liveColor} />
-          <Text
-            style={[
-              a.text_2xs,
-              a.font_medium,
-              a.leading_snug,
-              {color: liveColor},
-            ]}>
-            <Trans>Happening now</Trans>
-          </Text>
-        </View>
-      )}
       <Text
         emoji
         style={[a.text_md, a.font_semi_bold, a.leading_snug]}

src/components/FeedInterstitials.tsx

@@ -842,7 +842,6 @@ export function SuggestedFeeds() {
                   <FeedCard.TitleAndByline
                     title={feed.displayName}
                     creator={feed.creator}
-                    uri={feed.uri}
                   />
                 </FeedCard.Header>
                 <FeedCard.Description
@@ -934,15 +933,8 @@ export function SuggestedFeeds() {
 
 export function ProgressGuide() {
   const t = useTheme()
-  const {gtMobile} = useBreakpoints()
   return (
-    <View
-      style={[
-        t.atoms.border_contrast_low,
-        a.px_lg,
-        a.py_lg,
-        !gtMobile && {marginTop: 4},
-      ]}>
+    <View style={[t.atoms.border_contrast_low, a.px_lg, a.py_lg, a.pb_lg]}>
       <ProgressGuideList />
     </View>
   )

src/components/Menu/index.tsx

@@ -167,7 +167,6 @@ export function Item({children, label, style, onPress, ...rest}: ItemProps) {
         a.gap_sm,
         a.px_md,
         a.rounded_md,
-        a.overflow_hidden,
         a.border,
         t.atoms.bg_contrast_25,
         t.atoms.border_contrast_low,
@@ -194,6 +193,7 @@ export function ItemText({children, style}: ItemTextProps) {
         a.text_md,
         a.font_semi_bold,
         t.atoms.text_contrast_high,
+        {paddingTop: 3},
         style,
         disabled && t.atoms.text_contrast_low,
       ]}>
@@ -202,18 +202,16 @@ export function ItemText({children, style}: ItemTextProps) {
   )
 }
 
-export function ItemIcon({icon: Comp, fill}: ItemIconProps) {
+export function ItemIcon({icon: Comp}: ItemIconProps) {
   const t = useTheme()
   const {disabled} = useMenuItemContext()
   return (
     <Comp
       size="lg"
       fill={
-        fill
-          ? fill({disabled})
-          : disabled
-            ? t.atoms.text_contrast_low.color
-            : t.atoms.text_contrast_medium.color
+        disabled
+          ? t.atoms.text_contrast_low.color
+          : t.atoms.text_contrast_medium.color
       }
     />
   )

src/components/Menu/index.web.tsx

@@ -262,7 +262,6 @@ export function Item({children, label, onPress, style, ...rest}: ItemProps) {
           a.gap_lg,
           a.py_sm,
           a.rounded_xs,
-          a.overflow_hidden,
           {minHeight: 32, paddingHorizontal: 10},
           web({outline: 0}),
           (hovered || focused) &&
@@ -303,7 +302,7 @@ export function ItemText({children, style}: ItemTextProps) {
   )
 }
 
-export function ItemIcon({icon: Comp, position = 'left', fill}: ItemIconProps) {
+export function ItemIcon({icon: Comp, position = 'left'}: ItemIconProps) {
   const t = useTheme()
   const {disabled} = useMenuItemContext()
   return (
@@ -320,11 +319,9 @@ export function ItemIcon({icon: Comp, position = 'left', fill}: ItemIconProps) {
       <Comp
         size="md"
         fill={
-          fill
-            ? fill({disabled})
-            : disabled
-              ? t.atoms.text_contrast_low.color
-              : t.atoms.text_contrast_medium.color
+          disabled
+            ? t.atoms.text_contrast_low.color
+            : t.atoms.text_contrast_medium.color
         }
       />
     </View>

src/components/Menu/types.ts

@@ -107,7 +107,6 @@ export type ItemTextProps = React.PropsWithChildren<TextStyleProp & {}>
 export type ItemIconProps = React.PropsWithChildren<{
   icon: React.ComponentType<SVGIconProps>
   position?: 'left' | 'right'
-  fill?: (props: {disabled: boolean}) => string
 }>
 
 export type GroupProps = React.PropsWithChildren<ViewStyleProp & {}>

src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx

@@ -226,7 +226,6 @@ export function ExternalPlayer({
               style={[a.flex_1]}
               source={{uri: link.thumb}}
               accessibilityIgnoresInvertColors
-              loading="lazy"
             />
             <Fill
               style={[

src/components/Post/Embed/ExternalEmbed/index.tsx

@@ -100,7 +100,6 @@ export const ExternalEmbed = ({
               style={[a.aspect_card]}
               source={{uri: imageUri}}
               accessibilityIgnoresInvertColors
-              loading="lazy"
             />
           ) : undefined}
 

src/components/Post/Embed/FeedEmbed.tsx

@@ -17,16 +17,16 @@ export function FeedEmbed({
   return (
     <FeedCard.Link
       view={embed.view}
-      style={[a.border, t.atoms.border_contrast_low, a.p_sm, a.rounded_md]}>
+      style={[a.border, t.atoms.border_contrast_low, a.p_md, a.rounded_sm]}>
       <FeedCard.Outer>
         <FeedCard.Header>
-          <FeedCard.Avatar src={embed.view.avatar} size={48} />
+          <FeedCard.Avatar src={embed.view.avatar} />
           <FeedCard.TitleAndByline
             title={embed.view.displayName}
             creator={embed.view.creator}
-            uri={embed.view.uri}
           />
         </FeedCard.Header>
+        <FeedCard.Likes count={embed.view.likeCount || 0} />
       </FeedCard.Outer>
     </FeedCard.Link>
   )

src/components/Post/Embed/ImageEmbed.tsx

@@ -10,9 +10,9 @@ import {Image} from 'expo-image'
 
 import {useLightboxControls} from '#/state/lightbox'
 import {type Dimensions} from '#/view/com/lightbox/ImageViewing/@types'
+import {AutoSizedImage} from '#/view/com/util/images/AutoSizedImage'
+import {ImageLayoutGrid} from '#/view/com/util/images/ImageLayoutGrid'
 import {atoms as a} from '#/alf'
-import {AutoSizedImage} from '#/components/images/AutoSizedImage'
-import {ImageLayoutGrid} from '#/components/images/ImageLayoutGrid'
 import {PostEmbedViewContext} from '#/components/Post/Embed/types'
 import {type EmbedType} from '#/types/bsky/post'
 import {type CommonProps} from './types'

src/components/Post/Embed/VideoEmbed/index.tsx

@@ -6,10 +6,10 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
+import {ConstrainedImage} from '#/view/com/util/images/AutoSizedImage'
 import {atoms as a} from '#/alf'
 import {Button} from '#/components/Button'
 import {useThrottledValue} from '#/components/hooks/useThrottledValue'
-import {ConstrainedImage} from '#/components/images/AutoSizedImage'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
 import {VideoEmbedInnerNative} from './VideoEmbedInner/VideoEmbedInnerNative'
 import * as VideoFallback from './VideoEmbedInner/VideoFallback'

src/components/Post/Embed/VideoEmbed/index.web.tsx

@@ -13,10 +13,10 @@ import {useLingui} from '@lingui/react'
 
 import {isFirefox} from '#/lib/browser'
 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
+import {ConstrainedImage} from '#/view/com/util/images/AutoSizedImage'
 import {atoms as a, useTheme} from '#/alf'
 import {useIsWithinMessage} from '#/components/dms/MessageContext'
 import {useFullscreen} from '#/components/hooks/useFullscreen'
-import {ConstrainedImage} from '#/components/images/AutoSizedImage'
 import {MediaInsetBorder} from '#/components/MediaInsetBorder'
 import {
   HLSUnsupportedError,

src/components/PostControls/BookmarkButton.tsx

@@ -8,7 +8,6 @@ import type React from 'react'
 import {useCleanError} from '#/lib/hooks/useCleanError'
 import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/post-shadow'
-import {useFeedFeedbackContext} from '#/state/feed-feedback'
 import {useBookmarkMutation} from '#/state/queries/bookmarks/useBookmarkMutation'
 import {useRequireAuth} from '#/state/session'
 import {useTheme} from '#/alf'
@@ -33,7 +32,6 @@ export const BookmarkButton = memo(function BookmarkButton({
   const {mutateAsync: bookmark} = useBookmarkMutation()
   const cleanError = useCleanError()
   const requireAuth = useRequireAuth()
-  const {feedDescriptor} = useFeedFeedbackContext()
 
   const {viewer} = post
   const isBookmarked = !!viewer?.bookmarked
@@ -52,12 +50,7 @@ export const BookmarkButton = memo(function BookmarkButton({
         post,
       })
 
-      logger.metric('post:bookmark', {
-        uri: post.uri,
-        authorDid: post.author.did,
-        logContext,
-        feedDescriptor,
-      })
+      logger.metric('post:bookmark', {logContext})
 
       toast.show(
         <toast.Outer>
@@ -92,12 +85,7 @@ export const BookmarkButton = memo(function BookmarkButton({
         uri: post.uri,
       })
 
-      logger.metric('post:unbookmark', {
-        uri: post.uri,
-        authorDid: post.author.did,
-        logContext,
-        feedDescriptor,
-      })
+      logger.metric('post:unbookmark', {logContext})
 
       toast.show(
         <toast.Outer>

src/components/PostControls/PostMenu/PostMenuItems.tsx

@@ -98,7 +98,6 @@ let PostMenuItems = ({
   richText,
   threadgateRecord,
   onShowLess,
-  logContext,
 }: {
   testID: string
   post: Shadow<AppBskyFeedDefs.PostView>
@@ -112,7 +111,6 @@ let PostMenuItems = ({
   timestamp: string
   threadgateRecord?: AppBskyFeedThreadgate.Record
   onShowLess?: (interaction: AppBskyFeedDefs.Interaction) => void
-  logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
 }): React.ReactNode => {
   const {hasSession, currentAccount} = useSession()
   const {_} = useLingui()
@@ -212,21 +210,9 @@ let PostMenuItems = ({
     try {
       if (isThreadMuted) {
         unmuteThread()
-        logger.metric('post:unmute', {
-          uri: postUri,
-          authorDid: postAuthor.did,
-          logContext,
-          feedDescriptor: feedFeedback.feedDescriptor,
-        })
         Toast.show(_(msg`You will now receive notifications for this thread`))
       } else {
         muteThread()
-        logger.metric('post:mute', {
-          uri: postUri,
-          authorDid: postAuthor.did,
-          logContext,
-          feedDescriptor: feedFeedback.feedDescriptor,
-        })
         Toast.show(
           _(msg`You will no longer receive notifications for this thread`),
         )
@@ -286,12 +272,6 @@ let PostMenuItems = ({
       feedContext: postFeedContext,
       reqId: postReqId,
     })
-    logger.metric('post:showMore', {
-      uri: postUri,
-      authorDid: postAuthor.did,
-      logContext,
-      feedDescriptor: feedFeedback.feedDescriptor,
-    })
     Toast.show(
       _(msg({message: 'Feedback sent to feed operator', context: 'toast'})),
     )
@@ -304,12 +284,6 @@ let PostMenuItems = ({
       feedContext: postFeedContext,
       reqId: postReqId,
     })
-    logger.metric('post:showLess', {
-      uri: postUri,
-      authorDid: postAuthor.did,
-      logContext,
-      feedDescriptor: feedFeedback.feedDescriptor,
-    })
     if (onShowLess) {
       onShowLess({
         item: postUri,

src/components/PostControls/PostMenu/index.tsx

@@ -29,7 +29,6 @@ let PostMenuButton = ({
   threadgateRecord,
   onShowLess,
   hitSlop,
-  logContext,
 }: {
   testID: string
   post: Shadow<AppBskyFeedDefs.PostView>
@@ -42,7 +41,6 @@ let PostMenuButton = ({
   threadgateRecord?: AppBskyFeedThreadgate.Record
   onShowLess?: (interaction: AppBskyFeedDefs.Interaction) => void
   hitSlop?: Insets
-  logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
 }): React.ReactNode => {
   const {_} = useLingui()
 
@@ -89,7 +87,6 @@ let PostMenuButton = ({
             timestamp={timestamp}
             threadgateRecord={threadgateRecord}
             onShowLess={onShowLess}
-            logContext={logContext}
           />
         )}
       </Menu.Root>

src/components/PostControls/ShareMenu/index.tsx

@@ -16,7 +16,6 @@ import {useGate} from '#/lib/statsig/statsig'
 import {toShareUrl} from '#/lib/strings/url-helpers'
 import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/post-shadow'
-import {useFeedFeedbackContext} from '#/state/feed-feedback'
 import {EventStopper} from '#/view/com/util/EventStopper'
 import {native} from '#/alf'
 import {ArrowOutOfBoxModified_Stroke2_Corner2_Rounded as ArrowOutOfBoxIcon} from '#/components/icons/ArrowOutOfBox'
@@ -36,7 +35,6 @@ let ShareMenuButton = ({
   threadgateRecord,
   onShare,
   hitSlop,
-  logContext,
 }: {
   testID: string
   post: Shadow<AppBskyFeedDefs.PostView>
@@ -47,11 +45,9 @@ let ShareMenuButton = ({
   threadgateRecord?: AppBskyFeedThreadgate.Record
   onShare: () => void
   hitSlop?: Insets
-  logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
 }): React.ReactNode => {
   const {_} = useLingui()
   const gate = useGate()
-  const {feedDescriptor} = useFeedFeedbackContext()
 
   const ShareIcon = gate('alt_share_icon')
     ? ArrowShareRightIcon
@@ -69,27 +65,13 @@ let ShareMenuButton = ({
         setTimeout(menuControl.open)
 
         logger.metric(
-          'post:share',
-          {
-            uri: post.uri,
-            authorDid: post.author.did,
-            logContext,
-            feedDescriptor,
-            postContext: big ? 'thread' : 'feed',
-          },
+          'share:open',
+          {context: big ? 'thread' : 'feed'},
           {statsig: true},
         )
       },
     }),
-    [
-      menuControl,
-      setHasBeenOpen,
-      big,
-      logContext,
-      feedDescriptor,
-      post.uri,
-      post.author.did,
-    ],
+    [menuControl, setHasBeenOpen, big],
   )
 
   const onNativeLongPress = () => {

src/components/PostControls/index.tsx

@@ -13,7 +13,6 @@ import {CountWheel} from '#/lib/custom-animations/CountWheel'
 import {AnimatedLikeIcon} from '#/lib/custom-animations/LikeIcon'
 import {useHaptics} from '#/lib/haptics'
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
-import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/types'
 import {useFeedFeedbackContext} from '#/state/feed-feedback'
 import {
@@ -175,12 +174,6 @@ let PostControls = ({
       feedContext,
       reqId,
     })
-    logger.metric('post:clickQuotePost', {
-      uri: post.uri,
-      authorDid: post.author.did,
-      logContext,
-      feedDescriptor,
-    })
     openComposer({
       quote: post,
       onPost: onPostReply,
@@ -224,16 +217,7 @@ let PostControls = ({
             testID="replyBtn"
             onPress={
               !replyDisabled
-                ? () =>
-                    requireAuth(() => {
-                      logger.metric('post:clickReply', {
-                        uri: post.uri,
-                        authorDid: post.author.did,
-                        logContext,
-                        feedDescriptor,
-                      })
-                      onPressReply()
-                    })
+                ? () => requireAuth(() => onPressReply())
                 : undefined
             }
             label={_(
@@ -331,7 +315,6 @@ let PostControls = ({
             left: secondaryControlSpacingStyles.gap / 2,
             right: secondaryControlSpacingStyles.gap / 2,
           }}
-          logContext={logContext}
         />
         <PostMenuButton
           testID="postDropdownBtn"
@@ -347,7 +330,6 @@ let PostControls = ({
           hitSlop={{
             left: secondaryControlSpacingStyles.gap / 2,
           }}
-          logContext={logContext}
         />
       </View>
     </View>

src/components/ProfileHoverCard/index.web.tsx

@@ -389,7 +389,6 @@ let Card = ({
       {data && moderationOpts ? (
         status.isActive ? (
           <LiveStatus
-            status={status}
             profile={data}
             embed={status.embed}
             padding="lg"

src/components/ProgressGuide/FollowDialog.tsx

@@ -31,8 +31,8 @@ import {
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import {useInteractionState} from '#/components/hooks/useInteractionState'
-import {ArrowRight_Stroke2_Corner0_Rounded as ArrowRightIcon} from '#/components/icons/Arrow'
 import {MagnifyingGlass_Stroke2_Corner0_Rounded as SearchIcon} from '#/components/icons/MagnifyingGlass'
+import {PersonGroup_Stroke2_Corner2_Rounded as PersonGroupIcon} from '#/components/icons/Person'
 import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
 import {boostInterests, InterestTabs} from '#/components/InterestTabs'
 import * as ProfileCard from '#/components/ProfileCard'
@@ -60,16 +60,10 @@ type Item =
       key: string
     }
 
-export function FollowDialog({
-  guide,
-  showArrow,
-}: {
-  guide: Follow10ProgressGuide
-  showArrow?: boolean
-}) {
+export function FollowDialog({guide}: {guide: Follow10ProgressGuide}) {
   const {_} = useLingui()
   const control = Dialog.useDialogControl()
-  const {gtPhone} = useBreakpoints()
+  const {gtMobile} = useBreakpoints()
   const {height: minHeight} = useWindowDimensions()
 
   return (
@@ -80,12 +74,13 @@ export function FollowDialog({
           control.open()
           logEvent('progressGuide:followDialog:open', {})
         }}
-        size={gtPhone ? 'small' : 'large'}
-        color="primary">
+        size={gtMobile ? 'small' : 'large'}
+        color="primary"
+        variant="solid">
+        <ButtonIcon icon={PersonGroupIcon} />
         <ButtonText>
           <Trans>Find people to follow</Trans>
         </ButtonText>
-        {showArrow && <ButtonIcon icon={ArrowRightIcon} />}
       </Button>
       <Dialog.Outer control={control} nativeOptions={{minHeight}}>
         <Dialog.Handle />

src/components/ProgressGuide/List.tsx

@@ -2,62 +2,37 @@ import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useProfileFollowsQuery} from '#/state/queries/profile-follows'
-import {useSession} from '#/state/session'
 import {
   useProgressGuide,
   useProgressGuideControls,
 } from '#/state/shell/progress-guide'
-import {UserAvatar} from '#/view/com/util/UserAvatar'
-import {atoms as a, useBreakpoints, useLayoutBreakpoints, useTheme} from '#/alf'
+import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonIcon} from '#/components/Button'
-import {Person_Stroke2_Corner2_Rounded as PersonIcon} from '#/components/icons/Person'
 import {TimesLarge_Stroke2_Corner0_Rounded as Times} from '#/components/icons/Times'
 import {Text} from '#/components/Typography'
-import type * as bsky from '#/types/bsky'
 import {FollowDialog} from './FollowDialog'
 import {ProgressGuideTask} from './Task'
 
-const TOTAL_AVATARS = 10
-
 export function ProgressGuideList({style}: {style?: StyleProp<ViewStyle>}) {
   const t = useTheme()
   const {_} = useLingui()
-  const {gtPhone} = useBreakpoints()
-  const {rightNavVisible} = useLayoutBreakpoints()
-  const {currentAccount} = useSession()
   const followProgressGuide = useProgressGuide('follow-10')
   const followAndLikeProgressGuide = useProgressGuide('like-10-and-follow-7')
   const guide = followProgressGuide || followAndLikeProgressGuide
   const {endProgressGuide} = useProgressGuideControls()
-  const {data: follows} = useProfileFollowsQuery(currentAccount?.did, {
-    limit: TOTAL_AVATARS,
-  })
-
-  const actualFollowsCount = follows?.pages?.[0]?.follows?.length ?? 0
-
-  // Hide if user already follows 10+ people
-  if (guide?.guide === 'follow-10' && actualFollowsCount >= TOTAL_AVATARS) {
-    return null
-  }
-
-  // Inline layout when left nav visible but no right sidebar (800-1100px)
-  const inlineLayout = gtPhone && !rightNavVisible
 
   if (guide) {
     return (
-      <View
-        style={[
-          a.flex_col,
-          a.gap_md,
-          a.rounded_md,
-          t.atoms.bg_contrast_25,
-          a.p_lg,
-          style,
-        ]}>
+      <View style={[a.flex_col, a.gap_md, style]}>
         <View style={[a.flex_row, a.align_center, a.justify_between]}>
-          <Text style={[t.atoms.text, a.font_semi_bold, a.text_md]}>
-            <Trans>Follow 10 people to get started</Trans>
+          <Text
+            style={[
+              t.atoms.text_contrast_medium,
+              a.font_semi_bold,
+              a.text_sm,
+              {textTransform: 'uppercase'},
+            ]}>
+            <Trans>Getting started</Trans>
           </Text>
           <Button
             variant="ghost"
@@ -65,28 +40,20 @@ export function ProgressGuideList({style}: {style?: StyleProp<ViewStyle>}) {
             color="secondary"
             shape="round"
             label={_(msg`Dismiss getting started guide`)}
-            onPress={endProgressGuide}
-            style={[a.bg_transparent, {marginTop: -6, marginRight: -6}]}>
-            <ButtonIcon icon={Times} size="xs" />
+            onPress={endProgressGuide}>
+            <ButtonIcon icon={Times} size="sm" />
           </Button>
         </View>
         {guide.guide === 'follow-10' && (
-          <View
-            style={[
-              inlineLayout
-                ? [
-                    a.flex_row,
-                    a.flex_wrap,
-                    a.align_center,
-                    a.justify_between,
-                    a.gap_sm,
-                  ]
-                : a.flex_col,
-              !inlineLayout && a.gap_md,
-            ]}>
-            <StackedAvatars follows={follows?.pages?.[0]?.follows} />
-            <FollowDialog guide={guide} showArrow={inlineLayout} />
-          </View>
+          <>
+            <ProgressGuideTask
+              current={guide.numFollows + 1}
+              total={10 + 1}
+              title={_(msg`Follow 10 accounts`)}
+              subtitle={_(msg`Bluesky is better with friends!`)}
+            />
+            <FollowDialog guide={guide} />
+          </>
         )}
         {guide.guide === 'like-10-and-follow-7' && (
           <>
@@ -109,73 +76,3 @@ export function ProgressGuideList({style}: {style?: StyleProp<ViewStyle>}) {
   }
   return null
 }
-
-function StackedAvatars({follows}: {follows?: bsky.profile.AnyProfileView[]}) {
-  const t = useTheme()
-  const {centerColumnOffset} = useLayoutBreakpoints()
-
-  // Smaller avatars for narrower viewport
-  const avatarSize = centerColumnOffset ? 30 : 37
-  const overlap = centerColumnOffset ? 9 : 11
-  const iconSize = centerColumnOffset ? 14 : 18
-
-  // Use actual follows count, not the guide's event counter
-  const followedAvatars = follows?.slice(0, TOTAL_AVATARS) ?? []
-  const remainingSlots = TOTAL_AVATARS - followedAvatars.length
-
-  // Total width calculation: first avatar + (remaining * visible portion)
-  const totalWidth = avatarSize + (TOTAL_AVATARS - 1) * (avatarSize - overlap)
-
-  return (
-    <View style={[a.flex_row, a.self_start, {width: totalWidth}]}>
-      {/* Show followed user avatars */}
-      {followedAvatars.map((follow, i) => (
-        <View
-          key={follow.did}
-          style={[
-            a.rounded_full,
-            {
-              marginLeft: i === 0 ? 0 : -overlap,
-              zIndex: TOTAL_AVATARS - i,
-              borderWidth: 2,
-              borderColor: t.atoms.bg_contrast_25.backgroundColor,
-            },
-          ]}>
-          <UserAvatar
-            type="user"
-            size={avatarSize - 4}
-            avatar={follow.avatar}
-          />
-        </View>
-      ))}
-      {/* Show placeholder avatars for remaining slots */}
-      {Array(remainingSlots)
-        .fill(0)
-        .map((_, i) => (
-          <View
-            key={`placeholder-${i}`}
-            style={[
-              a.align_center,
-              a.justify_center,
-              a.rounded_full,
-              t.atoms.bg_contrast_100,
-              {
-                width: avatarSize,
-                height: avatarSize,
-                marginLeft:
-                  followedAvatars.length === 0 && i === 0 ? 0 : -overlap,
-                zIndex: TOTAL_AVATARS - followedAvatars.length - i,
-                borderWidth: 2,
-                borderColor: t.atoms.bg_contrast_25.backgroundColor,
-              },
-            ]}>
-            <PersonIcon
-              width={iconSize}
-              height={iconSize}
-              fill={t.atoms.text_contrast_low.color}
-            />
-          </View>
-        ))}
-    </View>
-  )
-}

src/components/ProgressGuide/Task.tsx

@@ -31,11 +31,11 @@ export function ProgressGuideTask({
           size={20}
           thickness={3}
           borderWidth={0}
-          unfilledColor={t.palette.contrast_100}
+          unfilledColor={t.palette.contrast_50}
         />
       )}
 
-      <View style={[a.flex_col, a.gap_xs, subtitle && {marginTop: -2}]}>
+      <View style={[a.flex_col, a.gap_2xs, subtitle && {marginTop: -2}]}>
         <Text
           style={[
             a.text_sm,

src/components/RichText.tsx

@@ -11,9 +11,6 @@ import {RichTextTag} from '#/components/RichTextTag'
 import {Text, type TextProps} from '#/components/Typography'
 
 const WORD_WRAP = {wordWrap: 1}
-// lifted from facet detection in `RichText` impl, _without_ `gm` flags
-const URL_REGEX =
-  /(^|\s|\()((https?:\/\/[\S]+)|((?<domain>[a-z][a-z0-9]*(\.[a-z0-9]+)+)[\S]*))/i
 
 export type RichTextProps = TextStyleProp &
   Pick<TextProps, 'selectable' | 'onLayout' | 'onTextLayout'> & {
@@ -118,8 +115,7 @@ export function RichText({
         </ProfileHoverCard>,
       )
     } else if (link && AppBskyRichtextFacet.validateLink(link).success) {
-      const isValidLink = URL_REGEX.test(link.uri)
-      if (!isValidLink || disableLinks) {
+      if (disableLinks) {
         els.push(toShortUrl(segment.text))
       } else {
         els.push(

src/components/RichTextTag.tsx

@@ -48,11 +48,10 @@ export function RichTextTag({
     reset: resetRemove,
   } = useRemoveMutedWordsMutation()
   const navigation = useNavigation<NavigationProp>()
-  const isCashtag = tag.startsWith('$')
-  const label = isCashtag ? _(msg`Cashtag ${tag}`) : _(msg`Hashtag ${tag}`)
+  const label = _(msg`Hashtag ${tag}`)
   const hint = isNative
-    ? _(msg`Long press to open tag menu for ${isCashtag ? tag : `#${tag}`}`)
-    : _(msg`Click to open tag menu for ${isCashtag ? tag : `#${tag}`}`)
+    ? _(msg`Long press to open tag menu for #${tag}`)
+    : _(msg`Click to open tag menu for ${tag}`)
 
   const isMuted = Boolean(
     (preferences?.moderationPrefs.mutedWords?.find(
@@ -110,24 +109,20 @@ export function RichTextTag({
       <Menu.Outer>
         <Menu.Group>
           <Menu.Item
-            label={_(msg`See ${isCashtag ? tag : `#${tag}`} posts`)}
+            label={_(msg`See ${tag} posts`)}
             onPress={() => {
               navigation.push('Hashtag', {
                 tag: encodeURIComponent(tag),
               })
             }}>
             <Menu.ItemText>
-              {isCashtag ? (
-                <Trans>See {tag} posts</Trans>
-              ) : (
-                <Trans>See #{tag} posts</Trans>
-              )}
+              <Trans>See #{tag} posts</Trans>
             </Menu.ItemText>
             <Menu.ItemIcon icon={Search} />
           </Menu.Item>
           {authorHandle && !isInvalidHandle(authorHandle) && (
             <Menu.Item
-              label={_(msg`See ${isCashtag ? tag : `#${tag}`} posts by user`)}
+              label={_(msg`See ${tag} posts by user`)}
               onPress={() => {
                 navigation.push('Hashtag', {
                   tag: encodeURIComponent(tag),
@@ -135,11 +130,7 @@ export function RichTextTag({
                 })
               }}>
               <Menu.ItemText>
-                {isCashtag ? (
-                  <Trans>See {tag} posts by user</Trans>
-                ) : (
-                  <Trans>See #{tag} posts by user</Trans>
-                )}
+                <Trans>See #{tag} posts by user</Trans>
               </Menu.ItemText>
               <Menu.ItemIcon icon={Person} />
             </Menu.Item>

src/components/StarterPack/QrCode.tsx

@@ -1,4 +1,4 @@
-import {lazy, useState} from 'react'
+import {lazy} from 'react'
 import {View} from 'react-native'
 // @ts-expect-error missing types
 import QRCode from 'react-native-qrcode-styled'
@@ -102,74 +102,39 @@ export function QrCode({
 
 export function QrCodeInner({link}: {link: string}) {
   const t = useTheme()
-  const [logoArea, setLogoArea] = useState<{
-    x: number
-    y: number
-    width: number
-    height: number
-  } | null>(null)
-
-  const onLogoAreaChange = (area: {
-    x: number
-    y: number
-    width: number
-    height: number
-  }) => {
-    setLogoArea(area)
-  }
 
   return (
-    <View style={{position: 'relative'}}>
-      {/* An SVG version of the logo is placed on top of normal `QRCode` `logo` prop, since the PNG fails to load before the export completes on web. */}
-      {isWeb && logoArea && (
-        <View
-          style={{
-            position: 'absolute',
-            left: logoArea.x,
-            top: logoArea.y + 1,
-            zIndex: 1,
-            padding: 4,
-          }}>
-          <Logo width={logoArea.width - 14} height={logoArea.height - 14} />
-        </View>
-      )}
-      <QRCode
-        data={link}
-        style={[
-          a.rounded_sm,
-          {height: 225, width: 225, backgroundColor: '#f3f3f3'},
-        ]}
-        pieceSize={isWeb ? 8 : 6}
-        padding={20}
-        pieceBorderRadius={isWeb ? 4.5 : 3.5}
-        outerEyesOptions={{
-          topLeft: {
-            borderRadius: [12, 12, 0, 12],
-            color: t.palette.primary_500,
-          },
-          topRight: {
-            borderRadius: [12, 12, 12, 0],
-            color: t.palette.primary_500,
-          },
-          bottomLeft: {
-            borderRadius: [12, 0, 12, 12],
-            color: t.palette.primary_500,
-          },
-        }}
-        innerEyesOptions={{borderRadius: 3}}
-        logo={{
-          href: require('../../../assets/logo.png'),
-          ...(isWeb && {
-            onChange: onLogoAreaChange,
-            padding: 28,
-          }),
-          ...(!isWeb && {
-            padding: 2,
-            scale: 0.95,
-          }),
-          hidePieces: true,
-        }}
-      />
-    </View>
+    <QRCode
+      data={link}
+      style={[
+        a.rounded_sm,
+        {height: 225, width: 225, backgroundColor: '#f3f3f3'},
+      ]}
+      pieceSize={isWeb ? 8 : 6}
+      padding={20}
+      // pieceLiquidRadius={2}
+      pieceBorderRadius={isWeb ? 4.5 : 3.5}
+      outerEyesOptions={{
+        topLeft: {
+          borderRadius: [12, 12, 0, 12],
+          color: t.palette.primary_500,
+        },
+        topRight: {
+          borderRadius: [12, 12, 12, 0],
+          color: t.palette.primary_500,
+        },
+        bottomLeft: {
+          borderRadius: [12, 0, 12, 12],
+          color: t.palette.primary_500,
+        },
+      }}
+      innerEyesOptions={{borderRadius: 3}}
+      logo={{
+        href: require('../../../assets/logo.png'),
+        scale: 0.95,
+        padding: 2,
+        hidePieces: true,
+      }}
+    />
   )
 }

src/components/TrendingTopics.tsx

@@ -20,12 +20,8 @@ export function TrendingTopic({
   topic: raw,
   size,
   style,
-  hovered,
-}: {
-  topic: TrendingTopic
-  size?: 'large' | 'small'
-  hovered?: boolean
-} & ViewStyleProp) {
+}: {topic: TrendingTopic; size?: 'large' | 'small'} & ViewStyleProp) {
+  const t = useTheme()
   const topic = useTopic(raw)
 
   const isSmall = size === 'small'
@@ -37,14 +33,18 @@ export function TrendingTopic({
       style={[
         a.flex_row,
         a.align_center,
+        a.rounded_full,
+        a.border,
+        t.atoms.border_contrast_medium,
+        t.atoms.bg,
         isSmall
           ? [
               {
-                paddingVertical: 2,
-                paddingHorizontal: 4,
+                paddingVertical: 5,
+                paddingHorizontal: 10,
               },
             ]
-          : [a.py_xs, a.px_sm],
+          : [a.py_sm, a.px_md],
         hasIcon && {gap: 6},
         style,
       ]}>
@@ -93,7 +93,6 @@ export function TrendingTopic({
           a.font_semi_bold,
           a.leading_tight,
           isSmall ? [a.text_sm] : [a.text_md, {paddingBottom: 1}],
-          hovered && {textDecorationLine: 'underline'},
         ]}
         numberOfLines={1}>
         {topic.displayName}

src/components/activity-notifications/SubscribeProfileButton.tsx

@@ -68,12 +68,10 @@ export function SubscribeProfileButton({
 
   const Icon = isSubscribed ? BellRingingIcon : BellPlusIcon
 
-  const tooltipVisible = showTooltip && !disableHint
-
   return (
     <>
       <Tooltip.Outer
-        visible={tooltipVisible}
+        visible={showTooltip && !disableHint}
         onVisibleChange={onDismissTooltip}
         position="bottom">
         <Tooltip.Target>
@@ -81,7 +79,7 @@ export function SubscribeProfileButton({
             accessibilityRole="button"
             testID="dmBtn"
             size="small"
-            color={tooltipVisible ? 'primary_subtle' : 'secondary'}
+            color="secondary"
             shape="round"
             label={_(msg`Get notified when ${name} posts`)}
             onPress={wrappedOnPress}>

src/components/ageAssurance/AgeAssuranceAccountCard.tsx

@@ -8,7 +8,6 @@ import {atoms as a, useBreakpoints, useTheme, type ViewStyleProp} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAppealDialog'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
-import {AgeAssuranceConfigUnavailableError} from '#/components/ageAssurance/AgeAssuranceErrors'
 import {
   AgeAssuranceInitDialog,
   useDialogControl,
@@ -28,13 +27,6 @@ import {useDeviceGeolocationApi} from '#/geolocation'
 export function AgeAssuranceAccountCard({style}: ViewStyleProp & {}) {
   const aa = useAgeAssurance()
   if (aa.state.access === aa.Access.Full) return null
-  if (aa.state.error === 'config') {
-    return (
-      <View style={style}>
-        <AgeAssuranceConfigUnavailableError />
-      </View>
-    )
-  }
   return <Inner style={style} />
 }
 

src/components/ageAssurance/AgeAssuranceAdmonition.tsx

@@ -3,7 +3,6 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {atoms as a, select, useTheme, type ViewStyleProp} from '#/alf'
-import {AgeAssuranceConfigUnavailableError} from '#/components/ageAssurance/AgeAssuranceErrors'
 import {useDialogControl} from '#/components/ageAssurance/AgeAssuranceInitDialog'
 import type * as Dialog from '#/components/Dialog'
 import {ShieldCheck_Stroke2_Corner0_Rounded as Shield} from '#/components/icons/Shield'
@@ -20,9 +19,6 @@ export function AgeAssuranceAdmonition({
   const aa = useAgeAssurance()
 
   if (aa.state.access === aa.Access.Full) return null
-  if (aa.state.error === 'config') {
-    return <AgeAssuranceConfigUnavailableError style={style} />
-  }
 
   return (
     <Inner style={style} control={control}>

src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx

@@ -23,7 +23,6 @@ export function useInternalState() {
   const visible = useMemo(() => {
     if (aa.state.access === aa.Access.Full) return false
     if (aa.state.lastInitiatedAt) return false
-    if (aa.state.error === 'config') return false
     if (hidden) return false
     if (nux && nux.completed) return false
     return true

src/components/ageAssurance/AgeAssuranceDismissibleNotice.tsx

@@ -5,7 +5,6 @@ import {useLingui} from '@lingui/react'
 import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs'
 import {atoms as a, type ViewStyleProp} from '#/alf'
 import {AgeAssuranceAdmonition} from '#/components/ageAssurance/AgeAssuranceAdmonition'
-import {AgeAssuranceConfigUnavailableError} from '#/components/ageAssurance/AgeAssuranceErrors'
 import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
 import {Button, ButtonIcon} from '#/components/Button'
 import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
@@ -27,37 +26,33 @@ export function AgeAssuranceDismissibleNotice({style}: ViewStyleProp & {}) {
 
   return (
     <View style={style}>
-      {aa.state.error === 'config' ? (
-        <AgeAssuranceConfigUnavailableError />
-      ) : (
-        <View>
-          <AgeAssuranceAdmonition>{copy.notice}</AgeAssuranceAdmonition>
+      <View>
+        <AgeAssuranceAdmonition>{copy.notice}</AgeAssuranceAdmonition>
 
-          <Button
-            label={_(msg`Don't show again`)}
-            size="tiny"
-            variant="solid"
-            color="secondary_inverted"
-            shape="round"
-            onPress={() => {
-              save({
-                id: Nux.AgeAssuranceDismissibleNotice,
-                completed: true,
-                data: undefined,
-              })
-              logger.metric('ageAssurance:dismissSettingsNotice', {})
-            }}
-            style={[
-              a.absolute,
-              {
-                top: 12,
-                right: 12,
-              },
-            ]}>
-            <ButtonIcon icon={X} />
-          </Button>
-        </View>
-      )}
+        <Button
+          label={_(msg`Don't show again`)}
+          size="tiny"
+          variant="solid"
+          color="secondary_inverted"
+          shape="round"
+          onPress={() => {
+            save({
+              id: Nux.AgeAssuranceDismissibleNotice,
+              completed: true,
+              data: undefined,
+            })
+            logger.metric('ageAssurance:dismissSettingsNotice', {})
+          }}
+          style={[
+            a.absolute,
+            {
+              top: 12,
+              right: 12,
+            },
+          ]}>
+          <ButtonIcon icon={X} />
+        </Button>
+      </View>
     </View>
   )
 }

src/components/ageAssurance/AgeAssuranceErrors.tsx

@@ -1,37 +0,0 @@
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {type ViewStyleProp} from '#/alf'
-import * as Admonition from '#/components/Admonition'
-import {ButtonIcon, ButtonText} from '#/components/Button'
-import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as RetryIcon} from '#/components/icons/ArrowRotate'
-import {refetchConfig} from '#/ageAssurance/data'
-
-export function AgeAssuranceConfigUnavailableError(props: ViewStyleProp) {
-  const {_} = useLingui()
-  return (
-    <Admonition.Outer type="error" style={props.style}>
-      <Admonition.Row>
-        <Admonition.Icon />
-        <Admonition.Content>
-          <Admonition.Text>
-            <Trans>
-              We were unable to load the age assurance configuration for your
-              region, probably due to a network error. Some content and features
-              may be unavailable temporarily. Please try again later.
-            </Trans>
-          </Admonition.Text>
-        </Admonition.Content>
-        <Admonition.Button
-          color="negative_subtle"
-          label={_(msg`Retry`)}
-          onPress={() => refetchConfig().catch(() => {})}>
-          <ButtonText>
-            <Trans>Retry</Trans>
-          </ButtonText>
-          <ButtonIcon icon={RetryIcon} />
-        </Admonition.Button>
-      </Admonition.Row>
-    </Admonition.Outer>
-  )
-}

src/components/ageAssurance/AgeRestrictedScreen.tsx

@@ -5,7 +5,6 @@ import {useLingui} from '@lingui/react'
 import {atoms as a} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
-import {AgeAssuranceConfigUnavailableError} from '#/components/ageAssurance/AgeAssuranceErrors'
 import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
 import {ButtonIcon, ButtonText} from '#/components/Button'
 import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components/icons/Chevron'
@@ -45,12 +44,6 @@ export function AgeRestrictedScreen({
       </Layout.Header.Outer>
       <Layout.Content>
         <View style={[a.p_lg]}>
-          {aa.state.error === 'config' && (
-            <View style={[a.pb_lg]}>
-              <AgeAssuranceConfigUnavailableError />
-            </View>
-          )}
-
           <View style={[a.align_start, a.pb_lg]}>
             <AgeAssuranceBadge />
           </View>

src/components/dialogs/Context.tsx

@@ -3,7 +3,6 @@ import {createContext, useContext, useMemo, useState} from 'react'
 import {type AgeAssuranceRedirectDialogState} from '#/components/ageAssurance/AgeAssuranceRedirectDialog'
 import * as Dialog from '#/components/Dialog'
 import {type Screen} from '#/components/dialogs/EmailDialog/types'
-import {type ReportSubject} from '#/components/moderation/ReportDialog'
 
 type Control = Dialog.DialogControlProps
 
@@ -25,7 +24,6 @@ type ControlsContext = {
     share?: boolean
   }>
   ageAssuranceRedirectDialogControl: StatefulControl<AgeAssuranceRedirectDialogState>
-  reportDialogControl: StatefulControl<{subject: ReportSubject}>
 }
 
 const ControlsContext = createContext<ControlsContext | null>(null)
@@ -53,9 +51,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
   }>()
   const ageAssuranceRedirectDialogControl =
     useStatefulDialogControl<AgeAssuranceRedirectDialogState>()
-  const reportDialogControl = useStatefulDialogControl<{
-    subject: ReportSubject
-  }>()
 
   const ctx = useMemo<ControlsContext>(
     () => ({
@@ -65,7 +60,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       emailDialogControl,
       linkWarningDialogControl,
       ageAssuranceRedirectDialogControl,
-      reportDialogControl,
     }),
     [
       mutedWordsDialogControl,
@@ -74,7 +68,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       emailDialogControl,
       linkWarningDialogControl,
       ageAssuranceRedirectDialogControl,
-      reportDialogControl,
     ],
   )
 

src/components/dialogs/nuxs/LiveNowBetaDialog.tsx

@@ -1,209 +0,0 @@
-import {useCallback, useMemo} from 'react'
-import {View} from 'react-native'
-import {Image} from 'expo-image'
-import {LinearGradient} from 'expo-linear-gradient'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {isWeb} from '#/platform/detection'
-import {atoms as a, select, useTheme, utils, web} from '#/alf'
-import {Button, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
-import {useNuxDialogContext} from '#/components/dialogs/nuxs'
-import {
-  createIsEnabledCheck,
-  isExistingUserAsOf,
-} from '#/components/dialogs/nuxs/utils'
-import {Beaker_Stroke2_Corner2_Rounded as BeakerIcon} from '#/components/icons/Beaker'
-import {Text} from '#/components/Typography'
-import {IS_E2E} from '#/env'
-
-export const enabled = createIsEnabledCheck(props => {
-  return (
-    !IS_E2E &&
-    isExistingUserAsOf(
-      '2026-01-16T00:00:00.000Z',
-      props.currentProfile.createdAt,
-    ) &&
-    props.gate('live_now_beta')
-  )
-})
-
-export function LiveNowBetaDialog() {
-  const t = useTheme()
-  const {_} = useLingui()
-  const nuxDialogs = useNuxDialogContext()
-  const control = Dialog.useDialogControl()
-
-  Dialog.useAutoOpen(control)
-
-  const onClose = useCallback(() => {
-    nuxDialogs.dismissActiveNux()
-  }, [nuxDialogs])
-
-  const shadowColor = useMemo(() => {
-    return select(t.name, {
-      light: utils.alpha(t.palette.primary_900, 0.4),
-      dark: utils.alpha(t.palette.primary_25, 0.4),
-      dim: utils.alpha(t.palette.primary_25, 0.4),
-    })
-  }, [t])
-
-  return (
-    <Dialog.Outer
-      control={control}
-      onClose={onClose}
-      nativeOptions={{preventExpansion: true}}>
-      <Dialog.Handle fill={t.palette.primary_700} />
-
-      <Dialog.ScrollableInner
-        label={_(msg`Show when you’re live`)}
-        style={[web({maxWidth: 440})]}
-        contentContainerStyle={[
-          {
-            paddingTop: 0,
-            paddingLeft: 0,
-            paddingRight: 0,
-          },
-        ]}>
-        <View
-          style={[
-            a.align_center,
-            a.overflow_hidden,
-            {
-              gap: 16,
-              paddingTop: isWeb ? 24 : 40,
-              borderTopLeftRadius: a.rounded_md.borderRadius,
-              borderTopRightRadius: a.rounded_md.borderRadius,
-            },
-          ]}>
-          <LinearGradient
-            colors={[
-              t.palette.primary_100,
-              utils.alpha(t.palette.primary_100, 0),
-            ]}
-            locations={[0, 1]}
-            start={{x: 0, y: 0}}
-            end={{x: 0, y: 1}}
-            style={[a.absolute, a.inset_0]}
-          />
-          <View style={[a.flex_row, a.align_center, a.gap_xs]}>
-            <BeakerIcon fill={t.palette.primary_700} size="sm" />
-            <Text
-              style={[
-                a.font_semi_bold,
-                {
-                  color: t.palette.primary_700,
-                },
-              ]}>
-              <Trans>Beta Feature</Trans>
-            </Text>
-          </View>
-
-          <View
-            style={[
-              a.relative,
-              a.w_full,
-              {
-                paddingTop: 8,
-                paddingHorizontal: 32,
-                paddingBottom: 32,
-              },
-            ]}>
-            <View
-              style={[
-                {
-                  borderRadius: 24,
-                  aspectRatio: 652 / 211,
-                },
-                isWeb
-                  ? [
-                      {
-                        boxShadow: `0px 10px 15px -3px ${shadowColor}`,
-                      },
-                    ]
-                  : [
-                      t.atoms.shadow_md,
-                      {
-                        shadowColor,
-                        shadowOpacity: 0.2,
-                        shadowOffset: {
-                          width: 0,
-                          height: 10,
-                        },
-                      },
-                    ],
-              ]}>
-              <Image
-                accessibilityIgnoresInvertColors
-                source={require('../../../../assets/images/live_now_beta.webp')}
-                style={[
-                  a.w_full,
-                  {
-                    aspectRatio: 652 / 211,
-                  },
-                ]}
-                alt={_(
-                  msg({
-                    message: `A screenshot of a post from @esb.lol, showing the user is currently livestreaming content on Twitch. The post reads: "Hello! I'm live on Twitch, and I'm testing Bluesky's latest feature too!"`,
-                    comment:
-                      'Contains a post that originally appeared in English. Consider translating the post text if it makes sense in your language, and noting that the post was translated from English.',
-                  }),
-                )}
-              />
-            </View>
-          </View>
-        </View>
-        <View style={[a.align_center, a.px_xl, a.gap_2xl, a.pb_sm]}>
-          <View style={[a.gap_sm, a.align_center]}>
-            <Text
-              style={[
-                a.text_3xl,
-                a.leading_tight,
-                a.font_bold,
-                a.text_center,
-                {
-                  fontSize: isWeb ? 28 : 32,
-                  maxWidth: 360,
-                },
-              ]}>
-              <Trans>Show when you’re live</Trans>
-            </Text>
-            <Text
-              style={[
-                a.text_md,
-                a.leading_snug,
-                a.text_center,
-                {
-                  maxWidth: 340,
-                },
-              ]}>
-              <Trans>
-                Streaming on Twitch? Set your live status on Bluesky to add a
-                badge to your avatar. Tapping it takes people straight to your
-                stream.
-              </Trans>
-            </Text>
-          </View>
-
-          {!isWeb && (
-            <Button
-              label={_(msg`Close`)}
-              size="large"
-              color="primary"
-              onPress={() => {
-                control.close()
-              }}
-              style={[a.w_full]}>
-              <ButtonText>
-                <Trans>Close</Trans>
-              </ButtonText>
-            </Button>
-          )}
-        </View>
-
-        <Dialog.Close />
-      </Dialog.ScrollableInner>
-    </Dialog.Outer>
-  )
-}

src/components/dialogs/nuxs/index.tsx

@@ -20,9 +20,9 @@ import {useProfileQuery} from '#/state/queries/profile'
 import {type SessionAccount, useSession} from '#/state/session'
 import {useOnboardingState} from '#/state/shell'
 import {
-  enabled as isLiveNowBetaDialogEnabled,
-  LiveNowBetaDialog,
-} from '#/components/dialogs/nuxs/LiveNowBetaDialog'
+  enabled as isFindContactsAnnouncementEnabled,
+  FindContactsAnnouncement,
+} from '#/components/dialogs/nuxs/FindContactsAnnouncement'
 import {isSnoozed, snooze, unsnooze} from '#/components/dialogs/nuxs/snoozing'
 import {type EnabledCheckProps} from '#/components/dialogs/nuxs/utils'
 import {useGeolocation} from '#/geolocation'
@@ -37,8 +37,8 @@ const queuedNuxs: {
   enabled?: (props: EnabledCheckProps) => boolean
 }[] = [
   {
-    id: Nux.LiveNowBetaDialog,
-    enabled: isLiveNowBetaDialogEnabled,
+    id: Nux.FindContactsAnnouncement,
+    enabled: isFindContactsAnnouncementEnabled,
   },
 ]
 
@@ -186,7 +186,9 @@ function Inner({
   return (
     <Context.Provider value={ctx}>
       {/*For example, activeNux === Nux.NeueTypography && <NeueTypography />*/}
-      {activeNux === Nux.LiveNowBetaDialog && <LiveNowBetaDialog />}
+      {activeNux === Nux.FindContactsAnnouncement && (
+        <FindContactsAnnouncement />
+      )}
     </Context.Provider>
   )
 }

src/components/interstitials/Trending.tsx

@@ -41,7 +41,7 @@ export function Inner() {
   }, [setTrendingDisabled])
 
   return error || noTopics ? null : (
-    <View style={[t.atoms.border_contrast_low, a.border_t, a.border_b]}>
+    <View style={[t.atoms.border_contrast_low, a.border_t]}>
       <BlockDrawerGesture>
         <ScrollView
           horizontal
@@ -99,9 +99,10 @@ export function Inner() {
                     <View style={[a.py_lg]}>
                       <Text
                         style={[
-                          t.atoms.text_contrast_medium,
+                          t.atoms.text,
                           a.text_sm,
                           a.font_semi_bold,
+                          {opacity: 0.7}, // NOTE: we use opacity 0.7 instead of a color to match the color of the home pager tab bar
                         ]}>
                         {topic.topic}
                       </Text>

src/components/live/EditLiveDialog.tsx

@@ -18,6 +18,7 @@ import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import * as TextField from '#/components/forms/TextField'
 import {Clock_Stroke2_Corner0_Rounded as ClockIcon} from '#/components/icons/Clock'
+import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons/Warning'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {LinkPreview} from './LinkPreview'
@@ -171,13 +172,26 @@ function DialogInner({
             </TextField.Root>
           </View>
           {(liveLinkError || linkMetaError) && (
-            <Admonition type="error">
-              {liveLinkError ? (
-                <Trans>This is not a valid link</Trans>
-              ) : (
-                cleanError(linkMetaError)
-              )}
-            </Admonition>
+            <View style={[a.flex_row, a.gap_xs, a.align_center]}>
+              <WarningIcon
+                style={[{color: t.palette.negative_500}]}
+                size="sm"
+              />
+              <Text
+                style={[
+                  a.text_sm,
+                  a.leading_snug,
+                  a.flex_1,
+                  a.font_semi_bold,
+                  {color: t.palette.negative_500},
+                ]}>
+                {liveLinkError ? (
+                  <Trans>This is not a valid link</Trans>
+                ) : (
+                  cleanError(linkMetaError)
+                )}
+              </Text>
+            </View>
           )}
 
           <LinkPreview linkMeta={linkMeta} loading={linkMetaLoading} />

src/components/live/GoLiveDialog.tsx

@@ -6,14 +6,13 @@ import {useLingui} from '@lingui/react'
 import {cleanError} from '#/lib/strings/errors'
 import {definitelyUrl} from '#/lib/strings/url-helpers'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {useLiveNowConfig} from '#/state/service-config'
 import {useTickEveryMinute} from '#/state/shell'
 import {atoms as a, ios, native, platform, useTheme, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import * as TextField from '#/components/forms/TextField'
-import {getLiveServiceNames} from '#/components/live/utils'
+import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons/Warning'
 import {Loader} from '#/components/Loader'
 import * as ProfileCard from '#/components/ProfileCard'
 import * as Select from '#/components/Select'
@@ -50,10 +49,6 @@ function DialogInner({profile}: {profile: bsky.profile.AnyProfileView}) {
   const [duration, setDuration] = useState(60)
   const moderationOpts = useModerationOpts()
   const tick = useTickEveryMinute()
-  const liveNowConfig = useLiveNowConfig()
-  const {formatted: allowedServices} = getLiveServiceNames(
-    liveNowConfig.allowedDomains,
-  )
 
   const time = useCallback(
     (offset: number) => {
@@ -144,21 +139,27 @@ function DialogInner({profile}: {profile: bsky.profile.AnyProfileView}) {
               />
             </TextField.Root>
           </View>
-          {liveLinkError || linkMetaError ? (
-            <Admonition type="error">
-              {liveLinkError ? (
-                <Trans>This is not a valid link</Trans>
-              ) : (
-                cleanError(linkMetaError)
-              )}
-            </Admonition>
-          ) : (
-            <Admonition type="tip">
-              <Trans>
-                The following services are enabled for your account:{' '}
-                {allowedServices}
-              </Trans>
-            </Admonition>
+          {(liveLinkError || linkMetaError) && (
+            <View style={[a.flex_row, a.gap_xs, a.align_center]}>
+              <WarningIcon
+                style={[{color: t.palette.negative_500}]}
+                size="sm"
+              />
+              <Text
+                style={[
+                  a.text_sm,
+                  a.leading_snug,
+                  a.flex_1,
+                  a.font_semi_bold,
+                  {color: t.palette.negative_500},
+                ]}>
+                {liveLinkError ? (
+                  <Trans>This is not a valid link</Trans>
+                ) : (
+                  cleanError(linkMetaError)
+                )}
+              </Text>
+            </View>
           )}
 
           <LinkPreview linkMeta={linkMeta} loading={linkMetaLoading} />

src/components/live/GoLiveDisabledDialog.tsx

@@ -1,147 +0,0 @@
-import {useCallback, useState} from 'react'
-import {View} from 'react-native'
-import {type AppBskyActorDefs, ToolsOzoneReportDefs} from '@atproto/api'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-import {useMutation} from '@tanstack/react-query'
-
-import {BLUESKY_MOD_SERVICE_HEADERS} from '#/lib/constants'
-import {logger} from '#/logger'
-import {useAgent} from '#/state/session'
-import {atoms as a, web} from '#/alf'
-import {Button, ButtonIcon, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
-import {Loader} from '#/components/Loader'
-import * as Toast from '#/components/Toast'
-import {Text} from '#/components/Typography'
-
-export function GoLiveDisabledDialog({
-  control,
-  status,
-}: {
-  control: Dialog.DialogControlProps
-  status: AppBskyActorDefs.StatusView
-}) {
-  return (
-    <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
-      <Dialog.Handle />
-      <DialogInner control={control} status={status} />
-    </Dialog.Outer>
-  )
-}
-
-export function DialogInner({
-  control,
-  status,
-}: {
-  control: Dialog.DialogControlProps
-  status: AppBskyActorDefs.StatusView
-}) {
-  const {_} = useLingui()
-  const agent = useAgent()
-  const [details, setDetails] = useState('')
-
-  const {mutate, isPending} = useMutation({
-    mutationFn: async () => {
-      if (!agent.session?.did) {
-        throw new Error('Not logged in')
-      }
-      if (!status.uri || !status.cid) {
-        throw new Error('Status is missing uri or cid')
-      }
-
-      if (__DEV__) {
-        logger.info('Submitting go live appeal', {
-          details,
-        })
-      } else {
-        await agent.createModerationReport(
-          {
-            reasonType: ToolsOzoneReportDefs.REASONAPPEAL,
-            subject: {
-              $type: 'com.atproto.repo.strongRef',
-              uri: status.uri,
-              cid: status.cid,
-            },
-            reason: details,
-          },
-          {
-            encoding: 'application/json',
-            headers: BLUESKY_MOD_SERVICE_HEADERS,
-          },
-        )
-      }
-    },
-    onError: () => {
-      Toast.show(_(msg`Failed to submit appeal, please try again.`), {
-        type: 'error',
-      })
-    },
-    onSuccess: () => {
-      control.close()
-      Toast.show(_(msg({message: 'Appeal submitted', context: 'toast'})), {
-        type: 'success',
-      })
-    },
-  })
-
-  const onSubmit = useCallback(() => mutate(), [mutate])
-
-  return (
-    <Dialog.ScrollableInner
-      label={_(msg`Appeal livestream suspension`)}
-      style={[web({maxWidth: 400})]}>
-      <View style={[a.gap_lg]}>
-        <View style={[a.gap_md]}>
-          <Text
-            style={[
-              a.flex_1,
-              a.text_2xl,
-              a.font_semi_bold,
-              a.leading_snug,
-              a.pr_4xl,
-            ]}>
-            <Trans>Going live is currently disabled for your account</Trans>
-          </Text>
-          <Text style={[a.text_md, a.leading_snug]}>
-            <Trans>
-              You are currently blocked from using the Go Live feature. To
-              appeal this moderation decision, please submit the form below.
-            </Trans>
-          </Text>
-          <Text style={[a.text_md, a.leading_snug]}>
-            <Trans>
-              This appeal will be sent to Bluesky's moderation service.
-            </Trans>
-          </Text>
-        </View>
-
-        <View style={[a.gap_md]}>
-          <Dialog.Input
-            label={_(msg`Text input field`)}
-            placeholder={_(
-              msg`Please explain why you think your Go Live access was incorrectly disabled.`,
-            )}
-            value={details}
-            onChangeText={setDetails}
-            autoFocus={true}
-            numberOfLines={3}
-            multiline
-            maxLength={300}
-          />
-          <Button
-            testID="submitBtn"
-            variant="solid"
-            color="primary"
-            size="large"
-            onPress={onSubmit}
-            label={_(msg`Submit`)}>
-            <ButtonText>{_(msg`Submit`)}</ButtonText>
-            {isPending && <ButtonIcon icon={Loader} />}
-          </Button>
-        </View>
-      </View>
-      <Dialog.Close />
-    </Dialog.ScrollableInner>
-  )
-}

src/components/live/LiveStatusDialog.tsx

@@ -17,9 +17,6 @@ import {unstableCacheProfileView} from '#/state/queries/profile'
 import {android, atoms as a, platform, tokens, useTheme, web} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
-import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfoIcon} from '#/components/icons/CircleInfo'
-import {createStaticClick, SimpleInlineLinkText} from '#/components/Link'
-import {useGlobalReportDialogControl} from '#/components/moderation/ReportDialog'
 import * as ProfileCard from '#/components/ProfileCard'
 import {Text} from '#/components/Typography'
 import type * as bsky from '#/types/bsky'
@@ -31,7 +28,6 @@ export function LiveStatusDialog({
   control,
   profile,
   embed,
-  status,
 }: {
   control: Dialog.DialogControlProps
   profile: bsky.profile.AnyProfileView
@@ -42,12 +38,7 @@ export function LiveStatusDialog({
   return (
     <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle difference={!!embed.external.thumb} />
-      <DialogInner
-        status={status}
-        profile={profile}
-        embed={embed}
-        navigation={navigation}
-      />
+      <DialogInner profile={profile} embed={embed} navigation={navigation} />
     </Dialog.Outer>
   )
 }
@@ -56,12 +47,10 @@ function DialogInner({
   profile,
   embed,
   navigation,
-  status,
 }: {
   profile: bsky.profile.AnyProfileView
   embed: AppBskyEmbedExternal.View
   navigation: NavigationProp
-  status: AppBskyActorDefs.StatusView
 }) {
   const {_} = useLingui()
   const control = Dialog.useDialogContext()
@@ -80,7 +69,6 @@ function DialogInner({
       contentContainerStyle={[a.pt_0, a.px_0]}
       style={[web({maxWidth: 420}), a.overflow_hidden]}>
       <LiveStatus
-        status={status}
         profile={profile}
         embed={embed}
         onPressOpenProfile={onPressOpenProfile}
@@ -91,13 +79,11 @@ function DialogInner({
 }
 
 export function LiveStatus({
-  status,
   profile,
   embed,
   padding = 'xl',
   onPressOpenProfile,
 }: {
-  status: AppBskyActorDefs.StatusView
   profile: bsky.profile.AnyProfileView
   embed: AppBskyEmbedExternal.View
   padding?: 'lg' | 'xl'
@@ -108,8 +94,6 @@ export function LiveStatus({
   const queryClient = useQueryClient()
   const openLink = useOpenLink()
   const moderationOpts = useModerationOpts()
-  const reportDialogControl = useGlobalReportDialogControl()
-  const dialogContext = Dialog.useDialogContext()
 
   return (
     <>
@@ -221,43 +205,15 @@ export function LiveStatus({
             </Button>
           </ProfileCard.Header>
         )}
-        <View
+        <Text
           style={[
-            a.flex_row,
-            a.align_center,
-            a.justify_between,
-            a.flex_1,
-            a.pt_sm,
+            a.w_full,
+            a.text_center,
+            t.atoms.text_contrast_low,
+            a.text_sm,
           ]}>
-          <View style={[a.flex_row, a.align_center, a.gap_xs, a.flex_1]}>
-            <CircleInfoIcon size="sm" fill={t.atoms.text_contrast_low.color} />
-            <Text style={[t.atoms.text_contrast_low, a.text_sm]}>
-              <Trans>Live feature is in beta</Trans>
-            </Text>
-          </View>
-          {status && (
-            <SimpleInlineLinkText
-              label={_(msg`Report this livestream`)}
-              {...createStaticClick(() => {
-                function open() {
-                  reportDialogControl.open({
-                    subject: {
-                      ...status,
-                      $type: 'app.bsky.actor.defs#statusView',
-                    },
-                  })
-                }
-                if (dialogContext.isWithinDialog) {
-                  dialogContext.close(open)
-                } else {
-                  open()
-                }
-              })}
-              style={[a.text_sm, a.underline, t.atoms.text_contrast_medium]}>
-              <Trans>Report</Trans>
-            </SimpleInlineLinkText>
-          )}
-        </View>
+          <Trans>Live feature is in beta testing</Trans>
+        </Text>
       </View>
     </>
   )

src/components/live/queries.ts

@@ -18,10 +18,10 @@ import {useLiveNowConfig} from '#/state/service-config'
 import {useAgent, useSession} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
 import {useDialogContext} from '#/components/Dialog'
-import {getLiveServiceNames} from '#/components/live/utils'
 
 export function useLiveLinkMetaQuery(url: string | null) {
   const liveNowConfig = useLiveNowConfig()
+  const {currentAccount} = useSession()
   const {_} = useLingui()
 
   const agent = useAgent()
@@ -30,14 +30,13 @@ export function useLiveLinkMetaQuery(url: string | null) {
     queryKey: ['link-meta', url],
     queryFn: async () => {
       if (!url) return undefined
+      const config = liveNowConfig.find(cfg => cfg.did === currentAccount?.did)
+
+      if (!config) throw new Error(_(msg`You are not allowed to go live`))
+
       const urlp = new URL(url)
-      if (!liveNowConfig.allowedDomains.has(urlp.hostname)) {
-        const {formatted} = getLiveServiceNames(liveNowConfig.allowedDomains)
-        throw new Error(
-          _(
-            msg`This service is not supported while the Live feature is in beta. Allowed services: ${formatted}.`,
-          ),
-        )
+      if (!config.domains.includes(urlp.hostname)) {
+        throw new Error(_(msg`${urlp.hostname} is not a valid URL`))
       }
 
       return await getLinkMeta(agent, url)

src/components/live/utils.ts

@@ -35,28 +35,3 @@ export function useDebouncedValue<T>(val: T, delayMs: number): T {
 
   return prev
 }
-
-const serviceUrlToNameMap: Record<string, string> = {
-  'twitch.tv': 'Twitch',
-  'www.twitch.tv': 'Twitch',
-  'youtube.com': 'YouTube',
-  'www.youtube.com': 'YouTube',
-  'youtu.be': 'YouTube',
-  'nba.com': 'NBA',
-  'www.nba.com': 'NBA',
-  'nba.smart.link': 'nba.smart.link',
-  'espn.com': 'ESPN',
-  'www.espn.com': 'ESPN',
-  'stream.place': 'Streamplace',
-  'skylight.social': 'Skylight',
-}
-
-export function getLiveServiceNames(domains: Set<string>) {
-  const names = Array.from(
-    new Set(Array.from(domains.values()).map(d => serviceUrlToNameMap[d] || d)),
-  )
-  return {
-    names,
-    formatted: names.join(', '),
-  }
-}

src/components/moderation/ReportDialog/action.ts

@@ -70,7 +70,6 @@ export function useSubmitReportMutation() {
           }
           break
         }
-        case 'status':
         case 'post':
         case 'list':
         case 'feed':

src/components/moderation/ReportDialog/const.ts

@@ -3,8 +3,6 @@ import {
   ToolsOzoneReportDefs as OzoneReportDefs,
 } from '@atproto/api'
 
-import {type ParsedReportSubject} from '#/components/moderation/ReportDialog/types'
-
 export const DMCA_LINK = 'https://bsky.social/about/support/copyright'
 export const SUPPORT_PAGE = 'https://bsky.social/about/support'
 
@@ -114,10 +112,3 @@ export const BSKY_LABELER_ONLY_REPORT_REASONS: Set<OzoneReportDefs.ReasonType> =
     OzoneReportDefs.REASONCHILDSAFETYOTHER,
     OzoneReportDefs.REASONVIOLENCEEXTREMISTCONTENT,
   ])
-
-/**
- * Set of _parsed_ subject types that should only be sent to Bluesky's
- * moderation service.
- */
-export const BSKY_LABELER_ONLY_SUBJECT_TYPES: Set<ParsedReportSubject['type']> =
-  new Set(['convoMessage', 'status'])

src/components/moderation/ReportDialog/copy.ts

@@ -14,12 +14,6 @@ export function useCopyForSubject(subject: ParsedReportSubject) {
           subtitle: _(msg`Why should this user be reviewed?`),
         }
       }
-      case 'status': {
-        return {
-          title: _(msg`Report this livestream`),
-          subtitle: _(msg`Why should this livestream be reviewed?`),
-        }
-      }
       case 'post': {
         return {
           title: _(msg`Report this post`),

src/components/moderation/ReportDialog/index.tsx

@@ -16,7 +16,6 @@ import {atoms as a, useGutters, useTheme} from '#/alf'
 import * as Admonition from '#/components/Admonition'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
-import {useGlobalDialogsControlContext} from '#/components/dialogs/Context'
 import {useDelayedLoading} from '#/components/hooks/useDelayedLoading'
 import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as Retry} from '#/components/icons/ArrowRotate'
 import {
@@ -32,7 +31,6 @@ import {Text} from '#/components/Typography'
 import {useSubmitReportMutation} from './action'
 import {
   BSKY_LABELER_ONLY_REPORT_REASONS,
-  BSKY_LABELER_ONLY_SUBJECT_TYPES,
   NEW_TO_OLD_REASONS_MAP,
   SUPPORT_PAGE,
 } from './const'
@@ -46,27 +44,17 @@ import {
   useReportOptions,
 } from './utils/useReportOptions'
 
-export {type ReportSubject} from './types'
 export {useDialogControl as useReportDialogControl} from '#/components/Dialog'
 
-export function useGlobalReportDialogControl() {
-  return useGlobalDialogsControlContext().reportDialogControl
-}
-
 const logger = Logger.create(Logger.Context.ReportDialog)
 
-export function GlobalReportDialog() {
-  const {value, control} = useGlobalReportDialogControl()
-  return <ReportDialog control={control} subject={value?.subject} />
-}
-
 export function ReportDialog(
   props: Omit<ReportDialogProps, 'subject'> & {
-    subject?: ReportSubject
+    subject: ReportSubject
   },
 ) {
   const subject = React.useMemo(
-    () => (props.subject ? parseReportSubject(props.subject) : undefined),
+    () => parseReportSubject(props.subject),
     [props.subject],
   )
   const onClose = React.useCallback(() => {
@@ -128,10 +116,8 @@ function Inner(props: ReportDialogProps) {
   const isBskyOnlyReason = state?.selectedOption?.reason
     ? BSKY_LABELER_ONLY_REPORT_REASONS.has(state.selectedOption.reason)
     : false
-  // some subjects ONLY go to Bluesky
-  const isBskyOnlySubject = BSKY_LABELER_ONLY_SUBJECT_TYPES.has(
-    props.subject.type,
-  )
+  // some subjects (chats) only go to Bluesky
+  const isBskyOnlySubject = props.subject.type === 'convoMessage'
 
   /**
    * Labelers that support this `subject` and its NSID collection
@@ -838,7 +824,12 @@ function LabelerCard({
               {title}
             </Text>
             <Text
-              style={[a.text_sm, a.leading_snug, t.atoms.text_contrast_medium]}>
+              style={[
+                a.text_sm,
+                ,
+                a.leading_snug,
+                t.atoms.text_contrast_medium,
+              ]}>
               <Trans>By {sanitizeHandle(labeler.creator.handle, '@')}</Trans>
             </Text>
           </View>

src/components/moderation/ReportDialog/types.ts

@@ -18,7 +18,6 @@ export type ReportSubject =
   | $Typed<AppBskyActorDefs.ProfileViewBasic>
   | $Typed<AppBskyActorDefs.ProfileView>
   | $Typed<AppBskyActorDefs.ProfileViewDetailed>
-  | $Typed<AppBskyActorDefs.StatusView>
   | $Typed<AppBskyGraphDefs.ListView>
   | $Typed<AppBskyFeedDefs.GeneratorView>
   | $Typed<AppBskyGraphDefs.StarterPackView>
@@ -39,12 +38,6 @@ export type ParsedReportSubject =
         quote: boolean
       }
     }
-  | {
-      type: 'status'
-      uri: string
-      cid: string
-      nsid: string
-    }
   | {
       type: 'list'
       uri: string

src/components/moderation/ReportDialog/utils/parseReportSubject.ts

@@ -33,14 +33,6 @@ export function parseReportSubject(
       did: subject.did,
       nsid: 'app.bsky.actor.profile',
     }
-  } else if (AppBskyActorDefs.isStatusView(subject)) {
-    if (!subject.uri || !subject.cid) return
-    return {
-      type: 'status',
-      uri: subject.uri,
-      cid: subject.cid,
-      nsid: 'app.bsky.actor.status',
-    }
   } else if (AppBskyGraphDefs.isListView(subject)) {
     return {
       type: 'list',

src/env/common.ts

@@ -108,18 +108,8 @@ export const GCP_PROJECT_ID: number =
  * URLs for the app config web worker. Can be a
  * locally running server, see `env.example` for more.
  */
-export const GEOLOCATION_DEV_URL = process.env.GEOLOCATION_DEV_URL
-export const GEOLOCATION_PROD_URL = `https://ip.bsky.app`
-export const GEOLOCATION_URL = IS_DEV
-  ? (GEOLOCATION_DEV_URL ?? GEOLOCATION_PROD_URL)
-  : GEOLOCATION_PROD_URL
-
-/**
- * URLs for the live-event config web worker. Can be a
- * locally running server, see `env.example` for more.
- */
-export const LIVE_EVENTS_DEV_URL = process.env.LIVE_EVENTS_DEV_URL
-export const LIVE_EVENTS_PROD_URL = `https://live-events.workers.bsky.app`
-export const LIVE_EVENTS_URL = IS_DEV
-  ? (LIVE_EVENTS_DEV_URL ?? LIVE_EVENTS_PROD_URL)
-  : LIVE_EVENTS_PROD_URL
+export const BAPP_CONFIG_DEV_URL = process.env.BAPP_CONFIG_DEV_URL
+export const BAPP_CONFIG_PROD_URL = `https://ip.bsky.app`
+export const BAPP_CONFIG_URL = IS_DEV
+  ? (BAPP_CONFIG_DEV_URL ?? BAPP_CONFIG_PROD_URL)
+  : BAPP_CONFIG_PROD_URL

src/features/liveEvents/components/DiscoverFeedLiveEventFeedsAndTrendingBanner.tsx

@@ -1,89 +0,0 @@
-import {View} from 'react-native'
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {useTrendingSettings} from '#/state/preferences/trending'
-import {atoms as a, useLayoutBreakpoints} from '#/alf'
-import {Button} from '#/components/Button'
-import {DotGrid_Stroke2_Corner0_Rounded as EllipsisIcon} from '#/components/icons/DotGrid'
-import {TrendingInterstitial} from '#/components/interstitials/Trending'
-import {LiveEventFeedCardWide} from '#/features/liveEvents/components/LiveEventFeedCardWide'
-import {
-  LiveEventFeedOptionsMenu,
-  useDialogControl,
-} from '#/features/liveEvents/components/LiveEventFeedOptionsMenu'
-import {useUserPreferencedLiveEvents} from '#/features/liveEvents/context'
-import {type LiveEventFeed} from '#/features/liveEvents/types'
-
-export function DiscoverFeedLiveEventFeedsAndTrendingBanner() {
-  const events = useUserPreferencedLiveEvents()
-  const {rightNavVisible} = useLayoutBreakpoints()
-  const {trendingDisabled} = useTrendingSettings()
-
-  if (!events.feeds.length) {
-    if (!rightNavVisible && !trendingDisabled) {
-      // only show trending on mobile when live event banner is not shown
-      return <TrendingInterstitial />
-    } else {
-      // no feed, no trending
-      return null
-    }
-  }
-
-  // On desktop, we show in the sidebar
-  if (rightNavVisible) return null
-
-  return events.feeds.map(feed => <Inner feed={feed} key={feed.id} />)
-}
-
-function Inner({feed}: {feed: LiveEventFeed}) {
-  const {_} = useLingui()
-  const optionsMenuControl = useDialogControl()
-  const layout = feed.layouts.wide
-
-  return (
-    <>
-      <View style={[a.px_lg, a.pt_md, a.pb_xs]}>
-        <View>
-          <LiveEventFeedCardWide feed={feed} metricContext="discover" />
-
-          <Button
-            label={_(msg`Configure live event banner`)}
-            size="tiny"
-            shape="round"
-            style={[a.absolute, a.z_10, {top: 6, right: 6}]}
-            onPress={() => {
-              optionsMenuControl.open()
-            }}>
-            {({hovered, pressed}) => (
-              <>
-                <View
-                  style={[
-                    a.absolute,
-                    a.inset_0,
-                    a.rounded_full,
-                    {
-                      backgroundColor: layout.overlayColor,
-                      opacity: hovered || pressed ? 0.8 : 0.6,
-                    },
-                  ]}
-                />
-                <EllipsisIcon
-                  size="sm"
-                  fill={layout.textColor}
-                  style={[a.z_20]}
-                />
-              </>
-            )}
-          </Button>
-        </View>
-      </View>
-
-      <LiveEventFeedOptionsMenu
-        feed={feed}
-        control={optionsMenuControl}
-        metricContext="discover"
-      />
-    </>
-  )
-}

src/features/liveEvents/components/ExploreScreenLiveEventFeedsBanner.tsx

@@ -1,17 +0,0 @@
-import {View} from 'react-native'
-
-import {atoms as a, useTheme} from '#/alf'
-import {LiveEventFeedCardWide} from '#/features/liveEvents/components/LiveEventFeedCardWide'
-import {useLiveEvents} from '#/features/liveEvents/context'
-
-export function ExploreScreenLiveEventFeedsBanner() {
-  const t = useTheme()
-  const events = useLiveEvents()
-  return events.feeds.map(feed => (
-    <View
-      key={feed.id}
-      style={[a.p_lg, a.border_b, t.atoms.border_contrast_low]}>
-      <LiveEventFeedCardWide feed={feed} metricContext="explore" />
-    </View>
-  ))
-}

src/features/liveEvents/components/LiveEventFeedCardCompact.tsx

@@ -1,132 +0,0 @@
-import {useEffect, useMemo} from 'react'
-import {View} from 'react-native'
-import {Image} from 'expo-image'
-import {LinearGradient} from 'expo-linear-gradient'
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {isBskyCustomFeedUrl} from '#/lib/strings/url-helpers'
-import {logger} from '#/logger'
-import {atoms as a, utils} from '#/alf'
-import {Live_Stroke2_Corner0_Rounded as LiveIcon} from '#/components/icons/Live'
-import {Link} from '#/components/Link'
-import {Text} from '#/components/Typography'
-import {
-  type LiveEventFeed,
-  type LiveEventFeedMetricContext,
-} from '#/features/liveEvents/types'
-
-const roundedStyles = [a.rounded_md, a.curve_continuous]
-
-export function LiveEventFeedCardCompact({
-  feed,
-  metricContext,
-}: {
-  feed: LiveEventFeed
-  metricContext: LiveEventFeedMetricContext
-}) {
-  const {_} = useLingui()
-
-  const layout = feed.layouts.compact
-  const overlayColor = layout.overlayColor
-  const textColor = layout.textColor
-  const url = useMemo(() => {
-    // Validated in multiple places on the backend
-    if (isBskyCustomFeedUrl(feed.url)) {
-      return new URL(feed.url).pathname
-    }
-    return '/'
-  }, [feed.url])
-
-  useEffect(() => {
-    logger.metric('liveEvents:feedBanner:seen', {
-      feed: feed.url,
-      context: metricContext,
-    })
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  return (
-    <Link
-      to={url}
-      label={_(msg`Live event happening now: ${feed.title}`)}
-      style={[a.w_full]}
-      onPress={() => {
-        logger.metric('liveEvents:feedBanner:click', {
-          feed: feed.url,
-          context: metricContext,
-        })
-      }}>
-      {({hovered, pressed}) => (
-        <View style={[roundedStyles, a.shadow_md, a.w_full]}>
-          <View
-            style={[a.w_full, a.align_start, a.overflow_hidden, roundedStyles]}>
-            <Image
-              accessibilityIgnoresInvertColors
-              source={{uri: layout.image}}
-              placeholder={{blurhash: layout.blurhash}}
-              style={[a.absolute, a.inset_0, a.w_full, a.h_full]}
-              contentFit="cover"
-              placeholderContentFit="cover"
-            />
-
-            <LinearGradient
-              colors={[overlayColor, utils.alpha(overlayColor, 0)]}
-              locations={[0, 1]}
-              start={{x: 0, y: 0}}
-              end={{x: 1, y: 0}}
-              style={[
-                a.absolute,
-                a.inset_0,
-                a.transition_opacity,
-                {
-                  transitionDuration: '200ms',
-                  opacity: hovered || pressed ? 0.6 : 0,
-                },
-              ]}
-            />
-
-            <View style={[a.w_full, a.justify_end]}>
-              <LinearGradient
-                colors={[
-                  overlayColor,
-                  utils.alpha(overlayColor, 0.7),
-                  utils.alpha(overlayColor, 0),
-                ]}
-                locations={[0, 0.8, 1]}
-                start={{x: 0, y: 0}}
-                end={{x: 1, y: 0}}
-                style={[a.absolute, a.inset_0]}
-              />
-
-              <View
-                style={[
-                  a.flex_1,
-                  a.flex_row,
-                  a.align_center,
-                  a.gap_xs,
-                  a.z_10,
-                  a.px_lg,
-                  a.py_md,
-                ]}>
-                <LiveIcon size="md" fill={textColor} />
-                <Text
-                  numberOfLines={1}
-                  style={[
-                    a.flex_1,
-                    a.leading_snug,
-                    a.font_bold,
-                    a.text_lg,
-                    a.pr_xl,
-                    {color: textColor},
-                  ]}>
-                  {layout.title}
-                </Text>
-              </View>
-            </View>
-          </View>
-        </View>
-      )}
-    </Link>
-  )
-}

src/features/liveEvents/components/LiveEventFeedCardWide.tsx

@@ -1,139 +0,0 @@
-import {useEffect, useMemo} from 'react'
-import {View} from 'react-native'
-import {Image} from 'expo-image'
-import {LinearGradient} from 'expo-linear-gradient'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {isBskyCustomFeedUrl} from '#/lib/strings/url-helpers'
-import {logger} from '#/logger'
-import {atoms as a, useBreakpoints, utils} from '#/alf'
-import {Link} from '#/components/Link'
-import {Text} from '#/components/Typography'
-import {
-  type LiveEventFeed,
-  type LiveEventFeedMetricContext,
-} from '#/features/liveEvents/types'
-
-const roundedStyles = [a.rounded_lg, a.curve_continuous]
-
-export function LiveEventFeedCardWide({
-  feed,
-  metricContext,
-}: {
-  feed: LiveEventFeed
-  metricContext: LiveEventFeedMetricContext
-}) {
-  const {_} = useLingui()
-  const {gtPhone} = useBreakpoints()
-
-  const layout = feed.layouts.wide
-  const overlayColor = layout.overlayColor
-  const textColor = layout.textColor
-  const url = useMemo(() => {
-    // Validated in multiple places on the backend
-    if (isBskyCustomFeedUrl(feed.url)) {
-      return new URL(feed.url).pathname
-    }
-    return '/'
-  }, [feed.url])
-
-  useEffect(() => {
-    logger.metric('liveEvents:feedBanner:seen', {
-      feed: feed.url,
-      context: metricContext,
-    })
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  return (
-    <Link
-      to={url}
-      label={_(msg`Live event happening now: ${feed.title}`)}
-      style={[a.w_full]}
-      onPress={() => {
-        logger.metric('liveEvents:feedBanner:click', {
-          feed: feed.url,
-          context: metricContext,
-        })
-      }}>
-      {({hovered, pressed}) => (
-        <View style={[roundedStyles, a.shadow_md, a.w_full]}>
-          <View
-            style={[
-              a.align_start,
-              roundedStyles,
-              a.overflow_hidden,
-              {
-                aspectRatio: gtPhone ? 576 / 144 : 369 / 100,
-              },
-            ]}>
-            <Image
-              accessibilityIgnoresInvertColors
-              source={{uri: layout.image}}
-              placeholder={{blurhash: layout.blurhash}}
-              style={[a.absolute, a.inset_0, a.w_full, a.h_full]}
-              contentFit="cover"
-              placeholderContentFit="cover"
-            />
-
-            <LinearGradient
-              colors={[overlayColor, utils.alpha(overlayColor, 0)]}
-              locations={[0, 1]}
-              start={{x: 0, y: 0}}
-              end={{x: 1, y: 0}}
-              style={[
-                a.absolute,
-                a.inset_0,
-                a.transition_opacity,
-                {
-                  transitionDuration: '200ms',
-                  opacity: hovered || pressed ? 0.6 : 0,
-                },
-              ]}
-            />
-
-            <View style={[a.flex_1, a.justify_end]}>
-              <LinearGradient
-                colors={[overlayColor, utils.alpha(overlayColor, 0)]}
-                locations={[0, 1]}
-                start={{x: 0, y: 0}}
-                end={{x: 1, y: 0}}
-                style={[a.absolute, a.inset_0]}
-              />
-
-              <View
-                style={[
-                  a.z_10,
-                  gtPhone ? [a.pl_xl, a.pb_lg] : [a.pl_lg, a.pb_md],
-                  {paddingRight: 64},
-                ]}>
-                <Text
-                  style={[
-                    a.leading_snug,
-                    gtPhone ? a.text_xs : a.text_2xs,
-                    {color: textColor, opacity: 0.8},
-                  ]}>
-                  {feed.preview ? (
-                    <Trans>Preview</Trans>
-                  ) : (
-                    <Trans>Happening now</Trans>
-                  )}
-                </Text>
-                <Text
-                  style={[
-                    a.leading_snug,
-                    a.font_bold,
-                    gtPhone ? a.text_3xl : a.text_lg,
-                    {color: textColor},
-                  ]}>
-                  {layout.title}
-                </Text>
-              </View>
-            </View>
-          </View>
-        </View>
-      )}
-    </Link>
-  )
-}

src/features/liveEvents/components/LiveEventFeedOptionsMenu.tsx

@@ -1,171 +0,0 @@
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {useCleanError} from '#/lib/hooks/useCleanError'
-import {isNative} from '#/platform/detection'
-import {atoms as a, web} from '#/alf'
-import {Admonition} from '#/components/Admonition'
-import {Button, ButtonIcon, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
-import {Loader} from '#/components/Loader'
-import * as toast from '#/components/Toast'
-import {Span, Text} from '#/components/Typography'
-import {useUpdateLiveEventPreferences} from '#/features/liveEvents/preferences'
-import {
-  type LiveEventFeed,
-  type LiveEventFeedMetricContext,
-} from '#/features/liveEvents/types'
-
-export {useDialogControl} from '#/components/Dialog'
-
-export function LiveEventFeedOptionsMenu({
-  control,
-  feed,
-  metricContext,
-}: {
-  control: Dialog.DialogControlProps
-  feed: LiveEventFeed
-  metricContext: LiveEventFeedMetricContext
-}) {
-  const {_} = useLingui()
-  return (
-    <Dialog.Outer control={control}>
-      <Dialog.Handle />
-      <Dialog.ScrollableInner
-        label={_(msg`Configure live event banner`)}
-        style={[web({maxWidth: 400})]}>
-        <Inner control={control} feed={feed} metricContext={metricContext} />
-        <Dialog.Close />
-      </Dialog.ScrollableInner>
-    </Dialog.Outer>
-  )
-}
-
-function Inner({
-  control,
-  feed,
-  metricContext,
-}: {
-  control: Dialog.DialogControlProps
-  feed: LiveEventFeed
-  metricContext: LiveEventFeedMetricContext
-}) {
-  const {_} = useLingui()
-  const {
-    isPending,
-    mutate: update,
-    error: rawError,
-    variables,
-  } = useUpdateLiveEventPreferences({
-    feed,
-    metricContext,
-    onUpdateSuccess({undoAction}) {
-      toast.show(
-        <toast.Outer>
-          <toast.Icon />
-          <toast.Text>
-            <Trans>Your live event preferences have been updated.</Trans>
-          </toast.Text>
-          {undoAction && (
-            <toast.Action
-              label={_(msg`Undo`)}
-              onPress={() => {
-                if (undoAction) {
-                  update(undoAction)
-                }
-              }}>
-              <Trans>Undo</Trans>
-            </toast.Action>
-          )}
-        </toast.Outer>,
-        {
-          type: 'success',
-        },
-      )
-
-      /*
-       * If there is no `undoAction`, it means that the action was already
-       * undone, and therefore the menu would have been closed prior to the
-       * undo happening.
-       */
-      if (undoAction) {
-        control.close()
-      }
-    },
-  })
-  const cleanError = useCleanError()
-  const error = rawError ? cleanError(rawError) : undefined
-
-  const isHidingFeed = variables?.type === 'hideFeed' && isPending
-  const isHidingAllFeeds = variables?.type === 'toggleHideAllFeeds' && isPending
-
-  return (
-    <View style={[a.gap_lg]}>
-      <View style={[a.gap_sm]}>
-        <Text style={[a.text_2xl, a.font_semi_bold, a.leading_snug]}>
-          <Trans>Live event options</Trans>
-        </Text>
-
-        <Text style={[a.text_md, a.leading_snug]}>
-          <Trans>
-            Live events appear occasionally when something exciting is
-            happening. If you'd like, you can hide this particular event, or all
-            events for this placement in your app interface.
-          </Trans>
-        </Text>
-
-        <Text style={[a.text_md, a.leading_snug]}>
-          <Trans>
-            If you choose to hide all events, you can always re-enable them from{' '}
-            <Span style={[a.font_semi_bold]}>Settings → Content & Media</Span>.
-          </Trans>
-        </Text>
-      </View>
-
-      <View style={[a.gap_sm]}>
-        <Button
-          label={_(msg`Hide this event`)}
-          size="large"
-          color="primary_subtle"
-          onPress={() => {
-            update({type: 'hideFeed', id: feed.id})
-          }}>
-          <ButtonText>
-            <Trans>Hide this event</Trans>
-          </ButtonText>
-          {isHidingFeed && <ButtonIcon icon={Loader} />}
-        </Button>
-        <Button
-          label={_(msg`Hide all events`)}
-          size="large"
-          color="secondary"
-          onPress={() => {
-            update({type: 'toggleHideAllFeeds'})
-          }}>
-          <ButtonText>
-            <Trans>Hide all events</Trans>
-          </ButtonText>
-          {isHidingAllFeeds && <ButtonIcon icon={Loader} />}
-        </Button>
-        {isNative && (
-          <Button
-            label={_(msg`Cancel`)}
-            size="large"
-            color="secondary_inverted"
-            onPress={() => control.close()}>
-            <ButtonText>
-              <Trans>Cancel</Trans>
-            </ButtonText>
-          </Button>
-        )}
-      </View>
-
-      {error && (
-        <Admonition type="error">
-          {error.clean || error.raw || _(msg`An unknown error occurred.`)}
-        </Admonition>
-      )}
-    </View>
-  )
-}

src/features/liveEvents/components/LiveEventFeedsSettingsToggle.tsx

@@ -1,43 +0,0 @@
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import * as SettingsList from '#/screens/Settings/components/SettingsList'
-import * as Toggle from '#/components/forms/Toggle'
-import {Live_Stroke2_Corner0_Rounded as LiveIcon} from '#/components/icons/Live'
-import {
-  useLiveEventPreferences,
-  useUpdateLiveEventPreferences,
-} from '#/features/liveEvents/preferences'
-
-export function LiveEventFeedsSettingsToggle() {
-  const {_} = useLingui()
-  const {data: prefs} = useLiveEventPreferences()
-  const {
-    isPending,
-    data: updatedPrefs,
-    mutate: update,
-  } = useUpdateLiveEventPreferences({
-    metricContext: 'settings',
-  })
-  const hideAllFeeds = !!(updatedPrefs || prefs)?.hideAllFeeds
-
-  return (
-    <Toggle.Item
-      name="enable_live_event_banner"
-      label={_(msg`Show live events in your Discover Feed`)}
-      value={!hideAllFeeds}
-      onChange={() => {
-        if (!isPending) {
-          update({type: 'toggleHideAllFeeds'})
-        }
-      }}>
-      <SettingsList.Item>
-        <SettingsList.ItemIcon icon={LiveIcon} />
-        <SettingsList.ItemText>
-          <Trans>Show live events in your Discover Feed</Trans>
-        </SettingsList.ItemText>
-        <Toggle.Platform />
-      </SettingsList.Item>
-    </Toggle.Item>
-  )
-}

src/features/liveEvents/components/SidebarLiveEventFeedsBanner.tsx

@@ -1,13 +0,0 @@
-import {LiveEventFeedCardCompact} from '#/features/liveEvents/components/LiveEventFeedCardCompact'
-import {useLiveEvents} from '#/features/liveEvents/context'
-
-export function SidebarLiveEventFeedsBanner() {
-  const events = useLiveEvents()
-  return events.feeds.map(feed => (
-    <LiveEventFeedCardCompact
-      key={feed.id}
-      feed={feed}
-      metricContext="sidebar"
-    />
-  ))
-}

src/features/liveEvents/context.tsx

@@ -1,110 +0,0 @@
-import {createContext, useContext, useMemo} from 'react'
-import {QueryClient, useQuery} from '@tanstack/react-query'
-
-import {useIsBskyTeam} from '#/lib/hooks/useIsBskyTeam'
-import {
-  convertBskyAppUrlIfNeeded,
-  isBskyCustomFeedUrl,
-  makeRecordUri,
-} from '#/lib/strings/url-helpers'
-import {IS_DEV, LIVE_EVENTS_URL} from '#/env'
-import {useLiveEventPreferences} from '#/features/liveEvents/preferences'
-import {type LiveEventsWorkerResponse} from '#/features/liveEvents/types'
-import {useDevMode} from '#/storage/hooks/dev-mode'
-
-const qc = new QueryClient()
-const liveEventsQueryKey = ['live-events']
-
-export const DEFAULT_LIVE_EVENTS = {
-  feeds: [],
-}
-
-async function fetchLiveEvents(): Promise<LiveEventsWorkerResponse | null> {
-  try {
-    const res = await fetch(`${LIVE_EVENTS_URL}/config`)
-    if (!res.ok) return null
-    const data = await res.json()
-    return data
-  } catch {
-    return null
-  }
-}
-
-const Context = createContext<LiveEventsWorkerResponse>(DEFAULT_LIVE_EVENTS)
-
-export function Provider({children}: React.PropsWithChildren<{}>) {
-  const [isDevMode] = useDevMode()
-  const isBskyTeam = useIsBskyTeam()
-  const {data} = useQuery(
-    {
-      staleTime: IS_DEV ? 5e3 : 1000 * 60,
-      queryKey: liveEventsQueryKey,
-      async queryFn() {
-        return fetchLiveEvents()
-      },
-    },
-    qc,
-  )
-
-  const ctx = useMemo(() => {
-    if (!data) return DEFAULT_LIVE_EVENTS
-    const feeds = data.feeds.filter(f => {
-      if (f.preview && !isBskyTeam) return false
-      return true
-    })
-    return {
-      ...data,
-      // only one at a time for now, unless bsky team and dev mode
-      feeds: isBskyTeam && isDevMode ? feeds : feeds.slice(0, 1),
-    }
-  }, [data, isBskyTeam, isDevMode])
-
-  return <Context.Provider value={ctx}>{children}</Context.Provider>
-}
-
-export async function prefetchLiveEvents() {
-  const data = await fetchLiveEvents()
-  if (data) {
-    qc.setQueryData(liveEventsQueryKey, data)
-  }
-}
-
-export function useLiveEvents() {
-  const ctx = useContext(Context)
-  if (!ctx) {
-    throw new Error('useLiveEventsContext must be used within a Provider')
-  }
-  return ctx
-}
-
-export function useUserPreferencedLiveEvents() {
-  const events = useLiveEvents()
-  const {data, isLoading} = useLiveEventPreferences()
-  if (isLoading) return DEFAULT_LIVE_EVENTS
-  const {hideAllFeeds, hiddenFeedIds} = data
-  return {
-    ...events,
-    feeds: hideAllFeeds
-      ? []
-      : events.feeds.filter(f => {
-          const hidden = f?.id ? hiddenFeedIds.includes(f?.id || '') : false
-          return !hidden
-        }),
-  }
-}
-
-export function useActiveLiveEventFeedUris() {
-  const {feeds} = useLiveEvents()
-
-  return new Set(
-    feeds
-      // insurance
-      .filter(f => isBskyCustomFeedUrl(f.url))
-      .map(f => {
-        const uri = convertBskyAppUrlIfNeeded(f.url)
-        const [_0, did, _1, rkey] = uri.split('/').filter(Boolean)
-        const urip = makeRecordUri(did, 'app.bsky.feed.generator', rkey)
-        return urip.toString()
-      }),
-  )
-}

src/features/liveEvents/preferences.ts

@@ -1,161 +0,0 @@
-import {useEffect} from 'react'
-import {type Agent, AppBskyActorDefs, asPredicate} from '@atproto/api'
-import {useMutation, useQueryClient} from '@tanstack/react-query'
-
-import {logger} from '#/logger'
-import {isWeb} from '#/platform/detection'
-import {
-  preferencesQueryKey,
-  usePreferencesQuery,
-} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
-import * as env from '#/env'
-import {
-  type LiveEventFeed,
-  type LiveEventFeedMetricContext,
-} from '#/features/liveEvents/types'
-
-export type LiveEventPreferencesAction = Parameters<
-  Agent['updateLiveEventPreferences']
->[0] & {
-  /**
-   * Flag that is internal to this hook, do not set when updating prefs
-   */
-  __canUndo?: boolean
-}
-
-export function useLiveEventPreferences() {
-  const query = usePreferencesQuery()
-  useWebOnlyDebugLiveEventPreferences()
-  return {
-    ...query,
-    data: query.data?.liveEventPreferences || {
-      hideAllFeeds: false,
-      hiddenFeedIds: [],
-    },
-  }
-}
-
-function useWebOnlyDebugLiveEventPreferences() {
-  const queryClient = useQueryClient()
-  const agent = useAgent()
-
-  useEffect(() => {
-    if (env.IS_DEV && isWeb && typeof window !== 'undefined') {
-      // @ts-ignore
-      window.__updateLiveEventPreferences = async (
-        action: LiveEventPreferencesAction,
-      ) => {
-        await agent.updateLiveEventPreferences(action)
-        // triggers a refetch
-        await queryClient.invalidateQueries({
-          queryKey: preferencesQueryKey,
-        })
-      }
-    }
-  }, [agent, queryClient])
-}
-
-export function useUpdateLiveEventPreferences(props: {
-  feed?: LiveEventFeed
-  metricContext: LiveEventFeedMetricContext
-  onUpdateSuccess?: (props: {
-    undoAction: LiveEventPreferencesAction | null
-  }) => void
-}) {
-  const queryClient = useQueryClient()
-  const agent = useAgent()
-
-  return useMutation<
-    AppBskyActorDefs.LiveEventPreferences,
-    Error,
-    LiveEventPreferencesAction,
-    {undoAction: LiveEventPreferencesAction | null}
-  >({
-    onSettled(data, error, variables) {
-      /*
-       * `onSettled` runs after the mutation completes, success or no. The idea
-       * here is that we want to invert the action that was just passed in, and
-       * provide it as an `undoAction` to the `onUpdateSuccess` callback.
-       *
-       * If the operation was not a success, we don't provide the `undoAction`.
-       *
-       * Upon the first call of the mutation, the `__canUndo` flag is undefined,
-       * so we allow the undo. However, when we create the `undoAction`, we
-       * set its `__canUndo` flag to false, so that if the user were to call
-       * the undo action, we would not provide another undo for that.
-       */
-      const canUndo = variables.__canUndo === undefined ? true : false
-      let undoAction: LiveEventPreferencesAction | null = null
-
-      switch (variables.type) {
-        case 'hideFeed':
-          undoAction = {type: 'unhideFeed', id: variables.id, __canUndo: false}
-          break
-        case 'unhideFeed':
-          undoAction = {type: 'hideFeed', id: variables.id, __canUndo: false}
-          break
-        case 'toggleHideAllFeeds':
-          undoAction = {type: 'toggleHideAllFeeds', __canUndo: false}
-          break
-      }
-
-      if (data && !error) {
-        props?.onUpdateSuccess?.({
-          undoAction: canUndo ? undoAction : null,
-        })
-      }
-    },
-    mutationFn: async action => {
-      const updated = await agent.updateLiveEventPreferences(action)
-      const prefs = updated.find(p =>
-        asPredicate(AppBskyActorDefs.validateLiveEventPreferences)(p),
-      )
-
-      switch (action.type) {
-        case 'hideFeed':
-        case 'unhideFeed': {
-          if (!props.feed) {
-            logger.error(
-              `useUpdateLiveEventPreferences: feed is missing, but required for hiding/unhiding`,
-              {
-                action,
-              },
-            )
-            break
-          }
-
-          logger.metric(
-            action.type === 'hideFeed'
-              ? 'liveEvents:feedBanner:hide'
-              : 'liveEvents:feedBanner:unhide',
-            {
-              feed: props.feed.url,
-              context: props.metricContext,
-            },
-          )
-          break
-        }
-        case 'toggleHideAllFeeds': {
-          if (prefs!.hideAllFeeds) {
-            logger.metric('liveEvents:hideAllFeedBanners', {
-              context: props.metricContext,
-            })
-          } else {
-            logger.metric('liveEvents:unhideAllFeedBanners', {
-              context: props.metricContext,
-            })
-          }
-          break
-        }
-      }
-
-      // triggers a refetch
-      queryClient.invalidateQueries({
-        queryKey: preferencesQueryKey,
-      })
-
-      return prefs!
-    },
-  })
-}

src/features/liveEvents/types.ts

@@ -1,27 +0,0 @@
-export type LiveEventFeedImageLayout = 'wide' | 'compact' // maybe more in the future
-
-export type LiveEventFeedLayout = {
-  title: string
-  overlayColor: string
-  textColor: string
-  image: string
-  blurhash: string
-}
-
-export type LiveEventFeed = {
-  id: string
-  preview: boolean
-  title: string
-  url: string
-  layouts: Record<LiveEventFeedImageLayout, LiveEventFeedLayout>
-}
-
-export type LiveEventsWorkerResponse = {
-  feeds: LiveEventFeed[]
-}
-
-export type LiveEventFeedMetricContext =
-  | 'explore'
-  | 'discover'
-  | 'sidebar'
-  | 'settings'

src/features/nuxs/components/Dot.tsx

@@ -1,31 +0,0 @@
-import {View, type ViewStyle} from 'react-native'
-
-import {atoms as a, useTheme} from '#/alf'
-
-/**
- * The little blue dot used to nudge a user towards a certain feature. The dot
- * is absolutely positioned, and is intended to be configured by passing in
- * positional styles via `top`, `bottom`, `left`, and `right` props.
- */
-export function Dot({
-  top,
-  bottom,
-  left,
-  right,
-}: Pick<ViewStyle, 'top' | 'bottom' | 'left' | 'right'>) {
-  const t = useTheme()
-  return (
-    <View style={[a.absolute, {top, bottom, left, right}]}>
-      <View
-        style={[
-          a.rounded_full,
-          {
-            height: 8,
-            width: 8,
-            backgroundColor: t.palette.primary_500,
-          },
-        ]}
-      />
-    </View>
-  )
-}

src/features/nuxs/components/Gradient.tsx

@@ -1,24 +0,0 @@
-import {LinearGradient} from 'expo-linear-gradient'
-
-import {atoms as a, useTheme, utils, type ViewStyleProp} from '#/alf'
-
-/**
- * A gradient overlay using the primary color at low opacity. This component is
- * absolutely positioned and intended to be composed within other components,
- * with optional styling allowed, such as adjusting border radius.
- */
-export function Gradient({style}: ViewStyleProp) {
-  const t = useTheme()
-  return (
-    <LinearGradient
-      colors={[
-        utils.alpha(t.palette.primary_500, 0.2),
-        utils.alpha(t.palette.primary_500, 0.1),
-      ]}
-      locations={[0, 1]}
-      start={{x: 0, y: 0}}
-      end={{x: 1, y: 0}}
-      style={[a.absolute, a.inset_0, style]}
-    />
-  )
-}

src/geolocation/const.ts

@@ -1,7 +1,7 @@
-import {GEOLOCATION_URL} from '#/env'
+import {BAPP_CONFIG_URL} from '#/env'
 import {type Geolocation} from '#/geolocation/types'
 
-export const GEOLOCATION_SERVICE_URL = `${GEOLOCATION_URL}/geolocation`
+export const GEOLOCATION_SERVICE_URL = `${BAPP_CONFIG_URL}/geolocation`
 
 /**
  * Default geolocation config.

src/geolocation/debug.ts

@@ -5,19 +5,13 @@ import {type Geolocation} from '#/geolocation/types'
 const localEnabled = false
 export const enabled = IS_DEV && (localEnabled || aaDebug.geolocation)
 export const geolocation: Geolocation = aaDebug.geolocation ?? {
-  countryCode: 'US',
-  regionCode: 'TX',
+  countryCode: 'AU',
+  regionCode: undefined,
+}
+export const deviceGeolocation: Geolocation = aaDebug.deviceGeolocation ?? {
+  countryCode: 'AU',
+  regionCode: undefined,
 }
-
-const deviceLocalEnabled = false
-export const deviceGeolocation: Geolocation | undefined =
-  aaDebug.deviceGeolocation ||
-  (deviceLocalEnabled
-    ? {
-        countryCode: 'US',
-        regionCode: 'TX',
-      }
-    : undefined)
 
 export async function resolve<T>(data: T) {
   await new Promise(y => setTimeout(y, 500)) // simulate network

src/geolocation/device.ts

@@ -1,5 +1,4 @@
 import {useCallback, useEffect, useRef} from 'react'
-import {Platform} from 'react-native'
 import * as Location from 'expo-location'
 import {createPermissionHook} from 'expo-modules-core'
 
@@ -47,8 +46,7 @@ const useForegroundPermissions = createPermissionHook({
 })
 
 export async function getDeviceGeolocation(): Promise<Geolocation> {
-  if (debug.enabled && debug.deviceGeolocation)
-    return debug.resolve(debug.deviceGeolocation)
+  if (debug.enabled) return debug.resolve(debug.deviceGeolocation)
 
   try {
     const geocode = await Location.getCurrentPositionAsync()
@@ -58,18 +56,6 @@ export async function getDeviceGeolocation(): Promise<Geolocation> {
     })
     const location = locations.at(0)
     const normalized = location ? normalizeDeviceLocation(location) : undefined
-    if (normalized?.regionCode && normalized.regionCode.length > 5) {
-      /*
-       * We want short codes only, and we're still seeing some full names here.
-       * 5 is just a heuristic for a region that is probably not formatted as a
-       * short code.
-       */
-      logger.error('getDeviceGeolocation: invalid regionCode', {
-        os: Platform.OS,
-        version: Platform.Version,
-        regionCode: normalized.regionCode,
-      })
-    }
     return {
       countryCode: normalized?.countryCode ?? undefined,
       regionCode: normalized?.regionCode ?? undefined,
@@ -156,8 +142,3 @@ export function useSyncDeviceGeolocationOnStartup(
     })
   }, [status, sync])
 }
-
-export function useIsDeviceGeolocationGranted() {
-  const [status] = useForegroundPermissions()
-  return status?.granted === true
-}

src/geolocation/index.tsx

@@ -12,10 +12,7 @@ import {type Geolocation} from '#/geolocation/types'
 import {mergeGeolocations} from '#/geolocation/util'
 import {device, useStorage} from '#/storage'
 
-export {
-  useIsDeviceGeolocationGranted,
-  useRequestDeviceGeolocation,
-} from '#/geolocation/device'
+export {useRequestDeviceGeolocation} from '#/geolocation/device'
 export {resolve} from '#/geolocation/service'
 export * from '#/geolocation/types'
 

src/lib/actor-status.ts

@@ -7,7 +7,7 @@ import {
 import {isAfter, parseISO} from 'date-fns'
 
 import {useMaybeProfileShadow} from '#/state/cache/profile-shadow'
-import {type LiveNowConfig, useLiveNowConfig} from '#/state/service-config'
+import {useLiveNowConfig} from '#/state/service-config'
 import {useTickEveryMinute} from '#/state/shell'
 import type * as bsky from '#/types/bsky'
 
@@ -19,27 +19,15 @@ export function useActorStatus(actor?: bsky.profile.AnyProfileView) {
   return useMemo(() => {
     tick! // revalidate every minute
 
-    if (shadowed && 'status' in shadowed && shadowed.status) {
-      const isValid = validateStatus(shadowed.status, config)
-      const isDisabled = shadowed.status.isDisabled || false
-      const isActive = isStatusStillActive(shadowed.status.expiresAt)
-      if (isValid && !isDisabled && isActive) {
-        return {
-          uri: shadowed.status.uri,
-          cid: shadowed.status.cid,
-          isDisabled: false,
-          isActive: true,
-          status: 'app.bsky.actor.status#live',
-          embed: shadowed.status.embed as $Typed<AppBskyEmbedExternal.View>, // temp_isStatusValid asserts this
-          expiresAt: shadowed.status.expiresAt!, // isStatusStillActive asserts this
-          record: shadowed.status.record,
-        } satisfies AppBskyActorDefs.StatusView
-      }
+    if (
+      shadowed &&
+      'status' in shadowed &&
+      shadowed.status &&
+      validateStatus(shadowed.did, shadowed.status, config) &&
+      isStatusStillActive(shadowed.status.expiresAt)
+    ) {
       return {
-        uri: shadowed.status.uri,
-        cid: shadowed.status.cid,
-        isDisabled,
-        isActive: false,
+        isActive: true,
         status: 'app.bsky.actor.status#live',
         embed: shadowed.status.embed as $Typed<AppBskyEmbedExternal.View>, // temp_isStatusValid asserts this
         expiresAt: shadowed.status.expiresAt!, // isStatusStillActive asserts this
@@ -48,7 +36,6 @@ export function useActorStatus(actor?: bsky.profile.AnyProfileView) {
     } else {
       return {
         status: '',
-        isDisabled: false,
         isActive: false,
         record: {},
       } satisfies AppBskyActorDefs.StatusView
@@ -65,14 +52,19 @@ export function isStatusStillActive(timeStr: string | undefined) {
 }
 
 export function validateStatus(
+  did: string,
   status: AppBskyActorDefs.StatusView,
-  config: LiveNowConfig,
+  config: {did: string; domains: string[]}[],
 ) {
   if (status.status !== 'app.bsky.actor.status#live') return false
+  const sources = config.find(cfg => cfg.did === did)
+  if (!sources) {
+    return false
+  }
   try {
     if (AppBskyEmbedExternal.isView(status.embed)) {
       const url = new URL(status.embed.external.uri)
-      return config.allowedDomains.has(url.hostname)
+      return sources.domains.includes(url.hostname)
     } else {
       return false
     }

src/lib/constants.ts

@@ -241,10 +241,6 @@ export const BLUESKY_MOD_SERVICE_HEADERS = {
   'atproto-proxy': `${BSKY_LABELER_DID}#atproto_labeler`,
 }
 
-export const BLUESKY_NOTIF_SERVICE_HEADERS = {
-  'atproto-proxy': `${BLUESKY_PROXY_DID}#bsky_notif`,
-}
-
 export const webLinks = {
   tos: `https://bsky.social/about/support/tos`,
   privacy: `https://bsky.social/about/support/privacy-policy`,

src/lib/hooks/useIsBskyTeam.ts

@@ -1,8 +0,0 @@
-import {useMemo} from 'react'
-
-import {useGate} from '#/lib/statsig/statsig'
-
-export function useIsBskyTeam() {
-  const gate = useGate()
-  return useMemo(() => gate('is_bsky_team_member'), [gate])
-}

src/lib/media/util.ts

@@ -8,6 +8,10 @@ export function getDataUriSize(uri: string): number {
   return Math.round((uri.length * 3) / 4)
 }
 
+export function isAcceptedImageMimeType(type: string): boolean {
+  return ['image/jpeg', 'image/png', 'image/webp'].includes(type)
+}
+
 export function isUriImage(uri: string): boolean {
   return /\.(jpg|jpeg|png|webp).*$/.test(uri)
 }