Combine SubtleWebHover and SubtleHover, default to web only for all cases

2025-10-10 14:55:21 -05:00
227 changed files with 69841 additions and 70741 deletions
@@ -50,8 +50,8 @@ jobs:

      - uses: actions/setup-java@v4
        with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'

      - name: ⚙️ Install dependencies
        run: yarn install
@@ -96,7 +96,7 @@ jobs:
        id: timestamp
        uses: nanzm/get-time-action@master
        with:
-          format: "MM-DD-HH-mm-ss"
+          format: 'MM-DD-HH-mm-ss'

      - name: 🚀 Upload Production Artifact
        id: upload-artifact-production
@@ -146,11 +146,6 @@ jobs:
          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

-      - name: 🧹 Clear Metro cache
-        if: ${{ inputs.profile == 'production' }}
-        # https://github.com/expo/eas-cli/issues/2959#issuecomment-2749791326
-        run: rm -rf ${TMPDIR:-/tmp}/metro-cache
-
      - name: 🏗️ Build Production APK
        if: ${{ inputs.profile == 'production' }}
        run: >
@@ -187,11 +182,11 @@ jobs:
      - name: ⬇️ Restore Cache
        id: get-base-commit
        uses: actions/cache@v4
-        if: ${{ inputs.profile == 'testflight-android' }}
+        if: ${{ inputs.profile == 'testflight' }}
        with:
          path: most-recent-testflight-commit.txt
          key: most-recent-testflight-commit

      - name: ✏️ Write commit hash to cache
-        if: ${{ inputs.profile == 'testflight-android' }}
+        if: ${{ inputs.profile == 'testflight' }}
        run: echo ${{ github.sha }} > most-recent-testflight-commit.txt
@@ -15,7 +15,7 @@ jobs:
  build:
    if: github.repository == 'bluesky-social/social-app'
    name: Build and Submit iOS
-    runs-on: macos-26
+    runs-on: macos-15
    steps:
      - name: Check for EXPO_TOKEN
        run: >
@@ -53,7 +53,7 @@ jobs:

      - uses: maxim-lobanov/setup-xcode@v1
        with:
-          xcode-version: "26.0"
+          xcode-version: "16.4"

      - name: ☕️ Setup Cocoapods
        uses: maxim-lobanov/setup-cocoapods@v1
@@ -98,29 +98,10 @@ jobs:
          yarn use-build-number-with-bump
          eas build -p ios
          --profile ${{ inputs.profile || 'testflight' }}
-          --local --output build.tar.gz --non-interactive
-
-      - name: 📂 Extract build artifact
-        run: |
-          if [ -f "build.tar.gz" ]; then
-            echo "Extracting build.tar.gz..."
-            mkdir ios-build
-            tar -xzf build.tar.gz -C ios-build
-            echo "Extraction completed successfully"
-          else
-            echo "Archive file not found!"
-            exit 1
-          fi
+          --local --output build.ipa --non-interactive

      - name: 🚀 Deploy
-        run: eas submit -p ios --non-interactive --path ios-build/ios/build/Bluesky.ipa
-
-      - name: 🪲 Upload dSYM to Sentry
-        run: >
-          SENTRY_ORG=blueskyweb
-          SENTRY_PROJECT=app
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          yarn sentry-cli debug-files upload ios-build/ios/build/Bluesky.app.dSYM.zip --include-sources
+        run: eas submit -p ios --non-interactive --path build.ipa

      - name: 📚 Get version from package.json
        id: get-build-info
@@ -150,7 +150,7 @@ jobs:
  # GitHub actions are horrible so let's just copy paste this in
  buildIfNecessaryIOS:
    name: Build and Submit iOS
-    runs-on: macos-26
+    runs-on: macos-15
    concurrency:
      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-ios
      cancel-in-progress: true
@@ -192,7 +192,7 @@ jobs:

      - uses: maxim-lobanov/setup-xcode@v1
        with:
-          xcode-version: "26.0"
+          xcode-version: "16.2"

      - name: ☕️ Setup Cocoapods
        uses: maxim-lobanov/setup-cocoapods@v1
@@ -119,8 +119,3 @@ src/locale/locales/**/*.js

 # ogcard assets
 bskyogcard/src/assets/fonts/noto-*
-
-# bskyweb build output
-bskyweb/static/media/*.webp
-bskyweb/static/media/*.jpg
-bskyweb/static/media/*.png
@@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app
 - runScript:
    file: ../setupServer.js
    env:
-      SERVER_PATH: ""
+        SERVER_PATH: ""
 - runFlow:
    file: ../setupApp.yml
 - tapOn:
@@ -25,10 +25,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "passwordInput"
 - inputText: "hunter22"
- tapOn:
-    # hideKeyboard on ios is borked
-    # https://docs.maestro.dev/troubleshooting/known-issues#hidekeyboard-command-is-flaky
-    text: "Your account"
+- hideKeyboard
 - tapOn:
    id: "nextBtn"
 - tapOn:
@@ -37,7 +34,7 @@ appId: xyz.blueskyweb.app
 - inputText: "e2e-test"
 - extendedWaitUntil:
    visible:
-      id: "handleAvailableCheck"
+        id: "handleAvailableCheck"
 - tapOn:
    id: "nextBtn"
 - assertVisible: "Give your profile a face"
@@ -17,52 +17,63 @@ appId: xyz.blueskyweb.app
    id: "e2eGotoLists"
 - tapOn:
    id: "newUserListBtn"
- waitForAnimationToEnd
- assertVisible: "Create user list"
+- assertVisible:
+    id: "createOrEditListModal"
 - tapOn:
-    id: "editListNameInput"
+    id: "editNameInput"
 - inputText: "Good Ppl"
 - tapOn:
-    id: "editListDescriptionInput"
+    id: "editDescriptionInput"
 - inputText: "They good"
 - tapOn: "Save"
- assertNotVisible: "Create user list"
+- tapOn: "Save"
+- assertNotVisible:
+    id: "createOrEditListModal"
 - tapOn: "People"
 - assertVisible: "Good Ppl"
 - assertVisible: "They good"

 - tapOn:
-    id: "moreOptionsBtn"
+    label: "Edit display name and description via the edit curatelist modal"
+    point: "90%,9%"
 - tapOn: "Edit list details"
- assertVisible: "Edit user list"
+- assertVisible:
+    id: "createOrEditListModal"
 - tapOn:
-    id: "editListNameInput"
+    id: "editNameInput"
 - eraseText
 - inputText: "Bad Ppl"
 - hideKeyboard
 - tapOn:
-    id: "editListDescriptionInput"
+    id: "editDescriptionInput"
 - eraseText
 - inputText: "They bad"
 - tapOn: "Save"
- assertNotVisible: "Edit user list"
+- tapOn: "Save"
+- assertNotVisible:
+    id: "createOrEditListModal"
 - assertVisible: Bad Ppl
 - assertVisible: They bad

 - tapOn:
-    id: "moreOptionsBtn"
+    label: "Remove description via the edit curatelist modal"
+    point: "90%,9%"
 - tapOn: "Edit list details"
- assertVisible: "Edit user list"
+- assertVisible:
+    id: "createOrEditListModal"
 - tapOn:
-    id: "editListDescriptionInput"
+    id: "editDescriptionInput"
 - eraseText
 - tapOn: "Save"
- assertNotVisible: "Edit user list"
+- tapOn: "Save"
+- assertNotVisible:
+    id: "createOrEditListModal"
 - assertNotVisible:
    id: "listDescription"

 - tapOn:
-    id: "moreOptionsBtn"
+    label: "Delete the curatelist"
+    point: "90%,9%"
 - tapOn: "Delete List"
 - tapOn:
    id: "confirmBtn"
@@ -71,15 +82,18 @@ appId: xyz.blueskyweb.app
    id: "newUserListBtn"
 - tapOn:
    id: "newUserListBtn"
- assertVisible: "Create user list"
+- assertVisible:
+    id: "createOrEditListModal"
 - tapOn:
-    id: "editListNameInput"
+    id: "editNameInput"
 - inputText: "Good Ppl"
 - tapOn:
-    id: "editListDescriptionInput"
+    id: "editDescriptionInput"
 - inputText: "They good"
 - tapOn: "Save"
- assertNotVisible: "Create user list"
+- tapOn: "Save"
+- assertNotVisible:
+    id: "createOrEditListModal"
 - tapOn: "People"
 - assertVisible: "Good Ppl"
 - assertVisible: "They good"
@@ -19,17 +19,21 @@ appId: xyz.blueskyweb.app
    id: "moderationlistsBtn"
 - tapOn: "New list"
 - tapOn:
-    id: "editListNameInput"
+    id: "editNameInput"
 - inputText: "Muted Users"
 - tapOn:
-    id: "editListDescriptionInput"
+    id: "editDescriptionInput"
 - inputText: "Shhh"
 - tapOn: "Save"
+- tapOn: "Save"

 # view modlist
 - assertVisible: "Muted Users"
 - assertVisible: "Shhh"

+# DOES NOT WORK - THE BUTTON IS NOT ACCESSIBLE
+# IGNORING FOR NOW, FIX THE COMPONENTS IN THE NEXT RELEASE
+# BECAUSE THIS IS A LEGIT A11Y PROBLEM -sfn
 - tapOn: "Subscribe to this list"
 - tapOn: "Mute accounts"
 - tapOn: "Mute list"
@@ -30,14 +30,7 @@ appId: xyz.blueskyweb.app
 - assertVisible: "What are your interests?"
 - tapOn:
    id: "onboardingContinue"
- assertVisible: "Suggested for you"
-# mock server doesn't have suggestions api
- tapOn: "Skip to next step"
- swipe:
-    direction: "LEFT"
- swipe:
-    direction: "LEFT"
- assertVisible: "Complete onboarding and start using your account"
+- assertVisible: "You're ready to go!"
 - tapOn:
    id: "onboardingFinish"
 - tapOn:
@@ -16,8 +16,7 @@ appId: xyz.blueskyweb.app
    id: "e2eStartOnboarding"
 - tapOn: "Select an avatar"
 - waitForAnimationToEnd
- assertVisible: "Photos"
- assertVisible: "Collections"
+- assertVisible: "Search your library…"
 - tapOn:
    point: "50%,22%"
 - waitForAnimationToEnd
@@ -28,14 +27,7 @@ appId: xyz.blueskyweb.app
 - assertVisible: "What are your interests?"
 - tapOn:
    id: "onboardingContinue"
- assertVisible: "Suggested for you"
-# mock server doesn't have suggestions api
- tapOn: "Skip to next step"
- swipe:
-    direction: "LEFT"
- swipe:
-    direction: "LEFT"
- assertVisible: "Complete onboarding and start using your account"
+- assertVisible: "You're ready to go!"
 - tapOn:
    id: "onboardingFinish"
 - tapOn:
@@ -31,8 +31,6 @@ appId: xyz.blueskyweb.app
      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
    id: "replyBtn"
- tapOn:
-    id: "replyBtn"
 - inputText: "Reply 1"
 - tapOn:
    id: "composerPublishBtn"
@@ -71,8 +69,6 @@ appId: xyz.blueskyweb.app
    id: "profilePager-selector-1"
 - tapOn:
    id: "replyBtn"
- tapOn:
-    id: "replyBtn"
 - inputText: "Reply 2"
 - tapOn:
    id: "composerPublishBtn"
@@ -1,18 +1,18 @@
 appId: xyz.blueskyweb.app
 ---
 - launchApp:
-    appId: "xyz.blueskyweb.app"
-    clearState: true
+   appId: "xyz.blueskyweb.app"
+   clearState: true
 - waitForAnimationToEnd
 - tapOn: "http://localhost:8081"
 - waitForAnimationToEnd
 - extendedWaitUntil:
    visible: "Continue"
 - swipe:
-    from: "Bluesky"
-    direction: DOWN
-    duration: 100
+   from: "Bluesky"
+   direction: DOWN
 - tapOn:
-    id: e2eProxyHeaderInput
+   id: e2eProxyHeaderInput
 - inputText: ${output.result}
 - pressKey: Enter
+- hideKeyboard
@@ -378,7 +378,6 @@ describe('parseEmbedPlayerFromUrl', () => {
    'https://music.apple.com/us/playlist/playlistName/playlistId',
    'https://music.apple.com/us/album/albumName/albumId',
    'https://music.apple.com/us/album/albumName/albumId?i=songId',
-    'https://music.apple.com/us/song/songName/songId',

    'https://vimeo.com/videoId',
    'https://vimeo.com/videoId?autoplay=0',
@@ -605,11 +604,6 @@ describe('parseEmbedPlayerFromUrl', () => {
      playerUri:
        'https://embed.music.apple.com/us/album/albumName/albumId?i=songId',
    },
-    {
-      type: 'apple_music_song',
-      source: 'appleMusic',
-      playerUri: 'https://embed.music.apple.com/us/song/songName/songId',
-    },

    {
      type: 'vimeo_video',
@@ -11,7 +11,7 @@ module.exports = function (_config) {
   *
   * @see https://docs.expo.dev/build-reference/variables/#built-in-environment-variables
   */
-  const PLATFORM = process.env.EAS_BUILD_PLATFORM ?? 'web'
+  const PLATFORM = process.env.EAS_BUILD_PLATFORM

  const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
  const IS_PRODUCTION = process.env.EXPO_PUBLIC_ENV === 'production'
@@ -40,7 +40,7 @@ module.exports = function (_config) {
      runtimeVersion: {
        policy: 'appVersion',
      },
-      icon: './assets/app-icons/ios_icon_default_next.png',
+      icon: './assets/app-icons/ios_icon_default_light.png',
      userInterfaceStyle: 'automatic',
      primaryColor: '#1083fe',
      newArchEnabled: false,
@@ -50,10 +50,6 @@ module.exports = function (_config) {
        config: {
          usesNonExemptEncryption: false,
        },
-        icon:
-          PLATFORM === 'web' // web build doesn't like .icon files
-            ? './assets/app-icons/ios_icon_default_next.png'
-            : './assets/app-icons/ios_icon_default.icon',
        infoPlist: {
          UIBackgroundModes: ['remote-notification'],
          NSCameraUsageDescription:
@@ -116,34 +112,6 @@ module.exports = function (_config) {
          'com.apple.security.application-groups': 'group.app.bsky',
        },
        privacyManifests: {
-          NSPrivacyCollectedDataTypes: [
-            {
-              NSPrivacyCollectedDataType: 'NSPrivacyCollectedDataTypeCrashData',
-              NSPrivacyCollectedDataTypeLinked: false,
-              NSPrivacyCollectedDataTypeTracking: false,
-              NSPrivacyCollectedDataTypePurposes: [
-                'NSPrivacyCollectedDataTypePurposeAppFunctionality',
-              ],
-            },
-            {
-              NSPrivacyCollectedDataType:
-                'NSPrivacyCollectedDataTypePerformanceData',
-              NSPrivacyCollectedDataTypeLinked: false,
-              NSPrivacyCollectedDataTypeTracking: false,
-              NSPrivacyCollectedDataTypePurposes: [
-                'NSPrivacyCollectedDataTypePurposeAppFunctionality',
-              ],
-            },
-            {
-              NSPrivacyCollectedDataType:
-                'NSPrivacyCollectedDataTypeOtherDiagnosticData',
-              NSPrivacyCollectedDataTypeLinked: false,
-              NSPrivacyCollectedDataTypeTracking: false,
-              NSPrivacyCollectedDataTypePurposes: [
-                'NSPrivacyCollectedDataTypePurposeAppFunctionality',
-              ],
-            },
-          ],
          NSPrivacyAccessedAPITypes: [
            {
              NSPrivacyAccessedAPIType:
@@ -175,11 +143,12 @@ module.exports = function (_config) {
        barStyle: 'light-content',
      },
      android: {
-        icon: './assets/app-icons/android_icon_default_next.png',
+        icon: './assets/app-icons/android_icon_default_light.png',
        adaptiveIcon: {
          foregroundImage: './assets/icon-android-foreground.png',
-          monochromeImage: './assets/icon-android-monochrome.png',
-          backgroundColor: '#006AFF',
+          monochromeImage: './assets/icon-android-foreground.png',
+          backgroundImage: './assets/icon-android-background.png',
+          backgroundColor: '#1185FE',
        },
        googleServicesFile: './google-services.json',
        package: 'xyz.blueskyweb.app',
@@ -326,13 +295,18 @@ module.exports = function (_config) {
             * Default set
             */
            default_light: {
-              ios: './assets/app-icons/ios_icon_legacy_light.png',
-              android: './assets/app-icons/android_icon_legacy_light.png',
+              ios: './assets/app-icons/ios_icon_default_light.png',
+              android: './assets/app-icons/android_icon_default_light.png',
              prerendered: true,
            },
            default_dark: {
-              ios: './assets/app-icons/ios_icon_legacy_dark.png',
-              android: './assets/app-icons/android_icon_legacy_dark.png',
+              ios: './assets/app-icons/ios_icon_default_dark.png',
+              android: './assets/app-icons/android_icon_default_dark.png',
+              prerendered: true,
+            },
+            next: {
+              ios: './assets/app-icons/icon_default_next.png',
+              android: './assets/app-icons/icon_default_next.png',
              prerendered: true,
            },

@@ -1,31 +0,0 @@
-{
-  "fill" : {
-    "automatic-gradient" : "srgb:0.00000,0.41569,1.00000,1.00000"
-  },
-  "groups" : [
-    {
-      "layers" : [
-        {
-          "fill" : "none",
-          "glass" : false,
-          "image-name" : "iOS transparent.png",
-          "name" : "iOS transparent"
-        }
-      ],
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}
@@ -1,10 +0,0 @@
-<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>
@@ -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 bg-white text-black hover:bg-neutral-50 dark:bg-dimmedBg dark:hover:bg-dimmedBgLighten relative transition-colors max-w-[600px] min-w-[300px] flex border dark:border-slate-600 dark:text-slate-200 rounded-xl"
      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 px-4 pt-3 pb-2.5 max-w-full">{children}</div>
    </div>
  )
 }
@@ -83,9 +83,9 @@ export function Embed({
        return (
          <Link
            href={`/profile/${record.author.did}/post/${getRkey(record)}`}
-            className="transition-colors hover:bg-blue-50 dark:hover:bg-slate-900 border dark:border-slate-600 rounded-xl p-2 gap-1.5 w-full flex flex-col">
+            className="transition-colors hover:bg-neutral-100 dark:hover:bg-slate-700 border dark:border-slate-600 rounded-xl p-2 gap-1.5 w-full flex flex-col">
            <div className="flex gap-1.5 items-center">
-              <div className="w-4 h-4 rounded-full bg-neutral-300 dark:bg-slate-900 shrink-0">
+              <div className="w-4 h-4 rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
                <img
                  className="rounded-full"
                  src={record.author.avatar}
@@ -222,7 +222,7 @@ export function Embed({

 function Info({children}: {children: ComponentChildren}) {
  return (
-    <div className="w-full rounded-xl border py-2 px-2.5 flex-row flex gap-2 hover:bg-blue-50 dark:border-slate-600 dark:hover:bg-slate-900">
+    <div className="w-full rounded-xl border py-2 px-2.5 flex-row flex gap-2 bg-neutral-50">
      <img src={infoIcon} className="w-4 h-4 shrink-0 mt-0.5" />
      <p className="text-sm text-textLight dark:text-textDimmed">{children}</p>
    </div>
@@ -6,10 +6,10 @@ import {
 } from '@atproto/api'
 import {h} from 'preact'

-import logo from '../../assets/logo_full_name.svg'
-import {Like as LikeIcon} from '../icons/Like'
-import {Reply as ReplyIcon} from '../icons/Reply'
-import {Repost as RepostIcon} from '../icons/Repost'
+import replyIcon from '../../assets/bubble_filled_stroke2_corner2_rounded.svg'
+import likeIcon from '../../assets/heart2_filled_stroke2_corner0_rounded.svg'
+import logo from '../../assets/logo.svg'
+import repostIcon from '../../assets/repost_stroke2_corner2_rounded.svg'
 import {CONTENT_LABELS} from '../labels'
 import * as bsky from '../types/bsky'
 import {niceDate} from '../util/nice-date'
@@ -45,13 +45,10 @@ export function Post({thread}: Props) {
  const verification = getVerificationState({profile: post.author})

  const href = `/profile/${post.author.did}/post/${getRkey(post)}`
-
  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"
-        lang={record?.langs?.[0]}>
-        <div className="flex gap-2.5 items-center cursor-pointer w-full max-w-full ">
+      <div className="flex-1 flex-col flex gap-2" lang={record?.langs?.[0]}>
+        <div className="flex gap-2.5 items-center cursor-pointer w-full max-w-full">
          <Link
            href={`/profile/${post.author.did}`}
            className="rounded-full shrink-0">
@@ -83,65 +80,56 @@ export function Post({thread}: Props) {
              @{post.author.handle}
            </Link>
          </div>
+          <Link
+            href={href}
+            className="transition-transform hover:scale-110 shrink-0 self-start">
+            <img src={logo} className="h-8" />
+          </Link>
        </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>
-          <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>
-        </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 href={href}>
+          <time
+            datetime={new Date(post.indexedAt).toISOString()}
+            className="text-textLight dark:text-textDimmed mt-1 text-sm hover:underline">
+            {niceDate(post.indexedAt)}
+          </time>
        </Link>
+        <div className="border-t dark:border-slate-600 w-full pt-2.5 flex items-center gap-5 text-sm cursor-pointer">
+          {!!post.likeCount && (
+            <div className="flex items-center gap-2 cursor-pointer">
+              <img src={likeIcon} className="w-5 h-5" />
+              <p className="font-bold text-neutral-500 dark:text-neutral-300 mb-px">
+                {prettyNumber(post.likeCount)}
+              </p>
+            </div>
+          )}
+          {!!post.repostCount && (
+            <div className="flex items-center gap-2 cursor-pointer">
+              <img src={repostIcon} className="w-5 h-5" />
+              <p className="font-bold text-neutral-500 dark:text-neutral-300 mb-px">
+                {prettyNumber(post.repostCount)}
+              </p>
+            </div>
+          )}
+          <div className="flex items-center gap-2 cursor-pointer">
+            <img src={replyIcon} className="w-5 h-5" />
+            <p className="font-bold text-neutral-500 dark:text-neutral-300 mb-px">
+              Reply
+            </p>
+          </div>
+          <div className="flex-1" />
+          <p className="cursor-pointer text-brand dark:text-brandLighten font-bold hover:underline hidden min-[450px]:inline">
+            {post.replyCount
+              ? `Read ${prettyNumber(post.replyCount)} ${
+                  post.replyCount > 1 ? 'replies' : 'reply'
+                } on Bluesky`
+              : `View on Bluesky`}
+          </p>
+          <p className="cursor-pointer text-brand font-bold hover:underline min-[450px]:hidden">
+            <span className="hidden min-[380px]:inline">View on </span>Bluesky
+          </p>
+        </div>
      </div>
    </Container>
  )
@@ -1,28 +0,0 @@
-import {h} from 'preact'
-
-export const Like = ({
-  width = 16,
-  height = 17,
-  fill = 'currentColor',
-  className,
-}: {
-  width?: number
-  height?: number
-  fill?: string
-  className?: string
-}) => (
-  <svg
-    className={className}
-    width={width}
-    height={height}
-    viewBox="0 0 16 17"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M11.1561 3.62664C10.3307 3.44261 9.35086 3.65762 8.47486 4.54615C8.34958 4.67323 8.17857 4.74478 8.00012 4.74478C7.82167 4.74478 7.65066 4.67324 7.52538 4.54616C6.64938 3.65762 5.66955 3.44261 4.84416 3.62664C4.0022 3.81438 3.25812 4.43047 2.89709 5.33069C2.21997 7.01907 2.83524 10.1257 8.00015 13.1315C13.165 10.1257 13.7803 7.01906 13.1032 5.33069C12.7421 4.43047 11.998 3.81437 11.1561 3.62664ZM14.3407 4.83438C15.4101 7.50098 14.0114 11.2942 8.32611 14.4808C8.12362 14.5943 7.87668 14.5943 7.6742 14.4808C1.98891 11.2942 0.590133 7.501 1.65956 4.83439C2.1788 3.53968 3.26862 2.61187 4.55399 2.32527C5.68567 2.07294 6.92237 2.32723 8.00012 3.18278C9.07786 2.32723 10.3146 2.07294 11.4462 2.32526C12.7316 2.61186 13.8214 3.53967 14.3407 4.83438Z"
-      fill={fill}
-    />
-  </svg>
-)
@@ -1,28 +0,0 @@
-import {h} from 'preact'
-
-export const Reply = ({
-  width = 16,
-  height = 17,
-  fill = 'currentColor',
-  className,
-}: {
-  width?: number
-  height?: number
-  fill?: string
-  className?: string
-}) => (
-  <svg
-    className={className}
-    width={width}
-    height={height}
-    viewBox="0 0 16 17"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M1.3335 4.23242C1.3335 3.12785 2.22893 2.23242 3.3335 2.23242H12.6668C13.7714 2.23242 14.6668 3.12785 14.6668 4.23242V10.8991C14.6668 12.0037 13.7714 12.8991 12.6668 12.8991H8.18482L5.00983 14.8041C4.80387 14.9277 4.54737 14.9309 4.33836 14.8126C4.12936 14.6942 4.00016 14.4726 4.00016 14.2324V12.8991H3.3335C2.22893 12.8991 1.3335 12.0037 1.3335 10.8991V4.23242ZM3.3335 3.56576C2.96531 3.56576 2.66683 3.86423 2.66683 4.23242V10.8991C2.66683 11.2673 2.96531 11.5658 3.3335 11.5658H4.66683C5.03502 11.5658 5.3335 11.8642 5.3335 12.2324V13.055L7.65717 11.6608C7.76078 11.5986 7.87933 11.5658 8.00016 11.5658H12.6668C13.035 11.5658 13.3335 11.2673 13.3335 10.8991V4.23242C13.3335 3.86423 13.035 3.56576 12.6668 3.56576H3.3335Z"
-      fill={fill}
-    />
-  </svg>
-)
@@ -1,26 +0,0 @@
-import {h} from 'preact'
-
-export const Repost = ({
-  width = 16,
-  height = 17,
-  fill = 'currentColor',
-  className,
-}: {
-  width?: number
-  height?: number
-  fill?: string
-  className?: string
-}) => (
-  <svg
-    className={className}
-    width={width}
-    height={height}
-    viewBox="0 0 16 17"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg">
-    <path
-      d="M3.86204 9.76164C4.12239 9.50134 4.54442 9.50131 4.80475 9.76164C5.06503 10.022 5.06503 10.444 4.80475 10.7044L3.94277 11.5663H11.3334C12.0697 11.5663 12.6667 10.9693 12.6667 10.233V8.89966C12.6667 8.53147 12.9652 8.233 13.3334 8.233C13.7015 8.23305 14.0001 8.53151 14.0001 8.89966V10.233C14.0001 11.7057 12.8061 12.8996 11.3334 12.8997H3.94277L4.80475 13.7616C5.06503 14.022 5.06503 14.444 4.80475 14.7044C4.54442 14.9647 4.12239 14.9646 3.86204 14.7044L2.3334 13.1757C1.8127 12.655 1.8127 11.811 2.3334 11.2903L3.86204 9.76164ZM2.00006 7.56633V6.233C2.00006 4.76024 3.19397 3.56633 4.66673 3.56633H12.0574L11.1954 2.70435C10.935 2.444 10.935 2.02199 11.1954 1.76164C11.4557 1.50134 11.8778 1.50131 12.1381 1.76164L13.6667 3.29029C14.1873 3.81096 14.1873 4.65503 13.6667 5.17571L12.1381 6.70435C11.8778 6.96468 11.4557 6.96465 11.1954 6.70435C10.935 6.444 10.935 6.02199 11.1954 5.76164L12.0574 4.89966H4.66673C3.93035 4.89966 3.3334 5.49662 3.3334 6.233V7.56633C3.3334 7.93449 3.03487 8.23294 2.66673 8.233C2.29854 8.233 2.00006 7.93452 2.00006 7.56633Z"
-      fill={fill}
-    />
-  </svg>
-)
@@ -15,7 +15,7 @@ import {redirectLogger} from '../logger.js'

 const SAFELINK_MIN_FETCH_INTERVAL = 1_000
 const SAFELINK_MAX_FETCH_INTERVAL = 10_000
-const SCHEME_REGEX = /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//
+const SCHEME_REGEX = /^[a-zA-Z][a-zA-Z0-9+.-]*:/

 export class SafelinkClient {
  private domainCache: LRUCache<string, SafelinkRule | 'ok'>
@@ -75,7 +75,7 @@ After you do `yarn ios` and `yarn android` once, you can later just run `yarn we

 - Start in various console tabs:
  - `yarn e2e:mock-server`
-  - `yarn e2e:start`
+  - `yarn e2e:metro`
 - Run once: `yarn e2e:build`
 - Each test run: `yarn e2e:run`

@@ -12,7 +12,7 @@ values.
 ### Running Maestro tests

 - In one tab, run `yarn e2e:mock-server`
- In a second tab, run `yarn e2e:build`
+- In a second tab, run `yarn e2e:metro`
 - In a third tab, run `yarn e2e:run`

 ## Using Flashlight for Performance Testing
@@ -36,8 +36,7 @@
      "extends": "base",
      "ios": {
        "resourceClass": "large",
-        "autoIncrement": true,
-        "buildArtifactPaths": ["ios/build/*"]
+        "autoIncrement": true
      },
      "android": {
        "autoIncrement": true
@@ -51,8 +50,7 @@
      "extends": "base",
      "distribution": "internal",
      "ios": {
-        "autoIncrement": false,
-        "buildArtifactPaths": ["ios/build/*"]
+        "autoIncrement": false
      },
      "android": {
        "autoIncrement": false
@@ -65,8 +63,7 @@
    "testflight": {
      "extends": "base",
      "ios": {
-        "autoIncrement": true,
-        "buildArtifactPaths": ["ios/build/*"]
+        "autoIncrement": true
      },
      "android": {
        "autoIncrement": true
@@ -80,8 +77,7 @@
      "extends": "base",
      "distribution": "internal",
      "ios": {
-        "autoIncrement": true,
-        "buildArtifactPaths": ["ios/build/*"]
+        "autoIncrement": true
      },
      "android": {
        "autoIncrement": true
@@ -1,6 +1,6 @@
 {
  "name": "bsky.app",
-  "version": "1.110.0",
+  "version": "1.109.0",
  "private": true,
  "engines": {
    "node": ">=20"
@@ -46,9 +46,8 @@
    "lint-native:fix": "swiftlint --fix ./modules && ktlint --format ./modules",
    "typecheck": "tsc --project ./tsconfig.check.json",
    "e2e:mock-server": "NODE_ENV=development ./jest/dev-infra/with-test-redis-and-db.sh ts-node --project tsconfig.e2e.json __e2e__/mock-server.ts",
-    "e2e:build": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:ios",
-    "e2e:build-android": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:android",
-    "e2e:start": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo start",
+    "e2e:metro": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:ios",
+    "e2e:metro-android": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:android",
    "e2e:run": "maestro test __e2e__",
    "perf:test": "NODE_ENV=test maestro test",
    "perf:test:run": "NODE_ENV=test maestro test __e2e__/perf-test.yml",
@@ -72,7 +71,7 @@
    "icons:optimize": "svgo -f ./assets/icons"
  },
  "dependencies": {
-    "@atproto/api": "^0.17.6",
+    "@atproto/api": "^0.17.0",
    "@bitdrift/react-native": "^0.6.8",
    "@braintree/sanitize-url": "^6.0.2",
    "@bsky.app/alf": "^0.1.5",
@@ -131,18 +130,18 @@
    "emoji-mart": "^5.5.2",
    "emoji-regex": "^10.4.0",
    "eventemitter3": "^5.0.1",
-    "expo": "^54.0.22",
+    "expo": "^54.0.9",
    "expo-application": "~7.0.7",
    "expo-blur": "~15.0.7",
    "expo-build-properties": "~1.0.9",
-    "expo-camera": "~17.0.9",
+    "expo-camera": "~17.0.8",
    "expo-clipboard": "~8.0.7",
-    "expo-dev-client": "~6.0.16",
-    "expo-device": "~8.0.9",
-    "expo-file-system": "~19.0.17",
-    "expo-font": "~14.0.9",
+    "expo-dev-client": "~6.0.12",
+    "expo-device": "~8.0.8",
+    "expo-file-system": "~19.0.14",
+    "expo-font": "~14.0.8",
    "expo-haptics": "~15.0.7",
-    "expo-image": "~3.0.10",
+    "expo-image": "~3.0.8",
    "expo-image-crop-tool": "^0.1.8",
    "expo-image-manipulator": "~14.0.7",
    "expo-image-picker": "~17.0.8",
@@ -153,15 +152,15 @@
    "expo-localization": "~17.0.7",
    "expo-location": "~19.0.7",
    "expo-media-library": "~18.2.0",
-    "expo-notifications": "~0.32.12",
+    "expo-notifications": "~0.32.11",
    "expo-screen-orientation": "~9.0.7",
    "expo-sharing": "~14.0.7",
    "expo-splash-screen": "~31.0.10",
-    "expo-system-ui": "~6.0.8",
-    "expo-task-manager": "~14.0.8",
-    "expo-updates": "~29.0.12",
-    "expo-video": "~3.0.13",
-    "expo-web-browser": "~15.0.9",
+    "expo-system-ui": "~6.0.7",
+    "expo-task-manager": "~14.0.7",
+    "expo-updates": "~29.0.11",
+    "expo-video": "~3.0.11",
+    "expo-web-browser": "~15.0.7",
    "fast-text-encoding": "^1.0.6",
    "history": "^5.3.0",
    "hls.js": "^1.6.2",
@@ -186,7 +185,7 @@
    "react-image-crop": "^11.0.7",
    "react-is": "19",
    "react-keyed-flatten-children": "^5.0.0",
-    "react-native": "0.81.5",
+    "react-native": "0.81.4",
    "react-native-compressor": "^1.13.0",
    "react-native-date-picker": "^5.0.13",
    "react-native-device-attest": "^0.1.6",
@@ -221,7 +220,7 @@
    "zod": "^3.20.2"
  },
  "devDependencies": {
-    "@atproto/dev-env": "^0.3.181",
+    "@atproto/dev-env": "^0.3.172",
    "@babel/core": "^7.26.0",
    "@babel/preset-env": "^7.26.0",
    "@babel/runtime": "^7.26.0",
@@ -229,13 +228,13 @@
    "@lingui/cli": "^4.14.1",
    "@lingui/macro": "^4.14.1",
    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
-    "@react-native/babel-preset": "0.81.5",
-    "@react-native/eslint-config": "^0.81.5",
-    "@react-native/typescript-config": "^0.81.5",
+    "@react-native/babel-preset": "0.81.4",
+    "@react-native/eslint-config": "^0.81.4",
+    "@react-native/typescript-config": "^0.81.4",
    "@sentry/webpack-plugin": "^3.2.2",
    "@testing-library/jest-native": "^5.4.3",
    "@testing-library/react-native": "^13.2.0",
-    "@types/jest": "29.5.14",
+    "@types/jest": "^29.4.0",
    "@types/lodash.chunk": "^4.2.7",
    "@types/lodash.debounce": "^4.0.7",
    "@types/lodash.isequal": "^4.5.6",
@@ -263,7 +262,7 @@
    "husky": "^8.0.3",
    "is-ci": "^3.0.1",
    "jest": "^29.7.0",
-    "jest-expo": "~54.0.13",
+    "jest-expo": "~54.0.12",
    "jest-junit": "^16.0.0",
    "lint-staged": "^13.2.3",
    "lockfile-lint": "^4.14.0",
@@ -273,13 +272,12 @@
    "react-refresh": "^0.14.0",
    "svgo": "^3.3.2",
    "ts-node": "^10.9.1",
-    "ts-plugin-sort-import-suggestions": "^1.0.4",
    "typescript": "^5.9.2",
    "webpack-bundle-analyzer": "^4.10.1"
  },
  "resolutions": {
-    "@react-native/babel-preset": "0.81.5",
-    "@react-native/normalize-colors": "0.81.5",
+    "@react-native/babel-preset": "0.81.4",
+    "@react-native/normalize-colors": "0.81.4",
    "**/@expo/image-utils": "0.8.7",
    "**/expo-constants": "18.0.8",
    "**/expo-device": "7.1.4",
@@ -1,389 +0,0 @@
-diff --git a/node_modules/react-native-reanimated/lib/module/component/PerformanceMonitor.js b/node_modules/react-native-reanimated/lib/module/component/PerformanceMonitor.js
-index 9c98d6c..70ada9f 100644
--- a/node_modules/react-native-reanimated/lib/module/component/PerformanceMonitor.js
-+++ b/node_modules/react-native-reanimated/lib/module/component/PerformanceMonitor.js
-@@ -1,125 +1,5 @@
- 'use strict';
- 
-import React, { useEffect, useRef } from 'react';
-import { StyleSheet, TextInput, View } from 'react-native';
-import { addWhitelistedNativeProps } from "../ConfigHelper.js";
-import { createAnimatedComponent } from "../createAnimatedComponent/index.js";
-import { useAnimatedProps, useFrameCallback, useSharedValue } from "../hook/index.js";
-function createCircularDoublesBuffer(size) {
-  'worklet';
-
-  return {
-    next: 0,
-    buffer: new Float32Array(size),
-    size,
-    count: 0,
-    push(value) {
-      const oldValue = this.buffer[this.next];
-      const oldCount = this.count;
-      this.buffer[this.next] = value;
-      this.next = (this.next + 1) % this.size;
-      this.count = Math.min(this.size, this.count + 1);
-      return oldCount === this.size ? oldValue : null;
-    },
-    front() {
-      const notEmpty = this.count > 0;
-      if (notEmpty) {
-        const current = this.next - 1;
-        const index = current < 0 ? this.size - 1 : current;
-        return this.buffer[index];
-      }
-      return null;
-    },
-    back() {
-      const notEmpty = this.count > 0;
-      return notEmpty ? this.buffer[this.next] : null;
-    }
-  };
-}
-const DEFAULT_BUFFER_SIZE = 20;
-addWhitelistedNativeProps({
-  text: true
-});
-const AnimatedTextInput = createAnimatedComponent(TextInput);
-function loopAnimationFrame(fn) {
-  let lastTime = 0;
-  function loop() {
-    requestAnimationFrame(time => {
-      if (lastTime > 0) {
-        fn(lastTime, time);
-      }
-      lastTime = time;
-      requestAnimationFrame(loop);
-    });
-  }
-  loop();
-}
-function getFps(renderTimeInMs) {
-  'worklet';
-
-  return 1000 / renderTimeInMs;
-}
-function completeBufferRoutine(buffer, timestamp) {
-  'worklet';
-
-  timestamp = Math.round(timestamp);
-  const droppedTimestamp = buffer.push(timestamp) ?? timestamp;
-  const measuredRangeDuration = timestamp - droppedTimestamp;
-  return getFps(measuredRangeDuration / buffer.count);
-}
-function JsPerformance({
-  smoothingFrames
-}) {
-  const jsFps = useSharedValue(null);
-  const totalRenderTime = useSharedValue(0);
-  const circularBuffer = useRef(createCircularDoublesBuffer(smoothingFrames));
-  useEffect(() => {
-    loopAnimationFrame((_, timestamp) => {
-      timestamp = Math.round(timestamp);
-      const currentFps = completeBufferRoutine(circularBuffer.current, timestamp);
-
-      // JS fps have to be measured every 2nd frame,
-      // thus 2x multiplication has to occur here
-      jsFps.value = (currentFps * 2).toFixed(0);
-    });
-  }, [jsFps, totalRenderTime]);
-  const animatedProps = useAnimatedProps(() => {
-    const text = 'JS: ' + (jsFps.value ?? 'N/A') + ' ';
-    return {
-      text,
-      defaultValue: text
-    };
-  });
-  return <View style={styles.container}>
-      <AnimatedTextInput style={styles.text} animatedProps={animatedProps} editable={false} />
-    </View>;
-}
-function UiPerformance({
-  smoothingFrames
-}) {
-  const uiFps = useSharedValue(null);
-  const circularBuffer = useSharedValue(null);
-  useFrameCallback(({
-    timestamp
-  }) => {
-    if (circularBuffer.value === null) {
-      circularBuffer.value = createCircularDoublesBuffer(smoothingFrames);
-    }
-    timestamp = Math.round(timestamp);
-    const currentFps = completeBufferRoutine(circularBuffer.value, timestamp);
-    uiFps.value = currentFps.toFixed(0);
-  });
-  const animatedProps = useAnimatedProps(() => {
-    const text = 'UI: ' + (uiFps.value ?? 'N/A') + ' ';
-    return {
-      text,
-      defaultValue: text
-    };
-  });
-  return <View style={styles.container}>
-      <AnimatedTextInput style={styles.text} animatedProps={animatedProps} editable={false} />
-    </View>;
-}
- /**
-  * A component that lets you measure fps values on JS and UI threads on both the
-  * Paper and Fabric architectures.
-@@ -127,38 +7,7 @@ function UiPerformance({
-  * @param smoothingFrames - Determines amount of saved frames which will be used
-  *   for fps value smoothing.
-  */
-export function PerformanceMonitor({
-  smoothingFrames = DEFAULT_BUFFER_SIZE
-}) {
-  return <View style={styles.monitor}>
-      <JsPerformance smoothingFrames={smoothingFrames} />
-      <UiPerformance smoothingFrames={smoothingFrames} />
-    </View>;
-+export function PerformanceMonitor() {
-+  return null;
- }
-const styles = StyleSheet.create({
-  monitor: {
-    flexDirection: 'row',
-    position: 'absolute',
-    backgroundColor: '#0006',
-    zIndex: 1000
-  },
-  header: {
-    fontSize: 14,
-    color: '#ffff',
-    paddingHorizontal: 5
-  },
-  text: {
-    fontSize: 13,
-    fontVariant: ['tabular-nums'],
-    color: '#ffff',
-    fontFamily: 'monospace',
-    paddingHorizontal: 3
-  },
-  container: {
-    alignItems: 'center',
-    justifyContent: 'center',
-    flexDirection: 'row',
-    flexWrap: 'wrap'
-  }
-});
- //# sourceMappingURL=PerformanceMonitor.js.map
-diff --git a/node_modules/react-native-reanimated/src/component/PerformanceMonitor.tsx b/node_modules/react-native-reanimated/src/component/PerformanceMonitor.tsx
-index ff8fc8a..34dde79 100644
--- a/node_modules/react-native-reanimated/src/component/PerformanceMonitor.tsx
-+++ b/node_modules/react-native-reanimated/src/component/PerformanceMonitor.tsx
-@@ -1,170 +1,5 @@
- 'use strict';
- 
-import React, { useEffect, useRef } from 'react';
-import { StyleSheet, TextInput, View } from 'react-native';
-
-import { addWhitelistedNativeProps } from '../ConfigHelper';
-import { createAnimatedComponent } from '../createAnimatedComponent';
-import type { FrameInfo } from '../frameCallback';
-import { useAnimatedProps, useFrameCallback, useSharedValue } from '../hook';
-
-type CircularBuffer = ReturnType<typeof createCircularDoublesBuffer>;
-function createCircularDoublesBuffer(size: number) {
-  'worklet';
-
-  return {
-    next: 0 as number,
-    buffer: new Float32Array(size),
-    size,
-    count: 0 as number,
-
-    push(value: number): number | null {
-      const oldValue = this.buffer[this.next];
-      const oldCount = this.count;
-      this.buffer[this.next] = value;
-
-      this.next = (this.next + 1) % this.size;
-      this.count = Math.min(this.size, this.count + 1);
-      return oldCount === this.size ? oldValue : null;
-    },
-
-    front(): number | null {
-      const notEmpty = this.count > 0;
-      if (notEmpty) {
-        const current = this.next - 1;
-        const index = current < 0 ? this.size - 1 : current;
-        return this.buffer[index];
-      }
-      return null;
-    },
-
-    back(): number | null {
-      const notEmpty = this.count > 0;
-      return notEmpty ? this.buffer[this.next] : null;
-    },
-  };
-}
-
-const DEFAULT_BUFFER_SIZE = 20;
-addWhitelistedNativeProps({ text: true });
-const AnimatedTextInput = createAnimatedComponent(TextInput);
-
-function loopAnimationFrame(fn: (lastTime: number, time: number) => void) {
-  let lastTime = 0;
-
-  function loop() {
-    requestAnimationFrame((time) => {
-      if (lastTime > 0) {
-        fn(lastTime, time);
-      }
-      lastTime = time;
-      requestAnimationFrame(loop);
-    });
-  }
-
-  loop();
-}
-
-function getFps(renderTimeInMs: number): number {
-  'worklet';
-  return 1000 / renderTimeInMs;
-}
-
-function completeBufferRoutine(
-  buffer: CircularBuffer,
-  timestamp: number
-): number {
-  'worklet';
-  timestamp = Math.round(timestamp);
-
-  const droppedTimestamp = buffer.push(timestamp) ?? timestamp;
-
-  const measuredRangeDuration = timestamp - droppedTimestamp;
-
-  return getFps(measuredRangeDuration / buffer.count);
-}
-
-function JsPerformance({ smoothingFrames }: { smoothingFrames: number }) {
-  const jsFps = useSharedValue<string | null>(null);
-  const totalRenderTime = useSharedValue(0);
-  const circularBuffer = useRef<CircularBuffer>(
-    createCircularDoublesBuffer(smoothingFrames)
-  );
-
-  useEffect(() => {
-    loopAnimationFrame((_, timestamp) => {
-      timestamp = Math.round(timestamp);
-
-      const currentFps = completeBufferRoutine(
-        circularBuffer.current,
-        timestamp
-      );
-
-      // JS fps have to be measured every 2nd frame,
-      // thus 2x multiplication has to occur here
-      jsFps.value = (currentFps * 2).toFixed(0);
-    });
-  }, [jsFps, totalRenderTime]);
-
-  const animatedProps = useAnimatedProps(() => {
-    const text = 'JS: ' + (jsFps.value ?? 'N/A') + ' ';
-    return { text, defaultValue: text };
-  });
-
-  return (
-    <View style={styles.container}>
-      <AnimatedTextInput
-        style={styles.text}
-        animatedProps={animatedProps}
-        editable={false}
-      />
-    </View>
-  );
-}
-
-function UiPerformance({ smoothingFrames }: { smoothingFrames: number }) {
-  const uiFps = useSharedValue<string | null>(null);
-  const circularBuffer = useSharedValue<CircularBuffer | null>(null);
-
-  useFrameCallback(({ timestamp }: FrameInfo) => {
-    if (circularBuffer.value === null) {
-      circularBuffer.value = createCircularDoublesBuffer(smoothingFrames);
-    }
-
-    timestamp = Math.round(timestamp);
-
-    const currentFps = completeBufferRoutine(circularBuffer.value, timestamp);
-
-    uiFps.value = currentFps.toFixed(0);
-  });
-
-  const animatedProps = useAnimatedProps(() => {
-    const text = 'UI: ' + (uiFps.value ?? 'N/A') + ' ';
-    return { text, defaultValue: text };
-  });
-
-  return (
-    <View style={styles.container}>
-      <AnimatedTextInput
-        style={styles.text}
-        animatedProps={animatedProps}
-        editable={false}
-      />
-    </View>
-  );
-}
-
-export type PerformanceMonitorProps = {
-  /**
-   * Sets amount of previous frames used for smoothing at highest expectedFps.
-   *
-   * Automatically scales down at lower frame rates.
-   *
-   * Affects jumpiness of the FPS measurements value.
-   */
-  smoothingFrames?: number;
-};
-
- /**
-  * A component that lets you measure fps values on JS and UI threads on both the
-  * Paper and Fabric architectures.
-@@ -172,40 +7,6 @@ export type PerformanceMonitorProps = {
-  * @param smoothingFrames - Determines amount of saved frames which will be used
-  *   for fps value smoothing.
-  */
-export function PerformanceMonitor({
-  smoothingFrames = DEFAULT_BUFFER_SIZE,
-}: PerformanceMonitorProps) {
-  return (
-    <View style={styles.monitor}>
-      <JsPerformance smoothingFrames={smoothingFrames} />
-      <UiPerformance smoothingFrames={smoothingFrames} />
-    </View>
-  );
-+export function PerformanceMonitor() {
-+  return null;
- }
-
-const styles = StyleSheet.create({
-  monitor: {
-    flexDirection: 'row',
-    position: 'absolute',
-    backgroundColor: '#0006',
-    zIndex: 1000,
-  },
-  header: {
-    fontSize: 14,
-    color: '#ffff',
-    paddingHorizontal: 5,
-  },
-  text: {
-    fontSize: 13,
-    fontVariant: ['tabular-nums'],
-    color: '#ffff',
-    fontFamily: 'monospace',
-    paddingHorizontal: 3,
-  },
-  container: {
-    alignItems: 'center',
-    justifyContent: 'center',
-    flexDirection: 'row',
-    flexWrap: 'wrap',
-  },
-});
@@ -1,33 +0,0 @@
-diff --git a/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift b/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift
-index c34ba71..13d576a 100644
--- a/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift
-+++ b/node_modules/react-native-uitextview/ios/RNUITextViewShadow.swift
-@@ -159,13 +159,23 @@ class RNUITextViewShadow: RCTShadowView {
-     let maxSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(MAXFLOAT))
-     let textSize = self.attributedText.boundingRect(with: maxSize, options: .usesLineFragmentOrigin, context: nil)
-     
-    var totalLines = self.lineHeight == 0.0 ? 0 : Int(ceil(textSize.height / self.lineHeight))
-
-    if self.numberOfLines != 0, totalLines > self.numberOfLines {
-      totalLines = self.numberOfLines
-+    var finalHeight: CGFloat
-+
-+    if self.numberOfLines != 0 && self.lineHeight != 0.0 {
-+      // numberOfLines is set with custom line height - need to calculate lines and snap to lineHeight multiples
-+      // NOTE: this calculation can be inaccurate with fractional font sizes
-+      var totalLines = Int(ceil(textSize.height / self.lineHeight))
-+      if totalLines > self.numberOfLines {
-+        totalLines = self.numberOfLines
-+      }
-+      finalHeight = CGFloat(totalLines) * self.lineHeight
-+    } else {
-+      // Either no numberOfLines limit, or no custom lineHeight - use actual text height
-+      // (numberOfLines without custom lineHeight is handled by the UITextView's textContainer.maximumNumberOfLines)
-+      finalHeight = textSize.height
-     }
- 
-    self.frameSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(CGFloat(totalLines) * self.lineHeight))
-+    self.frameSize = CGSize(width: CGFloat(maxWidth), height: finalHeight)
-     return YGSize(width: Float(self.frameSize.width), height: Float(self.frameSize.height))
-   }
- 
@@ -7,14 +7,13 @@ import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfoIcon} from '#/components
 import {CircleX_Stroke2_Corner0_Rounded as CircleXIcon} from '#/components/icons/CircleX'
 import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons/Warning'
 import {Text as BaseText, type TextProps} from '#/components/Typography'
-import {EmojiSad_Stroke2_Corner0_Rounded as EmojiSadIcon} from './icons/Emoji'

 export const colors = {
  warning: '#FFC404',
 }

 type Context = {
-  type: 'info' | 'tip' | 'warning' | 'error' | 'apology'
+  type: 'info' | 'tip' | 'warning' | 'error'
 }

 const Context = createContext<Context>({
@@ -30,14 +29,12 @@ export function Icon() {
    tip: CircleInfoIcon,
    warning: WarningIcon,
    error: CircleXIcon,
-    apology: EmojiSadIcon,
  }[type]
  const fill = {
    info: t.atoms.text_contrast_medium.color,
    tip: t.palette.primary_500,
    warning: colors.warning,
    error: t.palette.negative_500,
-    apology: t.atoms.text_contrast_medium.color,
  }[type]
  return <Icon fill={fill} size="md" />
 }
@@ -112,7 +109,6 @@ export function Outer({
    tip: t.palette.primary_500,
    warning: colors.warning,
    error: t.palette.negative_500,
-    apology: t.atoms.border_contrast_high.borderColor,
  }[type]
  return (
    <Context.Provider value={{type}}>
@@ -7,6 +7,7 @@ import {
  Pressable,
  type PressableProps,
  type StyleProp,
+  StyleSheet,
  type TargetedEvent,
  type TextProps,
  type TextStyle,
@@ -511,6 +512,8 @@ export const Button = React.forwardRef<View, ButtonProps>(
      [state, variant, color, size, disabled],
    )

+    const flattenedBaseStyles = flatten([baseStyles, style])
+
    return (
      <PressableComponent
        role="button"
@@ -530,10 +533,9 @@ export const Button = React.forwardRef<View, ButtonProps>(
          a.align_center,
          a.justify_center,
          a.curve_continuous,
-          baseStyles,
-          style,
+          flattenedBaseStyles,
          ...(state.hovered || state.pressed
-            ? [hoverStyles, hoverStyleProp]
+            ? [hoverStyles, flatten(hoverStyleProp)]
            : []),
        ]}
        onPressIn={onPressIn}
@@ -724,7 +726,7 @@ export function useSharedButtonTextStyles() {
      baseStyles.push(a.text_xs, a.leading_snug, a.font_semi_bold)
    }

-    return flatten(baseStyles)
+    return StyleSheet.flatten(baseStyles)
  }, [t, variant, color, size, disabled])
 }

@@ -1,74 +0,0 @@
-import {TouchableWithoutFeedback, View} from 'react-native'
-import * as Clipboard from 'expo-clipboard'
-
-import {atoms as a, useTheme} from '#/alf'
-import * as Prompt from '#/components/Prompt'
-import * as Toast from '#/components/Toast'
-import {Text} from '#/components/Typography'
-import {useDevMode} from '#/storage/hooks/dev-mode'
-
-/**
- * Internal-use component to display debug information supplied by the appview.
- * The `debug` field only exists on some API views, and is only visible for
- * internal users in dev mode. As such, none of these strings need to be
- * translated.
- *
- * This component can be removed at any time if we don't find it useful.
- */
-export function DebugFieldDisplay<T extends {debug?: {[x: string]: unknown}}>({
-  subject,
-}: {
-  subject: T
-}) {
-  const t = useTheme()
-  const [devMode] = useDevMode()
-  const prompt = Prompt.usePromptControl()
-
-  if (!devMode) return
-  if (!subject.debug) return
-
-  return (
-    <>
-      <Prompt.Basic
-        control={prompt}
-        title="Debug"
-        description={JSON.stringify(subject.debug, null, 2)}
-        cancelButtonCta="Close"
-        confirmButtonCta="Copy"
-        onConfirm={() => {
-          Clipboard.setStringAsync(JSON.stringify(subject.debug, null, 2))
-          Toast.show('Copied to clipboard', {type: 'success'})
-        }}
-      />
-      <TouchableWithoutFeedback
-        accessibilityRole="button"
-        onPress={e => {
-          e.preventDefault()
-          e.stopPropagation()
-          prompt.open()
-          return false
-        }}>
-        <View style={[a.flex_row, a.align_center, a.gap_xs, a.pt_sm, a.pb_xs]}>
-          <View
-            style={[a.py_xs, a.px_sm, a.rounded_sm, t.atoms.bg_contrast_25]}>
-            <Text
-              style={[a.font_bold, a.text_xs, t.atoms.text_contrast_medium]}>
-              Debug
-            </Text>
-          </View>
-          <Text
-            numberOfLines={1}
-            style={[
-              a.flex_1,
-              a.text_xs,
-              a.leading_tight,
-              {fontFamily: 'monospace'},
-              t.atoms.text_contrast_low,
-            ]}>
-            {JSON.stringify(subject.debug)}
-          </Text>
-        </View>
-      </TouchableWithoutFeedback>
-    </>
-  )
-}
@@ -16,7 +16,7 @@ import {RemoveScrollBar} from 'react-remove-scroll-bar'
 import {logger} from '#/logger'
 import {useA11y} from '#/state/a11y'
 import {useDialogStateControlContext} from '#/state/dialogs'
-import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
+import {atoms as a, flatten, useBreakpoints, useTheme, web} from '#/alf'
 import {Button, ButtonIcon} from '#/components/Button'
 import {Context} from '#/components/Dialog/context'
 import {
@@ -180,7 +180,7 @@ export function Inner({
        onClick={stopPropagation}
        onStartShouldSetResponder={_ => true}
        onTouchEnd={stopPropagation}
-        style={[
+        style={flatten([
          a.relative,
          a.rounded_md,
          a.w_full,
@@ -195,7 +195,7 @@ export function Inner({
          },
          !reduceMotionEnabled && a.zoom_fade_in,
          style,
-        ]}>
+        ])}>
        <DismissableLayer.DismissableLayer
          onInteractOutside={preventDefault}
          onFocusOutside={preventDefault}
@@ -244,7 +244,7 @@ export const InnerFlatList = React.forwardRef<
      contentContainerStyle={[a.h_full, a.px_0, webInnerContentContainerStyle]}>
      <FlatList
        ref={ref}
-        style={[a.h_full, gtMobile ? a.px_2xl : a.px_xl, style]}
+        style={[a.h_full, gtMobile ? a.px_2xl : a.px_xl, flatten(style)]}
        {...props}
      />
      {footer}
@@ -186,7 +186,7 @@ export function Description({
    return rt
  }, [description])
  if (!rt) return null
-  return <RichText value={rt} disableLinks {...rest} />
+  return <RichText value={rt} style={[a.leading_snug]} disableLinks {...rest} />
 }

 export function DescriptionPlaceholder() {
@@ -390,12 +390,7 @@ export function ProfileGrid({
        {!isProfileHeaderContext && (
          <InlineLinkText
            label={_(msg`See more suggested profiles on the Explore page`)}
-            to="/search"
-            onPress={() => {
-              logger.metric('suggestedUser:seeMore', {
-                logContext: isFeedContext ? 'Explore' : 'Profile',
-              })
-            }}>
+            to="/search">
            <Trans>See more</Trans>
          </InlineLinkText>
        )}
@@ -434,11 +429,6 @@ function SeeMoreSuggestedProfilesCard() {
      to="/search"
      color="primary"
      label={_(msg`Browse more accounts on the Explore page`)}
-      onPress={() => {
-        logger.metric('suggestedUser:seeMore', {
-          logContext: 'Explore',
-        })
-      }}
      style={[
        a.flex_col,
        a.align_center,
@@ -2,6 +2,7 @@ import {View} from 'react-native'

 import {
  atoms as a,
+  flatten,
  type TextStyleProp,
  useTheme,
  type ViewStyleProp,
@@ -32,9 +33,17 @@ export function IconCircle({
          height: size === 'lg' ? 52 : 64,
          backgroundColor: t.palette.primary_50,
        },
-        style,
+        flatten(style),
      ]}>
-      <Icon size={size} style={[{color: t.palette.primary_500}, iconStyle]} />
+      <Icon
+        size={size}
+        style={[
+          {
+            color: t.palette.primary_500,
+          },
+          flatten(iconStyle),
+        ]}
+      />
    </View>
  )
 }
@@ -83,12 +83,7 @@ export function InterestTabs({
  function handleTabLayout(index: number, x: number, width: number) {
    if (!tabOffsets.length) {
      pendingTabOffsets.current[index] = {x, width}
-      // not only do we check if the length is equal to the number of interests,
-      // but we also need to ensure that the array isn't sparse. `.filter()`
-      // removes any empty slots from the array
-      if (
-        pendingTabOffsets.current.filter(o => !!o).length === interests.length
-      ) {
+      if (pendingTabOffsets.current.length === interests.length) {
        setTabOffsets(pendingTabOffsets.current)
      }
    }
@@ -210,7 +205,7 @@ export function InterestTabs({
        showsHorizontalScrollIndicator={false}
        decelerationRate="fast"
        snapToOffsets={
-          tabOffsets.filter(o => !!o).length === interests.length
+          tabOffsets.length === interests.length
            ? tabOffsets.map(o => o.x - tokens.space.xl)
            : undefined
        }
@@ -55,7 +55,7 @@ export function Description({value, handle}: {value?: string; handle: string}) {
  const {_} = useLingui()
  return value ? (
    <Text numberOfLines={2}>
-      <RichText value={value} />
+      <RichText value={value} style={[a.leading_snug]} />
    </Text>
  ) : (
    <Text emoji style={[a.leading_snug]}>
@@ -166,7 +166,7 @@ export function useLink({
              const state = navigation.getState()
              // if screen is not in the current navigator, it means it's
              // most likely a tab screen. note: state can be undefined
-              if (!state?.routeNames?.includes?.(screen)) {
+              if (!state?.routeNames.includes(screen)) {
                const parent = navigation.getParent()
                if (
                  parent &&
@@ -296,7 +296,7 @@ export function Link({
  return (
    <Button
      {...rest}
-      style={[a.justify_start, rest.style]}
+      style={[a.justify_start, flatten(rest.style)]}
      role="link"
      accessibilityRole="link"
      href={href}
@@ -5,7 +5,7 @@ import {useLingui} from '@lingui/react'

 import {cleanError} from '#/lib/strings/errors'
 import {CenteredView} from '#/view/com/util/Views'
-import {atoms as a, useBreakpoints, useTheme} from '#/alf'
+import {atoms as a, flatten, useBreakpoints, useTheme} from '#/alf'
 import {Button, ButtonText} from '#/components/Button'
 import {Error} from '#/components/Error'
 import {Loader} from '#/components/Loader'
@@ -43,7 +43,7 @@ export function ListFooter({
        a.pb_lg,
        t.atoms.border_contrast_low,
        {height: height ?? 180, paddingTop: 30},
-        style,
+        flatten(style),
      ]}>
      {isFetchingNextPage ? (
        <Loader size="xl" />
@@ -7,7 +7,7 @@ import Animated, {
  withTiming,
 } from 'react-native-reanimated'

-import {atoms as a, useTheme} from '#/alf'
+import {atoms as a, flatten, useTheme} from '#/alf'
 import {type Props, useCommonSVGProps} from '#/components/icons/common'
 import {Loader_Stroke2_Corner0_Rounded as Icon} from '#/components/icons/Loader'

@@ -37,7 +37,12 @@ export function Loader(props: Props) {
      ]}>
      <Icon
        {...props}
-        style={[a.absolute, a.inset_0, t.atoms.text_contrast_high, props.style]}
+        style={[
+          a.absolute,
+          a.inset_0,
+          t.atoms.text_contrast_high,
+          flatten(props.style),
+        ]}
      />
    </Animated.View>
  )
@@ -1,6 +1,6 @@
 import {View} from 'react-native'

-import {atoms as a, useTheme} from '#/alf'
+import {atoms as a, flatten, useTheme} from '#/alf'
 import {type Props, useCommonSVGProps} from '#/components/icons/common'
 import {Loader_Stroke2_Corner0_Rounded as Icon} from '#/components/icons/Loader'

@@ -24,7 +24,7 @@ export function Loader(props: Props) {
            a.absolute,
            a.inset_0,
            t.atoms.text_contrast_high,
-            props.style,
+            flatten(props.style),
          ]}
        />
      </div>
@@ -1,8 +1,6 @@
-import {StyleSheet} from 'react-native'
 import type React from 'react'

-import {isHighDPI} from '#/lib/browser'
-import {atoms as a, platform, useTheme, type ViewStyleProp} from '#/alf'
+import {atoms as a, useTheme, type ViewStyleProp} from '#/alf'
 import {Fill} from '#/components/Fill'

 /**
@@ -27,15 +25,7 @@ export function MediaInsetBorder({
    <Fill
      style={[
        a.rounded_md,
-        {
-          borderWidth: platform({
-            native: StyleSheet.hairlineWidth,
-            // while we generally use hairlineWidth (aka 1px),
-            // we make an exception here for high DPI screens
-            // as the 1px border is very noticeable -sfn
-            web: isHighDPI ? 0.5 : StyleSheet.hairlineWidth,
-          }),
-        },
+        a.border,
        opaque
          ? [t.atoms.border_contrast_low]
          : [
@@ -44,7 +34,9 @@ export function MediaInsetBorder({
                : t.atoms.border_contrast_high,
              {opacity: 0.6},
            ],
-        a.pointer_events_none,
+        {
+          pointerEvents: 'none',
+        },
        style,
      ]}>
      {children}
@@ -5,11 +5,11 @@ import {
  useSafeAreaInsets,
 } from 'react-native-safe-area-context'
 import {LinearGradient} from 'expo-linear-gradient'
-import {utils} from '@bsky.app/alf'

 import {isAndroid, isNative} from '#/platform/detection'
 import {useA11y} from '#/state/a11y'
-import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
+import {atoms as a, flatten, useBreakpoints, useTheme, web} from '#/alf'
+import {transparentifyColor} from '#/alf/util/colorGeneration'
 import {FocusScope} from '#/components/FocusScope'
 import {LockScroll} from '#/components/LockScroll'

@@ -47,7 +47,7 @@ export function Overlay({
        ) : (
          <LinearGradient
            colors={[
-              utils.alpha(t.atoms.bg.backgroundColor, 0),
+              transparentifyColor(t.atoms.bg.backgroundColor, 0),
              t.atoms.bg.backgroundColor,
              t.atoms.bg.backgroundColor,
            ]}
@@ -97,7 +97,7 @@ export function Overlay({
              ]}>
              <LinearGradient
                colors={[
-                  utils.alpha(t.atoms.bg.backgroundColor, 0),
+                  transparentifyColor(t.atoms.bg.backgroundColor, 0),
                  t.atoms.bg.backgroundColor,
                ]}
                start={[0.5, 0]}
@@ -113,7 +113,7 @@ export function Overlay({
              role="dialog"
              aria-role="dialog"
              aria-label={label}
-              style={[
+              style={flatten([
                a.relative,
                a.w_full,
                a.p_2xl,
@@ -128,7 +128,7 @@ export function Overlay({
                    maxWidth: 420,
                  }),
                ],
-              ]}>
+              ])}>
              {children}
            </View>
          </FocusScope>
@@ -5,10 +5,3 @@ import {ID} from '#/components/PolicyUpdateOverlay/updates/202508/config'
 * the relationship is clear.
 */
 export const ACTIVE_UPDATE_ID = ID
-
-/**
- * Toggle to enable or disable the policy update overlay feature e.g. once an
- * update has run its course, set this to false. For new updates, set this to
- * true and change `ACTIVE_UPDATE_ID` to the new update ID.
- */
-export const POLICY_UPDATE_IS_ENABLED = false
@@ -7,7 +7,6 @@ import {
 } from 'react'

 import {useSession} from '#/state/session'
-import {POLICY_UPDATE_IS_ENABLED} from '#/components/PolicyUpdateOverlay/config'
 import {Provider as PortalProvider} from '#/components/PolicyUpdateOverlay/Portal'
 import {
  type PolicyUpdateState,
@@ -46,15 +45,8 @@ export function Provider({children}: {children?: ReactNode}) {
  const {hasSession} = useSession()
  const [isReadyToShowOverlay, setIsReadyToShowOverlay] = useState(false)
  const state = usePolicyUpdateState({
-    enabled:
-      // if the feature is enabled
-      POLICY_UPDATE_IS_ENABLED &&
-      // once shell has rendered
-      isReadyToShowOverlay &&
-      // only once logged in
-      hasSession &&
-      // only enabled in non-test environments
-      ENV !== 'e2e',
+    // only enable the policy update overlay in non-test environments
+    enabled: isReadyToShowOverlay && hasSession && ENV !== 'e2e',
  })

  const ctx = useMemo(
@@ -64,10 +64,7 @@ export function ImageEmbed({
    }
    const onPressIn = (_: number) => {
      InteractionManager.runAfterInteractions(() => {
-        Image.prefetch(
-          items.map(i => i.uri),
-          'memory',
-        )
+        Image.prefetch(items.map(i => i.uri))
      })
    }

@@ -57,9 +57,7 @@ export function PostRepliedTo({
        size="xs"
        style={[t.atoms.text_contrast_medium, {top: -1}]}
      />
-      <Text style={[a.flex_1, textStyle]} numberOfLines={1}>
-        {label}
-      </Text>
+      <Text style={textStyle}>{label}</Text>
    </View>
  )
 }
@@ -258,7 +258,6 @@ let PostMenuItems = ({

  const onHidePost = () => {
    hidePost({uri: postUri})
-    logEvent('thread:click:hideReplyForMe', {})
  }

  const hideInPWI = !!postAuthor.labels?.find(
@@ -339,12 +338,6 @@ let PostMenuItems = ({
        replyUri: postUri,
        action,
      })
-
-      // Log metric only when hiding (not when showing)
-      if (isHide) {
-        logEvent('thread:click:hideReplyForEveryone', {})
-      }
-
      Toast.show(
        isHide
          ? _(msg`Reply was successfully hidden`)
@@ -50,6 +50,7 @@ export function RecentChats({postUri}: {postUri: string}) {
        style={[a.flex_1, a.pt_2xs, {minHeight: 98}]}
        contentContainerStyle={[a.gap_sm, a.px_md]}
        showsHorizontalScrollIndicator={false}
+        fadingEdgeLength={64}
        nestedScrollEnabled>
        {convos && convos.length > 0 ? (
          convos.map(convo => {
@@ -1,4 +1,4 @@
-import {memo, useMemo, useState} from 'react'
+import {memo, useState} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {
  type AppBskyFeedDefs,
@@ -25,10 +25,9 @@ import {
  useProgressGuideControls,
 } from '#/state/shell/progress-guide'
 import * as Toast from '#/view/com/util/Toast'
-import {atoms as a, useBreakpoints} from '#/alf'
+import {atoms as a, flatten, useBreakpoints} from '#/alf'
 import {Reply as Bubble} from '#/components/icons/Reply'
 import {useFormatPostStatCount} from '#/components/PostControls/util'
-import * as Skele from '#/components/Skeleton'
 import {BookmarkButton} from './BookmarkButton'
 import {
  PostControlButton,
@@ -189,11 +188,11 @@ let PostControls = ({
    })
  }

-  const secondaryControlSpacingStyles = useSecondaryControlSpacingStyles({
-    variant,
-    big,
-    gtPhone,
-  })
+  const secondaryControlSpacingStyles = flatten([
+    {gap: 0}, // default, we want `gap` to be defined on the resulting object
+    variant !== 'compact' && a.gap_xs,
+    (big || gtPhone) && a.gap_sm,
+  ])

  return (
    <View
@@ -337,77 +336,3 @@ let PostControls = ({
 }
 PostControls = memo(PostControls)
 export {PostControls}
-
-export function PostControlsSkeleton({
-  big,
-  style,
-  variant,
-}: {
-  big?: boolean
-  style?: StyleProp<ViewStyle>
-  variant?: 'compact' | 'normal' | 'large'
-}) {
-  const {gtPhone} = useBreakpoints()
-
-  const rowHeight = big ? 32 : 28
-  const padding = 4
-  const size = rowHeight - padding * 2
-
-  const secondaryControlSpacingStyles = useSecondaryControlSpacingStyles({
-    variant,
-    big,
-    gtPhone,
-  })
-
-  const itemStyles = {
-    padding,
-  }
-
-  return (
-    <Skele.Row
-      style={[a.flex_row, a.justify_between, a.align_center, a.gap_md, style]}>
-      <View style={[a.flex_row, a.flex_1, {maxWidth: 320}]}>
-        <View
-          style={[itemStyles, a.flex_1, a.align_start, {marginLeft: -padding}]}>
-          <Skele.Pill blend size={size} />
-        </View>
-
-        <View style={[itemStyles, a.flex_1, a.align_start]}>
-          <Skele.Pill blend size={size} />
-        </View>
-
-        <View style={[itemStyles, a.flex_1, a.align_start]}>
-          <Skele.Pill blend size={size} />
-        </View>
-      </View>
-      <View style={[a.flex_row, a.justify_end, secondaryControlSpacingStyles]}>
-        <View style={itemStyles}>
-          <Skele.Circle blend size={size} />
-        </View>
-        <View style={itemStyles}>
-          <Skele.Circle blend size={size} />
-        </View>
-        <View style={itemStyles}>
-          <Skele.Circle blend size={size} />
-        </View>
-      </View>
-    </Skele.Row>
-  )
-}
-
-function useSecondaryControlSpacingStyles({
-  variant,
-  big,
-  gtPhone,
-}: {
-  variant?: 'compact' | 'normal' | 'large'
-  big?: boolean
-  gtPhone: boolean
-}) {
-  return useMemo(() => {
-    let gap = 0 // default, we want `gap` to be defined on the resulting object
-    if (variant !== 'compact') gap = a.gap_xs.gap
-    if (big || gtPhone) gap = a.gap_sm.gap
-    return {gap}
-  }, [variant, big, gtPhone])
-}
@@ -396,7 +396,7 @@ export function Description({
    <View style={[a.pt_xs]}>
      <RichText
        value={rt}
-        style={style}
+        style={[a.leading_snug, style]}
        numberOfLines={numberOfLines}
        disableLinks
      />
@@ -515,12 +515,7 @@ function Inner({
          <View style={[a.flex_row, a.align_center, a.pt_md, a.pb_xs]}>
            <Text
              numberOfLines={1}
-              style={[
-                a.text_lg,
-                a.leading_snug,
-                a.font_semi_bold,
-                a.self_start,
-              ]}>
+              style={[a.text_lg, a.font_semi_bold, a.self_start]}>
              {sanitizeDisplayName(
                profile.displayName || sanitizeHandle(profile.handle),
                moderation.ui('displayName'),
@@ -4,7 +4,6 @@ import {type ModerationOpts} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'

-import {popularInterests, useInterestsDisplayNames} from '#/lib/interests'
 import {logEvent} from '#/lib/statsig/statsig'
 import {isWeb} from '#/platform/detection'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -14,6 +13,10 @@ import {useGetSuggestedUsersQuery} from '#/state/queries/trending/useGetSuggeste
 import {useSession} from '#/state/session'
 import {type Follow10ProgressGuide} from '#/state/shell/progress-guide'
 import {type ListMethods} from '#/view/com/util/List'
+import {
+  popularInterests,
+  useInterestsDisplayNames,
+} from '#/screens/Onboarding/state'
 import {
  atoms as a,
  native,
@@ -48,14 +48,18 @@ export function RichText({
    [value],
  )

-  const plainStyles = [a.leading_snug, style]
-  const interactiveStyles = [plainStyles, interactiveStyle]
+  const flattenedStyle = flatten(style)
+  const plainStyles = [a.leading_snug, flattenedStyle]
+  const interactiveStyles = [
+    a.leading_snug,
+    flatten(interactiveStyle),
+    flattenedStyle,
+  ]

  const {text, facets} = richText

  if (!facets?.length) {
    if (isOnlyEmoji(text)) {
-      const flattenedStyle = flatten(style)
      const fontSize =
        (flattenedStyle.fontSize ?? a.text_sm.fontSize) * emojiMultiplier
      return (
@@ -96,8 +96,7 @@ export function RichTextTag({
            onLongPress={createStaticClick(menuProps.onPress).onPress}
            accessibilityHint={hint}
            label={label}
-            style={textStyle}
-            emoji>
+            style={textStyle}>
            {isNative ? (
              display
            ) : (
@@ -39,6 +39,15 @@ export function SubtleHover({
    />
  )

+  if (hover) {
+    console.log({
+      isWeb,
+      web,
+      isNative,
+      native,
+    })
+  }
+
  if (isWeb && web) {
    return isTouchDevice ? null : el
  } else if (isNative && native) {
@@ -1,9 +1,9 @@
 import {Children, createContext, useContext, useMemo} from 'react'
 import {View} from 'react-native'
-import {utils} from '@bsky.app/alf'
 import {Popover} from 'radix-ui'

 import {atoms as a, flatten, select, useTheme} from '#/alf'
+import {transparentifyColor} from '#/alf/util/colorGeneration'
 import {
  ARROW_SIZE,
  BUBBLE_MAX_WIDTH,
@@ -80,9 +80,9 @@ export function Content({
          {
            minWidth: 'max-content',
            boxShadow: select(t.name, {
-              light: `0 0 24px ${utils.alpha(t.palette.black, 0.2)}`,
-              dark: `0 0 24px ${utils.alpha(t.palette.black, 0.2)}`,
-              dim: `0 0 24px ${utils.alpha(t.palette.black, 0.2)}`,
+              light: `0 0 24px ${transparentifyColor(t.palette.black, 0.2)}`,
+              dark: `0 0 24px ${transparentifyColor(t.palette.black, 0.2)}`,
+              dim: `0 0 24px ${transparentifyColor(t.palette.black, 0.2)}`,
            }),
          },
        ])}>
@@ -1,7 +1,7 @@
 import {UITextView} from 'react-native-uitextview'

 import {logger} from '#/logger'
-import {atoms, useAlf, useTheme, web} from '#/alf'
+import {atoms, flatten, useAlf, useTheme, web} from '#/alf'
 import {
  childHasEmoji,
  normalizeTextStyles,
@@ -26,7 +26,7 @@ export function Text({
 }: TextProps) {
  const {fonts, flags} = useAlf()
  const t = useTheme()
-  const s = normalizeTextStyles([atoms.text_sm, t.atoms.text, style], {
+  const s = normalizeTextStyles([atoms.text_sm, t.atoms.text, flatten(style)], {
    fontScale: fonts.scaleMultiplier,
    fontFamily: fonts.family,
    flags,
@@ -84,7 +84,7 @@ export function P({style, ...rest}: TextProps) {
    <Text
      {...attr}
      {...rest}
-      style={[atoms.text_md, atoms.leading_relaxed, style]}
+      style={[atoms.text_md, atoms.leading_normal, flatten(style)]}
    />
  )
 }
@@ -8,7 +8,7 @@ import {FocusGuards, FocusScope} from 'radix-ui/internal'
 import {logger} from '#/logger'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import {Logo} from '#/view/icons/Logo'
-import {atoms as a, useBreakpoints, web} from '#/alf'
+import {atoms as a, flatten, useBreakpoints, web} from '#/alf'
 import {Button, ButtonText} from '#/components/Button'
 import {TimesLarge_Stroke2_Corner0_Rounded as XIcon} from '#/components/icons/Times'
 import {Text} from '#/components/Typography'
@@ -78,7 +78,7 @@ export function WelcomeModal({control}: WelcomeModalProps) {
      ]}>
      <FocusScope.FocusScope asChild loop trapped>
        <View
-          style={[
+          style={flatten([
            {
              maxWidth: 800,
              maxHeight: 600,
@@ -89,7 +89,7 @@ export function WelcomeModal({control}: WelcomeModalProps) {
            a.rounded_lg,
            a.overflow_hidden,
            a.zoom_in,
-          ]}>
+          ])}>
          <ImageBackground
            source={welcomeModalBg}
            style={[a.flex_1, a.justify_center]}
@@ -300,7 +300,7 @@ export function GifPreview({
            a.flex_1,
            a.mb_sm,
            a.rounded_sm,
-            a.aspect_square,
+            a.aspect_card,
            {opacity: pressed ? 0.8 : 1},
            t.atoms.bg_contrast_25,
          ]}
@@ -13,7 +13,6 @@ import isEqual from 'lodash.isequal'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
 import {useMyListsQuery} from '#/state/queries/my-lists'
-import {useGetPost} from '#/state/queries/post'
 import {
  createPostgateQueryKey,
  getPostgateRecord,
@@ -26,15 +25,12 @@ import {
 } from '#/state/queries/postgate/util'
 import {
  createThreadgateViewQueryKey,
+  getThreadgateView,
  type ThreadgateAllowUISetting,
  threadgateViewToAllowUISetting,
  useSetThreadgateAllowMutation,
  useThreadgateViewQuery,
 } from '#/state/queries/threadgate'
-import {
-  PostThreadContextProvider,
-  usePostThreadContext,
-} from '#/state/queries/usePostThread'
 import {useAgent, useSession} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
 import {atoms as a, useTheme} from '#/alf'
@@ -137,13 +133,10 @@ export type PostInteractionSettingsDialogProps = {
 export function PostInteractionSettingsDialog(
  props: PostInteractionSettingsDialogProps,
 ) {
-  const postThreadContext = usePostThreadContext()
  return (
    <Dialog.Outer control={props.control}>
      <Dialog.Handle />
-      <PostThreadContextProvider context={postThreadContext}>
-        <PostInteractionSettingsDialogControlledInner {...props} />
-      </PostThreadContextProvider>
+      <PostInteractionSettingsDialogControlledInner {...props} />
    </Dialog.Outer>
  )
 }
@@ -565,7 +558,6 @@ export function usePrefetchPostInteractionSettings({
 }) {
  const queryClient = useQueryClient()
  const agent = useAgent()
-  const getPost = useGetPost()

  return React.useCallback(async () => {
    try {
@@ -578,10 +570,7 @@ export function usePrefetchPostInteractionSettings({
        }),
        queryClient.prefetchQuery({
          queryKey: createThreadgateViewQueryKey(rootPostUri),
-          queryFn: async () => {
-            const post = await getPost({uri: rootPostUri})
-            return post.threadgate ?? null
-          },
+          queryFn: () => getThreadgateView({agent, postUri: rootPostUri}),
          staleTime: STALE.SECONDS.THIRTY,
        }),
      ])
@@ -590,5 +579,5 @@ export function usePrefetchPostInteractionSettings({
        safeMessage: e.message,
      })
    }
-  }, [queryClient, agent, postUri, rootPostUri, getPost])
+  }, [queryClient, agent, postUri, rootPostUri])
 }
@@ -435,7 +435,7 @@ function DialogInner({
              multiline
              label={_(msg`Description`)}
              placeholder={descriptionPlaceholder}
-              testID="editListDescriptionInput"
+              testID="editProfileDescriptionInput"
            />
          </TextField.Root>
          {descriptionTooLong && (
@@ -134,12 +134,12 @@ function MenuInner({
            accessibilityRole="button"
            role="button"
            onPress={() => setExpanded(true)}
-            style={[
+            style={flatten([
              a.rounded_full,
              {height: 34, width: 34},
              a.justify_center,
              a.align_center,
-            ]}>
+            ])}>
            <DotGridIcon size="lg" style={t.atoms.text_contrast_medium} />
          </Pressable>
        </DropdownMenu.Item>
@@ -424,7 +424,7 @@ function PreviewMessage({message}: {message: ChatBskyConvoDefs.MessageView}) {
        ]}>
        <RichText
          value={rt}
-          style={[a.text_md]}
+          style={[a.text_md, a.leading_snug]}
          interactiveStyle={a.underline}
          enableTags
        />
@@ -6,6 +6,7 @@ import {HITSLOP_10} from '#/lib/constants'
 import {isNative} from '#/platform/detection'
 import {
  atoms as a,
+  flatten,
  native,
  type TextStyleProp,
  useTheme,
@@ -232,7 +233,7 @@ export function Item({
        onPressOut={onPressOut}
        onFocus={onFocus}
        onBlur={onBlur}
-        style={[a.flex_row, a.align_center, a.gap_sm, style]}>
+        style={[a.flex_row, a.align_center, a.gap_sm, flatten(style)]}>
        {typeof children === 'function' ? children(state) : children}
      </Pressable>
    </ItemContext.Provider>
@@ -259,7 +260,7 @@ export function LabelText({
        native({
          paddingTop: 2,
        }),
-        style,
+        flatten(style),
      ]}>
      {children}
    </Text>
@@ -40,7 +40,7 @@ export function createSinglePathSVG({path}: {path: string}) {
        viewBox="0 0 24 24"
        width={size}
        height={size}
-        style={style}>
+        style={[style]}>
        {gradient}
        <Path fill={fill} fillRule="evenodd" clipRule="evenodd" d={path} />
      </Svg>
@@ -56,7 +56,10 @@ function DialogInner({profile}: {profile: bsky.profile.AnyProfileView}) {

      const date = new Date()
      date.setMinutes(date.getMinutes() + offset)
-      return i18n.date(date, {hour: 'numeric', minute: '2-digit', hour12: true})
+      return i18n
+        .date(date, {hour: 'numeric', minute: '2-digit', hour12: true})
+        .toLocaleUpperCase()
+        .replace(' ', '')
    },
    [tick, i18n],
  )
@@ -85,11 +85,7 @@ function ContentHiderActive({
      blur.type !== 'label' ||
      (blur.type === 'label' && blur.source.type !== 'user')
    ) {
-      if (desc.isSubjectAccount) {
-        return _(msg`${desc.name} (Account)`)
-      } else {
-        return desc.name
-      }
+      return desc.name
    }

    let hasAdultContentLabel = false
@@ -131,7 +127,6 @@ function ContentHiderActive({
    modui?.blurs,
    blur,
    desc.name,
-    desc.isSubjectAccount,
    labelDefs,
    i18n.locale,
    globalLabelStrings,
@@ -1,7 +1,6 @@
-import React, {useState} from 'react'
+import React from 'react'
 import {View} from 'react-native'
 import {type ComAtprotoLabelDefs, ComAtprotoModerationDefs} from '@atproto/api'
-import {XRPCError} from '@atproto/xrpc'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation} from '@tanstack/react-query'
@@ -20,7 +19,6 @@ import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import {InlineLinkText} from '#/components/Link'
 import {Text} from '#/components/Typography'
-import {Admonition} from '../Admonition'
 import {Divider} from '../Divider'
 import {Loader} from '../Loader'

@@ -230,7 +228,6 @@ function AppealForm({
  const sourceName = labeler
    ? sanitizeHandle(labeler.creator.handle, '@')
    : label.src
-  const [error, setError] = useState<string | null>(null)

  const {mutate, isPending} = useMutation({
    mutationFn: async () => {
@@ -255,16 +252,8 @@ function AppealForm({
      )
    },
    onError: err => {
-      if (err instanceof XRPCError && err.error === 'AlreadyAppealed') {
-        setError(
-          _(
-            msg`You've already appealed this label and it's being reviewed by our moderation team.`,
-          ),
-        )
-      } else {
-        setError(_(msg`Failed to submit appeal, please try again.`))
-      }
      logger.error('Failed to submit label appeal', {message: err})
+      Toast.show(_(msg`Failed to submit appeal, please try again.`), 'xmark')
    },
    onSuccess: () => {
      control.close()
@@ -296,11 +285,6 @@ function AppealForm({
          </Trans>
        </Text>
      </View>
-      {error && (
-        <Admonition type="error" style={[a.mt_sm]}>
-          {error}
-        </Admonition>
-      )}
      <View style={[a.my_md]}>
        <Dialog.Input
          label={_(msg`Text input field`)}
@@ -2,4 +2,3 @@ export const isSafari = false
 export const isFirefox = false
 export const isTouchDevice = true
 export const isAndroidWeb = false
-export const isHighDPI = true
@@ -6,4 +6,3 @@ export const isFirefox = /firefox|fxios/i.test(navigator.userAgent)
 export const isTouchDevice = window.matchMedia('(pointer: coarse)').matches
 export const isAndroidWeb =
  /android/i.test(navigator.userAgent) && isTouchDevice
-export const isHighDPI = window.matchMedia('(min-resolution: 2dppx)').matches
@@ -78,7 +78,6 @@ const NETWORK_ERRORS = [
  'Network request failed',
  'Failed to fetch',
  'Load failed',
-  'Upstream service unreachable',
 ]

 export function isNetworkError(e: unknown) {
@@ -1,11 +1,10 @@
 import React from 'react'
 import {Alert} from 'react-native'
 import * as Linking from 'expo-linking'
-import * as WebBrowser from 'expo-web-browser'

 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
 import {logger} from '#/logger'
-import {isIOS, isNative} from '#/platform/detection'
+import {isNative} from '#/platform/detection'
 import {useSession} from '#/state/session'
 import {useCloseAllActiveElements} from '#/state/util'
 import {
@@ -33,12 +32,7 @@ export function useIntentHandler() {
  const {tryApplyUpdate} = useApplyPullRequestOTAUpdate()

  React.useEffect(() => {
-    const handleIncomingURL = async (url: string) => {
-      if (isIOS) {
-        // Close in-app browser if it's open (iOS only)
-        await WebBrowser.dismissBrowser().catch(() => {})
-      }
-
+    const handleIncomingURL = (url: string) => {
      const referrerInfo = Referrer.getReferrerInfo()
      if (referrerInfo && referrerInfo.hostname !== 'bsky.app') {
        logger.metric('deepLink:referrerReceived', {
@@ -12,7 +12,7 @@ import {

 import {isNetworkError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
-import {isAndroid, isIOS} from '#/platform/detection'
+import {isIOS} from '#/platform/detection'
 import {IS_TESTFLIGHT} from '#/env'

 const MINIMUM_MINIMIZE_TIME = 15 * 60e3
@@ -193,13 +193,6 @@ export function useOTAUpdates() {
      return
    }

-    // TEMP: disable wake-from-background OTA loading on Android.
-    // This is causing a crash when the thread view is open due to
-    // `maintainVisibleContentPosition`. See repro repo for more details:
-    // https://github.com/mozzius/ota-crash-repro
-    // Old Arch only - re-enable once we're on the New Archictecture! -sfn
-    if (isAndroid) return
-
    const subscription = AppState.addEventListener(
      'change',
      async nextAppState => {
@@ -1,78 +0,0 @@
-import {useMemo} from 'react'
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-export const interests = [
-  'animals',
-  'art',
-  'books',
-  'comedy',
-  'comics',
-  'culture',
-  'dev',
-  'education',
-  'finance',
-  'food',
-  'gaming',
-  'journalism',
-  'movies',
-  'music',
-  'nature',
-  'news',
-  'pets',
-  'photography',
-  'politics',
-  'science',
-  'sports',
-  'tech',
-  'tv',
-  'writers',
-] as const
-export type Interest = (typeof interests)[number]
-
-// most popular selected interests
-export const popularInterests = [
-  'art',
-  'gaming',
-  'sports',
-  'comics',
-  'music',
-  'politics',
-  'photography',
-  'science',
-  'news',
-] satisfies Interest[]
-
-export function useInterestsDisplayNames() {
-  const {_} = useLingui()
-
-  return useMemo<Record<string, string>>(() => {
-    return {
-      // Keep this alphabetized
-      animals: _(msg`Animals`),
-      art: _(msg`Art`),
-      books: _(msg`Books`),
-      comedy: _(msg`Comedy`),
-      comics: _(msg`Comics`),
-      culture: _(msg`Culture`),
-      dev: _(msg`Software Dev`),
-      education: _(msg`Education`),
-      finance: _(msg`Finance`),
-      food: _(msg`Food`),
-      gaming: _(msg`Video Games`),
-      journalism: _(msg`Journalism`),
-      movies: _(msg`Movies`),
-      music: _(msg`Music`),
-      nature: _(msg`Nature`),
-      news: _(msg`News`),
-      pets: _(msg`Pets`),
-      photography: _(msg`Photography`),
-      politics: _(msg`Politics`),
-      science: _(msg`Science`),
-      sports: _(msg`Sports`),
-      tech: _(msg`Tech`),
-      tv: _(msg`TV`),
-      writers: _(msg`Writers`),
-    } satisfies Record<Interest, string>
-  }, [_])
-}
@@ -114,39 +114,8 @@ export async function saveImageToMediaLibrary({uri}: {uri: string}) {
      // as the starting image, or put it directly into the album
      const album = await MediaLibrary.getAlbumAsync(ALBUM_NAME)
      if (album) {
-        // try and migrate if needed
-        try {
-          if (await MediaLibrary.albumNeedsMigrationAsync(album)) {
-            await MediaLibrary.migrateAlbumIfNeededAsync(album)
-          }
-        } catch (err) {
-          logger.info('Attempted and failed to migrate album', {
-            safeMessage: err,
-          })
-        }
-
-        try {
-          // if album exists, put the image straight in there
-          await MediaLibrary.createAssetAsync(imagePath, album)
-        } catch (err) {
-          logger.info('Failed to create asset', {safeMessage: err})
-          // however, it's possible that we don't have write permission to the album
-          // try making a new one!
-          try {
-            await MediaLibrary.createAlbumAsync(
-              ALBUM_NAME,
-              undefined,
-              undefined,
-              imagePath,
-            )
-          } catch (err2) {
-            logger.info('Failed to create asset in a fresh album', {
-              safeMessage: err2,
-            })
-            // ... and if all else fails, just put it in DCIM
-            await MediaLibrary.createAssetAsync(imagePath)
-          }
-        }
+        // if album exists, put the image straight in there
+        await MediaLibrary.createAssetAsync(imagePath, album)
      } else {
        // otherwise, create album with asset (albums must always have at least one asset)
        await MediaLibrary.createAlbumAsync(
@@ -157,13 +126,12 @@ export async function saveImageToMediaLibrary({uri}: {uri: string}) {
        )
      }
    } else {
-      await MediaLibrary.saveToLibraryAsync(imagePath)
+      await MediaLibrary.createAssetAsync(imagePath)
    }
  } catch (err) {
    logger.error(err instanceof Error ? err : String(err), {
      message: 'Failed to save image to media library',
    })
-    throw err
  } finally {
    safeDeleteAsync(imagePath)
  }
@@ -410,21 +378,14 @@ function createPath(ext: string) {

 async function downloadImage(uri: string, path: string, timeout: number) {
  const dlResumable = createDownloadResumable(uri, path, {cache: true})
-  let timedOut = false
-  const to1 = setTimeout(() => {
-    timedOut = true
-    dlResumable.cancelAsync()
-  }, timeout)
+
+  const to1 = setTimeout(() => dlResumable.cancelAsync(), timeout)

  const dlRes = await dlResumable.downloadAsync()
  clearTimeout(to1)

  if (!dlRes?.uri) {
-    if (timedOut) {
-      throw new Error('Failed to download image - timed out')
-    } else {
-      throw new Error('Failed to download image - dlRes is undefined')
-    }
+    throw new Error('Failed to download image - dlRes is undefined')
  }

  return normalizePath(dlRes.uri)
@@ -1,32 +0,0 @@
-import {useCallback} from 'react'
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {isNative} from '#/platform/detection'
-import * as Toast from '#/components/Toast'
-import {saveImageToMediaLibrary} from './manip'
-
-/**
- * Same as `saveImageToMediaLibrary`, but also handles permissions and toasts
- *
- * iOS doesn't not require permissions to save images to the media library,
- * so this file is platform-split as it's much simpler than the Android version.
- */
-export function useSaveImageToMediaLibrary() {
-  const {_} = useLingui()
-  return useCallback(
-    async (uri: string) => {
-      if (!isNative) {
-        throw new Error('useSaveImageToMediaLibrary is native only')
-      }
-
-      try {
-        await saveImageToMediaLibrary({uri})
-        Toast.show(_(msg`Image saved`))
-      } catch (e: any) {
-        Toast.show(_(msg`Failed to save image: ${String(e)}`), {type: 'error'})
-      }
-    },
-    [_],
-  )
-}
@@ -1,17 +1,15 @@
 import {useCallback} from 'react'
 import * as MediaLibrary from 'expo-media-library'
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
+import {t} from '@lingui/macro'

 import {isNative} from '#/platform/detection'
-import * as Toast from '#/components/Toast'
+import * as Toast from '#/view/com/util/Toast'
 import {saveImageToMediaLibrary} from './manip'

 /**
 * Same as `saveImageToMediaLibrary`, but also handles permissions and toasts
 */
 export function useSaveImageToMediaLibrary() {
-  const {_} = useLingui()
  const [permissionResponse, requestPermission, getPermission] =
    MediaLibrary.usePermissions({
      granularPermissions: ['photo'],
@@ -25,12 +23,9 @@ export function useSaveImageToMediaLibrary() {
      async function save() {
        try {
          await saveImageToMediaLibrary({uri})
-
-          Toast.show(_(msg`Image saved`))
+          Toast.show(t`Image saved`)
        } catch (e: any) {
-          Toast.show(_(msg`Failed to save image: ${String(e)}`), {
-            type: 'error',
-          })
+          Toast.show(t`Failed to save image: ${String(e)}`, 'xmark')
        }
      }

@@ -47,22 +42,18 @@ export function useSaveImageToMediaLibrary() {
          } else {
            // since we've been explicitly denied, show a toast.
            Toast.show(
-              _(
-                msg`Images cannot be saved unless permission is granted to access your photo library.`,
-              ),
-              {type: 'error'},
+              t`Images cannot be saved unless permission is granted to access your photo library.`,
+              'xmark',
            )
          }
        } else {
          Toast.show(
-            _(
-              msg`Permission to access your photo library was denied. Please enable it in your system settings.`,
-            ),
-            {type: 'error'},
+            t`Permission to access your photo library was denied. Please enable it in your system settings.`,
+            'xmark',
          )
        }
      }
    },
-    [permissionResponse, requestPermission, getPermission, _],
+    [permissionResponse, requestPermission, getPermission],
  )
 }
@@ -1,5 +1,3 @@
-import {type ModerationUI} from '@atproto/api'
-
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import type * as bsky from '#/types/bsky'
@@ -7,10 +5,9 @@ import type * as bsky from '#/types/bsky'
 export function createSanitizedDisplayName(
  profile: bsky.profile.AnyProfileView,
  noAt = false,
-  moderation?: ModerationUI,
 ) {
  if (profile.displayName != null && profile.displayName !== '') {
-    return sanitizeDisplayName(profile.displayName, moderation)
+    return sanitizeDisplayName(profile.displayName)
  } else {
    return sanitizeHandle(profile.handle, noAt ? '' : '@')
  }
@@ -28,7 +28,6 @@ export interface ModerationCauseDescription {
  sourceType?: ModerationCauseSource['type']
  sourceAvi?: string
  sourceDid?: string
-  isSubjectAccount?: boolean
 }

 export function useModerationCauseDescription(
@@ -163,7 +162,6 @@ export function useModerationCauseDescription(
        sourceType: cause.source.type,
        sourceAvi: labeler?.creator.avatar,
        sourceDid: cause.label.src,
-        isSubjectAccount: cause.label.uri.startsWith('did:'),
      }
    }
    // should never happen
@@ -7,7 +7,6 @@ import debounce from 'lodash.debounce'

 import {PUBLIC_APPVIEW_DID, PUBLIC_STAGING_APPVIEW_DID} from '#/lib/constants'
 import {logger as notyLogger} from '#/lib/notifications/util'
-import {isNetworkError} from '#/lib/strings/errors'
 import {isNative} from '#/platform/detection'
 import {useAgeAssuranceContext} from '#/state/ageAssurance'
 import {type SessionAccount, useAgent, useSession} from '#/state/session'
@@ -48,9 +47,7 @@ async function _registerPushToken({

    notyLogger.debug(`registerPushToken: success`)
  } catch (error) {
-    if (!isNetworkError(error)) {
-      notyLogger.error(`registerPushToken: failed`, {safeMessage: error})
-    }
+    notyLogger.error(`registerPushToken: failed`, {safeMessage: error})
  }
 }

--- a/Show More
+++ b/Show More