Cleanup

.env.example

@@ -1,48 +1,8 @@
-# The env the app is running in e.g. development, testflight, production
+# Copy this to `.env` and `.env.test` files
+
+SENTRY_AUTH_TOKEN=
 EXPO_PUBLIC_ENV=development
-
-# 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
 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=
+EXPO_PUBLIC_LOG_DEBUG=
+EXPO_PUBLIC_BUNDLE_IDENTIFIER=
+EXPO_PUBLIC_BUNDLE_DATE=0

.eslintrc.js

@@ -0,0 +1,111 @@
+module.exports = {
+  root: true,
+  extends: [
+    '@react-native-community',
+    'plugin:react/recommended',
+    '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: {
+    // Temporary until https://github.com/facebook/react-native/pull/43756 gets into a release.
+    'prettier/prettier': 0,
+    'react/no-unescaped-entities': 0,
+    'react-native/no-inline-styles': 0,
+    'bsky-internal/avoid-unwrapped-text': [
+      'error',
+      {
+        impliedTextComponents: ['H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'P'],
+        impliedTextProps: [],
+        suggestedTextWrappers: {
+          Button: 'ButtonText',
+          'ToggleButton.Button': 'ToggleButton.ButtonText',
+        },
+      },
+    ],
+    'bsky-internal/use-exact-imports': 'error',
+    'bsky-internal/use-typed-gates': 'error',
+    'simple-import-sort/imports': [
+      'warn',
+      {
+        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': 'warn',
+    // TODO: Reenable when we figure out why it gets stuck on CI.
+    // 'react-compiler/react-compiler': 'error',
+    '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.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+
+1.
+
+**Expected behavior**
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots**
+
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Details**
+
+ - Platform: <!-- desktop chrome windows, mobile safari, iOS, Android -->
+ - Platform version:
+ - App version:
+
+**Additional context**
+
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,64 +0,0 @@
-name: "Bug Report"
-description: "Create a report for an issue you have experience in the app."
-labels: ["bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make sure you've searched for similar issues that are already open and being tracked. If you find an open issue that seems relevant to yours, it is best to leave a response there with your information instead of opening a new issue, since it helps to consolidate the info in one place.
-  - type: textarea
-    attributes:
-      label: Steps to Reproduce
-      description: |
-        Please provide the steps that may reproduce the issue that you are experiencing. The more concise of a
-        reproduction that you provide, the easier it will be for us to identify the issue and fix it in a timely manner.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-    validations:
-      required: true
-  - 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
-  - type: dropdown
-    attributes:
-      label: What platform(s) does this occur on?
-      multiple: true
-      options:
-        - iOS
-        - Android
-        - Web (Desktop)
-        - Web (Mobile)
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Device Info
-      description: |
-        Please provide the device information that you are using when experiencing this issue. This can include the
-        device model, operating system version, and any other relevant information.
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: What version of the app are you using?
-      description: |
-        You can easily find this information by visting the Settings screen in the app, and tapping on the version info
-        at the bottom of the screen. All the relevant information will be copied to your clipboard, and you will be
-        able to share it here.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional Information
-      description: |
-        Please provide any additional information that you think may be helpful in identifying the issue you are
-        experiencing. This can include any error messages, logs, or other information that you think may be relevant.
-    validations:
-        required: false

.github/ISSUE_TEMPLATE/bug_report_fabric.yml

@@ -1,69 +0,0 @@
-name: "Bug Report - Fabric/New Architecture"
-description: "Create a bug report for builds using the New Architecture. If you are not sure what that means, don't use this template, and instead use the default bug report template."
-labels: ["bug", "fabric"]
-body:
-  - type: checkboxes
-    attributes:
-      label: You're running a build that uses the React Native New Architecture, right?
-      description: This template is specifically for issues related to builds that use the React Native New Architecture. If you are not sure what that means, this template is probably not relevant to you, and you should use the default Bug Report template.
-      options:
-        - label: I am running a build that uses the New Architecture
-          required: true
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make sure you've searched for similar issues that are already open and being tracked. If you find an open issue that seems relevant to yours, it is best to leave a response there with your information instead of opening a new issue, since it helps to consolidate the info in one place.
-  - type: textarea
-    attributes:
-      label: Steps to Reproduce
-      description: |
-        Please provide the steps that may reproduce the issue that you are experiencing. The more concise of a
-        reproduction that you provide, the easier it will be for us to identify the issue and fix it in a timely manner.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-    validations:
-      required: true
-  - 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
-  - type: dropdown
-    attributes:
-      label: What platform(s) does this occur on?
-      multiple: true
-      options:
-        - iOS
-        - Android
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Device Info
-      description: |
-        Please provide the device information that you are using when experiencing this issue. This can include the
-        device model, operating system version, and any other relevant information.
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: What version of the app are you using?
-      description: |
-        You can easily find this information by visting the Settings screen in the app, and tapping on the version info
-        at the bottom of the screen. All the relevant information will be copied to your clipboard, and you will be
-        able to share it here.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional Information
-      description: |
-        Please provide any additional information that you think may be helpful in identifying the issue you are
-        experiencing. This can include any error messages, logs, or other information that you think may be relevant.
-    validations:
-        required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature-request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,42 +0,0 @@
-name: "Feature Request"
-description: "Suggest an idea for the Bluesky app."
-labels: ["feature-request"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for submitting a feature request! Before you submit this request, please make sure you've searched for similar requests that are already open and being tracked. If you find an open request that seems relevant to yours, it is best to leave a response there with your information instead of opening a new request, since it helps to consolidate the info in one place.
-  - type: textarea
-    attributes:
-      label: Describe the Feature
-      description: |
-        Please provide a detailed description of the feature you would like to see implemented in the app. The more
-        information you provide, the easier it will be for us to understand the feature you are requesting and to
-        implement it in a timely manner.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Attachments
-      description: |
-        If helpful, provide some images or videos of similar features in other apps that you think would be helpful
-        for us to understand the feature you are requesting, or places within the app that you think the feature belongs
-        in or is missing from.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe Alternatives
-      description: |
-        If there are any alternative solutions or features that you think would be helpful to implement in place of the
-        feature you are requesting, please provide a description of those as well.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional Context
-      description: |
-        If there is any additional context or information that you think would be helpful for us to know about the
-        feature you are requesting, please provide that information here.
-    validations:
-      required: false

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

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        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@v4
+        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,8 @@ on:
   push:
     branches:
       - main
-      - echoprom_fix
+      - bnewbold/embedr
+      - bnewbold/embedr-rebase
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -22,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1

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

@@ -1,11 +1,6 @@
 name: build-and-push-link-aws
 on:
   workflow_dispatch:
-  pull_request:
-    paths:
-      - "bskylink/**"
-      - "Dockerfile.bskylink"
-      - ".github/workflows/build-and-push-link-aws.yaml"
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -24,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1
@@ -50,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,11 +1,6 @@
 name: build-and-push-ogcard-aws
 on:
   workflow_dispatch:
-  pull_request:
-    paths:
-      - "bskyogcard/**"
-      - "Dockerfile.bskyogcard"
-      - ".github/workflows/build-and-push-ogcard-aws.yaml"
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -24,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1
@@ -50,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: >
@@ -33,7 +29,7 @@ jobs:
           fetch-depth: 5
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -42,7 +38,7 @@ jobs:
         uses: dcarbone/install-jq-action@v2
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@main
+        uses: expo/expo-github-action@v8
         with:
           expo-version: latest
           eas-version: latest
@@ -53,45 +49,25 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: ⚙️ Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install
 
       - name: 🔤 Compile translations
-        run: yarn 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 "$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 }}
-          yarn use-build-number-with-bump
-          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' }}
@@ -101,7 +77,7 @@ jobs:
         id: timestamp
         uses: nanzm/get-time-action@master
         with:
-          format: "MM-DD-HH-mm-ss"
+          format: 'MM-DD-HH-mm-ss'
 
       - name: 🚀 Upload Production Artifact
         id: upload-artifact-production
@@ -151,21 +127,9 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
-      - name: 🧹 Clear Metro cache
-        if: ${{ inputs.profile == 'production' }}
-        # https://github.com/expo/eas-cli/issues/2959#issuecomment-2749791326
-        run: rm -rf ${TMPDIR:-/tmp}/metro-cache
-
       - name: 🏗️ Build Production APK
         if: ${{ inputs.profile == 'production' }}
-        run: >
-          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 }}
-          yarn use-build-number-with-bump
-          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
@@ -192,13 +156,11 @@ jobs:
       - name: ⬇️ Restore Cache
         id: get-base-commit
         uses: actions/cache@v4
-        if: ${{ inputs.profile == 'testflight-android' }}
+        if: ${{ inputs.profile == 'testflight' }}
         with:
           path: most-recent-testflight-commit.txt
           key: most-recent-testflight-commit
 
       - name: ✏️ Write commit hash to cache
-        if: ${{ inputs.profile == 'testflight-android' }}
-        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: >
@@ -33,7 +29,7 @@ jobs:
           fetch-depth: 5
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -42,7 +38,7 @@ jobs:
         uses: dcarbone/install-jq-action@v2
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@main
+        uses: expo/expo-github-action@v8
         with:
           expo-version: latest
           eas-version: latest
@@ -52,19 +48,19 @@ jobs:
         run: yarn global add eas-cli-local-build-plugin
 
       - name: ⚙️ Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "26.0"
+          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@v4
+        uses: actions/cache@v3
         id: pods-cache
         with:
           path: ./ios/Pods
@@ -73,59 +69,20 @@ jobs:
           key: ${{ runner.os }}-pods-${{ hashFiles('yarn.lock') }}
 
       - name: 🔤 Compile translations
-        run: yarn 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 "${{ 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 }}
-          yarn use-build-number-with-bump
-          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..."
-            mkdir ios-build
-            tar -xzf build.tar.gz -C ios-build
-            echo "Extraction completed successfully"
-          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: eas submit -p ios --non-interactive --path ios-build/ios/build/Bluesky.ipa
-
-      - name: 🪲 Upload dSYM to Sentry
-        run: >
-          SENTRY_ORG=blueskyweb
-          SENTRY_PROJECT=app
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          yarn sentry-cli debug-files upload ios-build/ios/build/Bluesky.app.dSYM.zip --include-sources
+        run: eas submit -p ios --non-interactive --path build.ipa
 
       - name: 📚 Get version from package.json
         id: get-build-info
@@ -152,7 +109,5 @@ jobs:
           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,12 +38,10 @@ 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
@@ -57,7 +54,7 @@ jobs:
         run: git fetch origin main:main --depth 100
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -72,23 +69,17 @@ jobs:
       - name: Lint check
         run: yarn lint
 
-      - name: Lint lockfile
-        run: yarn lockfile-lint
-
       - name: Prettier check
         run: yarn prettier --check .
 
-      - name: 🔤 Compile translations
-        run: yarn 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: Check & compile i18n
+        run: yarn intl:build
 
       - name: Type check
         run: yarn typecheck
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@main
+        uses: expo/expo-github-action@v8
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
         with:
           expo-version: latest
@@ -103,34 +94,18 @@ jobs:
         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 "$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 }}
-          yarn export
+        run: EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export
 
       - name: 📦 Package Bundle and 🚀 Deploy
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
@@ -150,19 +125,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: >
@@ -177,13 +152,13 @@ jobs:
           fetch-depth: 5
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: yarn
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@main
+        uses: expo/expo-github-action@v8
         with:
           expo-version: latest
           eas-version: latest
@@ -193,19 +168,19 @@ jobs:
         run: yarn global add eas-cli-local-build-plugin
 
       - name: ⚙️ Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "26.0"
+          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@v4
+        uses: actions/cache@v3
         id: pods-cache
         with:
           path: ./ios/Pods
@@ -216,30 +191,15 @@ jobs:
       - name: 🔤 Compile translations
         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 "${{ 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 }}
-          yarn use-build-number-with-bump
-          eas build -p ios
-          --profile testflight
-          --local --output build.ipa --non-interactive
+        run: yarn use-build-number-with-bump eas build -p ios --profile testflight --local --output build.ipa --non-interactive
 
       - name: 🚀 Deploy
         run: eas submit -p ios --non-interactive --path build.ipa
@@ -254,20 +214,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]
+    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
@@ -283,13 +241,13 @@ jobs:
           fetch-depth: 5
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: yarn
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@main
+        uses: expo/expo-github-action@v8
         with:
           expo-version: latest
           eas-version: latest
@@ -300,46 +258,31 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: ⚙️ Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install
 
       - name: 🔤 Compile translations
         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 "$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 }}
-          yarn use-build-number-with-bump
-          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
@@ -370,7 +313,5 @@ jobs:
           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@v4
-        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-5-20251101

.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,13 +15,13 @@ 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.22'
       - name: Dummy Static Files
-        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
+        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
       - name: Check
         run: cd bskyweb/ && make check
       - name: Build (binary)
@@ -32,12 +32,12 @@ 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.22'
       - name: Dummy Static Files
-        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
+        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
       - name: Lint
         run: cd bskyweb/ &&  make lint

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ on:
     branches:
       - main
 concurrency:
-  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
+  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
   cancel-in-progress: true
 
 jobs:
@@ -15,12 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
-      - name: Install node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
+        uses: actions/checkout@v3
       - name: Yarn install
         uses: Wandalen/wretry.action@master
         with:
@@ -29,8 +24,6 @@ jobs:
           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
@@ -42,12 +35,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
-          cache: yarn
       - name: Yarn install
         uses: Wandalen/wretry.action@master
         with:
@@ -58,4 +50,4 @@ jobs:
         run: yarn intl:build
       - name: Run tests
         run: |
-          NODE_ENV=test yarn test --forceExit
+          NODE_ENV=test EXPO_PUBLIC_ENV=test yarn test --forceExit

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

@@ -1,50 +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@v4
-        with:
-          ssh-key: ${{secrets.GH_ACTION_DEPLOY_KEY}}
-      - name: Install node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-      - name: Yarn install
-        uses: Wandalen/wretry.action@master
-        with:
-          command: yarn --frozen-lockfile
-          attempt_limit: 3
-          attempt_delay: 2000
-      - name: Extract language strings
-        run: yarn 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,213 +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@v2
-        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@v4
-        with:
-          ref: ${{ steps.pr-info.outputs.head-sha }}
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Lint check
-        run: yarn lint
-
-      - name: Lint lockfile
-        run: yarn lockfile-lint
-
-      - name: 🔤 Compile translations
-        run: yarn 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: Type check
-        run: yarn typecheck
-
-      - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@main
-        with:
-          expo-version: latest
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: ⛏️ Setup Expo
-        run: yarn global add eas-cli-local-build-plugin
-
-      - 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 }}
-          yarn export
-
-      - name: 📦 Package Bundle and 🚀 Deploy
-        run: yarn 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@v2
-        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@v2
-        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

@@ -29,35 +29,27 @@ jobs:
           fetch-depth: 0
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           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
+          git merge --no-edit ${{ github.head_ref }}
           yarn install
-          yarn intl:build
 
       - name: 🔦 Generate stats file for PR
         run: |
@@ -81,7 +73,6 @@ jobs:
         if: ${{ !steps.get-base-stats.outputs.cache-hit }}
         run: |
           yarn install
-          yarn intl:build
           yarn generate-webpack-stats-file
           mv stats.json stats-base.json
 
@@ -89,9 +80,9 @@ jobs:
         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@v2
@@ -117,7 +108,7 @@ jobs:
         if: github.event_name == 'pull_request'
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -152,3 +143,4 @@ jobs:
         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@v4
-        with:
-          fetch-depth: 0
-      - name: Generate GitHub App Token
-        id: app-token
-        uses: actions/create-github-app-token@v1
-        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-yarn-lock.yml

@@ -1,50 +0,0 @@
-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@v4
-        with:
-          fetch-depth: 0
-
-      - name: Fetch base branch
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: git fetch origin $BASE_REF --depth=1
-
-      - name: Install node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-
-      - name: Reset yarn.lock to base
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: git show "origin/$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/
@@ -119,9 +118,3 @@ src/locale/locales/**/*.js
 
 # ogcard assets
 bskyogcard/src/assets/fonts/noto-*
-
-# bskyweb build output
-bskyweb/static/media/*.webp
-bskyweb/static/media/*.jpg
-bskyweb/static/media/*.png
-bskyweb/static/media/*.svg

.husky/pre-commit

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

.nvmrc

@@ -1 +1 @@
-20
+18

.prettierignore

@@ -1,4 +1,4 @@
-# Ignore everything except JS-ey or CSS code.
+# Ignore everything except JS-ey code.
 # Based on https://stackoverflow.com/a/70715829/458193
 *
 !**/*.js
@@ -7,14 +7,9 @@
 !**/*.tsx
 !*/
 
-!**/*.css
-
 # More specific ignores go below.
 .expo
 android
 ios
 src/locale/locales
 lib/react-compiler-runtime
-bskyweb/static
-coverage
-web-build

CLAUDE.md

@@ -1,637 +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 Native 0.81 with Expo 54
-- TypeScript
-- React Navigation for routing
-- TanStack Query (React Query) for data fetching
-- Lingui for internationalization
-- Custom design system called ALF (Application Layout Framework)
-
-## Essential Commands
-
-```bash
-# Development
-yarn start              # Start Expo dev server
-yarn web                # Start web version
-yarn android            # Run on Android
-yarn ios                # Run on iOS
-
-# Testing & Quality
-yarn test               # Run Jest tests
-yarn lint               # Run ESLint
-yarn typecheck          # Run TypeScript type checking
-
-# Internationalization
-# DO NOT run these commands - extraction and compilation are handled by CI
-yarn intl:extract       # Extract translation strings (nightly CI job)
-yarn intl:compile       # Compile translations for runtime (nightly CI job)
-
-# Build
-yarn build-web          # Build web version
-yarn 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)
-├── 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
-```
-
-## Styling System (ALF)
-
-ALF is the custom design system. It uses Tailwind-inspired naming with underscores instead of hyphens.
-
-### Basic Usage
-
-```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]}>
-        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
-
-### 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 */}
-        <Dialog.Handle />  {/* Native-only drag handle */}
-        <Dialog.ScrollableInner label={_(msg`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>
-      </Dialog.Outer>
-    </>
-  )
-}
-```
-
-### 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_sm, t.atoms.text_contrast_medium]}>Custom text</Text>
-
-// For text with emoji, add the emoji prop
-<Text emoji>Hello! 👋</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.
-
-```tsx
-import {msg, Trans, plural} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-function MyComponent() {
-  const {_} = useLingui()
-
-  // Simple strings - use msg() with _() function
-  const title = _(msg`Settings`)
-  const errorMessage = _(msg`Something went wrong`)
-
-  // Strings with variables
-  const greeting = _(msg`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></Trans>
-    </Text>
-  )
-}
-```
-
-**Commands:**
-```bash
-# DO NOT run these commands - extraction and compilation are handled by a nightly CI job
-yarn intl:extract    # Extract new strings to locale files
-yarn 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'
-
-// Query key pattern
-const RQKEY_ROOT = 'profile'
-export const RQKEY = (did: string) => [RQKEY_ROOT, did]
-
-// Query hook
-export function useProfileQuery({did}: {did: string}) {
-  const agent = useAgent()
-
-  return useQuery({
-    queryKey: RQKEY(did),
-    queryFn: async () => {
-      const res = await agent.getProfile({actor: did})
-      return res.data
-    },
-    staleTime: STALE.MINUTES.FIVE,
-    enabled: !!did,
-  })
-}
-
-// Mutation hook
-export function useUpdateProfile() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (data) => {
-      // Update logic
-    },
-    onSuccess: (_, variables) => {
-      queryClient.invalidateQueries({queryKey: RQKEY(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})
-      }
-    }
-  })
-}
-```
-
-**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: ['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) ?? []`
-
-### 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 `msg()` 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,50 +1,24 @@
-FROM golang:1.25-bookworm AS build-env
+FROM golang:1.22-bullseye AS build-env
 
 WORKDIR /usr/src/social-app
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-#
 # Node
-#
-ENV NODE_VERSION=20
+ENV NODE_VERSION=18
 ENV NVM_DIR=/usr/share/nvm
 
-#
 # Go
-#
 ENV GODEBUG="netdns=go"
 ENV GOOS="linux"
 ENV GOARCH="amd64"
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT="loopvar"
 
-# 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}
+ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER ${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-dev}
 
-#
-# 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 everything into the container
-#
 COPY . .
 
 #
@@ -60,16 +34,12 @@ RUN \. "$NVM_DIR/nvm.sh" && \
   nvm install $NODE_VERSION && \
   nvm use $NODE_VERSION && \
   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 && \
   npm install --global yarn && \
   yarn && \
-  yarn 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 && \
-  SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN SENTRY_RELEASE=$EXPO_PUBLIC_RELEASE_VERSION SENTRY_DIST=$EXPO_PUBLIC_BUNDLE_IDENTIFIER yarn build-web
+  yarn intl:build && \
+  EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() yarn build-web
 
 # DEBUG
 RUN find ./bskyweb/static && find ./web-build/static
@@ -89,7 +59,7 @@ RUN cd bskyweb/ && \
     -o /bskyweb \
     ./cmd/bskyweb
 
-FROM debian:bookworm-slim
+FROM debian:bullseye-slim
 
 ENV GODEBUG=netdns=go
 ENV TZ=Etc/UTC

Dockerfile.bskyogcard

@@ -26,9 +26,8 @@ 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

Dockerfile.embedr

@@ -1,11 +1,11 @@
-FROM golang:1.25-bookworm AS build-env
+FROM golang:1.22-bullseye AS build-env
 
 WORKDIR /usr/src/social-app
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Node
-ENV NODE_VERSION=20
+ENV NODE_VERSION=18
 ENV NVM_DIR=/usr/share/nvm
 
 # Go
@@ -40,7 +40,6 @@ RUN find ./bskyweb/embedr-static && find ./bskyweb/embedr-templates && find ./bs
 
 # hack around issue with empty directory and go:embed
 RUN touch bskyweb/static/js/empty.txt
-RUN touch bskyweb/static/css/empty.txt
 RUN touch bskyweb/static/media/empty.txt
 
 #
@@ -58,7 +57,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

@@ -20,7 +20,7 @@ build-web-embed: ## Compile web embed bundle, copy to bskyweb/embedr* directorie
 
 .PHONY: test
 test: ## Run all tests
-	NODE_ENV=test yarn test
+	NODE_ENV=test EXPO_PUBLIC_ENV=test yarn test
 
 .PHONY: lint
 lint: ## Run style checks and verify syntax
@@ -37,6 +37,6 @@ deps: ## Installs dependent libs using 'yarn install'
 
 .PHONY: nvm-setup
 nvm-setup: ## Use NVM to install and activate node+yarn
-	nvm install 20
-	nvm use 20
+	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,33 +3,28 @@ 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"
 - tapOn:
     id: "composeFAB"
 - inputText: "Post with an image"
 - tapOn:
-    id: "openMediaBtn"
-- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
-- tapOn: "Content warnings"
-- tapOn: "Porn"
+    id: "openGalleryBtn"
+- tapOn:
+    id: "labelsBtn"
+- tapOn:
+    label: "Tap on porn"
+    point: 78%,67%
 - tapOn:
     label: "Tap on confirm"
-    id: "confirmBtn"
+    point: 51%,92%
 - tapOn:
     id: "composerPublishBtn"
 - tapOn:
     id: "e2eRefreshHome"
-- assertVisible: "Adult Content"
+- assertVisible: "Adult Content"

__e2e__/flows/composer.yml

@@ -3,17 +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"
-
-- assertVisible:
-    id: "composeFAB"
 - tapOn:
     id: "composeFAB"
 - inputText: "Post text only"
@@ -25,10 +19,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 +44,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:
@@ -72,7 +60,7 @@ appId: xyz.blueskyweb.app
     id: "repostBtn"
 - tapOn:
     id: "quoteBtn"
-- inputText: "QP text only"
+- inputText: "QP text only"   
 - tapOn:
     id: "composerPublishBtn"
 - assertVisible:
@@ -83,10 +71,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,118 @@ 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: "People"
+- tapOn: "Save"
+- assertNotVisible:
+    id: "createOrEditListModal"
+- tapOn: "About"
 - 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"
+- assertVisible: "This list is empty!"
 
+- 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: "People"
+- tapOn: "Save"
+- assertNotVisible:
+    id: "createOrEditListModal"
+- tapOn: "About"
 - assertVisible: "Good Ppl"
 - assertVisible: "They good"
-- tapOn: "People"
+- tapOn: "About"
 
-- tapOn: "Start adding people"
-- tapOn: "Search"
+- tapOn:
+    label: "Adds users on curatelists from the list"
+    id: "addUserBtn"
+- assertVisible:
+    id: "listAddUserModal"
+- tapOn:
+    id: "searchInput"
 - inputText: "b"
 - pressKey: Enter
-- tapOn: "Add user to list"
-- swipe:
-    direction: DOWN
-- assertVisible: "View Bob's profile"
+- tapOn:
+    id: "user-bob.test-addBtn"
+- tapOn:
+    id: "doneBtn"
+- assertNotVisible:
+    id: "listAddUserModal"
+- assertVisible:
+    id: "user-bob.test"
 
 - tapOn: "Posts"
 - assertVisible:
@@ -123,18 +145,26 @@ appId: xyz.blueskyweb.app
     id: "e2eGotoLists"
 - tapOn: "Good Ppl"
 
-- tapOn: "People"
-- assertVisible: "View Bob's profile"
+- tapOn: "About"
+- assertVisible:
+    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:
+    id: "searchTextInput"
 - inputText: "bob"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"

__e2e__/flows/feed-reorder.yml

@@ -11,12 +11,18 @@ appId: xyz.blueskyweb.app
 
 # Pin alice's feed
 - extendedWaitUntil:
-    visible: "Open drawer menu"
-- tapOn: "Open drawer menu"
+    visible:
+        id: "viewHeaderDrawerBtn"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "profileCardButton"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
 - tapOn:
-    id: "profilePager-selector-5"
+    id: "profilePager-selector-4"
 - tapOn: "alice-favs"
 - tapOn: "Pin to Home"
 - tapOn:
@@ -30,18 +36,19 @@ appId: xyz.blueskyweb.app
     text: "alice-favs"
 
 # Set alice-favs first
-- tapOn: "Open drawer menu"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "menuItemButton-Feeds"
-- tapOn:
+- tapOn: 
     id: "editFeedsBtn"
 - tapOn:
     label: "Tap on down arrow"
-    id: "feed-timeline-moveDown"
+    point: "79%,23%"
 - tapOn:
-      label: "Save button"
-      id: "saveChangesBtn"
-- tapOn: "Go back"
+    id: "viewHeaderDrawerBtn"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - assertVisible:
     id: "homeScreenFeedTabs-selector-0"
     text: "alice-favs"
@@ -50,18 +57,19 @@ appId: xyz.blueskyweb.app
     text: "Following"
 
 # Set following first
-- tapOn: "Open drawer menu"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "menuItemButton-Feeds"
-- tapOn:
+- tapOn: 
     id: "editFeedsBtn"
 - tapOn:
     label: "Tap on down arrow"
-    id: "feed-feed-moveDown"
+    point: "79%,23%"
 - tapOn:
-    label: "Save button"
-    id: "saveChangesBtn"
-- tapOn: "Go back"
+    id: "viewHeaderDrawerBtn"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - assertVisible:
     id: "homeScreenFeedTabs-selector-0"
     text: "Following"
@@ -70,18 +78,19 @@ appId: xyz.blueskyweb.app
     text: "alice-favs"
 
 # Remove following
-- tapOn: "Open drawer menu"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "menuItemButton-Feeds"
-- tapOn:
+- tapOn: 
     id: "editFeedsBtn"
 - tapOn:
     label: "Tap on unpin"
-    id: "feed-timeline-togglePin"
+    point: "91%,23%"
 - tapOn:
-      label: "Save button"
-      id: "saveChangesBtn"
-- tapOn: "Go back"
+    id: "viewHeaderDrawerBtn"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - assertVisible:
     id: "homeScreenFeedTabs-selector-0"
     text: "alice-favs"

__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 ✨"
@@ -20,16 +20,18 @@ appId: xyz.blueskyweb.app
 - tapOn:
     label: "Feeds button disappears after pinning a feed"
     id: "bottomBarProfileBtn"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
 - tapOn:
-    id: "profilePager-selector-5"
+    id: "profilePager-selector-4"
 - tapOn: "alice-favs"
 - tapOn: "Pin to Home"
 - tapOn:
     id: "bottomBarHomeBtn"
 - tapOn:
-    id: "bottomBarHomeBtn"
-- tapOn:
-    id: "bottomBarHomeBtn"
+    id: "viewHeaderDrawerBtn"
 - assertNotVisible: "Feeds ✨"
 
 - tapOn:
@@ -50,6 +52,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

@@ -9,7 +9,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "e2eOpenLoggedOutView"
 - tapOn: "Sign in"
-- tapOn:
+- tapOn: 
     id: "selectServiceButton"
 - tapOn: "Custom"
 - tapOn:
@@ -23,7 +23,4 @@ appId: xyz.blueskyweb.app
     id: "loginPasswordInput"
 - inputText: "hunter2"
 - pressKey: Enter
-- tapOn:
-    text: "Not Now"
-    optional: true
-- assertVisible: "Following"
+- assertVisible: "Following"

__e2e__/flows/mod-lists.yml

@@ -3,41 +3,43 @@ 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:
     id: "e2eGotoModeration"
 - tapOn:
     id: "moderationlistsBtn"
-- tapOn: "New list"
+- tapOn: "New"
 - 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"
+# toggle mute subscription
+- tapOn:
+    point: "70%,9%"
 - tapOn: "Mute accounts"
 - tapOn: "Mute list"
 - tapOn: "Unmute"
 
-- tapOn: "Subscribe to this list"
+# toggle block subscription
+- tapOn:
+    point: "70%,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%"
+    point: "16%,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

@@ -17,6 +17,21 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "bottomBarProfileBtn"
 
+# Can see feeds
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
+- tapOn:
+    id: "profilePager-selector-4"
+- assertVisible: "alice-favs"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: RIGHT
+- tapOn:
+    id: "profilePager-selector-0"
+
 # Open and close edit profile modal
 - tapOn:
     id: "profileHeaderEditProfileButton"
@@ -78,13 +93,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,11 @@ 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:
+    id: "searchTextInput"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"
@@ -25,8 +26,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 +37,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,32 +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"
-- 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"
+- tapOn:
+    id: "searchTextInput"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"
 - assertVisible:
     id: "profileView"
+

__e2e__/flows/shared-prefs.yml

@@ -8,14 +8,7 @@ appId: xyz.blueskyweb.app
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
-- assertVisible:
-    id: "storybookBtn"
-- tapOn:
-    id: "storybookBtn"
+- tapOn: "/sys/debug"
 - tapOn:
     id: "sharedPrefsTestOpenBtn"
 - tapOn:
@@ -23,7 +16,7 @@ appId: xyz.blueskyweb.app
 - assertVisible: "Hello"
 - tapOn:
     id: "removeStringBtn"
-- assertVisible: "undefined"
+- assertVisible: "null"
 - tapOn:
     id: "setBoolBtn"
 - assertVisible: "true"

__e2e__/flows/thread-muting.yml

@@ -3,18 +3,14 @@ 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:
     id: "composeFAB"
 - inputText: "Test thread"
@@ -22,13 +18,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 +27,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 +38,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 +59,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

@@ -1,7 +1,7 @@
 import {createServer as createHTTPServer} from 'node:http'
 import {parse} from 'node:url'
 
-import {createServer, type TestPDS} from '../jest/test-pds'
+import {createServer, TestPDS} from '../jest/test-pds'
 
 async function main() {
   let server: TestPDS
@@ -181,10 +181,10 @@ async function main() {
             'warn-profile',
             'warn-posts',
             'muted-account',
-            'muted-by-list-acc',
+            'muted-by-list-account',
             'blocking-account',
             'blockedby-account',
-            'mutual-block-acc',
+            'mutual-block-account',
           ]) {
             await server.mocker.createUser(user)
             await server.mocker.follow('alice', user)
@@ -411,16 +411,16 @@ async function main() {
           await server.mocker.addToMuteList(
             'alice',
             list,
-            server.mocker.users['muted-by-list-acc'].did,
+            server.mocker.users['muted-by-list-account'].did,
           )
-          await server.mocker.createPost('muted-by-list-acc', 'muted post')
+          await server.mocker.createPost('muted-by-list-account', 'muted post')
           await server.mocker.createQuotePost(
-            'muted-by-list-acc',
+            'muted-by-list-account',
             'account quote post',
             anchorPost,
           )
           await server.mocker.createReply(
-            'muted-by-list-acc',
+            'muted-by-list-account',
             'account reply',
             anchorPost,
           )
@@ -470,16 +470,16 @@ async function main() {
           )
 
           await server.mocker.createPost(
-            'mutual-block-acc',
+            'mutual-block-account',
             'mutual-block post',
           )
           await server.mocker.createQuotePost(
-            'mutual-block-acc',
+            'mutual-block-account',
             'mutual-block quote post',
             anchorPost,
           )
           await server.mocker.createReply(
-            'mutual-block-acc',
+            'mutual-block-account',
             'mutual-block reply',
             anchorPost,
           )
@@ -488,15 +488,15 @@ async function main() {
               repo: server.mocker.users.alice.did,
             },
             {
-              subject: server.mocker.users['mutual-block-acc'].did,
+              subject: server.mocker.users['mutual-block-account'].did,
               createdAt: new Date().toISOString(),
             },
           )
           await server.mocker.users[
-            'mutual-block-acc'
+            'mutual-block-account'
           ].agent.app.bsky.graph.block.create(
             {
-              repo: server.mocker.users['mutual-block-acc'].did,
+              repo: server.mocker.users['mutual-block-account'].did,
             },
             {
               subject: server.mocker.users.alice.did,
@@ -509,16 +509,7 @@ async function main() {
         }
       }
       console.log('Ready')
-      return res
-        .writeHead(200, {
-          'content-type': 'application/json',
-        })
-        .end(
-          JSON.stringify({
-            pdsUrl: server.pdsUrl,
-            appviewDid: server.appviewDid,
-          }),
-        )
+      return res.writeHead(200).end(server.pdsUrl)
     } catch (e) {
       console.error('Error!', e)
       return res.writeHead(500).end()

__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,18 +1,11 @@
 appId: xyz.blueskyweb.app
 ---
 - launchApp:
-    appId: "xyz.blueskyweb.app"
-    clearState: true
+   appId: "xyz.blueskyweb.app"
+   clearState: true
 - waitForAnimationToEnd
 - tapOn: "http://localhost:8081"
 - waitForAnimationToEnd
-- extendedWaitUntil:
-    visible: "Continue"
 - swipe:
-    from: "Bluesky"
-    direction: DOWN
-    duration: 100
-- tapOn:
-    id: e2eProxyHeaderInput
-- inputText: ${output.result}
-- pressKey: Enter
+   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__/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-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: ''}))

__tests__/lib/__mocks__/exampleComHtml.ts

@@ -0,0 +1,47 @@
+export const exampleComHtml = `<!doctype html>
+<html>
+<head>
+    <title>Example Domain</title>
+    <meta name="description" content="An example website">
+
+    <meta charset="utf-8" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style type="text/css">
+    body {
+        background-color: #f0f0f2;
+        margin: 0;
+        padding: 0;
+        font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+
+    }
+    div {
+        width: 600px;
+        margin: 5em auto;
+        padding: 2em;
+        background-color: #fdfdff;
+        border-radius: 0.5em;
+        box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);
+    }
+    a:link, a:visited {
+        color: #38488f;
+        text-decoration: none;
+    }
+    @media (max-width: 700px) {
+        div {
+            margin: 0 auto;
+            width: auto;
+        }
+    }
+    </style>
+</head>
+
+<body>
+<div>
+    <h1>Example Domain</h1>
+    <p>This domain is for use in illustrative examples in documents. You may use this
+    domain in literature without prior coordination or asking for permission.</p>
+    <p><a href="https://www.iana.org/domains/example">More information...</a></p>
+</div>
+</body>
+</html>`

__tests__/lib/email.test.ts

@@ -1,82 +0,0 @@
-import {describe, expect, it} from '@jest/globals'
-import tldts from 'tldts'
-
-import {isEmailMaybeInvalid} from '#/lib/strings/email'
-
-describe('emailTypoChecker', () => {
-  const invalidCases = [
-    'gnail.com',
-    'gnail.co',
-    'gmaill.com',
-    'gmaill.co',
-    'gmai.com',
-    'gmai.co',
-    'gmal.com',
-    'gmal.co',
-    'gmail.co',
-    'iclod.com',
-    'iclod.co',
-    'outllok.com',
-    'outllok.co',
-    'outlook.co',
-    'yaoo.com',
-    'yaoo.co',
-    'yaho.com',
-    'yaho.co',
-    'yahooo.com',
-    'yahooo.co',
-    'yahoo.co',
-    'hithere.jul',
-    'agpowj.notshop',
-    'thisisnot.avalid.tld.nope',
-    // old tld for czechoslovakia
-    'czechoslovakia.cs',
-    // tlds that cbs was registering in 2024 but cancelled
-    'liveon.cbs',
-    'its.showtime',
-  ]
-  const validCases = [
-    'gmail.com',
-    // subdomains (tests end of string)
-    'gnail.com.test.com',
-    'outlook.com',
-    'yahoo.com',
-    'icloud.com',
-    'firefox.com',
-    'firefox.co',
-    'hello.world.com',
-    'buy.me.a.coffee.shop',
-    'mayotte.yt',
-    'aland.ax',
-    'bouvet.bv',
-    'uk.gb',
-    'chad.td',
-    'somalia.so',
-    'plane.aero',
-    'cute.cat',
-    'together.coop',
-    'findme.jobs',
-    'nightatthe.museum',
-    'industrial.mil',
-    'czechrepublic.cz',
-    'lovakia.sk',
-    // new gtlds in 2024
-    'whatsinyour.locker',
-    'letsmakea.deal',
-    'skeet.now',
-    'everyone.みんな',
-    'bourgeois.lifestyle',
-    'california.living',
-    'skeet.ing',
-    'listeningto.music',
-    'createa.meme',
-  ]
-
-  it.each(invalidCases)(`should be invalid: abcde@%s`, domain => {
-    expect(isEmailMaybeInvalid(`abcde@${domain}`, tldts)).toEqual(true)
-  })
-
-  it.each(validCases)(`should be valid: abcde@%s`, domain => {
-    expect(isEmailMaybeInvalid(`abcde@${domain}`, tldts)).toEqual(false)
-  })
-})

__tests__/lib/errors.test.ts

@@ -9,11 +9,11 @@ describe('isNetworkError', () => {
   ]
   const outputs = [true, false, false, true]
 
-  for (let i = 0; i < inputs.length; i++) {
-    const input = inputs[i]
-    const output = outputs[i]
-    it(`correctly distinguishes network errors for ${input}`, () => {
-      expect(isNetworkError(input)).toEqual(output)
-    })
-  }
+  it('correctly distinguishes network errors', () => {
+    for (let i = 0; i < inputs.length; i++) {
+      const input = inputs[i]
+      const result = isNetworkError(input)
+      expect(result).toEqual(outputs[i])
+    }
+  })
 })

__tests__/lib/extractHtmlMeta.test.ts

@@ -0,0 +1,134 @@
+import {extractHtmlMeta} from '../../src/lib/link-meta/html'
+import {exampleComHtml} from './__mocks__/exampleComHtml'
+import {youtubeHTML} from './__mocks__/youtubeHtml'
+import {tiktokHtml} from './__mocks__/tiktokHtml'
+import {youtubeChannelHtml} from './__mocks__/youtubeChannelHtml'
+
+describe('extractHtmlMeta', () => {
+  const cases = [
+    ['', {}],
+    ['nothing', {}],
+    ['<title>title</title>', {title: 'title'}],
+    ['<title> aSd!@#AC </title>', {title: 'aSd!@#AC'}],
+    ['<title>\n  title\n  </title>', {title: 'title'}],
+    ['<meta name="title" content="meta title">', {title: 'meta title'}],
+    [
+      '<meta name="description" content="meta description">',
+      {description: 'meta description'},
+    ],
+    ['<meta property="og:title" content="og title">', {title: 'og title'}],
+    [
+      '<meta property="og:description" content="og description">',
+      {description: 'og description'},
+    ],
+    [
+      '<meta property="og:image" content="https://ogimage.com/foo.png">',
+      {image: 'https://ogimage.com/foo.png'},
+    ],
+    [
+      '<meta property="twitter:title" content="twitter title">',
+      {title: 'twitter title'},
+    ],
+    [
+      '<meta property="twitter:description" content="twitter description">',
+      {description: 'twitter description'},
+    ],
+    [
+      '<meta property="twitter:image" content="https://twitterimage.com/foo.png">',
+      {image: 'https://twitterimage.com/foo.png'},
+    ],
+    ['<meta\n  name="title"\n  content="meta title"\n>', {title: 'meta title'}],
+  ]
+
+  it.each(cases)(
+    'given the html tag %p, returns %p',
+    // @ts-ignore not worth fixing -prf
+    (input, expectedResult) => {
+      const output = extractHtmlMeta({html: input as string, hostname: ''})
+      expect(output).toEqual(expectedResult)
+    },
+  )
+
+  it('extracts title and description from a generic HTML page', () => {
+    const input = exampleComHtml
+    const expectedOutput = {
+      title: 'Example Domain',
+      description: 'An example website',
+    }
+    const output = extractHtmlMeta({html: input, hostname: 'example.com'})
+    expect(output).toEqual(expectedOutput)
+  })
+
+  it('extracts title and description from a Tiktok HTML page', () => {
+    const input = tiktokHtml
+    const expectedOutput = {
+      title:
+        'Coca-Cola and Mentos! Super Reaction! #cocacola #mentos #reaction #bal... | TikTok',
+      description:
+        '5.5M Likes, 20.8K Comments. TikTok video from Power Vision Tests (@_powervision_): &quot;Coca-Cola and Mentos! Super Reaction! #cocacola #mentos #reaction #balloon #sciencemoment #scienceexperiment #experiment #test #amazing #pvexp&quot;.  оригинальный звук - Power Vision Tests.',
+    }
+    const output = extractHtmlMeta({html: input, hostname: 'tiktok.com'})
+    expect(output).toEqual(expectedOutput)
+  })
+
+  it('extracts title and description from a generic youtube page', () => {
+    const input = youtubeHTML
+    const expectedOutput = {
+      title: 'HD Video (1080p) with Relaxing Music of Native American Shamans',
+      description:
+        'Stunning HD Video ( 1080p ) of Patagonian Nature with Relaxing Native American Shamanic Music. HD footage used from ',
+      image: 'https://i.ytimg.com/vi/x6UITRjhijI/sddefault.jpg',
+    }
+    const output = extractHtmlMeta({html: input, hostname: 'youtube.com'})
+    expect(output).toEqual(expectedOutput)
+  })
+
+  it('extracts avatar from a youtube channel', () => {
+    const input = youtubeChannelHtml
+    const expectedOutput = {
+      title: 'penguinz0',
+      description:
+        'Clips channel: https://www.youtube.com/channel/UC4EQHfzIbkL_Skit_iKt1aA\n\nTwitter:     https://twitter.com/MoistCr1TiKaL\n\nInstagram:    https://www.instagram.com/bigmoistcr1tikal/?hl=en\n\nTwitch: https://www.twitch.tv/moistcr1tikal\n\nSnapchat: Hugecharles\n\nTik Tok: Hugecharles\n\nI don&#39;t have any other public accounts.',
+      image:
+        'https://yt3.googleusercontent.com/ytc/AL5GRJWOhJOuUC6C2b7gP-5D2q6ypXbcOOckyAE1En4RUQ=s176-c-k-c0x00ffffff-no-rj',
+    }
+    const output = extractHtmlMeta({html: input, hostname: 'youtube.com'})
+    expect(output).toEqual(expectedOutput)
+  })
+
+  it('extracts username from the url a twitter profile page', () => {
+    const expectedOutput = {
+      title: '@bluesky on Twitter',
+    }
+    const output = extractHtmlMeta({
+      html: '',
+      hostname: 'twitter.com',
+      pathname: '/bluesky',
+    })
+    expect(output).toEqual(expectedOutput)
+  })
+
+  it('extracts username from the url a tweet', () => {
+    const expectedOutput = {
+      title: 'Tweet by @bluesky',
+    }
+    const output = extractHtmlMeta({
+      html: '',
+      hostname: 'twitter.com',
+      pathname: '/bluesky/status/1582437529969917953',
+    })
+    expect(output).toEqual(expectedOutput)
+  })
+
+  it("does not extract username from the url when it's not a tweet or profile page", () => {
+    const expectedOutput = {
+      title: 'Twitter',
+    }
+    const output = extractHtmlMeta({
+      html: '',
+      hostname: 'twitter.com',
+      pathname: '/i/articles/follows/-1675653703?time_window=24',
+    })
+    expect(output).toEqual(expectedOutput)
+  })
+})

__tests__/lib/images.test.ts

@@ -1,29 +1,26 @@
-import {createDownloadResumable, deleteAsync} from 'expo-file-system/legacy'
-import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
+import ImageResizer from '@bam.tech/react-native-image-resizer'
+import RNFetchBlob from 'rn-fetch-blob'
 
 import {
   downloadAndResize,
-  type DownloadAndResizeOpts,
-  getResizedDimensions,
+  DownloadAndResizeOpts,
 } from '../../src/lib/media/manip'
 
-const mockResizedImage = {
-  path: 'file://resized-image.jpg',
-  size: 100,
-  width: 100,
-  height: 100,
-  mime: 'image/jpeg',
-}
-
 describe('downloadAndResize', () => {
   const errorSpy = jest.spyOn(global.console, 'error')
 
+  const mockResizedImage = {
+    path: jest.fn().mockReturnValue('file://resized-image.jpg'),
+    size: 100,
+    width: 50,
+    height: 50,
+    mime: 'image/jpeg',
+  }
+
   beforeEach(() => {
-    const mockedCreateResizedImage = manipulateAsync as jest.Mock
-    mockedCreateResizedImage.mockResolvedValue({
-      uri: 'file://resized-image.jpg',
-      ...mockResizedImage,
-    })
+    const mockedCreateResizedImage =
+      ImageResizer.createResizedImage as jest.Mock
+    mockedCreateResizedImage.mockResolvedValue(mockResizedImage)
   })
 
   afterEach(() => {
@@ -31,12 +28,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,24 +46,25 @@ describe('downloadAndResize', () => {
 
     const result = await downloadAndResize(opts)
     expect(result).toEqual(mockResizedImage)
-    expect(createDownloadResumable).toHaveBeenCalledWith(
-      opts.uri,
-      expect.anything(),
-      {
-        cache: true,
-      },
-    )
-
-    // First time it gets called is to get dimensions
-    expect(manipulateAsync).toHaveBeenCalledWith(expect.any(String), [], {})
-    expect(manipulateAsync).toHaveBeenCalledWith(
-      expect.any(String),
-      [{resize: {height: opts.height, width: opts.width}}],
-      {format: SaveFormat.JPEG, compress: 1.0},
-    )
-    expect(deleteAsync).toHaveBeenCalledWith(expect.any(String), {
-      idempotent: true,
+    expect(RNFetchBlob.config).toHaveBeenCalledWith({
+      fileCache: true,
+      appendExt: 'jpeg',
     })
+    expect(RNFetchBlob.fetch).toHaveBeenCalledWith(
+      'GET',
+      'https://example.com/image.jpg',
+    )
+    expect(ImageResizer.createResizedImage).toHaveBeenCalledWith(
+      'file://downloaded-image.jpg',
+      100,
+      100,
+      'JPEG',
+      100,
+      undefined,
+      undefined,
+      undefined,
+      {mode: 'cover'},
+    )
   })
 
   it('should return undefined for invalid URI', async () => {
@@ -85,43 +82,65 @@ describe('downloadAndResize', () => {
     expect(result).toBeUndefined()
   })
 
-  it('should not downsize whenever dimensions are below the max dimensions', () => {
-    const initialDimensionsOne = {
-      width: 1200,
-      height: 1000,
-    }
-    const resizedDimensionsOne = getResizedDimensions(initialDimensionsOne)
+  it('should return undefined for unsupported file type', async () => {
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image'),
+      info: jest.fn().mockReturnValue({status: 200}),
+      flush: jest.fn(),
+    })
 
-    const initialDimensionsTwo = {
-      width: 1000,
-      height: 1200,
+    const opts: DownloadAndResizeOpts = {
+      uri: 'https://example.com/image',
+      width: 100,
+      height: 100,
+      maxSize: 500000,
+      mode: 'cover',
+      timeout: 10000,
     }
-    const resizedDimensionsTwo = getResizedDimensions(initialDimensionsTwo)
 
-    expect(resizedDimensionsOne).toEqual(initialDimensionsOne)
-    expect(resizedDimensionsTwo).toEqual(initialDimensionsTwo)
+    const result = await downloadAndResize(opts)
+    expect(result).toEqual(mockResizedImage)
+    expect(RNFetchBlob.config).toHaveBeenCalledWith({
+      fileCache: true,
+      appendExt: 'jpeg',
+    })
+    expect(RNFetchBlob.fetch).toHaveBeenCalledWith(
+      'GET',
+      'https://example.com/image',
+    )
+    expect(ImageResizer.createResizedImage).toHaveBeenCalledWith(
+      'file://downloaded-image',
+      100,
+      100,
+      'JPEG',
+      100,
+      undefined,
+      undefined,
+      undefined,
+      {mode: 'cover'},
+    )
   })
 
-  it('should resize dimensions and maintain aspect ratio if they are above the max dimensons', () => {
-    const initialDimensionsOne = {
-      width: 3000,
-      height: 1500,
-    }
-    const resizedDimensionsOne = getResizedDimensions(initialDimensionsOne)
-
-    const initialDimensionsTwo = {
-      width: 2000,
-      height: 4000,
-    }
-    const resizedDimensionsTwo = getResizedDimensions(initialDimensionsTwo)
-
-    expect(resizedDimensionsOne).toEqual({
-      width: 2000,
-      height: 1000,
-    })
-    expect(resizedDimensionsTwo).toEqual({
-      width: 1000,
-      height: 2000,
+  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()
   })
 })

__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,12 +1,11 @@
 import {RichText} from '@atproto/api'
 
-import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player'
+import {parseEmbedPlayerFromUrl} from 'lib/strings/embed-player'
 import {
   createStarterPackGooglePlayUri,
   createStarterPackLinkFromAndroidReferrer,
   parseStarterPackUri,
-} from '#/lib/strings/starter-pack'
-import {tenorUrlToBskyGifUrl} from '#/state/queries/tenor'
+} 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'
@@ -336,10 +335,8 @@ describe('shortenLinks', () => {
 describe('parseEmbedPlayerFromUrl', () => {
   const inputs = [
     'https://youtu.be/videoId',
-    'https://youtu.be/videoId?t=1s',
     'https://www.youtube.com/watch?v=videoId',
     'https://www.youtube.com/watch?v=videoId&feature=share',
-    'https://www.youtube.com/watch?v=videoId&t=1s',
     'https://youtube.com/watch?v=videoId',
     'https://youtube.com/watch?v=videoId&feature=share',
     'https://youtube.com/shorts/videoId',
@@ -378,7 +375,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',
@@ -445,11 +441,6 @@ describe('parseEmbedPlayerFromUrl', () => {
       source: 'youtube',
       playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
     },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=1',
-    },
     {
       type: 'youtube_video',
       source: 'youtube',
@@ -460,11 +451,6 @@ describe('parseEmbedPlayerFromUrl', () => {
       source: 'youtube',
       playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
     },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=1',
-    },
     {
       type: 'youtube_video',
       source: 'youtube',
@@ -605,11 +591,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',
@@ -957,20 +938,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)
   })
 
@@ -1004,18 +985,3 @@ describe('createStarterPackGooglePlayUri', () => {
     expect(createStarterPackGooglePlayUri(undefined, 'rkey')).toEqual(null)
   })
 })
-
-describe('tenorUrlToBskyGifUrl', () => {
-  const inputs = [
-    'https://media.tenor.com/someID_AAAAC/someName.gif',
-    'https://media.tenor.com/someID/someName.gif',
-  ]
-
-  it.each(inputs)(
-    'returns url with t.gifs.bsky.app as hostname for input url',
-    input => {
-      const out = tenorUrlToBskyGifUrl(input)
-      expect(out.startsWith('https://t.gifs.bsky.app/')).toEqual(true)
-    },
-  )
-})

__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,28 @@
-// @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 SPLASH_CONFIG = {
+  backgroundColor: '#ffffff',
+  image: './assets/splash.png',
+  resizeMode: 'cover',
+}
+const DARK_SPLASH_CONFIG = {
+  backgroundColor: '#001429',
+  image: './assets/splash-dark.png',
+  resizeMode: 'cover',
+}
+
+const SPLASH_CONFIG_ANDROID = {
+  backgroundColor: '#0c7cff',
+  image: './assets/splash.png',
+  resizeMode: 'cover',
+}
+const DARK_SPLASH_CONFIG_ANDROID = {
+  backgroundColor: '#0f141b',
+  image: './assets/splash-dark.png',
+  resizeMode: 'cover',
+}
+
+module.exports = function (config) {
   /**
    * App version number. Should be incremented as part of a release cycle.
    */
@@ -16,11 +33,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_DEV = process.env.EXPO_PUBLIC_ENV === 'development'
   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 ASSOCIATED_DOMAINS = [
     'applinks:bsky.app',
@@ -31,9 +48,16 @@ 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 SENTRY_DIST = `${PLATFORM}.${VERSION}.${IS_TESTFLIGHT ? 'tf' : ''}${
+    IS_DEV ? 'dev' : ''
+  }`
 
   return {
     expo: {
@@ -45,20 +69,18 @@ module.exports = function (_config) {
       runtimeVersion: {
         policy: 'appVersion',
       },
-      icon: './assets/app-icons/ios_icon_default_next.png',
+      orientation: 'portrait',
+      icon: './assets/icon.png',
       userInterfaceStyle: 'automatic',
+      splash: SPLASH_CONFIG,
+      // hsl(211, 99%, 53%), same as palette.default.brandText
       primaryColor: '#1083fe',
-      newArchEnabled: false,
       ios: {
         supportsTablet: false,
         bundleIdentifier: 'xyz.blueskyweb.app',
         config: {
           usesNonExemptEncryption: false,
         },
-        icon:
-          PLATFORM === 'web' // web build doesn't like .icon files
-            ? './assets/app-icons/ios_icon_default_next.png'
-            : './assets/app-icons/ios_icon_default.icon',
         infoPlist: {
           UIBackgroundModes: ['remote-notification'],
           NSCameraUsageDescription:
@@ -69,87 +91,16 @@ module.exports = function (_config) {
             'Used to save images to your library.',
           NSPhotoLibraryUsageDescription:
             'Used for profile pictures, posts, and other kinds of content',
-          CFBundleSpokenName: 'Blue Sky',
-          CFBundleLocalizations: [
-            'en',
-            'an',
-            'ast',
-            'ca',
-            'cy',
-            'da',
-            'de',
-            'el',
-            'eo',
-            'es',
-            'eu',
-            'fi',
-            'fr',
-            'fy',
-            'ga',
-            'gd',
-            'gl',
-            'hi',
-            'hu',
-            'ia',
-            'id',
-            'it',
-            'ja',
-            'km',
-            'ko',
-            'ne',
-            'nl',
-            'pl',
-            'pt-BR',
-            'pt-PT',
-            'ro',
-            'ru',
-            'sv',
-            'th',
-            'tr',
-            'uk',
-            'vi',
-            'yue',
-            'zh-Hans',
-            'zh-Hant',
-          ],
-          UIDesignRequiresCompatibility: true,
         },
         associatedDomains: ASSOCIATED_DOMAINS,
+        splash: {
+          ...SPLASH_CONFIG,
+          dark: DARK_SPLASH_CONFIG,
+        },
         entitlements: {
-          '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.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:
@@ -175,17 +126,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_CONFIG_ANDROID.backgroundColor,
       },
       android: {
-        icon: './assets/app-icons/android_icon_default_next.png',
+        icon: './assets/icon.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',
@@ -198,18 +152,18 @@ 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'],
           },
         ],
+        splash: {
+          ...SPLASH_CONFIG_ANDROID,
+          dark: DARK_SPLASH_CONFIG_ANDROID,
+        },
       },
       web: {
         favicon: './assets/favicon.png',
@@ -228,40 +182,24 @@ 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
-          ? [
-              /** @type {[string, any]} */ ([
-                '@sentry/react-native/expo',
-                {
-                  organization: 'blueskyweb',
-                  project: 'app',
-                  url: 'https://sentry.io',
-                },
-              ]),
-            ]
-          : []),
+        Boolean(process.env.SENTRY_AUTH_TOKEN) && 'sentry-expo',
         [
           'expo-build-properties',
           {
             ios: {
               deploymentTarget: '15.1',
-              buildReactNativeFromSource: true,
-              ccacheEnabled: IS_DEV,
+              newArchEnabled: false,
             },
             android: {
-              compileSdkVersion: 35,
-              targetSdkVersion: 35,
-              buildToolsVersion: '35.0.0',
-              buildReactNativeFromSource: IS_PRODUCTION,
+              compileSdkVersion: 34,
+              targetSdkVersion: 34,
+              buildToolsVersion: '34.0.0',
+              kotlinVersion: '1.8.0',
+              newArchEnabled: false,
             },
           },
         ],
@@ -274,144 +212,16 @@ module.exports = function (_config) {
           },
         ],
         'react-native-compressor',
-        [
-          '@bitdrift/react-native',
-          {
-            networkInstrumentation: true,
-          },
-        ],
         './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
-        './plugins/withGradleJVMHeapSizeIncrease.js',
-        './plugins/withAndroidManifestLargeHeapPlugin.js',
+        './plugins/withAndroidManifestPlugin.js',
         './plugins/withAndroidManifestFCMIconPlugin.js',
-        './plugins/withAndroidManifestIntentQueriesPlugin.js',
+        './plugins/withAndroidStylesWindowBackgroundPlugin.js',
         './plugins/withAndroidStylesAccentColorPlugin.js',
-        './plugins/withAndroidDayNightThemePlugin.js',
-        './plugins/withAndroidNoJitpackPlugin.js',
+        './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',
         './plugins/shareExtension/withShareExtensions.js',
         './plugins/notificationsExtension/withNotificationsExtension.js',
-        [
-          'expo-font',
-          {
-            fonts: [
-              './assets/fonts/inter/InterVariable.woff2',
-              './assets/fonts/inter/InterVariable-Italic.woff2',
-              // 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',
-            ],
-          },
-        ],
-        [
-          'expo-splash-screen',
-          {
-            ios: {
-              enableFullScreenImage_legacy: true, // iOS only
-              backgroundColor: '#006AFF', // primary_500
-              image: './assets/splash/splash.png',
-              resizeMode: 'cover',
-              dark: {
-                enableFullScreenImage_legacy: true, // iOS only
-                backgroundColor: '#002861', // primary_900
-                image: './assets/splash/splash-dark.png',
-                resizeMode: 'cover',
-              },
-            },
-            android: {
-              backgroundColor: '#006AFF', // primary_500
-              image: './assets/splash/android-splash-logo-white.png',
-              imageWidth: 102, // even division of 306px
-              dark: {
-                backgroundColor: '#002861', // primary_900
-                image: './assets/splash/android-splash-logo-white.png',
-                imageWidth: 102,
-              },
-            },
-          },
-        ],
-        [
-          '@mozzius/expo-dynamic-app-icon',
-          {
-            /**
-             * Default set
-             */
-            default_light: {
-              ios: './assets/app-icons/ios_icon_legacy_light.png',
-              android: './assets/app-icons/android_icon_legacy_light.png',
-              prerendered: true,
-            },
-            default_dark: {
-              ios: './assets/app-icons/ios_icon_legacy_dark.png',
-              android: './assets/app-icons/android_icon_legacy_dark.png',
-              prerendered: true,
-            },
-
-            /**
-             * Bluesky+ core set
-             */
-            core_aurora: {
-              ios: './assets/app-icons/ios_icon_core_aurora.png',
-              android: './assets/app-icons/android_icon_core_aurora.png',
-              prerendered: true,
-            },
-            core_bonfire: {
-              ios: './assets/app-icons/ios_icon_core_bonfire.png',
-              android: './assets/app-icons/android_icon_core_bonfire.png',
-              prerendered: true,
-            },
-            core_sunrise: {
-              ios: './assets/app-icons/ios_icon_core_sunrise.png',
-              android: './assets/app-icons/android_icon_core_sunrise.png',
-              prerendered: true,
-            },
-            core_sunset: {
-              ios: './assets/app-icons/ios_icon_core_sunset.png',
-              android: './assets/app-icons/android_icon_core_sunset.png',
-              prerendered: true,
-            },
-            core_midnight: {
-              ios: './assets/app-icons/ios_icon_core_midnight.png',
-              android: './assets/app-icons/android_icon_core_midnight.png',
-              prerendered: true,
-            },
-            core_flat_blue: {
-              ios: './assets/app-icons/ios_icon_core_flat_blue.png',
-              android: './assets/app-icons/android_icon_core_flat_blue.png',
-              prerendered: true,
-            },
-            core_flat_white: {
-              ios: './assets/app-icons/ios_icon_core_flat_white.png',
-              android: './assets/app-icons/android_icon_core_flat_white.png',
-              prerendered: true,
-            },
-            core_flat_black: {
-              ios: './assets/app-icons/ios_icon_core_flat_black.png',
-              android: './assets/app-icons/android_icon_core_flat_black.png',
-              prerendered: true,
-            },
-            core_classic: {
-              ios: './assets/app-icons/ios_icon_core_classic.png',
-              android: './assets/app-icons/android_icon_core_classic.png',
-              prerendered: true,
-            },
-          },
-        ],
-        ['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.',
-          },
-        ],
-      ],
+        './plugins/withAppDelegateReferrer.js',
+      ].filter(Boolean),
       extra: {
         eas: {
           build: {
@@ -447,6 +257,22 @@ module.exports = function (_config) {
           projectId: '55bd077a-d905-4184-9c7f-94789ba0f302',
         },
       },
+      hooks: {
+        postPublish: [
+          /*
+           * @see https://docs.expo.dev/guides/using-sentry/#app-configuration
+           */
+          {
+            file: 'sentry-expo/upload-sourcemaps',
+            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"
-  }
-}