Add gate debug code

[APP-1934] replace image grid layout with carousel (#10157 )
Co-authored-by: RetroSunstar <57507616+RetroSunstar@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Eric Bailey <git@esb.lol>
2026-04-15 20:34:14 -05:00 · 2026-04-15 17:53:01 -05:00 · 2026-04-15 12:15:45 -07:00 · 2026-04-15 11:00:34 -07:00 · 2026-04-15 10:11:09 -07:00 · 2026-04-15 10:05:22 -07:00
332 changed files with 28574 additions and 18061 deletions
@@ -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
@@ -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
@@ -431,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
@@ -450,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({
@@ -459,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)) {
@@ -473,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`):
@@ -491,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
@@ -504,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
@@ -1,4 +1,4 @@
-FROM golang:1.25-bookworm AS build-env
+FROM golang:1.26-bookworm AS build-env

 WORKDIR /usr/src/social-app

@@ -1,4 +1,4 @@
-FROM golang:1.25-bookworm AS build-env
+FROM golang:1.26-bookworm AS build-env

 WORKDIR /usr/src/social-app

@@ -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.',
@@ -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',
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10a10 10 0 0 1-4.136-.893l-4.68.876A1 1 0 0 1 2.02 20.8l.93-4.537A10 10 0 0 1 2 12C2 6.477 6.477 2 12 2Zm0 2a8 8 0 0 0-7.111 11.668 1 1 0 0 1 .09.66l-.7 3.415 3.537-.662c.214-.04.435-.009.63.088A8 8 0 1 0 12 4Zm0 4a1 1 0 0 1 1 1v2h2a1 1 0 1 1 0 2h-2v2a1 1 0 1 1-2 0v-2H9a1 1 0 1 1 0-2h2V9a1 1 0 0 1 1-1Z"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M10.655 3.718c.55-1.116 2.14-1.116 2.69 0l7.548 15.317c.578 1.172-.515 2.471-1.768 2.103L13 19.336V15a1 1 0 0 0-2 0v4.336l-6.124 1.802c-1.254.369-2.346-.93-1.769-2.103l7.548-15.317Z"/></svg>
@@ -1,10 +1,10 @@
-<svg width="105" height="32" viewBox="0 0 105 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19.7901 9.77492C21.7947 11.2889 23.9508 14.3587 24.7425 16.0059C25.5342 14.3587 27.6903 11.2889 29.6949 9.77492C31.1413 8.68251 33.485 7.83725 33.485 10.5269C33.485 11.064 33.1789 15.0393 32.9993 15.6848C32.3752 17.9285 30.1009 18.5008 28.0778 18.1544C31.6141 18.7598 32.5136 20.7653 30.5709 22.7708C26.1996 27.2831 24.7425 20.3569 24.7425 20.3569C24.7425 20.3569 23.2854 27.2831 18.9142 22.7708C16.9714 20.7653 17.871 18.7598 21.4072 18.1544C19.3841 18.5008 17.1099 17.9285 16.4857 15.6848C16.3061 15.0393 16 11.064 16 10.5269C16 7.83725 18.3437 8.68251 19.7901 9.77492Z" fill="white"/>
-<path d="M44.3863 16.3646C45.5901 16.7932 46.2292 17.7837 46.2292 18.8924C46.2292 20.7698 44.9659 21.908 42.5434 21.908H37.5942V11.3828H42.3799C44.6835 11.3828 45.7982 12.5506 45.7982 14.1028C45.7982 15.1376 45.3226 15.8915 44.3863 16.3646ZM42.2313 13.0237H39.6006V15.7732H42.2313C43.2568 15.7732 43.8067 15.2411 43.8067 14.3541C43.8067 13.5411 43.2419 13.0237 42.2313 13.0237ZM39.6006 20.2524H42.4393C43.5689 20.2524 44.1782 19.735 44.1782 18.8037C44.1782 17.828 43.5986 17.3402 42.4393 17.3402H39.6006V20.2524Z" fill="white"/>
-<path d="M49.0111 21.908H47.1385V11.3828H49.0111V21.908Z" fill="white"/>
-<path d="M55.2202 18.5524V14.2802H57.0929V21.908H55.2797V20.7993C54.7 21.6567 53.8975 22.0854 52.872 22.0854C51.252 22.0854 50.1968 21.1098 50.1968 19.3359V14.2802H52.0694V19.0254C52.0694 19.9863 52.545 20.4741 53.5111 20.4741C54.4177 20.4741 55.2202 19.8089 55.2202 18.5524Z" fill="white"/>
-<path d="M65.6167 18.2272V18.6706H59.8799C60.0137 19.9863 60.7419 20.6367 61.8714 20.6367C62.7334 20.6367 63.3131 20.2672 63.6252 19.5428H65.4235C65.0222 21.095 63.6846 22.0854 61.8566 22.0854C60.7122 22.0854 59.7907 21.7159 59.0922 20.9915C58.3937 20.2672 58.037 19.3063 58.037 18.0941C58.037 16.8967 58.3788 15.9359 59.0773 15.1967C59.7759 14.4724 60.6825 14.1028 61.8269 14.1028C62.9861 14.1028 63.9076 14.4872 64.5912 15.2411C65.2749 15.995 65.6167 17.0002 65.6167 18.2272ZM61.812 15.5515C60.7865 15.5515 60.0731 16.1428 59.8948 17.3698H63.7441C63.5806 16.2611 62.8969 15.5515 61.812 15.5515Z" fill="white"/>
-<path d="M69.7673 22.115C67.5379 22.115 66.3638 21.2428 66.2598 19.4837H68.0878C68.1918 20.4298 68.6674 20.7846 69.797 20.7846C70.8076 20.7846 71.3129 20.4741 71.3129 19.868C71.3129 19.3211 70.9562 19.055 69.8118 18.8628L68.935 18.715C67.2555 18.4341 66.4232 17.6654 66.4232 16.4089C66.4232 14.975 67.5676 14.1028 69.6038 14.1028C71.7885 14.1028 72.9181 14.9602 72.9924 16.6898H71.2238C71.1792 15.7585 70.6293 15.4332 69.6038 15.4332C68.712 15.4332 68.2662 15.7289 68.2662 16.3202C68.2662 16.8524 68.6526 17.0889 69.5443 17.2515L70.5104 17.3993C72.3681 17.7393 73.1707 18.4193 73.1707 19.7202C73.1707 21.2576 71.9223 22.115 69.7673 22.115Z" fill="white"/>
-<path d="M81.3899 21.908H79.2497L77.0204 18.3602L75.8611 19.5132V21.908H74.0182V11.3828H75.8611V17.4437L78.9822 14.2802H81.2116L78.3134 17.1628L81.3899 21.908Z" fill="white"/>
-<path d="M86.2805 16.2019L86.9047 14.2802H88.8665L85.909 22.5289C85.5968 23.3715 85.2104 23.9776 84.72 24.3176C84.2295 24.6576 83.531 24.8202 82.6095 24.8202C82.2974 24.8202 82.0299 24.8054 81.7921 24.7759V23.3124H82.5055C83.3526 23.3124 83.7688 22.795 83.7688 22.0854C83.7688 21.7306 83.6499 21.2132 83.4121 20.548L81.1827 14.2802H83.204L83.8282 16.1872C84.289 17.6211 84.6902 19.0402 85.0469 20.4446C85.3739 19.2324 85.7901 17.8132 86.2805 16.2019Z" fill="white"/>
+<svg width="120" height="28" viewBox="0 0 120 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.23031 1.75921C9.52558 4.31406 13.0698 9.49434 14.3713 12.2741C15.6727 9.49434 19.2169 4.31406 22.5122 1.75921C24.8899 -0.0842317 28.7425 -1.5106 28.7425 3.02818C28.7425 3.93462 28.2393 10.6429 27.9441 11.7321C26.9181 15.5183 23.1796 16.4841 19.8539 15.8995C25.667 16.9212 27.1457 20.3055 23.9521 23.6897C16.7665 31.3043 14.3713 19.6163 14.3713 19.6163C14.3713 19.6163 11.976 31.3043 4.79042 23.6897C1.59681 20.3055 3.07554 16.9212 8.88858 15.8995C5.56292 16.4841 1.82441 15.5183 0.798403 11.7321C0.503259 10.6429 0 3.93462 0 3.02818C0 -1.5106 3.85263 -0.0842317 6.23031 1.75921Z" fill="#006AFF"/>
+<path d="M46.662 12.8778C48.641 13.6012 49.6915 15.2726 49.6915 17.1435C49.6915 20.3116 47.6149 22.2324 43.6326 22.2324H35.497V4.47113H43.3638C47.1507 4.47113 48.983 6.44184 48.983 9.06113C48.983 10.8073 48.2012 12.0796 46.662 12.8778ZM43.1195 7.2401H38.7952V11.88H43.1195C44.8053 11.88 45.7092 10.9819 45.7092 9.48521C45.7092 8.1132 44.7808 7.2401 43.1195 7.2401ZM38.7952 19.4385H43.4616C45.3183 19.4385 46.32 18.5654 46.32 16.9938C46.32 15.3474 45.3672 14.5242 43.4616 14.5242H38.7952V19.4385Z" fill="#006AFF"/>
+<path d="M54.2645 22.2324H51.1862V4.47113H54.2645V22.2324Z" fill="#006AFF"/>
+<path d="M64.4712 16.5698V9.36048H67.5495V22.2324H64.5689V20.3615C63.6161 21.8084 62.2968 22.5318 60.6111 22.5318C57.9481 22.5318 56.2135 20.8854 56.2135 17.8919V9.36048H59.2918V17.368C59.2918 18.9895 60.0736 19.8127 61.6616 19.8127C63.1519 19.8127 64.4712 18.6902 64.4712 16.5698Z" fill="#006AFF"/>
+<path d="M81.5614 16.021V16.7693H72.131C72.3508 18.9895 73.548 20.0871 75.4047 20.0871C76.8217 20.0871 77.7746 19.4635 78.2876 18.2411H81.2438C80.5841 20.8604 78.3853 22.5318 75.3803 22.5318C73.4991 22.5318 71.9844 21.9081 70.8361 20.6858C69.6878 19.4635 69.1015 17.842 69.1015 15.7965C69.1015 13.7759 69.6634 12.1544 70.8117 10.9071C71.9599 9.68477 73.4502 9.06113 75.3314 9.06113C77.2371 9.06113 78.7518 9.70972 79.8756 10.9819C80.9995 12.2542 81.5614 13.9505 81.5614 16.021ZM75.307 11.5058C73.6213 11.5058 72.4486 12.5036 72.1554 14.5741H78.4831C78.2143 12.7032 77.0905 11.5058 75.307 11.5058Z" fill="#006AFF"/>
+<path d="M88.3842 22.5817C84.7195 22.5817 82.7894 21.1099 82.6184 18.1413H85.6234C85.7944 19.7379 86.5762 20.3366 88.433 20.3366C90.0943 20.3366 90.925 19.8127 90.925 18.7899C90.925 17.8669 90.3386 17.4179 88.4574 17.0936L87.016 16.8442C84.2553 16.3702 82.8871 15.073 82.8871 12.9527C82.8871 10.5329 84.7683 9.06113 88.1154 9.06113C91.7068 9.06113 93.5636 10.508 93.6857 13.4266H90.7784C90.7051 11.855 89.8012 11.3062 88.1154 11.3062C86.6495 11.3062 85.9166 11.8052 85.9166 12.803C85.9166 13.701 86.5518 14.1002 88.0177 14.3746L89.6057 14.624C92.6596 15.1978 93.9789 16.3453 93.9789 18.5405C93.9789 21.1348 91.9267 22.5817 88.3842 22.5817Z" fill="#006AFF"/>
+<path d="M107.49 22.2324H103.972L100.307 16.2455L98.4015 18.1912V22.2324H95.372V4.47113H98.4015V14.6988L103.532 9.36048H107.197L102.433 14.2249L107.49 22.2324Z" fill="#006AFF"/>
+<path d="M115.529 12.6034L116.555 9.36048H119.78L114.918 23.2802C114.405 24.7021 113.77 25.7248 112.964 26.2986C112.158 26.8723 111.009 27.1467 109.495 27.1467C108.982 27.1467 108.542 27.1218 108.151 27.0719V24.6023H109.324C110.716 24.6023 111.4 23.7292 111.4 22.5318C111.4 21.9331 111.205 21.06 110.814 19.9374L107.149 9.36048H110.472L111.498 12.5785C112.255 14.9982 112.915 17.393 113.501 19.7628C114.039 17.7173 114.723 15.3225 115.529 12.6034Z" fill="#006AFF"/>
 </svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#fff" d="M6.514 2.143A1 1 0 0 0 5 3v18a1 1 0 0 0 1.514.858l15-9a1 1 0 0 0 0-1.716l-15-9Z"/></svg>
@@ -9,7 +9,11 @@ export function applyTheme(theme: 'light' | 'dark') {
  document.documentElement.classList.add(theme)
 }

-export function initSystemColorMode() {
+export function initSystemColorMode({additionalBodyClasses = ''} = {}) {
+  if (additionalBodyClasses) {
+    document.body.classList.add(additionalBodyClasses)
+  }
+
  applyTheme(
    window.matchMedia('(prefers-color-scheme: dark)').matches
      ? 'dark'
@@ -20,7 +20,7 @@ export function Container({
        if (!entry) return

        let {height} = entry.contentRect
-        height += 2 // border top and bottom
+        height += 4 // border-2 = 2px top + 2px bottom
        if (height !== prevHeight.current) {
          prevHeight.current = height
          window.parent.postMessage(
@@ -37,7 +37,7 @@ export function Container({
  return (
    <div
      ref={ref}
-      className="w-full bg-brand text-black dark:bg-brand relative transition-colors max-w-[600px] min-w-[300px] flex items-center  dark:text-slate-200 rounded-[20px] cursor-pointer hover:bg-opacity-90"
+      className="w-full border-2 border-brand text-black relative transition-colors max-w-[600px] min-w-[300px] flex items-center dark:text-slate-200 rounded-[32px] overflow-hidden cursor-pointer"
      onClick={() => {
        if (ref.current && href) {
          // forwardRef requires preact/compat - let's keep it simple
@@ -49,9 +49,7 @@ export function Container({
        }
      }}>
      {href && <Link href={href} />}
-      <div className="flex-1 px-[6px] pt-[6px] pb-2.5 max-w-full">
-        {children}
-      </div>
+      <div className="flex-1 max-w-full">{children}</div>
    </div>
  )
 }
@@ -14,8 +14,9 @@ import {ComponentChildren, h} from 'preact'
 import {useMemo} from 'preact/hooks'

 import infoIcon from '../../assets/circleInfo_stroke2_corner0_rounded.svg'
-import playIcon from '../../assets/play_filled_corner2_rounded.svg'
+import playIcon from '../../assets/play_filled_corner0_rounded.svg'
 import starterPackIcon from '../../assets/starterPack.svg'
+import {Globe} from '../icons/Globe'
 import {CONTENT_LABELS, labelsToInfo} from '../labels'
 import * as bsky from '../types/bsky'
 import {getRkey} from '../util/rkey'
@@ -93,7 +94,7 @@ export function Embed({
                />
              </div>
              <div className="flex flex-1 items-center shrink min-w-0 min-h-0">
-                <p className="block text-sm shrink-0 font-bold max-w-[70%] line-clamp-1">
+                <p className="text-sm shrink-0 font-semibold max-w-[70%] truncate">
                  {record.author.displayName?.trim() || record.author.handle}
                </p>
                {verification.isVerified && (
@@ -103,7 +104,7 @@ export function Embed({
                    size={12}
                  />
                )}
-                <p className="block line-clamp-1 text-sm text-textLight dark:text-textDimmed shrink-[10] ml-1">
+                <p className="text-sm text-textLight dark:text-textDimmed min-w-0 truncate ml-1">
                  @{record.author.handle}
                </p>
              </div>
@@ -334,13 +335,18 @@ function ExternalEmbed({
        />
      )}
      <div className="py-3 px-4">
-        <p className="text-sm text-textLight dark:text-textDimmed line-clamp-1">
-          {toNiceDomain(content.external.uri)}
+        <p className="font-semibold leading-tight line-clamp-3">
+          {content.external.title}
        </p>
-        <p className="font-semibold line-clamp-3">{content.external.title}</p>
-        <p className="text-sm text-textLight dark:text-textDimmed line-clamp-2 mt-0.5">
+        <p className="text-sm leading-snug text-textLight dark:text-textDimmed line-clamp-2 mt-0.5">
          {content.external.description}
        </p>
+        <div className="flex flex-row items-center gap-1 border-t dark:border-slate-600 mt-1 pt-1.5">
+          <Globe size={12} className="text-textLight dark:text-textDimmed" />
+          <p className="text-sm leading-none text-textLight dark:text-textDimmed line-clamp-1">
+            {toNiceDomain(content.external.uri)}
+          </p>
+        </div>
      </div>
    </Link>
  )
@@ -374,7 +380,7 @@ function GenericWithImageEmbed({
          <div className="w-8 h-8 rounded-md bg-brand shrink-0" />
        )}
        <div className="flex-1">
-          <p className="font-bold text-sm">{title}</p>
+          <p className="font-semibold text-sm">{title}</p>
          <p className="text-textLight dark:text-textDimmed text-sm">
            {subtitle}
          </p>
@@ -389,7 +395,6 @@ function GenericWithImageEmbed({
  )
 }

-// just the thumbnail and a play button
 function VideoEmbed({content}: {content: AppBskyEmbedVideo.View}) {
  let aspectRatio = 1

@@ -398,6 +403,28 @@ function VideoEmbed({content}: {content: AppBskyEmbedVideo.View}) {
    aspectRatio = clamp(width / height, 1 / 1, 3 / 1)
  }

+  const supportsHls = useMemo(() => {
+    const video = document.createElement('video')
+    return video.canPlayType('application/vnd.apple.mpegurl') !== ''
+  }, [])
+
+  if (supportsHls) {
+    return (
+      <video
+        src={content.playlist}
+        poster={content.thumbnail}
+        controls
+        playsinline
+        preload="metadata"
+        loading="lazy"
+        aria-label={content.alt || undefined}
+        onClickCapture={evt => evt.stopPropagation()}
+        className="w-full rounded-xl bg-black"
+        style={{aspectRatio: `${aspectRatio} / 1`}}
+      />
+    )
+  }
+
  return (
    <div
      className="w-full overflow-hidden rounded-xl aspect-square relative"
@@ -53,7 +53,7 @@ export function Post({thread}: Props) {
  return (
    <Container href={href}>
      <div
-        className="flex-1 flex-col flex gap-2 bg-neutral-50 dark:bg-black dark:hover:bg-slate-900 hover:bg-blue-50  rounded-[14px] p-4"
+        className="flex-1 flex-col flex gap-4 bg-white dark:bg-black hover:bg-brandHover dark:hover:bg-brandHoverDark rounded-[30px] p-5"
        lang={record?.langs?.[0]}>
        <div className="flex gap-2.5 items-center cursor-pointer w-full max-w-full ">
          <Link
@@ -70,7 +70,7 @@ export function Post({thread}: Props) {
            <div className="flex flex-1 items-center">
              <Link
                href={`/profile/${post.author.did}`}
-                className="block font-bold text-[17px] leading-5 line-clamp-1 hover:underline underline-offset-2 text-ellipsis decoration-2">
+                className="block font-semibold text-[15px] min-[400px]:text-[17px] leading-5 line-clamp-1 hover:underline underline-offset-2 text-ellipsis decoration-2">
                {post.author.displayName?.trim() || post.author.handle}
              </Link>
              {verification.isVerified && (
@@ -87,72 +87,68 @@ export function Post({thread}: Props) {
                />
              )}
            </div>
-            <Link
-              href={`/profile/${post.author.did}`}
-              className="block text-[15px] text-textLight dark:text-textDimmed hover:underline line-clamp-1">
-              @{post.author.handle}
-            </Link>
+            <div className="flex items-center gap-1 text-[13px] min-[400px]:text-[15px] min-w-0">
+              <Link
+                href={`/profile/${post.author.did}`}
+                className="text-textNeutral hover:underline line-clamp-1">
+                @{post.author.handle}
+              </Link>
+              <span className="text-textNeutral shrink-0">·</span>
+              <Link
+                href={`/profile/${post.author.did}`}
+                className="text-brand hover:underline shrink-0">
+                Follow
+              </Link>
+            </div>
          </div>
        </div>
+
        <PostContent record={record} />
        <Embed content={post.embed} labels={post.labels} />

-        <div className="flex items-center justify-between w-full pt-2.5  text-sm">
-          <div className="flex items-center gap-3 text-sm cursor-pointer">
-            {!!post.likeCount && (
-              <div className="flex items-center gap-1 cursor-pointer group">
-                <LikeIcon
-                  width={20}
-                  height={20}
-                  className="text-slate-600 dark:text-slate-400 group-hover:text-neutral-800 dark:group-hover:text-white transition-colors"
-                />
-                <p className="font-medium  text-slate-600 text-neutral-600 dark:text-neutral-300 mb-px group-hover:text-neutral-800 dark:group-hover:text-white transition-colors dark:text-slate-400">
-                  {prettyNumber(post.likeCount)}
-                </p>
-              </div>
-            )}
-            {!!post.replyCount && (
-              <div className="flex items-center gap-1 cursor-pointer group">
-                <ReplyIcon
-                  width={20}
-                  height={20}
-                  className="text-slate-600 dark:text-slate-400 group-hover:text-neutral-800 dark:group-hover:text-white transition-colors"
-                />
-                <p className="font-medium text-slate-600 text-neutral-600 dark:text-neutral-300 mb-px group-hover:text-neutral-800 dark:group-hover:text-white transition-colors dark:text-slate-400">
-                  {prettyNumber(post.replyCount)}
-                </p>
-              </div>
-            )}
-
-            {!!post.repostCount && (
-              <div className="flex items-center gap-1 cursor-pointer group">
-                <RepostIcon
-                  width={20}
-                  height={20}
-                  className="text-slate-600 dark:text-slate-400 group-hover:text-neutral-800 dark:group-hover:text-white transition-colors"
-                />
-                <p className="font-medium text-slate-600 dark:text-slate-400 mb-px group-hover:text-neutral-800 dark:group-hover:text-white transition-colors">
-                  {prettyNumber(post.repostCount)}
-                </p>
-              </div>
-            )}
+        <div className="flex items-end justify-between w-full">
+          <div className="flex flex-col min-[400px]:gap-0.5">
+            <div className="flex items-center gap-3 text-sm cursor-pointer ml-[-2px]">
+              {!!post.likeCount && (
+                <div className="flex items-center gap-0.5 min-[400px]:gap-1 cursor-pointer group">
+                  <LikeIcon className="w-5 h-5 min-[400px]:w-[22px] min-[400px]:h-[22px] text-textLight dark:text-textDimmed group-hover:text-neutral-800 dark:group-hover:text-white transition-colors" />
+                  <p className="text-[11px] min-[400px]:text-[15px] font-semibold text-textLight dark:text-textDimmed mb-px group-hover:text-neutral-800 dark:group-hover:text-white transition-colors">
+                    {prettyNumber(post.likeCount)}
+                  </p>
+                </div>
+              )}
+              {!!post.replyCount && (
+                <div className="flex items-center gap-0.5 min-[400px]:gap-1 cursor-pointer group">
+                  <ReplyIcon className="w-5 h-5 min-[400px]:w-[22px] min-[400px]:h-[22px] text-textLight dark:text-textDimmed group-hover:text-neutral-800 dark:group-hover:text-white transition-colors" />
+                  <p className="text-[11px] min-[400px]:text-[15px] font-semibold text-textLight dark:text-textDimmed mb-px group-hover:text-neutral-800 dark:group-hover:text-white transition-colors">
+                    {prettyNumber(post.replyCount)}
+                  </p>
+                </div>
+              )}
+              {!!post.repostCount && (
+                <div className="flex items-center gap-0.5 min-[400px]:gap-1 cursor-pointer group">
+                  <RepostIcon className="w-5 h-5 min-[400px]:w-[22px] min-[400px]:h-[22px] text-textLight dark:text-textDimmed group-hover:text-neutral-800 dark:group-hover:text-white transition-colors" />
+                  <p className="text-[11px] min-[400px]:text-[15px] font-semibold text-textLight dark:text-textDimmed mb-px group-hover:text-neutral-800 dark:group-hover:text-white transition-colors">
+                    {prettyNumber(post.repostCount)}
+                  </p>
+                </div>
+              )}
+            </div>
+            <Link href={href}>
+              <time
+                datetime={new Date(post.indexedAt).toISOString()}
+                className="text-[11px] min-[400px]:text-[15px] text-textNeutral hover:underline">
+                {niceDate(post.indexedAt)}
+              </time>
+            </Link>
          </div>
-          <Link href={href}>
-            <time
-              datetime={new Date(post.indexedAt).toISOString()}
-              className="text-slate-500 dark:text-textDimmed text-sm hover:underline dark:text-slate-500">
-              {niceDate(post.indexedAt)}
-            </time>
+          <Link
+            href={href}
+            className="transition-transform hover:scale-110 shrink-0">
+            <img src={logo} className="h-5 min-[400px]:h-7" />
          </Link>
        </div>
      </div>
-      <div className="flex items-center justify-end pt-2">
-        <Link
-          href={href}
-          className="transition-transform hover:scale-110 shrink-0">
-          <img src={logo} className="h-8" />
-        </Link>
-      </div>
    </Container>
  )
 }
@@ -177,7 +173,7 @@ function PostContent({record}: {record: AppBskyFeedPost.Record | null}) {
        <Link
          key={counter}
          href={segment.link.uri}
-          className="text-blue-500 hover:underline"
+          className="text-brand hover:underline"
          disableTracking={
            !segment.link.uri.startsWith('https://bsky.app') &&
            !segment.link.uri.startsWith('https://go.bsky.app')
@@ -193,7 +189,7 @@ function PostContent({record}: {record: AppBskyFeedPost.Record | null}) {
        <Link
          key={counter}
          href={`/profile/${segment.mention.did}`}
-          className="text-blue-500 hover:underline">
+          className="text-brand hover:underline">
          {segment.text}
        </Link>,
      )
@@ -205,7 +201,7 @@ function PostContent({record}: {record: AppBskyFeedPost.Record | null}) {
        <Link
          key={counter}
          href={`/hashtag/${segment.tag.tag}`}
-          className="text-blue-500 hover:underline">
+          className="text-brand hover:underline">
          {segment.text}
        </Link>,
      )
@@ -217,7 +213,7 @@ function PostContent({record}: {record: AppBskyFeedPost.Record | null}) {
  }

  return (
-    <p className="min-[300px]:text-lg leading-6 min-[300px]:leading-6 break-word break-words whitespace-pre-wrap">
+    <p className="text-md min-[400px]:text-lg leading-snug min-[400px]:leading-snug break-word break-words whitespace-pre-wrap">
      {richText}
    </p>
  )
@@ -0,0 +1,24 @@
+import {h} from 'preact'
+
+export const Globe = ({
+  size = 14,
+  className,
+}: {
+  size?: number
+  className?: string
+}) => (
+  <svg
+    className={className}
+    width={size}
+    height={size}
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24">
+    <path
+      fill="currentColor"
+      fill-rule="evenodd"
+      d="M4.4 9.493C4.14 10.28 4 11.124 4 12a8 8 0 1 0 10.899-7.459l-.953 3.81a1 1 0 0 1-.726.727l-3.444.866-.772 1.533a1 1 0 0 1-1.493.35L4.4 9.493Zm.883-1.84L7.756 9.51l.44-.874a1 1 0 0 1 .649-.52l3.306-.832.807-3.227a7.99 7.99 0 0 0-7.676 3.597ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm8.43.162a1 1 0 0 1 .77-.29l1.89.121a1 1 0 0 1 .494.168l2.869 1.928a1 1 0 0 1 .336 1.277l-.973 1.946a1 1 0 0 1-.894.553h-2.92a1 1 0 0 1-.831-.445L9.225 14.5a1 1 0 0 1 .126-1.262l1.08-1.076Zm.915 1.913.177-.177 1.171.074 1.914 1.286-.303.607h-1.766l-1.194-1.79Z"
+      clip-rule="evenodd"
+    />
+  </svg>
+)
@@ -2,6 +2,12 @@
@tailwind components;
@tailwind utilities;

+:root {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  text-rendering: optimizeLegibility;
+}
+
 .break-word {
  word-break: break-word;
 }
@@ -28,7 +28,7 @@ export const EMBED_SCRIPT = `${EMBED_SERVICE}/static/embed.js`
 const root = document.getElementById('app')
 if (!root) throw new Error('No root element')

-initSystemColorMode()
+initSystemColorMode({additionalBodyClasses: 'dark:bg-dimmedBgDarken'})

 const agent = new AtpAgent({
  service: 'https://public.api.bsky.app',
@@ -39,6 +39,7 @@ render(<LandingPage />, root)
 function LandingPage() {
  const [uri, setUri] = useState('')
  const [colorMode, setColorMode] = useState<ColorModeValues>('system')
+
  const [error, setError] = useState<string | null>(null)
  const [loading, setLoading] = useState(false)
  const [thread, setThread] = useState<AppBskyFeedDefs.ThreadViewPost | null>(
@@ -118,7 +119,7 @@ function LandingPage() {
  }, [uri])

  return (
-    <main className="w-full min-h-screen flex flex-col items-center gap-8 py-14 px-4 md:pt-32 dark:bg-dimmedBgDarken dark:text-slate-200">
+    <main className="w-full min-h-dvh flex flex-col items-center gap-8 py-14 px-4 md:pt-32 dark:text-slate-200">
      <Link
        href="https://bsky.social/about"
        className="transition-transform hover:scale-110">
@@ -185,7 +186,7 @@ function LandingPage() {
 function Skeleton() {
  return (
    <Container>
-      <div className="flex-1 flex-col flex gap-2 pb-8">
+      <div className="flex-1 flex-col flex gap-2 p-5 pb-8">
        <div className="flex gap-2.5 items-center">
          <div className="w-10 h-10 overflow-hidden rounded-full bg-neutral-100 dark:bg-slate-700 shrink-0 animate-pulse" />
          <div className="flex-1">
@@ -1,11 +1,11 @@
 export function niceDate(date: number | string | Date) {
  const d = new Date(date)
-  return `${d.toLocaleDateString('en-us', {
+  return `${d.toLocaleTimeString(undefined, {
+    hour: 'numeric',
+    minute: '2-digit',
+  })} · ${d.toLocaleDateString('en-us', {
    year: 'numeric',
    month: 'short',
    day: 'numeric',
-  })} at ${d.toLocaleTimeString(undefined, {
-    hour: 'numeric',
-    minute: '2-digit',
  })}`
 }
@@ -5,10 +5,13 @@ module.exports = {
  theme: {
    extend: {
      colors: {
-        brand: 'rgb(10,122,255)',
+        brand: 'rgb(0,106,255)',
+        brandHover: 'rgb(245,249,255)',
+        brandHoverDark: 'rgb(17,24,34)',
        brandLighten: 'rgb(32,139,254)',
-        textLight: 'rgb(66,87,108)',
-        textDimmed: 'rgb(174,187,201)',
+        textLight: 'rgb(63,82,104)',
+        textDimmed: 'rgb(164,179,197)',
+        textNeutral: 'rgb(102,123,153)',
        dimmedBgLighten: 'rgb(30,41,54)',
        dimmedBg: 'rgb(22,30,39)',
        dimmedBgDarken: 'rgb(18,25,32)',
@@ -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": {
@@ -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)')
@@ -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>) {
@@ -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()
  }
 }
@@ -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))
+}
@@ -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')
+    }
+  }
+}
@@ -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)
    }),
  )
@@ -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"/)
+  })
 })
@@ -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 */
+  }
 }

@@ -54,7 +54,7 @@ func NewRenderer(prefix string, fs *embed.FS, debug bool) *Renderer {
 	}
 }

-func (r Renderer) Render(w io.Writer, name string, data interface{}, c echo.Context) error {
+func (r Renderer) Render(w io.Writer, name string, data any, c echo.Context) error {
 	var ctx pongo2.Context

 	if data != nil {
@@ -11,6 +11,6 @@ type Template struct {
 	templates *template.Template
 }

-func (t *Template) Render(w io.Writer, name string, data interface{}, c echo.Context) error {
+func (t *Template) Render(w io.Writer, name string, data any, c echo.Context) error {
 	return t.templates.ExecuteTemplate(w, name, data)
 }
@@ -180,9 +180,9 @@ func serve(cctx *cli.Context) error {

 	// Create CORS middleware for oembed
 	oembedCORS := middleware.CORSWithConfig(middleware.CORSConfig{
-			AllowOrigins: []string{"*"},
-			AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodOptions},
-			AllowHeaders: []string{"Origin", "Content-Type", "Accept"},
+		AllowOrigins: []string{"*"},
+		AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodOptions},
+		AllowHeaders: []string{"Origin", "Content-Type", "Accept"},
 	})

 	e.GET("/robots.txt", echo.WrapHandler(staticHandler))
@@ -271,7 +271,7 @@ func (srv *Server) errorHandler(err error, c echo.Context) {
 		code = he.Code
 	}
 	c.Logger().Error(err)
-	data := map[string]interface{}{
+	data := map[string]any{
 		"statusCode": code,
 	}
 	c.Render(code, "error.html", data)
@@ -1,6 +1,6 @@
 module github.com/bluesky-social/social-app/bskyweb

-go 1.25
+go 1.26

 require (
 	github.com/bluesky-social/indigo v0.0.0-20250729223159-573ae927246a
@@ -2,7 +2,7 @@
 <html>
 <head>
  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, viewport-fit=cover">
+  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, viewport-fit=cover">
  <meta name="referrer" content="origin-when-cross-origin">
  <!--
    Preconnect to essential domains
@@ -5,8 +5,8 @@
    "start": "NODE_ENV=development ./dev-infra/with-test-redis-and-db.sh ts-node ./mock-server.ts"
  },
  "dependencies": {
-    "@atproto/dev-env": "^0.3.213",
+    "@atproto/dev-env": "^0.3.215",
    "ts-node": "^10.9.2",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
  }
 }
@@ -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"
  ]
-}
+}
@@ -64,14 +64,14 @@
    "@atproto/xrpc" "^0.7.6"
    "@atproto/xrpc-server" "^0.10.0"

-"@atproto/api@^0.19.2":
-  version "0.19.3"
-  resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.19.3.tgz#61de8d2e31abe9eb2b4c8f4ad124ed79d4a77e89"
-  integrity sha512-G8YpBpRouHdTAIagi/QQIUZOhGd1jfBQWkJy9QfxAzjjEpPvaVOSk4e1S85QzGLm/xbzVONzGkmdtiOSfP6wVg==
+"@atproto/api@^0.19.4":
+  version "0.19.4"
+  resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.19.4.tgz#f3ff850baf4d85538c082fb91aa0982737eb68be"
+  integrity sha512-fYNM62vdXxer0h8a9Jzl4/ag9uFIe0nTO+LkC6KTlx1yUDigrAoQMMbllIiCWj62GhUMxAkHabk/BZjjVAfKng==
  dependencies:
    "@atproto/common-web" "^0.4.18"
    "@atproto/lexicon" "^0.6.2"
-    "@atproto/syntax" "^0.5.0"
+    "@atproto/syntax" "^0.5.1"
    "@atproto/xrpc" "^0.7.7"
    await-lock "^2.2.2"
    multiformats "^9.9.0"
@@ -96,23 +96,23 @@
    multiformats "^9.9.0"
    uint8arrays "3.0.0"

-"@atproto/bsky@^0.0.219":
-  version "0.0.219"
-  resolved "https://registry.yarnpkg.com/@atproto/bsky/-/bsky-0.0.219.tgz#6a9f82eb4ab999e121d04ad2b3f08ff60cc75fba"
-  integrity sha512-Vm7JpIyCqd7sHzHsXqppGSaKkXKUhvdZ/UOldc247Bgmx+L/U+E6IeR028hzMr1YyDvU+bkO1hlqT8uUovOCdA==
+"@atproto/bsky@^0.0.221":
+  version "0.0.221"
+  resolved "https://registry.yarnpkg.com/@atproto/bsky/-/bsky-0.0.221.tgz#b574456225db66c866848526947473d60bb4d0e7"
+  integrity sha512-feNR6xkJ9HCJbQdJU3ytsnAfaSBXJdaXIMi0tNPrsLfoqCWWbTfXIcMczXeY4SOhKGFR5oMYxE9zrRC/TTAssw==
  dependencies:
    "@atproto-labs/fetch-node" "^0.2.0"
    "@atproto-labs/xrpc-utils" "^0.0.24"
-    "@atproto/api" "^0.19.2"
-    "@atproto/common" "^0.5.14"
+    "@atproto/api" "^0.19.4"
+    "@atproto/common" "^0.5.15"
    "@atproto/crypto" "^0.4.5"
    "@atproto/did" "^0.3.0"
    "@atproto/identity" "^0.4.12"
    "@atproto/lexicon" "^0.6.2"
-    "@atproto/repo" "^0.8.12"
+    "@atproto/repo" "^0.8.13"
    "@atproto/sync" "^0.1.40"
-    "@atproto/syntax" "^0.5.0"
-    "@atproto/xrpc-server" "^0.10.15"
+    "@atproto/syntax" "^0.5.1"
+    "@atproto/xrpc-server" "^0.10.17"
    "@bufbuild/protobuf" "^1.5.0"
    "@connectrpc/connect" "^1.1.4"
    "@connectrpc/connect-express" "^1.1.4"
@@ -146,13 +146,13 @@
    undici "^6.19.8"
    zod "3.23.8"

-"@atproto/bsync@^0.0.24":
-  version "0.0.24"
-  resolved "https://registry.yarnpkg.com/@atproto/bsync/-/bsync-0.0.24.tgz#6b0d4b02c0c0241687456ab817471d36ee81ae61"
-  integrity sha512-JN+oncaPBNRjzjTPGR7Q1fkKF3cqOQ6oLRrAh9kVU04ZS3FhWUG8cQvnr8wb1PUhFb/XYpWkwDw5+GIhdb7Lfw==
+"@atproto/bsync@^0.0.25":
+  version "0.0.25"
+  resolved "https://registry.yarnpkg.com/@atproto/bsync/-/bsync-0.0.25.tgz#0d6056f844c0b2579d9dfc04b6727974dc03fcd6"
+  integrity sha512-5tjP5QbUcNtMBw7FJeyRfA0OHQRKrg97Jva6Q26cKqLMICGYNbx0fpD7nZhGTP2/s1gd6UZkG9Zdh4GRZpbxWg==
  dependencies:
    "@atproto/common" "^0.5.14"
-    "@atproto/syntax" "^0.5.0"
+    "@atproto/syntax" "^0.5.1"
    "@bufbuild/protobuf" "^1.5.0"
    "@connectrpc/connect" "^1.1.4"
    "@connectrpc/connect-node" "^1.1.4"
@@ -172,6 +172,16 @@
    "@atproto/syntax" "^0.5.0"
    zod "^3.23.8"

+"@atproto/common-web@^0.4.19":
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/@atproto/common-web/-/common-web-0.4.19.tgz#bbd7f84f545ebe73ca3bc00314ccf4ee66e7069e"
+  integrity sha512-3BTi58p5WpT+9/zb6UZrdsXcfPo5P45UJm0E4iwHLILr+jc37CuBj9JReDSZ4U0i9RTrI3ZkfySyZ9bd+LnMsw==
+  dependencies:
+    "@atproto/lex-data" "^0.0.14"
+    "@atproto/lex-json" "^0.0.14"
+    "@atproto/syntax" "^0.5.1"
+    zod "^3.23.8"
+
 "@atproto/common@0.1.0":
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/@atproto/common/-/common-0.1.0.tgz#4216a8fef5b985ab62ac21252a0f8ca0f4a0f210"
@@ -203,6 +213,17 @@
    multiformats "^9.9.0"
    pino "^8.21.0"

+"@atproto/common@^0.5.15":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@atproto/common/-/common-0.5.15.tgz#3c43c25d3493d868cc4281d6ac2f923b00644463"
+  integrity sha512-+cdfdMPAIbH9zQGLfH1gNY2KEZsMxj0EelVQL5uJUFL+UkkAXiiqWj7J5mbax8sf02cC/afJnfkWzERNAheKoA==
+  dependencies:
+    "@atproto/common-web" "^0.4.19"
+    "@atproto/lex-cbor" "^0.0.15"
+    "@atproto/lex-data" "^0.0.14"
+    multiformats "^9.9.0"
+    pino "^8.21.0"
+
 "@atproto/crypto@0.1.0":
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/@atproto/crypto/-/crypto-0.1.0.tgz#bc73a479f9dbe06fa025301c182d7f7ab01bc568"
@@ -223,23 +244,23 @@
    "@noble/hashes" "^1.6.1"
    uint8arrays "3.0.0"

-"@atproto/dev-env@^0.3.213":
-  version "0.3.213"
-  resolved "https://registry.yarnpkg.com/@atproto/dev-env/-/dev-env-0.3.213.tgz#30ca66f827d44ccabb02b359119f68549fa3edf0"
-  integrity sha512-Bjhv+zzcQxhwV4I7si+yDls8sSetksILeiBemfRe3cvE4GOgs7KfsYI5+pqNmBZ5rrFPt3KUeN9vIo31LCgZOw==
+"@atproto/dev-env@^0.3.215":
+  version "0.3.215"
+  resolved "https://registry.yarnpkg.com/@atproto/dev-env/-/dev-env-0.3.215.tgz#9da8c4a73abb4501ac72c73da9536e2ec86cb46f"
+  integrity sha512-zwZwGWYLgP2Zdie6/gMtxuDbSs7/UV/gPJYfOlXln1ZDoMkfFbgCTq44PWRnJpUKTzrq7gt19E0GsL7DMkppjA==
  dependencies:
-    "@atproto/api" "^0.19.2"
-    "@atproto/bsky" "^0.0.219"
-    "@atproto/bsync" "^0.0.24"
-    "@atproto/common-web" "^0.4.18"
+    "@atproto/api" "^0.19.4"
+    "@atproto/bsky" "^0.0.221"
+    "@atproto/bsync" "^0.0.25"
+    "@atproto/common-web" "^0.4.19"
    "@atproto/crypto" "^0.4.5"
    "@atproto/identity" "^0.4.12"
    "@atproto/lexicon" "^0.6.2"
-    "@atproto/ozone" "^0.1.166"
-    "@atproto/pds" "^0.4.214"
+    "@atproto/ozone" "^0.1.167"
+    "@atproto/pds" "^0.4.216"
    "@atproto/sync" "^0.1.40"
-    "@atproto/syntax" "^0.5.0"
-    "@atproto/xrpc-server" "^0.10.15"
+    "@atproto/syntax" "^0.5.1"
+    "@atproto/xrpc-server" "^0.10.17"
    "@did-plc/lib" "^0.0.1"
    "@did-plc/server" "^0.0.1"
    dotenv "^16.0.3"
@@ -288,6 +309,14 @@
    "@atproto/lex-data" "^0.0.13"
    tslib "^2.8.1"

+"@atproto/lex-cbor@^0.0.15":
+  version "0.0.15"
+  resolved "https://registry.yarnpkg.com/@atproto/lex-cbor/-/lex-cbor-0.0.15.tgz#ae4558d8ce22119710ad22feb458d22774b3ca3b"
+  integrity sha512-3osDicK9bAMXJlKjLKqwYrhLQ60bOguWBNjE+fuNjMuizNzC0aqaClE3d+qMsFuFq9bjEHFw+4Vr9Qmd/m6VYg==
+  dependencies:
+    "@atproto/lex-data" "^0.0.14"
+    tslib "^2.8.1"
+
 "@atproto/lex-client@^0.0.15":
  version "0.0.15"
  resolved "https://registry.yarnpkg.com/@atproto/lex-client/-/lex-client-0.0.15.tgz#c647d14e91ca3f52feebf4b34f80abb7e93b3bee"
@@ -298,6 +327,16 @@
    "@atproto/lex-schema" "^0.0.14"
    tslib "^2.8.1"

+"@atproto/lex-client@^0.0.17":
+  version "0.0.17"
+  resolved "https://registry.yarnpkg.com/@atproto/lex-client/-/lex-client-0.0.17.tgz#566689a288f8b2af31f4a0fa081496dfaaef7278"
+  integrity sha512-lZ9clUjWgpno1XhSawQP+1/JeIYA9qBh759b/NSU0OiypQqgq7IxDvmzaBsiHK1sqjo0tyEkmG4X5Ym7YXjv0Q==
+  dependencies:
+    "@atproto/lex-data" "^0.0.14"
+    "@atproto/lex-json" "^0.0.14"
+    "@atproto/lex-schema" "^0.0.16"
+    tslib "^2.8.1"
+
 "@atproto/lex-data@^0.0.13":
  version "0.0.13"
  resolved "https://registry.yarnpkg.com/@atproto/lex-data/-/lex-data-0.0.13.tgz#db1bcfa12d5056210f6eb7f3b8bac909909d6b9c"
@@ -308,12 +347,22 @@
    uint8arrays "3.0.0"
    unicode-segmenter "^0.14.0"

-"@atproto/lex-document@^0.0.15":
-  version "0.0.15"
-  resolved "https://registry.yarnpkg.com/@atproto/lex-document/-/lex-document-0.0.15.tgz#b2f19756291a0d259cd99f5ebe4872e9133069b6"
-  integrity sha512-QT2MbICG4cTFrrA19SIHpZJ33WRLdzjhDsEhSknQ4dE5CjqPf4BP9LaC4pOeW8NE5Kn92hgIm3JWNjoak8blXw==
+"@atproto/lex-data@^0.0.14":
+  version "0.0.14"
+  resolved "https://registry.yarnpkg.com/@atproto/lex-data/-/lex-data-0.0.14.tgz#2f2f3c64699925a0d4785e5afd0e7731ba1d46c0"
+  integrity sha512-53DUa9664SS76nGAMYopWsO10OH0AAdf7P/HSKB6Wzx3iqe6lk/K61QZnKxOG1LreYl5CfvIJU6eNf4txI6GlQ==
  dependencies:
-    "@atproto/lex-schema" "^0.0.14"
+    multiformats "^9.9.0"
+    tslib "^2.8.1"
+    uint8arrays "3.0.0"
+    unicode-segmenter "^0.14.0"
+
+"@atproto/lex-document@^0.0.17":
+  version "0.0.17"
+  resolved "https://registry.yarnpkg.com/@atproto/lex-document/-/lex-document-0.0.17.tgz#8460096235910bf5ec8305f03a8da6bab8d8a12b"
+  integrity sha512-rQiDCSYQwze4+kaArUtmp4bjZ9rV3vYUMhjdDwmZCKodpppNEYrP5AQzyKlxBtKO+MRdLYwHDDwwvakU8atRww==
+  dependencies:
+    "@atproto/lex-schema" "^0.0.16"
    core-js "^3"
    tslib "^2.8.1"

@@ -325,19 +374,27 @@
    "@atproto/lex-data" "^0.0.13"
    tslib "^2.8.1"

-"@atproto/lex-resolver@^0.0.17":
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/@atproto/lex-resolver/-/lex-resolver-0.0.17.tgz#2c474f6babeb54665656bf28b8d27a98de69deae"
-  integrity sha512-6nI5bYZUYh50ZI8r4erLRP9EbNcW226VShpVN3vHyOSgTje4VP1RTcvBhROBAPj4rL3vc+Oa8OiL6IQXkYrQBg==
+"@atproto/lex-json@^0.0.14":
+  version "0.0.14"
+  resolved "https://registry.yarnpkg.com/@atproto/lex-json/-/lex-json-0.0.14.tgz#717e533ab583aa5f580acb2a77d9aa3e7eddaa17"
+  integrity sha512-6lPkDKqe7teEu4WrN5q7400cvZKgYS3uwUMvzG3F9XkgVYhOwSDCtouV/nSLBbpvo3l9OP0kiigtclcNcyekww==
+  dependencies:
+    "@atproto/lex-data" "^0.0.14"
+    tslib "^2.8.1"
+
+"@atproto/lex-resolver@^0.0.19":
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/@atproto/lex-resolver/-/lex-resolver-0.0.19.tgz#806fcb71e72d0db51e2eb29c594eddb8c4087414"
+  integrity sha512-oATn4RpZNLh5rp9doN5/UOYS/Cd25GOD90ohB5jnnmeoF8jTupqIYTVhntbnx1EFn+5tTlgkyXEBV+XESBUcdQ==
  dependencies:
    "@atproto-labs/did-resolver" "^0.2.6"
    "@atproto/crypto" "^0.4.5"
-    "@atproto/lex-client" "^0.0.15"
-    "@atproto/lex-data" "^0.0.13"
-    "@atproto/lex-document" "^0.0.15"
-    "@atproto/lex-schema" "^0.0.14"
-    "@atproto/repo" "^0.8.12"
-    "@atproto/syntax" "^0.5.0"
+    "@atproto/lex-client" "^0.0.17"
+    "@atproto/lex-data" "^0.0.14"
+    "@atproto/lex-document" "^0.0.17"
+    "@atproto/lex-schema" "^0.0.16"
+    "@atproto/repo" "^0.8.13"
+    "@atproto/syntax" "^0.5.1"
    tslib "^2.8.1"

 "@atproto/lex-schema@^0.0.14":
@@ -349,6 +406,17 @@
    "@atproto/syntax" "^0.5.0"
    tslib "^2.8.1"

+"@atproto/lex-schema@^0.0.16":
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/@atproto/lex-schema/-/lex-schema-0.0.16.tgz#8362932e239b7eaa7c5d6982d06c3147e3afd138"
+  integrity sha512-O+IorivZHJPeV3kU3NDD2yI8ATfckOphgvDfeiyKHRTxRUKS+lHMCpGUiSTC3fJrfMvYITrruUVViUHVEScrbA==
+  dependencies:
+    "@atproto/lex-data" "^0.0.14"
+    "@atproto/syntax" "^0.5.1"
+    "@standard-schema/spec" "^1.1.0"
+    iso-datestring-validator "^2.2.2"
+    tslib "^2.8.1"
+
 "@atproto/lexicon@^0.6.0", "@atproto/lexicon@^0.6.2":
  version "0.6.2"
  resolved "https://registry.yarnpkg.com/@atproto/lexicon/-/lexicon-0.6.2.tgz#f6152a2119df953236ca127c4b30e332265e81e7"
@@ -382,28 +450,28 @@
  optionalDependencies:
    "@atproto/oauth-provider-api" "0.3.7"

-"@atproto/oauth-provider@^0.15.12":
-  version "0.15.12"
-  resolved "https://registry.yarnpkg.com/@atproto/oauth-provider/-/oauth-provider-0.15.12.tgz#9dbbfdd6808399d9d7ff8993ac888938fbf4c515"
-  integrity sha512-Ri4aVx2I4lOKxViB92jwPhAs/NctWEwV0tgYSHcaRpvqr2SVlC2LxTVjUq14ohdbVfv4VFRzj0vZypEX+mclHg==
+"@atproto/oauth-provider@^0.15.14":
+  version "0.15.14"
+  resolved "https://registry.yarnpkg.com/@atproto/oauth-provider/-/oauth-provider-0.15.14.tgz#d969018b4ad5c0dd5863150cb8c1b65458738589"
+  integrity sha512-arA3O+Ye1YBhoIUnZtn8wfatnVnwiZrGyNkxhH0nqGbh/RRfwA5W0tgnSDq0VMclLkrPY/OnZ4v3oo9N81yWGg==
  dependencies:
    "@atproto-labs/fetch" "^0.2.3"
    "@atproto-labs/fetch-node" "^0.2.0"
    "@atproto-labs/pipe" "^0.1.1"
    "@atproto-labs/simple-store" "^0.3.0"
    "@atproto-labs/simple-store-memory" "^0.1.4"
-    "@atproto/common" "^0.5.14"
+    "@atproto/common" "^0.5.15"
    "@atproto/did" "^0.3.0"
    "@atproto/jwk" "^0.6.0"
    "@atproto/jwk-jose" "^0.1.11"
-    "@atproto/lex-document" "^0.0.15"
-    "@atproto/lex-resolver" "^0.0.17"
+    "@atproto/lex-document" "^0.0.17"
+    "@atproto/lex-resolver" "^0.0.19"
    "@atproto/oauth-provider-api" "0.3.7"
    "@atproto/oauth-provider-frontend" "0.2.9"
    "@atproto/oauth-provider-ui" "0.4.3"
    "@atproto/oauth-scopes" "^0.3.2"
    "@atproto/oauth-types" "^0.6.3"
-    "@atproto/syntax" "^0.5.0"
+    "@atproto/syntax" "^0.5.1"
    "@hapi/accept" "^6.0.3"
    "@hapi/address" "^5.1.1"
    "@hapi/bourne" "^3.0.0"
@@ -442,20 +510,20 @@
    "@atproto/jwk" "^0.6.0"
    zod "^3.23.8"

-"@atproto/ozone@^0.1.166":
-  version "0.1.166"
-  resolved "https://registry.yarnpkg.com/@atproto/ozone/-/ozone-0.1.166.tgz#9e65d6f67ef1fe285d0880e5f5a1b282dc63bd70"
-  integrity sha512-XZ77P/V/tt3SqTQYRsi5nM3P2h+QaNT7Nz3GTf+TMLVolACufRHPoDgp/PoTuS2FaLj1ndHnGyIPvZi/o8he6g==
+"@atproto/ozone@^0.1.167":
+  version "0.1.167"
+  resolved "https://registry.yarnpkg.com/@atproto/ozone/-/ozone-0.1.167.tgz#c3974bbe06f0926f165f90d5ba51ba9ce2032fff"
+  integrity sha512-AFquyND8zsskjkDc3WrQObUnZlEky05pFo0YYLy5JoqQN0WXIePLgGY0SC0EIokfF8iYXJE1ZM1u/dgA7DHqGQ==
  dependencies:
-    "@atproto/api" "^0.19.2"
+    "@atproto/api" "^0.19.4"
    "@atproto/common" "^0.5.14"
    "@atproto/crypto" "^0.4.5"
    "@atproto/identity" "^0.4.12"
    "@atproto/lexicon" "^0.6.2"
-    "@atproto/syntax" "^0.5.0"
+    "@atproto/syntax" "^0.5.1"
    "@atproto/ws-client" "^0.0.4"
    "@atproto/xrpc" "^0.7.7"
-    "@atproto/xrpc-server" "^0.10.15"
+    "@atproto/xrpc-server" "^0.10.16"
    "@did-plc/lib" "^0.0.1"
    compression "^1.7.4"
    cors "^2.8.5"
@@ -473,30 +541,30 @@
    undici "^6.14.1"
    ws "^8.12.0"

-"@atproto/pds@^0.4.214":
-  version "0.4.214"
-  resolved "https://registry.yarnpkg.com/@atproto/pds/-/pds-0.4.214.tgz#c68d55ec0b00a4e35f4801c826d44b65cd62f984"
-  integrity sha512-bTWeWg3H0TlELfE2eI2ySQuC6ojsCBSSmPtCXBh3Td9TFNpIoZQ/tYLUJMtMXaiVUi6HxzXQL1/iuYfC4Y+ZYQ==
+"@atproto/pds@^0.4.216":
+  version "0.4.216"
+  resolved "https://registry.yarnpkg.com/@atproto/pds/-/pds-0.4.216.tgz#4d9c73a529bd00893753aba1e7bb33f99b9aaaf4"
+  integrity sha512-yPNatCb2kvudRp5DMbPemN1+uMsLOJDydw2PCBMxuzdimOf10PsekOhhZxtfGGRvk2NbvKoyfUvkROoFmTr+ew==
  dependencies:
    "@atproto-labs/fetch-node" "^0.2.0"
    "@atproto-labs/simple-store" "^0.3.0"
    "@atproto-labs/simple-store-memory" "^0.1.4"
    "@atproto-labs/simple-store-redis" "^0.0.1"
    "@atproto-labs/xrpc-utils" "^0.0.24"
-    "@atproto/api" "^0.19.2"
+    "@atproto/api" "^0.19.4"
    "@atproto/aws" "^0.2.31"
-    "@atproto/common" "^0.5.14"
+    "@atproto/common" "^0.5.15"
    "@atproto/crypto" "^0.4.5"
    "@atproto/identity" "^0.4.12"
-    "@atproto/lex-cbor" "^0.0.14"
-    "@atproto/lex-data" "^0.0.13"
+    "@atproto/lex-cbor" "^0.0.15"
+    "@atproto/lex-data" "^0.0.14"
    "@atproto/lexicon" "^0.6.2"
-    "@atproto/oauth-provider" "^0.15.12"
+    "@atproto/oauth-provider" "^0.15.14"
    "@atproto/oauth-scopes" "^0.3.2"
-    "@atproto/repo" "^0.8.12"
-    "@atproto/syntax" "^0.5.0"
+    "@atproto/repo" "^0.8.13"
+    "@atproto/syntax" "^0.5.1"
    "@atproto/xrpc" "^0.7.7"
-    "@atproto/xrpc-server" "^0.10.15"
+    "@atproto/xrpc-server" "^0.10.17"
    "@did-plc/lib" "^0.0.4"
    "@hapi/address" "^5.1.1"
    better-sqlite3 "^10.0.0"
@@ -540,6 +608,21 @@
    varint "^6.0.0"
    zod "^3.23.8"

+"@atproto/repo@^0.8.13":
+  version "0.8.13"
+  resolved "https://registry.yarnpkg.com/@atproto/repo/-/repo-0.8.13.tgz#70160b8b3f78b6addcba7cf3e3ae06306e6b6641"
+  integrity sha512-VS8XHaBMGdq60xwRI5zQmXzsMF1hU7NKPjmkdr65tJdrv2z0VW77mG01Ui19Xh9O0mUc/LG6GEhwVrabB9Txow==
+  dependencies:
+    "@atproto/common" "^0.5.14"
+    "@atproto/common-web" "^0.4.18"
+    "@atproto/crypto" "^0.4.5"
+    "@atproto/lexicon" "^0.6.2"
+    "@ipld/dag-cbor" "^7.0.0"
+    multiformats "^9.9.0"
+    uint8arrays "3.0.0"
+    varint "^6.0.0"
+    zod "^3.23.8"
+
 "@atproto/sync@^0.1.40":
  version "0.1.40"
  resolved "https://registry.yarnpkg.com/@atproto/sync/-/sync-0.1.40.tgz#b8b467ac4fbf2e682d36cd5697508f993e9e645a"
@@ -562,6 +645,13 @@
  dependencies:
    tslib "^2.8.1"

+"@atproto/syntax@^0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@atproto/syntax/-/syntax-0.5.1.tgz#78257b903a0723720dca32110379208791ac3c24"
+  integrity sha512-J8DJjgKgACIyCTbpfvoTnf7+ofTx1kxTGO7KAftkC+jczaMdQhKdgIBAg2DaYy+80cvYGTHy5q/HI9qMAwGbWw==
+  dependencies:
+    tslib "^2.8.1"
+
 "@atproto/ws-client@^0.0.4":
  version "0.0.4"
  resolved "https://registry.yarnpkg.com/@atproto/ws-client/-/ws-client-0.0.4.tgz#9e436c0e72abea5da0d5a7e8ec862cec0fdb10cd"
@@ -591,6 +681,27 @@
    rate-limiter-flexible "^2.4.1"
    ws "^8.12.0"

+"@atproto/xrpc-server@^0.10.16", "@atproto/xrpc-server@^0.10.17":
+  version "0.10.17"
+  resolved "https://registry.yarnpkg.com/@atproto/xrpc-server/-/xrpc-server-0.10.17.tgz#1016d4a6d97966a3f80e8785e5d5cba7b68c1c60"
+  integrity sha512-FjexO6P/LRTx6/FdiWTzycFF4TgACW9npsFOitnocydTCOLYouP0OvUwdkxkreFC7qerT4+ARKpqrxRzyj0MNA==
+  dependencies:
+    "@atproto/common" "^0.5.15"
+    "@atproto/crypto" "^0.4.5"
+    "@atproto/lex-cbor" "^0.0.15"
+    "@atproto/lex-client" "^0.0.17"
+    "@atproto/lex-data" "^0.0.14"
+    "@atproto/lex-json" "^0.0.14"
+    "@atproto/lex-schema" "^0.0.16"
+    "@atproto/lexicon" "^0.6.2"
+    "@atproto/ws-client" "^0.0.4"
+    "@atproto/xrpc" "^0.7.7"
+    express "^4.17.2"
+    http-errors "^2.0.0"
+    mime-types "^2.1.35"
+    rate-limiter-flexible "^2.4.1"
+    ws "^8.12.0"
+
 "@atproto/xrpc@^0.7.6", "@atproto/xrpc@^0.7.7":
  version "0.7.7"
  resolved "https://registry.yarnpkg.com/@atproto/xrpc/-/xrpc-0.7.7.tgz#c0e3106c854cb9bc7d3129de2f31b8256eb0ed11"
@@ -2146,6 +2257,11 @@
  dependencies:
    tslib "^2.6.2"

+"@standard-schema/spec@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@standard-schema/spec/-/spec-1.1.0.tgz#a79b55dbaf8604812f52d140b2c9ab41bc150bb8"
+  integrity sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==
+
 "@tokenizer/token@^0.3.0":
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"
@@ -4146,10 +4262,10 @@ typed-emitter@^2.1.0:
  optionalDependencies:
    rxjs "^7.5.2"

-typescript@^5.9.3:
-  version "5.9.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
-  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
+typescript@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.2.tgz#0b1bfb15f68c64b97032f3d78abbf98bdbba501f"
+  integrity sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==

 uglify-js@^3.1.4:
  version "3.19.3"
@@ -47,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'],
@@ -62,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,
@@ -127,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',
@@ -189,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
@@ -237,6 +250,14 @@ export default defineConfig(
      '@typescript-eslint/prefer-promise-reject-errors': 'warn',
      '@typescript-eslint/await-thenable': 'warn',

+      "no-restricted-imports": ["error", {
+        "paths": [{
+          "name": "react",
+          "importNames": ["React", "default"],
+          "message": "React is already in the global type namespace. Use named imports for runtime modules."
+        }]
+      }],
+
      /**
       * Turn off rules that we haven't enforced thus far
       */
@@ -29,6 +29,7 @@ function getTagName(node) {
  return reversedIdentifiers.reverse().join('.')
 }

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

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

+/** @type {import('eslint').Rule.RuleModule} */
 module.exports = {
  meta: {
    type: 'suggestion',
@@ -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,
@@ -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}
@@ -33,17 +33,27 @@ class BottomSheetView(
  private var eventDispatcher: EventDispatcher? = null

  // Native content height observation (eliminates JS bridge round-trip)
-  private var contentLayoutListener: View.OnLayoutChangeListener? = null
+  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 {
+    } 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 {
@@ -355,7 +365,7 @@ class BottomSheetView(

    val innerViewGroup = this.innerView as? ViewGroup ?: return

-    val listener = View.OnLayoutChangeListener { _, _, top, _, bottom, _, _, oldTop, oldBottom ->
+    val listener = OnLayoutChangeListener { _, _, top, _, bottom, _, _, oldTop, oldBottom ->
      val newHeight = bottom - top
      val oldHeight = oldBottom - oldTop
      if (newHeight != oldHeight) {
@@ -1,6 +1,6 @@
 {
  "name": "bsky.app",
-  "version": "1.119.0",
+  "version": "1.121.0",
  "private": true,
  "engines": {
    "node": ">=20"
@@ -81,13 +81,16 @@
    "icons:optimize": "svgo -f ./assets/icons"
  },
  "dependencies": {
-    "@atproto/api": "^0.19.3",
+    "@atproto/api": "^0.19.9",
    "@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-scroll-edge-effect": "^0.1.4",
    "@bsky.app/expo-translate-text": "^0.2.9",
    "@bsky.app/react-native-mmkv": "2.12.5",
+    "@bsky.app/sift": "^0.3.2",
+    "@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",
@@ -109,7 +112,6 @@
    "@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",
@@ -117,9 +119,9 @@
    "@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",
@@ -155,6 +157,7 @@
    "expo-device": "~8.0.10",
    "expo-file-system": "~19.0.21",
    "expo-font": "~14.0.11",
+    "expo-glass-effect": "55.0.8",
    "expo-haptics": "~15.0.8",
    "expo-image": "~3.0.11",
    "expo-image-manipulator": "~14.0.8",
@@ -167,6 +170,7 @@
    "expo-location": "~19.0.8",
    "expo-media-library": "~18.2.1",
    "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",
@@ -179,6 +183,7 @@
    "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",
@@ -199,6 +204,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",
@@ -209,7 +215,7 @@
    "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.21.0",
+    "react-native-keyboard-controller": "^1.21.5",
    "react-native-pager-view": "6.8.0",
    "react-native-progress": "bluesky-social/react-native-progress",
    "react-native-qrcode-styled": "^0.3.3",
@@ -241,12 +247,10 @@
    "@babel/runtime": "^7.26.0",
    "@crowdin/cli": "^4.14.1",
    "@eslint/js": "^9.39.2",
-    "@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",
@@ -264,14 +268,14 @@
    "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",
    "eslint-plugin-react-native": "^5.0.0",
    "eslint-plugin-react-native-a11y": "^3.5.1",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-simple-import-sort": "^13.0.0",
    "file-loader": "6.2.0",
    "globals": "^17.0.0",
    "husky": "^8.0.3",
@@ -286,8 +290,8 @@
    "react-refresh": "^0.14.0",
    "svgo": "^3.3.2",
    "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": {
@@ -324,7 +328,8 @@
    ],
    "modulePathIgnorePatterns": [
      "__tests__/.*/__mocks__",
-      "__e2e__/.*"
+      "__e2e__/.*",
+      "bskylink/.*"
    ],
    "coveragePathIgnorePatterns": [
      "<rootDir>/node_modules/",
@@ -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")
@@ -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));
- }
@@ -0,0 +1,60 @@
+diff --git a/node_modules/expo-glass-effect/ios/GlassContainer.swift b/node_modules/expo-glass-effect/ios/GlassContainer.swift
+index 61fb67c..b2d111e 100644
+--- a/node_modules/expo-glass-effect/ios/GlassContainer.swift
+++ b/node_modules/expo-glass-effect/ios/GlassContainer.swift
+@@ -1,6 +1,7 @@
+ // Copyright 2022-present 650 Industries. All rights reserved.
+ 
+ import ExpoModulesCore
+import React
+ 
+ public final class GlassContainer: ExpoView {
+   private var containerEffect: Any?
+@@ -46,11 +47,19 @@ public final class GlassContainer: ExpoView {
+     }
+   }
+ 
+-  public override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+  // Paper: redirect children into the container effect's contentView
+  public override func didUpdateReactSubviews() {
+    for subview in self.reactSubviews() {
+      containerEffectView.contentView.addSubview(subview)
+    }
+  }
+
+  // Fabric: redirect children into the container effect's contentView
+  @objc public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+     containerEffectView.contentView.insertSubview(childComponentView, at: index)
+   }
+ 
+-  public override func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
+  @objc public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
+     childComponentView.removeFromSuperview()
+   }
+ }
+diff --git a/node_modules/expo-glass-effect/ios/GlassView.swift b/node_modules/expo-glass-effect/ios/GlassView.swift
+index 35cd8f3..9587306 100644
+--- a/node_modules/expo-glass-effect/ios/GlassView.swift
+++ b/node_modules/expo-glass-effect/ios/GlassView.swift
+@@ -271,11 +271,19 @@ public final class GlassView: ExpoView {
+       #endif
+     }
+   }
+-  public override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+  // Paper: redirect children into the glass effect's contentView
+  public override func didUpdateReactSubviews() {
+    for subview in self.reactSubviews() {
+      glassEffectView.contentView.addSubview(subview)
+    }
+  }
+
+  // Fabric: redirect children into the glass effect's contentView
+  @objc public func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+     glassEffectView.contentView.insertSubview(childComponentView, at: index)
+   }
+ 
+-  public override func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
+  @objc public func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
+     childComponentView.removeFromSuperview()
+   }
+ }
@@ -0,0 +1,3 @@
+# expo-glass-effect patch
+
+Patches in support for Expo SDK 54. Please delete when we update Expo
@@ -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
@@ -0,0 +1,48 @@
+diff --git a/node_modules/react-native-keyboard-controller/src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts b/node_modules/react-native-keyboard-controller/src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts
+index 24a25ae..2c5ff6d 100644
+--- a/node_modules/react-native-keyboard-controller/src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts
+++ b/node_modules/react-native-keyboard-controller/src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts
+@@ -1,8 +1,6 @@
+ import { useCallback } from "react";
+-import { Platform } from "react-native";
+ import { scrollTo, useAnimatedReaction } from "react-native-reanimated";
+ 
+-import { IS_FABRIC } from "../../../architecture";
+ import { isScrollAtEnd, shouldShiftContent } from "../useChatKeyboard/helpers";
+ 
+ import type { KeyboardLiftBehavior } from "../useChatKeyboard/types";
+@@ -52,7 +50,6 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
+     scroll,
+     layout,
+     size,
+-    contentOffsetY,
+     inverted,
+     keyboardLiftBehavior,
+     freeze,
+@@ -62,20 +59,14 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
+     (target: number) => {
+       "worklet";
+ 
+-      if (contentOffsetY && IS_FABRIC) {
+-        // eslint-disable-next-line react-compiler/react-compiler
+-        contentOffsetY.value = target;
+-      } else if (Platform.OS === "android") {
+-        // Defer scrollTo so the animatedProps inset commit lands first;
+-        // otherwise the native ScrollView clamps to the old range.
+-        requestAnimationFrame(() => {
+-          scrollTo(scrollViewRef, 0, target, false);
+-        });
+-      } else {
+      // Always defer scrollTo so the animatedProps inset commit lands first;
+      // otherwise the native ScrollView clamps contentOffset to the old
+      // contentInset range (iOS Fabric) or the old contentInsetBottom (Android).
+      requestAnimationFrame(() => {
+         scrollTo(scrollViewRef, 0, target, false);
+-      }
+      });
+     },
+-    [scrollViewRef, contentOffsetY],
+    [scrollViewRef],
+   );
+ 
+   useAnimatedReaction(
@@ -1,7 +1,6 @@
-const {withEntitlementsPlist} = require('@expo/config-plugins')
+const {withEntitlementsPlist} = require('expo/config-plugins')

 const withAppEntitlements = config => {
-  // eslint-disable-next-line no-shadow
  return withEntitlementsPlist(config, async config => {
    config.modResults['com.apple.security.application-groups'] = [
      `group.app.bsky`,
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')

 const withExtensionEntitlements = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
  return withInfoPlist(config, config => {
    const extensionEntitlementsPath = path.join(
      config.modRequest.platformProjectRoot,
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')

 const withExtensionInfoPlist = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
  return withInfoPlist(config, config => {
    const plistPath = path.join(
      config.modRequest.projectRoot,
@@ -1,4 +1,4 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 const path = require('path')
 const fs = require('fs')

@@ -6,7 +6,6 @@ const withExtensionViewController = (
  config,
  {controllerName, extensionName},
 ) => {
-  // eslint-disable-next-line no-shadow
  return withXcodeProject(config, config => {
    const controllerPath = path.join(
      config.modRequest.projectRoot,
@@ -1,4 +1,4 @@
-const {withPlugins} = require('@expo/config-plugins')
+const {withPlugins} = require('expo/config-plugins')
 const {withAppEntitlements} = require('./withAppEntitlements')
 const {withXcodeTarget} = require('./withXcodeTarget')
 const {withExtensionEntitlements} = require('./withExtensionEntitlements')
@@ -1,9 +1,8 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 const path = require('path')
 const fs = require('fs')

 const withSounds = (config, {extensionName, soundFiles}) => {
-  // eslint-disable-next-line no-shadow
  return withXcodeProject(config, config => {
    for (const file of soundFiles) {
      const soundPath = path.join(config.modRequest.projectRoot, 'assets', file)
@@ -1,12 +1,9 @@
-const {withXcodeProject, IOSConfig} = require('@expo/config-plugins')
-const path = require('path')
-const PBXFile = require('xcode/lib/pbxFile')
+const {withXcodeProject} = require('expo/config-plugins')

 const withXcodeTarget = (
  config,
  {extensionName, controllerName, soundFiles},
 ) => {
-  // eslint-disable-next-line no-shadow
  return withXcodeProject(config, config => {
    let pbxProject = config.modResults

@@ -1,7 +1,6 @@
-const {withEntitlementsPlist} = require('@expo/config-plugins')
+const {withEntitlementsPlist} = require('expo/config-plugins')

 const withAppEntitlements = config => {
-  // eslint-disable-next-line no-shadow
  return withEntitlementsPlist(config, async config => {
    config.modResults['com.apple.security.application-groups'] = [
      `group.app.bsky`,
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')

 const withExtensionEntitlements = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
  return withInfoPlist(config, config => {
    const extensionEntitlementsPath = path.join(
      config.modRequest.platformProjectRoot,
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')

 const withExtensionInfoPlist = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
  return withInfoPlist(config, config => {
    const plistPath = path.join(
      config.modRequest.projectRoot,
@@ -1,4 +1,4 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 const path = require('path')
 const fs = require('fs')

@@ -6,7 +6,6 @@ const withExtensionViewController = (
  config,
  {controllerName, extensionName},
 ) => {
-  // eslint-disable-next-line no-shadow
  return withXcodeProject(config, config => {
    const controllerPath = path.join(
      config.modRequest.projectRoot,
@@ -1,7 +1,6 @@
-const {withAndroidManifest} = require('@expo/config-plugins')
+const {withAndroidManifest} = require('expo/config-plugins')

 const withIntentFilters = config => {
-  // eslint-disable-next-line no-shadow
  return withAndroidManifest(config, config => {
    const intents = [
      {
@@ -1,4 +1,4 @@
-const {withPlugins} = require('@expo/config-plugins')
+const {withPlugins} = require('expo/config-plugins')
 const {withAppEntitlements} = require('./withAppEntitlements')
 const {withXcodeTarget} = require('./withXcodeTarget')
 const {withExtensionEntitlements} = require('./withExtensionEntitlements')
@@ -1,7 +1,6 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')

 const withXcodeTarget = (config, {extensionName, controllerName}) => {
-  // eslint-disable-next-line no-shadow
  return withXcodeProject(config, config => {
    const pbxProject = config.modResults

@@ -1,7 +1,6 @@
-const {withEntitlementsPlist} = require('@expo/config-plugins')
+const {withEntitlementsPlist} = require('expo/config-plugins')

 const withAppEntitlements = config => {
-  // eslint-disable-next-line no-shadow
  return withEntitlementsPlist(config, async config => {
    config.modResults['com.apple.security.application-groups'] = [
      `group.app.bsky`,
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')

 const withClipEntitlements = (config, {targetName}) => {
-  // eslint-disable-next-line no-shadow
  return withInfoPlist(config, config => {
    const entitlementsPath = path.join(
      config.modRequest.platformProjectRoot,
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')

 const withClipInfoPlist = (config, {targetName}) => {
-  // eslint-disable-next-line no-shadow
  return withInfoPlist(config, config => {
    const targetPath = path.join(
      config.modRequest.platformProjectRoot,
@@ -1,11 +1,10 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 const path = require('path')
 const fs = require('fs')

 const FILES = ['AppDelegate.swift', 'ViewController.swift']

 const withFiles = (config, {targetName}) => {
-  // eslint-disable-next-line no-shadow
  return withXcodeProject(config, config => {
    const basePath = path.join(
      config.modRequest.projectRoot,
@@ -1,4 +1,4 @@
-const {withPlugins} = require('@expo/config-plugins')
+const {withPlugins} = require('expo/config-plugins')
 const {withAppEntitlements} = require('./withAppEntitlements')
 const {withClipEntitlements} = require('./withClipEntitlements')
 const {withClipInfoPlist} = require('./withClipInfoPlist')
@@ -1,9 +1,8 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')

 const BUILD_PHASE_FILES = ['AppDelegate.swift', 'ViewController.swift']

 const withXcodeTarget = (config, {targetName}) => {
-  // eslint-disable-next-line no-shadow
  return withXcodeProject(config, config => {
    const pbxProject = config.modResults

@@ -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
-  })
-}
@@ -1,7 +1,6 @@
-const {withAndroidManifest} = require('@expo/config-plugins')
+const {withAndroidManifest} = require('expo/config-plugins')

 const withProcessTextQuery = config =>
-  // eslint-disable-next-line no-shadow
  withAndroidManifest(config, config => {
    const manifest = config.modResults.manifest

@@ -1,4 +1,4 @@
-const {withProjectBuildGradle} = require('@expo/config-plugins')
+const {withProjectBuildGradle} = require('expo/config-plugins')

 const jitpackRepository = "maven { url 'https://www.jitpack.io' }"

@@ -3,7 +3,7 @@
 * This way we get a sane default color for spinners, text inputs, etc.
 */

-const {withAndroidStyles, AndroidConfig} = require('@expo/config-plugins')
+const {withAndroidStyles, AndroidConfig} = require('expo/config-plugins')

 module.exports = function withAndroidStylesAccentColorPlugin(appConfig) {
  return withAndroidStyles(appConfig, function (decoratedAppConfig) {
@@ -1,11 +1,10 @@
-const {withAppDelegate} = require('@expo/config-plugins')
-const {mergeContents} = require('@expo/config-plugins/build/utils/generateCode')
+const {withAppDelegate, CodeGenerator} = require('expo/config-plugins')

 module.exports = config =>
  withAppDelegate(config, config => {
    let contents = config.modResults.contents

-    contents = mergeContents({
+    contents = CodeGenerator.mergeContents({
      src: contents,
      anchor: '// Linking API',
      newSrc: `
@@ -22,7 +21,7 @@ module.exports = config =>
      comment: '//',
    }).contents

-    contents = mergeContents({
+    contents = CodeGenerator.mergeContents({
      src: contents,
      anchor: '// Universal Links',
      newSrc: `
@@ -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'
@@ -59,7 +57,7 @@ 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 {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'
@@ -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] = useState(false)
  const {currentAccount} = useSession()
  const {resumeSession} = useSessionApi()
  const theme = useColorModeTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
  const hasCheckedReferrer = useStarterPackEntry()

  // init
@@ -134,16 +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.`), {
+      Toast.show(l`Sorry! Your session expired. Please sign in again.`, {
        type: 'info',
      })
    })
-  }, [_])
+  }, [l])

  return (
    <Alf theme={theme}>
@@ -176,7 +174,7 @@ function InnerApp() {
                                                    <EmailVerificationProvider>
                                                      <HideBottomBarBorderProvider>
                                                        <GestureHandlerRootView
-                                                          style={s.h100pct}>
+                                                          style={a.h_full}>
                                                          <GlobalGestureEventsProvider>
                                                            <IntentDialogProvider>
                                                              <TranslateOnDeviceProvider>
@@ -217,11 +215,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),
    )
  }, [])

@@ -237,7 +235,7 @@ function App() {
    <Geo.Provider>
      <AppConfigProvider>
        <A11yProvider>
-          <KeyboardControllerProvider>
+          <KeyboardControllerProvider preload={false}>
            <OnboardingProvider>
              <AnalyticsContext>
                <SessionProvider>
@@ -5,10 +5,10 @@ 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'
@@ -82,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
@@ -105,22 +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.`), {
+      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),
    )
  }, [])

@@ -78,6 +78,7 @@ import HashtagScreen from '#/screens/Hashtag'
 import {LogScreen} from '#/screens/Log'
 import {MessagesScreen} from '#/screens/Messages/ChatList'
 import {MessagesConversationScreen} from '#/screens/Messages/Conversation'
+import {MessagesConversationSettingsScreen} from '#/screens/Messages/ConversationSettings'
 import {MessagesInboxScreen} from '#/screens/Messages/Inbox'
 import {MessagesSettingsScreen} from '#/screens/Messages/Settings'
 import {ModerationScreen} from '#/screens/Moderation'
@@ -568,6 +569,11 @@ function commonScreens(Stack: typeof Flat, unreadCountLabel?: string) {
        getComponent={() => MessagesConversationScreen}
        options={{title: title(msg`Chat`), requireAuth: true}}
      />
+      <Stack.Screen
+        name="MessagesConversationSettings"
+        getComponent={() => MessagesConversationSettingsScreen}
+        options={{title: title(msg`Group chat settings`), requireAuth: true}}
+      />
      <Stack.Screen
        name="MessagesSettings"
        getComponent={() => MessagesSettingsScreen}
@@ -20,8 +20,8 @@ import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAp
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
 import {AgeAssuranceInitDialog} from '#/components/ageAssurance/AgeAssuranceInitDialog'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
-import {useDialogControl} from '#/components/Dialog'
 import * as Dialog from '#/components/Dialog'
+import {useDialogControl} from '#/components/Dialog'
 import {BirthDateSettingsDialog} from '#/components/dialogs/BirthDateSettings'
 import {DeviceLocationRequestDialog} from '#/components/dialogs/DeviceLocationRequestDialog'
 import {Full as Logo} from '#/components/icons/Logo'
@@ -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...`)
@@ -185,7 +183,7 @@ export async function getServerState({agent}: {agent: AtpAgent}) {
  const geolocation = device.get(['mergedGeolocation'])
  if (!geolocation || !geolocation.countryCode) {
    logger.error(`getServerState: missing geolocation countryCode`)
-    return
+    return null
  }
  const {data} = await agent.app.bsky.ageassurance.getState({
    countryCode: geolocation.countryCode,
@@ -227,8 +225,11 @@ export async function prefetchServerState({agent}: {agent: AtpAgent}) {
  try {
    logger.debug(`prefetchServerState: resolving...`)
    const res = await networkRetry(3, () => getServerState({agent}))
-    qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(qk, res)
-  } catch (e: any) {
+    if (res) {
+      qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(qk, res)
+    }
+  } catch (err) {
+    const e = err as Error
    logger.warn(`prefetchServerState: failed`, {
      safeMessage: e.message,
    })
@@ -239,16 +240,18 @@ export async function refetchServerState({agent}: {agent: AtpAgent}) {
  if (!did) return
  logger.debug(`refetchServerState: fetching...`)
  const res = await networkRetry(3, () => getServerState({agent}))
-  qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
-    createServerStateQueryKey({did}),
-    res,
-  )
+  if (res) {
+    qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
+      createServerStateQueryKey({did}),
+      res,
+    )
+  }
  return res
 }
 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 +316,7 @@ export function useServerStateQuery() {
      // only refetch when needed
      if (isAssured || !isAArequired) return

-      refetch()
+      void refetch()
    })
  }, [did, refetch, isAssured])

@@ -409,7 +412,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 +422,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})
@@ -85,7 +85,7 @@ function InnerProvider({children}: {children: React.ReactNode}) {

  const handleAccessUpdate = useCallback(
    (s: AgeAssuranceState) => {
-      getAndRegisterPushToken({
+      void getAndRegisterPushToken({
        isAgeRestricted: s.access !== AgeAssuranceAccess.Full,
      })
    },
@@ -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})
@@ -20,7 +20,7 @@ export const atoms = {
   */
  util_screen_outer: [
    web({
-      minHeight: '100vh',
+      minHeight: '100dvh',
    }),
    native({
      height: '100%',
@@ -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) {
@@ -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)
 }
@@ -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,
+  }
+}
@@ -2,6 +2,8 @@ import {useEffect, useRef} from 'react'

 import {getCurrentState, onAppStateChange} from '#/lib/appState'
 import {useAnalytics} from '#/analytics'
+import {Features, features} from '#/analytics/features'
+import {IS_DEV, IS_TESTFLIGHT} from '#/env'

 /**
 * Tracks passive analytics like app foreground/background time.
@@ -24,6 +26,20 @@ export function PassiveAnalytics() {
          ),
        })
      }
+
+      if (IS_DEV || IS_TESTFLIGHT) {
+        const feats = Object.values(Features).reduce(
+          (acc, feat) => {
+            acc[feat] = features.evalFeature(feat)
+            return acc
+          },
+          {} as Record<Features, any>,
+        )
+        ax.logger.info('FEATURES', {
+          features: feats,
+          definitions: features.getFeatures(),
+        })
+      }
    })
    return () => sub.remove()
  }, [ax])
@@ -9,6 +9,11 @@ export enum Features {
  ImportContactsOnboardingDisable = 'import_contacts:onboarding:disable',
  ImportContactsSettingsDisable = 'import_contacts:settings:disable',
  LiveNowBetaDisable = 'live_now_beta:disable',
+  ImageUploadsHighResolution = 'image_uploads:high_resolution',
+  ImageUploadsBlobSize2mbEnabled = 'image_uploads:blob_size_2mb:enabled',
+  GroupChatsEnable = 'group_chats:enable',
+  DmsNewMessageComposerEnable = 'dms:new_message_composer:enable',
+  PostGalleryEmbedEnable = 'post_gallery_embed:enable',

  AATest = 'aa-test',
 }
@@ -110,6 +110,7 @@ const Context = createContext<AnalyticsBaseContextType>({
    },
  },
 })
+Context.displayName = 'AnalyticsContext'

 /**
 * Ensures that deviceId is set and migrated from legacy storage. Handled on
@@ -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': {}
@@ -477,10 +480,12 @@ export type Events = {
  'suggestedUser:follow': {
    logContext:
      | 'Explore'
-      | 'InterstitialDiscover'
-      | 'InterstitialProfile'
-      | 'Profile'
+      | 'DiscoverInterstitial'
+      | 'ProfileInterstitial'
+      | 'ProfileHeader'
      | 'Onboarding'
+      | 'SeeMoreSuggestedUsers'
+      | 'ProgressGuide'
    location: 'Card' | 'Profile' | 'FollowAll'
    recId?: number | string
    position: number
@@ -490,9 +495,11 @@ export type Events = {
  'suggestedUser:press': {
    logContext:
      | 'Explore'
-      | 'InterstitialDiscover'
-      | 'InterstitialProfile'
+      | 'DiscoverInterstitial'
+      | 'ProfileInterstitial'
+      | 'ProfileHeader'
      | 'Onboarding'
+      | 'SeeMoreSuggestedUsers'
    recId?: number | string
    position: number
    suggestedDid: string
@@ -501,10 +508,11 @@ export type Events = {
  'suggestedUser:seen': {
    logContext:
      | 'Explore'
-      | 'InterstitialDiscover'
-      | 'InterstitialProfile'
-      | 'Profile'
+      | 'DiscoverInterstitial'
+      | 'ProfileInterstitial'
+      | 'ProfileHeader'
      | 'Onboarding'
+      | 'SeeMoreSuggestedUsers'
      | 'ProgressGuide'
    recId?: number | string
    position: number
@@ -514,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
@@ -554,6 +563,9 @@ export type Events = {
      | 'ChatsList'
      | 'SendViaChatDialog'
  }
+  'groupchat:create': {
+    logContext: 'NewChatDialog'
+  }
  'starterPack:addUser': {
    starterPack?: string
  }
@@ -1034,4 +1046,19 @@ export type Events = {
  'profile:associated:germ:click-self-info': {}
  'profile:associated:germ:self-disconnect': {}
  'profile:associated:germ:self-reconnect': {}
+
+  // Gallery carousel events
+  'post:gallery:swipe': {
+    fromImage: number
+    toImage: number
+    totalImages: number
+  }
+  'post:gallery:openLightbox': {
+    fromImage: number
+    totalImages: number
+  }
+  'post:gallery:impression': {
+    totalImages: number
+    postUri: string
+  }
 }
@@ -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>
+  )
+}
@@ -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>
+  )
+}
@@ -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>
+  )
+}
@@ -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>
+  )
+}
@@ -0,0 +1,6 @@
+export * from './Autocomplete'
+export * from './AutocompleteItemEmoji'
+export * from './AutocompleteItemProfile'
+export * from './types'
+export * from './useAutocomplete'
+export * from './util'
@@ -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[]
+}
@@ -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
+}
@@ -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],
+  )
+}
@@ -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}`)
+  }
+}
@@ -0,0 +1,260 @@
+import {useCallback, useEffect} from 'react'
+import {type StyleProp, View, type ViewStyle} from 'react-native'
+import Animated, {
+  Easing,
+  interpolate,
+  useAnimatedStyle,
+  useSharedValue,
+  withDelay,
+  withTiming,
+} from 'react-native-reanimated'
+
+import {useSession} from '#/state/session'
+import {UserAvatar} from '#/view/com/util/UserAvatar'
+import {atoms as a, useTheme} from '#/alf'
+import {Person_Filled_Corner2_Rounded as PersonIcon} from '#/components/icons/Person'
+import type * as bsky from '#/types/bsky'
+
+type Props = {
+  animate?: boolean
+  profiles: bsky.profile.AnyProfileView[]
+  size?: 'small' | 'medium' | 'large'
+}
+
+export function AvatarBubbles({
+  animate = false,
+  profiles: allProfiles,
+  size = 'large',
+}: Props) {
+  const {currentAccount} = useSession()
+  const profiles = allProfiles.filter(p => p.did !== currentAccount?.did)
+  const containerSize = size === 'small' ? 40 : size === 'medium' ? 56 : 120
+  const scale = size === 'small' ? 40 / 120 : size === 'medium' ? 56 / 120 : 1
+  const marginOffset = size === 'small' || size === 'medium' ? -2 : 0
+
+  const initialValue = animate ? 0 : 1
+  const p0 = useSharedValue(initialValue)
+  const p1 = useSharedValue(initialValue)
+  const p2 = useSharedValue(initialValue)
+  const p3 = useSharedValue(initialValue)
+
+  const animateScale = (p: Animated.SharedValue<number>, index: number) => {
+    p.set(0)
+    p.set(() =>
+      withDelay(
+        500 + index * 100,
+        withTiming(1, {
+          duration: 250,
+          easing: Easing.out(Easing.back(1.75)),
+        }),
+      ),
+    )
+  }
+
+  const playScaleAnimation = useCallback(() => {
+    animateScale(p0, 0)
+    animateScale(p1, 1)
+    animateScale(p2, 2)
+    animateScale(p3, 3)
+  }, [p0, p1, p2, p3])
+
+  useEffect(() => {
+    if (!animate) return
+    playScaleAnimation()
+  }, [animate, playScaleAnimation])
+
+  let avatars = (
+    <>
+      <AvatarBubble
+        profile={profiles[0] ?? allProfiles[0]}
+        scale={p0}
+        size={76}
+        x={-2}
+        y={-2}
+        style={[a.z_20]}
+        includeProfileBorder
+      />
+      <AvatarBubble
+        profile={profiles[1]}
+        scale={p1}
+        size={76}
+        x={42}
+        y={42}
+        style={[a.z_10]}
+        includeProfileBorder
+      />
+    </>
+  )
+
+  if (profiles.length === 3) {
+    avatars = (
+      <>
+        <AvatarBubble
+          profile={profiles[0]}
+          scale={p0}
+          size={68}
+          x={-2}
+          y={-2}
+        />
+        <AvatarBubble
+          profile={profiles[1]}
+          scale={p1}
+          size={56}
+          x={38}
+          y={62}
+        />
+        <AvatarBubble
+          profile={profiles[2]}
+          scale={p2}
+          size={46}
+          x={71}
+          y={18}
+        />
+      </>
+    )
+  }
+
+  if (profiles.length >= 4) {
+    avatars = (
+      <>
+        <AvatarBubble
+          profile={profiles[0]}
+          scale={p0}
+          size={68}
+          x={-2}
+          y={-2}
+        />
+        <AvatarBubble
+          profile={profiles[1]}
+          scale={p1}
+          size={56}
+          x={60}
+          y={49}
+        />
+        <AvatarBubble
+          profile={profiles[2]}
+          scale={p2}
+          size={42}
+          x={14}
+          y={74}
+        />
+        <AvatarBubble profile={profiles[3]} scale={p3} size={32} x={72} y={9} />
+      </>
+    )
+  }
+
+  return (
+    <Animated.View
+      style={[
+        a.p_2xs,
+        {
+          height: containerSize,
+          width: containerSize,
+        },
+      ]}>
+      <View
+        style={[
+          {
+            marginTop: marginOffset,
+            marginLeft: marginOffset,
+            transform: [{scale}],
+            transformOrigin: 'top left',
+          },
+        ]}>
+        {avatars}
+      </View>
+    </Animated.View>
+  )
+}
+
+function AvatarBubble({
+  profile,
+  scale,
+  size,
+  style,
+  x,
+  y,
+  includeProfileBorder,
+}: {
+  profile?: bsky.profile.AnyProfileView
+  scale: Animated.SharedValue<number>
+  size: number
+  style?: StyleProp<ViewStyle>
+  x: number
+  y: number
+  includeProfileBorder?: boolean
+}) {
+  const t = useTheme()
+
+  const animatedStyle = useAnimatedStyle(() => ({
+    transform: [
+      {translateX: x},
+      {translateY: y},
+      {scale: interpolate(scale.get(), [0, 1], [0, 1])},
+    ],
+  }))
+
+  return (
+    <Animated.View
+      style={[
+        a.absolute,
+        a.rounded_full,
+        a.flex_grow_0,
+        {transform: [{translateX: x}, {translateY: y}]},
+        includeProfileBorder && {
+          borderColor: t.atoms.text_inverted.color,
+          borderWidth: 2,
+        },
+        style,
+        animatedStyle,
+      ]}>
+      {profile ? (
+        <Avatar profile={profile} size={size} />
+      ) : (
+        <AvatarPlaceholder size={size} />
+      )}
+    </Animated.View>
+  )
+}
+
+function Avatar({
+  profile,
+  size = 76,
+}: {
+  profile: bsky.profile.AnyProfileView
+  size?: number
+}) {
+  return (
+    <UserAvatar
+      avatar={profile.avatar}
+      size={size}
+      type="user"
+      hideLiveBadge
+      noBorder
+    />
+  )
+}
+
+function AvatarPlaceholder({size = 76}: {size?: number}) {
+  const t = useTheme()
+
+  return (
+    <View
+      style={[
+        a.align_center,
+        a.justify_center,
+        a.rounded_full,
+        t.atoms.bg_contrast_200,
+        {
+          width: size,
+          height: size,
+        },
+      ]}>
+      <PersonIcon
+        width={size * 0.5}
+        height={size * 0.5}
+        fill={t.atoms.text_inverted.color}
+      />
+    </View>
+  )
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric Bailey	df5f7d7c10	Add gate debug code	2026-04-15 20:34:14 -05:00
Spence Pope	e804546809	[APP-1934] replace image grid layout with carousel (#10157 ) Co-authored-by: RetroSunstar <57507616+RetroSunstar@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Eric Bailey <git@esb.lol>	2026-04-15 17:53:01 -05:00
Samuel Newman	d3f5093817	Groupchats feature branch (#10181 ) Co-authored-by: DS Boyce <260543580+ds-boyce@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-15 12:15:45 -07:00
DS Boyce	75c9e2c181	Upgrade eslint-plugin-simple-import-sort to latest (#10260 )	2026-04-15 11:00:34 -07:00
DS Boyce	b9561f78ee	Enforce using named imports from 'react' (#10259 )	2026-04-15 10:11:09 -07:00
Samuel Newman	19e2dc939a	[bskyembed] Fix landing page for iOS 26 safari dark mode (#10257 )	2026-04-15 10:05:22 -07:00
Samuel Newman	ecc78efb12	Stop passing `_` around in composer functions (#10256 )	2026-04-15 07:39:51 -07:00
pfrazee	bcbc114189	Nightly source-language update	2026-04-15 03:14:26 +00:00
Spence Pope	8d3eba2381	[ALG-77] include 'for you' in see more suggested users (#10241 )	2026-04-14 17:50:00 -05:00
Eric Bailey	59a2d19c26	Fix stale searchText in search submit handler (#10251 ) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 17:42:43 -05:00
pfrazee	eee2df6d3a	Nightly source-language update	2026-04-14 03:15:02 +00:00
Samuel Newman	c56427c6fb	Fix inverted condition in moveIfNecessary (#10238 ) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-13 09:42:57 -07:00
Samuel Newman	9c502b38e5	Disable viewport zoom in prod (#10233 )	2026-04-13 09:42:37 -07:00
Samuel Newman	1f6d6d0545	Fix embed options border radius (#10237 )	2026-04-13 09:42:05 -07:00
Samuel Newman	27d1b96e73	Fix bskyembed skeleton padding (#10236 ) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-13 09:41:14 -07:00
Samuel Newman	5d0b900719	Fix server state query returning undefined (#10232 ) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-12 13:14:21 -05:00
Spence Pope	9b31bb8470	handle single-line text truncation (#10227 )	2026-04-12 01:48:58 -07:00
Samuel Newman	02daa0179b	use dvh for `util_screen_outer` (#10230 )	2026-04-11 10:08:02 +03:00
pfrazee	ff294edd1e	Nightly source-language update	2026-04-11 03:11:48 +00:00
bnewbold	a7b6cd4504	bskyweb: update to golang v1.26 (#10208 )	2026-04-10 10:25:40 -07:00
Samuel Newman	888eca73b3	Refactor chat list implementation (#10059 )	2026-04-10 09:58:16 -07:00
Samuel Newman	2c717dc1e7	Rename moderation link in settings to "Moderation and content filters" (#10192 )	2026-04-10 09:50:30 -07:00
Artem Pyvovar	ff68e4036d	Disable keyboard preload on iOS to prevent keyboard flash (#10214 )	2026-04-10 09:50:17 -07:00
Misty De Méo	170e169ad1	PostControls: restore likeCount testID (#10221 )	2026-04-10 09:50:03 -07:00
Samuel Newman	19df58f1ef	Remove direct dependency on `@expo/config-plugins` (#10152 )	2026-04-10 09:49:41 -07:00
Samuel Newman	c79dff9b3e	Tweak embed styles (#10226 )	2026-04-10 09:35:22 -07:00
Spence Pope	13b453e506	[APP-2065] yassify app embed (#10210 )	2026-04-10 09:08:09 -07:00
Eric Bailey	d8fdfddbaf	Check for undefined moderationOpts (#10224 )	2026-04-10 10:23:36 -05:00
Eric Bailey	ff30d39355	Remove flex to fix view collapse (#10219 )	2026-04-10 09:37:06 -05:00
pfrazee	9c65a8a78c	Nightly source-language update	2026-04-10 03:14:50 +00:00
Eric Bailey	8c9a11dc3f	[APP-1775] Handle labels on actor statuses (#9716 )	2026-04-09 15:52:45 -05:00
Samuel Newman	d01362a01e	Bump version to v1.121.0 (#10215 )	2026-04-09 22:34:27 +03:00
DS Boyce	3ff40e9603	Update / hotkey to support all keyboard layouts (#10212 )	2026-04-09 14:07:09 -05:00
Eric Bailey	cfeac097e1	[APP-2044] Gate image blob size increase (#10178 )	2026-04-09 14:06:25 -05:00
Eric Bailey	c42940b0ad	DM composer fixes (#10213 )	2026-04-09 13:47:29 -05:00
Samuel Newman	a0d4af5c5f	Add font smoothing stuff to embed (#10204 )	2026-04-09 06:12:20 -07:00
Samuel Newman	5ad3597fdb	Add simple video player to embed (#10205 )	2026-04-09 06:12:06 -07:00
pfrazee	987a656904	Nightly source-language update	2026-04-09 03:13:30 +00:00
DS Boyce	d0d00ba9f8	Address lint warnings (#10188 )	2026-04-08 15:54:43 -07:00
Eric Bailey	e4b4e48acb	Prep 1.120.0 release (#10207 )	2026-04-08 13:58:16 -05:00
RetroSunstar	925ae29b5f	Bump expo-paste-input to ^0.1.15 (#10203 )	2026-04-08 13:50:12 -05:00
Eric Bailey	f6b8854a9b	Bump xcode in workflows (#10201 )	2026-04-07 21:37:05 -05:00
Eric Bailey	3d0fbc5030	Prep 1.120.0 release (#10200 )	2026-04-07 21:06:19 -05:00
Eric Bailey	0a5ae17738	New rich text composer + autocomplete (#10159 )	2026-04-07 20:37:50 -05:00
Samuel Newman	02b849996c	Double the framerate (#8446 )	2026-04-07 14:13:24 -07:00
Samuel Newman	f231b67b76	Tweak missing feed copy (#10133 )	2026-04-07 15:25:22 -05:00
Samuel Newman	d2519a4f67	RM unneeded config plugin, update primary color (#10153 )	2026-04-07 15:21:03 -05:00
DS Boyce	a049a6538c	Use new endpoints for suggested users (#10185 )	2026-04-07 15:10:23 -05:00
DS Boyce	3c21fee6c2	Don't call getProfiles if there are no actors (#10196 )	2026-04-07 11:55:03 -07:00
DS Boyce	e74b57ab78	Update browserslist (#10195 )	2026-04-07 11:43:58 -07:00
Samuel Newman	a169bd862f	Fix layout shift when liking a post on Android (#10190 )	2026-04-07 09:48:11 -07:00
Eric Bailey	8bd6d9d135	Revert PostThread parent chunk size for native (#10193 )	2026-04-07 10:58:47 -05:00
pfrazee	5868804d3b	Nightly source-language update	2026-04-07 03:13:28 +00:00
Eric Bailey	bdce8e8ecd	Bump expo-paste-input (#10187 )	2026-04-06 18:50:28 -05:00
Eric Bailey	99257f2816	Add some more clarity to the RQ docs (#10120 )	2026-04-06 18:45:40 -05:00
Spence Pope	011d8d2f7c	[APP-2038] fix feeds not refreshing (#10167 ) Co-authored-by: Eric Bailey <git@esb.lol>	2026-04-06 17:34:01 -05:00
Spence Pope	c0d3010f3e	[APP-1999] Fix ReportDialog Android hang by narrowing dependency arrays (#10171 ) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-06 16:46:31 -05:00
Samuel Newman	3685439ffb	Minor hotkeys nit (#10184 )	2026-04-06 07:48:45 -07:00
RetroSunstar	165dd5a779	Fixes Hotkeys causing native to crash immediately on start (#10180 )	2026-04-06 09:50:14 -04:00
pfrazee	84b026efb7	Nightly source-language update	2026-04-04 03:09:51 +00:00
Samuel Newman	be56066ee9	Fix OOM crash - disable tanstack extension integration (#10169 )	2026-04-03 11:31:55 -07:00
DS Boyce	cca3326b21	Create global keyboard shortcut handler (#10145 )	2026-04-03 10:06:51 -07:00
DS Boyce	e0ea778e58	Warn when useState get/set names mismatch (#10166 )	2026-04-02 15:47:56 -07:00
Samuel Newman	9fe808f8a8	Fix bottom bar badge text padding (#10162 )	2026-04-02 11:51:54 -07:00
Samuel Newman	b9f3d04d65	Scale profile badge icons with font size (#10161 )	2026-04-02 11:51:38 -07:00
Samuel Newman	68a4d73d61	Add `no-extraneous-dependencies` and `no-nodejs-modules` eslint rules (#10151 )	2026-04-02 08:34:12 -07:00
Samuel Newman	eb566c5fcc	Fix `useResolveUriQuery` (#10163 )	2026-04-02 06:39:40 -07:00
pfrazee	512e550c2e	Nightly source-language update	2026-04-02 03:13:26 +00:00
Samuel Newman	500fc1c934	Update React Query to latest (#10126 )	2026-04-01 15:39:26 -07:00
Arunabh Verma	b196ddef73	Replace react-native-paste-input with expo-paste-input (#10158 ) Co-authored-by: Eric Bailey <git@esb.lol>	2026-04-01 16:25:16 -05:00
DS Boyce	5a2135733f	Handle more translation errors (#10160 )	2026-04-01 13:39:05 -07:00
Samuel Newman	69164c640f	Keep screen awake when videos are playing (#10155 )	2026-04-01 13:07:02 -05:00
Samuel Newman	f30acadc73	Hide alt text note after alt text is added (#10132 )	2026-04-01 13:00:11 -05:00
DS Boyce	9b20023c86	Fix Safari layout shift issue with SubtleHover (#10135 )	2026-04-01 09:12:11 -07:00
DS Boyce	e8ee30398a	Update Search to use ALF atoms (#10146 ) Co-authored-by: Samuel Newman <mozzius@protonmail.com>	2026-04-01 09:11:27 -07:00
pfrazee	6897116625	Nightly source-language update	2026-04-01 03:13:49 +00:00
DS Boyce	2262040797	Display see more link for suggested users in profile header (#10134 )	2026-03-31 14:54:51 -07:00
Samuel Newman	498d321bb1	Change other borderWidths from 2 to 1 (#10156 )	2026-03-31 09:35:31 -07:00
Samuel Newman	a697841a21	Update `typescript-eslint`, fix up eslint setup (#10150 )	2026-03-31 06:00:56 -07:00
DS Boyce	8ac63d780d	Update emoji regex to detect variations and sequences (#10138 )	2026-03-30 05:30:33 -07:00
Eric Bailey	0419066f45	Add fmt patch to react-native (#10136 )	2026-03-26 22:53:41 -05:00
pfrazee	1463323289	Nightly source-language update	2026-03-27 03:13:48 +00:00
DS Boyce	f4e14626aa	Add button for creating a new group clip clop (#10066 ) Co-authored-by: Samuel Newman <mozzius@protonmail.com>	2026-03-26 10:23:49 -07:00
RetroSunstar	ce000ada50	Fix 'Lists' & 'Feeds' not displaying their contents on muted profiles (#10101 )	2026-03-26 02:49:36 -07:00
pfrazee	4d0774b75e	Nightly source-language update	2026-03-26 03:14:00 +00:00
Eric Bailey	bc7b6f1e13	Fix clip issue (#10131 )	2026-03-25 17:17:47 -05:00
DS Boyce	d44060a34e	Pass correct log context to suggested user metrics (#10074 )	2026-03-25 17:13:23 -05:00
DS Boyce	2c828b5755	Fix text overflow in post meta on web (#10122 )	2026-03-25 12:59:04 -07:00
Samuel Newman	c06312f09a	PostThread perf: reduce time wasted on rendering skeletons (#10092 )	2026-03-25 12:44:36 -07:00
Samuel Newman	cc5580848c	Upgrade TypeScript to 6.0 (#10113 )	2026-03-25 00:50:26 -07:00
Samuel Newman	fa84c451d0	Fix draft restore to calculate shortened grapheme length for links (#10103 ) Co-authored-by: Claude <noreply@anthropic.com>	2026-03-24 15:31:19 -05:00
Paweł Fornagiel	894e2b89d4	fix: too many re-renders when toggling experimental feed sampling option (#10114 )	2026-03-24 14:59:01 -05:00
Eric Bailey	3e37696d88	Add resolution downsizing to image compression (#10117 )	2026-03-24 14:34:51 -05:00
Eric Bailey	6a15ca88b6	Update redirect service (#10116 )	2026-03-24 10:10:35 -05:00
Eric Bailey	5a6942025c	Add metrics to redirect service (#10112 )	2026-03-24 08:45:08 -05:00
pfrazee	3866142ccd	Nightly source-language update	2026-03-24 03:09:20 +00:00
Samuel Newman	7fd6f8f04b	Update version to v1.120.0 (#10110 )	2026-03-23 22:05:43 +02:00
DS Boyce	21d8b07bfe	Use isTranslationSupported from expo-translate-text (#10108 )	2026-03-23 09:56:35 -07:00
Samuel Newman	f08bf5fef9	Fix report dialog flashing error state on open (#10099 )	2026-03-23 09:19:57 -07:00
Samuel Newman	3e7e859c9c	[Web] Fix Wordle score rendering - prevent Inter from overriding emoji presentation (#10104 )	2026-03-23 09:19:33 -07:00
Samuel Newman	854ae60e7b	[Web] Fix clipped text when using `numberOfLines={1}` (#10105 )	2026-03-23 09:17:49 -07:00
Eric Bailey	cc4a436e45	Bump version to 1.119.1 (#10088 )	2026-03-20 12:04:12 -05:00
Eric Bailey	0532e120b8	Prep 1.119.1 (#10087 )	2026-03-20 11:52:46 -05:00
Samuel Newman	288fad67f4	Fix bottom sheet crash on API <30 (#10084 ) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-03-20 11:41:39 -05:00
DS Boyce	0e1e790c34	Include recId with log event for suggested profiles (#10075 )	2026-03-20 11:39:51 -05:00
Eric Bailey	74d8ca8fa7	Increase parent batch size to reduce onStartReached calls (#10086 )	2026-03-20 11:38:52 -05:00
Eric Bailey	34d8c6fe58	[APP-1968] Increase image upload resolution (#10073 )	2026-03-20 11:22:36 -05:00
Samuel Newman	5bcb909081	Remove hardcoded yellows (#10083 )	2026-03-20 11:21:16 -05:00
Samuel Newman	e28f6d2f37	Add bookmarks to thread placeholder candidates (#10080 ) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-03-20 11:20:27 -05:00
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10a10 10 0 0 1-4.136-.893l-4.68.876A1 1 0 0 1 2.02 20.8l.93-4.537A10 10 0 0 1 2 12C2 6.477 6.477 2 12 2Zm0 2a8 8 0 0 0-7.111 11.668 1 1 0 0 1 .09.66l-.7 3.415 3.537-.662c.214-.04.435-.009.63.088A8 8 0 1 0 12 4Zm0 4a1 1 0 0 1 1 1v2h2a1 1 0 1 1 0 2h-2v2a1 1 0 1 1-2 0v-2H9a1 1 0 1 1 0-2h2V9a1 1 0 0 1 1-1Z"/></svg>`