gestures setup

.claude/.pre-pr-sweep-state

@@ -1 +0,0 @@
-alt-blur@3076a2b5a593b0d7b37198b5aebfe3a222afd52d

.claude/settings.json

@@ -1,9 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(pnpm typecheck *)",
-      "Bash(pnpm lint *)",
-      "Bash(pnpm test *)"
-    ]
-  }
-}

.env.example

@@ -1,51 +1,8 @@
-# The env the app is running in e.g. development, testflight, production
-EXPO_PUBLIC_ENV=development
+# Copy this to `.env` and `.env.test` files
 
-# This is the semver release version of the app, pulled from package.json
-EXPO_PUBLIC_RELEASE_VERSION=
-
-# This is the commit hash that the current bundle was made from.
-EXPO_PUBLIC_BUNDLE_IDENTIFIER=
-
-# Should be formatted YYMMDDHH so that it increases for each build.
-EXPO_PUBLIC_BUNDLE_DATE=0
-
-# The log level for the app's logger transports
+BITDRIFT_API_KEY=
+SENTRY_AUTH_TOKEN=
 EXPO_PUBLIC_LOG_LEVEL=debug
-
-# Enable debug logs for specific logger instances
-EXPO_PUBLIC_LOG_DEBUG=session
-
-# Bluesky appview DID
-EXPO_PUBLIC_BLUESKY_PROXY_DID=
-
-# Chat service DID
-EXPO_PUBLIC_CHAT_PROXY_DID=
-
-#
-#
-# Bluesky specific values
-#
-#
-
-# Bluesky's metrics API
-EXPO_PUBLIC_METRICS_API_HOST=
-
-# Growthbook config
-EXPO_PUBLIC_GROWTHBOOK_API_HOST=
-EXPO_PUBLIC_GROWTHBOOK_CLIENT_KEY=
-
-# Sentry DSN for telemetry
-EXPO_PUBLIC_SENTRY_DSN=
-
-# Bitdrift API key. If undefined, Bitdrift will be disabled.
-EXPO_PUBLIC_BITDRIFT_API_KEY=
-
-# geolocation web worker URL
-GEOLOCATION_DEV_URL=
-
-# live-events web worker URL
-LIVE_EVENTS_DEV_URL=
-
-# app-config web worker URL
-APP_CONFIG_DEV_URL=
+EXPO_PUBLIC_LOG_DEBUG=
+EXPO_PUBLIC_BUNDLE_IDENTIFIER=
+EXPO_PUBLIC_BUNDLE_DATE=0

.eslintrc.js

@@ -0,0 +1,120 @@
+module.exports = {
+  root: true,
+  extends: [
+    '@react-native',
+    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:react-native-a11y/ios',
+    'prettier',
+  ],
+  parser: '@typescript-eslint/parser',
+  plugins: [
+    '@typescript-eslint',
+    'react',
+    'lingui',
+    'simple-import-sort',
+    'bsky-internal',
+    'eslint-plugin-react-compiler',
+  ],
+  rules: {
+    'react/no-unescaped-entities': 0,
+    'react/prop-types': 0,
+    'react-native/no-inline-styles': 0,
+    'bsky-internal/avoid-unwrapped-text': [
+      'error',
+      {
+        impliedTextComponents: [
+          'H1',
+          'H2',
+          'H3',
+          'H4',
+          'H5',
+          'H6',
+          'P',
+          'Admonition',
+        ],
+        impliedTextProps: [],
+        suggestedTextWrappers: {
+          Button: 'ButtonText',
+          'ToggleButton.Button': 'ToggleButton.ButtonText',
+        },
+      },
+    ],
+    'bsky-internal/use-exact-imports': 'error',
+    'bsky-internal/use-typed-gates': 'error',
+    'bsky-internal/use-prefixed-imports': 'error',
+    'simple-import-sort/imports': [
+      'error',
+      {
+        groups: [
+          // Side effect imports.
+          ['^\\u0000'],
+          // Node.js builtins prefixed with `node:`.
+          ['^node:'],
+          // Packages.
+          // Things that start with a letter (or digit or underscore), or `@` followed by a letter.
+          // React/React Native priortized, followed by expo
+          // Followed by all packages excluding unprefixed relative ones
+          [
+            '^(react\\/(.*)$)|^(react$)|^(react-native(.*)$)',
+            '^(expo(.*)$)|^(expo$)',
+            '^(?!(?:alf|components|lib|locale|logger|platform|screens|state|view)(?:$|\\/))@?\\w',
+          ],
+          // Relative imports.
+          // Ideally, anything that starts with a dot or #
+          // due to unprefixed relative imports being used, we whitelist the relative paths we use
+          // (?:$|\\/) matches end of string or /
+          [
+            '^(?:#\\/)?(?:lib|state|logger|platform|locale)(?:$|\\/)',
+            '^(?:#\\/)?view(?:$|\\/)',
+            '^(?:#\\/)?screens(?:$|\\/)',
+            '^(?:#\\/)?alf(?:$|\\/)',
+            '^(?:#\\/)?components(?:$|\\/)',
+            '^#\\/',
+            '^\\.',
+          ],
+          // anything else - hopefully we don't have any of these
+          ['^'],
+        ],
+      },
+    ],
+    'simple-import-sort/exports': 'error',
+    'react-compiler/react-compiler': 'warn',
+    'no-restricted-imports': [
+      'error',
+      {
+        paths: [
+          {
+            name: '@atproto/api',
+            importNames: ['moderatePost'],
+            message:
+              'Please use `moderatePost_wrapped` from `#/lib/moderatePost_wrapped` instead.',
+          },
+        ],
+      },
+    ],
+  },
+  ignorePatterns: [
+    '**/__mocks__/*.ts',
+    'src/platform/polyfills.ts',
+    'src/third-party',
+    'ios',
+    'android',
+    'coverage',
+    '*.lock',
+    '.husky',
+    'patches',
+    'bskyweb',
+    '*.html',
+    'bskyweb',
+    'src/locale/locales/_build/',
+    'src/locale/locales/**/*.js',
+  ],
+  settings: {
+    componentWrapperFunctions: ['observer'],
+  },
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 'latest',
+  },
+}

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/ISSUE_TEMPLATE/bug_report_fabric.yml

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

.github/ISSUE_TEMPLATE/feature_request.yml

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

.github/dependabot.yml

@@ -1,44 +0,0 @@
-version: 2
-# Dependabot auto-update config.
-#
-# Cooldown (7 days) is the point of this config: it delays version-update
-# PRs until a newly-published version has aged. Supply-chain attacks like
-# the tanstack Shai-Hulud compromise (2026-05-11) live minutes-to-hours
-# before the registry yanks them; a 7-day cooldown keeps poisoned
-# versions out of our lockfiles.
-#
-# Security updates bypass cooldown and continue to flow immediately. See:
-# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference#cooldown
-#
-# Auto-merge is deliberately NOT enabled. Every dependabot PR gets human
-# review.
-
-updates:
-  - package-ecosystem: npm
-    directory: /
-    schedule:
-      interval: weekly
-      day: monday
-    cooldown:
-      default-days: 7
-    open-pull-requests-limit: 5
-    groups:
-      production:
-        dependency-type: production
-        update-types: [minor, patch]
-      development:
-        dependency-type: development
-        update-types: [minor, patch]
-
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
-      day: monday
-    cooldown:
-      default-days: 7
-    open-pull-requests-limit: 3
-    groups:
-      actions:
-        patterns: ["*"]
-        update-types: [minor, patch]

.github/workflows/build-and-push-bskyweb-aws.yaml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1
@@ -43,11 +43,9 @@ jobs:
           tags: |
             type=sha,enable=true,priority=100,prefix=,suffix=,format=long
 
-      - name: Env
-        id: env
-        run: |
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+      - name: Set outputs
+        id: vars
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Build and push Docker image
         id: build-and-push
@@ -61,8 +59,4 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
-            EXPO_PUBLIC_ENV=production
-            EXPO_PUBLIC_RELEASE_VERSION=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-            EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-            EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}
-            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
+            EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.vars.outputs.sha_short }}

.github/workflows/build-and-push-bskyweb-ghcr.yaml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-embedr-aws.yaml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - main
-      - echoprom_fix
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -22,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-link-aws.yaml

@@ -1,9 +1,6 @@
 name: build-and-push-link-aws
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -22,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1
@@ -48,7 +45,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           file: ./Dockerfile.bskylink
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-and-push-ogcard-aws.yaml

@@ -1,9 +1,6 @@
 name: build-and-push-ogcard-aws
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -22,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1
@@ -48,7 +45,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           file: ./Dockerfile.bskyogcard
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

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

@@ -13,12 +13,8 @@ on:
 
 jobs:
   build:
-    if: github.repository == 'bluesky-social/social-app'
     name: Build and Submit Android
-    runs-on: Linux-x64-32core
-    concurrency:
-      group: android-build
-      cancel-in-progress: false
+    runs-on: ubuntu-latest
     steps:
       - name: Check for EXPO_TOKEN
         run: >
@@ -28,69 +24,51 @@ jobs:
           fi
 
       - name: ⬇️ Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
 
-      - uses: pnpm/action-setup@v6
-
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
-          cache: pnpm
+          node-version-file: .nvmrc
+          cache: yarn
 
       - name: 🪛 Setup jq
         uses: dcarbone/install-jq-action@v2
 
-      - name: ⚙️ Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: 🔨 Setup Expo CLI
-        uses: expo/expo-github-action@v9
+      - name: 🔨 Setup EAS
+        uses: expo/expo-github-action@v8
         with:
-          eas-version: '19.0.5'
-          packager: 'pnpm --allow-build=dtrace-provider'
+          expo-version: latest
+          eas-version: latest
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - uses: actions/setup-java@v5
+      - name: ⛏️ Setup EAS local builds
+        run: yarn global add eas-cli-local-build-plugin
+
+      - uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: ⚙️ Install dependencies
+        run: yarn install
 
       - name: 🔤 Compile translations
-        run: pnpm intl:build 2>&1 | tee i18n.log
+        run: yarn intl:build
 
-      - name: Check for i18n compilation errors
-        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi
-
-      # EXPO_PUBLIC_ENV is handled in eas.json
-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
         run: |
           export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
           echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
           echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
           echo "$json" > google-services.json
 
       - name: 🏗️ EAS Build
-        env:
-          PROFILE: ${{ inputs.profile || 'testflight-android' }}
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          pnpm use-build-number-with-bump
-          pnpm eas build -p android
-          --profile $PROFILE
-          --local --output build.aab --non-interactive
+        run: yarn use-build-number-with-bump eas build -p android --profile ${{ inputs.profile || 'testflight-android' }} --local --output build.aab --non-interactive
 
       - name: ✍️ Rename Testflight bundle
         if: ${{ inputs.profile != 'production' }}
@@ -100,12 +78,12 @@ 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
         if: ${{ inputs.profile == 'production' }}
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           retention-days: 30
           compression-level: 6
@@ -115,7 +93,7 @@ jobs:
       - name: 🚀 Upload Testflight Artifact
         id: upload-artifact-testflight
         if: ${{ inputs.profile != 'production' }}
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           retention-days: 30
           compression-level: 6
@@ -128,44 +106,36 @@ jobs:
 
       - name: 🔔 Notify Slack of Production Build
         if: ${{ inputs.profile == 'production' }}
-        uses: slackapi/slack-github-action@v3.0.3
+        uses: slackapi/slack-github-action@v1.25.0
         with:
-          webhook: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          webhook-type: incoming-webhook
-          payload-templated: true
           payload: |
-            {"text": "Android production build for Google Play Store submission is ready!\n```Artifact: ${{ steps.upload-artifact-production.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```"}
+            {
+              "text": "Android production build for Google Play Store submission is ready!\n```Artifact: ${{ steps.upload-artifact-production.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
       - name: 🔔 Notify Slack of Testflight Build
         if: ${{ inputs.profile != 'production' }}
-        uses: slackapi/slack-github-action@v3.0.3
+        uses: slackapi/slack-github-action@v1.25.0
         with:
-          webhook: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          webhook-type: incoming-webhook
-          payload-templated: true
           payload: |
-            {"text": "Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact-testflight.outputs.artifact-url }}"}
-
-      - 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
+            {
+              "text": "Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact-testflight.outputs.artifact-url }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
       - name: 🏗️ Build Production APK
         if: ${{ inputs.profile == 'production' }}
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          pnpm use-build-number-with-bump
-          pnpm eas build -p android
-          --profile production-apk
-          --local --output build.apk --non-interactive
+        run: yarn use-build-number-with-bump eas build -p android --profile production-apk --local --output build.apk --non-interactive
 
       - name: 🚀 Upload Production APK Artifact
         id: upload-artifact-production-apk
         if: ${{ inputs.profile == 'production' }}
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           retention-days: 30
           compression-level: 6
@@ -174,24 +144,24 @@ jobs:
 
       - name: 🔔 Notify Slack of Production APK Build
         if: ${{ inputs.profile == 'production' }}
-        uses: slackapi/slack-github-action@v3.0.3
+        uses: slackapi/slack-github-action@v1.25.0
         with:
-          webhook: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          webhook-type: incoming-webhook
-          payload-templated: true
           payload: |
-            {"text": "Android production build for GitHub/Obtanium is ready!\n```Artifact: ${{ steps.upload-artifact-production-apk.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```"}
+            {
+              "text": "Android production build for GitHub/Obtanium is ready!\n```Artifact: ${{ steps.upload-artifact-production-apk.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
       - name: ⬇️ Restore Cache
         id: get-base-commit
-        uses: actions/cache@v5
-        if: ${{ inputs.profile == 'testflight-android' }}
+        uses: actions/cache@v4
+        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' }}
-        env:
-          GITHUB_SHA: ${{ github.sha }}
-        run: echo $GITHUB_SHA > most-recent-testflight-commit.txt
+        if: ${{ inputs.profile == 'testflight' }}
+        run: echo ${{ github.sha }} > most-recent-testflight-commit.txt

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

@@ -13,12 +13,8 @@ on:
 
 jobs:
   build:
-    if: github.repository == 'bluesky-social/social-app'
     name: Build and Submit iOS
-    runs-on: macos-26-xlarge
-    concurrency:
-      group: ios-build
-      cancel-in-progress: false
+    runs-on: macos-14
     steps:
       - name: Check for EXPO_TOKEN
         run: >
@@ -28,126 +24,66 @@ jobs:
           fi
 
       - name: ⬇️ Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
 
-      - uses: pnpm/action-setup@v6
-
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
-          cache: pnpm
+          node-version-file: .nvmrc
+          cache: yarn
 
       - name: 🪛 Setup jq
         uses: dcarbone/install-jq-action@v2
 
-      - name: ⚙️ Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: 🔨 Setup Expo CLI
-        uses: expo/expo-github-action@v9
+      - name: 🔨 Setup EAS
+        uses: expo/expo-github-action@v8
         with:
-          eas-version: '19.0.5'
-          packager: 'pnpm --allow-build=dtrace-provider'
+          expo-version: latest
+          eas-version: latest
           token: ${{ secrets.EXPO_TOKEN }}
 
+      - name: ⛏️ Setup EAS local builds
+        run: yarn global add eas-cli-local-build-plugin
+
+      - name: ⚙️ Install dependencies
+        run: yarn install
+
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "26.4"
+          xcode-version: '15.3'
 
       - name: ☕️ Setup Cocoapods
         uses: maxim-lobanov/setup-cocoapods@v1
         with:
-          version: 1.16.2
+          version: 1.14.3
 
       - name: 💾 Cache Pods
-        uses: actions/cache@v5
+        uses: actions/cache@v3
         id: pods-cache
         with:
           path: ./ios/Pods
-          # We'll use the pnpm-lock.yaml for our hash since we don't yet have a Podfile.lock. Pod versions will not
-          # change unless the pnpm version changes as well.
-          key: ${{ runner.os }}-pods-${{ hashFiles('pnpm-lock.yaml') }}
+          # We'll use the yarn.lock for our hash since we don't yet have a Podfile.lock. Pod versions will not
+          # change unless the yarn version changes as well.
+          key: ${{ runner.os }}-pods-${{ hashFiles('yarn.lock') }}
 
       - name: 🔤 Compile translations
-        run: pnpm intl:build 2>&1 | tee i18n.log
+        run: yarn intl:build
 
-      - name: Check for i18n compilation errors
-        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi
-
-      # EXPO_PUBLIC_ENV is handled in eas.json
       - name: ✏️ Write environment variables
-        id: env
         run: |
           echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
           echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
           echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json
 
       - name: 🏗️ EAS Build
-        env:
-          PROFILE: ${{ inputs.profile || 'testflight' }}
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          pnpm use-build-number-with-bump
-          pnpm eas build -p ios
-          --profile $PROFILE
-          --local --output build.tar.gz --non-interactive
-
-      - name: 📂 Extract build artifact
-        run: |
-          if [ -f "build.tar.gz" ]; then
-            echo "Extracting build.tar.gz..."
-            rm -rf ios-build
-            mkdir -p ios-build
-            tar -xzf build.tar.gz -C ios-build
-            echo "Extraction completed successfully"
-
-            echo ""
-            echo "Top-level extracted files:"
-            find ios-build -maxdepth 3 -print
-
-            echo ""
-            echo "Searching for IPA..."
-            IPA_PATH="$(find ios-build -type f -name '*.ipa' -print -quit)"
-            if [ -z "$IPA_PATH" ]; then
-              echo "ERROR: No .ipa found anywhere under ios-build."
-              echo "Archive contents:"
-              tar -tzf build.tar.gz | sed -n '1,200p'
-              exit 1
-            fi
-
-            BUILD_DIR="$(dirname "$IPA_PATH")"
-            echo "Found IPA at: $IPA_PATH"
-            echo "Build dir: $BUILD_DIR"
-            echo ""
-            echo "Build dir contents:"
-            ls -la "$BUILD_DIR"
-            echo "BUILD_DIR=$BUILD_DIR" >> $GITHUB_ENV
-          else
-            echo "Archive file not found!"
-            exit 1
-          fi
+        run: yarn use-build-number-with-bump eas build -p ios --profile ${{ inputs.profile || 'testflight' }} --local --output build.ipa --non-interactive
 
       - name: 🚀 Deploy
-        run: pnpm eas submit -p ios --non-interactive --path "$BUILD_DIR/Bluesky.ipa"
-
-      - name: 🪲 Upload dSYM to Sentry
-        run: >
-          SENTRY_ORG=blueskyweb
-          SENTRY_PROJECT=app
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          pnpm sentry-cli debug-files upload "$BUILD_DIR/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
@@ -155,24 +91,24 @@ jobs:
 
       - name: 🔔 Notify Slack of Production Build
         if: ${{ inputs.profile == 'production' }}
-        uses: slackapi/slack-github-action@v3.0.3
+        uses: slackapi/slack-github-action@v1.25.0
         with:
-          webhook: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          webhook-type: incoming-webhook
-          payload-templated: true
           payload: |
-            {"text": "iOS production build for App Store submission is ready!\n```Artifact: Check TestFlight to know when it is available\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_IOS_BUILD_NUMBER }}```"}
+            {
+              "text": "iOS production build for App Store submission is ready!\n```Artifact: Check TestFlight to know when it is available\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_IOS_BUILD_NUMBER }}```"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
       - name: ⬇️ Restore Cache
         id: get-base-commit
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         if: ${{ inputs.profile == 'testflight' }}
         with:
           path: most-recent-testflight-commit.txt
           key: most-recent-testflight-commit
 
       - name: ✏️ Write commit hash to cache
-        env:
-          GITHUB_SHA: ${{ github.sha }}
         if: ${{ inputs.profile == 'testflight' }}
-        run: echo $GITHUB_SHA > most-recent-testflight-commit.txt
+        run: echo ${{ github.sha }} > most-recent-testflight-commit.txt

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

@@ -20,7 +20,6 @@ on:
 
 jobs:
   bundleDeploy:
-    if: github.repository == 'bluesky-social/social-app'
     name: Bundle and Deploy EAS Update
     runs-on: ubuntu-latest
     concurrency:
@@ -39,16 +38,14 @@ jobs:
 
       # Validate the version if one is supplied. This should generally happen if the update is for a production client
       - name: 🧐 Validate version
-        env:
-          RUNTIME_VERSION: ${{ inputs.runtimeVersion }}
         if: ${{ inputs.runtimeVersion }}
         run: |
-          if [ -z "$RUNTIME_VERSION" ]; then
-            [[ "$RUNTIME_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "Version is valid" || exit 1
+          if [ -z "${{ inputs.runtimeVersion }}" ]; then
+            [[ "${{ inputs.runtimeVersion }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "Version is valid" || exit 1
           fi
 
       - name: ⬇️ Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -56,13 +53,11 @@ jobs:
         if: ${{ github.ref != 'refs/heads/main' }}
         run: git fetch origin main:main --depth 100
 
-      - uses: pnpm/action-setup@v6
-
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
-          cache: pnpm
+          node-version-file: .nvmrc
+          cache: yarn
 
       - name: 📷 Check fingerprint and install dependencies
         id: fingerprint
@@ -71,65 +66,54 @@ jobs:
           profile: ${{ inputs.channel || 'testflight' }}
           previous-commit-tag: ${{ inputs.runtimeVersion }}
 
-      - name: 🔤 Compile translations
-        run: pnpm intl:build 2>&1 | tee i18n.log
-
-      - name: Check for i18n compilation errors
-        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi
-
       - name: Lint check
-        run: pnpm lint
+        run: yarn lint
+
+      - name: Lint lockfile
+        run: yarn lockfile-lint
 
       - name: Prettier check
-        run: pnpm prettier --check .
+        run: yarn prettier --check .
+
+      - name: Check & compile i18n
+        run: yarn intl:build
 
       - name: Type check
-        run: pnpm typecheck
+        run: yarn typecheck
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v9
+        uses: expo/expo-github-action@v8
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
         with:
-          eas-version: '19.0.5'
-          packager: 'pnpm --allow-build=dtrace-provider'
+          expo-version: latest
+          eas-version: latest
           token: ${{ secrets.EXPO_TOKEN }}
 
+      - name: ⛏️ Setup Expo
+        if: ${{ !steps.fingerprint.outputs.includes-changes }}
+        run: yarn global add eas-cli-local-build-plugin
+
       - name: 🪛 Setup jq
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
         uses: dcarbone/install-jq-action@v2
 
-      # eas.json not used here, set EXPO_PUBLIC_ENV
-      - name: Env
-        env:
-          CHANNEL: ${{ inputs.channel || 'testflight' }}
-          GITHUB_SHA: ${{ github.sha }}
-        id: env
+      - name: ✏️ Write environment variables
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
         run: |
           export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
           echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_ENV=$CHANNEL" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
           echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
           echo "$json" > google-services.json
 
       - name: 🏗️ Create Bundle
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          pnpm export
+        run: EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export
 
       - name: 📦 Package Bundle and 🚀 Deploy
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        run: pnpm use-build-number bash scripts/bundleUpdate.sh
+        run: yarn use-build-number bash scripts/bundleUpdate.sh
         env:
           DENIS_API_KEY: ${{ secrets.DENIS_API_KEY }}
           RUNTIME_VERSION: ${{ inputs.runtimeVersion }}
@@ -137,7 +121,7 @@ jobs:
 
       - name: ⬇️ Restore Cache
         id: get-base-commit
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
         with:
           path: most-recent-testflight-commit.txt
@@ -145,19 +129,19 @@ jobs:
 
       - name: ✏️ Write commit hash to cache
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        run: echo $GITHUB_SHA > most-recent-testflight-commit.txt
+        run: echo ${{ github.sha }} > most-recent-testflight-commit.txt
 
   # 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-14
     concurrency:
-      group: ios-build
-      cancel-in-progress: false
+      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-ios
+      cancel-in-progress: true
     needs: [bundleDeploy]
     # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
     # available here
-    if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected && github.repository == 'bluesky-social/social-app' }}
+    if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected }}
     steps:
       - name: Check for EXPO_TOKEN
         run: >
@@ -167,122 +151,67 @@ jobs:
           fi
 
       - name: ⬇️ Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
 
-      - uses: pnpm/action-setup@v6
-
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
-          cache: pnpm
+          node-version-file: .nvmrc
+          cache: yarn
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v9
+        uses: expo/expo-github-action@v8
         with:
-          eas-version: '19.0.5'
-          packager: 'pnpm --allow-build=dtrace-provider'
+          expo-version: latest
+          eas-version: latest
           token: ${{ secrets.EXPO_TOKEN }}
 
+      - name: ⛏️ Setup EAS local builds
+        run: yarn global add eas-cli-local-build-plugin
+
       - name: ⚙️ Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: yarn install
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "26.4"
+          xcode-version: '15.3'
 
       - name: ☕️ Setup Cocoapods
         uses: maxim-lobanov/setup-cocoapods@v1
         with:
-          version: 1.16.2
+          version: 1.14.3
 
       - name: 💾 Cache Pods
-        uses: actions/cache@v5
+        uses: actions/cache@v3
         id: pods-cache
         with:
           path: ./ios/Pods
-          # We'll use the pnpm-lock.yaml for our hash since we don't yet have a Podfile.lock. Pod versions will not
-          # change unless the pnpm version changes as well.
-          key: ${{ runner.os }}-pods-${{ hashFiles('pnpm-lock.yaml') }}
+          # We'll use the yarn.lock for our hash since we don't yet have a Podfile.lock. Pod versions will not
+          # change unless the yarn version changes as well.
+          key: ${{ runner.os }}-pods-${{ hashFiles('yarn.lock') }}
 
       - name: 🔤 Compile translations
-        run: pnpm intl:build
+        run: yarn intl:build
 
-      # EXPO_PUBLIC_ENV is handled in eas.json
-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
         run: |
           echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
           echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
           echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json
 
       - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          pnpm use-build-number-with-bump
-          pnpm eas build -p ios
-          --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..."
-            rm -rf ios-build
-            mkdir -p ios-build
-            tar -xzf build.tar.gz -C ios-build
-            echo "Extraction completed successfully"
-
-            echo ""
-            echo "Top-level extracted files:"
-            find ios-build -maxdepth 3 -print
-
-            echo ""
-            echo "Searching for IPA..."
-            IPA_PATH="$(find ios-build -type f -name '*.ipa' -print -quit)"
-            if [ -z "$IPA_PATH" ]; then
-              echo "ERROR: No .ipa found anywhere under ios-build."
-              echo "Archive contents:"
-              tar -tzf build.tar.gz | sed -n '1,200p'
-              exit 1
-            fi
-
-            BUILD_DIR="$(dirname "$IPA_PATH")"
-            echo "Found IPA at: $IPA_PATH"
-            echo "Build dir: $BUILD_DIR"
-            echo ""
-            echo "Build dir contents:"
-            ls -la "$BUILD_DIR"
-            echo "BUILD_DIR=$BUILD_DIR" >> $GITHUB_ENV
-          else
-            echo "Archive file not found!"
-            exit 1
-          fi
+        run: yarn use-build-number-with-bump eas build -p ios --profile testflight --local --output build.ipa --non-interactive
 
       - name: 🚀 Deploy
-        run: pnpm eas submit -p ios --non-interactive --path "$BUILD_DIR/Bluesky.ipa"
-
-      - name: 🪲 Upload dSYM to Sentry
-        run: >
-          SENTRY_ORG=blueskyweb
-          SENTRY_PROJECT=app
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          pnpm sentry-cli debug-files upload "$BUILD_DIR/Bluesky.app.dSYM.zip" --include-sources
+        run: eas submit -p ios --non-interactive --path build.ipa
 
       - name: ⬇️ Restore Cache
         id: get-base-commit
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         if: ${{ inputs.channel == 'testflight' }}
         with:
           path: most-recent-testflight-commit.txt
@@ -290,20 +219,18 @@ jobs:
 
       - name: ✏️ Write commit hash to cache
         if: ${{ inputs.channel == 'testflight' }}
-        env:
-          GITHUB_SHA: ${{ github.sha }}
-        run: echo $GITHUB_SHA > most-recent-testflight-commit.txt
+        run: echo ${{ github.sha }} > most-recent-testflight-commit.txt
 
   buildIfNecessaryAndroid:
     name: Build and Submit Android
     runs-on: ubuntu-latest
     concurrency:
-      group: android-build
+      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-android
       cancel-in-progress: false
     needs: [bundleDeploy]
     # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
     # available here
-    if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected && github.repository == 'bluesky-social/social-app'}}
+    if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected }}
 
     steps:
       - name: Check for EXPO_TOKEN
@@ -314,71 +241,58 @@ jobs:
           fi
 
       - name: ⬇️ Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
 
-      - uses: pnpm/action-setup@v6
-
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
-          cache: pnpm
+          node-version-file: .nvmrc
+          cache: yarn
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v9
+        uses: expo/expo-github-action@v8
         with:
-          eas-version: '19.0.5'
-          packager: 'pnpm --allow-build=dtrace-provider'
+          expo-version: latest
+          eas-version: latest
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - uses: actions/setup-java@v5
+      - name: ⛏️ Setup EAS local builds
+        run: yarn global add eas-cli-local-build-plugin
+
+      - uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: ⚙️ Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: yarn install
 
       - name: 🔤 Compile translations
-        run: pnpm intl:build
+        run: yarn intl:build
 
-      # EXPO_PUBLIC_ENV is handled in eas.json
-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
         run: |
           export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
           echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
           echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
           echo "$json" > google-services.json
 
       - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          pnpm use-build-number-with-bump
-          pnpm eas build -p android
-          --profile testflight-android
-          --local --output build.apk --non-interactive
+        run: yarn use-build-number-with-bump eas build -p android --profile testflight-android --local --output build.apk --non-interactive
 
       - name: ⏰ Get a timestamp
         id: timestamp
         uses: nanzm/get-time-action@master
         with:
-          format: "MM-DD-HH-mm-ss"
+          format: 'MM-DD-HH-mm-ss'
 
       - name: 🚀 Upload Artifact
         id: upload-artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           retention-days: 30
           compression-level: 0
@@ -386,24 +300,24 @@ jobs:
           path: build.apk
 
       - name: 🔔 Notify Slack
-        uses: slackapi/slack-github-action@v3.0.3
+        uses: slackapi/slack-github-action@v1.25.0
         with:
-          webhook: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          webhook-type: incoming-webhook
-          payload-templated: true
           payload: |
-            {"text": "Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact.outputs.artifact-url }}"}
+            {
+              "text": "Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact.outputs.artifact-url }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
       - name: ⬇️ Restore Cache
         id: get-base-commit
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         if: ${{ inputs.channel != 'testflight' && inputs.channel != 'production' }}
         with:
           path: most-recent-testflight-commit.txt
           key: most-recent-testflight-commit
 
       - name: ✏️ Write commit hash to cache
-        env:
-          GITHUB_SHA: ${{ github.sha }}
         if: ${{ inputs.channel != 'testflight' && inputs.channel != 'production' }}
-        run: echo $GITHUB_SHA > most-recent-testflight-commit.txt
+        run: echo ${{ github.sha }} > most-recent-testflight-commit.txt

.github/workflows/claude.yml

@@ -1,54 +0,0 @@
-name: Claude Code
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude:
-    if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-      actions: read # Required for Claude to read CI results on PRs
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code
-        id: claude
-        uses: anthropics/claude-code-action@v1
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # This is an optional setting that allows Claude to read CI results on PRs
-          additional_permissions: |
-            actions: read
-
-          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
-          # prompt: 'Update the pull request description to include a summary of changes.'
-
-          # Optional: Add claude_args to customize behavior and configuration
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://code.claude.com/docs/en/cli-reference for available options
-          # claude_args: '--allowed-tools Bash(gh pr:*)'
-
-          # NOTE(sfn): we can add a custom system prompt here
-
-          claude_args: |
-            --model claude-opus-4-7

.github/workflows/golang-test-lint.yml

@@ -7,7 +7,7 @@ on:
       - main
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
+  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
   cancel-in-progress: true
 
 jobs:
@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
       - name: Set up Go tooling
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v3
         with:
-          go-version-file: bskyweb/go.mod
+          go-version: '1.23'
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
       - name: Check
@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
       - name: Set up Go tooling
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v3
         with:
-          go-version-file: bskyweb/go.mod
+          go-version: '1.23'
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
       - name: Lint

.github/workflows/lint.yml

@@ -9,119 +9,51 @@ concurrency:
   group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
   cancel-in-progress: true
 
-# These jobs only check out the repo and run checks, so read access to the
-# repo contents is all the GITHUB_TOKEN needs.
-permissions:
-  contents: read
-
 jobs:
   linting:
     name: Run linters
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        job: [lint, prettier, typecheck]
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v5
-      - name: Verify Node version pins match package.json
-        run: |
-          set -euo pipefail
-          expected=$(node -p "require('./package.json').engines.node.replace(/[^0-9.]/g, '')")
-          rc=0
-          check() {
-            if [ "$2" != "$expected" ]; then
-              echo "::error file=$1::Node version mismatch: $1 pins '$2' but package.json is '$expected'"
-              rc=1
-            fi
-          }
-          # FROM node:X.Y.Z - service runtime images
-          for f in Dockerfile.bskylink Dockerfile.bskyogcard; do
-            v=$(grep -oE 'FROM node:[0-9]+\.[0-9]+\.[0-9]+' "$f" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | sort -u)
-            check "$f" "$v"
-          done
-          # ENV NODE_VERSION=X.Y.Z - Go images that nvm-install Node for the JS build stage
-          for f in Dockerfile.embedr; do
-            v=$(grep -oE 'NODE_VERSION=[0-9]+\.[0-9]+\.[0-9]+' "$f" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | sort -u)
-            check "$f" "$v"
-          done
-          # eas.json "node": "X.Y.Z"
-          v=$(grep -oE '"node":[[:space:]]*"[0-9]+\.[0-9]+\.[0-9]+"' eas.json | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | sort -u)
-          check "eas.json" "$v"
-          exit $rc
-      - uses: pnpm/action-setup@v6
+        uses: actions/checkout@v3
       - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
-          cache: pnpm
-      - name: pnpm install
+          node-version-file: .nvmrc
+      - name: Yarn install
         uses: Wandalen/wretry.action@master
         with:
-          command: pnpm install --frozen-lockfile
+          command: yarn --frozen-lockfile
           attempt_limit: 3
           attempt_delay: 2000
+      - name: Lint check
+        run: yarn lint
+      - name: Lint lockfile
+        run: yarn lockfile-lint
+      - name: Prettier check
+        run: yarn prettier --check .
       - name: Check & compile i18n
-        run: pnpm intl:build
-      - name: Lint checks
-        run: pnpm ${{ matrix.job }}
-  # Aggregates the matrix results into a single stable check name so branch
-  # protection can require "Run linters" regardless of how many matrix jobs run.
-  # The result is asserted in `run` (not `if`) so a malformed expression can
-  # never silently skip the check and report a false pass.
-  linting-summary:
-    name: Run linters
-    if: always()
-    needs: [linting]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Require linting to have succeeded
-        env:
-          RESULT: ${{ needs.linting.result }}
-        run: |
-          echo "linting result: $RESULT"
-          test "$RESULT" = "success"
+        run: yarn intl:build
+      - name: Type check
+        run: yarn typecheck
   testing:
     name: Run tests
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        shard: [1, 2, 3, 4]
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v5
-      - uses: pnpm/action-setup@v6
+        uses: actions/checkout@v3
       - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
-          cache: pnpm
-      - name: pnpm install
+          node-version-file: .nvmrc
+      - name: Yarn install
         uses: Wandalen/wretry.action@master
         with:
-          command: pnpm install --frozen-lockfile
+          command: yarn --frozen-lockfile
           attempt_limit: 3
           attempt_delay: 2000
       - name: Check & compile i18n
-        run: pnpm intl:build
+        run: yarn intl:build
       - name: Run tests
         run: |
-          NODE_ENV=test pnpm test --forceExit --shard=${{ matrix.shard }}/${{ strategy.job-total }}
-  # Aggregates the sharded test results into a single stable check name so branch
-  # protection can require "Run tests" regardless of how many shards run.
-  # The result is asserted in `run` (not `if`) so a malformed expression can
-  # never silently skip the check and report a false pass.
-  testing-summary:
-    name: Run tests
-    if: always()
-    needs: [testing]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Require testing to have succeeded
-        env:
-          RESULT: ${{ needs.testing.result }}
-        run: |
-          echo "testing result: $RESULT"
-          test "$RESULT" = "success"
+          NODE_ENV=test yarn test --forceExit

.github/workflows/nightly-update-source-languages.yaml

@@ -1,51 +0,0 @@
-name: Nightly Update Source Languages
-on:
-  schedule:
-    - cron: "0 2 * * *" # run at 2 AM UTC
-  workflow_dispatch:
-
-jobs:
-  extract-languages:
-    name: Nightly Update Source Languages
-    runs-on: ubuntu-latest
-
-    permissions:
-      # Give the default GITHUB_TOKEN write permission to commit and push the
-      # added or changed files to the repository.
-      contents: write
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v5
-        with:
-          ssh-key: ${{secrets.GH_ACTION_DEPLOY_KEY}}
-      - uses: pnpm/action-setup@v6
-      - name: Install node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: package.json
-          cache: pnpm
-      - name: pnpm install
-        uses: Wandalen/wretry.action@master
-        with:
-          command: pnpm install --frozen-lockfile
-          attempt_limit: 3
-          attempt_delay: 2000
-      - name: Extract language strings
-        run: pnpm intl:extract
-      - name: Create commit
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: Nightly source-language update
-          file_pattern: ./src/locale/locales/en/messages.po
-      - name: Push source lang to Crowdin
-        uses: crowdin/github-action@v2
-        with:
-          upload_sources: true
-          upload_sources_args: "-b main"
-          upload_translations: false
-          push_translations: false
-          push_sources: false
-          create_pull_request: false
-        env:
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/pull-request-comment.yml

@@ -1,209 +0,0 @@
----
-name: PR Comment Trigger
-
-on:
-  issue_comment:
-    types: [created]
-
-# Permissiosn to make comments in the pull request
-permissions:
-  pull-requests: write
-  actions: write
-  contents: read
-
-jobs:
-  handle-comment:
-    if: github.event.issue.pull_request
-    runs-on: ubuntu-latest
-    outputs:
-      should-deploy: ${{ steps.check-org.outputs.result }}
-
-    steps:
-      - name: Check if bot is mentioned
-        id: check-mention
-        env:
-          COMMENT: ${{ github.event.comment.body }}
-        run: |
-          if [[ "$COMMENT" == *"@github-actions"* ]] || \
-             [[ "$COMMENT" == *"github-actions[bot]"* ]]; then
-            bot_mentioned=true
-          else
-            bot_mentioned=false
-          fi
-
-
-          if [[ "$COMMENT" == *"ota"* ]]; then
-            has_ota=true
-          else
-            has_ota=false
-          fi
-
-
-          if [[ "$bot_mentioned" == "true" ]] && [[ "$has_ota" == "true" ]]; then
-            echo "mentioned=true" >> $GITHUB_OUTPUT
-          else
-            echo "mentioned=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Check organization membership
-        if: steps.check-mention.outputs.mentioned == 'true'
-        id: check-org
-        uses: actions/github-script@v7
-        with:
-          script: |
-            try {
-              const { data: perm } = await github.rest.repos.getCollaboratorPermissionLevel({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                username: context.payload.comment.user.login
-              });
-
-              const hasAccess = ['admin', 'write'].includes(perm.permission);
-              console.log(`User has ${perm.permission} access`);
-
-              return hasAccess;
-            } catch(error) {
-              console.log('User has no repository access');
-              return false;
-            }
-
-  bundle-deploy:
-    name: Bundle and Deploy EAS Update
-    runs-on: ubuntu-latest
-    needs: [handle-comment]
-    if: needs.handle-comment.outputs.should-deploy == 'true'
-
-    steps:
-      - name: Get PR HEAD SHA
-        env:
-          ISSUE_NUMBER: ${{ github.event.issue.number }}
-        id: pr-info
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const pr = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: process.env.ISSUE_NUMBER,
-            });
-
-            console.log(`PR HEAD SHA: ${pr.data.head.sha}`);
-            console.log(`PR HEAD REF: ${pr.data.head.ref}`);
-
-            core.setOutput('head-sha', pr.data.head.sha);
-            core.setOutput('head-ref', pr.data.head.ref);
-
-      - name: 💬 Drop a comment
-        uses: marocchino/sticky-pull-request-comment@v3
-        with:
-          header: pull-request-eas-build-${{ steps.pr-info.outputs.head-sha }}
-          number: ${{ github.event.issue.number }}
-          message: |
-            An OTA deployment has been requested and is now running for `${{ steps.pr-info.outputs.head-sha }}`.
-
-            [Here is some music to listen to while you wait...](https://www.youtube.com/watch?v=VBlFHuCzPgY)
-            ---
-            *Generated by [PR labeler](https://github.com/expo/expo/actions/workflows/pr-labeler.yml) 🤖*
-
-      - name: Check for EXPO_TOKEN
-        run: >
-          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
-            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
-            exit 1
-          fi
-
-      - name: ⬇️ Checkout
-        uses: actions/checkout@v5
-        with:
-          ref: ${{ steps.pr-info.outputs.head-sha }}
-
-      - uses: pnpm/action-setup@v6
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: package.json
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: 🔤 Compile translations
-        run: pnpm intl:build 2>&1 | tee i18n.log
-
-      - name: Check for i18n compilation errors
-        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi
-
-      - name: Lint check
-        run: pnpm lint
-
-      - name: Type check
-        run: pnpm typecheck
-
-      - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v9
-        with:
-          eas-version: '19.0.5'
-          packager: 'pnpm --allow-build=dtrace-provider'
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: 🪛 Setup jq
-        uses: dcarbone/install-jq-action@v2
-
-      - name: Env
-        id: env
-        run: |
-          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_ENV=testflight" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
-          echo "$json" > google-services.json
-
-      - name: 🏗️ Create Bundle
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          pnpm export
-
-      - name: 📦 Package Bundle and 🚀 Deploy
-        run: pnpm use-build-number bash scripts/bundleUpdate.sh
-        env:
-          DENIS_API_KEY: ${{ secrets.DENIS_API_KEY }}
-          CHANNEL_NAME: pull-request-${{ github.event.issue.number }}
-          RUNTIME_VERSION:
-
-      - name: 💬 Drop a comment
-        uses: marocchino/sticky-pull-request-comment@v3
-        env:
-          ISSUE_NUMBER: ${{ github.event.issue.number }}
-        with:
-          header: pull-request-eas-build-${{ steps.pr-info.outputs.head-sha }}
-          number: ${{ github.event.issue.number }}
-          message: |
-            Your requested OTA deployment was successful! You may now apply it by either scanning the QR code or opening the deep link below in your browser:
-
-            <img src="https://bsky-qr.vercel.app?channel=pull-request-$ISSUE_NUMBER" width=300 height=300>
-
-            `bluesky://intent/apply-ota?channel=pull-request-${{ github.event.issue.number }}`
-            ---
-
-            *Generated by [PR labeler](https://github.com/expo/expo/actions/workflows/pr-labeler.yml) 🤖*
-
-      - name: 💬 Drop a comment
-        uses: marocchino/sticky-pull-request-comment@v3
-        if: failure()
-        with:
-          header: pull-request-eas-build-${{ steps.pr-info.outputs.head-sha }}
-          number: ${{ github.event.issue.number }}
-          message: |
-            Your requested OTA deployment was unsuccessful. See action logs for more details.
-            ---
-            *Generated by [PR labeler](https://github.com/expo/expo/actions/workflows/pr-labeler.yml) 🤖*

.github/workflows/pull-request-commit.yml

@@ -24,51 +24,41 @@ jobs:
     if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.event_name == 'pull_request'}}
     steps:
       - name: ⬇️ Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: pnpm/action-setup@v6
-
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
-          cache: pnpm
+          node-version-file: .nvmrc
+          cache: yarn
 
       - name: Ensure tracking relevant branches and checkout base
-        env:
-          HEAD_REF: ${{ github.head_ref }}
-          BASE_REF: ${{ github.base_ref }}
         run: |
-          git checkout $HEAD_REF
-          git checkout $BASE_REF
+          git checkout ${{ github.head_ref }}
+          git checkout ${{ github.base_ref }}
 
       - name: Get the base commit
         id: base-commit
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: echo base-commit=$(git log -n 1 $BASE_REF --pretty=format:'%H') >> "$GITHUB_OUTPUT"
+        run: echo base-commit=$(git log -n 1 ${{ github.base_ref }} --pretty=format:'%H') >> "$GITHUB_OUTPUT"
 
       - name: Merge PR commit
-        env:
-          HEAD_REF: ${{ github.head_ref }}
         run: |
           # Have to set a git config for the merge to work
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global user.name "github-actions[bot]"
-          git merge --no-edit $HEAD_REF
-          pnpm install
-          pnpm intl:build
+          git merge --no-edit ${{ github.head_ref }}
+          yarn install
 
       - name: 🔦 Generate stats file for PR
         run: |
-          pnpm generate-webpack-stats-file
+          yarn generate-webpack-stats-file
           mv stats.json ../stats-new.json
 
       - name: ⬇️ Get base stats from cache
         id: get-base-stats
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: stats-base.json
           key: stats-base-${{ steps.base-commit.outputs.base-commit }}
@@ -82,21 +72,20 @@ jobs:
       - name: 🔦 Generate stats file from base commit
         if: ${{ !steps.get-base-stats.outputs.cache-hit }}
         run: |
-          pnpm install
-          pnpm intl:build
-          pnpm generate-webpack-stats-file
+          yarn install
+          yarn generate-webpack-stats-file
           mv stats.json stats-base.json
 
       - name: ％ Get diff
         id: get-diff
         uses: NejcZdovc/bundle-size-diff@v1
         with:
-          base_path: "stats-base.json"
-          pr_path: "../stats-new.json"
-          excluded_assets: "(.+).chunk.js|(.+).js.map|(.+).json|(.+).png|(.+).svg|(.+).webp|(.+).jpg|(.+).ico"
+          base_path: 'stats-base.json'
+          pr_path: '../stats-new.json'
+          excluded_assets: '(.+).chunk.js|(.+).js.map|(.+).json|(.+).png'
 
       - name: 💬 Drop a comment
-        uses: marocchino/sticky-pull-request-comment@v3
+        uses: marocchino/sticky-pull-request-comment@v2
         with:
           header: bundle-diff
           message: |
@@ -110,7 +99,7 @@ jobs:
     if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.event_name == 'pull_request'}}
     steps:
       - name: ⬇️ Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 100
 
@@ -118,13 +107,11 @@ jobs:
         run: git fetch origin main:main --depth 100
         if: github.event_name == 'pull_request'
 
-      - uses: pnpm/action-setup@v6
-
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
-          cache: pnpm
+          node-version-file: .nvmrc
+          cache: yarn
 
       - name: 📷 Check fingerprint and install dependencies
         id: fingerprint
@@ -133,7 +120,7 @@ jobs:
           profile: pull-request
 
       - name: 💬 Drop a comment
-        uses: marocchino/sticky-pull-request-comment@v3
+        uses: marocchino/sticky-pull-request-comment@v2
         if: ${{ steps.fingerprint.outputs.includes-changes }}
         with:
           header: fingerprint-diff
@@ -151,8 +138,9 @@ jobs:
             *Generated by [PR labeler](https://github.com/expo/expo/actions/workflows/pr-labeler.yml) 🤖*
 
       - name: 💬 Delete comment
-        uses: marocchino/sticky-pull-request-comment@v3
+        uses: marocchino/sticky-pull-request-comment@v2
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
         with:
           header: fingerprint-diff
           delete: true
+

.github/workflows/sync-internal.yaml

@@ -1,31 +0,0 @@
-name: Sync to internal repo
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    if: github.repository == 'bluesky-social/social-app'
-    steps:
-      - name: Checkout public repo
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-      - name: Generate GitHub App Token
-        id: app-token
-        uses: actions/create-github-app-token@v3
-        with:
-          app-id: ${{ vars.SYNC_INTERNAL_APP_ID }}
-          private-key: ${{ secrets.SYNC_INTERNAL_PK }}
-          repositories: social-app-internal
-      - name: Push to internal repo
-        env:
-          TOKEN: ${{ steps.app-token.outputs.token }}
-        run: |
-          git config user.name "github-actions"
-          git config user.email "test@users.noreply.github.com"
-          git config --unset-all http.https://github.com/.extraheader
-          git remote add internal https://x-access-token:${TOKEN}@github.com/bluesky-social/social-app-internal.git
-          git push internal main --force

.github/workflows/verify-pnpm-lock.yml

@@ -1,52 +0,0 @@
-name: Lockfile
-
-on:
-  pull_request:
-concurrency:
-  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
-  cancel-in-progress: true
-
-jobs:
-  verify-pnpm-lock:
-    name: No manual pnpm-lock.yaml edits
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out PR HEAD
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-
-      - name: Fetch base branch
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: git fetch origin $BASE_REF --depth=1
-
-      - uses: pnpm/action-setup@v6
-
-      - name: Install node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: package.json
-
-      - name: Reset pnpm-lock.yaml to base
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: git show "origin/$BASE_REF:pnpm-lock.yaml" > pnpm-lock.yaml
-
-      - name: pnpm install
-        uses: Wandalen/wretry.action@master
-        with:
-          # Fine to skip scripts since we don't run any code
-          command: pnpm clean && pnpm install --ignore-scripts --no-frozen-lockfile
-          attempt_limit: 3
-          attempt_delay: 2000
-
-      - name: Verify pnpm-lock.yaml
-        run: |
-          git diff --quiet --exit-code || {
-            echo '::error::`pnpm-lock.yaml` does not match what pnpm would generate given the base `pnpm-lock.yaml` and the head `package.json`.'
-            echo '::error:: - If this is intentional, you can ignore this check.'
-            echo '::error:: - If this is unintentional, apply the following diff:'
-            git --no-pager diff
-            exit 1
-          }

.github/workflows/verify-yarn-lock.yml

@@ -0,0 +1,46 @@
+name: Lockfile
+
+on:
+  pull_request:
+concurrency:
+  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  verify-yarn-lock:
+    name: No manual yarn.lock edits
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out PR HEAD
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Fetch base branch
+        run: git fetch origin ${{ github.base_ref }} --depth=1
+
+      - name: Install node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+
+      - name: Reset yarn.lock to base
+        run: git show "origin/${{ github.base_ref }}:yarn.lock" > yarn.lock
+
+      - name: Yarn install
+        uses: Wandalen/wretry.action@master
+        with:
+          # Fine to skip scripts since we don't run any code
+          command: yarn install --ignore-scripts
+          attempt_limit: 3
+          attempt_delay: 2000
+
+      - name: Verify yarn.lock
+        run: |
+          git diff --quiet --exit-code || {
+            echo '::error::`yarn.lock` does not match what Yarn would generate given the base `yarn.lock` and the head `package.json`.'
+            echo '::error:: - If this is intentional, you can ignore this check.'
+            echo '::error:: - If this is unintentional, apply the following diff:'
+            git --no-pager diff
+            exit 1
+          }

.gitignore

@@ -58,7 +58,6 @@ buck-out/
 # Ruby / CocoaPods
 /ios/Pods/
 /vendor/bundle/
-Gemfile.lock
 
 # Testing
 coverage/
@@ -86,9 +85,6 @@ stats.json
 # VSCode
 .vscode
 
-# Zed
-.zed
-
 # gitignore and github actions
 !.gitignore
 !.github
@@ -113,9 +109,7 @@ google-services.json
 
 # i18n
 src/locale/locales/_build/
-src/locale/locales/**/messages.js
-src/locale/locales/**/messages.mjs
-src/locale/locales/**/messages.ts
+src/locale/locales/**/*.js
 
 # local builds
 *.apk
@@ -124,12 +118,3 @@ src/locale/locales/**/messages.ts
 
 # ogcard assets
 bskyogcard/src/assets/fonts/noto-*
-
-# bskyweb build output
-bskyweb/static/media/*.webp
-bskyweb/static/media/*.jpg
-bskyweb/static/media/*.png
-bskyweb/static/media/*.svg
-
-# superpowers plugin plans/specs — local-only workspace
-docs/superpowers/

.husky/pre-commit

@@ -1 +1,4 @@
-pnpm exec lint-staged --concurrent false
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged

.jscodeshift/file/lingui-v5.js

@@ -1,236 +0,0 @@
-/**
- * Codemod to update Lingui's useLingui() hook to use v5.
- *
- * Before:
- *   import {msg} from '@lingui/core/macro'
- *   import {useLingui} from '@lingui/react'
- *   const {_} = useLingui()
- *   _(msg`Lorem ipsum`)
- *
- * After:
- *   import {useLingui} from '@lingui/react/macro'
- *   const {t: l} = useLingui()
- *   l`Lorem ipsum`
- *
- * Usage: jscodeshift -t .jscodeshift/file/lingui-v5.js <file-path>
- * Example: jscodeshift -t .jscodeshift/file/lingui-v5.js modules/bottom-sheet/src/lib/Portal.tsx
- */
-
-/* eslint-disable */
-
-export const parser = 'tsx'
-
-export default function transformer(file, api) {
-  const j = api.jscodeshift
-
-  const root = j(file.source)
-
-  // Remove msg imports, including aliased imports
-  root
-    .find(j.ImportDeclaration)
-    .filter(path => path.node.source.value === '@lingui/core/macro')
-    .forEach(path => {
-      const newSpecifiers = path.node.specifiers.filter(specifier => {
-        if (j.ImportSpecifier.check(specifier)) {
-          const importedName = specifier.imported
-            ? specifier.imported.name
-            : specifier.local.name
-          const localName = specifier.local
-            ? specifier.local.name
-            : importedName
-
-          return !(
-            importedName === 'msg' &&
-            (localName === 'msg' || localName === 'msgLingui')
-          )
-        }
-        return true
-      })
-
-      if (newSpecifiers.length > 0) {
-        path.node.specifiers = newSpecifiers
-      } else {
-        j(path).remove()
-      }
-    })
-
-  // Update React imports
-  root
-    .find(j.ImportDeclaration)
-    .filter(path => path.node.source.value === '@lingui/react')
-    .forEach(path => {
-      path.node.source = j.stringLiteral('@lingui/react/macro')
-    })
-
-  // Replace {_} with {t: l}
-  root
-    .find(j.VariableDeclarator, {
-      init: {
-        type: 'CallExpression',
-        callee: {name: 'useLingui'},
-      },
-    })
-    .replaceWith(nodePath => {
-      const {node} = nodePath
-      for (let i = 0; i < node.id.properties.length; i++) {
-        if (node.id.properties[i].key.name === '_') {
-          node.id.properties[i].key = j.identifier('t')
-          node.id.properties[i].shorthand = false
-          node.id.properties[i].value = j.identifier('l')
-        }
-      }
-      return node
-    })
-
-  // Replace {_: _l} with {t: l}
-  root
-    .find(j.VariableDeclarator, {
-      init: {callee: {name: 'useLingui'}},
-      id: {
-        properties: properties =>
-          properties.some(p => p.key.name === '_' && p.value.name === '_l'),
-      },
-    })
-    .forEach(path => {
-      const prop = path.node.id.properties.find(
-        p => p.key.name === '_' && p.value.name === '_l',
-      )
-      if (prop) {
-        prop.key.name = 't'
-        prop.value.name = 'l'
-      }
-    })
-
-  // Replace _(msg``) with l``
-  root
-    .find(j.CallExpression, {
-      callee: {name: '_'},
-      arguments: [
-        {
-          type: 'TaggedTemplateExpression',
-          tag: {name: 'msg'},
-        },
-      ],
-    })
-    .replaceWith(path => {
-      const quasis = path.node.arguments[0].quasi
-
-      return j.taggedTemplateExpression(j.identifier('l'), quasis)
-    })
-
-  // Replace _l(msgLingui``) with l``
-  root
-    .find(j.CallExpression, {
-      callee: {name: '_l'},
-      arguments: [
-        {
-          type: 'TaggedTemplateExpression',
-          tag: {name: 'msgLingui'},
-        },
-      ],
-    })
-    .replaceWith(path => {
-      const quasis = path.node.arguments[0].quasi
-
-      return j.taggedTemplateExpression(j.identifier('l'), quasis)
-    })
-
-  // Replace _(msg()) with l()
-  root
-    .find(j.CallExpression, {
-      callee: {name: '_'},
-      arguments: [
-        {
-          type: 'CallExpression',
-          callee: {name: 'msg'},
-        },
-      ],
-    })
-    .replaceWith(path => {
-      return j.callExpression(j.identifier('l'), [
-        path.node.arguments[0].arguments[0],
-      ])
-    })
-
-  // Replace _l(msgLingui()) with l()
-  root
-    .find(j.CallExpression, {
-      callee: {name: '_l'},
-      arguments: [
-        {
-          type: 'CallExpression',
-          callee: {name: 'msgLingui'},
-        },
-      ],
-    })
-    .replaceWith(path => {
-      return j.callExpression(j.identifier('l'), [
-        path.node.arguments[0].arguments[0],
-      ])
-    })
-
-  // Replace _(plural()) with plural()
-  root
-    .find(j.CallExpression, {
-      callee: {
-        type: 'Identifier',
-        name: '_',
-      },
-    })
-    .forEach(path => {
-      const callExpression = path.node
-      if (
-        callExpression.arguments.length === 1 &&
-        callExpression.arguments[0].type === 'CallExpression'
-      ) {
-        const innerCall = callExpression.arguments[0]
-
-        if (
-          innerCall.callee.type === 'Identifier' &&
-          innerCall.callee.name === 'plural'
-        ) {
-          j(path).replaceWith(innerCall)
-        }
-      }
-    })
-
-  // Update hook dependency arrays
-  root
-    .find(j.CallExpression, {
-      callee: callee => {
-        if (
-          callee.type === 'Identifier' ||
-          callee.type === 'MemberExpression'
-        ) {
-          return true
-        }
-        if (
-          ['useCallback', 'useEffect', 'useMemo'].includes(callee.name) &&
-          callee.type === 'MemberExpression' &&
-          callee.object.type === 'Identifier' &&
-          callee.object.name === 'React' &&
-          callee.property.type === 'Identifier' &&
-          callee.property.name === 'useCallback'
-        ) {
-          return true
-        }
-        return false
-      },
-    })
-    .forEach(path => {
-      const dependencyArray = path.node.arguments[1]
-      if (dependencyArray && dependencyArray.type === 'ArrayExpression') {
-        dependencyArray.elements = dependencyArray.elements.map(element => {
-          if (
-            element.type === 'Identifier' &&
-            (element.name === '_' || element.name === '_l')
-          ) {
-            return j.identifier('l')
-          }
-          return element
-        })
-      }
-    })
-
-  return root.toSource()
-}

.jscodeshift/repo/react-import.js

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

.jscodeshift/repo/toast-v2.js

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

.nvmrc

@@ -1 +1 @@
-24.15.0
+20

.prettierignore

@@ -5,14 +5,10 @@
 !**/*.jsx
 !**/*.ts
 !**/*.tsx
-!**/*.mjs
-!**/*.cjs
 !*/
 
 !**/*.css
 
-!**/pnpm-workspace.yaml
-
 # More specific ignores go below.
 .expo
 android

.prettierrc.js

@@ -1,6 +1,4 @@
-import {type Config} from 'prettier'
-
-const config: Config = {
+module.exports = {
   semi: false,
   arrowParens: 'avoid',
   bracketSameLine: true,
@@ -8,5 +6,3 @@ const config: Config = {
   singleQuote: true,
   trailingComma: 'all',
 }
-
-export default config

CLAUDE.md

@@ -1,894 +0,0 @@
-# CLAUDE.md – Bluesky Social App Development Guide
-
-This document provides guidance for working effectively in the Bluesky Social app codebase.
-
-## Project Overview
-
-Bluesky Social is a cross-platform social media application built with React Native and Expo. It runs on iOS, Android, and Web, connecting to the AT Protocol (atproto) decentralized social network.
-
-**Tech Stack:**
-
-- React 19.1
-- React Native 0.81 with Expo 54
-- TypeScript 6
-- React Navigation 7 for routing
-- TanStack Query (React Query) for data fetching
-- Lingui 5 for internationalization
-- Custom design system called ALF (Application Layout Framework)
-
-Prefer using the latest features available for each of these libraries (exact versions are found in `package.json`). For example, prefer `@lingui/react/macro` over `@lingui/react`. Suggest refactoring legacy or deprecated uses.
-
-## Essential Commands
-
-```bash
-# Development
-pnpm start              # Start Expo dev server
-pnpm web                # Start web version
-pnpm android            # Run on Android
-pnpm ios                # Run on iOS
-
-# Testing & Quality
-# IMPORTANT: Always use these pnpm scripts, never call the underlying tools directly
-pnpm test               # Run Jest tests
-pnpm lint               # Run ESLint
-pnpm typecheck          # Run TypeScript type checking
-
-# Internationalization
-# DO NOT run these commands - extraction and compilation are handled by CI
-pnpm intl:extract       # Extract translation strings (nightly CI job)
-pnpm intl:compile       # Compile translations for runtime (nightly CI job)
-
-# Build
-pnpm build-web          # Build web version
-pnpm prebuild           # Generate native projects
-```
-
-## Project Structure
-
-```
-src/
-├── alf/                    # Design system (ALF) - themes, atoms, tokens
-├── components/             # Shared UI components (Button, Dialog, Menu, etc.)
-├── screens/                # Full-page screen components (newer pattern)
-├── features/               # Macro-features that bridge components/screens
-├── view/
-│   ├── screens/            # Full-page screens (legacy location)
-│   ├── com/                # Reusable view components
-│   └── shell/              # App shell (navigation bars, tabs)
-├── state/
-│   ├── queries/            # TanStack Query hooks
-│   ├── preferences/        # User preferences (React Context)
-│   ├── session/            # Authentication state
-│   └── persisted/          # Persistent storage layer
-├── lib/                    # Utilities, constants, helpers
-├── locale/                 # i18n configuration and language files
-└── Navigation.tsx          # Main navigation configuration
-```
-
-### Project Structure in Depth
-
-When building new things, follow these guidelines for where to put code.
-
-#### Components vs Screens vs Features
-
-**Components** are reusable UI elements that are not full screens. Should be
-platform-agnostic when possible. Examples: Button, Dialog, Menu, TextField. Put
-these in `/components` if they are shared across screens.
-
-**Screens** are full-page components that represent a route in the app. They
-often contain multiple components and handle layout for a page. New screens
-should go in `/screens` (not `/view/screens`) to encourage better organization
-and separation from legacy code.
-
-For complex screens that have specific components or data needs that _are not
-shared by other screens_, we encourage subdirectoreis within `/screens/<name>`
-e.g. `/screens/ProfileScreen/ProfileScreen.tsx` and
-`/screens/ProfileScreen/components/`.
-
-**Features** are higher-level modules that may include context, data fetching,
-components, and utilities related to a specific feature e.g.
-`/features/liveNow`. They don't neatly fit into components or screens and often
-span multiple screens. This is an optional pattern for organizing complex
-features.
-
-#### Legacy Directories
-
-For the most part, avoid writing new files into the `/view` directory and
-subdirectories. This is the older pattern for organizing screens and components,
-and it has become a bit disorganized over time. New development should go into
-`/screens`, `/components`, and `/features`.
-
-#### State
-
-The `/state` directory is where we've historically put all our data fetching and
-state management logic. This is perfectly fine, but for new features, consider
-organizing state logic closer to the components that use it, either within a
-feature directory or co-located with a screen. The key is to keep related code
-together and avoid having "god files" with too much unrelated logic.
-
-#### Lib
-
-The `/lib` directory is for utilities and helpers that don't fit into other
-categories. This can include things like API clients, formatting functions,
-constants, and other shared logic.
-
-#### Top Level Directories
-
-Avoid writing new top-level subdirectories within `/src`. We've done this for a
-few things in the past that, but we have stronger patterns now. Examples:
-`/logger` should probably have been written into `/lib`. And `ageAssurance` is
-better classified within `/features`. We will probably migrate these things
-eventually.
-
-### File and Directory Naming Conventions
-
-Typically JS style for variables, functions, etc. We use ProudCamelCase for
-components, and camelCase directories and files.
-
-When organizing new code, consider if it fits into a single file, or if it
-should be broken down into multiple files. For "macro" component cases, or
-things that live in `/features` or `/screens`, we often follow a pattern of
-having an `index.tsx` for the main component, and then co-locating related
-components, hooks, and utilities in the same directory. For example:
-
-```
-src
-├── screens/
-│   ├── ProfileScreen/
-│   │   ├── index.tsx          # Main screen component
-│   │   ├── components/       # Sub-components used only by this screen
-```
-
-Similar patterns can be found in `/features` and `/components`. The idea here is
-to keep related code together and make it easier to navigate.
-
-You should ask yourself: if someone new was looking for the code related to this
-feature or screen, where would they expect to find it? Organizing code in a way
-that matches developer expectations can make the codebase much more
-approachable. Being able to say "Live Now stuff lives in `/features/liveNow`" is
-easier to understand than having it scattered across multiple directories.
-
-No need to go overboard with this. If a component or feature fits into a single
-file, there's no reason to have a `/Component/index.tsx` file when it could just
-be `/Component.tsx`. Use your judgment based on the complexity and amount of
-related code.
-
-#### Platform Specific Files
-
-We have conflicting patterns in the app for this. The preferred approach is to
-group platform-specific files into a directory as much as possible. For example,
-rather than having `Component.tsx`, `Component.web.tsx`, and
-`Component.native.tsx` in the same directory, we prefer to have a `Component/`
-directory with `index.tsx`, `index.web.tsx`, and `index.native.tsx`. This keeps
-related code together and gives us a better visual cue that there are probably
-other files contained within this "macro" feature, whereas `Component.tsx` on
-its own looks more like a single component file.
-
-### Documentation and Tests Within Features
-
-Comment code when necessary to explain the “why” behind something; avoid
-comments that simply describe the code. Avoid Unicode characters in comments,
-e.g., use `-` not `—`.
-
-For larger features or components, it's helpful to include a README.md file
-within the directory that explains the purpose of the feature, how it works, and
-any important implementation details. The `/Component/index.tsx` pattern lends
-itself well to this, since the `index.tsx` can be the main component file, and
-the `README.md` can provide documentation for the whole feature. This is
-optional, but can be a nice way to keep documentation close to the code it
-describes.
-
-Similarly, if there are tests that are specific to a component or feature, it
-can be helpful to include them in the same directory, either as
-`Component.test.tsx` or in a `__tests__/` subdirectory. This keeps everything
-related to the component or feature in one place and makes it easier to find and
-maintain tests.
-
-## Styling System (ALF)
-
-ALF is the custom design system. It uses Tailwind-inspired naming with underscores instead of hyphens.
-
-### Basic Usage
-
-Generally, order atoms by:
-
-- Flexbox configuration, e.g., `a.flex_row`
-- Spacing, e.g., `a.px_md`
-- Text styles, e.g., `a.font_bold`
-- Themes, e.g., `t.atoms.text`,
-- Raw styles, e.g., `{backgroundColor: t.palette.primary_500}`
-
-```tsx
-import {atoms as a, useTheme} from '#/alf'
-
-function MyComponent() {
-  const t = useTheme()
-
-  return (
-    <View style={[a.flex_row, a.gap_md, a.p_lg, t.atoms.bg]}>
-      <Text style={[a.text_md, a.font_bold, t.atoms.text_contrast_high]}>Hello</Text>
-    </View>
-  )
-}
-```
-
-### Key Concepts
-
-**Static Atoms** – Theme-independent styles imported from `atoms`:
-
-```tsx
-import {atoms as a} from '#/alf'
-// a.flex_row, a.p_md, a.gap_sm, a.rounded_md, a.text_lg, etc.
-```
-
-**Theme Atoms** – Theme-dependent colors from `useTheme()`:
-
-```tsx
-const t = useTheme()
-// t.atoms.bg, t.atoms.text, t.atoms.border_contrast_low, etc.
-// t.palette.primary_500, t.palette.negative_400, etc.
-```
-
-**Platform Utilities** – For platform-specific styles:
-
-```tsx
-import {web, native, ios, android, platform} from '#/alf'
-
-const styles = [
-  a.p_md,
-  web({cursor: 'pointer'}),
-  native({paddingBottom: 20}),
-  platform({ios: {...}, android: {...}, web: {...}}),
-]
-```
-
-**Breakpoints** – Responsive design:
-
-```tsx
-import {useBreakpoints} from '#/alf'
-
-const {gtPhone, gtMobile, gtTablet} = useBreakpoints()
-if (gtMobile) {
-  // Tablet or desktop layout
-}
-```
-
-### Naming Conventions
-
-- Spacing: `2xs`, `xs`, `sm`, `md`, `lg`, `xl`, `2xl` (t-shirt sizes)
-- Text: `text_xs`, `text_sm`, `text_md`, `text_lg`, `text_xl`
-- Gaps/Padding: `gap_sm`, `p_md`, `px_lg`, `py_xl`
-- Flex: `flex_row`, `flex_1`, `align_center`, `justify_between`
-- Borders: `border`, `border_t`, `rounded_md`, `rounded_full`
-
-## Component Patterns
-
-- Prefer fragment shorthand over `Fragment` unless a `key` is needed.
-- Prefer functions over arrow functions for component declarations.
-- Prefer prop destructuring via parameters over a const within the component.
-- Prefer inline types over `Props` types or interfaces.
-- Set reasonable defaults for optional props.
-
-```tsx
-import {Fragment} from 'react'
-import {View} from 'react-native'
-import {Trans, useLingui} from '@lingui/react/macro'
-
-import {Text} from '#/components/Typography'
-
-function MyComponent({foo = []}: {foo?: string[]}) {
-  const {t: l} = useLingui()
-
-  return (
-    <>
-      <View><Text><Trans>Example</Trans><Text></View>
-      <View>
-        {foo.map((foo, index) => (
-          <Fragment key={foo}>
-            <Text>{index}</Text>
-            <Text>{foo}</Text>
-          </Fragment>
-        ))}
-      </View>
-    </>
-  );
-}
-```
-
-### Dialog Component
-
-Dialogs use a bottom sheet on native and a modal on web. Use `useDialogControl()` hook to manage state.
-
-```tsx
-import * as Dialog from '#/components/Dialog'
-
-function MyFeature() {
-  const control = Dialog.useDialogControl()
-
-  return (
-    <>
-      <Button label="Open" onPress={control.open}>
-        <ButtonText>Open Dialog</ButtonText>
-      </Button>
-
-      <Dialog.Outer control={control}>
-        {/* Typically the inner part is in its own component */}
-        <DialogInner />
-      </Dialog.Outer>
-    </>
-  )
-}
-
-function DialogInner() {
-  return (
-    <>
-      <Dialog.Handle /> {/* Native-only drag handle */}
-      <Dialog.ScrollableInner label={l`My Dialog`}>
-        <Dialog.Header>
-          <Dialog.HeaderText>Title</Dialog.HeaderText>
-        </Dialog.Header>
-        <Text>Dialog content here</Text>
-        <Button label="Done" onPress={() => control.close()}>
-          <ButtonText>Done</ButtonText>
-        </Button>
-        <Dialog.Close /> {/* Web-only X button in top left */}
-      </Dialog.ScrollableInner>
-    </>
-  )
-}
-```
-
-### Menu Component
-
-Menus render as a dropdown on web and a bottom sheet dialog on native.
-
-```tsx
-import * as Menu from '#/components/Menu'
-
-function MyMenu() {
-  return (
-    <Menu.Root>
-      <Menu.Trigger label="Open menu">
-        {({props}) => (
-          <Button {...props} label="Menu">
-            <ButtonIcon icon={DotsHorizontal} />
-          </Button>
-        )}
-      </Menu.Trigger>
-
-      <Menu.Outer>
-        <Menu.Group>
-          <Menu.Item label="Edit" onPress={handleEdit}>
-            <Menu.ItemIcon icon={Pencil} />
-            <Menu.ItemText>Edit</Menu.ItemText>
-          </Menu.Item>
-          <Menu.Item label="Delete" onPress={handleDelete}>
-            <Menu.ItemIcon icon={Trash} />
-            <Menu.ItemText>Delete</Menu.ItemText>
-          </Menu.Item>
-        </Menu.Group>
-      </Menu.Outer>
-    </Menu.Root>
-  )
-}
-```
-
-### Button Component
-
-```tsx
-import {Button, ButtonText, ButtonIcon} from '#/components/Button'
-
-// Solid primary button (most common)
-<Button label="Save" onPress={handleSave} color="primary" size="large">
-  <ButtonText>Save</ButtonText>
-</Button>
-
-// With icon
-<Button label="Share" onPress={handleShare} color="secondary" size="small">
-  <ButtonIcon icon={Share} />
-  <ButtonText>Share</ButtonText>
-</Button>
-
-// Icon-only button
-<Button label="Close" onPress={handleClose} color="secondary" size="small" shape="round">
-  <ButtonIcon icon={XIcon} />
-</Button>
-
-// Ghost variant (deprecated - use color prop)
-<Button label="Cancel" variant="ghost" color="secondary" size="small">
-  <ButtonText>Cancel</ButtonText>
-</Button>
-```
-
-**Button Props:**
-
-- `color`: `'primary'` | `'secondary'` | `'negative'` | `'primary_subtle'` | `'negative_subtle'` | `'secondary_inverted'`
-- `size`: `'tiny'` | `'small'` | `'large'`
-- `shape`: `'default'` (pill) | `'round'` | `'square'` | `'rectangular'`
-- `variant`: `'solid'` | `'outline'` | `'ghost'` (deprecated, use `color`)
-
-### Typography
-
-```tsx
-import {Text, H1, H2, P} from '#/components/Typography'
-
-<H1 style={[a.text_xl, a.font_bold]}>Heading</H1>
-<P>Paragraph text with default styling.</P>
-<Text style={[a.text_md, t.atoms.text_contrast_medium]}>Custom text</Text>
-
-// For text with emoji, add the emoji prop. User-generated text (e.g. display names)
-// will almost certainly contain emoji, so only omit it when the text is static and
-// does not contain an emoji
-<Text emoji>Hello! 👋</Text>
-```
-
-The `Text` component's default style is `[a.text_sm, a.leading_snug, t.atoms.text]`.
-
-### TextField
-
-```tsx
-import * as TextField from '#/components/forms/TextField'
-
-<TextField.LabelText>Email</TextField.LabelText>
-<TextField.Root>
-  <TextField.Icon icon={AtSign} />
-  <TextField.Input
-    label="Email address"
-    placeholder="you@example.com"
-    defaultValue={email}
-    onChangeText={setEmail}
-    keyboardType="email-address"
-    autoCapitalize="none"
-  />
-</TextField.Root>
-```
-
-## Internationalization (i18n)
-
-All user-facing strings must be wrapped for translation using Lingui. Include `comment` and/or `context` props when necessary to avoid ambiguity, e.g., “Post” as a noun vs a verb.
-
-Prefer using `t` via `import {useLingui} '@lingui/react/macro'` vs `_` via `import {useLingui} from '@lingui/react'`. Alias `t` to `l` to avoid collisions with `const t = useTheme()`. Refactor existing uses of ``_(msg`foo`)`` to use `` l`foo` ``.
-
-Prefer Unicode punctuation over keyboard punctuation, e.g., `“quote”` over `"quote"`. Prefer en dashes preceded by a non-breaking space over em dashes, e.g., `one – two` over `one—two`.
-
-```tsx
-import {plural} from '@lingui/core/macro'
-import {Trans, useLingui} from '@lingui/react/macro'
-
-function MyComponent() {
-  const {t: l} = useLingui()
-
-  // Simple strings - use the l macro
-  const title = l`Settings`
-  const errorMessage = l({
-    message: 'Something went wrong',
-    comment: 'Generic error message for unknown/unhandled errors.',
-    context: 'Toast',
-  })
-
-  // Strings with variables
-  const greeting = l`Hello, ${name}!`
-
-  // Pluralization
-  const countLabel = plural(count, {
-    one: '# item',
-    other: '# items',
-  })
-
-  // JSX content - use Trans component
-  return (
-    <Text>
-      <Trans>
-        Welcome to <Text style={a.font_bold}>Bluesky</Text>, {name}!
-      </Trans>
-    </Text>
-  )
-}
-```
-
-Prefer `i18n.date` for date and time formatting. This ensures formatting is re-applied when the language changes at runtime. Refactor existing uses of `Intl.DateTimeFormat` to use `i18n.date`.
-
-```tsx
-import {useLingui} from '@lingui/react/macro'
-
-function MyComponent() {
-  const {i18n} = useLingui()
-
-  const createdAt = new Date()
-
-  return i18n.date(createdAt, {
-    dateStyle: 'medium',
-    timeStyle: 'medium',
-  })
-}
-```
-
-**Commands:**
-
-```bash
-# DO NOT run these commands - extraction and compilation are handled by a nightly CI job
-pnpm intl:extract    # Extract new strings to locale files
-pnpm intl:compile    # Compile translations for runtime
-```
-
-## State Management
-
-### TanStack Query (Data Fetching)
-
-```tsx
-// src/state/queries/profile.ts
-import {useQuery, useMutation, useQueryClient} from '@tanstack/react-query'
-
-import {createQueryKey} from '#/state/queries/util'
-
-/*
- * Query key name should match the query hook name for consistency
- */
-const profileQueryKeyRoot = 'profile'
-
-/*
- * Use object params and createQueryKey helper for better readability and to
- * avoid bugs with parameter order or types.
- */
-export const createProfileQueryKey = (args: {did: string}) =>
-  createQueryKey(profileQueryKeyRoot, args)
-
-/*
- * Query hook should be named use[Name]Query, where [Name] describes the data
- * being fetched. This is not a strict requirement, but it's a helpful
- * convention for discoverability
- */
-export function useProfileQuery({did}: {did: string}) {
-  const agent = useAgent()
-
-  return useQuery({
-    queryKey: createProfileQueryKey({did}),
-    queryFn: async () => {
-      const res = await agent.getProfile({actor: did})
-      return res.data
-    },
-    staleTime: STALE.MINUTES.FIVE,
-    enabled: !!did,
-  })
-}
-
-/*
- * Mutation hook should match the name of the query hook, but with "Mutation"
- * suffix. This is not a strict requirement, but it's a helpful convention for
- * discoverability and consistency.
- */
-export function useProfileMutation() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async data => {
-      // Update logic
-    },
-    onSuccess: (_, variables) => {
-      queryClient.invalidateQueries({
-        queryKey: createProfileQueryKey({did: variables.did}),
-      })
-    },
-    onError: error => {
-      if (isNetworkError(error)) {
-        // don't log, but inform user
-      } else if (error instanceof AppBskyExampleProcedure.ExampleError) {
-        // XRPC APIs often have typed errors, allows nicer handling
-      } else {
-        // Log unexpected errors to Sentry
-        logger.error('Error updating profile', {safeMessage: error})
-      }
-    },
-  })
-}
-
-/*
- * If cache mutation is needed, include specific interfaces for the specific
- * mutations you require adjacent to the source queries. Naming should be
- * descriptive of the mutation's purpose, e.g. use[Name]CacheMutation. This is
- * not a strict requirement, but it's a helpful convention for discoverability
- * and consistency.
- */
-export function useProfileCacheMutation() {
-  const queryClient = useQueryClient()
-
-  return (data: Partial<Profile>) => {
-    queryClient.setQueryData(
-      createProfileQueryKey({did: data.did}),
-      oldData => {
-        if (!oldData) return oldData
-        return {...oldData, ...data}
-      },
-    )
-  }
-}
-```
-
-**Stale Time Constants** (from `src/state/queries/index.ts`):
-
-```tsx
-STALE.SECONDS.FIFTEEN // 15 seconds
-STALE.MINUTES.ONE // 1 minute
-STALE.MINUTES.FIVE // 5 minutes
-STALE.HOURS.ONE // 1 hour
-STALE.INFINITY // Never stale
-```
-
-**Paginated APIs:** Many atproto APIs return paginated results with a `cursor`. Use `useInfiniteQuery` for these:
-
-```tsx
-export function useDraftsQuery() {
-  const agent = useAgent()
-
-  return useInfiniteQuery({
-    queryKey: createQueryKey('drafts'),
-    queryFn: async ({pageParam}) => {
-      const res = await agent.app.bsky.draft.getDrafts({cursor: pageParam})
-      return res.data
-    },
-    initialPageParam: undefined as string | undefined,
-    getNextPageParam: page => page.cursor,
-  })
-}
-```
-
-To get all items from pages: `data?.pages.flatMap(page => page.items) ?? []`
-
-**Persisted Queries**
-
-To persist query data across app restarts, `createQueryKey` supports a third
-parameter called `options`, which has a `persistedVersion` property. When this
-property is set to a number, the query will be persisted.
-
-When this property is updated (e.g. incremented), the persisted data will be cleared and replaced with the new data from the query function. This is useful for cases where the shape of the data has changed and old persisted data would no longer be valid.
-
-```tsx
-export const createProfileQueryKey = (args: {did: string}) =>
-  createQueryKey(profileQueryKeyRoot, args, {persistedVersion: 1})
-```
-
-### Preferences (React Context)
-
-```tsx
-// Simple boolean preference pattern
-import {useAutoplayDisabled, useSetAutoplayDisabled} from '#/state/preferences'
-
-function SettingsScreen() {
-  const autoplayDisabled = useAutoplayDisabled()
-  const setAutoplayDisabled = useSetAutoplayDisabled()
-
-  return <Toggle value={autoplayDisabled} onValueChange={setAutoplayDisabled} />
-}
-```
-
-### Session State
-
-```tsx
-import {useSession, useAgent} from '#/state/session'
-
-function MyComponent() {
-  const {hasSession, currentAccount} = useSession()
-  const agent = useAgent()
-
-  if (!hasSession) {
-    return <LoginPrompt />
-  }
-
-  // Use agent for API calls
-  const response = await agent.getProfile({actor: currentAccount.did})
-}
-```
-
-## Navigation
-
-Navigation uses React Navigation with type-safe route parameters.
-
-```tsx
-// Screen component
-import {type NativeStackScreenProps} from '@react-navigation/native-stack'
-import {type CommonNavigatorParams} from '#/lib/routes/types'
-
-type Props = NativeStackScreenProps<CommonNavigatorParams, 'Profile'>
-
-export function ProfileScreen({route, navigation}: Props) {
-  const {name} = route.params // Type-safe params
-
-  return <Layout.Screen>{/* Screen content */}</Layout.Screen>
-}
-
-// Programmatic navigation
-import {useNavigation} from '@react-navigation/native'
-
-const navigation = useNavigation()
-navigation.navigate('Profile', {name: 'alice.bsky.social'})
-
-// Or use the navigate helper
-import {navigate} from '#/Navigation'
-navigate('Profile', {name: 'alice.bsky.social'})
-```
-
-## Platform-Specific Code
-
-Use file extensions for platform-specific implementations:
-
-```
-Component.tsx          # Shared/default
-Component.web.tsx      # Web-only
-Component.native.tsx   # iOS + Android
-Component.ios.tsx      # iOS-only
-Component.android.tsx  # Android-only
-```
-
-Example from Dialog:
-
-- `src/components/Dialog/index.tsx` – Native (uses BottomSheet)
-- `src/components/Dialog/index.web.tsx` – Web (uses modal with Radix primitives)
-
-**Important:** The bundler automatically resolves platform-specific files. Just import normally:
-
-```tsx
-// CORRECT - bundler picks storage.ts or storage.web.ts automatically
-import * as storage from '#/state/drafts/storage'
-
-// WRONG - don't use require() or conditional imports for platform files
-const storage = IS_NATIVE
-  ? require('#/state/drafts/storage')
-  : require('#/state/drafts/storage.web')
-```
-
-Platform detection (for runtime logic, not imports):
-
-```tsx
-import {IS_WEB, IS_NATIVE, IS_IOS, IS_ANDROID} from '#/env'
-
-if (IS_NATIVE) {
-  // Native-specific logic
-}
-```
-
-## Import Aliases
-
-Always use the `#/` alias for absolute imports:
-
-```tsx
-// Good
-import {useSession} from '#/state/session'
-import {atoms as a, useTheme} from '#/alf'
-import {Button} from '#/components/Button'
-
-// Avoid
-import {useSession} from '../../../state/session'
-```
-
-## Footguns
-
-Common pitfalls to avoid in this codebase:
-
-### Dialog Close Callback (Critical)
-
-**Always use `control.close(() => ...)` when performing actions after closing a dialog.** The callback ensures the action runs after the dialog's close animation completes. Failing to do this causes race conditions with React state updates.
-
-```tsx
-// WRONG - causes bugs with state updates, navigation, opening other dialogs
-const onConfirm = () => {
-  control.close()
-  navigation.navigate('Home') // May race with dialog animation
-}
-
-// WRONG - same problem
-const onConfirm = () => {
-  control.close()
-  otherDialogControl.open() // Will likely fail or cause visual glitches
-}
-
-// CORRECT - action runs after dialog fully closes
-const onConfirm = () => {
-  control.close(() => {
-    navigation.navigate('Home')
-  })
-}
-
-// CORRECT - opening another dialog after close
-const onConfirm = () => {
-  control.close(() => {
-    otherDialogControl.open()
-  })
-}
-
-// CORRECT - state updates after close
-const onConfirm = () => {
-  control.close(() => {
-    setSomeState(newValue)
-    onCallback?.()
-  })
-}
-```
-
-This applies to:
-
-- Navigation (`navigation.navigate()`, `navigation.push()`)
-- Opening other dialogs or menus
-- State updates that affect UI (`setState`, `queryClient.invalidateQueries`)
-- Callbacks passed from parent components
-
-The Menu component on iOS specifically uses this pattern – see `src/components/Menu/index.tsx:151`.
-
-### Controlled vs Uncontrolled Inputs
-
-Prefer `defaultValue` over `value` for TextInput on the old architecture:
-
-```tsx
-// Preferred - uncontrolled
-<TextField.Input
-  defaultValue={initialEmail}
-  onChangeText={setEmail}
-/>
-
-// Avoid when possible - controlled (can cause performance issues)
-<TextField.Input
-  value={email}
-  onChangeText={setEmail}
-/>
-```
-
-### Platform-Specific Behavior
-
-Some components behave differently across platforms:
-
-- `Dialog.Handle` – Only renders on native (drag handle for bottom sheet)
-- `Dialog.Close` – Only renders on web (X button)
-- `Menu.Divider` – Only renders on web
-- `Menu.ContainerItem` – Only works on native
-
-Always test on multiple platforms when using these components.
-
-### React Compiler is Enabled
-
-This codebase uses React Compiler, so **don't proactively add `useMemo` or `useCallback`**. The compiler handles memoization automatically.
-
-```tsx
-// UNNECESSARY - React Compiler handles this
-const handlePress = useCallback(() => {
-  doSomething()
-}, [doSomething])
-
-// JUST WRITE THIS
-const handlePress = () => {
-  doSomething()
-}
-```
-
-Only use `useMemo`/`useCallback` when you have a specific reason, such as:
-
-- The value is immediately used in an effect's dependency array
-- You're passing a callback to a non-React library that needs referential stability
-
-## Best Practices
-
-1. **Accessibility**: Always provide `label` prop for interactive elements, use `accessibilityHint` where helpful
-
-2. **Translations**: Wrap ALL user-facing strings with ` `l` `` or `<Trans>`
-
-3. **Styling**: Combine static atoms with theme atoms, use platform utilities for platform-specific styles
-
-4. **State**: Use TanStack Query for server state, React Context for UI preferences
-
-5. **Components**: Check if a component exists in `#/components/` before creating new ones
-
-6. **Types**: Define explicit types for props, use `NativeStackScreenProps` for screens
-
-7. **Testing**: Components should have `testID` props for E2E testing
-
-## Key Files Reference
-
-| Purpose           | Location                                     |
-| ----------------- | -------------------------------------------- |
-| Theme definitions | `src/alf/themes.ts`                          |
-| Design tokens     | `src/alf/tokens.ts`                          |
-| Static atoms      | `src/alf/atoms.ts` (extends `@bsky.app/alf`) |
-| Navigation config | `src/Navigation.tsx`                         |
-| Route definitions | `src/routes.ts`                              |
-| Route types       | `src/lib/routes/types.ts`                    |
-| Query hooks       | `src/state/queries/*.ts`                     |
-| Session state     | `src/state/session/index.tsx`                |
-| i18n setup        | `src/locale/i18n.ts`                         |

Dockerfile

@@ -1,87 +1,52 @@
-#
-# Stage 1: build the web bundle with pnpm.
-#
-# Uses the official pnpm image. Node is auto-downloaded by pnpm using the
-# `devEngines.runtime` field in package.json (onFail: "download").
-#
-FROM ghcr.io/pnpm/pnpm:11 AS web-build
-
-WORKDIR /app
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-#
-# pnpm config
-#
-ENV CI=1
-# use the pnpm version specified in package.json
-ENV pnpm_config_pm_on_fail=download
-
-# The latest git hash of the preview branch on render.com
-# https://render.com/docs/docker-secrets#environment-variables-in-docker-builds
-ARG RENDER_GIT_COMMIT
-
-#
-# Expo
-#
-ARG EXPO_PUBLIC_ENV
-ENV EXPO_PUBLIC_ENV=${EXPO_PUBLIC_ENV:-development}
-ARG EXPO_PUBLIC_RELEASE_VERSION
-ENV EXPO_PUBLIC_RELEASE_VERSION=$EXPO_PUBLIC_RELEASE_VERSION
-ARG EXPO_PUBLIC_BUNDLE_IDENTIFIER
-# If not set by GitHub workflows, we're probably in Render
-ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER=${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-$RENDER_GIT_COMMIT}
-
-#
-# Sentry
-#
-ARG SENTRY_AUTH_TOKEN
-ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-unknown}
-ARG EXPO_PUBLIC_SENTRY_DSN
-ENV EXPO_PUBLIC_SENTRY_DSN=$EXPO_PUBLIC_SENTRY_DSN
-
-COPY . .
-
-RUN echo "Using bundle identifier: $EXPO_PUBLIC_BUNDLE_IDENTIFIER" && \
-  echo "EXPO_PUBLIC_ENV=$EXPO_PUBLIC_ENV" >> .env && \
-  echo "EXPO_PUBLIC_RELEASE_VERSION=$EXPO_PUBLIC_RELEASE_VERSION" >> .env && \
-  echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER" >> .env && \
-  echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env && \
-  echo "EXPO_PUBLIC_SENTRY_DSN=$EXPO_PUBLIC_SENTRY_DSN" >> .env
-
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
-
-RUN pnpm intl:build 2>&1 | tee i18n.log && \
-  if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compile errors!\n\n"; fi
-
-RUN SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN \
-    SENTRY_RELEASE=$EXPO_PUBLIC_RELEASE_VERSION \
-    SENTRY_DIST=$EXPO_PUBLIC_BUNDLE_IDENTIFIER \
-    pnpm build-web
-
-#
-# Stage 2: build the bskyweb Go binary, embedding the assets from stage 1.
-#
-# post-web-build.js (run by `pnpm build-web`) writes the bundled JS/CSS/media
-# into bskyweb/static/* and regenerates bskyweb/templates/scripts.html, so
-# copying the bskyweb/ tree from stage 1 is enough for go:embed to find
-# everything.
-#
-FROM golang:1.26-bookworm AS go-build
+FROM golang:1.23-bullseye AS build-env
 
 WORKDIR /usr/src/social-app
 
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Node
+ENV NODE_VERSION=20
+ENV NVM_DIR=/usr/share/nvm
+
+# Go
 ENV GODEBUG="netdns=go"
 ENV GOOS="linux"
 ENV GOARCH="amd64"
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT="loopvar"
 
-COPY --from=web-build /app/bskyweb ./bskyweb
+# Expo
+ARG EXPO_PUBLIC_BUNDLE_IDENTIFIER
+ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER=${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-dev}
+
+COPY . .
+
+#
+# Generate the JavaScript webpack.
+#
+RUN mkdir --parents $NVM_DIR && \
+  wget \
+    --output-document=/tmp/nvm-install.sh \
+    https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh && \
+  bash /tmp/nvm-install.sh
+
+RUN \. "$NVM_DIR/nvm.sh" && \
+  nvm install $NODE_VERSION && \
+  nvm use $NODE_VERSION && \
+  echo "Using bundle identifier: $EXPO_PUBLIC_BUNDLE_IDENTIFIER" && \
+  echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER" >> .env && \
+  echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env && \
+  npm install --global yarn && \
+  yarn && \
+  yarn intl:build && \
+  EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() yarn build-web
 
 # DEBUG
-RUN find ./bskyweb/static
+RUN find ./bskyweb/static && find ./web-build/static
 
+#
+# Generate the bskyweb Go binary.
+#
 RUN cd bskyweb/ && \
   go mod download && \
   go mod verify
@@ -94,10 +59,7 @@ RUN cd bskyweb/ && \
     -o /bskyweb \
     ./cmd/bskyweb
 
-#
-# Stage 3: runtime image.
-#
-FROM debian:bookworm-slim
+FROM debian:bullseye-slim
 
 ENV GODEBUG=netdns=go
 ENV TZ=Etc/UTC
@@ -110,7 +72,7 @@ RUN apt-get update && apt-get install --yes \
 ENTRYPOINT ["dumb-init", "--"]
 
 WORKDIR /bskyweb
-COPY --from=go-build /bskyweb /usr/bin/bskyweb
+COPY --from=build-env /bskyweb /usr/bin/bskyweb
 
 CMD ["/usr/bin/bskyweb"]
 

Dockerfile.bskylink

@@ -1,4 +1,4 @@
-FROM node:24.15.0-alpine3.22 AS build
+FROM node:20.11-alpine3.18 as build
 
 # Move files into the image and install
 WORKDIR /app
@@ -14,7 +14,7 @@ RUN yarn build
 RUN yarn install --production --ignore-scripts --prefer-offline
 
 # Uses assets from build stage to reduce build size
-FROM node:24.15.0-alpine3.22
+FROM node:20.11-alpine3.18
 
 RUN apk add --update dumb-init
 
@@ -29,6 +29,8 @@ VOLUME /app/data
 EXPOSE 3000
 ENV LINK_PORT=3000
 ENV NODE_ENV=production
+# potential perf issues w/ io_uring on this version of node
+ENV UV_USE_IO_URING=0
 
 # https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#non-root-user
 USER node

Dockerfile.bskyogcard

@@ -1,25 +1,20 @@
-FROM node:24.15.0-alpine3.22 AS build
-
-# Tells pnpm to run non-interactively (needed for install/script steps)
-ENV CI=true
+FROM node:20.11-alpine3.18 as build
 
 # Move files into the image and install
 WORKDIR /app
 
 COPY ./bskyogcard/package.json ./
-COPY ./bskyogcard/pnpm-lock.yaml ./
-COPY ./bskyogcard/pnpm-workspace.yaml ./
-RUN npm install --global pnpm@11.1.3
-RUN pnpm install --frozen-lockfile
+COPY ./bskyogcard/yarn.lock ./
+RUN yarn install --frozen-lockfile
 
 COPY ./bskyogcard ./
 
 # build then prune dev deps
-RUN pnpm install-fonts && pnpm build
-RUN pnpm install --prod --ignore-scripts --prefer-offline
+RUN yarn install-fonts && yarn build
+RUN yarn install --production --ignore-scripts --prefer-offline
 
 # Uses assets from build stage to reduce build size
-FROM node:24.15.0-alpine3.22
+FROM node:20.11-alpine3.18
 
 RUN apk add --update dumb-init
 
@@ -31,10 +26,11 @@ COPY --from=build /app /app
 RUN mkdir /app/data && chown node /app/data
 
 VOLUME /app/data
-EXPOSE 3000 3001
+EXPOSE 3000
 ENV CARD_PORT=3000
-ENV CARD_METRICS_PORT=3001
 ENV NODE_ENV=production
+# potential perf issues w/ io_uring on this version of node
+ENV UV_USE_IO_URING=0
 
 # https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#non-root-user
 USER node

Dockerfile.embedr

@@ -1,24 +1,20 @@
-FROM golang:1.26-bookworm AS build-env
+FROM golang:1.23-bullseye AS build-env
 
 WORKDIR /usr/src/social-app
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Node
-ENV NODE_VERSION=24.15.0
+ENV NODE_VERSION=20
 ENV NVM_DIR=/usr/share/nvm
 
 # Go
 ENV GODEBUG="netdns=go"
 ENV GOOS="linux"
-ARG TARGETARCH
-ENV GOARCH=${TARGETARCH:-amd64}
+ENV GOARCH="amd64"
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT="loopvar"
 
-# CI environment for pnpm
-ENV CI=true
-
 COPY . .
 
 #
@@ -33,11 +29,11 @@ RUN mkdir --parents $NVM_DIR && \
 RUN \. "$NVM_DIR/nvm.sh" && \
   nvm install $NODE_VERSION && \
   nvm use $NODE_VERSION && \
-  npm install --global pnpm@11.5.0 && \
-  pnpm install --frozen-lockfile && \
-  cd bskyembed && pnpm install --frozen-lockfile && cd .. && \
-  pnpm intl:build && \
-  pnpm build-embed
+  npm install --global yarn && \
+  yarn && \
+  cd bskyembed && yarn install --frozen-lockfile && cd .. && \
+  yarn intl:build && \
+  yarn build-embed
 
 # DEBUG
 RUN find ./bskyweb/embedr-static && find ./bskyweb/embedr-templates && find ./bskyembed/dist
@@ -62,7 +58,7 @@ RUN cd bskyweb/ && \
     -o /embedr \
     ./cmd/embedr
 
-FROM debian:bookworm-slim
+FROM debian:bullseye-slim
 
 ENV GODEBUG=netdns=go
 ENV TZ=Etc/UTC

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023–2026 Bluesky Social PBC
+Copyright 2023–2024 Bluesky PBC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Makefile

@@ -10,33 +10,33 @@ help: ## Print info about all commands
 
 .PHONY: build-web
 build-web: ## Compile web bundle, copy to bskyweb directory
-	pnpm intl:build
-	pnpm build-web
+	yarn intl:build
+	yarn build-web
 
 .PHONY: build-web-embed
 build-web-embed: ## Compile web embed bundle, copy to bskyweb/embedr* directories
-	pnpm intl:build
-	pnpm build-embed
+	yarn intl:build
+	yarn build-embed
 
 .PHONY: test
 test: ## Run all tests
-	NODE_ENV=test pnpm test
+	NODE_ENV=test yarn test
 
 .PHONY: lint
 lint: ## Run style checks and verify syntax
-	pnpm run lint
+	yarn run lint
 
 #.PHONY: fmt
 #fmt: ## Run syntax re-formatting
-#	pnpm prettier
+#	yarn prettier
 
 .PHONY: deps
-deps: ## Installs dependent libs using 'pnpm install'
-	pnpm install --frozen-lockfile
+deps: ## Installs dependent libs using 'yarn install'
+	yarn install --frozen-lockfile
 	cd bskyembed && yarn install --frozen-lockfile
 
 .PHONY: nvm-setup
-nvm-setup: ## Use NVM to install and activate node+pnpm
-	nvm install 20
-	nvm use 20
-	npm install --global pnpm
+nvm-setup: ## Use NVM to install and activate node+yarn
+	nvm install 18
+	nvm use 18
+	npm install --global yarn

README.md

@@ -10,7 +10,7 @@ Get the app itself:
 
 ## Development Resources
 
-This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), which are also open source, but in [a different git repository](https://github.com/bluesky-social/atproto).
+This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), code for which is also open source, but in [a different git repository](https://github.com/bluesky-social/atproto).
 
 There is a small amount of Go language source code (in `./bskyweb/`), for a web service that returns the React Native Web application.
 
@@ -19,7 +19,7 @@ The [Build Instructions](./docs/build.md) are a good place to get started with t
 The Authenticated Transfer Protocol ("AT Protocol" or "atproto") is a decentralized social media protocol. You don't *need* to understand AT Protocol to work with this application, but it can help. Learn more at:
 
 - [Overview and Guides](https://atproto.com/guides/overview)
-- [GitHub Discussions](https://github.com/bluesky-social/atproto/discussions) 👈 Great place to ask questions
+- [Github Discussions](https://github.com/bluesky-social/atproto/discussions) 👈 Great place to ask questions
 - [Protocol Specifications](https://atproto.com/specs/atp)
 - [Blogpost on self-authenticating data structures](https://bsky.social/about/blog/3-6-2022-a-self-authenticating-social-protocol)
 
@@ -27,7 +27,6 @@ The Bluesky Social application encompasses a set of schemas and APIs built in th
 
 ## Contributions
 
-> [!NOTE]
 > While we do accept contributions, we prioritize high quality issues and pull requests. Adhering to the below guidelines will ensure a more timely review.
 
 **Rules:**
@@ -43,7 +42,7 @@ The Bluesky Social application encompasses a set of schemas and APIs built in th
 - Open an issue and give some time for discussion before submitting a PR.
 - Stay away from PRs like...
   - Changing "Post" to "Skeet."
-  - Refactoring the codebase, e.g., to replace React Query with Redux Toolkit or something.
+  - Refactoring the codebase, e.g., to replace MobX with Redux or something.
   - Adding entirely new features without prior discussion. 
 
 Remember, we serve a wide community of users. Our day-to-day involves us constantly asking "which top priority is our top priority." If you submit well-written PRs that solve problems concisely, that's an awesome contribution. Otherwise, as much as we'd love to accept your ideas and contributions, we really don't have the bandwidth. That's what forking is for!
@@ -60,7 +59,7 @@ Please be sure to:
 
 ## Security disclosures
 
-If you discover any security issues, please send an email to security@bsky.app. The email is automatically CC'd to the entire team and we'll respond promptly.
+If you discover any security issues, please send an email to security@bsky.app. The email is automatically CCed to the entire team and we'll respond promptly.
 
 ## Are you a developer interested in building on atproto?
 
@@ -70,8 +69,6 @@ Bluesky is an open social network built on the AT Protocol, a flexible technolog
 
 See [./LICENSE](./LICENSE) for the full license.
 
-Bluesky Social PBC has committed to a software patent non-aggression pledge. For details see [the original announcement](https://bsky.social/about/blog/10-01-2025-patent-pledge).
-
 ## P.S.
 
 We ❤️ you and all of the ways you support us. Thank you for making Bluesky a great place!

__e2e__/config.yml

@@ -1,2 +1,2 @@
 flows:
-  - "flows/**"
+  - "flows/*"

__e2e__/flows/composer-self-label.yml

@@ -3,26 +3,21 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: ?users
+        SERVER_PATH: ?users
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 
 # Post an image with the porn label
 - assertVisible:
-    id: "composeFAB"
+      id: "composeFAB"
 - tapOn:
     id: "composeFAB"
 - inputText: "Post with an image"
 - tapOn:
-    id: "openMediaBtn"
-- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
+- tapOn: "Content warnings"
 - tapOn: "Content warnings"
 - tapOn: "Porn"
 - tapOn:

__e2e__/flows/composer.yml

@@ -3,17 +3,13 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: ?users
+        SERVER_PATH: ?users
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
 - assertVisible:
-    id: "composeFAB"
+      id: "composeFAB"
 - tapOn:
     id: "composeFAB"
 - inputText: "Post text only"
@@ -25,10 +21,7 @@ appId: xyz.blueskyweb.app
     id: "composeFAB"
 - inputText: "Post with an image"
 - tapOn:
-    id: "openMediaBtn"
-- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn:
     id: "composerPublishBtn"
 - assertVisible:
@@ -53,10 +46,7 @@ appId: xyz.blueskyweb.app
     id: "replyBtn"
 - inputText: "Reply with an image"
 - tapOn:
-    id: "openMediaBtn"
-- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn:
     id: "composerPublishBtn"
 - assertVisible:
@@ -83,10 +73,7 @@ appId: xyz.blueskyweb.app
     id: "quoteBtn"
 - inputText: "QP with an image"
 - tapOn:
-    id: "openMediaBtn"
-- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn:
     id: "composerPublishBtn"
 - assertVisible:

__e2e__/flows/create-account.yml

@@ -3,14 +3,15 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: ""
+        SERVER_PATH: ""
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eOpenLoggedOutView"
 - tapOn:
     id: "createAccountButton"
-- tapOn: "Bluesky Social"
+- tapOn:
+    id: "selectServiceButton"
 - tapOn:
     id: "customSelectBtn"
 - tapOn:
@@ -24,26 +25,13 @@ appId: xyz.blueskyweb.app
 - inputText: "example@test.com"
 - 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"
+- inputText: "hunter2"
+- pressKey: Enter
 - tapOn:
     id: "nextBtn"
-- waitForAnimationToEnd
 - tapOn:
-    # save password thing no longer seems to be in hierarchy
-    # tap on something else instead
-    point: 20%,20%
-    repeat: 2
-    delay: 1000
-- tapOn:
-    id: "handleInput"
+     id: "handleInput"
 - inputText: "e2e-test"
-- extendedWaitUntil:
-    visible:
-      id: "handleAvailableCheck"
 - tapOn:
     id: "nextBtn"
-- assertVisible: "Give your profile a face"
+

__e2e__/flows/curate-lists.yml

@@ -3,96 +3,115 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users&follows&posts"
+        SERVER_PATH: "?users&follows&posts"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 
 - tapOn:
     label: "Create a curate list"
     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"
 
+- tapOn:
+    label: "Create a new curatelist"
+    id: "e2eGotoLists"
+- tapOn:
+    id: "newUserListBtn"
 - assertVisible:
-    id: "newUserListBtn"
+    id: "createOrEditListModal"
 - tapOn:
-    id: "newUserListBtn"
-- assertVisible: "Create user list"
-- 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: "People"
 
 - tapOn: "Start adding people"
-- tapOn: "Search"
+- assertVisible:
+    id: "listAddUserModal"
+- tapOn:
+    id: "searchInput"
 - inputText: "b"
 - pressKey: Enter
-- tapOn: "Add user to list"
-- swipe:
-    direction: DOWN
+- tapOn:
+    id: "user-bob.test-addBtn"
+- tapOn:
+    id: "doneBtn"
+- assertNotVisible:
+    id: "listAddUserModal"
 - assertVisible:
-    id: "profileCard-bob.test-link"
+    id: "user-bob.test"
 
 - tapOn: "Posts"
 - assertVisible:
@@ -125,17 +144,23 @@ appId: xyz.blueskyweb.app
 
 - tapOn: "People"
 - assertVisible:
-    id: "profileCard-bob.test-link"
+    label: "Removes users on curatelists from the list"
+    id: "user-bob.test"
 - tapOn:
     point: "90%,43%"
+- assertVisible:
+    id: "userAddRemoveListsModal"
 - tapOn:
     id: "user-bob.test-addBtn"
 - tapOn:
     id: "doneBtn"
+- assertNotVisible:
+    id: "userAddRemoveListsModal"
 
 - tapOn:
+    label: "Adds and removes users on curatelists from the profile"
     id: "bottomBarSearchBtn"
-- tapOn: "Search for posts, users[,]? or feeds"
+- tapOn: "Search"
 - inputText: "bob"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"

__e2e__/flows/feed-reorder.yml

@@ -16,7 +16,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "profileCardButton"
 - tapOn:
-    id: "profilePager-selector-5"
+    id: "profilePager-selector-4"
 - tapOn: "alice-favs"
 - tapOn: "Pin to Home"
 - tapOn:
@@ -35,12 +35,9 @@ appId: xyz.blueskyweb.app
     id: "menuItemButton-Feeds"
 - tapOn:
     id: "editFeedsBtn"
-- swipe:
-    label: "Drag feed down"
-    from:
-      id: "feed-drag-handle"
-    direction: "DOWN"
-    duration: 1000
+- tapOn:
+    label: "Tap on down arrow"
+    id: "feed-timeline-moveDown"
 - tapOn:
       label: "Save button"
       id: "saveChangesBtn"
@@ -58,12 +55,9 @@ appId: xyz.blueskyweb.app
     id: "menuItemButton-Feeds"
 - tapOn:
     id: "editFeedsBtn"
-- swipe:
-    label: "Drag feed down"
-    from:
-      id: "feed-drag-handle"
-    direction: "DOWN"
-    duration: 1000
+- tapOn:
+    label: "Tap on down arrow"
+    id: "feed-feed-moveDown"
 - tapOn:
     label: "Save button"
     id: "saveChangesBtn"

__e2e__/flows/home-screen.yml

@@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: ?users&follows&posts&feeds
+        SERVER_PATH: ?users&follows&posts&feeds
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
@@ -11,7 +11,7 @@ appId: xyz.blueskyweb.app
 
 - extendedWaitUntil:
     visible:
-      text: "Feeds ✨"
+        text: "Feeds ✨"
 - tapOn:
     label: "Can go to feeds page using feeds button in tab bar"
     text: "Feeds ✨"
@@ -21,7 +21,7 @@ appId: xyz.blueskyweb.app
     label: "Feeds button disappears after pinning a feed"
     id: "bottomBarProfileBtn"
 - tapOn:
-    id: "profilePager-selector-5"
+    id: "profilePager-selector-4"
 - tapOn: "alice-favs"
 - tapOn: "Pin to Home"
 - tapOn:
@@ -50,6 +50,6 @@ appId: xyz.blueskyweb.app
     label: "Can delete posts"
     id: "postDropdownBtn"
     childOf:
-      id: "feedItem-by-alice.test"
+        id: "feedItem-by-alice.test"
 - tapOn: "Delete post"
 - tapOn: "Delete"

__e2e__/flows/login.yml

@@ -15,11 +15,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "customServerTextInput"
 - inputText: "http://localhost:3000"
-- runFlow:
-    when:
-      platform: Android
-    commands:
-      - hideKeyboard
 - tapOn: "Done"
 - tapOn:
     id: "loginUsernameInput"
@@ -28,7 +23,4 @@ appId: xyz.blueskyweb.app
     id: "loginPasswordInput"
 - inputText: "hunter2"
 - pressKey: Enter
-- tapOn:
-    text: "Not Now"
-    optional: true
 - assertVisible: "Following"

__e2e__/flows/mod-lists.yml

@@ -3,14 +3,11 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users&follows&labels"
+        SERVER_PATH: "?users&follows&labels"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 
 # create a modlist
 - tapOn:
@@ -19,25 +16,32 @@ 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"
 
-- tapOn: "Subscribe to this list"
+- tapOn:
+    label: "Dropdown"
+    point: "71%,9%"
+
 - tapOn: "Mute accounts"
 - tapOn: "Mute list"
 - tapOn: "Unmute"
 
-- tapOn: "Subscribe to this list"
+- tapOn:
+      label: "Dropdown"
+      point: "71%,9%"
+
 - tapOn: "Block accounts"
 - tapOn: "Block list"
 - tapOn: "Unblock"
 
-  # the rest of the behaviors are tested in curate-lists.yml
+ # the rest of the behaviors are tested in curate-lists.yml

__e2e__/flows/onboarding-avatar-creator.yml

@@ -3,15 +3,11 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users"
+        SERVER_PATH: "?users"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
 - tapOn:
     id: "e2eStartOnboarding"
 - tapOn: "Open avatar creator"
@@ -25,24 +21,12 @@ appId: xyz.blueskyweb.app
 - tapOn: "Select the atom emoji as your avatar"
 - tapOn: "Done"
 - waitForAnimationToEnd
-- tapOn:
-    id: "onboardingContinue"
+- tapOn: "Continue to next step"
 - 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"
+    label: "Tap on continue"
+    point: "50%,92%"
+- assertVisible: "You're ready to go!"
 - tapOn:
-    id: "onboardingFinish"
-- tapOn:
-    label: "NUX, if applicable"
-    text: "Close"
-    optional: true
-- waitForAnimationToEnd
-- assertVisible: "Following"
+    label: "Tap on Lets go"
+    point: "50%,92%"

__e2e__/flows/onboarding.yml

@@ -3,44 +3,26 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users"
+        SERVER_PATH: "?users"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
 - tapOn:
     id: "e2eStartOnboarding"
 - tapOn: "Select an avatar"
 - waitForAnimationToEnd
-- assertVisible: "Photos"
-- assertVisible: "Collections"
 - tapOn:
     point: "50%,22%"
 - waitForAnimationToEnd
-- tapOn: "Done"
+- tapOn: "Choose"
 - waitForAnimationToEnd
-- tapOn:
-    id: "onboardingContinue"
+- tapOn: "Continue to next step"
 - 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"
+    label: "Tap on continue"
+    point: "50%,92%"
+- assertVisible: "You're ready to go!"
 - tapOn:
-    id: "onboardingFinish"
-- tapOn:
-    label: "NUX, if applicable"
-    text: "Close"
-    optional: true
-- waitForAnimationToEnd
-- assertVisible: "Following"
+    label: "Tap on Lets go"
+    point: "50%,92%"

__e2e__/flows/post-report-flow.yml

@@ -1,24 +0,0 @@
-appId: xyz.blueskyweb.app
----
-- runScript:
-    file: ../setupServer.js
-    env:
-      SERVER_PATH: "?users&follows&posts"
-- runFlow:
-    file: ../setupApp.yml
-- tapOn:
-    id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
-- tapOn:
-    id: "postDropdownBtn"
-    index: 0
-- tapOn:
-    id: "postDropdownReportBtn"
-- tapOn: "Create report for Misleading"
-- tapOn: "Create report for Spam"
-- tapOn: "Send report to Dev-env Moderation"
-- tapOn:
-    point: "50%,90%"

__e2e__/flows/profile-screen-edit.yml

@@ -78,13 +78,13 @@ appId: xyz.blueskyweb.app
     id: "changeBannerBtn"
 - tapOn: "Upload from Library"
 - waitForAnimationToEnd
-- tapOn: "Done"
+- tapOn: "Choose"
 - waitForAnimationToEnd
 - tapOn:
     id: "changeAvatarBtn"
 - tapOn: "Upload from Library"
 - waitForAnimationToEnd
-- tapOn: "Done"
+- tapOn: "Choose"
 - waitForAnimationToEnd
 - tapOn:
     id: "editProfileSaveBtn"

__e2e__/flows/profile-screen.yml

@@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users&posts&feeds"
+        SERVER_PATH: "?users&posts&feeds"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
@@ -12,10 +12,10 @@ appId: xyz.blueskyweb.app
 # Navigate to another user profile
 - extendedWaitUntil:
     visible:
-      id: "bottomBarSearchBtn"
+        id: "bottomBarSearchBtn"
 - tapOn:
     id: "bottomBarSearchBtn"
-- tapOn: "Search for posts, users[,]? or feeds"
+- tapOn: "Search"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"
@@ -25,8 +25,6 @@ appId: xyz.blueskyweb.app
 # Can follow/unfollow another user
 - tapOn:
     id: "followBtn"
-- tapOn:
-    point: 65%,35% # dismiss the subscribe prompt
 - tapOn:
     id: "unfollowBtn"
 
@@ -38,4 +36,4 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "profileHeaderDropdownBtn"
 - tapOn: "Unmute Account"
-- assertNotVisible: "Account Muted"
+- assertNotVisible: "Account Muted"

__e2e__/flows/report-dialog/account.default.yml

@@ -1,26 +0,0 @@
-appId: xyz.blueskyweb.app
----
-- runScript:
-    file: ../../setupServer.js
-    env:
-      SERVER_PATH: ?users&follows&posts&feeds
-- runFlow:
-    file: ../../setupApp.yml
-- tapOn:
-    id: "e2eSignInAlice"
-
-- tapOn: "Carla's avatar"
-- tapOn:
-    id: "profileHeaderDropdownBtn"
-- tapOn:
-    id: "profileHeaderDropdownReportBtn"
-- tapOn:
-    id: "report:category:Misleading"
-- tapOn:
-    id: "report:option:Spam"
-- assertVisible:
-    text: "Send report to Dev-env Moderation"
-- tapOn:
-    id: "report:submit"
-- assertNotVisible:
-    id: "report:dialog"

__e2e__/flows/report-dialog/post.default.yml

@@ -1,26 +0,0 @@
-appId: xyz.blueskyweb.app
----
-- runScript:
-    file: ../../setupServer.js
-    env:
-      SERVER_PATH: ?users&follows&posts&feeds
-- runFlow:
-    file: ../../setupApp.yml
-- tapOn:
-    id: "e2eSignInAlice"
-
-- tapOn:
-    id: "postDropdownBtn"
-    index: 0
-- tapOn:
-    id: "postDropdownReportBtn"
-- tapOn:
-    id: "report:category:Misleading"
-- tapOn:
-    id: "report:option:Spam"
-- assertVisible:
-    text: "Send report to Dev-env Moderation"
-- tapOn:
-    id: "report:submit"
-- assertNotVisible:
-    id: "report:dialog"

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

@@ -1,43 +0,0 @@
-appId: xyz.blueskyweb.app
----
-- runScript:
-    file: ../../setupServer.js
-    env:
-      SERVER_PATH: ?users&follows&posts&feeds
-- runFlow:
-    file: ../../setupApp.yml
-- tapOn:
-    id: "e2eSignInAlice"
-
-- tapOn:
-    id: "postDropdownBtn"
-    index: 0
-- tapOn:
-    id: "postDropdownReportBtn"
-- tapOn:
-    id: "report:category:Misleading"
-- tapOn:
-    id: "report:option:Other misleading content"
-- assertVisible:
-    text: Your report will be sent to Dev-env Moderation.*
-# reason "other" defaults with details open
-- assertVisible:
-    id: "report:details"
-- tapOn:
-    id: "report:clearReportOption"
-- assertNotVisible:
-    id: "report:details"
-- tapOn:
-    id: "report:clearCategory"
-- assertNotVisible:
-    id: "report:option:Other misleading content"
-- tapOn:
-    id: "report:category:Misleading"
-- tapOn:
-    id: "report:option:Spam"
-- assertVisible:
-    text: Your report will be sent to Dev-env Moderation.*
-- tapOn:
-    id: "report:submit"
-- assertNotVisible:
-    id: "report:dialog"

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

@@ -1,33 +0,0 @@
-appId: xyz.blueskyweb.app
----
-- runScript:
-    file: ../../setupServer.js
-    env:
-      SERVER_PATH: ?users&follows&posts&feeds
-- runFlow:
-    file: ../../setupApp.yml
-- tapOn:
-    id: "e2eSignInAlice"
-
-- tapOn:
-    id: "postDropdownBtn"
-    index: 0
-- tapOn:
-    id: "postDropdownReportBtn"
-- tapOn:
-    id: "report:category:Misleading"
-- tapOn:
-    id: "report:option:Other misleading content"
-- assertVisible:
-    text: "Send report to Dev-env Moderation"
-# reason "other" defaults with details open
-- assertVisible:
-    id: "report:details"
-- tapOn:
-    id: "report:details"
-- inputText: "This is a test report"
-- hideKeyboard
-- tapOn:
-    id: "report:submit"
-- assertNotVisible:
-    id: "report:dialog"

__e2e__/flows/search-screen.yml

@@ -3,22 +3,20 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users"
+        SERVER_PATH: "?users"
 - runFlow:
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
 
 # Navigate to another user profile via autocomplete
-- extendedWaitUntil:
-    visible:
-      id: "bottomBarSearchBtn"
 - tapOn:
     id: "bottomBarSearchBtn"
-- assertVisible: "Search for posts, users[,]? or feeds"
-- tapOn: "Search for posts, users[,]? or feeds"
+- assertVisible: "Search"
+- tapOn: "Search"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"
 - assertVisible:
     id: "profileView"
+

__e2e__/flows/shared-prefs.yml

@@ -8,12 +8,8 @@ appId: xyz.blueskyweb.app
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
 - assertVisible:
-    id: "storybookBtn"
+      id: "storybookBtn"
 - tapOn:
     id: "storybookBtn"
 - tapOn:

__e2e__/flows/thread-muting.yml

@@ -3,16 +3,13 @@ appId: xyz.blueskyweb.app
 - runScript:
     file: ../setupServer.js
     env:
-      SERVER_PATH: "?users&follows"
+        SERVER_PATH: "?users&follows"
 - runFlow:
     file: ../setupApp.yml
 
 # Login, create a thread, and log out
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - assertVisible:
     id: "composeFAB"
 - tapOn:
@@ -22,13 +19,8 @@ appId: xyz.blueskyweb.app
     id: "composerPublishBtn"
 
 # Login, reply to the thread, and log out
-- tapOn:
-    id: "e2eSignOut"
 - tapOn:
     id: "e2eSignInBob"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
     id: "replyBtn"
 - inputText: "Reply 1"
@@ -36,13 +28,8 @@ appId: xyz.blueskyweb.app
     id: "composerPublishBtn"
 
 # Login, confirm notification exists, mute thread, and log out
-- tapOn:
-    id: "e2eSignOut"
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
     id: "bottomBarNotificationsBtn"
 - assertVisible:
@@ -52,17 +39,12 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "postDropdownBtn"
     childOf:
-      id: "postThreadItem-by-bob.test"
+        id: "postThreadItem-by-bob.test"
 - tapOn: "Mute thread"
 
 # Login, reply to the thread twice, and log out
-- tapOn:
-    id: "e2eSignOut"
 - tapOn:
     id: "e2eSignInBob"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
     id: "bottomBarProfileBtn"
 - tapOn:
@@ -78,35 +60,24 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "composerPublishBtn"
 
-# Login, confirm notifications dont exist, unmute the thread, ~~confirm notifications exist~~
-# Mute thread behaviour no longer change old notifications after muting/unmuting a thread -sfn
-- tapOn:
-    id: "e2eSignOut"
+
+# Login, confirm notifications dont exist, unmute the thread, confirm notifications exist
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
     id: "bottomBarNotificationsBtn"
-- assertVisible: ".*Reply 1.*"
-- assertNotVisible: ".*Reply 2.*"
-- assertNotVisible: ".*Reply 3.*"
-- assertVisible:
+- assertNotVisible:
     id: "feedItem-by-bob.test"
 - tapOn:
-    id: "feedItem-by-bob.test"
+    id: "bottomBarHomeBtn"
 - tapOn:
     id: "postDropdownBtn"
-    childOf:
-      id: "postThreadItem-by-bob.test"
 - tapOn: "Unmute thread"
 - tapOn:
     id: "bottomBarNotificationsBtn"
 - swipe:
     from:
-      id: "notifsFeed"
+        id: "notifsFeed"
     direction: DOWN
-- assertVisible: ".*Reply 1.*"
-- assertNotVisible: ".*Reply 2.*"
-- assertNotVisible: ".*Reply 3.*"
+- assertVisible:
+    id: "feedItem-by-bob.test"

__e2e__/mock-server.ts

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

__e2e__/perf-test.yml

@@ -1,3 +1,4 @@
+
 # flow.yaml
 
 appId: xyz.blueskyweb.app
@@ -32,7 +33,7 @@ appId: xyz.blueskyweb.app
     direction: "LEFT"
 - swipe:
     direction: "LEFT"
-- swipe:
+- swipe: 
     direction: "LEFT"
 - swipe:
     direction: "RIGHT"

__e2e__/setupApp.yml

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

__e2e__/setupServer.js

@@ -1,8 +1,5 @@
-// eslint-disable-next-line no-undef
-var res = http.post('http://localhost:1986/' + SERVER_PATH, {
+// eslint-disable-next-line
+http.post('http://localhost:1986/' + SERVER_PATH, {
   headers: {'Content-Type': 'text/plain'},
   body: '',
 })
-
-// eslint-disable-next-line no-undef
-output.result = json(res.body).appviewDid

__mocks__/@gorhom/bottom-sheet.tsx

@@ -1,8 +1,7 @@
-import React, {type ReactNode} from 'react'
-import {FlatList, Modal, ScrollView, TextInput, View} from 'react-native'
+import React, {ReactNode} from 'react'
+import {View, ScrollView, Modal, FlatList, TextInput} from 'react-native'
 
 const BottomSheetModalContext = React.createContext(null)
-BottomSheetModalContext.displayName = 'BottomSheetModalContext'
 
 const BottomSheetModalProvider = (props: any) => {
   return <BottomSheetModalContext.Provider {...props} value={{}} />
@@ -48,13 +47,13 @@ export {useBottomSheetInternal}
 export {useBottomSheetDynamicSnapPoints}
 
 export {
+  BottomSheetModalProvider,
   BottomSheetBackdrop,
-  BottomSheetFlatList,
-  BottomSheetFooter,
   BottomSheetHandle,
   BottomSheetModal,
-  BottomSheetModalProvider,
+  BottomSheetFooter,
   BottomSheetScrollView,
+  BottomSheetFlatList,
   BottomSheetTextInput,
 }
 

__mocks__/@notifee/react-native.ts

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

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

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

__mocks__/multiformats/cid.js

@@ -1,3 +0,0 @@
-export const CID = jest.fn().mockImplementation(() => {
-  return {}
-})

__mocks__/multiformats/hashes/hasher.js

@@ -1,7 +0,0 @@
-export const from = jest.fn().mockImplementation(() => {
-  return {
-    digest: jest.fn().mockImplementation(() => {
-      return Promise.resolve('')
-    }),
-  }
-})

__mocks__/react-native-background-fetch.ts

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

__mocks__/react-native-fs.js

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

__mocks__/react-native-image-crop-picker.js

@@ -0,0 +1,9 @@
+export const openPicker = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve({uri: ''}))
+export const openCamera = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve({uri: ''}))
+export const openCropper = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve({uri: ''}))

__mocks__/rn-fetch-blob.js

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

__mocks__/zeego/dropdown-menu.js

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

__tests__/lib/images.test.ts

@@ -1,9 +1,10 @@
-import {createDownloadResumable, deleteAsync} from 'expo-file-system/legacy'
+import {deleteAsync} from 'expo-file-system'
 import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
+import RNFetchBlob from 'rn-fetch-blob'
 
 import {
   downloadAndResize,
-  type DownloadAndResizeOpts,
+  DownloadAndResizeOpts,
   getResizedDimensions,
 } from '../../src/lib/media/manip'
 
@@ -31,12 +32,11 @@ describe('downloadAndResize', () => {
   })
 
   it('should return resized image for valid URI and options', async () => {
-    const mockedFetch = createDownloadResumable as jest.Mock
-    mockedFetch.mockReturnValue({
-      cancelAsync: jest.fn(),
-      downloadAsync: jest
-        .fn()
-        .mockResolvedValue({uri: 'file://resized-image.jpg'}),
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image.jpg'),
+      info: jest.fn().mockReturnValue({status: 200}),
+      flush: jest.fn(),
     })
 
     const opts: DownloadAndResizeOpts = {
@@ -50,12 +50,13 @@ describe('downloadAndResize', () => {
 
     const result = await downloadAndResize(opts)
     expect(result).toEqual(mockResizedImage)
-    expect(createDownloadResumable).toHaveBeenCalledWith(
-      opts.uri,
-      expect.anything(),
-      {
-        cache: true,
-      },
+    expect(RNFetchBlob.config).toHaveBeenCalledWith({
+      fileCache: true,
+      appendExt: 'jpeg',
+    })
+    expect(RNFetchBlob.fetch).toHaveBeenCalledWith(
+      'GET',
+      'https://example.com/image.jpg',
     )
 
     // First time it gets called is to get dimensions
@@ -85,6 +86,28 @@ describe('downloadAndResize', () => {
     expect(result).toBeUndefined()
   })
 
+  it('should return undefined for non-200 response', async () => {
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image'),
+      info: jest.fn().mockReturnValue({status: 400}),
+      flush: jest.fn(),
+    })
+
+    const opts: DownloadAndResizeOpts = {
+      uri: 'https://example.com/image',
+      width: 100,
+      height: 100,
+      maxSize: 500000,
+      mode: 'cover',
+      timeout: 10000,
+    }
+
+    const result = await downloadAndResize(opts)
+    expect(errorSpy).not.toHaveBeenCalled()
+    expect(result).toBeUndefined()
+  })
+
   it('should not downsize whenever dimensions are below the max dimensions', () => {
     const initialDimensionsOne = {
       width: 1200,

__tests__/lib/link-meta.test.ts

@@ -1,4 +1,4 @@
-import {getLikelyType, LikelyType} from '../../src/lib/link-meta/link-meta'
+import {LikelyType, getLikelyType} from '../../src/lib/link-meta/link-meta'
 
 describe('getLikelyType', () => {
   it('correctly handles non-parsed url', async () => {

__tests__/lib/string.test.ts

@@ -1,14 +1,11 @@
 import {RichText} from '@atproto/api'
-import {i18n} from '@lingui/core'
 
-import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player'
+import {parseEmbedPlayerFromUrl} from 'lib/strings/embed-player'
 import {
   createStarterPackGooglePlayUri,
   createStarterPackLinkFromAndroidReferrer,
   parseStarterPackUri,
-} from '#/lib/strings/starter-pack'
-import {messages} from '#/locale/locales/en/messages'
-import {klipyUrlToBskyGifUrl} from '#/features/gifPicker/utils'
+} from 'lib/strings/starter-pack'
 import {cleanError} from '../../src/lib/strings/errors'
 import {createFullHandle, makeValidHandle} from '../../src/lib/strings/handles'
 import {enforceLen} from '../../src/lib/strings/helpers'
@@ -204,9 +201,6 @@ describe('enforceLen', () => {
 })
 
 describe('cleanError', () => {
-  // cleanError uses lingui
-  i18n.loadAndActivate({locale: 'en', messages})
-
   const inputs = [
     'TypeError: Network request failed',
     'Error: Aborted',
@@ -332,7 +326,6 @@ describe('shortenLinks', () => {
       expect(outputRT.text).toEqual(outputs[i][0])
       expect(outputRT.facets?.length).toEqual(outputs[i][1].length)
       for (let j = 0; j < outputs[i][1].length; j++) {
-        // @ts-expect-error whatever
         expect(outputRT.facets![j].features[0].uri).toEqual(outputs[i][1][j])
       }
     }
@@ -384,7 +377,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',
@@ -443,20 +435,6 @@ describe('parseEmbedPlayerFromUrl', () => {
 
     'https://www.flickr.com/groups/898944@N23/',
     'https://www.flickr.com/groups',
-
-    'https://maxblansjaar.bandcamp.com/album/false-comforts',
-    'https://grmnygrmny.bandcamp.com/track/fluid',
-    'https://sufjanstevens.bandcamp.com/',
-    'https://sufjanstevens.bandcamp.com',
-    'https://bandcamp.com/',
-    'https://bandcamp.com',
-
-    'https://static.klipy.com/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
-    'https://static.klipy.com/ii/abc123/73/ac/someFile.gif?hh=200&ww=300&mp4=videoSlugMp4&webm=videoSlugWebm',
-    'https://static.klipy.com/ii/abc123/73/ac/someFile.gif?hh=200',
-    'https://static.klipy.com/ii/abc123/73/ac/someFile.gif',
-    'https://static.klipy.com/other/path.gif?hh=200&ww=300',
-    'https://static.klipy.com',
   ]
 
   const outputs = [
@@ -625,11 +603,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',
@@ -835,52 +808,6 @@ describe('parseEmbedPlayerFromUrl', () => {
 
     undefined,
     undefined,
-
-    {
-      type: 'bandcamp_album',
-      source: 'bandcamp',
-      playerUri:
-        'https://bandcamp.com/EmbeddedPlayer/url=https%3A%2F%2Fmaxblansjaar.bandcamp.com%2Falbum%2Ffalse-comforts/size=large/bgcol=ffffff/linkcol=0687f5/minimal=true/transparent=true/',
-    },
-    {
-      type: 'bandcamp_track',
-      source: 'bandcamp',
-      playerUri:
-        'https://bandcamp.com/EmbeddedPlayer/url=https%3A%2F%2Fgrmnygrmny.bandcamp.com%2Ftrack%2Ffluid/size=large/bgcol=ffffff/linkcol=0687f5/minimal=true/transparent=true/',
-    },
-    undefined,
-    undefined,
-    undefined,
-    undefined,
-
-    {
-      type: 'klipy_gif',
-      source: 'klipy',
-      isGif: true,
-      hideDetails: true,
-      playerUri: 'https://k.gifs.bsky.app/ii/abc123/73/ac/someFile.gif',
-      dimensions: {
-        width: 300,
-        height: 200,
-      },
-    },
-    // With video slug params — on native (test env), keeps gif filename,
-    // strips mp4/webm params. On web, would swap to video filename.
-    {
-      type: 'klipy_gif',
-      source: 'klipy',
-      isGif: true,
-      hideDetails: true,
-      playerUri: 'https://k.gifs.bsky.app/ii/abc123/73/ac/someFile.gif',
-      dimensions: {
-        width: 300,
-        height: 200,
-      },
-    },
-    undefined,
-    undefined,
-    undefined,
-    undefined,
   ]
 
   it('correctly grabs the correct id from uri', () => {
@@ -1023,20 +950,20 @@ describe('parseStarterPackHttpUri', () => {
   })
 
   it('returns the at uri when the input is a valid starterpack at uri', () => {
-    const validAtUri = 'at://did:plc:123/app.bsky.graph.starterpack/rkey'
+    const validAtUri = 'at://did:123/app.bsky.graph.starterpack/rkey'
     expect(parseStarterPackUri(validAtUri)).toEqual({
-      name: 'did:plc:123',
+      name: 'did:123',
       rkey: 'rkey',
     })
   })
 
   it('returns null when the at uri has no rkey', () => {
-    const validAtUri = 'at://did:plc:123/app.bsky.graph.starterpack'
+    const validAtUri = 'at://did:123/app.bsky.graph.starterpack'
     expect(parseStarterPackUri(validAtUri)).toEqual(null)
   })
 
   it('returns null when the collection is not app.bsky.graph.starterpack', () => {
-    const validAtUri = 'at://did:plc:123/app.bsky.graph.list/rkey'
+    const validAtUri = 'at://did:123/app.bsky.graph.list/rkey'
     expect(parseStarterPackUri(validAtUri)).toEqual(null)
   })
 
@@ -1070,31 +997,3 @@ describe('createStarterPackGooglePlayUri', () => {
     expect(createStarterPackGooglePlayUri(undefined, 'rkey')).toEqual(null)
   })
 })
-
-describe('klipyUrlToBskyGifUrl', () => {
-  const inputs = [
-    'https://static.klipy.com/ii/abc123/73/ac/someFile.gif',
-    'https://static.klipy.com/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
-  ]
-
-  it.each(inputs)(
-    'returns url with k.gifs.bsky.app as hostname for input url',
-    input => {
-      const out = klipyUrlToBskyGifUrl(input)
-      expect(out.startsWith('https://k.gifs.bsky.app/')).toEqual(true)
-    },
-  )
-
-  it('preserves the path and query params when rewriting', () => {
-    const out = klipyUrlToBskyGifUrl(
-      'https://static.klipy.com/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
-    )
-    expect(out).toEqual(
-      'https://k.gifs.bsky.app/ii/abc123/73/ac/someFile.gif?hh=200&ww=300',
-    )
-  })
-
-  it('returns empty string for invalid URLs', () => {
-    expect(klipyUrlToBskyGifUrl('not-a-url')).toEqual('')
-  })
-})

__tests__/lib/strings/handles.test.ts

@@ -1,42 +0,0 @@
-import {type IsValidHandle, validateServiceHandle} from '#/lib/strings/handles'
-
-describe('handle validation', () => {
-  const valid = [
-    ['ali', 'bsky.social'],
-    ['alice', 'bsky.social'],
-    ['a-lice', 'bsky.social'],
-    ['a-----lice', 'bsky.social'],
-    ['123', 'bsky.social'],
-    ['123456789012345678', 'bsky.social'],
-    ['alice', 'custom-pds.com'],
-    ['alice', 'my-custom-pds-with-long-name.social'],
-    ['123456789012345678', 'my-custom-pds-with-long-name.social'],
-  ]
-  it.each(valid)(`should be valid: %s.%s`, (handle, service) => {
-    const result = validateServiceHandle(handle, service)
-    expect(result.overall).toEqual(true)
-  })
-
-  const invalid = [
-    ['al', 'bsky.social', 'frontLengthNotTooShort'],
-    ['-alice', 'bsky.social', 'hyphenStartOrEnd'],
-    ['alice-', 'bsky.social', 'hyphenStartOrEnd'],
-    ['%%%', 'bsky.social', 'handleChars'],
-    ['1234567890123456789', 'bsky.social', 'frontLengthNotTooLong'],
-    [
-      '1234567890123456789',
-      'my-custom-pds-with-long-name.social',
-      'frontLengthNotTooLong',
-    ],
-    ['al', 'my-custom-pds-with-long-name.social', 'frontLengthNotTooShort'],
-    ['a'.repeat(300), 'toolong.com', 'totalLength'],
-  ] satisfies [string, string, keyof IsValidHandle][]
-  it.each(invalid)(
-    `should be invalid: %s.%s due to %s`,
-    (handle, service, expectedError) => {
-      const result = validateServiceHandle(handle, service)
-      expect(result.overall).toEqual(false)
-      expect(result[expectedError]).toEqual(false)
-    },
-  )
-})

__tests__/lib/strings/mention-manip.test.ts

@@ -32,7 +32,6 @@ describe('getMentionAt', () => {
     ['@alice hello', 7, undefined],
     ['alice@alice', 0, undefined],
     ['alice@alice', 6, undefined],
-    ['hello @alice-com goodbye', 8, 'alice-com'],
   ]
 
   it.each(cases)(
@@ -73,7 +72,6 @@ describe('insertMentionAt', () => {
     ['@alice hello', 7, '@alice hello'],
     ['alice@alice', 0, 'alice@alice'],
     ['alice@alice', 6, 'alice@alice'],
-    ['hello @alice-com goodbye', 10, 'hello @alice.com  goodbye'],
   ]
 
   it.each(cases)(

app.config.js

@@ -1,11 +1,8 @@
-// @ts-check
 const pkg = require('./package.json')
 
-/**
- * @param {import('@expo/config-types').ExpoConfig} _config
- * @returns {{ expo: import('@expo/config-types').ExpoConfig }}
- */
-module.exports = function (_config) {
+const DARK_SPLASH_ANDROID_BACKGROUND = '#0f141b'
+
+module.exports = function (config) {
   /**
    * App version number. Should be incremented as part of a release cycle.
    */
@@ -16,11 +13,11 @@ 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'
-  const IS_DEV = !IS_TESTFLIGHT && !IS_PRODUCTION
+  const IS_DEV = !IS_TESTFLIGHT || !IS_PRODUCTION
 
   const ASSOCIATED_DOMAINS = [
     'applinks:bsky.app',
@@ -31,16 +28,17 @@ module.exports = function (_config) {
     ...(IS_DEV || IS_TESTFLIGHT ? [] : []),
   ]
 
-  const UPDATES_ENABLED = IS_TESTFLIGHT || IS_PRODUCTION
+  const UPDATES_CHANNEL = IS_TESTFLIGHT
+    ? 'testflight'
+    : IS_PRODUCTION
+    ? 'production'
+    : undefined
+  const UPDATES_ENABLED = !!UPDATES_CHANNEL
 
   const USE_SENTRY = Boolean(process.env.SENTRY_AUTH_TOKEN)
-
-  const IOS_ICON_FILE =
-    PLATFORM === 'web' // web build doesn't like .icon files
-      ? './assets/app-icons/ios_icon_default_next.png'
-      : IS_TESTFLIGHT
-        ? './assets/app-icons/ios_icon_testflight.icon'
-        : './assets/app-icons/ios_icon_default.icon'
+  const SENTRY_DIST = `${PLATFORM}.${VERSION}.${IS_TESTFLIGHT ? 'tf' : ''}${
+    IS_DEV ? 'dev' : ''
+  }`
 
   return {
     expo: {
@@ -52,21 +50,17 @@ 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: '#006AFF',
-      newArchEnabled: false,
+      primaryColor: '#1083fe',
       ios: {
         supportsTablet: false,
         bundleIdentifier: 'xyz.blueskyweb.app',
         config: {
           usesNonExemptEncryption: false,
         },
-        icon: IOS_ICON_FILE,
         infoPlist: {
-          CADisableMinimumFrameDurationOnPhone: true,
           UIBackgroundModes: ['remote-notification'],
-          NSUserActivityTypes: ['INSendMessageIntent'],
           NSCameraUsageDescription:
             'Used for profile pictures, posts, and other kinds of content.',
           NSMicrophoneUsageDescription:
@@ -81,22 +75,15 @@ module.exports = function (_config) {
             'an',
             'ast',
             'ca',
-            'cy',
-            'da',
             'de',
             'el',
-            'eo',
             'es',
-            'eu',
             'fi',
             'fr',
-            'fy',
             'ga',
-            'gd',
             'gl',
             'hi',
             'hu',
-            'ia',
             'id',
             'it',
             'ja',
@@ -106,15 +93,13 @@ module.exports = function (_config) {
             'nl',
             'pl',
             'pt-BR',
-            'pt-PT',
             'ro',
             'ru',
-            'sv',
             'th',
             'tr',
             'uk',
             'vi',
-            'yue',
+            'yue-Hant',
             'zh-Hans',
             'zh-Hant',
           ],
@@ -124,38 +109,8 @@ module.exports = function (_config) {
           'com.apple.developer.kernel.increased-memory-limit': true,
           'com.apple.developer.kernel.extended-virtual-addressing': true,
           'com.apple.security.application-groups': 'group.app.bsky',
-          'com.apple.developer.usernotifications.communication': true,
-          // 'com.apple.developer.device-information.user-assigned-device-name': true,
         },
         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:
@@ -181,17 +136,20 @@ module.exports = function (_config) {
       },
       androidStatusBar: {
         barStyle: 'light-content',
+        backgroundColor: '#00000000',
       },
       // Dark nav bar in light mode is better than light nav bar in dark mode
       androidNavigationBar: {
         barStyle: 'light-content',
+        backgroundColor: DARK_SPLASH_ANDROID_BACKGROUND,
       },
       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',
@@ -204,14 +162,10 @@ module.exports = function (_config) {
                 scheme: 'https',
                 host: 'bsky.app',
               },
-              ...(IS_DEV
-                ? [
-                    {
-                      scheme: 'http',
-                      host: 'localhost:19006',
-                    },
-                  ]
-                : []),
+              IS_DEV && {
+                scheme: 'http',
+                host: 'localhost:19006',
+              },
             ],
             category: ['BROWSABLE', 'DEFAULT'],
           },
@@ -234,48 +188,31 @@ module.exports = function (_config) {
             }
           : undefined,
         checkAutomatically: 'NEVER',
+        channel: UPDATES_CHANNEL,
       },
       plugins: [
-        'expo-video',
         'expo-localization',
-        'expo-web-browser',
-        [
-          'react-native-edge-to-edge',
-          {android: {enforceNavigationBarContrast: false}},
+        USE_SENTRY && [
+          '@sentry/react-native/expo',
+          {
+            organization: 'blueskyweb',
+            project: 'react-native',
+            release: VERSION,
+            dist: SENTRY_DIST,
+          },
         ],
-        ...(USE_SENTRY
-          ? [
-              /** @type {[string, any]} */ ([
-                '@sentry/react-native/expo',
-                {
-                  organization: 'blueskyweb',
-                  project: 'app',
-                  url: 'https://sentry.io',
-                },
-              ]),
-            ]
-          : []),
         [
           'expo-build-properties',
           {
             ios: {
               deploymentTarget: '15.1',
-              buildReactNativeFromSource: true,
-              ccacheEnabled: IS_DEV,
-              cxxLanguageStandard: 'c++23',
-              extraPods: [
-                {
-                  name: 'MCEmojiPicker',
-                  git: 'https://github.com/bluesky-social/MCEmojiPicker.git',
-                  branch: 'main',
-                },
-              ],
+              newArchEnabled: false,
             },
             android: {
-              compileSdkVersion: 36,
+              compileSdkVersion: 35,
               targetSdkVersion: 35,
               buildToolsVersion: '35.0.0',
-              buildReactNativeFromSource: IS_PRODUCTION,
+              newArchEnabled: false,
             },
           },
         ],
@@ -288,21 +225,17 @@ module.exports = function (_config) {
           },
         ],
         'react-native-compressor',
-        [
-          '@bitdrift/react-native',
-          {
-            networkInstrumentation: true,
-          },
-        ],
+        // TODO: Reenable when the build issue is fixed.
+        // '@bitdrift/react-native',
         './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
-        './plugins/withGradleJVMHeapSizeIncrease.js',
-        './plugins/withAndroidManifestLargeHeapPlugin.js',
+        './plugins/withAndroidManifestPlugin.js',
         './plugins/withAndroidManifestFCMIconPlugin.js',
-        './plugins/withAndroidManifestIntentQueriesPlugin.js',
         './plugins/withAndroidStylesAccentColorPlugin.js',
+        './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',
         './plugins/withAndroidNoJitpackPlugin.js',
         './plugins/shareExtension/withShareExtensions.js',
         './plugins/notificationsExtension/withNotificationsExtension.js',
+        './plugins/withAppDelegateReferrer.js',
         [
           'expo-font',
           {
@@ -312,12 +245,10 @@ module.exports = function (_config) {
               // Android only
               './assets/fonts/inter/Inter-Regular.otf',
               './assets/fonts/inter/Inter-Italic.otf',
-              './assets/fonts/inter/Inter-Medium.otf',
-              './assets/fonts/inter/Inter-MediumItalic.otf',
               './assets/fonts/inter/Inter-SemiBold.otf',
               './assets/fonts/inter/Inter-SemiBoldItalic.otf',
-              './assets/fonts/inter/Inter-Bold.otf',
-              './assets/fonts/inter/Inter-BoldItalic.otf',
+              './assets/fonts/inter/Inter-ExtraBold.otf',
+              './assets/fonts/inter/Inter-ExtraBoldItalic.otf',
             ],
           },
         ],
@@ -325,25 +256,25 @@ module.exports = function (_config) {
           'expo-splash-screen',
           {
             ios: {
-              enableFullScreenImage_legacy: true, // iOS only
-              backgroundColor: '#006AFF', // primary_500
-              image: './assets/splash/splash.png',
+              enableFullScreenImage_legacy: true,
+              backgroundColor: '#ffffff',
+              image: './assets/splash.png',
               resizeMode: 'cover',
               dark: {
-                enableFullScreenImage_legacy: true, // iOS only
-                backgroundColor: '#002861', // primary_900
-                image: './assets/splash/splash-dark.png',
+                enableFullScreenImage_legacy: true,
+                backgroundColor: '#001429',
+                image: './assets/splash-dark.png',
                 resizeMode: 'cover',
               },
             },
             android: {
-              backgroundColor: '#006AFF', // primary_500
-              image: './assets/splash/android-splash-logo-white.png',
-              imageWidth: 102, // even division of 306px
+              backgroundColor: '#0c7cff',
+              image: './assets/splash-android-icon.png',
+              imageWidth: 150,
               dark: {
-                backgroundColor: '#002861', // primary_900
-                image: './assets/splash/android-splash-logo-white.png',
-                imageWidth: 102,
+                backgroundColor: '#0c2a49',
+                image: './assets/splash-android-icon-dark.png',
+                imageWidth: 150,
               },
             },
           },
@@ -355,13 +286,13 @@ 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,
             },
 
@@ -416,15 +347,7 @@ module.exports = function (_config) {
           },
         ],
         ['expo-screen-orientation', {initialOrientation: 'PORTRAIT_UP'}],
-        ['expo-location'],
-        [
-          'expo-contacts',
-          {
-            contactsPermission:
-              'I agree to allow Bluesky to use my contacts for friend discovery until I opt out.',
-          },
-        ],
-      ],
+      ].filter(Boolean),
       extra: {
         eas: {
           build: {
@@ -460,6 +383,22 @@ module.exports = function (_config) {
           projectId: '55bd077a-d905-4184-9c7f-94789ba0f302',
         },
       },
+      hooks: {
+        postPublish: [
+          /*
+           * @see https://docs.expo.dev/guides/using-sentry/#app-configuration
+           */
+          {
+            file: './postHooks/uploadSentrySourcemapsPostHook',
+            config: {
+              organization: 'blueskyweb',
+              project: 'react-native',
+              release: VERSION,
+              dist: SENTRY_DIST,
+            },
+          },
+        ],
+      },
     },
   }
 }

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

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

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

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

assets/icons/arrowBoxRight_stroke2_corner3_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M17 3a4 4 0 0 1 4 4v10a4 4 0 0 1-4 4h-2a1 1 0 1 1 0-2h2a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2h-2a1 1 0 1 1 0-2h2Zm-6.707 4.793a1 1 0 0 1 1.414 0l3.5 3.5a1 1 0 0 1 0 1.414l-3.5 3.5a1 1 0 1 1-1.414-1.414L12.086 13H4a1 1 0 1 1 0-2h8.086l-1.793-1.793a1 1 0 0 1 0-1.414Z"/></svg>

assets/icons/arrowCornerDownRight_stroke2_rounded_2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M15.793 10.293a1 1 0 0 1 1.338-.068l.076.068 3.293 3.293a2 2 0 0 1 .138 2.677l-.138.151-3.293 3.293a1 1 0 1 1-1.414-1.414L18.086 16H8a5 5 0 0 1-5-5V5a1 1 0 0 1 2 0v6a3 3 0 0 0 3 3h10.086l-2.293-2.293-.068-.076a1 1 0 0 1 .068-1.338Z"/></svg>

assets/icons/arrowOutOfBoxModified_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M20 13.75a1 1 0 0 1 1 1V18a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3v-3.25a1 1 0 1 1 2 0V18a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-3.25a1 1 0 0 1 1-1ZM12 3a1 1 0 0 1 .707.293l4.5 4.5a1 1 0 1 1-1.414 1.414L13 6.414v8.836a1 1 0 1 1-2 0V6.414L8.207 9.207a1 1 0 1 1-1.414-1.414l4.5-4.5A1 1 0 0 1 12 3Z"/></svg>

assets/icons/arrowRotateClockwise_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M2.972 12a9 9 0 0 1 9-9c1.726 0 3.165.423 4.448 1.21A10 10 0 0 1 18 5.428V4a1 1 0 1 1 2 0v4a1 1 0 0 1-1 1h-4a1 1 0 1 1 0-2h1.756a8.3 8.3 0 0 0-1.382-1.085C14.417 5.327 13.341 5 11.972 5a7 7 0 1 0 6.601 9.333A1 1 0 0 1 20.46 15a9 9 0 0 1-17.487-3Z"/></svg>