Bump dev-env

.env.example

@@ -46,6 +46,3 @@ GEOLOCATION_DEV_URL=
 
 # live-events web worker URL
 LIVE_EVENTS_DEV_URL=
-
-# app-config web worker URL
-APP_CONFIG_DEV_URL=

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

@@ -118,7 +118,12 @@ jobs:
           fi
 
       - name: 🚀 Deploy
-        run: eas submit -p ios --non-interactive --path ios-build/ios/build/Bluesky.ipa
+        env:
+          PROFILE: ${{ inputs.profile || 'testflight' }}
+        run: >
+          eas submit -p ios --non-interactive
+          --path ios-build/ios/build/Bluesky.ipa
+          --what-to-test "$([[ "$PROFILE" == "production" ]] && echo "Production build" || echo "TestFlight build")"
 
       - name: 🪲 Upload dSYM to Sentry
         run: >

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

@@ -242,7 +242,7 @@ jobs:
           --local --output build.ipa --non-interactive
 
       - name: 🚀 Deploy
-        run: eas submit -p ios --non-interactive --path build.ipa
+        run: eas submit -p ios --non-interactive --path build.ipa --what-to-test "TestFlight build"
 
       - name: ⬇️ Restore Cache
         id: get-base-commit

.gitignore

@@ -110,9 +110,7 @@ google-services.json
 
 # i18n
 src/locale/locales/_build/
-src/locale/locales/**/messages.js
-src/locale/locales/**/messages.mjs
-src/locale/locales/**/messages.ts
+src/locale/locales/**/*.js
 
 # local builds
 *.apk

CLAUDE.md

@@ -24,7 +24,6 @@ yarn android            # Run on Android
 yarn ios                # Run on iOS
 
 # Testing & Quality
-# IMPORTANT: Always use these yarn scripts, never call the underlying tools directly
 yarn test               # Run Jest tests
 yarn lint               # Run ESLint
 yarn typecheck          # Run TypeScript type checking
@@ -46,7 +45,6 @@ src/
 ├── alf/                    # Design system (ALF) - themes, atoms, tokens
 ├── components/             # Shared UI components (Button, Dialog, Menu, etc.)
 ├── screens/                # Full-page screen components (newer pattern)
-├── features/               # Macro-features that bridge components/screens
 ├── view/
 │   ├── screens/            # Full-page screens (legacy location)
 │   ├── com/                # Reusable view components
@@ -61,121 +59,6 @@ src/
 └── Navigation.tsx          # Main navigation configuration
 ```
 
-### Project Structure in Depth
-
-When building new things, follow these guidelines for where to put code.
-
-#### Components vs Screens vs Features
-
-**Components** are reusable UI elements that are not full screens. Should be
-platform-agnostic when possible. Examples: Button, Dialog, Menu, TextField. Put
-these in `/components` if they are shared across screens.
-
-**Screens** are full-page components that represent a route in the app. They
-often contain multiple components and handle layout for a page. New screens
-should go in `/screens` (not `/view/screens`) to encourage better organization
-and separation from legacy code.
-
-For complex screens that have specific components or data needs that _are not
-shared by other screens_, we encourage subdirectoreis within `/screens/<name>`
-e.g. `/screens/ProfileScreen/ProfileScreen.tsx` and
-`/screens/ProfileScreen/components/`.
-
-**Features** are higher-level modules that may include context, data fetching,
-components, and utilities related to a specific feature e.g.
-`/features/liveNow`. They don't neatly fit into components or screens and often
-span multiple screens. This is an optional pattern for organizing complex
-features.
-
-#### Legacy Directories
-
-For the most part, avoid writing new files into the `/view` directory and
-subdirectories. This is the older pattern for organizing screens and components,
-and it has become a bit disorganized over time. New development should go into
-`/screens`, `/components`, and `/features`.
-
-#### State
-
-The `/state` directory is where we've historically put all our data fetching and
-state management logic. This is perfectly fine, but for new features, consider
-organizing state logic closer to the components that use it, either within a
-feature directory or co-located with a screen. The key is to keep related code
-together and avoid having "god files" with too much unrelated logic.
-
-#### Lib
-
-The `/lib` directory is for utilities and helpers that don't fit into other
-categories. This can include things like API clients, formatting functions,
-constants, and other shared logic.
-
-#### Top Level Directories
-
-Avoid writing new top-level subdirectories within `/src`. We've done this for a
-few things in the past that, but we have stronger patterns now. Examples:
-`/logger` should probably have been written into `/lib`. And `ageAssurance` is
-better classified within `/features`. We will probably migrate these things
-eventually.
-
-### File and Directory Naming Conventions
-
-Typically JS style for variables, functions, etc. We use ProudCamelCase for
-components, and camelCase directories and files.
-
-When organizing new code, consider if it fits into a single file, or if it
-should be broken down into multiple files. For "macro" component cases, or
-things that live in `/features` or `/screens`, we often follow a pattern of
-having an `index.tsx` for the main component, and then co-locating related
-components, hooks, and utilities in the same directory. For example:
-
-```
-src
-├── screens/
-│   ├── ProfileScreen/
-│   │   ├── index.tsx          # Main screen component
-│   │   ├── components/       # Sub-components used only by this screen
-```
-
-Similar patterns can be found in `/features` and `/components`. The idea here is
-to keep related code together and make it easier to navigate.
-
-You should ask yourself: if someone new was looking for the code related to this
-feature or screen, where would they expect to find it? Organizing code in a way
-that matches developer expectations can make the codebase much more
-approachable. Being able to say "Live Now stuff lives in `/features/liveNow`" is
-easier to understand than having it scattered across multiple directories.
-
-No need to go overboard with this. If a component or feature fits into a single
-file, there's no reason to have a `/Component/index.tsx` file when it could just
-be `/Component.tsx`. Use your judgment based on the complexity and amount of
-related code.
-
-#### Platform Specific Files
-
-We have conflicting patterns in the app for this. The preferred approach is to
-group platform-specific files into a directory as much as possible. For example,
-rather than having `Component.tsx`, `Component.web.tsx`, and
-`Component.native.tsx` in the same directory, we prefer to have a `Component/`
-directory with `index.tsx`, `index.web.tsx`, and `index.native.tsx`. This keeps
-related code together and gives us a better visual cue that there are probably
-other files contained within this "macro" feature, whereas `Component.tsx` on
-its own looks more like a single component file.
-
-### Documentation and Tests Within Features
-
-For larger features or components, it's helpful to include a README.md file
-within the directory that explains the purpose of the feature, how it works, and
-any important implementation details. The `/Component/index.tsx` pattern lends
-itself well to this, since the `index.tsx` can be the main component file, and
-the `README.md` can provide documentation for the whole feature. This is
-optional, but can be a nice way to keep documentation close to the code it
-describes.
-
-Similarly, if there are tests that are specific to a component or feature, it
-can be helpful to include them in the same directory, either as
-`Component.test.tsx` or in a `__tests__/` subdirectory. This keeps everything
-related to the component or feature in one place and makes it easier to find and
-maintain tests.
-
 ## Styling System (ALF)
 
 ALF is the custom design system. It uses Tailwind-inspired naming with underscores instead of hyphens.
@@ -387,8 +270,7 @@ import * as TextField from '#/components/forms/TextField'
 All user-facing strings must be wrapped for translation using Lingui.
 
 ```tsx
-import {msg, plural} from '@lingui/core/macro'
-import {Trans} from '@lingui/react/macro'
+import {msg, Trans, plural} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 function MyComponent() {

__e2e__/flows/curate-lists.yml

@@ -39,6 +39,7 @@ appId: xyz.blueskyweb.app
     id: "editListNameInput"
 - eraseText
 - inputText: "Bad Ppl"
+- hideKeyboard
 - tapOn:
     id: "editListDescriptionInput"
 - eraseText

__e2e__/flows/feed-reorder.yml

@@ -35,12 +35,9 @@ appId: xyz.blueskyweb.app
     id: "menuItemButton-Feeds"
 - tapOn:
     id: "editFeedsBtn"
-- swipe:
-    label: "Drag feed down"
-    from:
-      id: "feed-drag-handle"
-    direction: "DOWN"
-    duration: 1000
+- tapOn:
+    label: "Tap on down arrow"
+    id: "feed-timeline-moveDown"
 - tapOn:
       label: "Save button"
       id: "saveChangesBtn"
@@ -58,12 +55,9 @@ appId: xyz.blueskyweb.app
     id: "menuItemButton-Feeds"
 - tapOn:
     id: "editFeedsBtn"
-- swipe:
-    label: "Drag feed down"
-    from:
-      id: "feed-drag-handle"
-    direction: "DOWN"
-    duration: 1000
+- tapOn:
+    label: "Tap on down arrow"
+    id: "feed-feed-moveDown"
 - tapOn:
     label: "Save button"
     id: "saveChangesBtn"

__e2e__/flows/login.yml

@@ -15,11 +15,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "customServerTextInput"
 - inputText: "http://localhost:3000"
-- runFlow:
-    when:
-      platform: Android
-    commands:
-      - hideKeyboard
 - tapOn: "Done"
 - tapOn:
     id: "loginUsernameInput"

__e2e__/flows/report-dialog/post.reason-other.yml

@@ -26,7 +26,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "report:details"
 - inputText: "This is a test report"
-- hideKeyboard
 - tapOn:
     id: "report:submit"
 - assertNotVisible:

__e2e__/mock-server.ts

@@ -0,0 +1,529 @@
+import {createServer as createHTTPServer} from 'node:http'
+import {parse} from 'node:url'
+
+import {createServer, type TestPDS} from '../jest/test-pds'
+
+async function main() {
+  let server: TestPDS
+  createHTTPServer(async (req, res) => {
+    const url = parse(req.url || '/', true)
+    if (req.method !== 'POST') {
+      return res.writeHead(200).end()
+    }
+    try {
+      console.log('Closing old server')
+      await server?.close()
+      console.log('Starting new server')
+      const inviteRequired = url?.query && 'invite' in url.query
+      server = await createServer({inviteRequired})
+      console.log('Listening at', server.pdsUrl)
+      if (url?.query) {
+        if ('users' in url.query) {
+          console.log('Generating mock users')
+          await server.mocker.createUser('alice')
+          await server.mocker.createUser('bob')
+          await server.mocker.createUser('carla')
+          await server.mocker.users.alice.agent.upsertProfile(() => ({
+            displayName: 'Alice',
+            description: 'Test user 1',
+          }))
+          await server.mocker.users.bob.agent.upsertProfile(() => ({
+            displayName: 'Bob',
+            description: 'Test user 2',
+          }))
+          await server.mocker.users.carla.agent.upsertProfile(() => ({
+            displayName: 'Carla',
+            description: 'Test user 3',
+          }))
+          if (inviteRequired) {
+            await server.mocker.createInvite(server.mocker.users.alice.did)
+          }
+        }
+        if ('follows' in url.query) {
+          console.log('Generating mock follows')
+          await server.mocker.follow('alice', 'bob')
+          await server.mocker.follow('alice', 'carla')
+          await server.mocker.follow('bob', 'alice')
+          await server.mocker.follow('bob', 'carla')
+          await server.mocker.follow('carla', 'alice')
+          await server.mocker.follow('carla', 'bob')
+        }
+        if ('posts' in url.query) {
+          console.log('Generating mock posts')
+          for (let user in server.mocker.users) {
+            await server.mocker.users[user].agent.post({text: 'Post'})
+          }
+        }
+        if ('feeds' in url.query) {
+          console.log('Generating mock feed')
+          await server.mocker.createFeed('alice', 'alice-favs', [])
+        }
+        if ('thread' in url.query) {
+          console.log('Generating mock posts')
+          const res = await server.mocker.users.bob.agent.post({
+            text: 'Thread root',
+          })
+          await server.mocker.users.carla.agent.post({
+            text: 'Thread reply',
+            reply: {
+              parent: {cid: res.cid, uri: res.uri},
+              root: {cid: res.cid, uri: res.uri},
+            },
+          })
+        }
+        if ('mergefeed' in url.query) {
+          console.log('Generating mock users')
+          await server.mocker.createUser('alice')
+          await server.mocker.createUser('bob')
+          await server.mocker.createUser('carla')
+          await server.mocker.createUser('dan')
+          await server.mocker.users.alice.agent.upsertProfile(() => ({
+            displayName: 'Alice',
+            description: 'Test user 1',
+          }))
+          await server.mocker.users.bob.agent.upsertProfile(() => ({
+            displayName: 'Bob',
+            description: 'Test user 2',
+          }))
+          await server.mocker.users.carla.agent.upsertProfile(() => ({
+            displayName: 'Carla',
+            description: 'Test user 3',
+          }))
+          await server.mocker.users.dan.agent.upsertProfile(() => ({
+            displayName: 'Dan',
+            description: 'Test user 4',
+          }))
+          console.log('Generating mock follows')
+          await server.mocker.follow('alice', 'bob')
+          await server.mocker.follow('alice', 'carla')
+          console.log('Generating mock posts')
+          let posts: Record<string, any[]> = {
+            alice: [],
+            bob: [],
+            carla: [],
+            dan: [],
+          }
+          for (let i = 0; i < 10; i++) {
+            for (let user in server.mocker.users) {
+              if (user === 'alice') continue
+              posts[user].push(
+                await server.mocker.createPost(user, `Post ${i}`),
+              )
+            }
+          }
+          for (let i = 0; i < 10; i++) {
+            for (let user in server.mocker.users) {
+              if (user === 'alice') continue
+              if (i % 5 === 0) {
+                await server.mocker.createReply(user, 'Self reply', {
+                  cid: posts[user][i].cid,
+                  uri: posts[user][i].uri,
+                })
+              }
+              if (i % 5 === 1) {
+                await server.mocker.createReply(user, 'Reply to bob', {
+                  cid: posts.bob[i].cid,
+                  uri: posts.bob[i].uri,
+                })
+              }
+              if (i % 5 === 2) {
+                await server.mocker.createReply(user, 'Reply to dan', {
+                  cid: posts.dan[i].cid,
+                  uri: posts.dan[i].uri,
+                })
+              }
+              await server.mocker.users[user].agent.post({text: `Post ${i}`})
+            }
+          }
+          console.log('Generating mock feeds')
+          await server.mocker.createFeed(
+            'alice',
+            'alice-favs',
+            posts.dan.map(p => p.uri),
+          )
+          await server.mocker.createFeed(
+            'alice',
+            'alice-favs2',
+            posts.dan.map(p => p.uri),
+          )
+        }
+        if ('labels' in url.query) {
+          console.log('Generating naughty users with labels')
+
+          const anchorPost = await server.mocker.createPost(
+            'alice',
+            'Anchor post',
+          )
+
+          for (const user of [
+            'dmca-account',
+            'dmca-profile',
+            'dmca-posts',
+            'porn-account',
+            'porn-profile',
+            'porn-posts',
+            'nudity-account',
+            'nudity-profile',
+            'nudity-posts',
+            'scam-account',
+            'scam-profile',
+            'scam-posts',
+            'unknown-account',
+            'unknown-profile',
+            'unknown-posts',
+            'hide-account',
+            'hide-profile',
+            'hide-posts',
+            'no-promote-account',
+            'no-promote-profile',
+            'no-promote-posts',
+            'warn-account',
+            'warn-profile',
+            'warn-posts',
+            'muted-account',
+            'muted-by-list-acc',
+            'blocking-account',
+            'blockedby-account',
+            'mutual-block-acc',
+          ]) {
+            await server.mocker.createUser(user)
+            await server.mocker.follow('alice', user)
+            await server.mocker.follow(user, 'alice')
+            await server.mocker.createPost(user, `Unlabeled post from ${user}`)
+            await server.mocker.createReply(
+              user,
+              `Unlabeled reply from ${user}`,
+              anchorPost,
+            )
+            await server.mocker.like(user, anchorPost)
+          }
+
+          await server.mocker.labelAccount('dmca-violation', 'dmca-account')
+          await server.mocker.labelProfile('dmca-violation', 'dmca-profile')
+          await server.mocker.labelPost(
+            'dmca-violation',
+            await server.mocker.createPost('dmca-posts', 'dmca post'),
+          )
+          await server.mocker.labelPost(
+            'dmca-violation',
+            await server.mocker.createQuotePost(
+              'dmca-posts',
+              'dmca quote post',
+              anchorPost,
+            ),
+          )
+          await server.mocker.labelPost(
+            'dmca-violation',
+            await server.mocker.createReply(
+              'dmca-posts',
+              'dmca reply',
+              anchorPost,
+            ),
+          )
+
+          await server.mocker.labelAccount('porn', 'porn-account')
+          await server.mocker.labelProfile('porn', 'porn-profile')
+          await server.mocker.labelPost(
+            'porn',
+            await server.mocker.createImagePost('porn-posts', 'porn post'),
+          )
+          await server.mocker.labelPost(
+            'porn',
+            await server.mocker.createQuotePost(
+              'porn-posts',
+              'porn quote post',
+              anchorPost,
+            ),
+          )
+          await server.mocker.labelPost(
+            'porn',
+            await server.mocker.createReply(
+              'porn-posts',
+              'porn reply',
+              anchorPost,
+            ),
+          )
+
+          await server.mocker.labelAccount('nudity', 'nudity-account')
+          await server.mocker.labelProfile('nudity', 'nudity-profile')
+          await server.mocker.labelPost(
+            'nudity',
+            await server.mocker.createImagePost('nudity-posts', 'nudity post'),
+          )
+          await server.mocker.labelPost(
+            'nudity',
+            await server.mocker.createQuotePost(
+              'nudity-posts',
+              'nudity quote post',
+              anchorPost,
+            ),
+          )
+          await server.mocker.labelPost(
+            'nudity',
+            await server.mocker.createReply(
+              'nudity-posts',
+              'nudity reply',
+              anchorPost,
+            ),
+          )
+
+          await server.mocker.labelAccount('scam', 'scam-account')
+          await server.mocker.labelProfile('scam', 'scam-profile')
+          await server.mocker.labelPost(
+            'scam',
+            await server.mocker.createPost('scam-posts', 'scam post'),
+          )
+          await server.mocker.labelPost(
+            'scam',
+            await server.mocker.createQuotePost(
+              'scam-posts',
+              'scam quote post',
+              anchorPost,
+            ),
+          )
+          await server.mocker.labelPost(
+            'scam',
+            await server.mocker.createReply(
+              'scam-posts',
+              'scam reply',
+              anchorPost,
+            ),
+          )
+
+          await server.mocker.labelAccount(
+            'not-a-real-label',
+            'unknown-account',
+          )
+          await server.mocker.labelProfile(
+            'not-a-real-label',
+            'unknown-profile',
+          )
+          await server.mocker.labelPost(
+            'not-a-real-label',
+            await server.mocker.createPost('unknown-posts', 'unknown post'),
+          )
+          await server.mocker.labelPost(
+            'not-a-real-label',
+            await server.mocker.createQuotePost(
+              'unknown-posts',
+              'unknown quote post',
+              anchorPost,
+            ),
+          )
+          await server.mocker.labelPost(
+            'not-a-real-label',
+            await server.mocker.createReply(
+              'unknown-posts',
+              'unknown reply',
+              anchorPost,
+            ),
+          )
+
+          await server.mocker.labelAccount('!hide', 'hide-account')
+          await server.mocker.labelProfile('!hide', 'hide-profile')
+          await server.mocker.labelPost(
+            '!hide',
+            await server.mocker.createPost('hide-posts', 'hide post'),
+          )
+          await server.mocker.labelPost(
+            '!hide',
+            await server.mocker.createQuotePost(
+              'hide-posts',
+              'hide quote post',
+              anchorPost,
+            ),
+          )
+          await server.mocker.labelPost(
+            '!hide',
+            await server.mocker.createReply(
+              'hide-posts',
+              'hide reply',
+              anchorPost,
+            ),
+          )
+
+          await server.mocker.labelAccount('!no-promote', 'no-promote-account')
+          await server.mocker.labelProfile('!no-promote', 'no-promote-profile')
+          await server.mocker.labelPost(
+            '!no-promote',
+            await server.mocker.createPost(
+              'no-promote-posts',
+              'no-promote post',
+            ),
+          )
+          await server.mocker.labelPost(
+            '!no-promote',
+            await server.mocker.createQuotePost(
+              'no-promote-posts',
+              'no-promote quote post',
+              anchorPost,
+            ),
+          )
+          await server.mocker.labelPost(
+            '!no-promote',
+            await server.mocker.createReply(
+              'no-promote-posts',
+              'no-promote reply',
+              anchorPost,
+            ),
+          )
+
+          await server.mocker.labelAccount('!warn', 'warn-account')
+          await server.mocker.labelProfile('!warn', 'warn-profile')
+          await server.mocker.labelPost(
+            '!warn',
+            await server.mocker.createPost('warn-posts', 'warn post'),
+          )
+          await server.mocker.labelPost(
+            '!warn',
+            await server.mocker.createQuotePost(
+              'warn-posts',
+              'warn quote post',
+              anchorPost,
+            ),
+          )
+          await server.mocker.labelPost(
+            '!warn',
+            await server.mocker.createReply(
+              'warn-posts',
+              'warn reply',
+              anchorPost,
+            ),
+          )
+
+          await server.mocker.users.alice.agent.mute('muted-account.test')
+          await server.mocker.createPost('muted-account', 'muted post')
+          await server.mocker.createQuotePost(
+            'muted-account',
+            'muted quote post',
+            anchorPost,
+          )
+          await server.mocker.createReply(
+            'muted-account',
+            'muted reply',
+            anchorPost,
+          )
+
+          const list = await server.mocker.createMuteList(
+            'alice',
+            'Muted Users',
+          )
+          await server.mocker.addToMuteList(
+            'alice',
+            list,
+            server.mocker.users['muted-by-list-acc'].did,
+          )
+          await server.mocker.createPost('muted-by-list-acc', 'muted post')
+          await server.mocker.createQuotePost(
+            'muted-by-list-acc',
+            'account quote post',
+            anchorPost,
+          )
+          await server.mocker.createReply(
+            'muted-by-list-acc',
+            'account reply',
+            anchorPost,
+          )
+
+          await server.mocker.createPost('blocking-account', 'blocking post')
+          await server.mocker.createQuotePost(
+            'blocking-account',
+            'blocking quote post',
+            anchorPost,
+          )
+          await server.mocker.createReply(
+            'blocking-account',
+            'blocking reply',
+            anchorPost,
+          )
+          await server.mocker.users.alice.agent.app.bsky.graph.block.create(
+            {
+              repo: server.mocker.users.alice.did,
+            },
+            {
+              subject: server.mocker.users['blocking-account'].did,
+              createdAt: new Date().toISOString(),
+            },
+          )
+
+          await server.mocker.createPost('blockedby-account', 'blockedby post')
+          await server.mocker.createQuotePost(
+            'blockedby-account',
+            'blockedby quote post',
+            anchorPost,
+          )
+          await server.mocker.createReply(
+            'blockedby-account',
+            'blockedby reply',
+            anchorPost,
+          )
+          await server.mocker.users[
+            'blockedby-account'
+          ].agent.app.bsky.graph.block.create(
+            {
+              repo: server.mocker.users['blockedby-account'].did,
+            },
+            {
+              subject: server.mocker.users.alice.did,
+              createdAt: new Date().toISOString(),
+            },
+          )
+
+          await server.mocker.createPost(
+            'mutual-block-acc',
+            'mutual-block post',
+          )
+          await server.mocker.createQuotePost(
+            'mutual-block-acc',
+            'mutual-block quote post',
+            anchorPost,
+          )
+          await server.mocker.createReply(
+            'mutual-block-acc',
+            'mutual-block reply',
+            anchorPost,
+          )
+          await server.mocker.users.alice.agent.app.bsky.graph.block.create(
+            {
+              repo: server.mocker.users.alice.did,
+            },
+            {
+              subject: server.mocker.users['mutual-block-acc'].did,
+              createdAt: new Date().toISOString(),
+            },
+          )
+          await server.mocker.users[
+            'mutual-block-acc'
+          ].agent.app.bsky.graph.block.create(
+            {
+              repo: server.mocker.users['mutual-block-acc'].did,
+            },
+            {
+              subject: server.mocker.users.alice.did,
+              createdAt: new Date().toISOString(),
+            },
+          )
+
+          // flush caches
+          await server.mocker.testNet.processAll()
+        }
+      }
+      console.log('Ready')
+      return res
+        .writeHead(200, {
+          'content-type': 'application/json',
+        })
+        .end(
+          JSON.stringify({
+            pdsUrl: server.pdsUrl,
+            appviewDid: server.appviewDid,
+          }),
+        )
+    } catch (e) {
+      console.error('Error!', e)
+      return res.writeHead(500).end()
+    }
+  }).listen(1986)
+  console.log('Mock server manager listening on 1986')
+}
+main()

__e2e__/setupApp.yml

@@ -3,29 +3,15 @@ appId: xyz.blueskyweb.app
 - launchApp:
     appId: "xyz.blueskyweb.app"
     clearState: true
-    arguments:
-      "-EXDevMenuIsOnboardingFinished": true
-- runFlow:
-    when:
-      platform: iOS
-    commands:
-      - openLink: "exp+bluesky://expo-development-client/?url=http%3A%2F%2Flocalhost%3A8081"
-      - runFlow:
-          when:
-            visible: 'Open in "Bluesky"'
-          commands:
-            - tapOn: Open
-- runFlow:
-    when:
-      platform: Android
-    commands:
-      - tapOn: 'http://localhost:8081'
-      - runFlow:
-          label: "Dismiss Expo dev menu"
-          when:
-            visible: "Continue"
-          commands:
-            - back
+- waitForAnimationToEnd
+- tapOn: "http://localhost:8081"
+- waitForAnimationToEnd
+- extendedWaitUntil:
+    visible: "Continue"
+- swipe:
+    from: "Bluesky"
+    direction: DOWN
+    duration: 100
 - tapOn:
     id: e2eProxyHeaderInput
 - inputText: ${output.result}

__mocks__/@notifee/react-native.ts

@@ -0,0 +1,6 @@
+export default {
+  requestPermission: jest.fn(),
+  onForegroundEvent: jest.fn(),
+  setBadgeCount: jest.fn(),
+  displayNotification: jest.fn(),
+}

__mocks__/@react-native-camera-roll/camera-roll.js

@@ -0,0 +1,9 @@
+export const CameraRoll = {
+  getPhotos: jest.fn().mockResolvedValue({
+    edges: [
+      {node: {image: {uri: 'path/to/image1.jpg'}}},
+      {node: {image: {uri: 'path/to/image2.jpg'}}},
+      {node: {image: {uri: 'path/to/image3.jpg'}}},
+    ],
+  }),
+}

__mocks__/react-native-background-fetch.ts

@@ -0,0 +1,4 @@
+export default {
+  configure: jest.fn().mockResolvedValue(0),
+  finish: jest.fn(),
+}

__mocks__/react-native-fs.js

@@ -0,0 +1 @@
+export default {}

__mocks__/rn-fetch-blob.js

@@ -0,0 +1,10 @@
+jest.mock('rn-fetch-blob', () => {
+  return {
+    __esModule: true,
+    default: {
+      fs: {
+        unlink: jest.fn(),
+      },
+    },
+  }
+})

__mocks__/zeego/dropdown-menu.js

@@ -0,0 +1,2 @@
+export const DropdownMenu = jest.fn().mockImplementation(() => {})
+export const create = jest.fn().mockImplementation(() => {})

__tests__/lib/string.test.ts

@@ -1,5 +1,4 @@
 import {RichText} from '@atproto/api'
-import {i18n} from '@lingui/core'
 
 import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player'
 import {
@@ -7,7 +6,6 @@ import {
   createStarterPackLinkFromAndroidReferrer,
   parseStarterPackUri,
 } from '#/lib/strings/starter-pack'
-import {messages} from '#/locale/locales/en/messages'
 import {tenorUrlToBskyGifUrl} from '#/state/queries/tenor'
 import {cleanError} from '../../src/lib/strings/errors'
 import {createFullHandle, makeValidHandle} from '../../src/lib/strings/handles'
@@ -204,9 +202,6 @@ describe('enforceLen', () => {
 })
 
 describe('cleanError', () => {
-  // cleanError uses lingui
-  i18n.loadAndActivate({locale: 'en', messages})
-
   const inputs = [
     'TypeError: Network request failed',
     'Error: Aborted',
@@ -332,7 +327,6 @@ describe('shortenLinks', () => {
       expect(outputRT.text).toEqual(outputs[i][0])
       expect(outputRT.facets?.length).toEqual(outputs[i][1].length)
       for (let j = 0; j < outputs[i][1].length; j++) {
-        // @ts-expect-error whatever
         expect(outputRT.facets![j].features[0].uri).toEqual(outputs[i][1][j])
       }
     }
@@ -443,13 +437,6 @@ describe('parseEmbedPlayerFromUrl', () => {
 
     'https://www.flickr.com/groups/898944@N23/',
     'https://www.flickr.com/groups',
-
-    'https://maxblansjaar.bandcamp.com/album/false-comforts',
-    'https://grmnygrmny.bandcamp.com/track/fluid',
-    'https://sufjanstevens.bandcamp.com/',
-    'https://sufjanstevens.bandcamp.com',
-    'https://bandcamp.com/',
-    'https://bandcamp.com',
   ]
 
   const outputs = [
@@ -828,23 +815,6 @@ describe('parseEmbedPlayerFromUrl', () => {
 
     undefined,
     undefined,
-
-    {
-      type: 'bandcamp_album',
-      source: 'bandcamp',
-      playerUri:
-        'https://bandcamp.com/EmbeddedPlayer/url=https%3A%2F%2Fmaxblansjaar.bandcamp.com%2Falbum%2Ffalse-comforts/size=large/bgcol=ffffff/linkcol=0687f5/minimal=true/transparent=true/',
-    },
-    {
-      type: 'bandcamp_track',
-      source: 'bandcamp',
-      playerUri:
-        'https://bandcamp.com/EmbeddedPlayer/url=https%3A%2F%2Fgrmnygrmny.bandcamp.com%2Ftrack%2Ffluid/size=large/bgcol=ffffff/linkcol=0687f5/minimal=true/transparent=true/',
-    },
-    undefined,
-    undefined,
-    undefined,
-    undefined,
   ]
 
   it('correctly grabs the correct id from uri', () => {

app.config.js

@@ -35,13 +35,6 @@ module.exports = function (_config) {
 
   const USE_SENTRY = Boolean(process.env.SENTRY_AUTH_TOKEN)
 
-  const IOS_ICON_FILE =
-    PLATFORM === 'web' // web build doesn't like .icon files
-      ? './assets/app-icons/ios_icon_default_next.png'
-      : IS_TESTFLIGHT
-        ? './assets/app-icons/ios_icon_testflight.icon'
-        : './assets/app-icons/ios_icon_default.icon'
-
   return {
     expo: {
       version: VERSION,
@@ -62,7 +55,10 @@ module.exports = function (_config) {
         config: {
           usesNonExemptEncryption: false,
         },
-        icon: IOS_ICON_FILE,
+        icon:
+          PLATFORM === 'web' // web build doesn't like .icon files
+            ? './assets/app-icons/ios_icon_default_next.png'
+            : './assets/app-icons/ios_icon_default.icon',
         infoPlist: {
           UIBackgroundModes: ['remote-notification'],
           NSCameraUsageDescription:
@@ -116,6 +112,7 @@ module.exports = function (_config) {
             'zh-Hans',
             'zh-Hant',
           ],
+          UIDesignRequiresCompatibility: true,
         },
         associatedDomains: ASSOCIATED_DOMAINS,
         entitlements: {
@@ -259,16 +256,9 @@ module.exports = function (_config) {
               deploymentTarget: '15.1',
               buildReactNativeFromSource: true,
               ccacheEnabled: IS_DEV,
-              extraPods: [
-                {
-                  name: 'MCEmojiPicker',
-                  git: 'https://github.com/bluesky-social/MCEmojiPicker.git',
-                  branch: 'main',
-                },
-              ],
             },
             android: {
-              compileSdkVersion: 36,
+              compileSdkVersion: 35,
               targetSdkVersion: 35,
               buildToolsVersion: '35.0.0',
               buildReactNativeFromSource: IS_PRODUCTION,

assets/app-icons/ios_icon_testflight.icon/icon.json

@@ -1,113 +0,0 @@
-{
-  "fill" : {
-    "automatic-gradient" : "srgb:1.00000,1.00000,1.00000,1.00000"
-  },
-  "groups" : [
-    {
-      "blend-mode-specializations" : [
-        {
-          "value" : "overlay"
-        },
-        {
-          "appearance" : "dark",
-          "value" : "screen"
-        },
-        {
-          "appearance" : "tinted",
-          "value" : "screen"
-        }
-      ],
-      "blur-material-specializations" : [
-        {
-          "value" : 0.5
-        },
-        {
-          "appearance" : "dark",
-          "value" : 0.5
-        },
-        {
-          "appearance" : "tinted",
-          "value" : null
-        }
-      ],
-      "hidden" : false,
-      "layers" : [
-        {
-          "image-name" : "TestFlight notice.png",
-          "name" : "TestFlight notice"
-        }
-      ],
-      "lighting" : "individual",
-      "position" : {
-        "scale" : 0.4,
-        "translation-in-points" : [
-          0,
-          350
-        ]
-      },
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "specular-specializations" : [
-        {
-          "value" : false
-        },
-        {
-          "appearance" : "dark",
-          "value" : false
-        },
-        {
-          "appearance" : "tinted",
-          "value" : false
-        }
-      ],
-      "translucency-specializations" : [
-        {
-          "value" : {
-            "enabled" : true,
-            "value" : 0.5
-          }
-        },
-        {
-          "appearance" : "dark",
-          "value" : {
-            "enabled" : true,
-            "value" : 0.5
-          }
-        },
-        {
-          "appearance" : "tinted",
-          "value" : {
-            "enabled" : true,
-            "value" : 0.5
-          }
-        }
-      ]
-    },
-    {
-      "layers" : [
-        {
-          "fill" : "none",
-          "glass" : false,
-          "image-name" : "iOS transparent.png",
-          "name" : "iOS transparent"
-        }
-      ],
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}

assets/icons/bot_filled.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 0a2 2 0 0 1 1 3.73V5h4.2c1.68 0 2.52 0 3.162.327a3 3 0 0 1 1.31 1.31C22 7.28 22 8.12 22 9.8v.25a2.501 2.501 0 0 1 0 4.9V15c0 2.8 0 4.2-.545 5.27a5 5 0 0 1-2.185 2.185C18.2 23 16.8 23 14 23h-4c-2.8 0-4.2 0-5.27-.545a5 5 0 0 1-2.185-2.185C2 19.2 2 17.8 2 15v-.05a2.5 2.5 0 0 1 0-4.9V9.8c0-1.68 0-2.52.327-3.162a3 3 0 0 1 1.31-1.31C4.28 5 5.12 5 6.8 5H11V3.73A2 2 0 0 1 12 0M8 10a2 2 0 0 0-2 2v2a2 2 0 1 0 4 0v-2a2 2 0 0 0-2-2m8 0a2 2 0 0 0-2 2v2a2 2 0 1 0 4 0v-2a2 2 0 0 0-2-2" clip-rule="evenodd"/></svg>

assets/icons/bot_stroke.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2a1 1 0 0 1 1 1v2h3.2l1.113.005c.975.015 1.568.077 2.05.322a3 3 0 0 1 1.31 1.31C21 7.28 21 8.12 21 9.8v.287a1.498 1.498 0 0 1-.005 2.827c-.006 2.204-.058 3.41-.54 4.356l-.093.174a5 5 0 0 1-2.092 2.011l-.205.096c-.766.33-1.72.417-3.21.44L13 20h-2l-1.854-.009c-1.49-.023-2.445-.11-3.211-.44l-.205-.096a5 5 0 0 1-2.185-2.185c-.409-.803-.51-1.79-.536-3.415l-.005-.94A1.498 1.498 0 0 1 3 10.086V9.8c0-1.575 0-2.412.27-3.04l.057-.122a3 3 0 0 1 1.105-1.196l.206-.115C5.279 5 6.12 5 7.8 5H11V3a1 1 0 0 1 1-1M7.8 7c-.873 0-1.408.002-1.808.034a3 3 0 0 0-.367.051l-.063.018-.016.006a1 1 0 0 0-.437.437l-.006.016-.018.063a3 3 0 0 0-.05.367C5.001 8.392 5 8.927 5 9.8V12c0 1.433.002 2.388.062 3.121.058.71.16 1.036.265 1.241a3 3 0 0 0 1.31 1.31c.207.106.532.209 1.242.267.733.06 1.688.061 3.121.061h2c1.433 0 2.388-.002 3.121-.061.71-.058 1.036-.161 1.241-.266a3 3 0 0 0 1.31-1.31c.106-.206.209-.532.267-1.242.06-.733.061-1.688.061-3.121V9.8c0-.873-.002-1.408-.034-1.808a2.5 2.5 0 0 0-.051-.367l-.017-.063-.007-.016a1 1 0 0 0-.437-.437l-.015-.006-.064-.018a3 3 0 0 0-.367-.05C17.608 7.001 17.073 7 16.2 7zM9 10a1 1 0 0 1 1 1v2a1 1 0 1 1-2 0v-2a1 1 0 0 1 1-1m6 0a1 1 0 0 1 1 1v2a1 1 0 1 1-2 0v-2a1 1 0 0 1 1-1"/></svg>

assets/icons/dotGrid2x3_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M9 17a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm-6-7a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4ZM9 3a2 2 0 1 1 0 4 2 2 0 0 1 0-4Zm6 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4Z"/></svg>

babel.config.js

@@ -16,7 +16,7 @@ module.exports = function (api) {
       ],
     ],
     plugins: [
-      '@lingui/babel-plugin-lingui-macro',
+      'macros',
       ['babel-plugin-react-compiler', {target: '19'}],
       [
         'module:react-native-dotenv',

bskyembed/src/components/post.tsx

@@ -10,7 +10,6 @@ import logo from '../../assets/logo_full_name.svg'
 import {Like as LikeIcon} from '../icons/Like'
 import {Reply as ReplyIcon} from '../icons/Reply'
 import {Repost as RepostIcon} from '../icons/Repost'
-import {Robot as RobotIcon} from '../icons/Robot'
 import {CONTENT_LABELS} from '../labels'
 import * as bsky from '../types/bsky'
 import {niceDate} from '../util/nice-date'
@@ -44,9 +43,6 @@ export function Post({thread}: Props) {
   }
 
   const verification = getVerificationState({profile: post.author})
-  const isBot = post.author.labels?.some(
-    l => l.val === 'bot' && l.src === post.author.did,
-  )
 
   const href = `/profile/${post.author.did}/post/${getRkey(post)}`
 
@@ -80,12 +76,6 @@ export function Post({thread}: Props) {
                   size={15}
                 />
               )}
-              {isBot && (
-                <RobotIcon
-                  className="pl-[3px] mt-px shrink-0 text-slate-500 dark:text-slate-400"
-                  size={15}
-                />
-              )}
             </div>
             <Link
               href={`/profile/${post.author.did}`}

bskyembed/src/icons/Robot.tsx

@@ -1,22 +0,0 @@
-import {h} from 'preact'
-
-export const Robot = ({
-  size = 14,
-  className,
-}: {
-  size?: number
-  className?: string
-}) => (
-  <svg
-    className={className}
-    width={size}
-    height={size}
-    viewBox="0 0 24 24"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-      d="M12 0C13.1046 0 14 0.89543 14 2C14 2.73976 13.5971 3.3835 13 3.72949V5H17.2002C18.8802 5 19.7206 5.00018 20.3623 5.32715C20.9265 5.61472 21.3853 6.07347 21.6729 6.6377C21.9998 7.27941 22 8.11978 22 9.7998V10.0498C23.1411 10.2814 24 11.2905 24 12.5C24 13.7094 23.141 14.7175 22 14.9492V15C22 17.8 21.9999 19.2 21.4551 20.2695C20.9757 21.2103 20.2103 21.9757 19.2695 22.4551C18.2 22.9999 16.8 23 14 23H10C7.20005 23 5.79998 22.9999 4.73047 22.4551C3.78966 21.9757 3.02429 21.2103 2.54492 20.2695C2.00013 19.2 2 17.8 2 15V14.9492C0.858955 14.7175 0 13.7094 0 12.5C0 11.2905 0.85886 10.2814 2 10.0498V9.7998C2 8.11978 2.00018 7.27941 2.32715 6.6377C2.61472 6.07347 3.07347 5.61472 3.6377 5.32715C4.27941 5.00018 5.11978 5 6.7998 5H11V3.72949C10.4029 3.3835 10 2.73976 10 2C10 0.89543 10.8954 0 12 0ZM8 10C6.89543 10 6 10.8954 6 12V14C6 15.1046 6.89543 16 8 16C9.10457 16 10 15.1046 10 14V12C10 10.8954 9.10457 10 8 10ZM16 10C14.8954 10 14 10.8954 14 12V14C14 15.1046 14.8954 16 16 16C17.1046 16 18 15.1046 18 14V12C18 10.8954 17.1046 10 16 10Z"
-      fill="currentColor"
-    />
-  </svg>
-)

bskyogcard/src/components/Butterfly.tsx

@@ -1,6 +1,6 @@
-import {type SVGAttributes} from 'react'
+import React from 'react'
 
-export function Butterfly(props: SVGAttributes<SVGSVGElement>) {
+export function Butterfly(props: React.SVGAttributes<SVGSVGElement>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

bskyogcard/src/components/Img.tsx

@@ -1,22 +1,10 @@
-import {type ImgHTMLAttributes} from 'react'
-
-// @NOTE satori does not currently support webp, see vercel/satori#273
-function detectMime(buf: Buffer): string {
-  if (buf[0] === 0xff && buf[1] === 0xd8) return 'image/jpeg'
-  if (buf[0] === 0x89 && buf[1] === 0x50) return 'image/png'
-  if (buf[0] === 0x52 && buf[1] === 0x49) return 'image/webp'
-  if (buf[0] === 0x47 && buf[1] === 0x49) return 'image/gif'
-  return 'image/jpeg'
-}
+import React from 'react'
 
 export function Img(
-  props: Omit<ImgHTMLAttributes<HTMLImageElement>, 'src'> & {src: Buffer},
+  props: Omit<React.ImgHTMLAttributes<HTMLImageElement>, 'src'> & {src: Buffer},
 ) {
   const {src, ...others} = props
   return (
-    <img
-      {...others}
-      src={`data:${detectMime(src)};base64,${src.toString('base64')}`}
-    />
+    <img {...others} src={`data:image/jpeg;base64,${src.toString('base64')}`} />
   )
 }

bskyogcard/src/components/StarterPack.tsx

@@ -1,5 +1,6 @@
 /* eslint-disable bsky-internal/avoid-unwrapped-text */
-import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
+import React from 'react'
+import {AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
 
 import {Butterfly} from './Butterfly.js'
 import {Img} from './Img.js'

bskyogcard/src/routes/starter-pack.tsx

@@ -1,8 +1,9 @@
 import assert from 'node:assert'
 
-import {type AppBskyGraphDefs, AtUri} from '@atproto/api'
+import React from 'react'
+import {AppBskyGraphDefs, AtUri} from '@atproto/api'
 import resvg from '@resvg/resvg-js'
-import {type Express} from 'express'
+import {Express} from 'express'
 import satori from 'satori'
 
 import {
@@ -10,7 +11,7 @@ import {
   STARTERPACK_HEIGHT,
   STARTERPACK_WIDTH,
 } from '../components/StarterPack.js'
-import {type AppContext} from '../context.js'
+import {AppContext} from '../context.js'
 import {httpLogger} from '../logger.js'
 import {loadEmojiAsSvg} from '../util.js'
 import {handler, originVerifyMiddleware} from './util.js'
@@ -82,18 +83,12 @@ export default function (ctx: AppContext, app: Express) {
 }
 
 async function getImage(url: string) {
-  const response = await fetch(ensureJpeg(url))
+  const response = await fetch(url)
   const arrayBuf = await response.arrayBuffer() // must drain body even if it will be discarded
   if (response.status !== 200) return null
   return Buffer.from(arrayBuf)
 }
 
-// CDN URLs end with @jpeg, @webp, or no extension (which may default to webp).
-// We want to ensure the image URLs we use are for jpegs, required for compat with satori.
-function ensureJpeg(url: string) {
-  return url.replace(/(@[a-z]{3,5})?$/, '@jpeg')
-}
-
 const hideAvatarLabels = new Set([
   '!hide',
   '!warn',

bskyweb/README.md

@@ -6,26 +6,21 @@ To build the SPA bundle (`bundle.web.js`), first get a JavaScript development
 environment set up. Either follow the top-level README, or something quick
 like:
 
-```bash
-# install nodejs
-nvm install
-nvm use
-npm install --global yarn
+    # install nodejs
+    nvm install
+    nvm use
+    npm install --global yarn
 
-# setup tools and deps (in top level of this repo)
-yarn install --frozen-lockfile
+    # setup tools and deps (in top level of this repo)
+    yarn install --frozen-lockfile
 
-# run yarn web dev server, if you wanted
-yarn web
-```
+    # run yarn web dev server, if you wanted
+    yarn web
 
 Then build and copy over the big 'ol `bundle.web.js` file:
 
-
-```bash
-# in the top level of this repo
-yarn build-web
-```
+    # in the top level of this repo
+    yarn build-web
 
 ### Golang Daemon
 
@@ -33,13 +28,11 @@ Install golang. We generally develop against the current stable release of the l
 
 In this directory (`bskyweb/`):
 
-```bash
-# re-build and run daemon
-go run ./cmd/bskyweb serve
+    # re-build and run daemon
+    go run ./cmd/bskyweb serve
 
-# build and output a binary
-go build -o bskyweb ./cmd/bskyweb/
-```
+    # build and output a binary
+    go build -o bskyweb ./cmd/bskyweb/
 
 The easiest way to configure the daemon is to copy `example.env` to `.env` and
 fill in auth values there.

bskyweb/cmd/bskyweb/filters.go

@@ -2,14 +2,12 @@ package main
 
 import (
 	"net/url"
-	"strings"
 
 	"github.com/flosch/pongo2/v6"
 )
 
 func init() {
 	pongo2.RegisterFilter("canonicalize_url", filterCanonicalizeURL)
-	pongo2.RegisterFilter("avatar_thumbnail", filterAvatarThumbnail)
 }
 
 func filterCanonicalizeURL(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {
@@ -28,8 +26,3 @@ func filterCanonicalizeURL(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value
 	// Return the cleaned URL
 	return pongo2.AsValue(parsedURL.String()), nil
 }
-
-func filterAvatarThumbnail(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {
-	urlStr := in.String()
-	return pongo2.AsValue(strings.Replace(urlStr, "/img/avatar/plain/", "/img/avatar_thumbnail/plain/", 1)), nil
-}

bskyweb/cmd/bskyweb/server.go

@@ -292,7 +292,6 @@ func serve(cctx *cli.Context) error {
 	e.GET("/settings/accessibility", server.WebGeneric)
 	e.GET("/settings/appearance", server.WebGeneric)
 	e.GET("/settings/account", server.WebGeneric)
-	e.GET("/settings/automation-label", server.WebGeneric)
 	e.GET("/settings/privacy-and-security", server.WebGeneric)
 	e.GET("/settings/privacy-and-security/activity", server.WebGeneric)
 	e.GET("/settings/content-and-media", server.WebGeneric)
@@ -575,10 +574,7 @@ func (srv *Server) WebPost(c echo.Context) error {
 
 	if postView.Embed != nil && !isEmbedHidden {
 		hasImages := postView.Embed.EmbedImages_View != nil
-		hasVideo := postView.Embed.EmbedVideo_View != nil
-		hasMedia := postView.Embed.EmbedRecordWithMedia_View != nil && postView.Embed.EmbedRecordWithMedia_View.Media != nil
-		hasMediaImages := hasMedia && postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View != nil
-		hasMediaVideo := hasMedia && postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View != nil
+		hasMedia := postView.Embed.EmbedRecordWithMedia_View != nil && postView.Embed.EmbedRecordWithMedia_View.Media != nil && postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View != nil
 
 		if hasImages {
 			var thumbUrls []string
@@ -586,20 +582,12 @@ func (srv *Server) WebPost(c echo.Context) error {
 				thumbUrls = append(thumbUrls, postView.Embed.EmbedImages_View.Images[i].Thumb)
 			}
 			data["imgThumbUrls"] = thumbUrls
-		} else if hasVideo {
-			if postView.Embed.EmbedVideo_View.Thumbnail != nil {
-				data["imgThumbUrls"] = []string{*postView.Embed.EmbedVideo_View.Thumbnail}
-			}
-		} else if hasMediaImages {
+		} else if hasMedia {
 			var thumbUrls []string
 			for i := range postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View.Images {
 				thumbUrls = append(thumbUrls, postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View.Images[i].Thumb)
 			}
 			data["imgThumbUrls"] = thumbUrls
-		} else if hasMediaVideo {
-			if postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.Thumbnail != nil {
-				data["imgThumbUrls"] = []string{*postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.Thumbnail}
-			}
 		}
 	}
 

bskyweb/cmd/embedr/server.go

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

bskyweb/templates/base.html

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

bskyweb/templates/post.html

@@ -35,8 +35,8 @@
   {% endfor %}
   <meta name="twitter:card" content="summary_large_image">
   {% else %}
-  <meta property="og:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">
-  <meta property="twitter:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">
+  <meta property="og:image" content="{{ postView.Author.Avatar }}">
+  <meta property="twitter:image" content="{{ postView.Author.Avatar }}">
   <meta name="twitter:card" content="summary">
   {% endif %}
   <meta name="twitter:label1" content="Posted At">

dev-env/mock-server.ts

@@ -1,510 +0,0 @@
-import {createServer as createHTTPServer} from 'node:http'
-import {parse} from 'node:url'
-
-import {createServer, type TestPDS} from './test-pds'
-
-let server: TestPDS
-// eslint-disable-next-line @typescript-eslint/no-misused-promises
-createHTTPServer(async (req, res) => {
-  const url = parse(req.url || '/', true)
-  if (req.method !== 'POST') {
-    return res.writeHead(200).end()
-  }
-  try {
-    console.log('Closing old server')
-    await server?.close()
-    console.log('Starting new server')
-    const inviteRequired = url?.query && 'invite' in url.query
-    server = await createServer({inviteRequired})
-    console.log('Listening at', server.pdsUrl)
-    if (url?.query) {
-      if ('users' in url.query) {
-        console.log('Generating mock users')
-        await server.mocker.createUser('alice')
-        await server.mocker.createUser('bob')
-        await server.mocker.createUser('carla')
-        await server.mocker.users.alice.agent.upsertProfile(() => ({
-          displayName: 'Alice',
-          description: 'Test user 1',
-        }))
-        await server.mocker.users.bob.agent.upsertProfile(() => ({
-          displayName: 'Bob',
-          description: 'Test user 2',
-        }))
-        await server.mocker.users.carla.agent.upsertProfile(() => ({
-          displayName: 'Carla',
-          description: 'Test user 3',
-        }))
-        if (inviteRequired) {
-          await server.mocker.createInvite(server.mocker.users.alice.did)
-        }
-      }
-      if ('follows' in url.query) {
-        console.log('Generating mock follows')
-        await server.mocker.follow('alice', 'bob')
-        await server.mocker.follow('alice', 'carla')
-        await server.mocker.follow('bob', 'alice')
-        await server.mocker.follow('bob', 'carla')
-        await server.mocker.follow('carla', 'alice')
-        await server.mocker.follow('carla', 'bob')
-      }
-      if ('posts' in url.query) {
-        console.log('Generating mock posts')
-        for (let user in server.mocker.users) {
-          await server.mocker.users[user].agent.post({text: 'Post'})
-        }
-      }
-      if ('feeds' in url.query) {
-        console.log('Generating mock feed')
-        await server.mocker.createFeed('alice', 'alice-favs', [])
-      }
-      if ('thread' in url.query) {
-        console.log('Generating mock posts')
-        const res = await server.mocker.users.bob.agent.post({
-          text: 'Thread root',
-        })
-        await server.mocker.users.carla.agent.post({
-          text: 'Thread reply',
-          reply: {
-            parent: {cid: res.cid, uri: res.uri},
-            root: {cid: res.cid, uri: res.uri},
-          },
-        })
-      }
-      if ('mergefeed' in url.query) {
-        console.log('Generating mock users')
-        await server.mocker.createUser('alice')
-        await server.mocker.createUser('bob')
-        await server.mocker.createUser('carla')
-        await server.mocker.createUser('dan')
-        await server.mocker.users.alice.agent.upsertProfile(() => ({
-          displayName: 'Alice',
-          description: 'Test user 1',
-        }))
-        await server.mocker.users.bob.agent.upsertProfile(() => ({
-          displayName: 'Bob',
-          description: 'Test user 2',
-        }))
-        await server.mocker.users.carla.agent.upsertProfile(() => ({
-          displayName: 'Carla',
-          description: 'Test user 3',
-        }))
-        await server.mocker.users.dan.agent.upsertProfile(() => ({
-          displayName: 'Dan',
-          description: 'Test user 4',
-        }))
-        console.log('Generating mock follows')
-        await server.mocker.follow('alice', 'bob')
-        await server.mocker.follow('alice', 'carla')
-        console.log('Generating mock posts')
-        let posts: Record<string, any[]> = {
-          alice: [],
-          bob: [],
-          carla: [],
-          dan: [],
-        }
-        for (let i = 0; i < 10; i++) {
-          for (let user in server.mocker.users) {
-            if (user === 'alice') continue
-            posts[user].push(await server.mocker.createPost(user, `Post ${i}`))
-          }
-        }
-        for (let i = 0; i < 10; i++) {
-          for (let user in server.mocker.users) {
-            if (user === 'alice') continue
-            if (i % 5 === 0) {
-              await server.mocker.createReply(user, 'Self reply', {
-                cid: posts[user][i].cid,
-                uri: posts[user][i].uri,
-              })
-            }
-            if (i % 5 === 1) {
-              await server.mocker.createReply(user, 'Reply to bob', {
-                cid: posts.bob[i].cid,
-                uri: posts.bob[i].uri,
-              })
-            }
-            if (i % 5 === 2) {
-              await server.mocker.createReply(user, 'Reply to dan', {
-                cid: posts.dan[i].cid,
-                uri: posts.dan[i].uri,
-              })
-            }
-            await server.mocker.users[user].agent.post({text: `Post ${i}`})
-          }
-        }
-        console.log('Generating mock feeds')
-        await server.mocker.createFeed(
-          'alice',
-          'alice-favs',
-          posts.dan.map(p => p.uri),
-        )
-        await server.mocker.createFeed(
-          'alice',
-          'alice-favs2',
-          posts.dan.map(p => p.uri),
-        )
-      }
-      if ('labels' in url.query) {
-        console.log('Generating naughty users with labels')
-
-        const anchorPost = await server.mocker.createPost(
-          'alice',
-          'Anchor post',
-        )
-
-        for (const user of [
-          'dmca-account',
-          'dmca-profile',
-          'dmca-posts',
-          'porn-account',
-          'porn-profile',
-          'porn-posts',
-          'nudity-account',
-          'nudity-profile',
-          'nudity-posts',
-          'scam-account',
-          'scam-profile',
-          'scam-posts',
-          'unknown-account',
-          'unknown-profile',
-          'unknown-posts',
-          'hide-account',
-          'hide-profile',
-          'hide-posts',
-          'no-promote-account',
-          'no-promote-profile',
-          'no-promote-posts',
-          'warn-account',
-          'warn-profile',
-          'warn-posts',
-          'muted-account',
-          'muted-by-list-acc',
-          'blocking-account',
-          'blockedby-account',
-          'mutual-block-acc',
-        ]) {
-          await server.mocker.createUser(user)
-          await server.mocker.follow('alice', user)
-          await server.mocker.follow(user, 'alice')
-          await server.mocker.createPost(user, `Unlabeled post from ${user}`)
-          await server.mocker.createReply(
-            user,
-            `Unlabeled reply from ${user}`,
-            anchorPost,
-          )
-          await server.mocker.like(user, anchorPost)
-        }
-
-        await server.mocker.labelAccount('dmca-violation', 'dmca-account')
-        await server.mocker.labelProfile('dmca-violation', 'dmca-profile')
-        await server.mocker.labelPost(
-          'dmca-violation',
-          await server.mocker.createPost('dmca-posts', 'dmca post'),
-        )
-        await server.mocker.labelPost(
-          'dmca-violation',
-          await server.mocker.createQuotePost(
-            'dmca-posts',
-            'dmca quote post',
-            anchorPost,
-          ),
-        )
-        await server.mocker.labelPost(
-          'dmca-violation',
-          await server.mocker.createReply(
-            'dmca-posts',
-            'dmca reply',
-            anchorPost,
-          ),
-        )
-
-        await server.mocker.labelAccount('porn', 'porn-account')
-        await server.mocker.labelProfile('porn', 'porn-profile')
-        await server.mocker.labelPost(
-          'porn',
-          await server.mocker.createImagePost('porn-posts', 'porn post'),
-        )
-        await server.mocker.labelPost(
-          'porn',
-          await server.mocker.createQuotePost(
-            'porn-posts',
-            'porn quote post',
-            anchorPost,
-          ),
-        )
-        await server.mocker.labelPost(
-          'porn',
-          await server.mocker.createReply(
-            'porn-posts',
-            'porn reply',
-            anchorPost,
-          ),
-        )
-
-        await server.mocker.labelAccount('nudity', 'nudity-account')
-        await server.mocker.labelProfile('nudity', 'nudity-profile')
-        await server.mocker.labelPost(
-          'nudity',
-          await server.mocker.createImagePost('nudity-posts', 'nudity post'),
-        )
-        await server.mocker.labelPost(
-          'nudity',
-          await server.mocker.createQuotePost(
-            'nudity-posts',
-            'nudity quote post',
-            anchorPost,
-          ),
-        )
-        await server.mocker.labelPost(
-          'nudity',
-          await server.mocker.createReply(
-            'nudity-posts',
-            'nudity reply',
-            anchorPost,
-          ),
-        )
-
-        await server.mocker.labelAccount('scam', 'scam-account')
-        await server.mocker.labelProfile('scam', 'scam-profile')
-        await server.mocker.labelPost(
-          'scam',
-          await server.mocker.createPost('scam-posts', 'scam post'),
-        )
-        await server.mocker.labelPost(
-          'scam',
-          await server.mocker.createQuotePost(
-            'scam-posts',
-            'scam quote post',
-            anchorPost,
-          ),
-        )
-        await server.mocker.labelPost(
-          'scam',
-          await server.mocker.createReply(
-            'scam-posts',
-            'scam reply',
-            anchorPost,
-          ),
-        )
-
-        await server.mocker.labelAccount('not-a-real-label', 'unknown-account')
-        await server.mocker.labelProfile('not-a-real-label', 'unknown-profile')
-        await server.mocker.labelPost(
-          'not-a-real-label',
-          await server.mocker.createPost('unknown-posts', 'unknown post'),
-        )
-        await server.mocker.labelPost(
-          'not-a-real-label',
-          await server.mocker.createQuotePost(
-            'unknown-posts',
-            'unknown quote post',
-            anchorPost,
-          ),
-        )
-        await server.mocker.labelPost(
-          'not-a-real-label',
-          await server.mocker.createReply(
-            'unknown-posts',
-            'unknown reply',
-            anchorPost,
-          ),
-        )
-
-        await server.mocker.labelAccount('!hide', 'hide-account')
-        await server.mocker.labelProfile('!hide', 'hide-profile')
-        await server.mocker.labelPost(
-          '!hide',
-          await server.mocker.createPost('hide-posts', 'hide post'),
-        )
-        await server.mocker.labelPost(
-          '!hide',
-          await server.mocker.createQuotePost(
-            'hide-posts',
-            'hide quote post',
-            anchorPost,
-          ),
-        )
-        await server.mocker.labelPost(
-          '!hide',
-          await server.mocker.createReply(
-            'hide-posts',
-            'hide reply',
-            anchorPost,
-          ),
-        )
-
-        await server.mocker.labelAccount('!no-promote', 'no-promote-account')
-        await server.mocker.labelProfile('!no-promote', 'no-promote-profile')
-        await server.mocker.labelPost(
-          '!no-promote',
-          await server.mocker.createPost('no-promote-posts', 'no-promote post'),
-        )
-        await server.mocker.labelPost(
-          '!no-promote',
-          await server.mocker.createQuotePost(
-            'no-promote-posts',
-            'no-promote quote post',
-            anchorPost,
-          ),
-        )
-        await server.mocker.labelPost(
-          '!no-promote',
-          await server.mocker.createReply(
-            'no-promote-posts',
-            'no-promote reply',
-            anchorPost,
-          ),
-        )
-
-        await server.mocker.labelAccount('!warn', 'warn-account')
-        await server.mocker.labelProfile('!warn', 'warn-profile')
-        await server.mocker.labelPost(
-          '!warn',
-          await server.mocker.createPost('warn-posts', 'warn post'),
-        )
-        await server.mocker.labelPost(
-          '!warn',
-          await server.mocker.createQuotePost(
-            'warn-posts',
-            'warn quote post',
-            anchorPost,
-          ),
-        )
-        await server.mocker.labelPost(
-          '!warn',
-          await server.mocker.createReply(
-            'warn-posts',
-            'warn reply',
-            anchorPost,
-          ),
-        )
-
-        await server.mocker.users.alice.agent.mute('muted-account.test')
-        await server.mocker.createPost('muted-account', 'muted post')
-        await server.mocker.createQuotePost(
-          'muted-account',
-          'muted quote post',
-          anchorPost,
-        )
-        await server.mocker.createReply(
-          'muted-account',
-          'muted reply',
-          anchorPost,
-        )
-
-        const list = await server.mocker.createMuteList('alice', 'Muted Users')
-        await server.mocker.addToMuteList(
-          'alice',
-          list,
-          server.mocker.users['muted-by-list-acc'].did,
-        )
-        await server.mocker.createPost('muted-by-list-acc', 'muted post')
-        await server.mocker.createQuotePost(
-          'muted-by-list-acc',
-          'account quote post',
-          anchorPost,
-        )
-        await server.mocker.createReply(
-          'muted-by-list-acc',
-          'account reply',
-          anchorPost,
-        )
-
-        await server.mocker.createPost('blocking-account', 'blocking post')
-        await server.mocker.createQuotePost(
-          'blocking-account',
-          'blocking quote post',
-          anchorPost,
-        )
-        await server.mocker.createReply(
-          'blocking-account',
-          'blocking reply',
-          anchorPost,
-        )
-        await server.mocker.users.alice.agent.app.bsky.graph.block.create(
-          {
-            repo: server.mocker.users.alice.did,
-          },
-          {
-            subject: server.mocker.users['blocking-account'].did,
-            createdAt: new Date().toISOString(),
-          },
-        )
-
-        await server.mocker.createPost('blockedby-account', 'blockedby post')
-        await server.mocker.createQuotePost(
-          'blockedby-account',
-          'blockedby quote post',
-          anchorPost,
-        )
-        await server.mocker.createReply(
-          'blockedby-account',
-          'blockedby reply',
-          anchorPost,
-        )
-        await server.mocker.users[
-          'blockedby-account'
-        ].agent.app.bsky.graph.block.create(
-          {
-            repo: server.mocker.users['blockedby-account'].did,
-          },
-          {
-            subject: server.mocker.users.alice.did,
-            createdAt: new Date().toISOString(),
-          },
-        )
-
-        await server.mocker.createPost('mutual-block-acc', 'mutual-block post')
-        await server.mocker.createQuotePost(
-          'mutual-block-acc',
-          'mutual-block quote post',
-          anchorPost,
-        )
-        await server.mocker.createReply(
-          'mutual-block-acc',
-          'mutual-block reply',
-          anchorPost,
-        )
-        await server.mocker.users.alice.agent.app.bsky.graph.block.create(
-          {
-            repo: server.mocker.users.alice.did,
-          },
-          {
-            subject: server.mocker.users['mutual-block-acc'].did,
-            createdAt: new Date().toISOString(),
-          },
-        )
-        await server.mocker.users[
-          'mutual-block-acc'
-        ].agent.app.bsky.graph.block.create(
-          {
-            repo: server.mocker.users['mutual-block-acc'].did,
-          },
-          {
-            subject: server.mocker.users.alice.did,
-            createdAt: new Date().toISOString(),
-          },
-        )
-
-        // flush caches
-        await server.mocker.testNet.processAll()
-      }
-    }
-    console.log('Ready')
-    return res
-      .writeHead(200, {
-        'content-type': 'application/json',
-      })
-      .end(
-        JSON.stringify({
-          pdsUrl: server.pdsUrl,
-          appviewDid: server.appviewDid,
-        }),
-      )
-  } catch (e) {
-    console.error('Error!', e)
-    return res.writeHead(500).end()
-  }
-}).listen(1986)
-console.log('Mock server manager listening on 1986')

dev-env/package.json

@@ -1,12 +0,0 @@
-{
-  "name": "dev-env",
-  "version": "0.0.0",
-  "scripts": {
-    "e2e:mock-server": "NODE_ENV=development ./dev-infra/with-test-redis-and-db.sh ts-node ./mock-server.ts"
-  },
-  "dependencies": {
-    "@atproto/dev-env": "^0.3.213",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.9.3"
-  }
-}

docs/build.md

@@ -164,8 +164,8 @@ See [testing.md](./testing.md).
 `./platform/polyfills.*.ts` adds polyfills to the environment. Currently, this includes:
 
 - TextEncoder / TextDecoder
+- react-native-url-polyfill
 - Array#findLast (on web)
-- setImmediate (on web)
 
 ### Sentry sourcemaps
 

docs/localization.md

@@ -73,7 +73,7 @@ import { Text } from "react-native";
 ```jsx
 // After
 import { Text } from "react-native";
-import { Trans } from "@lingui/react/macro";
+import { Trans } from "@lingui/macro";
 
 <Text><Trans>Hello World</Trans></Text>
 ```
@@ -90,33 +90,18 @@ const text = "Hello World";
 ```
 In this case, you can use the `useLingui()` hook:
 ```jsx
-import { msg } from "@lingui/core/macro";
+import { msg } from "@lingui/macro";
 import { useLingui } from "@lingui/react";
 
 const { _ } = useLingui();
 return <Text accessibilityLabel={_(msg`Label is here`)}>{text}</Text>
 ```
 
-NEW: the latest Lingui version introduced a new macro version of the `useLingui` hook which lets you do this:
-
+If you want to do this outside of a React component, you can use the `t` macro instead (note: this won't react to changes if the locale is switched dynamically within the app):
 ```jsx
-import { useLingui } from "@lingui/react/macro";
+import { t } from "@lingui/macro";
 
-const { t } = useLingui();
-return <Text accessibilityLabel={t`Label is here`}>{text}</Text>
-```
-
-If you want to do this outside of a React component, you can use the global `t` macro instead (note: this won't react to changes if the locale is switched dynamically within the app):
-```jsx
-import { t } from "@lingui/core/macro";
-
-// not ideal - t only gets called once at module evaluation time
 const text = t`Hello World`;
-
-// however, this is suitable for strings that are ephemeral:
-function sayHello() {
-  Toast.show(t`Hello World`); // Each time the toast shows, the current locale at that moment is used
-}
 ```
 
 We can then run `yarn intl:extract` to update the catalog in `src/locale/locales/{locale}/messages.po`. This will add the new string to the catalog.
@@ -136,7 +121,7 @@ So the workflow is as follows:
 These pitfalls are memoization pitfalls that will cause the components to not re-render when the locale is changed -- causing stale translations to be shown.
 
 ```jsx
-import { msg } from "@lingui/core/macro";
+import { msg } from "@lingui/macro";
 import { i18n } from "@lingui/core";
 
 const welcomeMessage = msg`Welcome!`;

docs/testing.md

@@ -3,26 +3,12 @@
 Make sure you've copied `.env.example` to `.env.test` and provided any required
 values.
 
-Install dependencies in `/dev-env`
-
-```
-cd dev-env && yarn
-```
-
 ## Using Maestro
 
 1. Install Maestro by following [these instructions](https://maestro.mobile.dev/getting-started/installing-maestro). This will help us run the E2E tests.
 2. You can write Maestro tests in `/.maestro/flows/` directory by creating a new `.yml` file or by modifying an existing one.
 3. You can also use [Maestro Studio](https://maestro.mobile.dev/getting-started/maestro-studio) which automatically generates commands by recording your actions on the app. Therefore, you can create realistic tests without having to manually write any code. Use the `maestro studio` command to start recording your actions.
 
-### Running on Android
-
-You will need to allow your device access to the port that the mock server is running on.
-
-```
-adb reverse tcp:3000 tcp:3000
-```
-
 ### Running Maestro tests
 
 - In one tab, run `yarn e2e:mock-server`

eslint.config.mjs

@@ -23,6 +23,8 @@ export default defineConfig(
   {
     ignores: [
       '**/__mocks__/*.ts',
+      'src/platform/polyfills.ts',
+      'src/third-party/**',
       'ios/**',
       'android/**',
       'coverage/**',

jest/jestSetup.js

@@ -1,5 +1,7 @@
 /* global jest */
 import 'react-native-gesture-handler/jestSetup'
+// IMPORTANT: this is what's used in the native runtime
+import 'react-native-url-polyfill/auto'
 
 import {configure} from '@testing-library/react-native'
 
@@ -34,7 +36,6 @@ jest.mock('react-native-safe-area-context', () => {
 jest.mock('expo-file-system/legacy', () => ({
   getInfoAsync: jest.fn().mockResolvedValue({exists: true, size: 100}),
   deleteAsync: jest.fn(),
-  moveAsync: jest.fn().mockResolvedValue(undefined),
   createDownloadResumable: jest.fn(),
 }))
 
@@ -44,7 +45,6 @@ jest.mock('expo-image-manipulator', () => ({
   }),
   SaveFormat: {
     JPEG: 'jpeg',
-    WEBP: 'webp',
   },
 }))
 

lingui.config.js

@@ -1,7 +1,5 @@
-import {defineConfig} from '@lingui/cli'
-
-export default defineConfig({
-  sourceLocale: 'en',
+/** @type {import('@lingui/conf').LinguiConfig} */
+module.exports = {
   locales: [
     'en',
     'an',
@@ -51,5 +49,5 @@ export default defineConfig({
       include: ['src'],
     },
   ],
-  compileNamespace: 'ts',
-})
+  format: 'po',
+}

modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetModule.kt

@@ -25,8 +25,8 @@ class BottomSheetModule : Module() {
           view.dismiss()
         }
 
-        Prop("fullHeight") { view: BottomSheetView, prop: Boolean ->
-          view.fullHeight = prop
+        AsyncFunction("updateLayout") { view: BottomSheetView ->
+          view.updateLayout()
         }
 
         Prop("disableDrag") { view: BottomSheetView, prop: Boolean ->
@@ -48,8 +48,6 @@ class BottomSheetModule : Module() {
         Prop("preventExpansion") { view: BottomSheetView, prop: Boolean ->
           view.preventExpansion = prop
         }
-
-        Prop("sourceViewTag") { _: BottomSheetView, _: Int? -> }
       }
     }
 }

modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt

@@ -8,7 +8,10 @@ import android.view.ViewStructure
 import android.view.Window
 import android.view.accessibility.AccessibilityEvent
 import android.widget.FrameLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.allViews
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil
@@ -31,20 +34,11 @@ class BottomSheetView(
 
   private lateinit var dialogRootViewGroup: DialogRootViewGroup
   private var eventDispatcher: EventDispatcher? = null
+  private var isKeyboardVisible: Boolean = false
 
-  // Native content height observation (eliminates JS bridge round-trip)
-  private var contentLayoutListener: View.OnLayoutChangeListener? = null
-  private var observedChildren: List<View> = emptyList()
-  private var lastObservedContentHeight: Float = 0f
-  private var pendingLayoutUpdate: Boolean = false
-
-  private val screenHeight: Float =
-    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-      context.resources.displayMetrics.heightPixels.toFloat()
-    } else {
-      val wm = context.getSystemService(Context.WINDOW_SERVICE) as android.view.WindowManager
-      wm.currentWindowMetrics.bounds.height().toFloat()
-    }
+  private val screenHeight =
+    context.resources.displayMetrics.heightPixels
+      .toFloat()
 
   private fun getNavigationBarHeight(): Int {
     val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android")
@@ -70,15 +64,8 @@ class BottomSheetView(
     set(value) {
       field = value
       this.dialog?.setCancelable(!value)
-      // Full-height sheets have no half-expanded snap point, so any drag
-      // would dismiss. Disable dragging when dismiss is prevented.
-      if (fullHeight) {
-        this.setDraggable(!value && !disableDrag)
-      }
     }
 
-  var fullHeight = false
-
   var preventExpansion = false
 
   var minHeight = 0f
@@ -142,7 +129,6 @@ class BottomSheetView(
   }
 
   private fun destroy() {
-    this.stopObservingContentHeight()
     this.isClosing = false
     this.isOpen = false
     this.dialog = null
@@ -207,40 +193,31 @@ class BottomSheetView(
     val bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
     bottomSheet?.let {
       it.setBackgroundColor(0)
-      it.elevation = 0f
 
       val behavior = BottomSheetBehavior.from(it)
       behavior.state = BottomSheetBehavior.STATE_HIDDEN
+      behavior.isFitToContents = true
+      behavior.halfExpandedRatio = getHalfExpandedRatio(contentHeight)
       behavior.skipCollapsed = true
       behavior.isDraggable = true
       behavior.isHideable = true
-      if (fullHeight) {
-        behavior.isFitToContents = false
-        behavior.expandedOffset = getStatusBarHeight()
+
+      if (preventExpansion) {
+        behavior.maxHeight = (behavior.halfExpandedRatio * screenHeight).toInt()
+      } else {
+        behavior.maxHeight = (screenHeight - getStatusBarHeight()).toInt()
+      }
+
+      val targetHeight = this.getTargetHeight()
+      val availableHeight = screenHeight - getStatusBarHeight() - getNavigationBarHeight()
+      val shouldBeExpanded = targetHeight >= availableHeight
+
+      if (shouldBeExpanded) {
         behavior.state = BottomSheetBehavior.STATE_EXPANDED
         this.selectedSnapPoint = 2
-      } else if (preventExpansion) {
-        behavior.isFitToContents = true
-        behavior.halfExpandedRatio = getHalfExpandedRatio(contentHeight)
-        behavior.maxHeight = (behavior.halfExpandedRatio * screenHeight).toInt()
+      } else {
         behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
         this.selectedSnapPoint = 1
-      } else {
-        behavior.isFitToContents = false
-        behavior.halfExpandedRatio = getHalfExpandedRatio(contentHeight)
-        behavior.expandedOffset = getStatusBarHeight()
-
-        val targetHeight = this.getTargetHeight()
-        val availableHeight = screenHeight - getStatusBarHeight() - getNavigationBarHeight()
-        val shouldBeExpanded = targetHeight >= availableHeight
-
-        if (shouldBeExpanded) {
-          behavior.state = BottomSheetBehavior.STATE_EXPANDED
-          this.selectedSnapPoint = 2
-        } else {
-          behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
-          this.selectedSnapPoint = 1
-        }
       }
 
       behavior.addBottomSheetCallback(
@@ -249,23 +226,12 @@ class BottomSheetView(
             bottomSheet: View,
             newState: Int,
           ) {
-            if (newState == BottomSheetBehavior.STATE_EXPANDED && preventExpansion) {
-              behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
-              return
-            }
             when (newState) {
               BottomSheetBehavior.STATE_EXPANDED -> selectedSnapPoint = 2
               BottomSheetBehavior.STATE_COLLAPSED -> selectedSnapPoint = 1
               BottomSheetBehavior.STATE_HALF_EXPANDED -> selectedSnapPoint = 1
               BottomSheetBehavior.STATE_HIDDEN -> selectedSnapPoint = 0
             }
-            // Apply deferred layout update after gesture completes
-            if (newState != BottomSheetBehavior.STATE_DRAGGING &&
-                newState != BottomSheetBehavior.STATE_SETTLING &&
-                pendingLayoutUpdate) {
-              pendingLayoutUpdate = false
-              updateLayout()
-            }
           }
 
           override fun onSlide(
@@ -279,14 +245,25 @@ class BottomSheetView(
     this.isOpening = true
     dialog.show()
     this.dialog = dialog
-    if (!fullHeight) {
-      this.startObservingContentHeight()
-    }
 
+    ViewCompat.setOnApplyWindowInsetsListener(dialogRootViewGroup) { view, insets ->
+      val imeVisible = insets.isVisible(WindowInsetsCompat.Type.ime())
+      val bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
+      val behavior = bottomSheet?.let { BottomSheetBehavior.from(it) }
+
+      val wasKeyboardVisible = isKeyboardVisible
+      isKeyboardVisible = imeVisible
+
+      if (imeVisible && behavior?.state == BottomSheetBehavior.STATE_HALF_EXPANDED) {
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+      } else if (!imeVisible && wasKeyboardVisible) {
+        updateLayout()
+      }
+      insets
+    }
   }
 
   fun updateLayout() {
-    if (fullHeight) return
     val dialog = this.dialog ?: return
     val contentHeight = this.getContentHeight()
 
@@ -297,34 +274,21 @@ class BottomSheetView(
 
       val oldRatio = behavior.halfExpandedRatio
       val newRatio = getHalfExpandedRatio(contentHeight)
+      behavior.halfExpandedRatio = newRatio
+
+      if (preventExpansion) {
+        behavior.maxHeight = (behavior.halfExpandedRatio * screenHeight).toInt()
+      }
 
       val targetHeight = this.getTargetHeight()
       val availableHeight = screenHeight - getStatusBarHeight() - getNavigationBarHeight()
       val shouldBeExpanded = targetHeight >= availableHeight
 
-      // Don't update during user gestures — defer until the gesture completes.
-      if (currentState == BottomSheetBehavior.STATE_DRAGGING) {
-        pendingLayoutUpdate = true
-        return
-      }
-
-      behavior.halfExpandedRatio = newRatio
-
-      if (preventExpansion) {
-        behavior.maxHeight = (behavior.halfExpandedRatio * screenHeight).toInt()
-        it.requestLayout()
-      }
-
-      // During settling (programmatic animation from our own state change),
-      // redirect the animation to the new position if the ratio changed.
-      if (currentState == BottomSheetBehavior.STATE_SETTLING) {
-        if (oldRatio != newRatio) {
-          behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
+      if (isKeyboardVisible) {
+        if (behavior.state != BottomSheetBehavior.STATE_EXPANDED) {
+          behavior.state = BottomSheetBehavior.STATE_EXPANDED
         }
-        return
-      }
-
-      if (shouldBeExpanded && behavior.state != BottomSheetBehavior.STATE_EXPANDED && !preventExpansion) {
+      } else if (shouldBeExpanded && behavior.state != BottomSheetBehavior.STATE_EXPANDED && !preventExpansion) {
         behavior.state = BottomSheetBehavior.STATE_EXPANDED
       } else if (!shouldBeExpanded && behavior.state != BottomSheetBehavior.STATE_HALF_EXPANDED) {
         behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
@@ -335,77 +299,21 @@ class BottomSheetView(
   }
 
   fun dismiss() {
-    val dialog = this.dialog ?: return
-    // Mark as closing so the content observer doesn't fight the dismiss
-    // animation by calling updateLayout() mid-hide.
-    this.isClosing = true
-    // Temporarily make cancelable so cancel() works — cancel() gives the
-    // slide-out animation, while dismiss() does a plain fade.
-    dialog.setCancelable(true)
-    dialog.cancel()
-  }
-
-  // Observe each direct child of innerView via OnLayoutChangeListener so that
-  // height updates are detected purely on the native side. We use OnLayoutChangeListener
-  // (not OnGlobalLayoutListener) because React Native calls view.layout() directly
-  // via Yoga, bypassing requestLayout()/performTraversals(). OnLayoutChangeListener
-  // fires from setFrame() which IS called by layout(), so it catches RN updates.
-  private fun startObservingContentHeight() {
-    stopObservingContentHeight()
-
-    val innerViewGroup = this.innerView as? ViewGroup ?: return
-
-    val listener = View.OnLayoutChangeListener { _, _, top, _, bottom, _, _, oldTop, oldBottom ->
-      val newHeight = bottom - top
-      val oldHeight = oldBottom - oldTop
-      if (newHeight != oldHeight) {
-        val contentHeight = getContentHeight()
-        if (contentHeight != lastObservedContentHeight && contentHeight > 0 && (isOpen || isOpening) && !isClosing) {
-          lastObservedContentHeight = contentHeight
-          updateLayout()
-        }
-      }
-    }
-
-    val children = mutableListOf<View>()
-    for (i in 0 until innerViewGroup.childCount) {
-      val child = innerViewGroup.getChildAt(i)
-      child.addOnLayoutChangeListener(listener)
-      children.add(child)
-    }
-
-    this.contentLayoutListener = listener
-    this.observedChildren = children
-
-    // Pick up current height if content is already laid out
-    val contentHeight = getContentHeight()
-    if (contentHeight > 0 && contentHeight != lastObservedContentHeight) {
-      lastObservedContentHeight = contentHeight
-      updateLayout()
-    }
-  }
-
-  private fun stopObservingContentHeight() {
-    contentLayoutListener?.let { listener ->
-      observedChildren.forEach { it.removeOnLayoutChangeListener(listener) }
-    }
-    contentLayoutListener = null
-    observedChildren = emptyList()
-    lastObservedContentHeight = 0f
+    this.dialog?.dismiss()
   }
 
   // Util
 
   private fun getContentHeight(): Float {
-    val innerView = this.innerView as? ViewGroup ?: return 0f
-    // Use the tallest direct child's height. The handle is absolutely positioned
-    // (overlaps the content), so summing would double-count its height as padding.
-    var maxChildHeight = 0f
-    for (i in 0 until innerView.childCount) {
-      val h = innerView.getChildAt(i).height.toFloat()
-      if (h > maxChildHeight) maxChildHeight = h
+    val innerView = this.innerView ?: return 0f
+    var index = 0
+    innerView.allViews.forEach {
+      if (index == 1) {
+        return it.height.toFloat()
+      }
+      index++
     }
-    return maxChildHeight
+    return 0f
   }
 
   private fun getTargetHeight(): Float {

modules/bottom-sheet/android/src/main/res/values/styles.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="EdgeToEdgeBottomSheetDialogTheme" parent="ThemeOverlay.Material3.DayNight.BottomSheetDialog">
-        <!-- Enable edge-to-edge, matching react-native-edge-to-edge's setup -->
+    <style name="EdgeToEdgeBottomSheetDialogTheme" parent="Theme.Material3.DayNight.BottomSheetDialog">
+        <!-- Enable edge-to-edge -->
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowIsFloating">false</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:fitsSystemWindows">false</item>
         <item name="enableEdgeToEdge">true</item>
 
         <!-- Configure bottom sheet to respect system window insets -->
@@ -18,6 +16,5 @@
         <item name="paddingLeftSystemWindowInsets">true</item>
         <item name="paddingRightSystemWindowInsets">true</item>
         <item name="paddingTopSystemWindowInsets">false</item>
-        <item name="backgroundTint">@android:color/transparent</item>
     </style>
 </resources>

modules/bottom-sheet/ios/BottomSheetModule.swift

@@ -19,8 +19,8 @@ public class BottomSheetModule: Module {
         view.dismiss()
       }
 
-      Prop("fullHeight") { (view: SheetView, prop: Bool) in
-        view.fullHeight = prop
+      AsyncFunction("updateLayout") { (view: SheetView) in
+        view.updateLayout()
       }
 
       Prop("cornerRadius") { (view: SheetView, prop: Float) in
@@ -42,10 +42,6 @@ public class BottomSheetModule: Module {
       Prop("preventExpansion") { (view: SheetView, prop: Bool) in
         view.preventExpansion = prop
       }
-
-      Prop("sourceViewTag") { (view: SheetView, prop: Int?) in
-        view.sourceViewTag = prop
-      }
     }
   }
 }

modules/bottom-sheet/ios/SheetView.swift

@@ -8,9 +8,6 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   private var innerView: UIView?
   private var touchHandler: RCTTouchHandler?
 
-  // Native content height observation (eliminates JS bridge round-trip)
-  private var contentHeightObservation: NSKeyValueObservation?
-
   // Events
   private let onAttemptDismiss = EventDispatcher()
   private let onSnapPointChange = EventDispatcher()
@@ -26,11 +23,9 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   }
 
   // React view props
-  var fullHeight = false
   var preventDismiss = false
   var preventExpansion = false
   var cornerRadius: CGFloat?
-  var sourceViewTag: Int?
   var minHeight = 0.0
   var maxHeight: CGFloat! {
     didSet {
@@ -72,6 +67,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
       }
     }
   }
+  private var prevLayoutDetentIdentifier: UISheetPresentationController.Detent.Identifier?
 
   // MARK: - Lifecycle
 
@@ -109,8 +105,6 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   }
 
   private func destroy() {
-    self.contentHeightObservation?.invalidate()
-    self.contentHeightObservation = nil
     self.isClosing = false
     self.isOpen = false
     self.sheetVc = nil
@@ -133,7 +127,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
     }
 
     let sheetVc = SheetViewController()
-    sheetVc.setDetents(contentHeight: self.clampHeight(contentHeight), preventExpansion: self.preventExpansion, fullHeight: self.fullHeight)
+    sheetVc.setDetents(contentHeight: self.clampHeight(contentHeight), preventExpansion: self.preventExpansion)
     if let sheet = sheetVc.sheetPresentationController {
       sheet.delegate = self
       sheet.preferredCornerRadius = self.cornerRadius
@@ -141,20 +135,8 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
     }
     sheetVc.view.addSubview(innerView)
 
-    if #available(iOS 26.0, *),
-       let tag = self.sourceViewTag,
-       let bridge = self.appContext?.reactBridge,
-       let sourceView = bridge.uiManager.view(forReactTag: NSNumber(value: tag)) {
-      sheetVc.preferredTransition = .zoom { _ in
-        return sourceView
-      }
-    }
-
     self.sheetVc = sheetVc
     self.isOpening = true
-    if !self.fullHeight {
-      self.startObservingContentHeight()
-    }
 
     rvc.present(sheetVc, animated: true) { [weak self] in
       self?.isOpening = false
@@ -162,30 +144,15 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
     }
   }
 
-  // Observe the content view's bounds via KVO so that height changes are detected
-  // purely on the native side, without a JS bridge round-trip through onLayout.
-  // Calls updateDetents directly with the observed height rather than going through
-  // updateLayout(), which has a prevLayoutDetentIdentifier guard that can block
-  // legitimate content-driven updates when detent identifiers drift during animations.
-  private func startObservingContentHeight() {
-    self.contentHeightObservation?.invalidate()
-
-    guard let contentView = self.innerView?.subviews.first else { return }
-
-    self.contentHeightObservation = contentView.observe(
-      \.bounds,
-      options: [.old, .new]
-    ) { [weak self] _, change in
-      guard let self = self,
-            (self.isOpen || self.isOpening) && !self.isClosing,
-            let oldBounds = change.oldValue,
-            let newBounds = change.newValue,
-            oldBounds.height != newBounds.height,
-            newBounds.height > 0 else { return }
-      let clampedHeight = self.clampHeight(newBounds.height)
-      self.sheetVc?.updateDetents(contentHeight: clampedHeight, preventExpansion: self.preventExpansion)
+  func updateLayout() {
+    // Allow updates either when identifiers match OR when prevLayoutDetentIdentifier is nil (first real content update)
+    if self.prevLayoutDetentIdentifier == self.selectedDetentIdentifier || self.prevLayoutDetentIdentifier == nil,
+       let contentHeight = self.innerView?.subviews.first?.frame.size.height {
+      self.sheetVc?.updateDetents(contentHeight: self.clampHeight(contentHeight),
+                                  preventExpansion: self.preventExpansion)
       self.selectedDetentIdentifier = self.sheetVc?.getCurrentDetentIdentifier()
     }
+    self.prevLayoutDetentIdentifier = self.selectedDetentIdentifier
   }
 
   func dismiss() {

modules/bottom-sheet/ios/SheetViewController.swift

@@ -20,32 +20,13 @@ class SheetViewController: UIViewController {
     }
   }
 
-  func setDetents(contentHeight: CGFloat, preventExpansion: Bool, fullHeight: Bool = false) {
+  func setDetents(contentHeight: CGFloat, preventExpansion: Bool) {
     guard let sheet = self.sheetPresentationController,
           let screenHeight = Util.getScreenHeight()
     else {
       return
     }
 
-    if fullHeight {
-      sheet.detents = [.large()]
-      sheet.selectedDetentIdentifier = .large
-      return
-    }
-
-    // On iOS 26, the floaty sheet presentation adds the device bottom safe area
-    // on top of the custom detent value, creating visible padding inside the pill.
-    // Subtract it so the pill height matches our actual content.
-    var bottomSafeAreaAdjustment: CGFloat = 0
-    if #available(iOS 26.0, *) {
-      if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-         let window = windowScene.windows.first {
-        bottomSafeAreaAdjustment = window.safeAreaInsets.bottom
-      }
-    }
-
-    let adjustedHeight = contentHeight - bottomSafeAreaAdjustment
-
     if #available(iOS 16.0, *) {
       if contentHeight > screenHeight - 100 {
         sheet.detents = [
@@ -55,7 +36,7 @@ class SheetViewController: UIViewController {
       } else {
         sheet.detents = [
           .custom { _ in
-            return adjustedHeight
+            return contentHeight
           }
         ]
         if !preventExpansion {

modules/bottom-sheet/src/BottomSheet.types.ts

@@ -1,4 +1,5 @@
-import {type ColorValue, type NativeSyntheticEvent} from 'react-native'
+import React from 'react'
+import {ColorValue, NativeSyntheticEvent} from 'react-native'
 
 export type BottomSheetState = 'closed' | 'closing' | 'open' | 'opening'
 
@@ -24,9 +25,7 @@ export interface BottomSheetViewProps {
   backgroundColor?: ColorValue
   containerBackgroundColor?: ColorValue
   disableDrag?: boolean
-  sourceViewTag?: number
 
-  fullHeight?: boolean
   minHeight?: number
   maxHeight?: number
 

modules/bottom-sheet/src/BottomSheetNativeComponent.tsx

@@ -1,30 +1,29 @@
-import {Component, createRef} from 'react'
-import {type ComponentType, type ContextType, type RefObject} from 'react'
+import * as React from 'react'
 import {
   Dimensions,
   type LayoutChangeEvent,
   type NativeSyntheticEvent,
   Platform,
   type StyleProp,
-  useWindowDimensions,
   View,
   type ViewStyle,
 } from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {requireNativeModule, requireNativeViewManager} from 'expo-modules-core'
 
+import {IS_IOS} from '#/env'
 import {
   type BottomSheetState,
   type BottomSheetViewProps,
 } from './BottomSheet.types'
-import {
-  BottomSheetPortalProvider,
-  Context as PortalContext,
-} from './BottomSheetPortal'
+import {BottomSheetPortalProvider} from './BottomSheetPortal'
+import {Context as PortalContext} from './BottomSheetPortal'
 
-const NativeView: ComponentType<
+const screenHeight = Dimensions.get('screen').height
+
+const NativeView: React.ComponentType<
   BottomSheetViewProps & {
-    ref: RefObject<any>
+    ref: React.RefObject<any>
     style: StyleProp<ViewStyle>
   }
 > = requireNativeViewManager('BottomSheet')
@@ -35,19 +34,15 @@ const IS_IOS15 =
   Platform.OS === 'ios' &&
   // semvar - can be 3 segments, so can't use Number(Platform.Version)
   Number(Platform.Version.split('.').at(0)) < 16
-// older android versions (15 and below) aren't naturally edge-to-edge
-// and behave a little differently
-const IS_NON_E2E_ANDROID =
-  Platform.OS === 'android' && Number(Platform.Version) < 35
 
-export class BottomSheetNativeComponent extends Component<
+export class BottomSheetNativeComponent extends React.Component<
   BottomSheetViewProps,
   {
     open: boolean
     viewHeight?: number
   }
 > {
-  ref = createRef<any>()
+  ref = React.createRef<any>()
 
   static contextType = PortalContext
 
@@ -75,12 +70,16 @@ export class BottomSheetNativeComponent extends Component<
     this.props.onStateChange?.(event)
   }
 
+  private updateLayout = () => {
+    this.ref.current?.updateLayout()
+  }
+
   static dismissAll = async () => {
     await NativeModule.dismissAll()
   }
 
   render() {
-    const Portal = this.context as ContextType<typeof PortalContext>
+    const Portal = this.context as React.ContextType<typeof PortalContext>
     if (!Portal) {
       throw new Error(
         'BottomSheet: You need to wrap your component tree with a <BottomSheetPortalProvider> to use the bottom sheet.',
@@ -93,7 +92,6 @@ export class BottomSheetNativeComponent extends Component<
 
     let extraStyles
     if (IS_IOS15 && this.state.viewHeight) {
-      const screenHeight = Dimensions.get('screen').height
       const {viewHeight} = this.state
       const cornerRadius = this.props.cornerRadius ?? 0
       if (viewHeight < screenHeight / 2) {
@@ -113,14 +111,23 @@ export class BottomSheetNativeComponent extends Component<
           nativeViewRef={this.ref}
           onStateChange={this.onStateChange}
           extraStyles={extraStyles}
-          onLayout={
-            IS_IOS15
-              ? e => {
-                  const {height} = e.nativeEvent.layout
-                  this.setState({viewHeight: height})
-                }
-              : undefined
-          }
+          onLayout={e => {
+            if (IS_IOS15) {
+              const {height} = e.nativeEvent.layout
+              this.setState({viewHeight: height})
+            }
+            if (Platform.OS === 'android') {
+              // TEMP HACKFIX: I had to timebox this, but this is Bad.
+              // On Android, if you run updateLayout() immediately,
+              // it will take ages to actually run on the native side.
+              // However, adding literally any delay will fix this, including
+              // a console.log() - just sending the log to the CLI is enough.
+              // TODO: Get to the bottom of this and fix it properly! -sfn
+              setTimeout(() => this.updateLayout())
+            } else {
+              this.updateLayout()
+            }
+          }}
         />
       </Portal>
     )
@@ -140,19 +147,13 @@ function BottomSheetNativeComponentInner({
   onStateChange: (
     event: NativeSyntheticEvent<{state: BottomSheetState}>,
   ) => void
-  nativeViewRef: RefObject<View>
-  onLayout?: (event: LayoutChangeEvent) => void
+  nativeViewRef: React.RefObject<View>
+  onLayout: (event: LayoutChangeEvent) => void
 }) {
   const insets = useSafeAreaInsets()
   const cornerRadius = rest.cornerRadius ?? 0
-  const {height: screenHeight} = useWindowDimensions()
 
-  // sigh... on older Android versions, screenHeight does not include safe area insets
-  // on newer Androids + iOS, it does. we need to find the inner bit + the bottom inset
-  // for the sheet content
-  const sheetHeight = IS_NON_E2E_ANDROID
-    ? screenHeight + insets.bottom
-    : screenHeight - insets.top
+  const sheetHeight = IS_IOS ? screenHeight - insets.top : screenHeight
 
   return (
     <NativeView

modules/bottom-sheet/src/BottomSheetPortal.tsx

@@ -1,17 +1,20 @@
-import {createContext, useContext, useMemo} from 'react'
-import {type ElementType, type ReactNode} from 'react'
+import React from 'react'
 
 import {createPortalGroup_INTERNAL} from './lib/Portal'
 
-type PortalContext = ElementType<{children: ReactNode}>
+type PortalContext = React.ElementType<{children: React.ReactNode}>
 
-export const Context = createContext({} as PortalContext)
+export const Context = React.createContext({} as PortalContext)
 Context.displayName = 'BottomSheetPortalContext'
 
-export const useBottomSheetPortal_INTERNAL = () => useContext(Context)
+export const useBottomSheetPortal_INTERNAL = () => React.useContext(Context)
 
-export function BottomSheetPortalProvider({children}: {children: ReactNode}) {
-  const portal = useMemo(() => {
+export function BottomSheetPortalProvider({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  const portal = React.useMemo(() => {
     return createPortalGroup_INTERNAL()
   }, [])
 
@@ -29,7 +32,7 @@ const defaultPortal = createPortalGroup_INTERNAL()
 
 export const BottomSheetOutlet = defaultPortal.Outlet
 
-export function BottomSheetProvider({children}: {children: ReactNode}) {
+export function BottomSheetProvider({children}: {children: React.ReactNode}) {
   return (
     <Context.Provider value={defaultPortal.Portal}>
       <defaultPortal.Provider>{children}</defaultPortal.Provider>

modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider.tsx

@@ -1,7 +1,6 @@
-import {createContext, useContext, useEffect, useMemo, useState} from 'react'
-import {type ReactNode} from 'react'
+import React from 'react'
 
-import {type BackgroundNotificationHandlerPreferences} from './ExpoBackgroundNotificationHandler.types'
+import {BackgroundNotificationHandlerPreferences} from './ExpoBackgroundNotificationHandler.types'
 import {BackgroundNotificationHandler} from './ExpoBackgroundNotificationHandlerModule'
 
 interface BackgroundNotificationPreferencesContext {
@@ -12,29 +11,30 @@ interface BackgroundNotificationPreferencesContext {
   ) => void
 }
 
-const Context = createContext<BackgroundNotificationPreferencesContext>(
+const Context = React.createContext<BackgroundNotificationPreferencesContext>(
   {} as BackgroundNotificationPreferencesContext,
 )
-export const useBackgroundNotificationPreferences = () => useContext(Context)
+export const useBackgroundNotificationPreferences = () =>
+  React.useContext(Context)
 
 export function BackgroundNotificationPreferencesProvider({
   children,
 }: {
-  children: ReactNode
+  children: React.ReactNode
 }) {
   const [preferences, setPreferences] =
-    useState<BackgroundNotificationHandlerPreferences>({
+    React.useState<BackgroundNotificationHandlerPreferences>({
       playSoundChat: true,
     })
 
-  useEffect(() => {
+  React.useEffect(() => {
     ;(async () => {
       const prefs = await BackgroundNotificationHandler.getAllPrefsAsync()
       setPreferences(prefs)
     })()
   }, [])
 
-  const value = useMemo(
+  const value = React.useMemo(
     () => ({
       preferences,
       setPref: async <

modules/expo-bluesky-gif-view/src/GifView.tsx

@@ -1,17 +1,17 @@
-import {createRef, PureComponent} from 'react'
-import {type ComponentType, type RefObject} from 'react'
+import React from 'react'
 import {requireNativeModule} from 'expo'
 import {requireNativeViewManager} from 'expo-modules-core'
 
-import {type GifViewProps} from './GifView.types'
+import {GifViewProps} from './GifView.types'
 
 const NativeModule = requireNativeModule('ExpoBlueskyGifView')
-const NativeView: ComponentType<GifViewProps & {ref: RefObject<any>}> =
-  requireNativeViewManager('ExpoBlueskyGifView')
+const NativeView: React.ComponentType<
+  GifViewProps & {ref: React.RefObject<any>}
+> = requireNativeViewManager('ExpoBlueskyGifView')
 
-export class GifView extends PureComponent<GifViewProps> {
+export class GifView extends React.PureComponent<GifViewProps> {
   // TODO native types, should all be the same as those in this class
-  private nativeRef: RefObject<any> = createRef()
+  private nativeRef: React.RefObject<any> = React.createRef()
 
   constructor(props: GifViewProps | Readonly<GifViewProps>) {
     super(props)

modules/expo-bluesky-gif-view/src/GifView.web.tsx

@@ -1,11 +1,11 @@
-import {createRef, PureComponent} from 'react'
-import {type RefObject} from 'react'
+import * as React from 'react'
 import {StyleSheet} from 'react-native'
 
-import {type GifViewProps} from './GifView.types'
+import {GifViewProps} from './GifView.types'
 
-export class GifView extends PureComponent<GifViewProps> {
-  private readonly videoPlayerRef: RefObject<HTMLMediaElement> = createRef()
+export class GifView extends React.PureComponent<GifViewProps> {
+  private readonly videoPlayerRef: React.RefObject<HTMLMediaElement> =
+    React.createRef()
   private isLoaded = false
 
   constructor(props: GifViewProps | Readonly<GifViewProps>) {

modules/expo-emoji-picker/ios/EmojiPickerModule.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'MCEmojiPicker'
+  s.dependency 'MCEmojiPicker', '1.2.3'
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bsky.app",
-  "version": "1.119.0",
+  "version": "1.117.0",
   "private": true,
   "engines": {
     "node": ">=20"
@@ -16,13 +16,6 @@
           "expo-image-picker"
         ]
       }
-    },
-    "install": {
-      "exclude": [
-        "react-native-reanimated",
-        "@sentry/react-native",
-        "react-native-pager-view"
-      ]
     }
   },
   "scripts": {
@@ -52,7 +45,7 @@
     "lint-native": "swiftlint ./modules && ktlint ./modules",
     "lint-native:fix": "swiftlint --fix ./modules && ktlint --format ./modules",
     "typecheck": "tsc --project ./tsconfig.check.json",
-    "e2e:mock-server": "cd dev-env && yarn e2e:mock-server",
+    "e2e:mock-server": "NODE_ENV=development ./jest/dev-infra/with-test-redis-and-db.sh ts-node --project tsconfig.e2e.json __e2e__/mock-server.ts",
     "e2e:build": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:ios",
     "e2e:build-android": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:android",
     "e2e:start": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo start -c",
@@ -66,7 +59,7 @@
     "intl:extract": "lingui extract --clean --locale en",
     "intl:extract:all": "lingui extract --clean",
     "intl:compile": "lingui compile",
-    "intl:compile-if-needed": "is-ci || [ -f src/locale/locales/en/messages.ts ] || yarn intl:compile",
+    "intl:compile-if-needed": "is-ci || [ -f src/locale/locales/en/messages.js ] || yarn intl:compile",
     "intl:pull": "crowdin download translations --verbose -b main",
     "intl:push": "crowdin push translations --verbose -b main",
     "intl:push-sources": "crowdin push sources --verbose -b main",
@@ -80,15 +73,13 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.19.3",
+    "@atproto/api": "^0.18.21",
     "@bitdrift/react-native": "^0.6.8",
     "@braintree/sanitize-url": "^6.0.2",
-    "@bsky.app/alf": "^0.1.7",
+    "@bsky.app/alf": "^0.1.6",
     "@bsky.app/expo-image-crop-tool": "^0.5.0",
-    "@bsky.app/expo-translate-text": "^0.2.7",
     "@bsky.app/react-native-mmkv": "2.12.5",
     "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
-    "@emoji-mart/data": "^1.2.1",
     "@emoji-mart/react": "^1.1.1",
     "@expo/html-elements": "^0.12.5",
     "@expo/webpack-config": "^19.0.1",
@@ -102,19 +93,17 @@
     "@fortawesome/free-regular-svg-icons": "^6.1.1",
     "@fortawesome/free-solid-svg-icons": "^6.1.1",
     "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@growthbook/growthbook": "^1.6.5",
-    "@growthbook/growthbook-react": "^1.6.5",
+    "@growthbook/growthbook-react": "^1.6.2",
     "@haileyok/bluesky-video": "0.3.2",
     "@ipld/dag-cbor": "^9.2.0",
-    "@lingui/core": "^5.9.2",
-    "@lingui/react": "^5.9.2",
+    "@lingui/react": "^4.14.1",
     "@mattermost/react-native-paste-input": "mattermost/react-native-paste-input",
     "@miblanchard/react-native-slider": "^2.6.0",
     "@mozzius/expo-dynamic-app-icon": "^1.8.0",
     "@react-native-async-storage/async-storage": "2.2.0",
-    "@react-navigation/bottom-tabs": "^7.15.5",
-    "@react-navigation/native": "^7.1.33",
-    "@react-navigation/native-stack": "^7.14.4",
+    "@react-navigation/bottom-tabs": "^7.9.0",
+    "@react-navigation/native": "^7.1.26",
+    "@react-navigation/native-stack": "^7.9.0",
     "@sentry/react-native": "~6.20.0",
     "@tanstack/query-async-storage-persister": "^5.25.0",
     "@tanstack/react-query": "5.25.0",
@@ -134,13 +123,15 @@
     "@types/invariant": "^2.2.37",
     "@types/lodash.throttle": "^4.1.9",
     "@types/node": "^20.14.3",
+    "@zxing/text-encoding": "^0.9.0",
     "array.prototype.findlast": "^1.2.3",
+    "await-lock": "^2.2.2",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "bcp-47": "^2.1.0",
     "bcp-47-match": "^2.0.3",
     "date-fns": "^2.30.0",
     "email-validator": "^2.0.4",
-    "emoji-mart": "^5.6.0",
+    "emoji-mart": "^5.5.2",
     "emoji-regex": "^10.4.0",
     "eventemitter3": "^5.0.1",
     "expo": "^54.0.27",
@@ -172,12 +163,14 @@
     "expo-sms": "^14.0.7",
     "expo-splash-screen": "~31.0.12",
     "expo-system-ui": "~6.0.9",
+    "expo-task-manager": "~14.0.9",
     "expo-updates": "~29.0.14",
     "expo-video": "~3.0.15",
     "expo-video-thumbnails": "^10.0.8",
     "expo-web-browser": "~15.0.10",
     "fast-deep-equal": "^3.1.3",
     "fast-text-encoding": "^1.0.6",
+    "history": "^5.3.0",
     "hls.js": "^1.6.2",
     "idb-keyval": "^6.2.2",
     "js-sha256": "^0.9.0",
@@ -205,18 +198,20 @@
     "react-native-compressor": "^1.13.0",
     "react-native-date-picker": "^5.0.13",
     "react-native-device-attest": "^0.1.6",
-    "react-native-drawer-layout": "^4.2.2",
+    "react-native-drawer-layout": "^4.2.1",
     "react-native-edge-to-edge": "^1.6.0",
     "react-native-gesture-handler": "~2.28.0",
+    "react-native-get-random-values": "~1.11.0",
     "react-native-keyboard-controller": "^1.20.7",
     "react-native-pager-view": "6.8.0",
     "react-native-progress": "bluesky-social/react-native-progress",
     "react-native-qrcode-styled": "^0.3.3",
     "react-native-reanimated": "^3.19.1",
     "react-native-safe-area-context": "~5.6.0",
-    "react-native-screens": "^4.24.0",
+    "react-native-screens": "^4.19.0",
     "react-native-svg": "15.12.1",
     "react-native-uitextview": "^1.4.0",
+    "react-native-url-polyfill": "^1.3.0",
     "react-native-uuid": "^2.0.3",
     "react-native-view-shot": "^4.0.3",
     "react-native-web": "^0.21.0",
@@ -225,7 +220,6 @@
     "react-remove-scroll-bar": "^2.3.8",
     "react-responsive": "^10.0.1",
     "react-textarea-autosize": "^8.5.3",
-    "setimmediate": "^1.0.5",
     "sonner": "^2.0.7",
     "sonner-native": "^0.21.0",
     "tippy.js": "^6.3.7",
@@ -235,13 +229,14 @@
     "zod": "^3.20.2"
   },
   "devDependencies": {
+    "@atproto/dev-env": "^0.3.209",
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@babel/runtime": "^7.26.0",
     "@eslint/js": "^9.39.2",
     "@expo/config-plugins": "~54.0.1",
-    "@lingui/babel-plugin-lingui-macro": "^5.9.2",
-    "@lingui/cli": "^5.9.2",
+    "@lingui/cli": "^4.14.1",
+    "@lingui/macro": "^4.14.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "@react-native/babel-preset": "0.81.5",
     "@react-native/eslint-config": "^0.81.5",
@@ -256,6 +251,7 @@
     "@types/react": "^19.1.12",
     "@types/react-dom": "^19.1.9",
     "babel-jest": "^29.7.0",
+    "babel-plugin-macros": "^3.1.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-react-compiler": "^19.1.0-rc.3",
     "babel-preset-expo": "~54.0.0",
@@ -283,9 +279,10 @@
     "react-native-dotenv": "^3.4.11",
     "react-refresh": "^0.14.0",
     "svgo": "^3.3.2",
+    "ts-node": "^10.9.1",
     "ts-plugin-sort-import-suggestions": "^1.0.4",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.0",
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.53.0",
     "webpack-bundle-analyzer": "^4.10.1"
   },
   "resolutions": {

patches/@lingui+core+4.14.1.patch

@@ -0,0 +1,10 @@
+diff --git a/node_modules/@lingui/core/dist/index.mjs b/node_modules/@lingui/core/dist/index.mjs
+index 9759736..881f67b 100644
+--- a/node_modules/@lingui/core/dist/index.mjs
++++ b/node_modules/@lingui/core/dist/index.mjs
+@@ -1,4 +1,4 @@
+-import unraw from 'unraw';
++import { unraw } from 'unraw';
+ import { compileMessage } from '@lingui/message-utils/compileMessage';
+ 
+ const isString = (s) => typeof s === "string";

patches/react-native-uitextview+1.4.0.patch

@@ -1,11 +1,11 @@
 diff --git a/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift b/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift
-index c34ba71..3602856 100644
+index c34ba71..13d576a 100644
 --- a/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift
 +++ b/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift
-@@ -159,13 +159,25 @@ class RNUITextViewShadow: RCTShadowView {
+@@ -159,13 +159,23 @@ class RNUITextViewShadow: RCTShadowView {
      let maxSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(MAXFLOAT))
      let textSize = self.attributedText.boundingRect(with: maxSize, options: .usesLineFragmentOrigin, context: nil)
- 
+     
 -    var totalLines = self.lineHeight == 0.0 ? 0 : Int(ceil(textSize.height / self.lineHeight))
 -
 -    if self.numberOfLines != 0, totalLines > self.numberOfLines {
@@ -27,8 +27,6 @@ index c34ba71..3602856 100644
      }
  
 -    self.frameSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(CGFloat(totalLines) * self.lineHeight))
-+    finalHeight = ceil(finalHeight)
-+
 +    self.frameSize = CGSize(width: CGFloat(maxWidth), height: finalHeight)
      return YGSize(width: Float(self.frameSize.width), height: Float(self.frameSize.height))
    }

src/App.native.tsx

@@ -1,8 +1,7 @@
 import '#/logger/sentry/setup'
 import '#/view/icons'
 
-import {useEffect, useState} from 'react'
-import * as React from 'react'
+import React, {useEffect, useState} from 'react'
 import {GestureHandlerRootView} from 'react-native-gesture-handler'
 import {KeyboardProvider as KeyboardControllerProvider} from 'react-native-keyboard-controller'
 import {
@@ -12,7 +11,7 @@ import {
 import * as ScreenOrientation from 'expo-screen-orientation'
 import * as SplashScreen from 'expo-splash-screen'
 import * as SystemUI from 'expo-system-ui'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import * as Sentry from '@sentry/react-native'
 
@@ -20,14 +19,9 @@ import {Provider as HideBottomBarBorderProvider} from '#/lib/hooks/useHideBottom
 import {QueryProvider} from '#/lib/react-query'
 import {s} from '#/lib/styles'
 import {ThemeProvider} from '#/lib/ThemeContext'
-import {Provider as TranslateOnDeviceProvider} from '#/lib/translation'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
 import {Provider as A11yProvider} from '#/state/a11y'
-import {
-  prefetchAppConfig,
-  Provider as AppConfigProvider,
-} from '#/state/appConfig'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {Provider as EmailVerificationProvider} from '#/state/email-verification'
@@ -109,7 +103,6 @@ if (IS_ANDROID) {
 Geo.resolve()
 prefetchAgeAssuranceConfig()
 prefetchLiveEvents()
-prefetchAppConfig()
 
 function InnerApp() {
   const [isReady, setIsReady] = React.useState(false)
@@ -181,11 +174,9 @@ function InnerApp() {
                                                           style={s.h100pct}>
                                                           <GlobalGestureEventsProvider>
                                                             <IntentDialogProvider>
-                                                              <TranslateOnDeviceProvider>
-                                                                <TestCtrls />
-                                                                <Shell />
-                                                                <ToastOutlet />
-                                                              </TranslateOnDeviceProvider>
+                                                              <TestCtrls />
+                                                              <Shell />
+                                                              <ToastOutlet />
                                                             </IntentDialogProvider>
                                                           </GlobalGestureEventsProvider>
                                                         </GestureHandlerRootView>
@@ -237,40 +228,38 @@ function App() {
    */
   return (
     <Geo.Provider>
-      <AppConfigProvider>
-        <A11yProvider>
-          <KeyboardControllerProvider>
-            <OnboardingProvider>
-              <AnalyticsContext>
-                <SessionProvider>
-                  <PrefsStateProvider>
-                    <I18nProvider>
-                      <ShellStateProvider>
-                        <ModalStateProvider>
-                          <DialogStateProvider>
-                            <LightboxStateProvider>
-                              <PortalProvider>
-                                <BottomSheetProvider>
-                                  <StarterPackProvider>
-                                    <SafeAreaProvider
-                                      initialMetrics={initialWindowMetrics}>
-                                      <InnerApp />
-                                    </SafeAreaProvider>
-                                  </StarterPackProvider>
-                                </BottomSheetProvider>
-                              </PortalProvider>
-                            </LightboxStateProvider>
-                          </DialogStateProvider>
-                        </ModalStateProvider>
-                      </ShellStateProvider>
-                    </I18nProvider>
-                  </PrefsStateProvider>
-                </SessionProvider>
-              </AnalyticsContext>
-            </OnboardingProvider>
-          </KeyboardControllerProvider>
-        </A11yProvider>
-      </AppConfigProvider>
+      <A11yProvider>
+        <KeyboardControllerProvider>
+          <OnboardingProvider>
+            <AnalyticsContext>
+              <SessionProvider>
+                <PrefsStateProvider>
+                  <I18nProvider>
+                    <ShellStateProvider>
+                      <ModalStateProvider>
+                        <DialogStateProvider>
+                          <LightboxStateProvider>
+                            <PortalProvider>
+                              <BottomSheetProvider>
+                                <StarterPackProvider>
+                                  <SafeAreaProvider
+                                    initialMetrics={initialWindowMetrics}>
+                                    <InnerApp />
+                                  </SafeAreaProvider>
+                                </StarterPackProvider>
+                              </BottomSheetProvider>
+                            </PortalProvider>
+                          </LightboxStateProvider>
+                        </DialogStateProvider>
+                      </ModalStateProvider>
+                    </ShellStateProvider>
+                  </I18nProvider>
+                </PrefsStateProvider>
+              </SessionProvider>
+            </AnalyticsContext>
+          </OnboardingProvider>
+        </KeyboardControllerProvider>
+      </A11yProvider>
     </Geo.Provider>
   )
 }

src/App.web.tsx

@@ -2,22 +2,17 @@ import '#/logger/sentry/setup' // must be near top
 import '#/view/icons'
 import './style.css'
 
-import {Fragment, useEffect, useState} from 'react'
+import React, {useEffect, useState} from 'react'
 import {SafeAreaProvider} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import * as Sentry from '@sentry/react-native'
 
 import {QueryProvider} from '#/lib/react-query'
 import {ThemeProvider} from '#/lib/ThemeContext'
-import {Provider as TranslateOnDeviceProvider} from '#/lib/translation'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
 import {Provider as A11yProvider} from '#/state/a11y'
-import {
-  prefetchAppConfig,
-  Provider as AppConfigProvider,
-} from '#/state/appConfig'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {Provider as EmailVerificationProvider} from '#/state/email-verification'
@@ -84,10 +79,9 @@ import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottom
 Geo.resolve()
 prefetchAgeAssuranceConfig()
 prefetchLiveEvents()
-prefetchAppConfig()
 
 function InnerApp() {
-  const [isReady, setIsReady] = useState(false)
+  const [isReady, setIsReady] = React.useState(false)
   const {currentAccount} = useSession()
   const {resumeSession} = useSessionApi()
   const theme = useColorModeTheme()
@@ -122,69 +116,68 @@ function InnerApp() {
     })
   }, [_])
 
+  // wait for session to resume
+  if (!isReady || !hasCheckedReferrer) return <Splash isReady />
+
   return (
     <Alf theme={theme}>
       <ThemeProvider theme={theme}>
         <ContextMenuProvider>
-          <Splash isReady={isReady && hasCheckedReferrer}>
-            <VideoVolumeProvider>
-              <ActiveVideoProvider>
-                <Fragment
-                  // Resets the entire tree below when it changes:
-                  key={currentAccount?.did}>
-                  <AnalyticsFeaturesContext>
-                    <QueryProvider currentDid={currentAccount?.did}>
-                      <PolicyUpdateOverlayProvider>
-                        <LiveEventsProvider>
-                          <AgeAssuranceV2Provider>
-                            <ComposerProvider>
-                              <MessagesProvider>
-                                {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
-                                <LabelDefsProvider>
-                                  <ModerationOptsProvider>
-                                    <LoggedOutViewProvider>
-                                      <SelectedFeedProvider>
-                                        <HiddenRepliesProvider>
-                                          <HomeBadgeProvider>
-                                            <UnreadNotifsProvider>
-                                              <BackgroundNotificationPreferencesProvider>
-                                                <MutedThreadsProvider>
-                                                  <SafeAreaProvider>
-                                                    <ProgressGuideProvider>
-                                                      <ServiceConfigProvider>
-                                                        <EmailVerificationProvider>
-                                                          <HideBottomBarBorderProvider>
-                                                            <IntentDialogProvider>
-                                                              <TranslateOnDeviceProvider>
-                                                                <Shell />
-                                                                <ToastOutlet />
-                                                              </TranslateOnDeviceProvider>
-                                                            </IntentDialogProvider>
-                                                          </HideBottomBarBorderProvider>
-                                                        </EmailVerificationProvider>
-                                                      </ServiceConfigProvider>
-                                                    </ProgressGuideProvider>
-                                                  </SafeAreaProvider>
-                                                </MutedThreadsProvider>
-                                              </BackgroundNotificationPreferencesProvider>
-                                            </UnreadNotifsProvider>
-                                          </HomeBadgeProvider>
-                                        </HiddenRepliesProvider>
-                                      </SelectedFeedProvider>
-                                    </LoggedOutViewProvider>
-                                  </ModerationOptsProvider>
-                                </LabelDefsProvider>
-                              </MessagesProvider>
-                            </ComposerProvider>
-                          </AgeAssuranceV2Provider>
-                        </LiveEventsProvider>
-                      </PolicyUpdateOverlayProvider>
-                    </QueryProvider>
-                  </AnalyticsFeaturesContext>
-                </Fragment>
-              </ActiveVideoProvider>
-            </VideoVolumeProvider>
-          </Splash>
+          <VideoVolumeProvider>
+            <ActiveVideoProvider>
+              <React.Fragment
+                // Resets the entire tree below when it changes:
+                key={currentAccount?.did}>
+                <AnalyticsFeaturesContext>
+                  <QueryProvider currentDid={currentAccount?.did}>
+                    <PolicyUpdateOverlayProvider>
+                      <LiveEventsProvider>
+                        <AgeAssuranceV2Provider>
+                          <ComposerProvider>
+                            <MessagesProvider>
+                              {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
+                              <LabelDefsProvider>
+                                <ModerationOptsProvider>
+                                  <LoggedOutViewProvider>
+                                    <SelectedFeedProvider>
+                                      <HiddenRepliesProvider>
+                                        <HomeBadgeProvider>
+                                          <UnreadNotifsProvider>
+                                            <BackgroundNotificationPreferencesProvider>
+                                              <MutedThreadsProvider>
+                                                <SafeAreaProvider>
+                                                  <ProgressGuideProvider>
+                                                    <ServiceConfigProvider>
+                                                      <EmailVerificationProvider>
+                                                        <HideBottomBarBorderProvider>
+                                                          <IntentDialogProvider>
+                                                            <Shell />
+                                                            <ToastOutlet />
+                                                          </IntentDialogProvider>
+                                                        </HideBottomBarBorderProvider>
+                                                      </EmailVerificationProvider>
+                                                    </ServiceConfigProvider>
+                                                  </ProgressGuideProvider>
+                                                </SafeAreaProvider>
+                                              </MutedThreadsProvider>
+                                            </BackgroundNotificationPreferencesProvider>
+                                          </UnreadNotifsProvider>
+                                        </HomeBadgeProvider>
+                                      </HiddenRepliesProvider>
+                                    </SelectedFeedProvider>
+                                  </LoggedOutViewProvider>
+                                </ModerationOptsProvider>
+                              </LabelDefsProvider>
+                            </MessagesProvider>
+                          </ComposerProvider>
+                        </AgeAssuranceV2Provider>
+                      </LiveEventsProvider>
+                    </PolicyUpdateOverlayProvider>
+                  </QueryProvider>
+                </AnalyticsFeaturesContext>
+              </React.Fragment>
+            </ActiveVideoProvider>
+          </VideoVolumeProvider>
         </ContextMenuProvider>
       </ThemeProvider>
     </Alf>
@@ -194,14 +187,14 @@ function InnerApp() {
 function App() {
   const [isReady, setReady] = useState(false)
 
-  useEffect(() => {
+  React.useEffect(() => {
     Promise.all([initPersistedState(), Geo.resolve(), setupDeviceId]).then(() =>
       setReady(true),
     )
   }, [])
 
   if (!isReady) {
-    return null
+    return <Splash isReady />
   }
 
   /*
@@ -210,33 +203,31 @@ function App() {
    */
   return (
     <Geo.Provider>
-      <AppConfigProvider>
-        <A11yProvider>
-          <OnboardingProvider>
-            <AnalyticsContext>
-              <SessionProvider>
-                <PrefsStateProvider>
-                  <I18nProvider>
-                    <ShellStateProvider>
-                      <ModalStateProvider>
-                        <DialogStateProvider>
-                          <LightboxStateProvider>
-                            <PortalProvider>
-                              <StarterPackProvider>
-                                <InnerApp />
-                              </StarterPackProvider>
-                            </PortalProvider>
-                          </LightboxStateProvider>
-                        </DialogStateProvider>
-                      </ModalStateProvider>
-                    </ShellStateProvider>
-                  </I18nProvider>
-                </PrefsStateProvider>
-              </SessionProvider>
-            </AnalyticsContext>
-          </OnboardingProvider>
-        </A11yProvider>
-      </AppConfigProvider>
+      <A11yProvider>
+        <OnboardingProvider>
+          <AnalyticsContext>
+            <SessionProvider>
+              <PrefsStateProvider>
+                <I18nProvider>
+                  <ShellStateProvider>
+                    <ModalStateProvider>
+                      <DialogStateProvider>
+                        <LightboxStateProvider>
+                          <PortalProvider>
+                            <StarterPackProvider>
+                              <InnerApp />
+                            </StarterPackProvider>
+                          </PortalProvider>
+                        </LightboxStateProvider>
+                      </DialogStateProvider>
+                    </ModalStateProvider>
+                  </ShellStateProvider>
+                </I18nProvider>
+              </PrefsStateProvider>
+            </SessionProvider>
+          </AnalyticsContext>
+        </OnboardingProvider>
+      </A11yProvider>
     </Geo.Provider>
   )
 }

src/Navigation.tsx

@@ -1,8 +1,8 @@
 import {type JSX, useCallback, useRef} from 'react'
-import * as Linking from 'expo-linking'
+import {Linking} from 'react-native'
 import * as Notifications from 'expo-notifications'
 import {i18n, type MessageDescriptor} from '@lingui/core'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {
   type BottomTabBarProps,
   createBottomTabNavigator,
@@ -103,7 +103,6 @@ import {ActivityPrivacySettingsScreen} from '#/screens/Settings/ActivityPrivacyS
 import {AppearanceSettingsScreen} from '#/screens/Settings/AppearanceSettings'
 import {AppIconSettingsScreen} from '#/screens/Settings/AppIconSettings'
 import {AppPasswordsScreen} from '#/screens/Settings/AppPasswords'
-import {AutomationLabelSettingsScreen} from '#/screens/Settings/AutomationLabelSettings'
 import {ContentAndMediaSettingsScreen} from '#/screens/Settings/ContentAndMediaSettings'
 import {ExternalMediaPreferencesScreen} from '#/screens/Settings/ExternalMediaPreferences'
 import {FindContactsSettingsScreen} from '#/screens/Settings/FindContactsSettings'
@@ -139,7 +138,7 @@ import {
 } from '#/components/dialogs/EmailDialog'
 import {useAnalytics} from '#/analytics'
 import {setNavigationMetadata} from '#/analytics/metadata'
-import {IS_LIQUID_GLASS, IS_NATIVE, IS_WEB} from '#/env'
+import {IS_NATIVE, IS_WEB} from '#/env'
 import {router} from '#/routes'
 import {Referrer} from '../modules/expo-bluesky-swiss-army'
 
@@ -404,14 +403,6 @@ function commonScreens(Stack: typeof Flat, unreadCountLabel?: string) {
           requireAuth: true,
         }}
       />
-      <Stack.Screen
-        name="AutomationLabelSettings"
-        getComponent={() => AutomationLabelSettingsScreen}
-        options={{
-          title: title(msg`Automation Label`),
-          requireAuth: true,
-        }}
-      />
       <Stack.Screen
         name="PrivacyAndSecuritySettings"
         getComponent={() => PrivacyAndSecuritySettingsScreen}
@@ -694,30 +685,10 @@ function screenOptions(t: Theme) {
 function HomeTabNavigator() {
   const t = useTheme()
 
-  const BLURRED_SCROLL_EDGE_EFFECT = IS_LIQUID_GLASS
-    ? ({
-        headerShown: true,
-        headerTransparent: true,
-        headerTitle: '',
-        headerBackVisible: false,
-        scrollEdgeEffects: {
-          top: 'soft',
-        },
-      } as const)
-    : {}
-
   return (
     <HomeTab.Navigator screenOptions={screenOptions(t)} initialRouteName="Home">
-      <HomeTab.Screen
-        name="Home"
-        getComponent={() => HomeScreen}
-        options={BLURRED_SCROLL_EDGE_EFFECT}
-      />
-      <HomeTab.Screen
-        name="Start"
-        getComponent={() => HomeScreen}
-        options={BLURRED_SCROLL_EDGE_EFFECT}
-      />
+      <HomeTab.Screen name="Home" getComponent={() => HomeScreen} />
+      <HomeTab.Screen name="Start" getComponent={() => HomeScreen} />
       {commonScreens(HomeTab as typeof Flat)}
     </HomeTab.Navigator>
   )
@@ -903,6 +874,11 @@ const LINKING = {
   },
 } satisfies LinkingOptions<AllNavigatorParams>
 
+/**
+ * Used to ensure we don't handle the same notification twice
+ */
+let lastHandledNotificationDateDedupe: number | undefined
+
 function RoutesContainer({children}: React.PropsWithChildren<{}>) {
   const ax = useAnalytics()
   const notyLogger = ax.logger.useChild(ax.logger.Context.Notifications)
@@ -913,7 +889,6 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
   const previousScreen = useRef<string | undefined>(undefined)
   const emailDialogControl = useEmailDialogControl()
   const closeAllActiveElements = useCloseAllActiveElements()
-  const linkingUrl = Linking.useLinkingURL()
 
   /**
    * Handle navigation to a conversation, or prepares for account switch.
@@ -948,30 +923,29 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
     },
   )
 
-  function handlePushNotificationEntry() {
+  async function handlePushNotificationEntry() {
     if (!IS_NATIVE) return
 
-    // intent urls are handled by `useIntentHandler`
-    if (linkingUrl) return
+    // deep links take precedence - on android,
+    // getLastNotificationResponseAsync returns a "notification"
+    // that is actually a deep link. avoid handling it twice -sfn
+    if (await Linking.getInitialURL()) {
+      return
+    }
 
-    const notificationResponse = Notifications.getLastNotificationResponse()
+    /**
+     * The notification that caused the app to open, if applicable
+     */
+    const response = await Notifications.getLastNotificationResponseAsync()
 
-    if (notificationResponse) {
-      notyLogger.debug(`handlePushNotificationEntry: response`, {
-        response: notificationResponse,
-      })
+    if (response) {
+      notyLogger.debug(`handlePushNotificationEntry: response`, {response})
 
-      // Clear the last notification response to ensure it's not used again
-      try {
-        Notifications.clearLastNotificationResponse()
-      } catch (error) {
-        notyLogger.error(
-          `handlePushNotificationEntry: error clearing notification response`,
-          {error},
-        )
-      }
+      if (response.notification.date === lastHandledNotificationDateDedupe)
+        return
+      lastHandledNotificationDateDedupe = response.notification.date
 
-      const payload = getNotificationPayload(notificationResponse.notification)
+      const payload = getNotificationPayload(response.notification)
 
       if (payload) {
         ax.metric('notifications:openApp', {
@@ -1037,9 +1011,6 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
         })
       }
     }
-
-    // temp, just testing
-    void ax.features.enabled(ax.features.AATest)
   })
 
   return (

src/Splash.tsx

@@ -1,5 +1,4 @@
-import {forwardRef, useCallback, useEffect, useState} from 'react'
-import {type PropsWithChildren} from 'react'
+import React, {useCallback, useEffect} from 'react'
 import {
   AccessibilityInfo,
   Image as RNImage,
@@ -30,7 +29,7 @@ const darkSplashImageUri = RNImage.resolveAssetSource(
   darkSplashImagePointer,
 ).uri
 
-export const Logo = forwardRef(function LogoImpl(props: SvgProps, ref) {
+export const Logo = React.forwardRef(function LogoImpl(props: SvgProps, ref) {
   const width = 1000
   const height = width * (67 / 64)
   return (
@@ -52,17 +51,19 @@ type Props = {
   isReady: boolean
 }
 
-export function Splash(props: PropsWithChildren<Props>) {
+export function Splash(props: React.PropsWithChildren<Props>) {
   'use no memo'
   const insets = useSafeAreaInsets()
   const intro = useSharedValue(0)
   const outroLogo = useSharedValue(0)
   const outroApp = useSharedValue(0)
   const outroAppOpacity = useSharedValue(0)
-  const [isAnimationComplete, setIsAnimationComplete] = useState(false)
-  const [isImageLoaded, setIsImageLoaded] = useState(false)
-  const [isLayoutReady, setIsLayoutReady] = useState(false)
-  const [reduceMotion, setReduceMotion] = useState<boolean | undefined>(false)
+  const [isAnimationComplete, setIsAnimationComplete] = React.useState(false)
+  const [isImageLoaded, setIsImageLoaded] = React.useState(false)
+  const [isLayoutReady, setIsLayoutReady] = React.useState(false)
+  const [reduceMotion, setReduceMotion] = React.useState<boolean | undefined>(
+    false,
+  )
   const isReady =
     props.isReady &&
     isImageLoaded &&

src/Splash.web.tsx

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

src/ageAssurance/components/NoAccessScreen.tsx

@@ -1,9 +1,8 @@
 import {useCallback, useEffect} from 'react'
 import {ScrollView, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
+import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'
 
 import {
   SupportCode,

src/ageAssurance/components/RedirectOverlay.tsx

@@ -9,9 +9,8 @@ import {
 } from 'react'
 import {Dimensions, View} from 'react-native'
 import * as Linking from 'expo-linking'
-import {msg} from '@lingui/core/macro'
+import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'
 
 import {retry} from '#/lib/async/retry'
 import {wait} from '#/lib/async/wait'

src/alf/atoms.ts

@@ -108,22 +108,6 @@ export const atoms = {
     animation: `zoomIn ${EXP_CURVE} 0.3s, fadeIn ${EXP_CURVE} 0.3s`,
   }),
 
-  /**
-   * Visually hidden but available to screen readers (web).
-   * Use for live regions or off-screen labels (e.g. "Image 1 of 3").
-   */
-  sr_only: web({
-    position: 'absolute',
-    width: 1,
-    height: 1,
-    padding: 0,
-    margin: -1,
-    overflow: 'hidden',
-    clip: 'rect(0,0,0,0)',
-    whiteSpace: 'nowrap',
-    borderWidth: 0,
-  }),
-
   /**
    * {@link Layout.SCROLLBAR_OFFSET}
    */

src/alf/index.tsx

@@ -1,5 +1,4 @@
-import {createContext, useCallback, useContext, useMemo, useState} from 'react'
-import {type PropsWithChildren} from 'react'
+import React from 'react'
 import {type Theme, type ThemeName} from '@bsky.app/alf'
 
 import {
@@ -47,7 +46,7 @@ export type Alf = {
 /*
  * Context
  */
-export const Context = createContext<Alf>({
+export const Context = React.createContext<Alf>({
   themeName: 'light',
   theme: themes.light,
   themes,
@@ -65,14 +64,16 @@ Context.displayName = 'AlfContext'
 export function ThemeProvider({
   children,
   theme: themeName,
-}: PropsWithChildren<{theme: ThemeName}>) {
-  const [fontScale, setFontScale] = useState<Alf['fonts']['scale']>(() =>
+}: React.PropsWithChildren<{theme: ThemeName}>) {
+  const [fontScale, setFontScale] = React.useState<Alf['fonts']['scale']>(() =>
     getFontScale(),
   )
-  const [fontScaleMultiplier, setFontScaleMultiplier] = useState(() =>
+  const [fontScaleMultiplier, setFontScaleMultiplier] = React.useState(() =>
     computeFontScaleMultiplier(fontScale),
   )
-  const setFontScaleAndPersist = useCallback<Alf['fonts']['setFontScale']>(
+  const setFontScaleAndPersist = React.useCallback<
+    Alf['fonts']['setFontScale']
+  >(
     fs => {
       setFontScale(fs)
       persistFontScale(fs)
@@ -80,10 +81,12 @@ export function ThemeProvider({
     },
     [setFontScale],
   )
-  const [fontFamily, setFontFamily] = useState<Alf['fonts']['family']>(() =>
-    getFontFamily(),
+  const [fontFamily, setFontFamily] = React.useState<Alf['fonts']['family']>(
+    () => getFontFamily(),
   )
-  const setFontFamilyAndPersist = useCallback<Alf['fonts']['setFontFamily']>(
+  const setFontFamilyAndPersist = React.useCallback<
+    Alf['fonts']['setFontFamily']
+  >(
     ff => {
       setFontFamily(ff)
       persistFontFamily(ff)
@@ -91,7 +94,7 @@ export function ThemeProvider({
     [setFontFamily],
   )
 
-  const value = useMemo<Alf>(
+  const value = React.useMemo<Alf>(
     () => ({
       themes,
       themeName: themeName,
@@ -119,12 +122,12 @@ export function ThemeProvider({
 }
 
 export function useAlf() {
-  return useContext(Context)
+  return React.useContext(Context)
 }
 
 export function useTheme(theme?: ThemeName) {
   const alf = useAlf()
-  return useMemo(() => {
+  return React.useMemo(() => {
     return theme ? alf.themes[theme] : alf.theme
   }, [theme, alf])
 }

src/alf/util/useColorModeTheme.ts

@@ -1,4 +1,4 @@
-import {useLayoutEffect} from 'react'
+import React from 'react'
 import {type ColorSchemeName, useColorScheme} from 'react-native'
 import {type ThemeName} from '@bsky.app/alf'
 
@@ -9,7 +9,7 @@ import {IS_WEB} from '#/env'
 export function useColorModeTheme(): ThemeName {
   const theme = useThemeName()
 
-  useLayoutEffect(() => {
+  React.useLayoutEffect(() => {
     updateDocument(theme)
   }, [theme])
 

src/alf/util/useGutters.ts

@@ -1,4 +1,4 @@
-import {useMemo} from 'react'
+import React from 'react'
 
 import {type Breakpoint, useBreakpoints} from '#/alf/breakpoints'
 import * as tokens from '#/alf/tokens'
@@ -52,7 +52,7 @@ export function useGutters([top, right, bottom, left]: Gutter[]) {
     bottom = top
     left = right
   }
-  return useMemo(() => {
+  return React.useMemo(() => {
     return {
       paddingTop: top === 0 ? 0 : gutters[top][activeBreakpoint || 'default'],
       paddingRight:

src/analytics/features/types.ts

@@ -9,6 +9,4 @@ export enum Features {
   ImportContactsOnboardingDisable = 'import_contacts:onboarding:disable',
   ImportContactsSettingsDisable = 'import_contacts:settings:disable',
   LiveNowBetaDisable = 'live_now_beta:disable',
-
-  AATest = 'aa-test',
 }

src/analytics/identifiers/session.ts

@@ -18,16 +18,6 @@ export function getInitialSessionId() {
   return sessionId
 }
 
-/**
- * Gets the current session ID. Freshness depends on `useSessionId` being
- * mounted, which handles refreshing this value between foreground/background
- * transitions. Since that's mounted in `analytics/index.tsx`, this value can
- * generally be trusted to be up to date.
- */
-export function getSessionId() {
-  return device.get(['nativeSessionId'])
-}
-
 export function useSessionId() {
   const [id, setId] = useState(() => sessionId)
 

src/analytics/identifiers/session.web.ts

@@ -21,16 +21,6 @@ export function getInitialSessionId() {
   return sessionId
 }
 
-/**
- * Gets the current session ID. Freshness depends on `useSessionId` being
- * mounted, which handles refreshing this value between foreground/background
- * transitions. Since that's mounted in `analytics/index.tsx`, this value can
- * generally be trusted to be up to date.
- */
-export function getSessionId() {
-  return window.sessionStorage.getItem(SESSION_ID_KEY)
-}
-
 export function useSessionId() {
   const [id, setId] = useState(() => sessionId)
 

src/analytics/index.tsx

@@ -1,4 +1,4 @@
-import {createContext, useContext, useMemo} from 'react'
+import {createContext, useContext, useEffect, useMemo} from 'react'
 import {Platform} from 'react-native'
 
 import {Logger} from '#/logger'
@@ -24,7 +24,7 @@ import {
 import {type Metrics, metrics} from '#/analytics/metrics'
 import * as refParams from '#/analytics/misc/refParams'
 import * as env from '#/env'
-import {useGeolocationServiceResponse} from '#/geolocation/service'
+import {useGeolocation} from '#/geolocation'
 import {device} from '#/storage'
 
 export * as utils from '#/analytics/utils'
@@ -104,7 +104,7 @@ const Context = createContext<AnalyticsBaseContextType>({
       referrerSrc: refParams.src,
       referrerUrl: refParams.url,
     },
-    geolocation: device.get(['geolocationServiceResponse']) || {
+    geolocation: device.get(['mergedGeolocation']) || {
       countryCode: '',
       regionCode: '',
     },
@@ -137,7 +137,7 @@ export function AnalyticsContext({
     }
   }
   const sessionId = useSessionId()
-  const geolocation = useGeolocationServiceResponse()
+  const geolocation = useGeolocation()
   const parentContext = useContext(Context)
   const childContext = useMemo(() => {
     const combinedMetadata = {
@@ -181,25 +181,20 @@ export function AnalyticsFeaturesContext({
   const parentContext = useContext(Context)
 
   /**
-   * Side-effects: we need to synchronously set these during the same render
-   * cycle. These calls do not trigger re-renders, they just set properties on
-   * the singleton GrowthBook instance.
+   * Side-effect: we need to synchronously set this during the
+   * same render cycle. It does not trigger a re-render, it just
+   * sets properties on the singleton GrowthBook instance.
    */
   setAttributes(parentContext.metadata)
-  feats.setTrackingCallback((experiment, result) => {
-    parentContext.metric('experiment:viewed', {
-      experimentId: experiment.key,
-      variationId: result.key,
+
+  useEffect(() => {
+    feats.setTrackingCallback((experiment, result) => {
+      parentContext.metric('experiment:viewed', {
+        experimentId: experiment.key,
+        variationId: result.key,
+      })
     })
-  })
-  feats.setFeatureUsageCallback((feature, result) => {
-    parentContext.metric('feature:viewed', {
-      featureId: feature,
-      featureResultValue: result.value,
-      experimentId: result.experiment?.key,
-      variationId: result.experimentResult?.key,
-    })
-  })
+  }, [parentContext.metric])
 
   const childContext = useMemo<AnalyticsContextType>(() => {
     return {

src/analytics/metrics/client.ts

@@ -4,7 +4,6 @@ import {Logger} from '#/logger'
 import * as env from '#/env'
 
 type Event<M extends Record<string, any>> = {
-  source: 'app'
   time: number
   event: keyof M
   payload: M[keyof M]
@@ -44,8 +43,7 @@ export class MetricsClient<M extends Record<string, any>> {
   ) {
     this.start()
 
-    const e: Event<M> = {
-      source: 'app',
+    const e = {
       time: Date.now(),
       event,
       payload,

src/analytics/metrics/types.ts

@@ -2,8 +2,6 @@
  * Do not import runtime code into this file
  */
 
-import {type Platform} from 'react-native'
-
 import {type NotificationReason} from '#/lib/hooks/useNotificationHandler'
 import {type FeedDescriptor} from '#/state/queries/post-feed'
 import {type LiveEventFeedMetricContext} from '#/features/liveEvents/types'
@@ -17,14 +15,6 @@ export type Events = {
     experimentId: string
     variationId: string
   }
-  'feature:viewed': {
-    featureId: string
-    featureResultValue: unknown
-    /** Only available if feature has experiment rules applied */
-    experimentId?: string
-    /** Only available if feature has experiment rules applied */
-    variationId?: string
-  }
 
   'account:loggedIn': {
     logContext:
@@ -573,10 +563,6 @@ export type Events = {
     profilesCount: number
     feedsCount: number
   }
-  'starterPack:convertToList': {
-    starterPack: string
-    memberCount: number
-  }
   'starterPack:ctaPress': {
     starterPack: string
   }
@@ -649,32 +635,6 @@ export type Events = {
     tab: string
   }
 
-  'search:query': {
-    source: 'typed' | 'history' | 'autocomplete'
-  }
-
-  'search:results:loaded': {
-    tab: 'top' | 'latest' | 'people' | 'feeds'
-    initialCount: number
-  }
-
-  'search:result:press': {
-    tab?: 'top' | 'latest' | 'people' | 'feeds'
-    resultType: 'post' | 'profile' | 'feed'
-    position: number
-    uri: string
-  }
-
-  'search:recent:press': {
-    profileDid: string
-    position: number
-  }
-
-  'search:autocomplete:press': {
-    profileDid: string
-    position: number
-  }
-
   'progressGuide:hide': {}
   'progressGuide:followDialog:open': {}
 
@@ -707,17 +667,6 @@ export type Events = {
     targetLanguage: string
     textLength: number
   }
-  'translate:result': {
-    method: 'on-device' | 'google-translate' | 'fallback-alert'
-    os: Platform['OS']
-    sourceLanguage: string | null
-    targetLanguage: string
-  }
-  'translate:override': {
-    os: Platform['OS']
-    sourceLanguage: string
-    targetLanguage: string
-  }
 
   'verification:create': {}
   'verification:revoke': {}
@@ -732,9 +681,6 @@ export type Events = {
   'verification:settings:hideBadges': {}
   'verification:settings:unHideBadges': {}
 
-  'bot:label:toggle': {state: 'add' | 'remove'}
-  'bot:badge:click': {}
-
   'live:create': {duration: number}
   'live:edit': {}
   'live:remove': {}
@@ -929,9 +875,4 @@ export type Events = {
   'liveEvents:unhideAllFeedBanners': {
     context: LiveEventFeedMetricContext
   }
-
-  'profile:associated:germ:click-to-chat': {}
-  'profile:associated:germ:click-self-info': {}
-  'profile:associated:germ:self-disconnect': {}
-  'profile:associated:germ:self-reconnect': {}
 }

src/components/AccountList.tsx

@@ -1,10 +1,10 @@
-import {Fragment, useCallback} from 'react'
+import React, {useCallback} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
+import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'
 
+import {useActorStatus} from '#/lib/actor-status'
 import {isJwtExpired} from '#/lib/jwt'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
@@ -16,9 +16,9 @@ import {Button} from '#/components/Button'
 import {CheckThick_Stroke2_Corner0_Rounded as CheckIcon} from '#/components/icons/Check'
 import {ChevronRight_Stroke2_Corner0_Rounded as ChevronIcon} from '#/components/icons/Chevron'
 import {PlusLarge_Stroke2_Corner0_Rounded as PlusIcon} from '#/components/icons/Plus'
-import {ProfileBadges} from '#/components/ProfileBadges'
 import {Text} from '#/components/Typography'
-import {useActorStatus} from '#/features/liveNow'
+import {useSimpleVerificationState} from '#/components/verification'
+import {VerificationCheck} from '#/components/verification/VerificationCheck'
 
 export function AccountList({
   onSelectAccount,
@@ -52,7 +52,7 @@ export function AccountList({
         t.atoms.border_contrast_low,
       ]}>
       {accounts.map(account => (
-        <Fragment key={account.did}>
+        <React.Fragment key={account.did}>
           <AccountItem
             profile={profiles?.profiles.find(p => p.did === account.did)}
             account={account}
@@ -61,7 +61,7 @@ export function AccountList({
             isPendingAccount={account.did === pendingDid}
           />
           <View style={[a.border_b, t.atoms.border_contrast_low]} />
-        </Fragment>
+        </React.Fragment>
       ))}
       <Button
         testID="chooseAddAccountBtn"
@@ -115,6 +115,7 @@ function AccountItem({
 }) {
   const t = useTheme()
   const {_} = useLingui()
+  const verification = useSimpleVerificationState({profile})
   const {isActive: live} = useActorStatus(profile)
 
   const onPress = useCallback(() => {
@@ -162,12 +163,13 @@ function AccountItem({
                   profile?.displayName || profile?.handle || account.handle,
                 )}
               </Text>
-              {profile && (
-                <ProfileBadges
-                  profile={profile}
-                  size="sm"
-                  style={[{marginTop: -2}]}
-                />
+              {verification.showBadge && (
+                <View>
+                  <VerificationCheck
+                    width={12}
+                    verifier={verification.role === 'verifier'}
+                  />
+                </View>
               )}
             </View>
             <Text

src/components/Admonition.tsx

@@ -9,6 +9,10 @@ import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons
 import {Text as BaseText, type TextProps} from '#/components/Typography'
 import {EmojiSad_Stroke2_Corner0_Rounded as EmojiSadIcon} from './icons/Emoji'
 
+export const colors = {
+  warning: '#FFC404',
+}
+
 type Context = {
   type: 'info' | 'tip' | 'warning' | 'error' | 'apology'
 }
@@ -31,7 +35,7 @@ export function Icon() {
   const fill = {
     info: t.atoms.text_contrast_medium.color,
     tip: t.palette.primary_500,
-    warning: t.palette.yellow,
+    warning: colors.warning,
     error: t.palette.negative_500,
     apology: t.atoms.text_contrast_medium.color,
   }[type]
@@ -106,7 +110,7 @@ export function Outer({
   const borderColor = {
     info: t.atoms.border_contrast_high.borderColor,
     tip: t.palette.primary_500,
-    warning: t.palette.yellow,
+    warning: colors.warning,
     error: t.palette.negative_500,
     apology: t.atoms.border_contrast_high.borderColor,
   }[type]

src/components/AppLanguageDropdown.tsx

@@ -1,5 +1,5 @@
-import {useCallback} from 'react'
-import {msg} from '@lingui/core/macro'
+import React from 'react'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -20,7 +20,7 @@ export function AppLanguageDropdown() {
   const setLangPrefs = useLanguagePrefsApi()
   const sanitizedLang = sanitizeAppLanguageSetting(langPrefs.appLanguage)
 
-  const onChangeAppLanguage = useCallback(
+  const onChangeAppLanguage = React.useCallback(
     (value: string) => {
       if (!value) return
       if (sanitizedLang !== value) {

src/components/BotAccountAlert.tsx

@@ -1,79 +0,0 @@
-import {View} from 'react-native'
-import {Trans, useLingui} from '@lingui/react/macro'
-
-import {useSession} from '#/state/session'
-import {atoms as a, useTheme, web} from '#/alf'
-import {Button, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
-import {Bot_Filled as RobotIcon} from '#/components/icons/Bot'
-import {Text} from '#/components/Typography'
-import {navigate} from '#/Navigation'
-import type * as bsky from '#/types/bsky'
-
-export function BotAccountAlert({
-  control,
-  profile,
-}: {
-  control: Dialog.DialogControlProps
-  profile: bsky.profile.AnyProfileView
-}) {
-  const {t: l} = useLingui()
-  const t = useTheme()
-  const {currentAccount} = useSession()
-
-  const isSelf = profile.did === currentAccount?.did
-  const description = isSelf
-    ? l`You have marked this account as automated. You can remove it at any time from your account settings.`
-    : l`This account has been marked as automated by its owner.`
-
-  return (
-    <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
-      <Dialog.ScrollableInner
-        label={l`Automated account`}
-        style={[web({maxWidth: 320})]}>
-        <View style={[a.align_center, a.pb_md, a.shadow_sm]}>
-          <RobotIcon width={48} fill={t.atoms.text_contrast_medium.color} />
-        </View>
-        <View style={[a.align_center]}>
-          <Text
-            style={[
-              a.leading_snug,
-              a.text_center,
-              a.pb_xl,
-              a.text_md,
-              t.atoms.text_contrast_high,
-              {maxWidth: 300},
-            ]}>
-            {description}
-          </Text>
-        </View>
-        <View style={[a.w_full, a.gap_sm]}>
-          <Button
-            label={l`Okay`}
-            onPress={() => control.close()}
-            color="primary"
-            size="large">
-            <ButtonText>
-              <Trans>Okay</Trans>
-            </ButtonText>
-          </Button>
-          {isSelf ? (
-            <Button
-              label={l`Open settings`}
-              onPress={() => {
-                control.close(() => {
-                  navigate('AutomationLabelSettings')
-                })
-              }}
-              color="secondary"
-              size="large">
-              <ButtonText>
-                <Trans>Open settings</Trans>
-              </ButtonText>
-            </Button>
-          ) : null}
-        </View>
-      </Dialog.ScrollableInner>
-    </Dialog.Outer>
-  )
-}

src/components/BotBadge.tsx

@@ -1,92 +0,0 @@
-import {View} from 'react-native'
-import {type ComAtprotoLabelDefs} from '@atproto/api'
-import {useLingui} from '@lingui/react/macro'
-
-import {atoms as a, useTheme} from '#/alf'
-import {BotAccountAlert} from '#/components/BotAccountAlert'
-import {Button} from '#/components/Button'
-import {useDialogControl} from '#/components/Dialog'
-import {Bot_Filled as RobotIcon} from '#/components/icons/Bot'
-import {useAnalytics} from '#/analytics'
-import type * as bsky from '#/types/bsky'
-
-export function isBotAccount(profile: {
-  did: string
-  labels?: ComAtprotoLabelDefs.Label[]
-}): boolean {
-  return (
-    profile.labels?.some(l => l.val === 'bot' && l.src === profile.did) ?? false
-  )
-}
-
-export function BotBadge({
-  profile,
-  alwaysShow = false,
-  width,
-}: {
-  profile: bsky.profile.AnyProfileView
-  alwaysShow?: boolean
-  width: number
-}) {
-  const t = useTheme()
-
-  if (!isBotAccount(profile) && !alwaysShow) {
-    return null
-  }
-
-  return (
-    <View>
-      <RobotIcon width={width} fill={t.atoms.text_contrast_medium.color} />
-    </View>
-  )
-}
-
-export function BotBadgeButton({
-  profile,
-  width,
-}: {
-  profile: bsky.profile.AnyProfileView
-  width: number
-}) {
-  const t = useTheme()
-  const ax = useAnalytics()
-  const {t: l} = useLingui()
-  const control = useDialogControl()
-
-  if (!isBotAccount(profile)) {
-    return null
-  }
-
-  return (
-    <>
-      <Button
-        label={l`Automated account`}
-        hitSlop={20}
-        onPress={evt => {
-          evt.preventDefault()
-          ax.metric('bot:badge:click', {})
-          control.open()
-        }}>
-        {({hovered}) => (
-          <View
-            style={[
-              a.justify_end,
-              a.align_end,
-              a.transition_transform,
-              {
-                width: width,
-                height: width,
-                transform: [{scale: hovered ? 1.1 : 1}],
-              },
-            ]}>
-            <RobotIcon
-              width={width}
-              fill={t.atoms.text_contrast_medium.color}
-            />
-          </View>
-        )}
-      </Button>
-      <BotAccountAlert control={control} profile={profile} />
-    </>
-  )
-}

src/components/Button.tsx

@@ -1,12 +1,4 @@
-import {
-  createContext,
-  forwardRef,
-  useCallback,
-  useContext,
-  useMemo,
-  useState,
-} from 'react'
-import {type ComponentType, type ReactElement, type ReactNode} from 'react'
+import React from 'react'
 import {
   type AccessibilityProps,
   type GestureResponderEvent,
@@ -83,8 +75,8 @@ export type ButtonState = {
 export type ButtonContext = VariantProps & ButtonState
 
 type NonTextElements =
-  | ReactElement<any>
-  | Iterable<ReactElement<any> | null | undefined | boolean>
+  | React.ReactElement<any>
+  | Iterable<React.ReactElement<any> | null | undefined | boolean>
 
 export type ButtonProps = Pick<
   PressableProps,
@@ -110,13 +102,13 @@ export type ButtonProps = Pick<
     style?: StyleProp<ViewStyle>
     hoverStyle?: StyleProp<ViewStyle>
     children: NonTextElements | ((context: ButtonContext) => NonTextElements)
-    PressableComponent?: ComponentType<PressableProps>
+    PressableComponent?: React.ComponentType<PressableProps>
   }
 
 export type ButtonTextProps = TextProps &
   VariantProps & {disabled?: boolean; emoji?: boolean}
 
-const Context = createContext<VariantProps & ButtonState>({
+const Context = React.createContext<VariantProps & ButtonState>({
   hovered: false,
   focused: false,
   pressed: false,
@@ -125,10 +117,10 @@ const Context = createContext<VariantProps & ButtonState>({
 Context.displayName = 'ButtonContext'
 
 export function useButtonContext() {
-  return useContext(Context)
+  return React.useContext(Context)
 }
 
-export const Button = forwardRef<View, ButtonProps>(
+export const Button = React.forwardRef<View, ButtonProps>(
   (
     {
       children,
@@ -161,13 +153,13 @@ export const Button = forwardRef<View, ButtonProps>(
     }
 
     const t = useTheme()
-    const [state, setState] = useState({
+    const [state, setState] = React.useState({
       pressed: false,
       hovered: false,
       focused: false,
     })
 
-    const onPressIn = useCallback(
+    const onPressIn = React.useCallback(
       (e: GestureResponderEvent) => {
         setState(s => ({
           ...s,
@@ -177,7 +169,7 @@ export const Button = forwardRef<View, ButtonProps>(
       },
       [setState, onPressInOuter],
     )
-    const onPressOut = useCallback(
+    const onPressOut = React.useCallback(
       (e: GestureResponderEvent) => {
         setState(s => ({
           ...s,
@@ -187,7 +179,7 @@ export const Button = forwardRef<View, ButtonProps>(
       },
       [setState, onPressOutOuter],
     )
-    const onHoverIn = useCallback(
+    const onHoverIn = React.useCallback(
       (e: MouseEvent) => {
         setState(s => ({
           ...s,
@@ -197,7 +189,7 @@ export const Button = forwardRef<View, ButtonProps>(
       },
       [setState, onHoverInOuter],
     )
-    const onHoverOut = useCallback(
+    const onHoverOut = React.useCallback(
       (e: MouseEvent) => {
         setState(s => ({
           ...s,
@@ -207,7 +199,7 @@ export const Button = forwardRef<View, ButtonProps>(
       },
       [setState, onHoverOutOuter],
     )
-    const onFocus = useCallback(
+    const onFocus = React.useCallback(
       (e: NativeSyntheticEvent<TargetedEvent>) => {
         setState(s => ({
           ...s,
@@ -217,7 +209,7 @@ export const Button = forwardRef<View, ButtonProps>(
       },
       [setState, onFocusOuter],
     )
-    const onBlur = useCallback(
+    const onBlur = React.useCallback(
       (e: NativeSyntheticEvent<TargetedEvent>) => {
         setState(s => ({
           ...s,
@@ -228,7 +220,7 @@ export const Button = forwardRef<View, ButtonProps>(
       [setState, onBlurOuter],
     )
 
-    const {baseStyles, hoverStyles} = useMemo(() => {
+    const {baseStyles, hoverStyles} = React.useMemo(() => {
       const baseStyles: ViewStyle[] = []
       const hoverStyles: ViewStyle[] = []
 
@@ -534,7 +526,7 @@ export const Button = forwardRef<View, ButtonProps>(
       }
     }, [t, variant, color, size, shape, disabled])
 
-    const context = useMemo<ButtonContext>(
+    const context = React.useMemo<ButtonContext>(
       () => ({
         ...state,
         variant,
@@ -589,7 +581,7 @@ Button.displayName = 'Button'
 export function useSharedButtonTextStyles() {
   const t = useTheme()
   const {color, variant, disabled, size} = useButtonContext()
-  return useMemo(() => {
+  return React.useMemo(() => {
     const baseStyles: TextStyle[] = []
 
     /*
@@ -777,7 +769,7 @@ export function ButtonIcon({
   icon: Comp,
   size,
 }: {
-  icon: ComponentType<SVGIconProps>
+  icon: React.ComponentType<SVGIconProps>
   /**
    * @deprecated no longer needed
    */
@@ -786,66 +778,67 @@ export function ButtonIcon({
 }) {
   const {size: buttonSize, shape: buttonShape} = useButtonContext()
   const textStyles = useSharedButtonTextStyles()
-  const {iconSize, iconContainerSize, iconNegativeMargin} = useMemo(() => {
-    /**
-     * Pre-set icon sizes for different button sizes
-     */
-    const iconSizeShorthand =
-      size ??
-      (({
-        large: 'md',
-        small: 'sm',
-        tiny: 'xs',
-      }[buttonSize || 'small'] || 'sm') as Exclude<
-        SVGIconProps['size'],
-        undefined
-      >)
+  const {iconSize, iconContainerSize, iconNegativeMargin} =
+    React.useMemo(() => {
+      /**
+       * Pre-set icon sizes for different button sizes
+       */
+      const iconSizeShorthand =
+        size ??
+        (({
+          large: 'md',
+          small: 'sm',
+          tiny: 'xs',
+        }[buttonSize || 'small'] || 'sm') as Exclude<
+          SVGIconProps['size'],
+          undefined
+        >)
 
-    /*
-     * Copied here from icons/common.tsx so we can tweak if we need to, but
-     * also so that we can calculate transforms.
-     */
-    const iconSize = {
-      xs: 12,
-      sm: 16,
-      md: 18,
-      lg: 24,
-      xl: 28,
-      '2xs': 8,
-      '2xl': 32,
-      '3xl': 40,
-    }[iconSizeShorthand]
+      /*
+       * Copied here from icons/common.tsx so we can tweak if we need to, but
+       * also so that we can calculate transforms.
+       */
+      const iconSize = {
+        xs: 12,
+        sm: 16,
+        md: 18,
+        lg: 24,
+        xl: 28,
+        '2xs': 8,
+        '2xl': 32,
+        '3xl': 40,
+      }[iconSizeShorthand]
 
-    /*
-     * Goal here is to match rendered text size so that different size icons
-     * don't increase button size
-     */
-    const iconContainerSize = {
-      large: 20,
-      small: 17,
-      tiny: 15,
-    }[buttonSize || 'small']
-
-    /*
-     * The icon needs to be closer to the edge of the button than the text. Therefore
-     * we make the gap slightly too large, and then pull in the sides using negative margins.
-     */
-    let iconNegativeMargin = 0
-
-    if (buttonShape === 'default') {
-      iconNegativeMargin = {
-        large: -2,
-        small: -2,
-        tiny: -1,
+      /*
+       * Goal here is to match rendered text size so that different size icons
+       * don't increase button size
+       */
+      const iconContainerSize = {
+        large: 20,
+        small: 17,
+        tiny: 15,
       }[buttonSize || 'small']
-    }
 
-    return {
-      iconSize,
-      iconContainerSize,
-      iconNegativeMargin,
-    }
-  }, [buttonSize, buttonShape, size])
+      /*
+       * The icon needs to be closer to the edge of the button than the text. Therefore
+       * we make the gap slightly too large, and then pull in the sides using negative margins.
+       */
+      let iconNegativeMargin = 0
+
+      if (buttonShape === 'default') {
+        iconNegativeMargin = {
+          large: -2,
+          small: -2,
+          tiny: -1,
+        }[buttonSize || 'small']
+      }
+
+      return {
+        iconSize,
+        iconContainerSize,
+        iconNegativeMargin,
+      }
+    }, [buttonSize, buttonShape, size])
 
   return (
     <View
@@ -895,8 +888,8 @@ export type StackedButtonProps = Omit<
   keyof VariantProps | 'children'
 > &
   Pick<VariantProps, 'color'> & {
-    children: ReactNode
-    icon: ComponentType<SVGIconProps>
+    children: React.ReactNode
+    icon: React.ComponentType<SVGIconProps>
   }
 
 export function StackedButton({children, ...props}: StackedButtonProps) {

src/components/ContextMenu/Backdrop.ios.tsx

@@ -7,7 +7,7 @@ import Animated, {
   useAnimatedStyle,
 } from 'react-native-reanimated'
 import {BlurView} from 'expo-blur'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {atoms as a, useTheme} from '#/alf'

src/components/ContextMenu/Backdrop.tsx

@@ -5,7 +5,7 @@ import Animated, {
   type SharedValue,
   useAnimatedStyle,
 } from 'react-native-reanimated'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {atoms as a, useTheme} from '#/alf'

src/components/ContextMenu/context.tsx

@@ -1,4 +1,4 @@
-import {createContext, useContext} from 'react'
+import React from 'react'
 
 import {
   type ContextType,
@@ -6,17 +6,17 @@ import {
   type MenuContextType,
 } from '#/components/ContextMenu/types'
 
-export const Context = createContext<ContextType | null>(null)
+export const Context = React.createContext<ContextType | null>(null)
 Context.displayName = 'ContextMenuContext'
 
-export const MenuContext = createContext<MenuContextType | null>(null)
+export const MenuContext = React.createContext<MenuContextType | null>(null)
 MenuContext.displayName = 'ContextMenuMenuContext'
 
-export const ItemContext = createContext<ItemContextType | null>(null)
+export const ItemContext = React.createContext<ItemContextType | null>(null)
 ItemContext.displayName = 'ContextMenuItemContext'
 
 export function useContextMenuContext() {
-  const context = useContext(Context)
+  const context = React.useContext(Context)
 
   if (!context) {
     throw new Error(
@@ -28,7 +28,7 @@ export function useContextMenuContext() {
 }
 
 export function useContextMenuMenuContext() {
-  const context = useContext(MenuContext)
+  const context = React.useContext(MenuContext)
 
   if (!context) {
     throw new Error(
@@ -40,7 +40,7 @@ export function useContextMenuMenuContext() {
 }
 
 export function useContextMenuItemContext() {
-  const context = useContext(ItemContext)
+  const context = React.useContext(ItemContext)
 
   if (!context) {
     throw new Error(

src/components/ContextMenu/index.tsx

@@ -1,7 +1,4 @@
-import {
-  cloneElement,
-  Fragment,
-  isValidElement,
+import React, {
   useCallback,
   useEffect,
   useId,
@@ -9,7 +6,6 @@ import {
   useRef,
   useState,
 } from 'react'
-import {type ReactNode} from 'react'
 import {
   BackHandler,
   Keyboard,
@@ -27,7 +23,6 @@ import {
   type GestureUpdateEvent,
   type PanGestureHandlerEventPayload,
 } from 'react-native-gesture-handler'
-import {KeyboardEvents} from 'react-native-keyboard-controller'
 import Animated, {
   clamp,
   interpolate,
@@ -40,13 +35,12 @@ import Animated, {
   type WithSpringConfig,
 } from 'react-native-reanimated'
 import {
-  type EdgeInsets,
   useSafeAreaFrame,
   useSafeAreaInsets,
 } from 'react-native-safe-area-context'
 import {captureRef} from 'react-native-view-shot'
 import {Image, type ImageErrorEventData} from 'expo-image'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useIsFocused} from '@react-navigation/native'
 import flattenReactChildren from 'react-keyed-flatten-children'
@@ -87,9 +81,9 @@ export {
 const {Provider: PortalProvider, Outlet, Portal} = createPortalGroup()
 
 const SPRING_IN: WithSpringConfig = {
-  mass: 0.75,
-  damping: 300,
-  stiffness: 1200,
+  mass: IS_IOS ? 1.25 : 0.75,
+  damping: 50,
+  stiffness: 1100,
   restDisplacementThreshold: 0.01,
 }
 
@@ -103,7 +97,7 @@ const SPRING_OUT: WithSpringConfig = {
 /**
  * Needs placing near the top of the provider stack, but BELOW the theme provider.
  */
-export function Provider({children}: {children: ReactNode}) {
+export function Provider({children}: {children: React.ReactNode}) {
   return (
     <PortalProvider>
       {children}
@@ -112,11 +106,10 @@ export function Provider({children}: {children: ReactNode}) {
   )
 }
 
-export function Root({children}: {children: ReactNode}) {
+export function Root({children}: {children: React.ReactNode}) {
   const playHaptic = useHaptics()
   const [mode, setMode] = useState<'full' | 'auxiliary-only'>('full')
   const [measurement, setMeasurement] = useState<Measurement | null>(null)
-  const returnLocationSV = useSharedValue<{x: number; y: number} | null>(null)
   const animationSV = useSharedValue(0)
   const translationSV = useSharedValue(0)
   const isFocused = useIsFocused()
@@ -149,7 +142,6 @@ export function Root({children}: {children: ReactNode}) {
       ({
         isOpen: !!measurement && isFocused,
         measurement,
-        returnLocationSV,
         animationSV,
         translationSV,
         mode,
@@ -157,8 +149,6 @@ export function Root({children}: {children: ReactNode}) {
           setMeasurement(evt)
           setMode(mode)
           animationSV.set(withSpring(1, SPRING_IN))
-          // reset return location
-          returnLocationSV.set(null)
         },
         close: () => {
           animationSV.set(
@@ -166,9 +156,6 @@ export function Root({children}: {children: ReactNode}) {
               if (finished) {
                 hoverablesSV.set({})
                 translationSV.set(0)
-                // note: return location has to be reset on open,
-                // rather than on close, otherwise there's a flicker
-                // where the reanimated update is faster than the react render
                 runOnJS(onCompletedClose)()
               }
             }),
@@ -207,7 +194,6 @@ export function Root({children}: {children: ReactNode}) {
       }) satisfies ContextType,
     [
       measurement,
-      returnLocationSV,
       setMeasurement,
       onCompletedClose,
       isFocused,
@@ -239,7 +225,7 @@ export function Root({children}: {children: ReactNode}) {
 export function Trigger({children, label, contentLabel, style}: TriggerProps) {
   const context = useContextMenuContext()
   const playHaptic = useHaptics()
-  const insets = useSafeAreaInsets()
+  const {top: topInset} = useSafeAreaInsets()
   const ref = useRef<View>(null)
   const isFocused = useIsFocused()
   const [image, setImage] = useState<string | null>(null)
@@ -251,8 +237,23 @@ export function Trigger({children, label, contentLabel, style}: TriggerProps) {
   const open = useNonReactiveCallback(
     async (mode: 'full' | 'auxiliary-only') => {
       playHaptic()
+      Keyboard.dismiss()
       const [measurement, capture] = await Promise.all([
-        measureView(ref.current, insets),
+        new Promise<Measurement>(resolve => {
+          ref.current?.measureInWindow((x, y, width, height) =>
+            resolve({
+              x,
+              y:
+                y +
+                platform({
+                  default: 0,
+                  android: topInset, // not included in measurement
+                }),
+              width,
+              height,
+            }),
+          )
+        }),
         captureRef(ref, {result: 'data-uri'}).catch(err => {
           logger.error(err instanceof Error ? err : String(err), {
             message: 'Failed to capture image of context menu trigger',
@@ -261,45 +262,16 @@ export function Trigger({children, label, contentLabel, style}: TriggerProps) {
           return '<failed capture>'
         }),
       ])
-      Keyboard.dismiss()
       setImage(capture)
-      if (measurement) {
-        setPendingMeasurement({measurement, mode})
-      }
+      setPendingMeasurement({measurement, mode})
     },
   )
 
-  // after keyboard hides, the position might change - set a return location
-  useEffect(() => {
-    if (context.isOpen && context.measurement) {
-      const hide = KeyboardEvents.addListener('keyboardDidHide', () => {
-        measureView(ref.current, insets)
-          .then(newMeasurement => {
-            if (!newMeasurement || !context.measurement) return
-            if (
-              newMeasurement.x !== context.measurement.x ||
-              newMeasurement.y !== context.measurement.y
-            ) {
-              context.returnLocationSV.set({
-                x: newMeasurement.x,
-                y: newMeasurement.y,
-              })
-            }
-          })
-          .catch(() => {})
-      })
-
-      return () => {
-        hide.remove()
-      }
-    }
-  }, [context, insets])
-
   const doubleTapGesture = useMemo(() => {
     return Gesture.Tap()
       .numberOfTaps(2)
       .hitSlop(HITSLOP_10)
-      .onEnd(() => void open('auxiliary-only'))
+      .onEnd(() => open('auxiliary-only'))
       .runOnJS(true)
   }, [open])
 
@@ -388,7 +360,6 @@ export function Trigger({children, label, contentLabel, style}: TriggerProps) {
             animation={animationSV}
             image={image}
             measurement={measurement}
-            returnLocation={context.returnLocationSV}
             onDisplay={() => {
               if (pendingMeasurement) {
                 context.open(
@@ -413,7 +384,6 @@ function TriggerClone({
   animation,
   image,
   measurement,
-  returnLocation,
   onDisplay,
   label,
 }: {
@@ -421,29 +391,14 @@ function TriggerClone({
   animation: SharedValue<number>
   image: string
   measurement: Measurement
-  returnLocation: SharedValue<{x: number; y: number} | null>
   onDisplay: () => void
   label: string
 }) {
   const {_} = useLingui()
 
-  const animatedStyles = useAnimatedStyle(() => {
-    const anim = animation.get()
-    const ret = returnLocation.get()
-    const returnOffsetX = ret
-      ? interpolate(anim, [0, 1], [ret.x - measurement.x, 0])
-      : 0
-    const returnOffsetY = ret
-      ? interpolate(anim, [0, 1], [ret.y - measurement.y, 0])
-      : 0
-
-    return {
-      transform: [
-        {translateX: returnOffsetX},
-        {translateY: translation.get() * anim + returnOffsetY},
-      ],
-    }
-  })
+  const animatedStyles = useAnimatedStyle(() => ({
+    transform: [{translateY: translation.get() * animation.get()}],
+  }))
 
   const handleError = useCallback(
     (evt: ImageErrorEventData) => {
@@ -573,7 +528,7 @@ export function Outer({
   style,
   align = 'left',
 }: {
-  children: ReactNode
+  children: React.ReactNode
   style?: StyleProp<ViewStyle>
   align?: 'left' | 'right'
 }) {
@@ -693,22 +648,22 @@ export function Outer({
                     t.atoms.border_contrast_low,
                   ]}>
                   {flattenReactChildren(children).map((child, i) => {
-                    return isValidElement(child) &&
+                    return React.isValidElement(child) &&
                       (child.type === Item || child.type === Divider) ? (
-                      <Fragment key={i}>
+                      <React.Fragment key={i}>
                         {i > 0 ? (
                           <View
                             style={[a.border_b, t.atoms.border_contrast_low]}
                           />
                         ) : null}
-                        {cloneElement(child, {
+                        {React.cloneElement(child, {
                           // @ts-expect-error not typed
                           style: {
                             borderRadius: 0,
                             borderWidth: 0,
                           },
                         })}
-                      </Fragment>
+                      </React.Fragment>
                     ) : null
                   })}
                 </View>
@@ -896,7 +851,7 @@ export function ItemRadio({selected}: {selected: boolean}) {
   )
 }
 
-export function LabelText({children}: {children: ReactNode}) {
+export function LabelText({children}: {children: React.ReactNode}) {
   const t = useTheme()
   return (
     <Text
@@ -919,25 +874,6 @@ export function Divider() {
   )
 }
 
-function measureView(view: View | null, insets: EdgeInsets) {
-  if (!view) return Promise.resolve(null)
-  return new Promise<Measurement>(resolve => {
-    view?.measureInWindow((x, y, width, height) =>
-      resolve({
-        x,
-        y:
-          y +
-          platform({
-            default: 0,
-            android: insets.top, // not included in measurement
-          }),
-        width,
-        height,
-      }),
-    )
-  })
-}
-
 function getHoveredHoverable(
   evt:
     | GestureStateChangeEvent<PanGestureHandlerEventPayload>

src/components/ContextMenu/types.ts

@@ -49,7 +49,6 @@ export type ContextType = {
   translationSV: SharedValue<number>
   mode: 'full' | 'auxiliary-only'
   open: (evt: Measurement, mode: 'full' | 'auxiliary-only') => void
-  returnLocationSV: SharedValue<{x: number; y: number} | null>
   close: () => void
   registerHoverable: (
     id: string,

src/components/Dialog/context.ts

@@ -18,7 +18,7 @@ import {BottomSheetSnapPoint} from '../../../modules/bottom-sheet/src/BottomShee
 
 export const Context = createContext<DialogContextProps>({
   close: () => {},
-  isNativeDialog: false,
+  IS_NATIVEDialog: false,
   nativeSnapPoint: BottomSheetSnapPoint.Hidden,
   disableDrag: false,
   setDisableDrag: () => {},

src/components/Dialog/index.tsx

@@ -1,32 +1,27 @@
+import React, {useImperativeHandle} from 'react'
 import {
-  forwardRef,
-  useCallback,
-  useImperativeHandle,
-  useMemo,
-  useRef,
-  useState,
-} from 'react'
-import {
-  Keyboard,
-  type KeyboardEventListener,
-  type LayoutChangeEvent,
   type NativeScrollEvent,
   type NativeSyntheticEvent,
   Pressable,
-  ScrollView,
+  type ScrollView,
   type StyleProp,
   TextInput,
   View,
   type ViewStyle,
 } from 'react-native'
-import {useReanimatedKeyboardAnimation} from 'react-native-keyboard-controller'
+import {
+  KeyboardAwareScrollView,
+  type KeyboardAwareScrollViewRef,
+  useKeyboardHandler,
+  useReanimatedKeyboardAnimation,
+} from 'react-native-keyboard-controller'
 import Animated, {
   runOnJS,
   type ScrollEvent,
   useAnimatedStyle,
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {ScrollProvider} from '#/lib/ScrollContext'
@@ -34,7 +29,7 @@ import {logger} from '#/logger'
 import {useA11y} from '#/state/a11y'
 import {useDialogStateControlContext} from '#/state/dialogs'
 import {List, type ListMethods, type ListProps} from '#/view/com/util/List'
-import {android, atoms as a, ios, platform, tokens, useTheme} from '#/alf'
+import {atoms as a, ios, platform, tokens, useTheme} from '#/alf'
 import {useThemeName} from '#/alf/util/useColorModeTheme'
 import {Context, useDialogContext} from '#/components/Dialog/context'
 import {
@@ -43,8 +38,7 @@ import {
   type DialogOuterProps,
 } from '#/components/Dialog/types'
 import {createInput} from '#/components/forms/TextField'
-import {useOnKeyboard} from '#/components/hooks/useOnKeyboard'
-import {IS_ANDROID, IS_IOS, IS_LIQUID_GLASS} from '#/env'
+import {IS_ANDROID, IS_IOS} from '#/env'
 import {BottomSheet, BottomSheetSnapPoint} from '../../../modules/bottom-sheet'
 import {
   type BottomSheetSnapPointChangeEvent,
@@ -68,21 +62,21 @@ export function Outer({
 }: React.PropsWithChildren<DialogOuterProps>) {
   const themeName = useThemeName()
   const t = useTheme(themeName)
-  const ref = useRef<BottomSheetNativeComponent>(null)
-  const closeCallbacks = useRef<(() => void)[]>([])
+  const ref = React.useRef<BottomSheetNativeComponent>(null)
+  const closeCallbacks = React.useRef<(() => void)[]>([])
   const {setDialogIsOpen, setFullyExpandedCount} =
     useDialogStateControlContext()
 
-  const prevSnapPoint = useRef<BottomSheetSnapPoint>(
+  const prevSnapPoint = React.useRef<BottomSheetSnapPoint>(
     BottomSheetSnapPoint.Hidden,
   )
 
-  const [disableDrag, setDisableDrag] = useState(false)
-  const [snapPoint, setSnapPoint] = useState<BottomSheetSnapPoint>(
+  const [disableDrag, setDisableDrag] = React.useState(false)
+  const [snapPoint, setSnapPoint] = React.useState<BottomSheetSnapPoint>(
     BottomSheetSnapPoint.Partial,
   )
 
-  const callQueuedCallbacks = useCallback(() => {
+  const callQueuedCallbacks = React.useCallback(() => {
     for (const cb of closeCallbacks.current) {
       try {
         cb()
@@ -94,7 +88,7 @@ export function Outer({
     closeCallbacks.current = []
   }, [])
 
-  const open = useCallback<DialogControlProps['open']>(() => {
+  const open = React.useCallback<DialogControlProps['open']>(() => {
     // Run any leftover callbacks that might have been queued up before calling `.open()`
     callQueuedCallbacks()
     setDialogIsOpen(control.id, true)
@@ -102,7 +96,7 @@ export function Outer({
   }, [setDialogIsOpen, control.id, callQueuedCallbacks])
 
   // This is the function that we call when we want to dismiss the dialog.
-  const close = useCallback<DialogControlProps['close']>(cb => {
+  const close = React.useCallback<DialogControlProps['close']>(cb => {
     if (typeof cb === 'function') {
       closeCallbacks.current.push(cb)
     }
@@ -111,7 +105,7 @@ export function Outer({
 
   // This is the actual thing we are doing once we "confirm" the dialog. We want the dialog's close animation to
   // happen before we run this. It is passed to the `BottomSheet` component.
-  const onCloseAnimationComplete = useCallback(() => {
+  const onCloseAnimationComplete = React.useCallback(() => {
     // This removes the dialog from our list of stored dialogs. Not super necessary on iOS, but on Android this
     // tells us that we need to toggle the accessibility overlay setting
     setDialogIsOpen(control.id, false)
@@ -157,10 +151,10 @@ export function Outer({
     [open, close],
   )
 
-  const context = useMemo(
+  const context = React.useMemo(
     () => ({
       close,
-      isNativeDialog: true,
+      IS_NATIVEDialog: true,
       nativeSnapPoint: snapPoint,
       disableDrag,
       setDisableDrag,
@@ -172,8 +166,7 @@ export function Outer({
   return (
     <BottomSheet
       ref={ref}
-      // device-bezel radius when undefined
-      cornerRadius={IS_LIQUID_GLASS ? undefined : 20}
+      cornerRadius={20}
       backgroundColor={t.atoms.bg.backgroundColor}
       {...nativeOptions}
       onSnapPointChange={onSnapPointChange}
@@ -188,9 +181,6 @@ export function Outer({
   )
 }
 
-/**
- * @deprecated use `Dialog.ScrollableInner` instead
- */
 export function Inner({children, style, header}: DialogInnerProps) {
   const insets = useSafeAreaInsets()
   return (
@@ -200,9 +190,9 @@ export function Inner({children, style, header}: DialogInnerProps) {
         style={[
           a.pt_2xl,
           a.px_xl,
-          IS_LIQUID_GLASS
-            ? a.pb_2xl
-            : {paddingBottom: insets.bottom + insets.top},
+          {
+            paddingBottom: insets.bottom + insets.top,
+          },
           style,
         ]}>
         {children}
@@ -211,23 +201,41 @@ export function Inner({children, style, header}: DialogInnerProps) {
   )
 }
 
-export const ScrollableInner = forwardRef<ScrollView, DialogInnerProps>(
+export const ScrollableInner = React.forwardRef<ScrollView, DialogInnerProps>(
   function ScrollableInner(
     {children, contentContainerStyle, header, ...props},
     ref,
   ) {
     const {nativeSnapPoint, disableDrag, setDisableDrag} = useDialogContext()
-    const isAtMaxSnapPoint = nativeSnapPoint === BottomSheetSnapPoint.Full
     const insets = useSafeAreaInsets()
-    const [keyboardHeight, setKeyboardHeight] = useState(() =>
-      IS_ANDROID ? (Keyboard.metrics()?.height ?? 0) : 0,
+
+    const [keyboardHeight, setKeyboardHeight] = React.useState(0)
+
+    // note: iOS-only. keyboard-controller doesn't seem to work inside the sheets on Android
+    useKeyboardHandler(
+      {
+        onEnd: e => {
+          'worklet'
+          runOnJS(setKeyboardHeight)(e.height)
+        },
+      },
+      [],
     )
 
-    const keyboardEventHandler = useCallback<KeyboardEventListener>(e => {
-      setKeyboardHeight(e.endCoordinates.height)
-    }, [])
-    useOnKeyboard('keyboardDidShow', keyboardEventHandler)
-    useOnKeyboard('keyboardDidHide', keyboardEventHandler)
+    let paddingBottom = 0
+    if (IS_IOS) {
+      paddingBottom += keyboardHeight / 4
+      if (nativeSnapPoint === BottomSheetSnapPoint.Full) {
+        paddingBottom += insets.bottom + tokens.space.md
+      }
+      paddingBottom = Math.max(paddingBottom, tokens.space._2xl)
+    } else {
+      if (nativeSnapPoint === BottomSheetSnapPoint.Full) {
+        paddingBottom += insets.top
+      }
+      paddingBottom +=
+        Math.max(insets.bottom, tokens.space._5xl) + tokens.space._2xl
+    }
 
     const onScroll = (e: NativeSyntheticEvent<NativeScrollEvent>) => {
       if (!IS_ANDROID) {
@@ -242,33 +250,20 @@ export const ScrollableInner = forwardRef<ScrollView, DialogInnerProps>(
     }
 
     return (
-      <ScrollView
+      <KeyboardAwareScrollView
         contentContainerStyle={[
           a.pt_2xl,
-          IS_LIQUID_GLASS ? a.px_2xl : a.px_xl,
-          platform({
-            ios: a.pb_2xl,
-            android: {
-              paddingBottom: keyboardHeight + insets.bottom + tokens.space.xl,
-            },
-          }),
+          a.px_xl,
+          {paddingBottom},
           contentContainerStyle,
         ]}
-        ref={ref}
+        ref={ref as React.Ref<KeyboardAwareScrollViewRef>}
         showsVerticalScrollIndicator={IS_ANDROID ? false : undefined}
-        contentInsetAdjustmentBehavior={
-          isAtMaxSnapPoint ? 'automatic' : 'never'
-        }
-        automaticallyAdjustKeyboardInsets={isAtMaxSnapPoint}
         {...props}
-        bounces={isAtMaxSnapPoint}
+        bounces={nativeSnapPoint === BottomSheetSnapPoint.Full}
+        bottomOffset={30}
         scrollEventThrottle={50}
-        // set drag state based on scroll on android.
-        // we want to detect if it's at the top or not, so watch
-        // scrollEndDrag and momentumScrollEnd as well
-        onScroll={android(onScroll)}
-        onScrollEndDrag={android(onScroll)}
-        onMomentumScrollEnd={android(onScroll)}
+        onScroll={IS_ANDROID ? onScroll : undefined}
         keyboardShouldPersistTaps="handled"
         // TODO: figure out why this positions the header absolutely (rather than stickily)
         // on Android. fine to disable for now, because we don't have any
@@ -276,27 +271,22 @@ export const ScrollableInner = forwardRef<ScrollView, DialogInnerProps>(
         stickyHeaderIndices={ios(header ? [0] : undefined)}>
         {header}
         {children}
-      </ScrollView>
+      </KeyboardAwareScrollView>
     )
   },
 )
 
-export const InnerFlatList = forwardRef<
+export const InnerFlatList = React.forwardRef<
   ListMethods,
   ListProps<any> & {
     webInnerStyle?: StyleProp<ViewStyle>
     webInnerContentContainerStyle?: StyleProp<ViewStyle>
     footer?: React.ReactNode
   }
->(function InnerFlatList(
-  {headerOffset, footer, style, contentContainerStyle, ...props},
-  ref,
-) {
+>(function InnerFlatList({footer, style, ...props}, ref) {
   const insets = useSafeAreaInsets()
   const {nativeSnapPoint, disableDrag, setDisableDrag} = useDialogContext()
 
-  const isAtMaxSnapPoint = nativeSnapPoint === BottomSheetSnapPoint.Full
-
   const onScroll = (e: ScrollEvent) => {
     'worklet'
     if (!IS_ANDROID) {
@@ -311,44 +301,24 @@ export const InnerFlatList = forwardRef<
   }
 
   return (
-    <ScrollProvider
-      onScroll={onScroll}
-      onEndDrag={onScroll}
-      onMomentumEnd={onScroll}>
+    <ScrollProvider onScroll={onScroll}>
       <List
         keyboardShouldPersistTaps="handled"
-        contentInsetAdjustmentBehavior={
-          isAtMaxSnapPoint ? 'automatic' : 'never'
-        }
-        automaticallyAdjustKeyboardInsets={isAtMaxSnapPoint}
-        scrollIndicatorInsets={{top: headerOffset}}
-        bounces={isAtMaxSnapPoint}
+        bounces={nativeSnapPoint === BottomSheetSnapPoint.Full}
+        ListFooterComponent={<View style={{height: insets.bottom + 100}} />}
         ref={ref}
         showsVerticalScrollIndicator={IS_ANDROID ? false : undefined}
         {...props}
         style={[a.h_full, style]}
-        contentContainerStyle={[
-          {paddingTop: headerOffset},
-          android({
-            paddingBottom: insets.top + insets.bottom + tokens.space.xl,
-          }),
-          contentContainerStyle,
-        ]}
       />
       {footer}
     </ScrollProvider>
   )
 })
 
-export function FlatListFooter({
-  children,
-  onLayout,
-}: {
-  children: React.ReactNode
-  onLayout?: (event: LayoutChangeEvent) => void
-}) {
+export function FlatListFooter({children}: {children: React.ReactNode}) {
   const t = useTheme()
-  const {bottom} = useSafeAreaInsets()
+  const {top, bottom} = useSafeAreaInsets()
   const {height} = useReanimatedKeyboardAnimation()
 
   const animatedStyle = useAnimatedStyle(() => {
@@ -360,7 +330,6 @@ export function FlatListFooter({
 
   return (
     <Animated.View
-      onLayout={onLayout}
       style={[
         a.absolute,
         a.bottom_0,
@@ -371,7 +340,12 @@ export function FlatListFooter({
         t.atoms.border_contrast_low,
         a.px_lg,
         a.pt_md,
-        {paddingBottom: bottom + tokens.space.md},
+        {
+          paddingBottom: platform({
+            ios: tokens.space.md + bottom,
+            android: tokens.space.md + bottom + top,
+          }),
+        },
         // TODO: had to admit defeat here, but we should
         // try and get this to work for Android as well -sfn
         ios(animatedStyle),