Reenable tanstack query devtools

Co-authored-by: Eric Bailey <git@esb.lol>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: "Bug Report"
-description: "Create a report for an issue you have experience in the app."
+description: "Create a report for an issue you have experienced in the app."
 labels: ["bug"]
 body:
   - type: markdown
@@ -19,13 +19,14 @@ body:
         4. See error
     validations:
       required: true
-  - type: textarea
+  - type: upload
     attributes:
       label: Attachments
       description: |
         If possible, please provide any images or videos that may help us understand the issue you are experiencing.
     validations:
       required: false
+      accept: ".png,.jpg,.jpeg,.gif,.webp,.mp4,.mov,.webm"
   - type: dropdown
     attributes:
       label: What platform(s) does this occur on?

.github/ISSUE_TEMPLATE/bug_report_fabric.yml

@@ -26,13 +26,14 @@ body:
         4. See error
     validations:
       required: true
-  - type: textarea
+  - type: upload
     attributes:
       label: Attachments
       description: |
         If possible, please provide any images or videos that may help us understand the issue you are experiencing.
     validations:
       required: false
+      accept: ".png,.jpg,.jpeg,.gif,.webp,.mp4,.mov,.webm"
   - type: dropdown
     attributes:
       label: What platform(s) does this occur on?

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -15,7 +15,7 @@ body:
         implement it in a timely manner.
     validations:
       required: true
-  - type: textarea
+  - type: upload
     attributes:
       label: Attachments
       description: |
@@ -24,6 +24,7 @@ body:
         in or is missing from.
     validations:
       required: false
+      accept: ".png,.jpg,.jpeg,.gif,.webp,.mp4,.mov,.webm"
   - type: textarea
     attributes:
       label: Describe Alternatives

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

@@ -56,7 +56,7 @@ jobs:
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "26.0"
+          xcode-version: "26.4"
 
       - name: ☕️ Setup Cocoapods
         uses: maxim-lobanov/setup-cocoapods@v1

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

@@ -197,7 +197,7 @@ jobs:
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "26.0"
+          xcode-version: "26.4"
 
       - name: ☕️ Setup Cocoapods
         uses: maxim-lobanov/setup-cocoapods@v1

.jscodeshift/react-import.js

@@ -0,0 +1,135 @@
+/**
+ * Codemod to replace namespaced React calls with named imports
+ *
+ * Before:
+ *   import React from 'react'
+ *   React.useEffect(() => {}, [])
+ *
+ * After:
+ *   import { useEffect } from 'react'
+ *   useEffect(() => {}, [])
+ *
+ * Usage: jscodeshift -t .jscodeshift/react-import.js <file-path>
+ * Example: jscodeshift -t .jscodeshift/react-import.js src/App.native.tsx
+ */
+
+/* eslint-disable */
+
+export const parser = 'tsx'
+
+export default function transformer(file, api) {
+  const j = api.jscodeshift
+  const root = j(file.source)
+
+  // Find the React import
+  let reactImportPath = null
+  const reactMembers = new Set()
+
+  root.find(j.ImportDeclaration).forEach(path => {
+    const node = path.value
+    if (node.source.value === 'react') {
+      node.specifiers.forEach(spec => {
+        // Check if this is a default import of React
+        if (
+          spec.type === 'ImportDefaultSpecifier' &&
+          spec.local.name === 'React'
+        ) {
+          reactImportPath = path
+        }
+      })
+    }
+  })
+
+  if (!reactImportPath) {
+    // No React import found, nothing to do
+    return file.source
+  }
+
+  // Find all React.* member expressions
+  root
+    .find(j.MemberExpression)
+    .filter(path => {
+      const node = path.value
+      return (
+        node.object.type === 'Identifier' &&
+        node.object.name === 'React' &&
+        node.property.type === 'Identifier'
+      )
+    })
+    .forEach(path => {
+      const propertyName = path.value.property.name
+      reactMembers.add(propertyName)
+    })
+
+  // Find all React.* JSX member expressions (e.g., <React.Fragment>)
+  root
+    .find(j.JSXMemberExpression)
+    .filter(path => {
+      const node = path.value
+      return node.object.name === 'React' && node.property.name
+    })
+    .forEach(path => {
+      const propertyName = path.value.property.name
+      reactMembers.add(propertyName)
+    })
+
+  // If no React members are used, remove the import
+  if (reactMembers.size === 0) {
+    reactImportPath.prune()
+    return root.toSource()
+  }
+
+  // Sort the members for consistent output
+  const sortedMembers = Array.from(reactMembers).sort()
+
+  // Create new import specifiers
+  const newSpecifiers = sortedMembers.map(name =>
+    j.importSpecifier(j.identifier(name), j.identifier(name)),
+  )
+
+  // Get the existing import specifiers
+  const sortedImports = Array.from(reactImportPath.value.specifiers).sort()
+  const existingSpecifiers = sortedImports.filter(
+    specifier => specifier.type !== 'ImportDefaultSpecifier',
+  )
+
+  const allSpecifiers = [
+    ...new Map(
+      [...existingSpecifiers, ...newSpecifiers].map(item => [
+        item.imported.name,
+        item,
+      ]),
+    ).values(),
+  ]
+
+  // Update the import declaration
+  reactImportPath.value.specifiers = allSpecifiers
+
+  // Replace all React.* member expressions with just the identifier
+  root
+    .find(j.MemberExpression)
+    .filter(path => {
+      const node = path.value
+      return (
+        node.object.type === 'Identifier' &&
+        node.object.name === 'React' &&
+        node.property.type === 'Identifier'
+      )
+    })
+    .replaceWith(path => {
+      return j.identifier(path.value.property.name)
+    })
+
+  // Replace all React.* JSX member expressions with just the identifier
+  root
+    .find(j.JSXMemberExpression)
+    .filter(path => {
+      const node = path.value
+      return node.object.name === 'React' && node.property.name
+    })
+    .replaceWith(path => {
+      return j.jsxIdentifier(path.value.property.name)
+    })
+
+  return root.toSource()
+}

.jscodeshift/toast-v2.js

@@ -0,0 +1,106 @@
+/**
+ * Codemod to replace namespaced React calls with named imports
+ *
+ * Before:
+ *   import * as Toast from '#/view/com/util/Toast'
+ *   Toast.show(message, 'xmark')
+ *
+ * After:
+ *   import * as Toast from '#/components/Toast'
+ *   Toast.show(message, {type: 'error'})
+ *
+ * Usage: jscodeshift -t .jscodeshift/toast-v2.js <file-path>
+ * Example: jscodeshift -t .jscodeshift/toast-v2.js src/App.native.tsx
+ */
+
+/* eslint-disable */
+
+export const parser = 'tsx'
+
+const OLD_IMPORT = '#/view/com/util/Toast'
+const NEW_IMPORT = '#/components/Toast'
+
+const convertLegacyToastType = type => {
+  switch (type) {
+    // these ones are fine
+    case 'default':
+    case 'success':
+    case 'error':
+    case 'warning':
+    case 'info':
+      return type
+    // legacy ones need conversion
+    case 'xmark':
+      return 'error'
+    case 'exclamation-circle':
+      return 'warning'
+    case 'check':
+      return 'success'
+    case 'clipboard-check':
+      return 'success'
+    case 'circle-exclamation':
+    case 'exclamation-circle':
+      return 'warning'
+    default:
+      return 'default'
+  }
+}
+
+export default function transformer(file, api) {
+  const j = api.jscodeshift
+  const root = j(file.source)
+
+  // Find Toast import declarations using the old path
+  const toastImports = root
+    .find(j.ImportDeclaration)
+    .filter(path => path.value.source.value === OLD_IMPORT)
+
+  if (toastImports.length === 0) {
+    return file.source
+  }
+
+  // Update import path
+  toastImports.forEach(path => {
+    path.value.source.value = NEW_IMPORT
+  })
+
+  // Collect all local names the Toast namespace is bound to
+  const toastLocalNames = new Set()
+  toastImports.forEach(path => {
+    path.value.specifiers.forEach(spec => {
+      if (spec.type === 'ImportNamespaceSpecifier') {
+        toastLocalNames.add(spec.local.name)
+      }
+    })
+  })
+
+  // Transform Toast.show(message, type) calls
+  root.find(j.CallExpression).forEach(path => {
+    const {callee, arguments: args} = path.value
+
+    // Match <ToastName>.show(...)
+    if (
+      callee.type !== 'MemberExpression' ||
+      callee.object.type !== 'Identifier' ||
+      !toastLocalNames.has(callee.object.name) ||
+      callee.property.name !== 'show'
+    ) {
+      return
+    }
+
+    // Only transform 2-arg calls where the second arg is a string literal
+    if (args.length !== 2) return
+    const typeArg = args[1]
+    if (typeArg.type !== 'StringLiteral' && typeArg.type !== 'Literal') return
+
+    const legacyType = typeArg.value
+    const newType = convertLegacyToastType(legacyType)
+
+    // Replace the second argument with an options object: {type: 'newType'}
+    args[1] = j.objectExpression([
+      j.property('init', j.identifier('type'), j.stringLiteral(newType)),
+    ])
+  })
+
+  return root.toSource()
+}

CLAUDE.md

@@ -46,6 +46,7 @@ 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
@@ -60,6 +61,121 @@ 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.
@@ -315,16 +431,30 @@ yarn intl:compile    # Compile translations for runtime
 // src/state/queries/profile.ts
 import {useQuery, useMutation, useQueryClient} from '@tanstack/react-query'
 
-// Query key pattern
-const RQKEY_ROOT = 'profile'
-export const RQKEY = (did: string) => [RQKEY_ROOT, did]
+import {createQueryKey} from '#/state/queries/util'
 
-// Query hook
+/*
+ * Query key name should match the query hook name for consistency
+ */
+const profileQueryKeyRoot = 'profile'
+
+/*
+ * Use object params and createQueryKey helper for better readability and to
+ * avoid bugs with parameter order or types.
+ */
+export const createProfileQueryKey = (args: {did: string}) =>
+  createQueryKey(profileQueryKeyRoot, args)
+
+/*
+ * Query hook should be named use[Name]Query, where [Name] describes the data
+ * being fetched. This is not a strict requirement, but it's a helpful
+ * convention for discoverability
+ */
 export function useProfileQuery({did}: {did: string}) {
   const agent = useAgent()
 
   return useQuery({
-    queryKey: RQKEY(did),
+    queryKey: createProfileQueryKey({did}),
     queryFn: async () => {
       const res = await agent.getProfile({actor: did})
       return res.data
@@ -334,8 +464,12 @@ export function useProfileQuery({did}: {did: string}) {
   })
 }
 
-// Mutation hook
-export function useUpdateProfile() {
+/*
+ * Mutation hook should match the name of the query hook, but with "Mutation"
+ * suffix. This is not a strict requirement, but it's a helpful convention for
+ * discoverability and consistency.
+ */
+export function useProfileMutation() {
   const queryClient = useQueryClient()
 
   return useMutation({
@@ -343,7 +477,9 @@ export function useUpdateProfile() {
       // Update logic
     },
     onSuccess: (_, variables) => {
-      queryClient.invalidateQueries({queryKey: RQKEY(variables.did)})
+      queryClient.invalidateQueries({
+        queryKey: createProfileQueryKey({did: variables.did}),
+      })
     },
     onError: (error) => {
       if (isNetworkError(error)) {
@@ -357,6 +493,24 @@ export function useUpdateProfile() {
     }
   })
 }
+
+/*
+ * If cache mutation is needed, include specific interfaces for the specific
+ * mutations you require adjacent to the source queries. Naming should be
+ * descriptive of the mutation's purpose, e.g. use[Name]CacheMutation. This is
+ * not a strict requirement, but it's a helpful convention for discoverability
+ * and consistency.
+ */
+export function useProfileCacheMutation() {
+  const queryClient = useQueryClient()
+
+  return (data: Partial<Profile>) => {
+    queryClient.setQueryData(createProfileQueryKey({did: data.did}), oldData => {
+      if (!oldData) return oldData
+      return {...oldData, ...data}
+    })
+  }
+}
 ```
 
 **Stale Time Constants** (from `src/state/queries/index.ts`):
@@ -375,7 +529,7 @@ export function useDraftsQuery() {
   const agent = useAgent()
 
   return useInfiniteQuery({
-    queryKey: ['drafts'],
+    queryKey: createQueryKey('drafts'),
     queryFn: async ({pageParam}) => {
       const res = await agent.app.bsky.draft.getDrafts({cursor: pageParam})
       return res.data
@@ -388,6 +542,19 @@ export function useDraftsQuery() {
 
 To get all items from pages: `data?.pages.flatMap(page => page.items) ?? []`
 
+**Persisted Queries**
+
+To persist query data across app restarts, `createQueryKey` supports a third
+parameter called `options`, which has a `persistedVersion` property. When this
+property is set to a number, the query will be persisted.
+
+When this property is updated (e.g. incremented), the persisted data will be cleared and replaced with the new data from the query function. This is useful for cases where the shape of the data has changed and old persisted data would no longer be valid.
+
+```tsx
+export const createProfileQueryKey = (args: {did: string}) =>
+  createQueryKey(profileQueryKeyRoot, args, {persistedVersion: 1})
+```
+
 ### Preferences (React Context)
 
 ```tsx

__e2e__/flows/curate-lists.yml

@@ -91,7 +91,8 @@ appId: xyz.blueskyweb.app
 - tapOn: "Add user to list"
 - swipe:
     direction: DOWN
-- assertVisible: "View Bob's profile"
+- assertVisible:
+    id: "profileCard-bob.test-link"
 
 - tapOn: "Posts"
 - assertVisible:
@@ -123,7 +124,8 @@ appId: xyz.blueskyweb.app
 - tapOn: "Good Ppl"
 
 - tapOn: "People"
-- assertVisible: "View Bob's profile"
+- assertVisible:
+    id: "profileCard-bob.test-link"
 - tapOn:
     point: "90%,43%"
 - tapOn:

__e2e__/mock-server.ts

@@ -1,529 +0,0 @@
-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()

app.config.js

@@ -54,7 +54,7 @@ module.exports = function (_config) {
       },
       icon: './assets/app-icons/ios_icon_default_next.png',
       userInterfaceStyle: 'automatic',
-      primaryColor: '#1083fe',
+      primaryColor: '#006AFF',
       newArchEnabled: false,
       ios: {
         supportsTablet: false,
@@ -64,6 +64,7 @@ module.exports = function (_config) {
         },
         icon: IOS_ICON_FILE,
         infoPlist: {
+          CADisableMinimumFrameDurationOnPhone: true,
           UIBackgroundModes: ['remote-notification'],
           NSCameraUsageDescription:
             'Used for profile pictures, posts, and other kinds of content.',
@@ -268,7 +269,7 @@ module.exports = function (_config) {
               ],
             },
             android: {
-              compileSdkVersion: 35,
+              compileSdkVersion: 36,
               targetSdkVersion: 35,
               buildToolsVersion: '35.0.0',
               buildReactNativeFromSource: IS_PRODUCTION,
@@ -296,7 +297,6 @@ module.exports = function (_config) {
         './plugins/withAndroidManifestFCMIconPlugin.js',
         './plugins/withAndroidManifestIntentQueriesPlugin.js',
         './plugins/withAndroidStylesAccentColorPlugin.js',
-        './plugins/withAndroidDayNightThemePlugin.js',
         './plugins/withAndroidNoJitpackPlugin.js',
         './plugins/shareExtension/withShareExtensions.js',
         './plugins/notificationsExtension/withNotificationsExtension.js',

assets/icons/bot_filled.svg

@@ -0,0 +1 @@
+<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

@@ -0,0 +1 @@
+<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>

bskyembed/src/components/post.tsx

@@ -10,6 +10,7 @@ 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'
@@ -43,6 +44,9 @@ 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)}`
 
@@ -76,6 +80,12 @@ 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

@@ -0,0 +1,22 @@
+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>
+)

bskylink/package.json

@@ -4,7 +4,9 @@
   "type": "module",
   "main": "index.ts",
   "scripts": {
-    "test": "./tests/infra/with-test-db.sh node --loader ts-node/esm --test ./tests/index.ts",
+    "test": "npm run test:unit && npm run test:e2e",
+    "test:e2e": "./tests/infra/with-test-db.sh node --loader ts-node/esm --test ./tests/index.ts",
+    "test:unit": "node --loader ts-node/esm --test ./src/*.test.ts",
     "build": "tsc"
   },
   "dependencies": {

bskylink/src/config.ts

@@ -15,6 +15,7 @@ export type ServiceConfig = {
   safelinkPdsUrl?: string
   safelinkAgentIdentifier?: string
   safelinkAgentPass?: string
+  metricsApiHost?: string
 }
 
 export type DbConfig = {
@@ -45,6 +46,7 @@ export type Environment = {
   safelinkPdsUrl?: string
   safelinkAgentIdentifier?: string
   safelinkAgentPass?: string
+  metricsApiHost?: string
 }
 
 export const readEnv = (): Environment => {
@@ -65,6 +67,7 @@ export const readEnv = (): Environment => {
     safelinkPdsUrl: envStr('LINK_SAFELINK_PDS_URL'),
     safelinkAgentIdentifier: envStr('LINK_SAFELINK_AGENT_IDENTIFIER'),
     safelinkAgentPass: envStr('LINK_SAFELINK_AGENT_PASS'),
+    metricsApiHost: envStr('LINK_METRICS_API_HOST'),
   }
 }
 
@@ -79,6 +82,7 @@ export const envToCfg = (env: Environment): Config => {
     safelinkPdsUrl: env.safelinkPdsUrl,
     safelinkAgentIdentifier: env.safelinkAgentIdentifier,
     safelinkAgentPass: env.safelinkAgentPass,
+    metricsApiHost: env.metricsApiHost,
   }
   if (!env.dbPostgresUrl) {
     throw new Error('Must configure postgres url (LINK_DB_POSTGRES_URL)')

bskylink/src/context.ts

@@ -1,6 +1,7 @@
 import {SafelinkClient} from './cache/safelinkClient.js'
 import {type Config} from './config.js'
 import Database from './db/index.js'
+import {MetricsClient} from './metrics.js'
 
 export type AppContextOptions = {
   cfg: Config
@@ -12,6 +13,7 @@ export class AppContext {
   db: Database
   safelinkClient: SafelinkClient
   abortController = new AbortController()
+  metrics: MetricsClient
 
   constructor(private opts: AppContextOptions) {
     this.cfg = this.opts.cfg
@@ -20,6 +22,9 @@ export class AppContext {
       cfg: this.opts.cfg.service,
       db: this.opts.db,
     })
+    this.metrics = new MetricsClient({
+      trackingEndpoint: this.opts.cfg.service.metricsApiHost,
+    })
   }
 
   static async fromConfig(cfg: Config, overrides?: Partial<AppContextOptions>) {

bskylink/src/html/linkRedirectContents.ts

@@ -1,10 +1,20 @@
 import escapeHTML from 'escape-html'
 
 export function linkRedirectContents(link: string): string {
+  // Encode characters that could break out of the single-quoted URL in meta refresh.
+  // HTML entity escaping (') is insufficient because the browser decodes entities
+  // before the meta refresh parser processes the URL, allowing apostrophes to
+  // prematurely terminate the URL string.
+  //
+  // Example: "They're" with HTML escaping becomes "They're" in HTML, but after
+  // the browser decodes the content attribute, the meta refresh parser sees "They're"
+  // and interprets the apostrophe as the closing quote, truncating the URL to "They".
+  const safeLink = link.replace(/'/g, '%27')
+
   return `
     <html>
       <head>
-        <meta http-equiv="refresh" content="0; URL='${escapeHTML(link)}'" />
+        <meta http-equiv="refresh" content="0; URL='${escapeHTML(safeLink)}'" />
         <meta
           http-equiv="Cache-Control"
           content="no-store, no-cache, must-revalidate, max-age=0" />

bskylink/src/index.ts

@@ -36,6 +36,7 @@ export class LinkService {
   }
 
   async start() {
+    this.ctx.metrics.start()
     this.server = this.app.listen(this.ctx.cfg.service.port)
     this.server.keepAliveTimeout = 90000
     this.terminator = createHttpTerminator({server: this.server})
@@ -46,5 +47,6 @@ export class LinkService {
     this.ctx.abortController.abort()
     await this.terminator?.terminate()
     await this.ctx.db.close()
+    this.ctx.metrics.stop()
   }
 }

bskylink/src/metrics.test.ts

@@ -0,0 +1,183 @@
+import assert from 'node:assert'
+import {afterEach, beforeEach, describe, it, mock} from 'node:test'
+
+import {httpLogger} from './logger.js'
+import {MetricsClient} from './metrics.js'
+
+type TestEvents = {
+  click: {button: string}
+  view: {screen: string}
+}
+
+describe('MetricsClient', () => {
+  let fetchMock: ReturnType<typeof mock.fn>
+  let fetchRequests: {body: any}[]
+  let client: MetricsClient<TestEvents>
+  let loggerErrorMock: ReturnType<typeof mock.fn>
+
+  beforeEach(() => {
+    mock.timers.enable({apis: ['setInterval', 'setTimeout']})
+    fetchRequests = []
+    fetchMock = mock.fn(async (_url: any, options: any) => {
+      const body = JSON.parse(options.body)
+      fetchRequests.push({body})
+      return {ok: true, status: 200, text: async () => ''}
+    })
+    ;(globalThis as any).fetch = fetchMock
+    loggerErrorMock = mock.fn()
+    httpLogger.error = loggerErrorMock as any
+  })
+
+  afterEach(() => {
+    client?.stop()
+    mock.timers.reset()
+    mock.restoreAll()
+  })
+
+  it('flushes events on interval', async () => {
+    client = new MetricsClient<TestEvents>({
+      trackingEndpoint: 'https://test.metrics.api',
+    })
+    client.track('click', {button: 'submit'})
+    client.track('view', {screen: 'home'})
+
+    assert.strictEqual(fetchRequests.length, 0)
+
+    mock.timers.tick(10_000)
+    await flush()
+
+    assert.strictEqual(fetchRequests.length, 1)
+    assert.strictEqual(fetchRequests[0].body.events.length, 2)
+    assert.strictEqual(fetchRequests[0].body.events[0].event, 'click')
+    assert.strictEqual(fetchRequests[0].body.events[1].event, 'view')
+  })
+
+  it('flushes when maxBatchSize is exceeded', async () => {
+    client = new MetricsClient<TestEvents>({
+      trackingEndpoint: 'https://test.metrics.api',
+    })
+    client.maxBatchSize = 5
+
+    for (let i = 0; i < 5; i++) {
+      client.track('click', {button: `btn-${i}`})
+    }
+
+    assert.strictEqual(fetchRequests.length, 0)
+
+    client.track('click', {button: 'btn-trigger'})
+    await flush()
+
+    assert.strictEqual(fetchRequests.length, 1)
+    assert.strictEqual(fetchRequests[0].body.events.length, 6)
+  })
+
+  it('logs error on failed request', async () => {
+    fetchMock.mock.mockImplementation(async () => {
+      return {
+        ok: false,
+        status: 500,
+        text: async () => 'Internal Server Error',
+      }
+    })
+
+    client = new MetricsClient<TestEvents>({
+      trackingEndpoint: 'https://test.metrics.api',
+    })
+    client.track('click', {button: 'submit'})
+
+    mock.timers.tick(10_000)
+    await flush()
+
+    assert.strictEqual(fetchMock.mock.callCount(), 1)
+    assert.strictEqual(loggerErrorMock.mock.callCount(), 1)
+    const call = loggerErrorMock.mock.calls[0]
+    const arg = call.arguments[0] as {err: Error}
+    assert.ok(arg.err instanceof Error)
+    assert.strictEqual(call.arguments[1], 'Failed to send metrics')
+  })
+
+  it('handles fetch text() error gracefully', async () => {
+    fetchMock.mock.mockImplementation(async () => {
+      return {
+        ok: false,
+        status: 500,
+        text: async () => {
+          throw new Error('Failed to read response')
+        },
+      }
+    })
+
+    client = new MetricsClient<TestEvents>({
+      trackingEndpoint: 'https://test.metrics.api',
+    })
+    client.track('click', {button: 'submit'})
+
+    mock.timers.tick(10_000)
+    await flush()
+
+    assert.strictEqual(fetchMock.mock.callCount(), 1)
+    assert.strictEqual(loggerErrorMock.mock.callCount(), 1)
+    const call = loggerErrorMock.mock.calls[0]
+    const arg = call.arguments[0] as {err: Error}
+    assert.ok(arg.err instanceof Error)
+    assert.match(arg.err.message, /Unknown error/)
+    assert.strictEqual(call.arguments[1], 'Failed to send metrics')
+  })
+
+  it('flushes when stop() is called', async () => {
+    client = new MetricsClient<TestEvents>({
+      trackingEndpoint: 'https://test.metrics.api',
+    })
+    client.track('click', {button: 'submit'})
+
+    assert.strictEqual(fetchRequests.length, 0)
+
+    client.stop()
+    await flush()
+
+    assert.strictEqual(fetchRequests.length, 1)
+    assert.strictEqual(fetchRequests[0].body.events.length, 1)
+    assert.strictEqual(fetchRequests[0].body.events[0].event, 'click')
+  })
+
+  it('does not send if trackingEndpoint is not configured', async () => {
+    client = new MetricsClient<TestEvents>({})
+    client.track('click', {button: 'submit'})
+
+    mock.timers.tick(10_000)
+    await flush()
+
+    assert.strictEqual(fetchMock.mock.callCount(), 0)
+  })
+
+  it('start() is idempotent', async () => {
+    client = new MetricsClient<TestEvents>({
+      trackingEndpoint: 'https://test.metrics.api',
+    })
+
+    client.track('click', {button: 'submit'})
+    client.start()
+    client.start()
+
+    mock.timers.tick(10_000)
+    await flush()
+
+    assert.strictEqual(fetchRequests.length, 1)
+  })
+
+  it('does not flush if queue is empty', async () => {
+    client = new MetricsClient<TestEvents>({
+      trackingEndpoint: 'https://test.metrics.api',
+    })
+    client.start()
+
+    mock.timers.tick(10_000)
+    await flush()
+
+    assert.strictEqual(fetchMock.mock.callCount(), 0)
+  })
+})
+
+function flush() {
+  return new Promise(r => setImmediate(r))
+}

bskylink/src/metrics.ts

@@ -0,0 +1,141 @@
+import crypto from 'node:crypto'
+
+import {httpLogger} from './logger.js'
+
+/**
+ * New metrics events should be added here
+ */
+type Events = {
+  redirect: {
+    link: string
+    whitelisted: 'unknown' | 'yes'
+    blocked: boolean
+    warned: boolean
+    utm_source?: string
+    utm_medium?: string
+    utm_campaign?: string
+    utm_content?: string
+    utm_term?: string
+  }
+  invalid_redirect: {
+    link: string
+  }
+}
+
+type Event<M extends Record<string, any>> = {
+  time: number
+  event: keyof M
+  payload: M[keyof M]
+  metadata: Record<string, any>
+}
+
+export type Config = {
+  trackingEndpoint?: string
+}
+
+/**
+ * This MetricsClient is duplicated from both `social-app` and `atproto`
+ * codebases.
+ */
+export class MetricsClient<M extends Record<string, any> = Events> {
+  maxBatchSize = 100
+
+  private disabled: boolean = false
+  private started: boolean = false
+  private queue: Event<M>[] = []
+  private flushInterval: NodeJS.Timeout | null = null
+  constructor(private config: Config) {
+    this.disabled = !config.trackingEndpoint
+  }
+
+  start() {
+    if (this.disabled) return
+    if (this.started) return
+    this.started = true
+    this.flushInterval = setInterval(() => {
+      this.flush()
+    }, 10_000)
+  }
+
+  stop() {
+    if (this.flushInterval) {
+      clearInterval(this.flushInterval)
+      this.flushInterval = null
+    }
+    this.flush()
+  }
+
+  track<E extends keyof M>(event: E, payload: M[E]) {
+    if (this.disabled) return
+
+    this.start()
+
+    /**
+     * deviceId is required for sharding events in Middleman. To avoid a hot
+     * shard, we generate a random anonymous IDs for this client.
+     *
+     * @see https://github.com/bluesky-social/tango/blob/d5819cde419d13e0d2cf837f4b30d48529d64060/middleman/handlers_tracking.go#L195
+     */
+    const anonId = `anon-${crypto.randomUUID()}`
+
+    /**
+     * Event structure is like this to ensure compat with Middleman, which
+     * receives events like this from other codebases, including `social-app`.
+     */
+    const e = {
+      source: 'blink',
+      time: Date.now(),
+      event,
+      payload,
+      metadata: {
+        base: {
+          deviceId: anonId,
+          sessionId: anonId,
+        },
+        session: {
+          did: undefined,
+        },
+      },
+    }
+    this.queue.push(e)
+
+    if (this.queue.length > this.maxBatchSize) {
+      this.flush()
+    }
+  }
+
+  flush() {
+    if (this.disabled) return
+    if (!this.queue.length) return
+    const events = this.queue.splice(0, this.queue.length)
+    this.sendBatch(events)
+  }
+
+  private async sendBatch(events: Event<M>[]) {
+    if (this.disabled || !this.config.trackingEndpoint) return
+
+    try {
+      const res = await fetch(this.config.trackingEndpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({events}),
+        keepalive: true,
+      })
+
+      if (!res.ok) {
+        const errorText = await res.text().catch(() => 'Unknown error')
+        httpLogger.error(
+          {err: new Error(`${res.status} Failed to fetch - ${errorText}`)},
+          'Failed to send metrics',
+        )
+      } else {
+        // Drain response body to allow connection reuse.
+        await res.text().catch(() => {})
+      }
+    } catch (err) {
+      httpLogger.error({err}, 'Failed to send metrics')
+    }
+  }
+}

bskylink/src/routes/redirect.ts

@@ -37,6 +37,7 @@ export default function (ctx: AppContext, app: Express) {
           url.pathname === '/redirect') || // is a redirect loop
         INTERNAL_IP_REGEX.test(url.hostname) // isn't directing to an internal location
       ) {
+        ctx.metrics.track('invalid_redirect', {link})
         res.setHeader('Cache-Control', 'no-store')
         res.setHeader('Location', `https://${ctx.cfg.service.appHostname}`)
         return res.status(302).end()
@@ -48,6 +49,9 @@ export default function (ctx: AppContext, app: Express) {
       res.type('html')
 
       let html: string | undefined
+      let whitelisted: 'unknown' | 'yes' = 'unknown'
+      let blocked: boolean = false
+      let warned: boolean = false
 
       if (ctx.cfg.service.safelinkEnabled) {
         const rule = await ctx.safelinkClient.tryFindRule(link)
@@ -55,6 +59,7 @@ export default function (ctx: AppContext, app: Express) {
           switch (rule.action) {
             case 'whitelist':
               redirectLogger.info({rule}, 'Whitelist rule matched')
+              whitelisted = 'yes'
               break
             case 'block':
               html = linkWarningLayout(
@@ -66,6 +71,7 @@ export default function (ctx: AppContext, app: Express) {
               )
               res.setHeader('Cache-Control', 'no-store')
               redirectLogger.info({rule}, 'Block rule matched')
+              blocked = true
               break
             case 'warn':
               html = linkWarningLayout(
@@ -77,6 +83,7 @@ export default function (ctx: AppContext, app: Express) {
               )
               res.setHeader('Cache-Control', 'no-store')
               redirectLogger.info({rule}, 'Warn rule matched')
+              warned = true
               break
             default:
               redirectLogger.warn({rule}, 'Unknown rule matched')
@@ -89,6 +96,18 @@ export default function (ctx: AppContext, app: Express) {
         html = linkRedirectContents(url.href)
       }
 
+      ctx.metrics.track('redirect', {
+        link,
+        whitelisted,
+        blocked,
+        warned,
+        utm_source: req.query.utm_source?.toString(),
+        utm_medium: req.query.utm_medium?.toString(),
+        utm_campaign: req.query.utm_campaign?.toString(),
+        utm_content: req.query.utm_content?.toString(),
+        utm_term: req.query.utm_term?.toString(),
+      })
+
       return res.end(html)
     }),
   )

bskylink/tests/index.ts

@@ -2,11 +2,9 @@ import assert from 'node:assert'
 import {type AddressInfo} from 'node:net'
 import {after, before, describe, it} from 'node:test'
 
-import {ToolsOzoneSafelinkDefs} from '@atproto/api'
-
 import {Database, envToCfg, LinkService, readEnv} from '../src/index.js'
 
-describe('link service', async () => {
+describe.skip('link service', async () => {
   let linkService: LinkService
   let baseUrl: string
   before(async () => {
@@ -18,9 +16,9 @@ describe('link service', async () => {
       dbPostgresSchema: 'link_test',
       dbPostgresUrl: process.env.DB_POSTGRES_URL,
       safelinkEnabled: true,
-      ozoneUrl: 'http://localhost:2583',
-      ozoneAgentHandle: 'mod-authority.test',
-      ozoneAgentPass: 'hunter2',
+      safelinkPdsUrl: 'http://localhost:2583',
+      safelinkAgentIdentifier: 'mod-authority.test',
+      safelinkAgentPass: 'hunter2',
     })
     const migrateDb = Database.postgres({
       url: cfg.db.url,
@@ -33,6 +31,7 @@ describe('link service', async () => {
     const {port} = linkService.server?.address() as AddressInfo
     baseUrl = `http://localhost:${port}`
 
+    /*
     // Ensure blocklist, whitelist, and safelink rules are set up
     const now = new Date().toISOString()
     linkService.ctx.cfg.eventCache.smartUpdate({
@@ -110,6 +109,7 @@ describe('link service', async () => {
       comment:
         'Could be quite the mistake to get into this addicting game, but we will warn instead of block',
     })
+    */
   })
   after(async () => {
     await linkService?.destroy()
@@ -213,6 +213,7 @@ describe('link service', async () => {
     )
   })
 
+  /*
   it('Rule adjustment, safe redirect, 200 response for Instagram Account of teamsesh Bones', async () => {
     // Retrieve the latest event after all updates
     const result = linkService.ctx.cfg.eventCache.smartGet(
@@ -232,6 +233,7 @@ describe('link service', async () => {
       new RegExp(urlToRedirect.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')),
     )
   })
+  */
 
   async function getRedirect(link: string): Promise<[number, string]> {
     const url = new URL(link)
@@ -291,9 +293,10 @@ describe('link service no safelink', async () => {
       dbPostgresSchema: 'link_test',
       dbPostgresUrl: process.env.DB_POSTGRES_URL,
       safelinkEnabled: false,
-      ozoneUrl: 'http://localhost:2583',
-      ozoneAgentHandle: 'mod-authority.test',
-      ozoneAgentPass: 'hunter2',
+      safelinkPdsUrl: 'http://localhost:2583',
+      safelinkAgentIdentifier: 'mod-authority.test',
+      safelinkAgentPass: 'hunter2',
+      metricsApiHost: 'http://localhost:2584',
     })
     const migrateDb = Database.postgres({
       url: cfg.db.url,
@@ -357,4 +360,21 @@ describe('link service no safelink', async () => {
     // No blocked-site div, always safe
     assert.doesNotMatch(html, /"blocked-site"/)
   })
+
+  it('normal redirect with query params', async () => {
+    const urlToRedirect = 'https://bsky.app/settings'
+    const url = new URL(`${baseUrl}/redirect`)
+    url.searchParams.set('u', urlToRedirect)
+    url.searchParams.set('utm_source', 'test')
+    const res = await fetch(url, {redirect: 'manual'})
+    assert.strictEqual(res.status, 200)
+    const html = await res.text()
+    assert.match(html, /meta http-equiv="refresh"/)
+    assert.match(
+      html,
+      new RegExp(urlToRedirect.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')),
+    )
+    // No blocked-site div, always safe
+    assert.doesNotMatch(html, /"blocked-site"/)
+  })
 })

bskylink/tsconfig.json

@@ -14,6 +14,10 @@
     "sourceMap": true
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist"]
+  "exclude": ["node_modules", "dist"],
+  "ts-node": {
+    "logError": true,
+    "pretty": true /* <= technically not required */
+  }
 }
 

bskyogcard/src/components/Img.tsx

@@ -1,5 +1,6 @@
 import React 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'

bskyogcard/src/routes/starter-pack.tsx

@@ -1,9 +1,9 @@
 import assert from 'node:assert'
 
 import React from 'react'
-import {AppBskyGraphDefs, AtUri} from '@atproto/api'
+import {type AppBskyGraphDefs, AtUri} from '@atproto/api'
 import resvg from '@resvg/resvg-js'
-import {Express} from 'express'
+import {type Express} from 'express'
 import satori from 'satori'
 
 import {
@@ -11,7 +11,7 @@ import {
   STARTERPACK_HEIGHT,
   STARTERPACK_WIDTH,
 } from '../components/StarterPack.js'
-import {AppContext} from '../context.js'
+import {type AppContext} from '../context.js'
 import {httpLogger} from '../logger.js'
 import {loadEmojiAsSvg} from '../util.js'
 import {handler, originVerifyMiddleware} from './util.js'
@@ -83,12 +83,18 @@ export default function (ctx: AppContext, app: Express) {
 }
 
 async function getImage(url: string) {
-  const response = await fetch(url)
+  const response = await fetch(ensureJpeg(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/cmd/bskyweb/server.go

@@ -292,6 +292,7 @@ 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)
@@ -589,6 +590,14 @@ func (srv *Server) WebPost(c echo.Context) error {
 			if postView.Embed.EmbedVideo_View.Thumbnail != nil {
 				data["imgThumbUrls"] = []string{*postView.Embed.EmbedVideo_View.Thumbnail}
 			}
+			if postView.Embed.EmbedVideo_View.Playlist != "" {
+				data["videoUrl"] = postView.Embed.EmbedVideo_View.Playlist
+				data["videoType"] = "application/vnd.apple.mpegurl"
+				if postView.Embed.EmbedVideo_View.AspectRatio != nil {
+					data["videoWidth"] = postView.Embed.EmbedVideo_View.AspectRatio.Width
+					data["videoHeight"] = postView.Embed.EmbedVideo_View.AspectRatio.Height
+				}
+			}
 		} else if hasMediaImages {
 			var thumbUrls []string
 			for i := range postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View.Images {
@@ -599,6 +608,14 @@ func (srv *Server) WebPost(c echo.Context) error {
 			if postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.Thumbnail != nil {
 				data["imgThumbUrls"] = []string{*postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.Thumbnail}
 			}
+			if postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.Playlist != "" {
+				data["videoUrl"] = postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.Playlist
+				data["videoType"] = "application/vnd.apple.mpegurl"
+				if postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.AspectRatio != nil {
+					data["videoWidth"] = postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.AspectRatio.Width
+					data["videoHeight"] = postView.Embed.EmbedRecordWithMedia_View.Media.EmbedVideo_View.AspectRatio.Height
+				}
+			}
 		}
 	}
 

bskyweb/templates/post.html

@@ -34,6 +34,14 @@
   <meta property="twitter:image" content="{{ imgThumbUrl }}">
   {% endfor %}
   <meta name="twitter:card" content="summary_large_image">
+  {%- if videoUrl %}
+  <meta property="og:video" content="{{ videoUrl }}">
+  <meta property="og:video:type" content="{{ videoType }}">
+  {%- if videoWidth %}
+  <meta property="og:video:width" content="{{ videoWidth }}">
+  <meta property="og:video:height" content="{{ videoHeight }}">
+  {% endif -%}
+  {% endif -%}
   {% else %}
   <meta property="og:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">
   <meta property="twitter:image" content="{{ postView.Author.Avatar|avatar_thumbnail }}">

dev-env/mock-server.ts

@@ -0,0 +1,510 @@
+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

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

dev-env/tsconfig.json

@@ -28,6 +28,7 @@
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": false,
     "esModuleInterop": true,
+    "skipLibCheck": true,
     "paths": {
       "#/*": ["./src/*"],
       "lib/*": ["./src/lib/*"],
@@ -43,4 +44,4 @@
     "metro.config.js",
     "jest.config.js"
   ]
-}
+}

docs/localization.md

@@ -47,8 +47,7 @@ Every night, a GitHub action will run `yarn intl:extract` to update the english
 ### Release process
 
 1. Pull main and create a branch.
-1. Run `yarn intl:pull` to fetch all translation updates from Crowdin. Commit.
-1. Run `yarn intl:extract:all` to ensure all `.po` files are synced with the current state of the code. Commit.
+1. Run `yarn intl:release` to fetch all translation updates from Crowdin and extract all `.po` files so that they're synced with the latest code. Commit that.
 1. Create a PR, ensure the translations all look correct, and merge.
 1. If needed:
   1. Merge all approved translation PRs (contributions from outside crowdin).

docs/testing.md

@@ -3,6 +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.

eslint.config.mjs

@@ -37,6 +37,7 @@ export default defineConfig(
       '*.e2e.ts',
       '*.e2e.tsx',
       'eslint.config.mjs',
+      '.jscodeshift/**',
     ],
   },
 
@@ -46,7 +47,6 @@ export default defineConfig(
   js.configs.recommended,
   tseslint.configs.recommendedTypeChecked,
   reactHooks.configs.flat.recommended,
-  // @ts-expect-error https://github.com/un-ts/eslint-plugin-import-x/issues/439
   importX.flatConfigs.recommended,
   importX.flatConfigs.typescript,
   importX.flatConfigs['react-native'],
@@ -61,6 +61,7 @@ export default defineConfig(
       'react-native': reactNative,
       'react-native-a11y': reactNativeA11y,
       'simple-import-sort': simpleImportSort,
+      // @ts-expect-error - not sure why
       lingui,
       'react-compiler': reactCompiler,
       'bsky-internal': bskyInternal,
@@ -126,6 +127,7 @@ export default defineConfig(
        */
       ...react.configs.recommended.rules,
       ...react.configs['jsx-runtime'].rules,
+      'react/hook-use-state': 'warn',
       'react/no-unescaped-entities': 'off',
       'react/prop-types': 'off',
       'react-native/no-inline-styles': 'off',
@@ -188,6 +190,18 @@ export default defineConfig(
          */
         ignore: ['^#\/locale\/locales\/.+\/messages'],
       }],
+      'import-x/no-extraneous-dependencies': ['error', {
+        'whitelist': [
+          // test files only
+          '@jest/globals',
+          // we only use a really simple util from this, and we know it will be present
+          'expo-modules-core',
+          // this is a dep for @atproto/api, but we absolutely need them in sync, so just
+          // rely on the transient version
+          '@atproto/common-web',
+        ]
+      }],
+      'import-x/no-nodejs-modules': 'error',
 
       /**
        * TypeScript-specific rules

eslint/avoid-unwrapped-text.js

@@ -29,6 +29,7 @@ function getTagName(node) {
   return reversedIdentifiers.reverse().join('.')
 }
 
+/** @type {import('eslint').Rule.RuleModule} */
 module.exports = {
   meta: {
     type: 'problem',

eslint/use-exact-imports.js

@@ -3,6 +3,7 @@ const BANNED_IMPORTS = [
   '@fortawesome/free-solid-svg-icons',
 ]
 
+/** @type {import('eslint').Rule.RuleModule} */
 module.exports = {
   meta: {
     type: 'suggestion',

eslint/use-prefixed-imports.js

@@ -10,6 +10,7 @@ const BANNED_IMPORT_PREFIXES = [
   'view/',
 ]
 
+/** @type {import('eslint').Rule.RuleModule} */
 module.exports = {
   meta: {
     type: 'suggestion',

jest/jestSetup.js

@@ -9,6 +9,7 @@ jest.mock('@react-native-async-storage/async-storage', () =>
   require('@react-native-async-storage/async-storage/jest/async-storage-mock'),
 )
 jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter', () => {
+  // eslint-disable-next-line import-x/no-nodejs-modules
   const {EventEmitter} = require('events')
   return {
     __esModule: true,

jest/test-utils.tsx

@@ -1,23 +0,0 @@
-import {GestureHandlerRootView} from 'react-native-gesture-handler'
-import {SafeAreaProvider} from 'react-native-safe-area-context'
-import {render} from '@testing-library/react-native'
-
-import {ThemeProvider} from '../src/lib/ThemeContext'
-import {type RootStoreModel, RootStoreProvider} from '../src/state'
-
-const customRender = (ui: any, rootStore: RootStoreModel) =>
-  render(
-    <GestureHandlerRootView style={{flex: 1}}>
-      <RootStoreProvider value={rootStore}>
-        <ThemeProvider theme="light">
-          <SafeAreaProvider>{ui}</SafeAreaProvider>
-        </ThemeProvider>
-      </RootStoreProvider>
-    </GestureHandlerRootView>,
-  )
-
-// re-export everything
-export * from '@testing-library/react-native'
-
-// override render method
-export {customRender as render}

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

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

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

@@ -8,10 +8,7 @@ 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
@@ -34,11 +31,30 @@ class BottomSheetView(
 
   private lateinit var dialogRootViewGroup: DialogRootViewGroup
   private var eventDispatcher: EventDispatcher? = null
-  private var isKeyboardVisible: Boolean = false
 
-  private val screenHeight =
-    context.resources.displayMetrics.heightPixels
-      .toFloat()
+  // Native content height observation (eliminates JS bridge round-trip)
+  private var contentLayoutListener: 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) {
+      // API 35+: edge-to-edge is mandatory, heightPixels is the full display
+      context.resources.displayMetrics.heightPixels.toFloat()
+    } else if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
+      // API 30-34: heightPixels may exclude nav bar, use currentWindowMetrics
+      val wm = context.getSystemService(Context.WINDOW_SERVICE) as android.view.WindowManager
+      wm.currentWindowMetrics.bounds.height().toFloat()
+    } else {
+      // API < 30: currentWindowMetrics not available, use getRealSize
+      // which includes system bars (heightPixels may exclude them)
+      val wm = context.getSystemService(Context.WINDOW_SERVICE) as android.view.WindowManager
+      val size = android.graphics.Point()
+      @Suppress("DEPRECATION")
+      wm.defaultDisplay.getRealSize(size)
+      size.y.toFloat()
+    }
 
   private fun getNavigationBarHeight(): Int {
     val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android")
@@ -64,8 +80,15 @@ 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
@@ -129,6 +152,7 @@ class BottomSheetView(
   }
 
   private fun destroy() {
+    this.stopObservingContentHeight()
     this.isClosing = false
     this.isOpen = false
     this.dialog = null
@@ -193,31 +217,40 @@ 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 (preventExpansion) {
-        behavior.maxHeight = (behavior.halfExpandedRatio * screenHeight).toInt()
-      } else {
-        behavior.maxHeight = (screenHeight - getStatusBarHeight()).toInt()
-      }
-
-      val targetHeight = this.getTargetHeight()
-      val availableHeight = screenHeight - getStatusBarHeight() - getNavigationBarHeight()
-      val shouldBeExpanded = targetHeight >= availableHeight
-
-      if (shouldBeExpanded) {
+      if (fullHeight) {
+        behavior.isFitToContents = false
+        behavior.expandedOffset = getStatusBarHeight()
         behavior.state = BottomSheetBehavior.STATE_EXPANDED
         this.selectedSnapPoint = 2
-      } else {
+      } else if (preventExpansion) {
+        behavior.isFitToContents = true
+        behavior.halfExpandedRatio = getHalfExpandedRatio(contentHeight)
+        behavior.maxHeight = (behavior.halfExpandedRatio * screenHeight).toInt()
         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(
@@ -226,12 +259,23 @@ 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(
@@ -245,25 +289,14 @@ class BottomSheetView(
     this.isOpening = true
     dialog.show()
     this.dialog = dialog
-
-    ViewCompat.setOnApplyWindowInsetsListener(dialogRootViewGroup) { view, insets ->
-      val imeVisible = insets.isVisible(WindowInsetsCompat.Type.ime())
-      val bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
-      val behavior = bottomSheet?.let { BottomSheetBehavior.from(it) }
-
-      val wasKeyboardVisible = isKeyboardVisible
-      isKeyboardVisible = imeVisible
-
-      if (imeVisible && behavior?.state == BottomSheetBehavior.STATE_HALF_EXPANDED) {
-        behavior.state = BottomSheetBehavior.STATE_EXPANDED
-      } else if (!imeVisible && wasKeyboardVisible) {
-        updateLayout()
-      }
-      insets
+    if (!fullHeight) {
+      this.startObservingContentHeight()
     }
+
   }
 
   fun updateLayout() {
+    if (fullHeight) return
     val dialog = this.dialog ?: return
     val contentHeight = this.getContentHeight()
 
@@ -274,21 +307,34 @@ 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
 
-      if (isKeyboardVisible) {
-        if (behavior.state != BottomSheetBehavior.STATE_EXPANDED) {
-          behavior.state = BottomSheetBehavior.STATE_EXPANDED
+      // 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
         }
-      } else if (shouldBeExpanded && behavior.state != BottomSheetBehavior.STATE_EXPANDED && !preventExpansion) {
+        return
+      }
+
+      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
@@ -299,21 +345,77 @@ class BottomSheetView(
   }
 
   fun dismiss() {
-    this.dialog?.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 = 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
   }
 
   // Util
 
   private fun getContentHeight(): Float {
-    val innerView = this.innerView ?: return 0f
-    var index = 0
-    innerView.allViews.forEach {
-      if (index == 1) {
-        return it.height.toFloat()
-      }
-      index++
+    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
     }
-    return 0f
+    return maxChildHeight
   }
 
   private fun getTargetHeight(): Float {

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

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="EdgeToEdgeBottomSheetDialogTheme" parent="Theme.Material3.DayNight.BottomSheetDialog">
-        <!-- Enable edge-to-edge -->
+    <style name="EdgeToEdgeBottomSheetDialogTheme" parent="ThemeOverlay.Material3.DayNight.BottomSheetDialog">
+        <!-- Enable edge-to-edge, matching react-native-edge-to-edge's setup -->
         <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 -->
@@ -16,5 +18,6 @@
         <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()
       }
 
-      AsyncFunction("updateLayout") { (view: SheetView) in
-        view.updateLayout()
+      Prop("fullHeight") { (view: SheetView, prop: Bool) in
+        view.fullHeight = prop
       }
 
       Prop("cornerRadius") { (view: SheetView, prop: Float) in

modules/bottom-sheet/ios/SheetView.swift

@@ -8,6 +8,9 @@ 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()
@@ -23,6 +26,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   }
 
   // React view props
+  var fullHeight = false
   var preventDismiss = false
   var preventExpansion = false
   var cornerRadius: CGFloat?
@@ -68,7 +72,6 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
       }
     }
   }
-  private var prevLayoutDetentIdentifier: UISheetPresentationController.Detent.Identifier?
 
   // MARK: - Lifecycle
 
@@ -106,6 +109,8 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   }
 
   private func destroy() {
+    self.contentHeightObservation?.invalidate()
+    self.contentHeightObservation = nil
     self.isClosing = false
     self.isOpen = false
     self.sheetVc = nil
@@ -128,7 +133,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
     }
 
     let sheetVc = SheetViewController()
-    sheetVc.setDetents(contentHeight: self.clampHeight(contentHeight), preventExpansion: self.preventExpansion)
+    sheetVc.setDetents(contentHeight: self.clampHeight(contentHeight), preventExpansion: self.preventExpansion, fullHeight: self.fullHeight)
     if let sheet = sheetVc.sheetPresentationController {
       sheet.delegate = self
       sheet.preferredCornerRadius = self.cornerRadius
@@ -147,6 +152,9 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
 
     self.sheetVc = sheetVc
     self.isOpening = true
+    if !self.fullHeight {
+      self.startObservingContentHeight()
+    }
 
     rvc.present(sheetVc, animated: true) { [weak self] in
       self?.isOpening = false
@@ -154,15 +162,30 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
     }
   }
 
-  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)
+  // 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)
       self.selectedDetentIdentifier = self.sheetVc?.getCurrentDetentIdentifier()
     }
-    self.prevLayoutDetentIdentifier = self.selectedDetentIdentifier
   }
 
   func dismiss() {

modules/bottom-sheet/ios/SheetViewController.swift

@@ -20,13 +20,19 @@ class SheetViewController: UIViewController {
     }
   }
 
-  func setDetents(contentHeight: CGFloat, preventExpansion: Bool) {
+  func setDetents(contentHeight: CGFloat, preventExpansion: Bool, fullHeight: Bool = false) {
     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.

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

@@ -26,6 +26,7 @@ export interface BottomSheetViewProps {
   disableDrag?: boolean
   sourceViewTag?: number
 
+  fullHeight?: boolean
   minHeight?: number
   maxHeight?: number
 

modules/bottom-sheet/src/BottomSheetNativeComponent.tsx

@@ -12,7 +12,6 @@ import {
 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,
@@ -35,6 +34,10 @@ 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 React.Component<
   BottomSheetViewProps,
@@ -71,10 +74,6 @@ export class BottomSheetNativeComponent extends React.Component<
     this.props.onStateChange?.(event)
   }
 
-  private updateLayout = () => {
-    this.ref.current?.updateLayout()
-  }
-
   static dismissAll = async () => {
     await NativeModule.dismissAll()
   }
@@ -113,23 +112,14 @@ export class BottomSheetNativeComponent extends React.Component<
           nativeViewRef={this.ref}
           onStateChange={this.onStateChange}
           extraStyles={extraStyles}
-          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()
-            }
-          }}
+          onLayout={
+            IS_IOS15
+              ? e => {
+                  const {height} = e.nativeEvent.layout
+                  this.setState({viewHeight: height})
+                }
+              : undefined
+          }
         />
       </Portal>
     )
@@ -150,13 +140,18 @@ function BottomSheetNativeComponentInner({
     event: NativeSyntheticEvent<{state: BottomSheetState}>,
   ) => void
   nativeViewRef: React.RefObject<View>
-  onLayout: (event: LayoutChangeEvent) => void
+  onLayout?: (event: LayoutChangeEvent) => void
 }) {
   const insets = useSafeAreaInsets()
   const cornerRadius = rest.cornerRadius ?? 0
   const {height: screenHeight} = useWindowDimensions()
 
-  const sheetHeight = IS_IOS ? screenHeight - insets.top : screenHeight
+  // 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
 
   return (
     <NativeView

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bsky.app",
-  "version": "1.118.0",
+  "version": "1.120.0",
   "private": true,
   "engines": {
     "node": ">=20"
@@ -52,7 +52,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": "NODE_ENV=development ./jest/dev-infra/with-test-redis-and-db.sh ts-node --project tsconfig.e2e.json __e2e__/mock-server.ts",
+    "e2e:mock-server": "cd dev-env && yarn start",
     "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",
@@ -70,6 +70,7 @@
     "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",
+    "intl:release": "yarn intl:pull && yarn intl:extract:all",
     "nuke": "rm -rf ./node_modules && rm -rf ./ios && rm -rf ./android",
     "update-extensions": "bash scripts/updateExtensions.sh",
     "export": "npx expo export --dump-sourcemap && yarn upload-native-sourcemaps",
@@ -80,13 +81,15 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.19.3",
+    "@atproto/api": "^0.19.6",
     "@bitdrift/react-native": "^0.6.8",
     "@braintree/sanitize-url": "^6.0.2",
     "@bsky.app/alf": "^0.1.7",
     "@bsky.app/expo-image-crop-tool": "^0.5.0",
-    "@bsky.app/expo-translate-text": "^0.2.7",
+    "@bsky.app/expo-translate-text": "^0.2.9",
     "@bsky.app/react-native-mmkv": "2.12.5",
+    "@bsky.app/sift": "^0.3.1",
+    "@bsky.app/tapper": "^0.5.0",
     "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
     "@emoji-mart/data": "^1.2.1",
     "@emoji-mart/react": "^1.1.1",
@@ -108,17 +111,16 @@
     "@ipld/dag-cbor": "^9.2.0",
     "@lingui/core": "^5.9.2",
     "@lingui/react": "^5.9.2",
-    "@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.9.0",
-    "@react-navigation/native": "^7.1.26",
-    "@react-navigation/native-stack": "^7.9.0",
+    "@react-navigation/bottom-tabs": "^7.15.5",
+    "@react-navigation/native": "^7.1.33",
+    "@react-navigation/native-stack": "^7.14.4",
     "@sentry/react-native": "~6.20.0",
-    "@tanstack/query-async-storage-persister": "^5.25.0",
-    "@tanstack/react-query": "5.25.0",
-    "@tanstack/react-query-persist-client": "^5.25.0",
+    "@tanstack/query-async-storage-persister": "^5.96.2",
+    "@tanstack/react-query": "^5.96.2",
+    "@tanstack/react-query-persist-client": "^5.96.2",
     "@tiptap/core": "^2.9.1",
     "@tiptap/extension-document": "^2.9.1",
     "@tiptap/extension-hard-break": "^2.9.1",
@@ -143,7 +145,7 @@
     "emoji-mart": "^5.6.0",
     "emoji-regex": "^10.4.0",
     "eventemitter3": "^5.0.1",
-    "expo": "^54.0.27",
+    "expo": "^54.0.33",
     "expo-application": "~7.0.8",
     "expo-blur": "~15.0.8",
     "expo-build-properties": "~1.0.10",
@@ -152,32 +154,34 @@
     "expo-contacts": "^15.0.10",
     "expo-dev-client": "~6.0.20",
     "expo-device": "~8.0.10",
-    "expo-file-system": "~19.0.20",
-    "expo-font": "~14.0.10",
+    "expo-file-system": "~19.0.21",
+    "expo-font": "~14.0.11",
     "expo-haptics": "~15.0.8",
     "expo-image": "~3.0.11",
     "expo-image-manipulator": "~14.0.8",
-    "expo-image-picker": "~17.0.9",
+    "expo-image-picker": "~17.0.10",
     "expo-intent-launcher": "~13.0.8",
     "expo-keep-awake": "~15.0.8",
     "expo-linear-gradient": "~15.0.8",
-    "expo-linking": "~8.0.10",
+    "expo-linking": "~8.0.11",
     "expo-localization": "~17.0.8",
     "expo-location": "~19.0.8",
     "expo-media-library": "~18.2.1",
-    "expo-notifications": "~0.32.14",
+    "expo-notifications": "~0.32.16",
+    "expo-paste-input": "^0.1.15",
     "expo-privacy-sensitive": "^0.1.0",
     "expo-screen-orientation": "~9.0.8",
     "expo-sharing": "~14.0.8",
     "expo-sms": "^14.0.7",
-    "expo-splash-screen": "~31.0.12",
+    "expo-splash-screen": "~31.0.13",
     "expo-system-ui": "~6.0.9",
-    "expo-updates": "~29.0.14",
-    "expo-video": "~3.0.15",
+    "expo-updates": "~29.0.16",
+    "expo-video": "~3.0.16",
     "expo-video-thumbnails": "^10.0.8",
     "expo-web-browser": "~15.0.10",
     "fast-deep-equal": "^3.1.3",
     "fast-text-encoding": "^1.0.6",
+    "fuse.js": "^7.1.0",
     "hls.js": "^1.6.2",
     "idb-keyval": "^6.2.2",
     "js-sha256": "^0.9.0",
@@ -198,6 +202,7 @@
     "react": "19.1.0",
     "react-compiler-runtime": "^19.1.0-rc.1",
     "react-dom": "19.1.0",
+    "react-hotkeys-hook": "5.2.4",
     "react-image-crop": "^11.0.7",
     "react-is": "19",
     "react-keyed-flatten-children": "^5.0.0",
@@ -205,16 +210,16 @@
     "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.1",
+    "react-native-drawer-layout": "^4.2.2",
     "react-native-edge-to-edge": "^1.6.0",
     "react-native-gesture-handler": "~2.28.0",
-    "react-native-keyboard-controller": "^1.20.7",
+    "react-native-keyboard-controller": "^1.21.0",
     "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.19.0",
+    "react-native-screens": "^4.24.0",
     "react-native-svg": "15.12.1",
     "react-native-uitextview": "^1.4.0",
     "react-native-uuid": "^2.0.3",
@@ -235,17 +240,16 @@
     "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",
+    "@crowdin/cli": "^4.14.1",
     "@eslint/js": "^9.39.2",
-    "@expo/config-plugins": "~54.0.1",
+    "@expo/config-plugins": "~54.0.4",
     "@lingui/babel-plugin-lingui-macro": "^5.9.2",
     "@lingui/cli": "^5.9.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "@react-native/babel-preset": "0.81.5",
-    "@react-native/eslint-config": "^0.81.5",
     "@react-native/typescript-config": "^0.81.5",
     "@sentry/webpack-plugin": "^3.2.2",
     "@testing-library/react-native": "^13.2.0",
@@ -259,12 +263,12 @@
     "babel-jest": "^29.7.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-react-compiler": "^19.1.0-rc.3",
-    "babel-preset-expo": "~54.0.0",
+    "babel-preset-expo": "~54.0.10",
     "eslint": "^9.39.2",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-bsky-internal": "link:./eslint",
-    "eslint-plugin-import-x": "^4.16.1",
-    "eslint-plugin-lingui": "^0.11.0",
+    "eslint-plugin-import-x": "^4.16.2",
+    "eslint-plugin-lingui": "^0.12.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-compiler": "^19.1.0-rc.2",
     "eslint-plugin-react-hooks": "^7.0.1",
@@ -276,7 +280,7 @@
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
     "jest": "^29.7.0",
-    "jest-expo": "~54.0.14",
+    "jest-expo": "~54.0.17",
     "jest-junit": "^16.0.0",
     "lint-staged": "^13.2.3",
     "lockfile-lint": "^4.14.0",
@@ -284,22 +288,23 @@
     "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": "^6.0.2",
+    "typescript-eslint": "^8.58.0",
     "webpack-bundle-analyzer": "^4.10.1"
   },
   "resolutions": {
     "@react-native/babel-preset": "0.81.5",
     "@react-native/normalize-colors": "0.81.5",
-    "**/@expo/image-utils": "0.8.7",
-    "**/@react-native-async-storage/async-storage": "2.2.0",
-    "**/expo-constants": "18.0.8",
-    "**/expo-device": "7.1.4",
+    "**/@expo/image-utils": "0.8.12",
     "**/multiformats": "9.9.0",
     "unicode-segmenter": "0.14.5",
-    "@types/estree": "1.0.6"
+    "@types/estree": "1.0.6",
+    "metro": "0.83.3",
+    "metro-core": "0.83.3",
+    "metro-config": "0.83.3",
+    "metro-runtime": "0.83.3",
+    "metro-source-map": "0.83.3"
   },
   "jest": {
     "preset": "jest-expo/ios",
@@ -322,7 +327,8 @@
     ],
     "modulePathIgnorePatterns": [
       "__tests__/.*/__mocks__",
-      "__e2e__/.*"
+      "__e2e__/.*",
+      "bskylink/.*"
     ],
     "coveragePathIgnorePatterns": [
       "<rootDir>/node_modules/",

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

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

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

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

patches/expo-modules-core+3.0.28.patch

@@ -1,44 +0,0 @@
-diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultLauncher.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultLauncher.kt
-index d300fc2..0890878 100644
---- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultLauncher.kt
-+++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultLauncher.kt
-@@ -3,8 +3,8 @@ package expo.modules.kotlin.activityresult
- import androidx.activity.result.ActivityResultCallback
- import androidx.activity.result.contract.ActivityResultContract
- import java.io.Serializable
-+import kotlinx.coroutines.suspendCancellableCoroutine
- import kotlin.coroutines.resume
--import kotlin.coroutines.suspendCoroutine
- 
- /**
-  * A launcher for a previously-[AppContextActivityResultCaller.registerForActivityResult] prepared call
-@@ -22,8 +22,12 @@ abstract class AppContextActivityResultLauncher<I : Serializable, O> {
-    */
-   abstract fun launch(input: I, callback: ActivityResultCallback<O>)
- 
--  suspend fun launch(input: I): O = suspendCoroutine { continuation ->
--    launch(input) { output -> continuation.resume(output) }
-+  suspend fun launch(input: I): O = suspendCancellableCoroutine { continuation ->
-+    launch(input) { output ->
-+      if (continuation.isActive) {
-+        continuation.resume(output)
-+      }
-+    }
-   }
- 
-   abstract val contract: AppContextActivityResultContract<I, O>
-diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt
-index 47c4d15..afe138d 100644
---- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt
-+++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt
-@@ -125,6 +125,10 @@ internal fun peekResponseBody(
- }
- 
- internal fun shouldParseBody(response: Response): Boolean {
-+  if (response.request.url.encodedPath == "/bitdrift_public.protobuf.client.v1.ApiService/Mux") {
-+    return false
-+  }
-+
-   // Check for Content-Type
-   val skipContentTypes = listOf(
-     "text/event-stream", // Server Sent Events

patches/expo-modules-core+3.0.29.patch

@@ -0,0 +1,15 @@
+diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt
+index 47c4d15..afe138d 100644
+--- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt
++++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt
+@@ -125,6 +125,10 @@ internal fun peekResponseBody(
+ }
+ 
+ internal fun shouldParseBody(response: Response): Boolean {
++  if (response.request.url.encodedPath == "/bitdrift_public.protobuf.client.v1.ApiService/Mux") {
++    return false
++  }
++
+   // Check for Content-Type
+   val skipContentTypes = listOf(
+     "text/event-stream", // Server Sent Events

patches/expo-notifications+0.32.14.patch

@@ -1,992 +0,0 @@
-diff --git a/node_modules/expo-notifications/android/.gradle/8.10/checksums/checksums.lock b/node_modules/expo-notifications/android/.gradle/8.10/checksums/checksums.lock
-new file mode 100644
-index 0000000..883ef6a
-Binary files /dev/null and b/node_modules/expo-notifications/android/.gradle/8.10/checksums/checksums.lock differ
-diff --git a/node_modules/expo-notifications/android/.gradle/8.10/dependencies-accessors/gc.properties b/node_modules/expo-notifications/android/.gradle/8.10/dependencies-accessors/gc.properties
-new file mode 100644
-index 0000000..e69de29
-diff --git a/node_modules/expo-notifications/android/.gradle/8.10/fileChanges/last-build.bin b/node_modules/expo-notifications/android/.gradle/8.10/fileChanges/last-build.bin
-new file mode 100644
-index 0000000..f76dd23
-Binary files /dev/null and b/node_modules/expo-notifications/android/.gradle/8.10/fileChanges/last-build.bin differ
-diff --git a/node_modules/expo-notifications/android/.gradle/8.10/fileHashes/fileHashes.lock b/node_modules/expo-notifications/android/.gradle/8.10/fileHashes/fileHashes.lock
-new file mode 100644
-index 0000000..774caf7
-Binary files /dev/null and b/node_modules/expo-notifications/android/.gradle/8.10/fileHashes/fileHashes.lock differ
-diff --git a/node_modules/expo-notifications/android/.gradle/8.10/gc.properties b/node_modules/expo-notifications/android/.gradle/8.10/gc.properties
-new file mode 100644
-index 0000000..e69de29
-diff --git a/node_modules/expo-notifications/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/node_modules/expo-notifications/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
-new file mode 100644
-index 0000000..a3c1514
-Binary files /dev/null and b/node_modules/expo-notifications/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
-diff --git a/node_modules/expo-notifications/android/.gradle/buildOutputCleanup/cache.properties b/node_modules/expo-notifications/android/.gradle/buildOutputCleanup/cache.properties
-new file mode 100644
-index 0000000..0e5b4da
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.gradle/buildOutputCleanup/cache.properties
-@@ -0,0 +1,2 @@
-+#Thu Apr 24 20:44:36 PDT 2025
-+gradle.version=8.10
-diff --git a/node_modules/expo-notifications/android/.gradle/config.properties b/node_modules/expo-notifications/android/.gradle/config.properties
-new file mode 100644
-index 0000000..0bd71c6
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.gradle/config.properties
-@@ -0,0 +1,2 @@
-+#Thu Apr 24 20:44:32 PDT 2025
-+java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home
-diff --git a/node_modules/expo-notifications/android/.gradle/vcs-1/gc.properties b/node_modules/expo-notifications/android/.gradle/vcs-1/gc.properties
-new file mode 100644
-index 0000000..e69de29
-diff --git a/node_modules/expo-notifications/android/.idea/.gitignore b/node_modules/expo-notifications/android/.idea/.gitignore
-new file mode 100644
-index 0000000..26d3352
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.idea/.gitignore
-@@ -0,0 +1,3 @@
-+# Default ignored files
-+/shelf/
-+/workspace.xml
-diff --git a/node_modules/expo-notifications/android/.idea/AndroidProjectSystem.xml b/node_modules/expo-notifications/android/.idea/AndroidProjectSystem.xml
-new file mode 100644
-index 0000000..4a53bee
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.idea/AndroidProjectSystem.xml
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project version="4">
-+  <component name="AndroidProjectSystem">
-+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-+  </component>
-+</project>
-\ No newline at end of file
-diff --git a/node_modules/expo-notifications/android/.idea/caches/deviceStreaming.xml b/node_modules/expo-notifications/android/.idea/caches/deviceStreaming.xml
-new file mode 100644
-index 0000000..9e9ba09
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.idea/caches/deviceStreaming.xml
-@@ -0,0 +1,607 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project version="4">
-+  <component name="DeviceStreaming">
-+    <option name="deviceSelectionList">
-+      <list>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="27" />
-+          <option name="brand" value="DOCOMO" />
-+          <option name="codename" value="F01L" />
-+          <option name="id" value="F01L" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="FUJITSU" />
-+          <option name="name" value="F-01L" />
-+          <option name="screenDensity" value="360" />
-+          <option name="screenX" value="720" />
-+          <option name="screenY" value="1280" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="OnePlus" />
-+          <option name="codename" value="OP5552L1" />
-+          <option name="id" value="OP5552L1" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="OnePlus" />
-+          <option name="name" value="CPH2415" />
-+          <option name="screenDensity" value="480" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2412" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="OPPO" />
-+          <option name="codename" value="OP573DL1" />
-+          <option name="id" value="OP573DL1" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="OPPO" />
-+          <option name="name" value="CPH2557" />
-+          <option name="screenDensity" value="480" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="28" />
-+          <option name="brand" value="DOCOMO" />
-+          <option name="codename" value="SH-01L" />
-+          <option name="id" value="SH-01L" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="SHARP" />
-+          <option name="name" value="AQUOS sense2 SH-01L" />
-+          <option name="screenDensity" value="480" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2160" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="Lenovo" />
-+          <option name="codename" value="TB370FU" />
-+          <option name="formFactor" value="Tablet" />
-+          <option name="id" value="TB370FU" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Lenovo" />
-+          <option name="name" value="Tab P12" />
-+          <option name="screenDensity" value="340" />
-+          <option name="screenX" value="1840" />
-+          <option name="screenY" value="2944" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="a15" />
-+          <option name="id" value="a15" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="A15" />
-+          <option name="screenDensity" value="450" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2340" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="a35x" />
-+          <option name="id" value="a35x" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="A35" />
-+          <option name="screenDensity" value="450" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2340" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="31" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="a51" />
-+          <option name="id" value="a51" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy A51" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="akita" />
-+          <option name="id" value="akita" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 8a" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="motorola" />
-+          <option name="codename" value="arcfox" />
-+          <option name="id" value="arcfox" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Motorola" />
-+          <option name="name" value="razr plus 2024" />
-+          <option name="screenDensity" value="360" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="1272" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="motorola" />
-+          <option name="codename" value="austin" />
-+          <option name="id" value="austin" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Motorola" />
-+          <option name="name" value="moto g 5G (2022)" />
-+          <option name="screenDensity" value="280" />
-+          <option name="screenX" value="720" />
-+          <option name="screenY" value="1600" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="b0q" />
-+          <option name="id" value="b0q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy S22 Ultra" />
-+          <option name="screenDensity" value="600" />
-+          <option name="screenX" value="1440" />
-+          <option name="screenY" value="3088" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="32" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="bluejay" />
-+          <option name="id" value="bluejay" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 6a" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="caiman" />
-+          <option name="id" value="caiman" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 9 Pro" />
-+          <option name="screenDensity" value="360" />
-+          <option name="screenX" value="960" />
-+          <option name="screenY" value="2142" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="comet" />
-+          <option name="default" value="true" />
-+          <option name="id" value="comet" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 9 Pro Fold" />
-+          <option name="screenDensity" value="390" />
-+          <option name="screenX" value="2076" />
-+          <option name="screenY" value="2152" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="29" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="crownqlteue" />
-+          <option name="id" value="crownqlteue" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy Note9" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="2220" />
-+          <option name="screenY" value="1080" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="dm2q" />
-+          <option name="id" value="dm2q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="S23 Plus" />
-+          <option name="screenDensity" value="450" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2340" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="dm3q" />
-+          <option name="id" value="dm3q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy S23 Ultra" />
-+          <option name="screenDensity" value="600" />
-+          <option name="screenX" value="1440" />
-+          <option name="screenY" value="3088" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="e1q" />
-+          <option name="default" value="true" />
-+          <option name="id" value="e1q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy S24" />
-+          <option name="screenDensity" value="480" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2340" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="e3q" />
-+          <option name="id" value="e3q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy S24 Ultra" />
-+          <option name="screenDensity" value="450" />
-+          <option name="screenX" value="1440" />
-+          <option name="screenY" value="3120" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="eos" />
-+          <option name="id" value="eos" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Eos" />
-+          <option name="screenDensity" value="320" />
-+          <option name="screenX" value="384" />
-+          <option name="screenY" value="384" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="felix" />
-+          <option name="id" value="felix" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel Fold" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="2208" />
-+          <option name="screenY" value="1840" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="felix" />
-+          <option name="id" value="felix" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel Fold" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="2208" />
-+          <option name="screenY" value="1840" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="felix_camera" />
-+          <option name="id" value="felix_camera" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel Fold (Camera-enabled)" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="2208" />
-+          <option name="screenY" value="1840" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="motorola" />
-+          <option name="codename" value="fogona" />
-+          <option name="id" value="fogona" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Motorola" />
-+          <option name="name" value="moto g play - 2024" />
-+          <option name="screenDensity" value="280" />
-+          <option name="screenX" value="720" />
-+          <option name="screenY" value="1600" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="g0q" />
-+          <option name="id" value="g0q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="SM-S906U1" />
-+          <option name="screenDensity" value="450" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2340" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="gta9pwifi" />
-+          <option name="id" value="gta9pwifi" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="SM-X210" />
-+          <option name="screenDensity" value="240" />
-+          <option name="screenX" value="1200" />
-+          <option name="screenY" value="1920" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="gts7xllite" />
-+          <option name="id" value="gts7xllite" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="SM-T738U" />
-+          <option name="screenDensity" value="340" />
-+          <option name="screenX" value="1600" />
-+          <option name="screenY" value="2560" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="gts8uwifi" />
-+          <option name="formFactor" value="Tablet" />
-+          <option name="id" value="gts8uwifi" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy Tab S8 Ultra" />
-+          <option name="screenDensity" value="320" />
-+          <option name="screenX" value="1848" />
-+          <option name="screenY" value="2960" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="gts8wifi" />
-+          <option name="formFactor" value="Tablet" />
-+          <option name="id" value="gts8wifi" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy Tab S8" />
-+          <option name="screenDensity" value="274" />
-+          <option name="screenX" value="1600" />
-+          <option name="screenY" value="2560" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="gts9fe" />
-+          <option name="id" value="gts9fe" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy Tab S9 FE 5G" />
-+          <option name="screenDensity" value="280" />
-+          <option name="screenX" value="1440" />
-+          <option name="screenY" value="2304" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="husky" />
-+          <option name="id" value="husky" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 8 Pro" />
-+          <option name="screenDensity" value="390" />
-+          <option name="screenX" value="1008" />
-+          <option name="screenY" value="2244" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="30" />
-+          <option name="brand" value="motorola" />
-+          <option name="codename" value="java" />
-+          <option name="id" value="java" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Motorola" />
-+          <option name="name" value="G20" />
-+          <option name="screenDensity" value="280" />
-+          <option name="screenX" value="720" />
-+          <option name="screenY" value="1600" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="komodo" />
-+          <option name="id" value="komodo" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 9 Pro XL" />
-+          <option name="screenDensity" value="360" />
-+          <option name="screenX" value="1008" />
-+          <option name="screenY" value="2244" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="lynx" />
-+          <option name="id" value="lynx" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 7a" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="motorola" />
-+          <option name="codename" value="maui" />
-+          <option name="id" value="maui" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Motorola" />
-+          <option name="name" value="moto g play - 2023" />
-+          <option name="screenDensity" value="280" />
-+          <option name="screenX" value="720" />
-+          <option name="screenY" value="1600" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="o1q" />
-+          <option name="id" value="o1q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy S21" />
-+          <option name="screenDensity" value="421" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="31" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="oriole" />
-+          <option name="id" value="oriole" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 6" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="panther" />
-+          <option name="id" value="panther" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 7" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="q5q" />
-+          <option name="id" value="q5q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy Z Fold5" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1812" />
-+          <option name="screenY" value="2176" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="q6q" />
-+          <option name="id" value="q6q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy Z Fold6" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1856" />
-+          <option name="screenY" value="2160" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="30" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="r11" />
-+          <option name="formFactor" value="Wear OS" />
-+          <option name="id" value="r11" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel Watch" />
-+          <option name="screenDensity" value="320" />
-+          <option name="screenX" value="384" />
-+          <option name="screenY" value="384" />
-+          <option name="type" value="WEAR_OS" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="r11q" />
-+          <option name="id" value="r11q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="SM-S711U" />
-+          <option name="screenDensity" value="450" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2340" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="30" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="redfin" />
-+          <option name="id" value="redfin" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 5" />
-+          <option name="screenDensity" value="440" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2340" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="shiba" />
-+          <option name="id" value="shiba" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 8" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="samsung" />
-+          <option name="codename" value="t2q" />
-+          <option name="id" value="t2q" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Samsung" />
-+          <option name="name" value="Galaxy S21 Plus" />
-+          <option name="screenDensity" value="394" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2400" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="33" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="tangorpro" />
-+          <option name="formFactor" value="Tablet" />
-+          <option name="id" value="tangorpro" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel Tablet" />
-+          <option name="screenDensity" value="320" />
-+          <option name="screenX" value="1600" />
-+          <option name="screenY" value="2560" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="34" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="tokay" />
-+          <option name="default" value="true" />
-+          <option name="id" value="tokay" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 9" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2424" />
-+        </PersistentDeviceSelectionData>
-+        <PersistentDeviceSelectionData>
-+          <option name="api" value="35" />
-+          <option name="brand" value="google" />
-+          <option name="codename" value="tokay" />
-+          <option name="default" value="true" />
-+          <option name="id" value="tokay" />
-+          <option name="labId" value="google" />
-+          <option name="manufacturer" value="Google" />
-+          <option name="name" value="Pixel 9" />
-+          <option name="screenDensity" value="420" />
-+          <option name="screenX" value="1080" />
-+          <option name="screenY" value="2424" />
-+        </PersistentDeviceSelectionData>
-+      </list>
-+    </option>
-+  </component>
-+</project>
-\ No newline at end of file
-diff --git a/node_modules/expo-notifications/android/.idea/gradle.xml b/node_modules/expo-notifications/android/.idea/gradle.xml
-new file mode 100644
-index 0000000..b838237
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.idea/gradle.xml
-@@ -0,0 +1,12 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project version="4">
-+  <component name="GradleSettings">
-+    <option name="linkedExternalProjectsSettings">
-+      <GradleProjectSettings>
-+        <option name="testRunner" value="CHOOSE_PER_TEST" />
-+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-+      </GradleProjectSettings>
-+    </option>
-+  </component>
-+</project>
-\ No newline at end of file
-diff --git a/node_modules/expo-notifications/android/.idea/migrations.xml b/node_modules/expo-notifications/android/.idea/migrations.xml
-new file mode 100644
-index 0000000..f8051a6
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.idea/migrations.xml
-@@ -0,0 +1,10 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project version="4">
-+  <component name="ProjectMigrations">
-+    <option name="MigrateToGradleLocalJavaHome">
-+      <set>
-+        <option value="$PROJECT_DIR$" />
-+      </set>
-+    </option>
-+  </component>
-+</project>
-\ No newline at end of file
-diff --git a/node_modules/expo-notifications/android/.idea/misc.xml b/node_modules/expo-notifications/android/.idea/misc.xml
-new file mode 100644
-index 0000000..3040d03
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.idea/misc.xml
-@@ -0,0 +1,10 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project version="4">
-+  <component name="ExternalStorageConfigurationManager" enabled="true" />
-+  <component name="ProjectRootManager">
-+    <output url="file://$PROJECT_DIR$/build/classes" />
-+  </component>
-+  <component name="ProjectType">
-+    <option name="id" value="Android" />
-+  </component>
-+</project>
-\ No newline at end of file
-diff --git a/node_modules/expo-notifications/android/.idea/runConfigurations.xml b/node_modules/expo-notifications/android/.idea/runConfigurations.xml
-new file mode 100644
-index 0000000..16660f1
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.idea/runConfigurations.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project version="4">
-+  <component name="RunConfigurationProducerService">
-+    <option name="ignoredProducers">
-+      <set>
-+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
-+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
-+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
-+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
-+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
-+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
-+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
-+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
-+      </set>
-+    </option>
-+  </component>
-+</project>
-\ No newline at end of file
-diff --git a/node_modules/expo-notifications/android/.idea/workspace.xml b/node_modules/expo-notifications/android/.idea/workspace.xml
-new file mode 100644
-index 0000000..df26928
---- /dev/null
-+++ b/node_modules/expo-notifications/android/.idea/workspace.xml
-@@ -0,0 +1,47 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project version="4">
-+  <component name="AutoImportSettings">
-+    <option name="autoReloadType" value="NONE" />
-+  </component>
-+  <component name="ChangeListManager">
-+    <list default="true" id="fed6a9c0-2e93-4b6e-953a-d1cd1e93b59f" name="Changes" comment="" />
-+    <option name="SHOW_DIALOG" value="false" />
-+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-+    <option name="LAST_RESOLUTION" value="IGNORE" />
-+  </component>
-+  <component name="ClangdSettings">
-+    <option name="formatViaClangd" value="false" />
-+  </component>
-+  <component name="ProjectColorInfo"><![CDATA[{
-+  "associatedIndex": 4
-+}]]></component>
-+  <component name="ProjectId" id="2wCjuanPzVGKP91vdmftQVgUlaM" />
-+  <component name="ProjectViewState">
-+    <option name="hideEmptyMiddlePackages" value="true" />
-+    <option name="showLibraryContents" value="true" />
-+  </component>
-+  <component name="PropertiesComponent"><![CDATA[{
-+  "keyToString": {
-+    "RunOnceActivity.ShowReadmeOnStart": "true",
-+    "RunOnceActivity.cidr.known.project.marker": "true",
-+    "RunOnceActivity.readMode.enableVisualFormatting": "true",
-+    "android.gradle.sync.needed": "true",
-+    "cf.first.check.clang-format": "false",
-+    "cidr.known.project.marker": "true",
-+    "kotlin-language-version-configured": "true",
-+    "last_opened_file_path": "/Users/hailey/bsky/social-app/node_modules/expo-notifications/android"
-+  }
-+}]]></component>
-+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-+  <component name="TaskManager">
-+    <task active="true" id="Default" summary="Default task">
-+      <changelist id="fed6a9c0-2e93-4b6e-953a-d1cd1e93b59f" name="Changes" comment="" />
-+      <created>1745552672693</created>
-+      <option name="number" value="Default" />
-+      <option name="presentableId" value="Default" />
-+      <updated>1745552672693</updated>
-+    </task>
-+    <servers />
-+  </component>
-+</project>
-\ No newline at end of file
-diff --git a/node_modules/expo-notifications/android/build.gradle b/node_modules/expo-notifications/android/build.gradle
-index bc479ee..1ebfa00 100644
---- a/node_modules/expo-notifications/android/build.gradle
-+++ b/node_modules/expo-notifications/android/build.gradle
-@@ -42,6 +42,7 @@ dependencies {
-   implementation 'com.google.firebase:firebase-messaging:24.0.1'
- 
-   implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
-+  implementation project(':expo-background-notification-handler')
- 
-   if (project.findProject(':expo-modules-test-core')) {
-     testImplementation project(':expo-modules-test-core')
-diff --git a/node_modules/expo-notifications/android/local.properties b/node_modules/expo-notifications/android/local.properties
-new file mode 100644
-index 0000000..ab4c86d
---- /dev/null
-+++ b/node_modules/expo-notifications/android/local.properties
-@@ -0,0 +1,8 @@
-+## This file must *NOT* be checked into Version Control Systems,
-+# as it contains information specific to your local configuration.
-+#
-+# Location of the SDK. This is only used by Gradle.
-+# For customization when using a Version Control System, please read the
-+# header note.
-+#Thu Apr 24 20:44:32 PDT 2025
-+sdk.dir=/Users/hailey/Library/Android/sdk
-diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/interfaces/INotificationContent.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/interfaces/INotificationContent.kt
-index 7b99e6c..45a450d 100644
---- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/interfaces/INotificationContent.kt
-+++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/interfaces/INotificationContent.kt
-@@ -15,6 +15,7 @@ import org.json.JSONObject
-  * This interface exists to provide a common API for both classes.
-  * */
- interface INotificationContent : Parcelable {
-+  val channelId: String?
-   val title: String?
-   val text: String?
-   val subText: String?
-diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationContent.java b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationContent.java
-index 191b64e..fe8b3c5 100644
---- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationContent.java
-+++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationContent.java
-@@ -35,6 +35,7 @@ import kotlin.coroutines.Continuation;
-  * Refactoring this class may require a migration strategy for the data stored in SharedPreferences.
-  */
- public class NotificationContent implements Parcelable, Serializable, INotificationContent {
-+  private String mChannelId;
-   private String mTitle;
-   private String mText;
-   private String mSubtitle;
-@@ -65,6 +66,11 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
-     }
-   };
- 
-+  @Nullable
-+  public String getChannelId() {
-+    return mChannelId;
-+  }
-+
-   @Nullable
-   public String getTitle() {
-     return mTitle;
-@@ -158,6 +164,7 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
-   }
- 
-   protected NotificationContent(Parcel in) {
-+    mChannelId = in.readString();
-     mTitle = in.readString();
-     mText = in.readString();
-     mSubtitle = in.readString();
-@@ -183,6 +190,7 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
- 
-   @Override
-   public void writeToParcel(Parcel dest, int flags) {
-+    dest.writeString(mChannelId);
-     dest.writeString(mTitle);
-     dest.writeString(mText);
-     dest.writeString(mSubtitle);
-@@ -203,6 +211,7 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
-   private static final long serialVersionUID = 397666843266836802L;
- 
-   private void writeObject(java.io.ObjectOutputStream out) throws IOException {
-+    out.writeObject(mChannelId);
-     out.writeObject(mTitle);
-     out.writeObject(mText);
-     out.writeObject(mSubtitle);
-@@ -285,6 +294,11 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
-       useDefaultVibrationPattern();
-     }
- 
-+    public Builder setChannelId(String channelId) {
-+      content.mChannelId = channelId;
-+      return this;
-+    }
-+
-     public Builder setTitle(String title) {
-       content.mTitle = title;
-       return this;
-diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationData.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationData.kt
-index 3af254c..3c77e9d 100644
---- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationData.kt
-+++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationData.kt
-@@ -11,6 +11,9 @@ import org.json.JSONObject
- * */
- @JvmInline
- value class NotificationData(private val data: Map<String, String>) {
-+  val channelId: String?
-+    get() = data["channelId"]
-+
-   val title: String?
-     get() = data["title"]
- 
-diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/RemoteNotificationContent.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/RemoteNotificationContent.kt
-index d2cc6cf..6a48ff2 100644
---- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/RemoteNotificationContent.kt
-+++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/RemoteNotificationContent.kt
-@@ -31,6 +31,8 @@ class RemoteNotificationContent(private val remoteMessage: RemoteMessage) : INot
-     return remoteMessage.notification?.imageUrl != null
-   }
- 
-+  override val channelId = remoteMessage.notification?.channelId ?: notificationData.channelId
-+
-   override val title = remoteMessage.notification?.title ?: notificationData.title
- 
-   override val text = remoteMessage.notification?.body ?: notificationData.message
-diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt
-index 98f003f..2f745e8 100644
---- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt
-+++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt
-@@ -101,6 +101,9 @@ open class ExpoNotificationBuilder(
-     builder.setOngoing(content.isSticky)
- 
-     // see "Notification anatomy" https://developer.android.com/develop/ui/views/notifications#Templates
-+    content.channelId?.let {
-+      builder.setChannelId(it)
-+    }
-     builder.setContentTitle(content.title)
-     builder.setContentText(content.text)
-     builder.setSubText(content.subText)
-diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/service/delegates/FirebaseMessagingDelegate.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/service/delegates/FirebaseMessagingDelegate.kt
-index 90ca4ff..9d4cb09 100644
---- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/service/delegates/FirebaseMessagingDelegate.kt
-+++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/service/delegates/FirebaseMessagingDelegate.kt
-@@ -3,6 +3,9 @@ package expo.modules.notifications.service.delegates
- import android.content.Context
- import android.os.Bundle
- import com.google.firebase.messaging.RemoteMessage
-+import expo.modules.backgroundnotificationhandler.BackgroundNotificationHandler
-+import expo.modules.backgroundnotificationhandler.BackgroundNotificationHandlerInterface
-+import expo.modules.backgroundnotificationhandler.ExpoBackgroundNotificationHandlerModule
- import expo.modules.interfaces.taskManager.TaskServiceProviderHelper
- import expo.modules.notifications.notifications.RemoteMessageSerializer
- import expo.modules.notifications.notifications.background.BackgroundRemoteNotificationTaskConsumer
-@@ -18,7 +21,7 @@ import expo.modules.notifications.tokens.interfaces.FirebaseTokenListener
- import java.lang.ref.WeakReference
- import java.util.*
- 
--open class FirebaseMessagingDelegate(protected val context: Context) : FirebaseMessagingDelegate {
-+open class FirebaseMessagingDelegate(protected val context: Context) : FirebaseMessagingDelegate, BackgroundNotificationHandlerInterface{
-   companion object {
-     // Unfortunately we cannot save state between instances of a service other way
-     // than by static properties. Fortunately, using weak references we can
-@@ -105,8 +108,19 @@ open class FirebaseMessagingDelegate(protected val context: Context) : FirebaseM
-     DebugLogging.logRemoteMessage("FirebaseMessagingDelegate.onMessageReceived: message", remoteMessage)
-     val notification = createNotification(remoteMessage)
-     DebugLogging.logNotification("FirebaseMessagingDelegate.onMessageReceived: notification", notification)
--    NotificationsService.receive(context, notification)
--    runTaskManagerTasks(context.applicationContext, RemoteMessageSerializer.toBundle(remoteMessage))
-+    if (!ExpoBackgroundNotificationHandlerModule.isForegrounded) {
-+      BackgroundNotificationHandler(context, this).handleMessage(remoteMessage)
-+    } else {
-+      NotificationsService.receive(context, notification)
-+      runTaskManagerTasks(
-+        context.applicationContext,
-+        RemoteMessageSerializer.toBundle(remoteMessage)
-+      )
-+    }
-+  }
-+
-+  override fun showMessage(remoteMessage: RemoteMessage) {
-+    NotificationsService.receive(context, createNotification(remoteMessage))
-   }
- 
-   protected fun createNotification(remoteMessage: RemoteMessage): Notification {

patches/expo-notifications+0.32.16.patch

@@ -0,0 +1,170 @@
+diff --git a/node_modules/expo-notifications/android/build.gradle b/node_modules/expo-notifications/android/build.gradle
+index bc479ee..1ebfa00 100644
+--- a/node_modules/expo-notifications/android/build.gradle
++++ b/node_modules/expo-notifications/android/build.gradle
+@@ -42,6 +42,7 @@ dependencies {
+   implementation 'com.google.firebase:firebase-messaging:24.0.1'
+ 
+   implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
++  implementation project(':expo-background-notification-handler')
+ 
+   if (project.findProject(':expo-modules-test-core')) {
+     testImplementation project(':expo-modules-test-core')
+diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/interfaces/INotificationContent.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/interfaces/INotificationContent.kt
+index 7b99e6c..45a450d 100644
+--- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/interfaces/INotificationContent.kt
++++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/interfaces/INotificationContent.kt
+@@ -15,6 +15,7 @@ import org.json.JSONObject
+  * This interface exists to provide a common API for both classes.
+  * */
+ interface INotificationContent : Parcelable {
++  val channelId: String?
+   val title: String?
+   val text: String?
+   val subText: String?
+diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationContent.java b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationContent.java
+index 191b64e..fe8b3c5 100644
+--- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationContent.java
++++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationContent.java
+@@ -35,6 +35,7 @@ import kotlin.coroutines.Continuation;
+  * Refactoring this class may require a migration strategy for the data stored in SharedPreferences.
+  */
+ public class NotificationContent implements Parcelable, Serializable, INotificationContent {
++  private String mChannelId;
+   private String mTitle;
+   private String mText;
+   private String mSubtitle;
+@@ -65,6 +66,11 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
+     }
+   };
+ 
++  @Nullable
++  public String getChannelId() {
++    return mChannelId;
++  }
++
+   @Nullable
+   public String getTitle() {
+     return mTitle;
+@@ -158,6 +164,7 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
+   }
+ 
+   protected NotificationContent(Parcel in) {
++    mChannelId = in.readString();
+     mTitle = in.readString();
+     mText = in.readString();
+     mSubtitle = in.readString();
+@@ -183,6 +190,7 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
+ 
+   @Override
+   public void writeToParcel(Parcel dest, int flags) {
++    dest.writeString(mChannelId);
+     dest.writeString(mTitle);
+     dest.writeString(mText);
+     dest.writeString(mSubtitle);
+@@ -203,6 +211,7 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
+   private static final long serialVersionUID = 397666843266836802L;
+ 
+   private void writeObject(java.io.ObjectOutputStream out) throws IOException {
++    out.writeObject(mChannelId);
+     out.writeObject(mTitle);
+     out.writeObject(mText);
+     out.writeObject(mSubtitle);
+@@ -285,6 +294,11 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
+       useDefaultVibrationPattern();
+     }
+ 
++    public Builder setChannelId(String channelId) {
++      content.mChannelId = channelId;
++      return this;
++    }
++
+     public Builder setTitle(String title) {
+       content.mTitle = title;
+       return this;
+diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationData.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationData.kt
+index 3af254c..3c77e9d 100644
+--- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationData.kt
++++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/NotificationData.kt
+@@ -11,6 +11,9 @@ import org.json.JSONObject
+ * */
+ @JvmInline
+ value class NotificationData(private val data: Map<String, String>) {
++  val channelId: String?
++    get() = data["channelId"]
++
+   val title: String?
+     get() = data["title"]
+ 
+diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/RemoteNotificationContent.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/RemoteNotificationContent.kt
+index d2cc6cf..6a48ff2 100644
+--- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/RemoteNotificationContent.kt
++++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/model/RemoteNotificationContent.kt
+@@ -31,6 +31,8 @@ class RemoteNotificationContent(private val remoteMessage: RemoteMessage) : INot
+     return remoteMessage.notification?.imageUrl != null
+   }
+ 
++  override val channelId = remoteMessage.notification?.channelId ?: notificationData.channelId
++
+   override val title = remoteMessage.notification?.title ?: notificationData.title
+ 
+   override val text = remoteMessage.notification?.body ?: notificationData.message
+diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt
+index 98f003f..2f745e8 100644
+--- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt
++++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt
+@@ -101,6 +101,9 @@ open class ExpoNotificationBuilder(
+     builder.setOngoing(content.isSticky)
+ 
+     // see "Notification anatomy" https://developer.android.com/develop/ui/views/notifications#Templates
++    content.channelId?.let {
++      builder.setChannelId(it)
++    }
+     builder.setContentTitle(content.title)
+     builder.setContentText(content.text)
+     builder.setSubText(content.subText)
+diff --git a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/service/delegates/FirebaseMessagingDelegate.kt b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/service/delegates/FirebaseMessagingDelegate.kt
+index 90ca4ff..9d4cb09 100644
+--- a/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/service/delegates/FirebaseMessagingDelegate.kt
++++ b/node_modules/expo-notifications/android/src/main/java/expo/modules/notifications/service/delegates/FirebaseMessagingDelegate.kt
+@@ -3,6 +3,9 @@ package expo.modules.notifications.service.delegates
+ import android.content.Context
+ import android.os.Bundle
+ import com.google.firebase.messaging.RemoteMessage
++import expo.modules.backgroundnotificationhandler.BackgroundNotificationHandler
++import expo.modules.backgroundnotificationhandler.BackgroundNotificationHandlerInterface
++import expo.modules.backgroundnotificationhandler.ExpoBackgroundNotificationHandlerModule
+ import expo.modules.interfaces.taskManager.TaskServiceProviderHelper
+ import expo.modules.notifications.notifications.RemoteMessageSerializer
+ import expo.modules.notifications.notifications.background.BackgroundRemoteNotificationTaskConsumer
+@@ -18,7 +21,7 @@ import expo.modules.notifications.tokens.interfaces.FirebaseTokenListener
+ import java.lang.ref.WeakReference
+ import java.util.*
+ 
+-open class FirebaseMessagingDelegate(protected val context: Context) : FirebaseMessagingDelegate {
++open class FirebaseMessagingDelegate(protected val context: Context) : FirebaseMessagingDelegate, BackgroundNotificationHandlerInterface{
+   companion object {
+     // Unfortunately we cannot save state between instances of a service other way
+     // than by static properties. Fortunately, using weak references we can
+@@ -105,8 +108,19 @@ open class FirebaseMessagingDelegate(protected val context: Context) : FirebaseM
+     DebugLogging.logRemoteMessage("FirebaseMessagingDelegate.onMessageReceived: message", remoteMessage)
+     val notification = createNotification(remoteMessage)
+     DebugLogging.logNotification("FirebaseMessagingDelegate.onMessageReceived: notification", notification)
+-    NotificationsService.receive(context, notification)
+-    runTaskManagerTasks(context.applicationContext, RemoteMessageSerializer.toBundle(remoteMessage))
++    if (!ExpoBackgroundNotificationHandlerModule.isForegrounded) {
++      BackgroundNotificationHandler(context, this).handleMessage(remoteMessage)
++    } else {
++      NotificationsService.receive(context, notification)
++      runTaskManagerTasks(
++        context.applicationContext,
++        RemoteMessageSerializer.toBundle(remoteMessage)
++      )
++    }
++  }
++
++  override fun showMessage(remoteMessage: RemoteMessage) {
++    NotificationsService.receive(context, createNotification(remoteMessage))
+   }
+ 
+   protected fun createNotification(remoteMessage: RemoteMessage): Notification {

patches/react-native+0.81.5+005+fmt-compat-fix.patch

@@ -0,0 +1,16 @@
+diff --git a/node_modules/react-native/third-party-podspecs/fmt.podspec b/node_modules/react-native/third-party-podspecs/fmt.podspec
+index 2f38990..9b02e48 100644
+--- a/node_modules/react-native/third-party-podspecs/fmt.podspec
++++ b/node_modules/react-native/third-party-podspecs/fmt.podspec
+@@ -26,4 +26,11 @@ Pod::Spec.new do |spec|
+   spec.public_header_files = "include/fmt/*.h"
+   spec.header_mappings_dir = "include"
+   spec.source_files = ["include/fmt/*.h", "src/format.cc"]
++
++  # TODO: Remove after upgrading React Native past 0.83.x
++  # Fix fmt 11.0.2 consteval build error with Xcode 26.4 (facebook/react-native#55601)
++  # Fixed in RN 0.84+ which bumps fmt to a compatible version.
++  spec.prepare_command = <<~SCRIPT
++    perl -i -pe 's/^#  define FMT_USE_CONSTEVAL 1$/#  define FMT_USE_CONSTEVAL 0/' include/fmt/base.h
++  SCRIPT
+ end

plugins/withAndroidDayNightThemePlugin.js

@@ -1,27 +0,0 @@
-// Based on https://github.com/expo/expo/pull/33957
-// Could be removed once the app has been updated to Expo 53
-const {withAndroidStyles} = require('@expo/config-plugins')
-
-module.exports = function withAndroidDayNightThemePlugin(appConfig) {
-  const cleanupList = new Set([
-    'colorPrimary',
-    'android:editTextBackground',
-    'android:textColor',
-    'android:editTextStyle',
-  ])
-
-  return withAndroidStyles(appConfig, config => {
-    config.modResults.resources.style = config.modResults.resources.style
-      ?.map(style => {
-        if (style.$.name === 'AppTheme' && style.item != null) {
-          style.item = style.item.filter(item => !cleanupList.has(item.$.name))
-        }
-        return style
-      })
-      .filter(style => {
-        return style.$.name !== 'ResetEditText'
-      })
-
-    return config
-  })
-}

src/App.native.tsx

@@ -1,7 +1,7 @@
 import '#/logger/sentry/setup'
 import '#/view/icons'
 
-import React, {useEffect, useState} from 'react'
+import {Fragment, useEffect, useState} from 'react'
 import {GestureHandlerRootView} from 'react-native-gesture-handler'
 import {KeyboardProvider as KeyboardControllerProvider} from 'react-native-keyboard-controller'
 import {
@@ -11,13 +11,11 @@ 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 {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import * as Sentry from '@sentry/react-native'
 
 import {Provider as HideBottomBarBorderProvider} from '#/lib/hooks/useHideBottomBarBorder'
 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'
@@ -58,9 +56,8 @@ import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
 import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
 import {Provider as HiddenRepliesProvider} from '#/state/threadgate-hidden-replies'
 import {TestCtrls} from '#/view/com/testing/TestCtrls'
-import * as Toast from '#/view/com/util/Toast'
 import {Shell} from '#/view/shell'
-import {ThemeProvider as Alf} from '#/alf'
+import {atoms as a, ThemeProvider as Alf} from '#/alf'
 import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
 import {Provider as ContextMenuProvider} from '#/components/ContextMenu'
 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
@@ -68,6 +65,7 @@ import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialo
 import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdateOverlay'
 import {Provider as PortalProvider} from '#/components/Portal'
 import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
+import * as Toast from '#/components/Toast'
 import {ToastOutlet} from '#/components/Toast'
 import {
   prefetchAgeAssuranceConfig,
@@ -89,9 +87,9 @@ import {Splash} from '#/Splash'
 import {BottomSheetProvider} from '../modules/bottom-sheet'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
 
-SplashScreen.preventAutoHideAsync()
+void SplashScreen.preventAutoHideAsync()
 if (IS_IOS) {
-  SystemUI.setBackgroundColorAsync('black')
+  void SystemUI.setBackgroundColorAsync('black')
 }
 if (IS_ANDROID) {
   // iOS is handled by the config plugin -sfn
@@ -105,17 +103,17 @@ if (IS_ANDROID) {
 /**
  * Begin geolocation ASAP
  */
-Geo.resolve()
-prefetchAgeAssuranceConfig()
-prefetchLiveEvents()
-prefetchAppConfig()
+void Geo.resolve()
+void prefetchAgeAssuranceConfig()
+void prefetchLiveEvents()
+void prefetchAppConfig()
 
 function InnerApp() {
-  const [isReady, setIsReady] = React.useState(false)
+  const [isReady, setIsReady] = useState(false)
   const {currentAccount} = useSession()
   const {resumeSession} = useSessionApi()
   const theme = useColorModeTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const hasCheckedReferrer = useStarterPackEntry()
 
   // init
@@ -134,17 +132,16 @@ function InnerApp() {
       }
     }
     const account = readLastActiveAccount()
-    onLaunch(account)
+    void onLaunch(account)
   }, [resumeSession])
 
   useEffect(() => {
     return listenSessionDropped(() => {
-      Toast.show(
-        _(msg`Sorry! Your session expired. Please sign in again.`),
-        'info',
-      )
+      Toast.show(l`Sorry! Your session expired. Please sign in again.`, {
+        type: 'info',
+      })
     })
-  }, [_])
+  }, [l])
 
   return (
     <Alf theme={theme}>
@@ -152,7 +149,7 @@ function InnerApp() {
         <ContextMenuProvider>
           <Splash isReady={isReady && hasCheckedReferrer}>
             <VideoVolumeProvider>
-              <React.Fragment
+              <Fragment
                 // Resets the entire tree below when it changes:
                 key={currentAccount?.did}>
                 <AnalyticsFeaturesContext>
@@ -177,7 +174,7 @@ function InnerApp() {
                                                     <EmailVerificationProvider>
                                                       <HideBottomBarBorderProvider>
                                                         <GestureHandlerRootView
-                                                          style={s.h100pct}>
+                                                          style={a.h_full}>
                                                           <GlobalGestureEventsProvider>
                                                             <IntentDialogProvider>
                                                               <TranslateOnDeviceProvider>
@@ -208,7 +205,7 @@ function InnerApp() {
                     </PolicyUpdateOverlayProvider>
                   </QueryProvider>
                 </AnalyticsFeaturesContext>
-              </React.Fragment>
+              </Fragment>
             </VideoVolumeProvider>
           </Splash>
         </ContextMenuProvider>
@@ -218,11 +215,11 @@ function InnerApp() {
 }
 
 function App() {
-  const [isReady, setReady] = useState(false)
+  const [isReady, setIsReady] = useState(false)
 
-  React.useEffect(() => {
-    Promise.all([initPersistedState(), Geo.resolve(), setupDeviceId]).then(() =>
-      setReady(true),
+  useEffect(() => {
+    void Promise.all([initPersistedState(), Geo.resolve(), setupDeviceId]).then(
+      () => setIsReady(true),
     )
   }, [])
 

src/App.web.tsx

@@ -3,11 +3,12 @@ import '#/view/icons'
 import './style.css'
 
 import {Fragment, useEffect, useState} from 'react'
+import {KeyboardProvider as KeyboardControllerProvider} from 'react-native-keyboard-controller'
 import {SafeAreaProvider} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import * as Sentry from '@sentry/react-native'
 
+import {Provider as HotkeysProvider} from '#/lib/hotkeys'
 import {QueryProvider} from '#/lib/react-query'
 import {ThemeProvider} from '#/lib/ThemeContext'
 import {Provider as TranslateOnDeviceProvider} from '#/lib/translation'
@@ -47,7 +48,6 @@ import {Provider as ProgressGuideProvider} from '#/state/shell/progress-guide'
 import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
 import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
 import {Provider as HiddenRepliesProvider} from '#/state/threadgate-hidden-replies'
-import * as Toast from '#/view/com/util/Toast'
 import {Shell} from '#/view/shell/index'
 import {ThemeProvider as Alf} from '#/alf'
 import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
@@ -58,6 +58,7 @@ import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdate
 import {Provider as PortalProvider} from '#/components/Portal'
 import {Provider as ActiveVideoProvider} from '#/components/Post/Embed/VideoEmbed/ActiveVideoWebContext'
 import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
+import * as Toast from '#/components/Toast'
 import {ToastOutlet} from '#/components/Toast'
 import {
   prefetchAgeAssuranceConfig,
@@ -81,17 +82,17 @@ import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottom
 /**
  * Begin geolocation ASAP
  */
-Geo.resolve()
-prefetchAgeAssuranceConfig()
-prefetchLiveEvents()
-prefetchAppConfig()
+void Geo.resolve()
+void prefetchAgeAssuranceConfig()
+void prefetchLiveEvents()
+void prefetchAppConfig()
 
 function InnerApp() {
   const [isReady, setIsReady] = useState(false)
   const {currentAccount} = useSession()
   const {resumeSession} = useSessionApi()
   const theme = useColorModeTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const hasCheckedReferrer = useStarterPackEntry()
 
   // init
@@ -104,23 +105,22 @@ function InnerApp() {
           await features.init
         }
       } catch (e) {
-        logger.error(`session: resumeSession failed`, {message: e})
+        logger.error('session: resumeSession failed', {message: e})
       } finally {
         setIsReady(true)
       }
     }
     const account = readLastActiveAccount()
-    onLaunch(account)
+    void onLaunch(account)
   }, [resumeSession])
 
   useEffect(() => {
     return listenSessionDropped(() => {
-      Toast.show(
-        _(msg`Sorry! Your session expired. Please sign in again.`),
-        'info',
-      )
+      Toast.show(l`Sorry! Your session expired. Please sign in again.`, {
+        type: 'info',
+      })
     })
-  }, [_])
+  }, [l])
 
   return (
     <Alf theme={theme}>
@@ -156,8 +156,10 @@ function InnerApp() {
                                                           <HideBottomBarBorderProvider>
                                                             <IntentDialogProvider>
                                                               <TranslateOnDeviceProvider>
-                                                                <Shell />
-                                                                <ToastOutlet />
+                                                                <HotkeysProvider>
+                                                                  <Shell />
+                                                                  <ToastOutlet />
+                                                                </HotkeysProvider>
                                                               </TranslateOnDeviceProvider>
                                                             </IntentDialogProvider>
                                                           </HideBottomBarBorderProvider>
@@ -192,11 +194,11 @@ function InnerApp() {
 }
 
 function App() {
-  const [isReady, setReady] = useState(false)
+  const [isReady, setIsReady] = useState(false)
 
   useEffect(() => {
-    Promise.all([initPersistedState(), Geo.resolve(), setupDeviceId]).then(() =>
-      setReady(true),
+    void Promise.all([initPersistedState(), Geo.resolve(), setupDeviceId]).then(
+      () => setIsReady(true),
     )
   }, [])
 
@@ -212,29 +214,31 @@ function App() {
     <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>
+          <KeyboardControllerProvider>
+            <OnboardingProvider>
+              <AnalyticsContext>
+                <SessionProvider>
+                  <PrefsStateProvider>
+                    <I18nProvider>
+                      <ShellStateProvider>
+                        <ModalStateProvider>
+                          <DialogStateProvider>
+                            <LightboxStateProvider>
+                              <PortalProvider>
+                                <StarterPackProvider>
+                                  <InnerApp />
+                                </StarterPackProvider>
+                              </PortalProvider>
+                            </LightboxStateProvider>
+                          </DialogStateProvider>
+                        </ModalStateProvider>
+                      </ShellStateProvider>
+                    </I18nProvider>
+                  </PrefsStateProvider>
+                </SessionProvider>
+              </AnalyticsContext>
+            </OnboardingProvider>
+          </KeyboardControllerProvider>
         </A11yProvider>
       </AppConfigProvider>
     </Geo.Provider>

src/Navigation.tsx

@@ -103,6 +103,7 @@ 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'
@@ -403,6 +404,14 @@ 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}

src/Splash.tsx

@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect} from 'react'
+import {forwardRef, useCallback, useEffect, useState} from 'react'
 import {
   AccessibilityInfo,
   Image as RNImage,
@@ -29,7 +29,7 @@ const darkSplashImageUri = RNImage.resolveAssetSource(
   darkSplashImagePointer,
 ).uri
 
-export const Logo = React.forwardRef(function LogoImpl(props: SvgProps, ref) {
+export const Logo = forwardRef(function LogoImpl(props: SvgProps, ref) {
   const width = 1000
   const height = width * (67 / 64)
   return (
@@ -58,12 +58,10 @@ export function Splash(props: React.PropsWithChildren<Props>) {
   const outroLogo = useSharedValue(0)
   const outroApp = useSharedValue(0)
   const outroAppOpacity = useSharedValue(0)
-  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 [isAnimationComplete, setIsAnimationComplete] = useState(false)
+  const [isImageLoaded, setIsImageLoaded] = useState(false)
+  const [isLayoutReady, setIsLayoutReady] = useState(false)
+  const [reduceMotion, setReduceMotion] = useState<boolean | undefined>(false)
   const isReady =
     props.isReady &&
     isImageLoaded &&

src/ageAssurance/components/NoAccessScreen.tsx

@@ -12,6 +12,8 @@ import {
 import {dateDiff, useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
 import {useIsBirthdateUpdateAllowed} from '#/state/birthdate'
 import {useSessionApi} from '#/state/session'
+import {DeactivateAccountDialog} from '#/screens/Settings/components/DeactivateAccountDialog'
+import {DeleteAccountDialog} from '#/screens/Settings/components/DeleteAccountDialog'
 import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAppealDialog'
@@ -49,6 +51,8 @@ export function NoAccessScreen() {
   const {gtPhone} = useBreakpoints()
   const insets = useSafeAreaInsets()
   const birthdateControl = useDialogControl()
+  const deactivateAccountControl = useDialogControl()
+  const deleteAccountControl = useDialogControl()
   const {data} = useAgeAssuranceDataContext()
   const region = useAgeAssuranceRegionConfig()
   const isBirthdateUpdateAllowed = useIsBirthdateUpdateAllowed()
@@ -71,6 +75,7 @@ export function NoAccessScreen() {
       hasDeclaredAge,
       canUpdateBirthday,
     })
+    // TODO This can be cleaned up with useEffectEvent once we're on 19.2
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
@@ -234,18 +239,38 @@ export function NoAccessScreen() {
               </View>
             )}
 
-            <View style={[a.pt_lg, a.gap_xl]}>
+            <View style={[a.pt_lg, a.gap_xl, {maxWidth: 280}]}>
               <Logo width={120} textFill={t.atoms.text.color} />
-              <Text style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}>
+              <Text
+                style={[
+                  a.text_sm,
+                  a.italic,
+                  a.leading_snug,
+                  t.atoms.text_contrast_medium,
+                ]}>
                 <Trans>
                   To log out,{' '}
                   <SimpleInlineLinkText
                     label={_(msg`Click here to log out`)}
                     {...createStaticClick(() => {
                       onPressLogout()
-                    })}>
+                    })}
+                    style={[a.italic]}>
                     click here
                   </SimpleInlineLinkText>
+                  . Or if you’d prefer, you can{' '}
+                  <SimpleInlineLinkText
+                    label={_(msg`Click here to delete your account`)}
+                    {...createStaticClick(() => {
+                      ax.metric(
+                        'ageAssurance:noAccessScreen:openDeleteAccountDialog',
+                        {},
+                      )
+                      deleteAccountControl.open()
+                    })}
+                    style={[a.italic]}>
+                    delete your account
+                  </SimpleInlineLinkText>
                   .
                 </Trans>
               </Text>
@@ -255,6 +280,11 @@ export function NoAccessScreen() {
       </View>
 
       <BirthDateSettingsDialog control={birthdateControl} />
+      <DeactivateAccountDialog control={deactivateAccountControl} />
+      <DeleteAccountDialog
+        control={deleteAccountControl}
+        deactivateDialogControl={deactivateAccountControl}
+      />
 
       {/*
        * While this blocking overlay is up, other dialogs in the shell

src/ageAssurance/data.tsx

@@ -105,19 +105,18 @@ export function getConfigFromCache():
   )
 }
 let configPrefetchPromise: Promise<void> | undefined
-export async function prefetchConfig() {
+export function prefetchConfig() {
   if (configPrefetchPromise) {
     logger.debug(`prefetchAgeAssuranceConfig: already in progress`)
     return
   }
 
-  configPrefetchPromise = new Promise(async resolve => {
+  configPrefetchPromise = (async () => {
     await cacheHydrationPromise
     const cached = getConfigFromCache()
 
     if (cached) {
       logger.debug(`prefetchAgeAssuranceConfig: using cache`)
-      resolve()
     } else {
       try {
         logger.debug(`prefetchAgeAssuranceConfig: resolving...`)
@@ -126,15 +125,14 @@ export async function prefetchConfig() {
           configQueryKey,
           res,
         )
-      } catch (e: any) {
+      } catch (err) {
+        const e = err as Error
         logger.warn(`prefetchAgeAssuranceConfig: failed`, {
           safeMessage: e.message,
         })
-      } finally {
-        resolve()
       }
     }
-  })
+  })()
 }
 export async function refetchConfig() {
   logger.debug(`refetchConfig: fetching...`)
@@ -228,7 +226,8 @@ export async function prefetchServerState({agent}: {agent: AtpAgent}) {
     logger.debug(`prefetchServerState: resolving...`)
     const res = await networkRetry(3, () => getServerState({agent}))
     qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(qk, res)
-  } catch (e: any) {
+  } catch (err) {
+    const e = err as Error
     logger.warn(`prefetchServerState: failed`, {
       safeMessage: e.message,
     })
@@ -248,7 +247,7 @@ export async function refetchServerState({agent}: {agent: AtpAgent}) {
 export function usePatchServerState() {
   const {currentAccount} = useSession()
   return useCallback(
-    async (next: AppBskyAgeassuranceDefs.State) => {
+    (next: AppBskyAgeassuranceDefs.State) => {
       if (!currentAccount) return
       const did = currentAccount.did
       const prev = getServerStateFromCache({did})
@@ -313,7 +312,7 @@ export function useServerStateQuery() {
       // only refetch when needed
       if (isAssured || !isAArequired) return
 
-      refetch()
+      void refetch()
     })
   }, [did, refetch, isAssured])
 
@@ -409,7 +408,8 @@ export async function prefetchOtherRequiredData({agent}: {agent: AtpAgent}) {
     logger.debug(`prefetchOtherRequiredData: resolving...`)
     const res = await networkRetry(3, () => getOtherRequiredData({agent}))
     qc.setQueryData<OtherRequiredData>(qk, res)
-  } catch (e: any) {
+  } catch (err) {
+    const e = err as Error
     logger.warn(`prefetchOtherRequiredData: failed`, {
       safeMessage: e.message,
     })
@@ -418,7 +418,7 @@ export async function prefetchOtherRequiredData({agent}: {agent: AtpAgent}) {
 export function usePatchOtherRequiredData() {
   const {currentAccount} = useSession()
   return useCallback(
-    async (next: OtherRequiredData) => {
+    (next: OtherRequiredData) => {
       if (!currentAccount) return
       const did = currentAccount.did
       const prev = getOtherRequiredDataFromCache({did})

src/ageAssurance/debug.ts

@@ -57,7 +57,7 @@ export const otherRequiredData: OtherRequiredData = {
   birthdate: new Date(2000, 1, 1).toISOString(),
 }
 
-const serverStateEnabled = false
+const serverStateEnabled = false || IS_E2E
 export const serverState: AppBskyAgeassuranceGetState.OutputSchema | undefined =
   serverStateEnabled
     ? {

src/ageAssurance/index.tsx

@@ -2,8 +2,10 @@ import {createContext, useCallback, useContext, useEffect, useMemo} from 'react'
 
 import {useGetAndRegisterPushToken} from '#/lib/notifications/notifications'
 import {Provider as RedirectOverlayProvider} from '#/ageAssurance/components/RedirectOverlay'
-import {AgeAssuranceDataProvider} from '#/ageAssurance/data'
-import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
+import {
+  AgeAssuranceDataProvider,
+  useAgeAssuranceDataContext,
+} from '#/ageAssurance/data'
 import {logger} from '#/ageAssurance/logger'
 import {
   useAgeAssuranceState,
@@ -83,7 +85,7 @@ function InnerProvider({children}: {children: React.ReactNode}) {
 
   const handleAccessUpdate = useCallback(
     (s: AgeAssuranceState) => {
-      getAndRegisterPushToken({
+      void getAndRegisterPushToken({
         isAgeRestricted: s.access !== AgeAssuranceAccess.Full,
       })
     },

src/ageAssurance/state.ts

@@ -99,6 +99,7 @@ export function useOnAgeAssuranceAccessUpdate(
 
   useEffect(() => {
     if (prevAccess !== state.access) {
+      // eslint-disable-next-line react-hooks/set-state-in-effect
       setPrevAccess(state.access)
       cb(state)
       logger.debug(`useOnAgeAssuranceAccessUpdate`, {state})

src/alf/fonts.ts

@@ -77,10 +77,18 @@ export function applyFonts(style: TextStyle, fontFamily: 'system' | 'theme') {
     }
 
     /**
-     * Disable contextual alternates in Inter
+     * Disable contextual alternates and emoji overrides in Inter
      * {@link https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant}
      */
-    style.fontVariant = (style.fontVariant || []).concat('no-contextual')
+    if (IS_WEB) {
+      // @ts-expect-error - web supports 'unicode' as a valid value for fontVariant
+      style.fontVariant = (style.fontVariant || []).concat(
+        'no-contextual',
+        'unicode',
+      )
+    } else {
+      style.fontVariant = (style.fontVariant || []).concat('no-contextual')
+    }
   } else {
     // fallback families only supported on web
     if (IS_WEB) {

src/alf/index.tsx

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

src/alf/typography.tsx

@@ -1,12 +1,14 @@
 import {Children} from 'react'
-import {type TextProps as RNTextProps} from 'react-native'
-import {type StyleProp, type TextStyle} from 'react-native'
+import {
+  type StyleProp,
+  type TextProps as RNTextProps,
+  type TextStyle,
+} from 'react-native'
 import {UITextView} from 'react-native-uitextview'
 import createEmojiRegex from 'emoji-regex'
 
 import {type Alf, applyFonts, atoms, flatten} from '#/alf'
-import {IS_NATIVE} from '#/env'
-import {IS_IOS} from '#/env'
+import {IS_IOS, IS_NATIVE} from '#/env'
 
 /**
  * Ensures that `lineHeight` defaults to a relative value of `1`, or applies
@@ -107,7 +109,8 @@ export function renderChildrenWithEmoji(
   })
 }
 
-const SINGLE_EMOJI_RE = /^[\p{Emoji_Presentation}\p{Extended_Pictographic}]+$/u
+const SINGLE_EMOJI_RE =
+  /^[\p{Emoji_Presentation}\p{Extended_Pictographic}\uFE0F\u200D]+$/u
 export function isOnlyEmoji(text: string) {
   return text.length <= 15 && SINGLE_EMOJI_RE.test(text)
 }

src/alf/util/flatten.ts

@@ -1,3 +1,39 @@
-import {StyleSheet} from 'react-native'
+import {type DimensionValue, StyleSheet} from 'react-native'
 
 export const flatten = StyleSheet.flatten
+
+/**
+ * Coerce a style value to a number. Padding values are typed as
+ * `DimensionValue` (numbers, percentages, "auto", etc.) but our ALF atoms
+ * are always plain numbers. Non-numeric values are treated as 0.
+ */
+function num(v: unknown): number {
+  return typeof v === 'number' ? v : 0
+}
+
+interface PaddingStyle {
+  padding?: DimensionValue
+  paddingHorizontal?: DimensionValue
+  paddingVertical?: DimensionValue
+  paddingTop?: DimensionValue
+  paddingBottom?: DimensionValue
+  paddingLeft?: DimensionValue
+  paddingRight?: DimensionValue
+}
+
+/**
+ * Extract resolved padding values from a style object. Returns numbers for
+ * each side, resolving shorthand properties (padding → paddingVertical →
+ * paddingTop/paddingBottom, etc.). Values are expected to be numbers — any
+ * non-numeric `DimensionValue` (e.g. percentages) is treated as 0.
+ */
+export function extractPadding(style: PaddingStyle | PaddingStyle[]) {
+  const s = flatten(style as any) ?? {}
+  const base = num(s.padding)
+  return {
+    paddingTop: num(s.paddingTop) || num(s.paddingVertical) || base,
+    paddingBottom: num(s.paddingBottom) || num(s.paddingVertical) || base,
+    paddingLeft: num(s.paddingLeft) || num(s.paddingHorizontal) || base,
+    paddingRight: num(s.paddingRight) || num(s.paddingHorizontal) || base,
+  }
+}

src/alf/util/useColorModeTheme.ts

@@ -1,4 +1,4 @@
-import React from 'react'
+import {useLayoutEffect} 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()
 
-  React.useLayoutEffect(() => {
+  useLayoutEffect(() => {
     updateDocument(theme)
   }, [theme])
 

src/alf/util/useGutters.ts

@@ -1,4 +1,4 @@
-import React from 'react'
+import {useMemo} 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 React.useMemo(() => {
+  return useMemo(() => {
     return {
       paddingTop: top === 0 ? 0 : gutters[top][activeBreakpoint || 'default'],
       paddingRight:

src/analytics/features/types.ts

@@ -9,6 +9,9 @@ export enum Features {
   ImportContactsOnboardingDisable = 'import_contacts:onboarding:disable',
   ImportContactsSettingsDisable = 'import_contacts:settings:disable',
   LiveNowBetaDisable = 'live_now_beta:disable',
+  ImageUploadsHighResolution = 'image_uploads:high_resolution',
+  GroupChatsEnable = 'group_chats:enable',
+  DmsNewMessageComposerEnable = 'dms:new_message_composer:enable',
 
   AATest = 'aa-test',
 }

src/analytics/index.tsx

@@ -110,6 +110,7 @@ const Context = createContext<AnalyticsBaseContextType>({
     },
   },
 })
+Context.displayName = 'AnalyticsContext'
 
 /**
  * Ensures that deviceId is set and migrated from legacy storage. Handled on

src/analytics/metrics/types.ts

@@ -230,6 +230,9 @@ export type Events = {
 
   'composer:gif:open': {}
   'composer:gif:select': {}
+  'composer:image:edit': {
+    platform: Platform['OS']
+  }
   'composerPrompt:press': {}
   'composerPrompt:camera:press': {}
   'composerPrompt:gallery:press': {}
@@ -470,13 +473,19 @@ export type Events = {
     profileDid: string
     position?: number
   }
+  'profile:mute': {}
+  'profile:unmute': {}
+  'profile:block': {}
+  'profile:unblock': {}
   'suggestedUser:follow': {
     logContext:
       | 'Explore'
-      | 'InterstitialDiscover'
-      | 'InterstitialProfile'
-      | 'Profile'
+      | 'DiscoverInterstitial'
+      | 'ProfileInterstitial'
+      | 'ProfileHeader'
       | 'Onboarding'
+      | 'SeeMoreSuggestedUsers'
+      | 'ProgressGuide'
     location: 'Card' | 'Profile' | 'FollowAll'
     recId?: number | string
     position: number
@@ -486,9 +495,11 @@ export type Events = {
   'suggestedUser:press': {
     logContext:
       | 'Explore'
-      | 'InterstitialDiscover'
-      | 'InterstitialProfile'
+      | 'DiscoverInterstitial'
+      | 'ProfileInterstitial'
+      | 'ProfileHeader'
       | 'Onboarding'
+      | 'SeeMoreSuggestedUsers'
     recId?: number | string
     position: number
     suggestedDid: string
@@ -497,10 +508,11 @@ export type Events = {
   'suggestedUser:seen': {
     logContext:
       | 'Explore'
-      | 'InterstitialDiscover'
-      | 'InterstitialProfile'
-      | 'Profile'
+      | 'DiscoverInterstitial'
+      | 'ProfileInterstitial'
+      | 'ProfileHeader'
       | 'Onboarding'
+      | 'SeeMoreSuggestedUsers'
       | 'ProgressGuide'
     recId?: number | string
     position: number
@@ -510,13 +522,14 @@ export type Events = {
   'suggestedUser:seeMore': {
     logContext:
       | 'Explore'
-      | 'InterstitialDiscover'
-      | 'InterstitialProfile'
-      | 'Profile'
+      | 'DiscoverInterstitial'
+      | 'ProfileInterstitial'
+      | 'ProfileHeader'
       | 'Onboarding'
+    recId?: number | string
   }
   'suggestedUser:dismiss': {
-    logContext: 'InterstitialDiscover' | 'InterstitialProfile'
+    logContext: 'DiscoverInterstitial' | 'ProfileInterstitial' | 'ProfileHeader'
     recId?: number | string
     position: number
     suggestedDid: string
@@ -703,20 +716,115 @@ export type Events = {
   'reportDialog:failure': {}
 
   translate: {
-    sourceLanguages: string[]
-    targetLanguage: string
+    os: Platform['OS']
+    /**
+     * The languages the content might be in, such as the user-supplied
+     * language codes on posts. Currently only available on posts.
+     */
+    possibleSourceLanguages: string[] | undefined
+    /**
+     * This is the user's configured primary language, which is always defined.
+     */
+    expectedTargetLanguage: string
+    /**
+     * The length of the text being translated. We assume shorter texts are
+     * more likely to have inaccurate translations.
+     */
     textLength: number
+    googleTranslate: boolean
   }
   'translate:result': {
-    method: 'on-device' | 'google-translate' | 'fallback-alert'
+    success: boolean
     os: Platform['OS']
-    sourceLanguage: string | null
-    targetLanguage: string
+    /**
+     * The languages the content might be in, such as the user-supplied
+     * language codes on posts. Currently only available on posts.
+     */
+    possibleSourceLanguages: string[] | undefined
+    /**
+     * The language we expected the content to be in. This could be based on
+     * user selection or on our confidence in the detected language. This is
+     * nullable because we may not always have an expected source language.
+     */
+    expectedSourceLanguage: string | null
+    /**
+     * This is the user's configured primary language, which is always defined.
+     */
+    expectedTargetLanguage: string
+    /**
+     * The language the translation result was actually in. This is nullable
+     * because the translation could have failed, in which case we won't have a
+     * result source language.
+     */
+    resultSourceLanguage: string | null
+    /**
+     * The language the translation result was translated into. This should be
+     * the same as `expectedTargetLanguage`, but we include it for completeness
+     * and in case there are any edge cases where they differ. This is nullable
+     * because if the translation failed, we won't have a result target
+     * language.
+     */
+    resultTargetLanguage: string | null
+    /**
+     * The length of the text being translated. We assume shorter texts are
+     * more likely to have inaccurate translations.
+     */
+    textLength: number
   }
   'translate:override': {
     os: Platform['OS']
-    sourceLanguage: string
-    targetLanguage: string
+    /**
+     * The languages the content might be in, such as the user-supplied
+     * language codes on posts. Currently only available on posts.
+     */
+    possibleSourceLanguages: string[] | undefined
+    /**
+     * The language the user has indicated the content is actually in, which
+     * may be different from the expected source language if the user is
+     * overriding the auto-detected language. This is the language the user
+     * wants to translate from after overriding.
+     */
+    expectedSourceLanguage: string
+    /**
+     * This is the user's configured primary language, which is always defined.
+     */
+    expectedTargetLanguage: string
+    /**
+     * The language the translation result was actually in, which the user now
+     * wishes to override.
+     */
+    resultSourceLanguage: string
+  }
+
+  'postMenu:openMuteWordsDialog': {
+    uri: string
+    authorDid: string
+    logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
+    feedDescriptor?: string
+  }
+  'postMenu:muteAccount': {
+    uri: string
+    authorDid: string
+    logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
+    feedDescriptor?: string
+  }
+  'postMenu:unmuteAccount': {
+    uri: string
+    authorDid: string
+    logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
+    feedDescriptor?: string
+  }
+  'postMenu:blockAccount': {
+    uri: string
+    authorDid: string
+    logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
+    feedDescriptor?: string
+  }
+  'postMenu:reportPost': {
+    uri: string
+    authorDid: string
+    logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
+    feedDescriptor?: string
   }
 
   'verification:create': {}
@@ -732,6 +840,9 @@ 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': {}
@@ -809,6 +920,7 @@ export type Events = {
     canUpdateBirthday: boolean
   }
   'ageAssurance:noAccessScreen:openBirthdateDialog': {}
+  'ageAssurance:noAccessScreen:openDeleteAccountDialog': {}
 
   /*
    * Specifically for the `BlockedGeoOverlay`

src/components/AccountList.tsx

@@ -1,4 +1,4 @@
-import React, {useCallback} from 'react'
+import {Fragment, useCallback} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
@@ -16,9 +16,8 @@ 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 {useSimpleVerificationState} from '#/components/verification'
-import {VerificationCheck} from '#/components/verification/VerificationCheck'
 import {useActorStatus} from '#/features/liveNow'
 
 export function AccountList({
@@ -53,7 +52,7 @@ export function AccountList({
         t.atoms.border_contrast_low,
       ]}>
       {accounts.map(account => (
-        <React.Fragment key={account.did}>
+        <Fragment key={account.did}>
           <AccountItem
             profile={profiles?.profiles.find(p => p.did === account.did)}
             account={account}
@@ -62,7 +61,7 @@ export function AccountList({
             isPendingAccount={account.did === pendingDid}
           />
           <View style={[a.border_b, t.atoms.border_contrast_low]} />
-        </React.Fragment>
+        </Fragment>
       ))}
       <Button
         testID="chooseAddAccountBtn"
@@ -116,7 +115,6 @@ function AccountItem({
 }) {
   const t = useTheme()
   const {_} = useLingui()
-  const verification = useSimpleVerificationState({profile})
   const {isActive: live} = useActorStatus(profile)
 
   const onPress = useCallback(() => {
@@ -164,13 +162,12 @@ function AccountItem({
                   profile?.displayName || profile?.handle || account.handle,
                 )}
               </Text>
-              {verification.showBadge && (
-                <View>
-                  <VerificationCheck
-                    width={12}
-                    verifier={verification.role === 'verifier'}
-                  />
-                </View>
+              {profile && (
+                <ProfileBadges
+                  profile={profile}
+                  size="sm"
+                  style={[{marginTop: -2}]}
+                />
               )}
             </View>
             <Text

src/components/AppLanguageDropdown.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import {useCallback} from 'react'
 import {msg} from '@lingui/core/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 = React.useCallback(
+  const onChangeAppLanguage = useCallback(
     (value: string) => {
       if (!value) return
       if (sanitizedLang !== value) {

src/components/Autocomplete/Autocomplete.tsx

@@ -0,0 +1,78 @@
+import {useCallback} from 'react'
+import {View} from 'react-native'
+import {Sift, type UseSiftReturn} from '@bsky.app/sift'
+
+import {atoms as a, useTheme} from '#/alf'
+import {type AutocompleteItem} from '#/components/Autocomplete/types'
+import {useOnKeyboard} from '#/components/hooks/useOnKeyboard'
+import {Portal} from '#/components/Portal'
+import {IS_WEB} from '#/env'
+import {AutocompleteItemEmoji} from './AutocompleteItemEmoji'
+import {AutocompleteItemProfile} from './AutocompleteItemProfile'
+import {AutocompleteItemSearch} from './AutocompleteItemSearch'
+
+function renderItem(
+  item: Parameters<Parameters<typeof Sift<AutocompleteItem>>[0]['render']>[0],
+) {
+  switch (item.item.type) {
+    case 'profile':
+      return <AutocompleteItemProfile {...item} />
+    case 'emoji':
+      return <AutocompleteItemEmoji {...item} />
+    case 'search':
+      return <AutocompleteItemSearch {...item} />
+    default:
+      return <View />
+  }
+}
+
+export function Autocomplete({
+  inverted,
+  sift,
+  data,
+  render = renderItem,
+  onSelect,
+  onDismiss,
+}: {
+  inverted?: boolean
+  sift: UseSiftReturn
+  data: AutocompleteItem[]
+  render?: Parameters<typeof Sift<AutocompleteItem>>[0]['render']
+  onSelect: (item: AutocompleteItem) => void
+  onDismiss: () => void
+}) {
+  const t = useTheme()
+
+  const updatePosition = useCallback(() => {
+    sift.updatePosition()
+  }, [sift])
+
+  useOnKeyboard('keyboardDidShow', updatePosition)
+  useOnKeyboard('keyboardDidHide', updatePosition)
+
+  return (
+    <Portal>
+      <Sift
+        inverted={inverted}
+        sift={sift}
+        data={data}
+        onSelect={onSelect}
+        onDismiss={onDismiss}
+        style={[
+          a.overflow_hidden,
+          a.rounded_md,
+          a.border,
+          t.atoms.border_contrast_low,
+          t.atoms.bg,
+          a.w_full,
+          IS_WEB
+            ? {
+                maxWidth: 300,
+              }
+            : {},
+        ]}
+        render={render}
+      />
+    </Portal>
+  )
+}

src/components/Autocomplete/AutocompleteItemEmoji.tsx

@@ -0,0 +1,30 @@
+import {SiftItem} from '@bsky.app/sift'
+
+import {atoms as a, useTheme} from '#/alf'
+import {Text} from '#/components/Typography'
+import {type AutocompleteItemProps} from './types'
+
+export function AutocompleteItemEmoji({
+  active,
+  props,
+  item,
+}: AutocompleteItemProps) {
+  const t = useTheme()
+
+  if (item.type !== 'emoji') return null
+
+  return (
+    <SiftItem
+      {...props}
+      style={s => [
+        {paddingVertical: 6, paddingHorizontal: 10},
+        a.flex_row,
+        a.align_center,
+        a.gap_sm,
+        active || s.hovered || s.pressed ? [t.atoms.bg_contrast_25] : [],
+      ]}>
+      <Text style={[a.text_xl, a.leading_tight]}>{item.value}</Text>
+      <Text style={[a.text_md, a.leading_tight]}>:{item.emoji.id}:</Text>
+    </SiftItem>
+  )
+}

src/components/Autocomplete/AutocompleteItemProfile.tsx

@@ -0,0 +1,47 @@
+import {SiftItem} from '@bsky.app/sift'
+
+import {useModerationOpts} from '#/state/preferences/moderation-opts'
+import {atoms as a, useTheme} from '#/alf'
+import * as ProfileCard from '#/components/ProfileCard'
+import {type AutocompleteItemProps} from './types'
+
+export function AutocompleteItemProfile({
+  active,
+  isFirst,
+  isLast,
+  props,
+  item,
+}: AutocompleteItemProps) {
+  const t = useTheme()
+  const moderationOpts = useModerationOpts()
+
+  if (item.type !== 'profile' || !moderationOpts) return null
+
+  return (
+    <SiftItem
+      {...props}
+      style={s => [
+        a.py_sm,
+        a.px_md,
+        active || s.hovered || s.pressed ? [t.atoms.bg_contrast_25] : [],
+        isFirst && {
+          paddingTop: a.py_sm.paddingTop * 1.2,
+        },
+        isLast && {
+          paddingBottom: a.py_sm.paddingTop * 1.2,
+        },
+      ]}>
+      <ProfileCard.Header>
+        <ProfileCard.Avatar
+          disabledPreview
+          profile={item.profile}
+          moderationOpts={moderationOpts}
+        />
+        <ProfileCard.NameAndHandle
+          profile={item.profile}
+          moderationOpts={moderationOpts}
+        />
+      </ProfileCard.Header>
+    </SiftItem>
+  )
+}

src/components/Autocomplete/AutocompleteItemSearch.tsx

@@ -0,0 +1,49 @@
+import {View} from 'react-native'
+import {SiftItem} from '@bsky.app/sift'
+
+import {atoms as a, useTheme} from '#/alf'
+import {MagnifyingGlass_Stroke2_Corner0_Rounded as MagnifyingGlassIcon} from '#/components/icons/MagnifyingGlass'
+import {Text} from '#/components/Typography'
+import {type AutocompleteItemProps} from './types'
+
+export function AutocompleteItemSearch({
+  active,
+  isFirst,
+  isLast,
+  props,
+  item,
+}: AutocompleteItemProps) {
+  const t = useTheme()
+
+  if (item.type !== 'search') return null
+
+  return (
+    <SiftItem
+      {...props}
+      style={s => [
+        a.py_sm,
+        a.px_md,
+        a.flex_row,
+        a.align_center,
+        a.gap_sm,
+        active || s.hovered || s.pressed ? [t.atoms.bg_contrast_25] : [],
+        isFirst && {
+          paddingTop: a.py_sm.paddingTop * 1.2,
+        },
+        isLast && {
+          paddingBottom: a.py_sm.paddingTop * 1.2,
+        },
+      ]}>
+      <View
+        style={[
+          a.align_center,
+          {
+            width: 40,
+          },
+        ]}>
+        <MagnifyingGlassIcon fill={t.atoms.text_contrast_low.color} size="xl" />
+      </View>
+      <Text style={[a.text_md, a.leading_snug]}>{item.value}</Text>
+    </SiftItem>
+  )
+}

src/components/Autocomplete/index.tsx

@@ -0,0 +1,6 @@
+export * from './Autocomplete'
+export * from './AutocompleteItemEmoji'
+export * from './AutocompleteItemProfile'
+export * from './types'
+export * from './useAutocomplete'
+export * from './util'

src/components/Autocomplete/types.ts

@@ -0,0 +1,48 @@
+import {type Sift} from '@bsky.app/sift'
+import {type Emoji} from '@emoji-mart/data'
+
+import type * as bsky from '#/types/bsky'
+
+export type AutocompleteProfile = {
+  key: string
+  type: 'profile'
+  value: string
+  profile: bsky.profile.AnyProfileView
+}
+
+export type AutocompleteTag = {
+  key: string
+  type: 'tag'
+  value: string
+  tag: string
+}
+
+export type AutocompleteEmoji = {
+  key: string
+  type: 'emoji'
+  value: string
+  emoji: Emoji
+}
+
+export type AutocompleteSearch = {
+  key: string
+  type: 'search'
+  value: string
+}
+
+export type AutocompleteItem =
+  | AutocompleteProfile
+  | AutocompleteTag
+  | AutocompleteEmoji
+  | AutocompleteSearch
+
+export type AutocompleteItemType = AutocompleteItem['type']
+
+export type AutocompleteItemProps = Parameters<
+  Parameters<typeof Sift<AutocompleteItem>>[0]['render']
+>[0]
+
+export type AutocompleteApi = {
+  query: string
+  items: AutocompleteItem[]
+}

src/components/Autocomplete/useAutocomplete/index.ts

@@ -0,0 +1,135 @@
+import {useCallback} from 'react'
+import {moderateProfile, type ModerationOpts} from '@atproto/api'
+import {keepPreviousData, useQuery} from '@tanstack/react-query'
+
+import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
+import {useModerationOpts} from '#/state/preferences/moderation-opts'
+import {STALE} from '#/state/queries'
+import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences'
+import {useAgent} from '#/state/session'
+import {
+  type AutocompleteApi,
+  type AutocompleteItem,
+  type AutocompleteItemType,
+  type AutocompleteProfile,
+} from '#/components/Autocomplete/types'
+import {useEmojiSearch} from './useEmojiSearch'
+
+const DEFAULT_MOD_OPTS = {
+  userDid: undefined,
+  prefs: DEFAULT_LOGGED_OUT_PREFERENCES.moderationPrefs,
+}
+
+export function useAutocomplete({
+  type,
+  query: q,
+  limit,
+  showSearchFallback = false,
+}: {
+  type: AutocompleteItemType
+  query: string
+  limit?: number
+  showSearchFallback?: boolean
+}): AutocompleteApi {
+  const agent = useAgent()
+  const moderationOpts = useModerationOpts()
+  const emojiSearch = useEmojiSearch()
+
+  const query = useQuery({
+    staleTime: STALE.MINUTES.ONE,
+    queryKey: [
+      'autocomplete',
+      {
+        type,
+        query: q,
+      },
+    ],
+    async queryFn() {
+      if (type === 'profile') {
+        // TODO return recents
+        if (!q) return []
+
+        // Going from "foo" to "foo." should not clear matches.
+        q = q.toLowerCase().trim().replace(/\.$/, '')
+
+        const res = await agent.searchActorsTypeahead({
+          q,
+          limit: limit || 8,
+        })
+
+        return (res?.data.actors || []).map(profile => ({
+          key: profile.did,
+          type: 'profile' as const,
+          value: '@' + profile.handle,
+          profile,
+        }))
+      } else if (type === 'emoji') {
+        return emojiSearch(q, limit || 8)
+      }
+
+      return []
+    },
+    select: useCallback(
+      (items: AutocompleteItem[]) => {
+        const seen = new Set<string>()
+        let results: AutocompleteItem[] = []
+
+        for (const item of items) {
+          if (seen.has(item.key)) continue
+          seen.add(item.key)
+
+          if (item.type === 'profile') {
+            const moderated = moderateProfileItem({
+              query: q,
+              item,
+              moderationOpts: moderationOpts || DEFAULT_MOD_OPTS,
+            })
+            if (moderated) results.push(moderated)
+          } else {
+            results.push(item)
+          }
+        }
+
+        if (showSearchFallback && q) {
+          results.unshift({
+            key: `search-${q}`,
+            type: 'search' as const,
+            value: q,
+          })
+        }
+
+        return results
+      },
+      [q, showSearchFallback, moderationOpts],
+    ),
+    placeholderData: keepPreviousData,
+  })
+
+  return {
+    query: q,
+    items: query.data || [],
+  }
+}
+
+function moderateProfileItem({
+  query,
+  item,
+  moderationOpts,
+}: {
+  query: string
+  item: AutocompleteProfile
+  moderationOpts: ModerationOpts
+}) {
+  const modui = moderateProfile(item.profile, moderationOpts).ui('profileList')
+  const isExactMatch = query && item.profile.handle.toLowerCase() === query
+
+  if (
+    (isExactMatch && !moduiContainsHideableOffense(modui)) ||
+    !modui.filter ||
+    isJustAMute(modui)
+  ) {
+    return item
+  }
+
+  return null
+}

src/components/Autocomplete/useAutocomplete/useEmojiSearch.ts

@@ -0,0 +1,40 @@
+import {useCallback} from 'react'
+import {type Emoji} from '@emoji-mart/data'
+import Fuse from 'fuse.js'
+
+import {useGetEmojis} from '#/lib/useGetEmojis'
+import {type AutocompleteEmoji} from '#/components/Autocomplete/types'
+
+/*
+ * Lazily loaded Fuse instance for emoji search. Built once on first search,
+ * then reused for all subsequent searches.
+ */
+let emojiFuseInstance: Fuse<Emoji> | null = null
+
+export function useEmojiSearch(): (
+  query: string,
+  limit?: number,
+) => Promise<AutocompleteEmoji[]> {
+  const getEmojis = useGetEmojis()
+
+  return useCallback(
+    async (query: string, limit: number = 8) => {
+      if (!emojiFuseInstance) {
+        const data = await getEmojis()
+        emojiFuseInstance = new Fuse(Object.values(data.emojis), {
+          keys: ['search'],
+          threshold: 0.3,
+        })
+      }
+
+      const results = emojiFuseInstance.search(query, {limit})
+      return results.map(result => ({
+        key: result.item.id,
+        type: 'emoji' as const,
+        value: result.item.skins[0].native,
+        emoji: result.item,
+      }))
+    },
+    [getEmojis],
+  )
+}

src/components/Autocomplete/util.ts

@@ -0,0 +1,12 @@
+export function parseAutocompleteItemType(type: string) {
+  switch (type) {
+    case 'mention':
+      return 'profile'
+    case 'tag':
+      return 'tag'
+    case 'emoji':
+      return 'emoji'
+    default:
+      throw new Error(`Unknown autocomplete item type: ${type}`)
+  }
+}

src/components/BotAccountAlert.tsx

@@ -0,0 +1,79 @@
+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

@@ -0,0 +1,92 @@
+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,4 +1,11 @@
-import React from 'react'
+import {
+  createContext,
+  forwardRef,
+  useCallback,
+  useContext,
+  useMemo,
+  useState,
+} from 'react'
 import {
   type AccessibilityProps,
   type GestureResponderEvent,
@@ -108,7 +115,7 @@ export type ButtonProps = Pick<
 export type ButtonTextProps = TextProps &
   VariantProps & {disabled?: boolean; emoji?: boolean}
 
-const Context = React.createContext<VariantProps & ButtonState>({
+const Context = createContext<VariantProps & ButtonState>({
   hovered: false,
   focused: false,
   pressed: false,
@@ -117,10 +124,10 @@ const Context = React.createContext<VariantProps & ButtonState>({
 Context.displayName = 'ButtonContext'
 
 export function useButtonContext() {
-  return React.useContext(Context)
+  return useContext(Context)
 }
 
-export const Button = React.forwardRef<View, ButtonProps>(
+export const Button = forwardRef<View, ButtonProps>(
   (
     {
       children,
@@ -153,13 +160,13 @@ export const Button = React.forwardRef<View, ButtonProps>(
     }
 
     const t = useTheme()
-    const [state, setState] = React.useState({
+    const [state, setState] = useState({
       pressed: false,
       hovered: false,
       focused: false,
     })
 
-    const onPressIn = React.useCallback(
+    const onPressIn = useCallback(
       (e: GestureResponderEvent) => {
         setState(s => ({
           ...s,
@@ -169,7 +176,7 @@ export const Button = React.forwardRef<View, ButtonProps>(
       },
       [setState, onPressInOuter],
     )
-    const onPressOut = React.useCallback(
+    const onPressOut = useCallback(
       (e: GestureResponderEvent) => {
         setState(s => ({
           ...s,
@@ -179,7 +186,7 @@ export const Button = React.forwardRef<View, ButtonProps>(
       },
       [setState, onPressOutOuter],
     )
-    const onHoverIn = React.useCallback(
+    const onHoverIn = useCallback(
       (e: MouseEvent) => {
         setState(s => ({
           ...s,
@@ -189,7 +196,7 @@ export const Button = React.forwardRef<View, ButtonProps>(
       },
       [setState, onHoverInOuter],
     )
-    const onHoverOut = React.useCallback(
+    const onHoverOut = useCallback(
       (e: MouseEvent) => {
         setState(s => ({
           ...s,
@@ -199,7 +206,7 @@ export const Button = React.forwardRef<View, ButtonProps>(
       },
       [setState, onHoverOutOuter],
     )
-    const onFocus = React.useCallback(
+    const onFocus = useCallback(
       (e: NativeSyntheticEvent<TargetedEvent>) => {
         setState(s => ({
           ...s,
@@ -209,7 +216,7 @@ export const Button = React.forwardRef<View, ButtonProps>(
       },
       [setState, onFocusOuter],
     )
-    const onBlur = React.useCallback(
+    const onBlur = useCallback(
       (e: NativeSyntheticEvent<TargetedEvent>) => {
         setState(s => ({
           ...s,
@@ -220,7 +227,7 @@ export const Button = React.forwardRef<View, ButtonProps>(
       [setState, onBlurOuter],
     )
 
-    const {baseStyles, hoverStyles} = React.useMemo(() => {
+    const {baseStyles, hoverStyles} = useMemo(() => {
       const baseStyles: ViewStyle[] = []
       const hoverStyles: ViewStyle[] = []
 
@@ -526,7 +533,7 @@ export const Button = React.forwardRef<View, ButtonProps>(
       }
     }, [t, variant, color, size, shape, disabled])
 
-    const context = React.useMemo<ButtonContext>(
+    const context = useMemo<ButtonContext>(
       () => ({
         ...state,
         variant,
@@ -581,7 +588,7 @@ Button.displayName = 'Button'
 export function useSharedButtonTextStyles() {
   const t = useTheme()
   const {color, variant, disabled, size} = useButtonContext()
-  return React.useMemo(() => {
+  return useMemo(() => {
     const baseStyles: TextStyle[] = []
 
     /*
@@ -778,67 +785,66 @@ export function ButtonIcon({
 }) {
   const {size: buttonSize, shape: buttonShape} = useButtonContext()
   const textStyles = useSharedButtonTextStyles()
-  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
-        >)
+  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
+      >)
 
-      /*
-       * 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,
+    /*
+     * 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,
       }[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,
-        }[buttonSize || 'small']
-      }
-
-      return {
-        iconSize,
-        iconContainerSize,
-        iconNegativeMargin,
-      }
-    }, [buttonSize, buttonShape, size])
+    return {
+      iconSize,
+      iconContainerSize,
+      iconNegativeMargin,
+    }
+  }, [buttonSize, buttonShape, size])
 
   return (
     <View