actually specify @types/react@19, remove need for transitive dep

fix rebase mistake
update @types/react
2025-06-10 22:45:58 +03:00 · 2025-06-10 22:44:42 +03:00 · 2025-06-10 22:34:30 +03:00 · 2025-06-10 22:34:30 +03:00 · 2025-06-10 22:34:22 +03:00 · 2025-06-10 22:34:22 +03:00
1291 changed files with 156631 additions and 280964 deletions
@@ -1,41 +1,8 @@
-# The env the app is running in e.g. development, testflight, production
-EXPO_PUBLIC_ENV=development
+# Copy this to `.env` and `.env.test` files

-# This is the semver release version of the app, pulled from package.json
-EXPO_PUBLIC_RELEASE_VERSION=
-
-# This is the commit hash that the current bundle was made from.
-EXPO_PUBLIC_BUNDLE_IDENTIFIER=
-
-# Should be formatted YYMMDDHH so that it increases for each build.
-EXPO_PUBLIC_BUNDLE_DATE=0
-
-# The log level for the app's logger transports
+BITDRIFT_API_KEY=
+SENTRY_AUTH_TOKEN=
 EXPO_PUBLIC_LOG_LEVEL=debug
-
-# Enable debug logs for specific logger instances
-EXPO_PUBLIC_LOG_DEBUG=session
-
-# Bluesky appview DID
-EXPO_PUBLIC_BLUESKY_PROXY_DID=
-
-# Chat service DID
-EXPO_PUBLIC_CHAT_PROXY_DID=
-
-#
-#
-# Bluesky specific values
-#
-#
-
-# Sentry DSN for telemetry
-EXPO_PUBLIC_SENTRY_DSN=
-
-# Bitdrift API key. If undefined, Bitdrift will be disabled.
-EXPO_PUBLIC_BITDRIFT_API_KEY=
-
-# bapp-config web worker URL
-BAPP_CONFIG_DEV_URL=
-
-# Dev-only passthrough value for bapp-config web worker
-BAPP_CONFIG_DEV_BYPASS_SECRET=
+EXPO_PUBLIC_LOG_DEBUG=
+EXPO_PUBLIC_BUNDLE_IDENTIFIER=
+EXPO_PUBLIC_BUNDLE_DATE=0
@@ -34,16 +34,12 @@ module.exports = {
          'P',
          'Admonition',
          'Admonition.Admonition',
-          'Toast.Action',
-          'AgeAssuranceAdmonition',
          'Span',
-          'StackedButton',
        ],
        impliedTextProps: [],
        suggestedTextWrappers: {
          Button: 'ButtonText',
          'ToggleButton.Button': 'ToggleButton.ButtonText',
-          'SegmentedControl.Item': 'SegmentedControl.ItemText',
        },
      },
    ],
@@ -90,7 +86,7 @@ module.exports = {
    'no-unused-vars': 'off',
    '@typescript-eslint/no-unused-vars': [
      'error',
-      {argsIgnorePattern: '^_', varsIgnorePattern: '^_.+'},
+      {argsIgnorePattern: '^_', varsIgnorePattern: '^_'},
    ],
    '@typescript-eslint/consistent-type-imports': [
      'warn',
@@ -113,8 +109,6 @@ module.exports = {
    'bskyembed',
    'src/locale/locales/_build/',
    'src/locale/locales/**/*.js',
-    '*.e2e.ts',
-    '*.e2e.tsx',
  ],
  settings: {
    componentWrapperFunctions: ['observer'],
@@ -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,12 @@ jobs:
          tags: |
            type=sha,enable=true,priority=100,prefix=,suffix=,format=long

-      - name: Env
-        id: env
+      - name: Set outputs
+        id: vars
        run: |
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT

      - name: Build and push Docker image
        id: build-and-push
@@ -61,8 +62,8 @@ 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 }}
+            EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.vars.outputs.sha_short }}
+            SENTRY_DIST=${{ steps.vars.outputs.SENTRY_DIST }}
+            SENTRY_RELEASE=${{ steps.vars.outputs.SENTRY_RELEASE }}
            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
+            SENTRY_DSN=${{ secrets.SENTRY_DSN }}
@@ -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
@@ -3,7 +3,6 @@ on:
  push:
    branches:
      - main
-      - echoprom_fix

 env:
  REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -22,7 +21,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Setup Docker buildx
        uses: docker/setup-buildx-action@v1
@@ -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 }}
@@ -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 }}
@@ -13,9 +13,8 @@ on:

 jobs:
  build:
-    if: github.repository == 'bluesky-social/social-app'
    name: Build and Submit Android
-    runs-on: Linux-x64-32core
+    runs-on: ubuntu-latest
    steps:
      - name: Check for EXPO_TOKEN
        run: >
@@ -30,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
@@ -39,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
@@ -50,11 +49,11 @@ 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
@@ -62,31 +61,23 @@ jobs:
      - name: Check for i18n compilation errors
        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi

-      # EXPO_PUBLIC_ENV is handled in eas.json
-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
        run: |
          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

+      - name: Setup Sentry vars for build-time injection
+        id: sentry
+        run: |
+          echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
+
      - 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 ${{ inputs.profile || 'testflight-android' }}
-          --local --output build.aab --non-interactive
+        run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} 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' }}
@@ -96,7 +87,7 @@ jobs:
        id: timestamp
        uses: nanzm/get-time-action@master
        with:
-          format: "MM-DD-HH-mm-ss"
+          format: 'MM-DD-HH-mm-ss'

      - name: 🚀 Upload Production Artifact
        id: upload-artifact-production
@@ -146,21 +137,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: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} 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
@@ -187,11 +166,11 @@ jobs:
      - name: ⬇️ Restore Cache
        id: get-base-commit
        uses: actions/cache@v4
-        if: ${{ inputs.profile == 'testflight-android' }}
+        if: ${{ inputs.profile == 'testflight' }}
        with:
          path: most-recent-testflight-commit.txt
          key: most-recent-testflight-commit

      - name: ✏️ Write commit hash to cache
-        if: ${{ inputs.profile == 'testflight-android' }}
+        if: ${{ inputs.profile == 'testflight' }}
        run: echo ${{ github.sha }} > most-recent-testflight-commit.txt
@@ -13,9 +13,8 @@ on:

 jobs:
  build:
-    if: github.repository == 'bluesky-social/social-app'
    name: Build and Submit iOS
-    runs-on: macos-26-xlarge
+    runs-on: macos-15
    steps:
      - name: Check for EXPO_TOKEN
        run: >
@@ -30,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
@@ -39,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
@@ -49,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: '16.2'

      - 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
@@ -75,52 +74,25 @@ jobs:
      - name: Check for i18n compilation errors
        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi

-      # EXPO_PUBLIC_ENV is handled in eas.json
      - name: ✏️ Write environment variables
-        id: env
        run: |
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json

-      - name: 🏗️ EAS Build
-        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 ${{ inputs.profile || 'testflight' }}
-          --local --output build.tar.gz --non-interactive
-
-      - name: 📂 Extract build artifact
+      - name: Setup Sentry vars for build-time injection
+        id: sentry
        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
+          echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
+
+      - name: 🏗️ EAS Build
+        run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} 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
@@ -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:
@@ -55,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
@@ -86,7 +85,7 @@ jobs:
        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
@@ -101,31 +100,25 @@ jobs:
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
        uses: dcarbone/install-jq-action@v2

-      # eas.json not used here, set EXPO_PUBLIC_ENV
-      - name: Env
-        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=${{ inputs.channel || '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_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
+          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

+      - name: Setup Sentry vars for build-time injection
+        id: sentry
+        run: |
+          echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
+
      - 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: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export

      - name: 📦 Package Bundle and 🚀 Deploy
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
@@ -150,14 +143,14 @@ jobs:
  # GitHub actions are horrible so let's just copy paste this in
  buildIfNecessaryIOS:
    name: Build and Submit iOS
-    runs-on: macos-26
+    runs-on: macos-15
    concurrency:
      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-ios
      cancel-in-progress: true
    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: >
@@ -172,13 +165,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
@@ -188,19 +181,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: '16.2'

      - 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
@@ -211,30 +204,16 @@ 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 "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json

      - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          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
@@ -260,7 +239,7 @@ jobs:
    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
@@ -276,13 +255,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
@@ -293,46 +272,32 @@ 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 "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

      - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          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
@@ -7,7 +7,7 @@ on:
      - main

 concurrency:
-  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
+  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
  cancel-in-progress: true

 jobs:
@@ -15,11 +15,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Git Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Set up Go tooling
        uses: actions/setup-go@v3
        with:
-          go-version: "1.25"
+          go-version: '1.23'
      - name: Dummy Static Files
        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
      - name: Check
@@ -32,11 +32,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Git Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Set up Go tooling
        uses: actions/setup-go@v3
        with:
-          go-version: "1.25"
+          go-version: '1.23'
      - name: Dummy Static Files
        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
      - name: Lint
@@ -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,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:
@@ -42,12 +41,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:
@@ -1,7 +1,7 @@
 name: Nightly Update Source Languages
 on:
  schedule:
-    - cron: "0 2 * * *" # run at 2 AM UTC
+    - cron: '0 2 * * *' # run at 2 AM UTC
  workflow_dispatch:

 jobs:
@@ -16,14 +16,13 @@ jobs:

    steps:
      - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          ssh-key: ${{secrets.GH_ACTION_DEPLOY_KEY}}
      - 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:
@@ -47,4 +46,4 @@ jobs:
          push_sources: false
          create_pull_request: false
        env:
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
@@ -1,209 +0,0 @@
---
-name: PR Comment Trigger
-
-on:
-  issue_comment:
-    types: [created]
-
-# Permissiosn to make comments in the pull request
-permissions:
-  pull-requests: write
-  actions: write
-  contents: read
-
-jobs:
-  handle-comment:
-    if: github.event.issue.pull_request
-    runs-on: ubuntu-latest
-    outputs:
-      should-deploy: ${{ steps.check-org.outputs.result }}
-
-    steps:
-      - name: Check if bot is mentioned
-        id: check-mention
-        env:
-          COMMENT: ${{ github.event.comment.body }}
-        run: |
-          if [[ "$COMMENT" == *"@github-actions"* ]] || \
-             [[ "$COMMENT" == *"github-actions[bot]"* ]]; then
-            bot_mentioned=true
-          else
-            bot_mentioned=false
-          fi
-
-
-          if [[ "${{ github.event.comment.body }}" == *"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
-        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: ${{ github.event.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
-        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-${{ github.event.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) 🤖*
@@ -29,7 +29,7 @@ jobs:
          fetch-depth: 0

      - name: 🔧 Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
        with:
          node-version-file: .nvmrc
          cache: yarn
@@ -50,7 +50,6 @@ jobs:
          git config --global user.name "github-actions[bot]"
          git merge --no-edit ${{ github.head_ref }}
          yarn install
-          yarn intl:build

      - name: 🔦 Generate stats file for PR
        run: |
@@ -74,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

@@ -82,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"
+          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
@@ -110,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
@@ -145,3 +143,4 @@ jobs:
        with:
          header: fingerprint-diff
          delete: true
+
@@ -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
@@ -3,7 +3,7 @@ name: Lockfile
 on:
  pull_request:
 concurrency:
-  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
+  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
  cancel-in-progress: true

 jobs:
@@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out PR HEAD
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0

@@ -20,7 +20,7 @@ jobs:
        run: git fetch origin ${{ github.base_ref }} --depth=1

      - name: Install node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
        with:
          node-version-file: .nvmrc

@@ -58,7 +58,6 @@ buck-out/
 # Ruby / CocoaPods
 /ios/Pods/
 /vendor/bundle/
-Gemfile.lock

 # Testing
 coverage/
@@ -119,8 +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
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"

-npx lint-staged --concurrent false
+npx lint-staged
@@ -1,4 +1,4 @@
-FROM golang:1.25-bookworm AS build-env
+FROM golang:1.23-bullseye AS build-env

 WORKDIR /usr/src/social-app

@@ -19,28 +19,28 @@ 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}
+
+# The latest git hash of the preview branch on render.com
+ARG RENDER_GIT_COMMIT

 #
 # Sentry
 #
 ARG SENTRY_AUTH_TOKEN
 ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-unknown}
-ARG EXPO_PUBLIC_SENTRY_DSN
-ENV EXPO_PUBLIC_SENTRY_DSN=$EXPO_PUBLIC_SENTRY_DSN
+# Will fall back to package.json#version, but this is handled elsewhere
+ARG SENTRY_RELEASE
+ENV SENTRY_RELEASE=$SENTRY_RELEASE
+ARG SENTRY_DIST
+# Default to RENDER_GIT_COMMIT if not set by GitHub workflows
+ENV SENTRY_DIST=${SENTRY_DIST:-$RENDER_GIT_COMMIT}
+ARG SENTRY_DSN
+ENV SENTRY_DSN=$SENTRY_DSN

 #
 # Copy everything into the container
@@ -60,16 +60,13 @@ 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
+  EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN SENTRY_RELEASE=$SENTRY_RELEASE SENTRY_DIST=$SENTRY_DIST SENTRY_DSN=$SENTRY_DSN yarn build-web

 # DEBUG
 RUN find ./bskyweb/static && find ./web-build/static
@@ -89,7 +86,7 @@ RUN cd bskyweb/ && \
    -o /bskyweb \
    ./cmd/bskyweb

-FROM debian:bookworm-slim
+FROM debian:bullseye-slim

 ENV GODEBUG=netdns=go
 ENV TZ=Etc/UTC
@@ -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
@@ -1,4 +1,4 @@
-FROM golang:1.25-bookworm AS build-env
+FROM golang:1.23-bullseye AS build-env

 WORKDIR /usr/src/social-app

@@ -58,7 +58,7 @@ RUN cd bskyweb/ && \
    -o /embedr \
    ./cmd/embedr

-FROM debian:bookworm-slim
+FROM debian:bullseye-slim

 ENV GODEBUG=netdns=go
 ENV TZ=Etc/UTC
@@ -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:**
@@ -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!
@@ -3,26 +3,20 @@ appId: xyz.blueskyweb.app
 - runScript:
    file: ../setupServer.js
    env:
-      SERVER_PATH: ?users
+        SERVER_PATH: ?users
 - runFlow:
    file: ../setupApp.yml
 - tapOn:
    id: "e2eSignInAlice"
- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"

 # Post an image with the porn label
 - assertVisible:
-    id: "composeFAB"
+      id: "composeFAB"
 - tapOn:
    id: "composeFAB"
 - inputText: "Post with an image"
 - tapOn:
-    id: "openMediaBtn"
- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn: "Content warnings"
 - tapOn: "Porn"
 - tapOn:
@@ -3,17 +3,13 @@ appId: xyz.blueskyweb.app
 - runScript:
    file: ../setupServer.js
    env:
-      SERVER_PATH: ?users
+        SERVER_PATH: ?users
 - runFlow:
    file: ../setupApp.yml
 - tapOn:
    id: "e2eSignInAlice"
- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
-
 - assertVisible:
-    id: "composeFAB"
+      id: "composeFAB"
 - tapOn:
    id: "composeFAB"
 - inputText: "Post text only"
@@ -25,10 +21,7 @@ appId: xyz.blueskyweb.app
    id: "composeFAB"
 - inputText: "Post with an image"
 - tapOn:
-    id: "openMediaBtn"
- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn:
    id: "composerPublishBtn"
 - assertVisible:
@@ -53,10 +46,7 @@ appId: xyz.blueskyweb.app
    id: "replyBtn"
 - inputText: "Reply with an image"
 - tapOn:
-    id: "openMediaBtn"
- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn:
    id: "composerPublishBtn"
 - assertVisible:
@@ -83,10 +73,7 @@ appId: xyz.blueskyweb.app
    id: "quoteBtn"
 - inputText: "QP with an image"
 - tapOn:
-    id: "openMediaBtn"
- extendedWaitUntil:
-    visible:
-      id: "selectedPhotosView"
+    id: "openGalleryBtn"
 - tapOn:
    id: "composerPublishBtn"
 - assertVisible:
@@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app
 - runScript:
    file: ../setupServer.js
    env:
-      SERVER_PATH: ""
+        SERVER_PATH: ""
 - runFlow:
    file: ../setupApp.yml
 - tapOn:
@@ -25,25 +25,11 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "passwordInput"
 - inputText: "hunter22"
- tapOn:
-    # hideKeyboard on ios is borked
-    # https://docs.maestro.dev/troubleshooting/known-issues#hidekeyboard-command-is-flaky
-    text: "Your account"
+- hideKeyboard
 - tapOn:
    id: "nextBtn"
- 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"
+- tapOn: "Not now"
 - inputText: "e2e-test"
- extendedWaitUntil:
-    visible:
-      id: "handleAvailableCheck"
 - tapOn:
    id: "nextBtn"
- assertVisible: "Give your profile a face"
+
@@ -3,83 +3,95 @@ appId: xyz.blueskyweb.app
 - runScript:
    file: ../setupServer.js
    env:
-      SERVER_PATH: "?users&follows&posts"
+        SERVER_PATH: "?users&follows&posts"
 - runFlow:
    file: ../setupApp.yml
 - tapOn:
    id: "e2eSignInAlice"
- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"

 - tapOn:
    label: "Create a curate list"
    id: "e2eGotoLists"
 - tapOn:
    id: "newUserListBtn"
- waitForAnimationToEnd
- assertVisible: "Create user list"
+- assertVisible:
+    id: "createOrEditListModal"
 - tapOn:
-    id: "editListNameInput"
+    id: "editNameInput"
 - inputText: "Good Ppl"
 - tapOn:
-    id: "editListDescriptionInput"
+    id: "editDescriptionInput"
 - inputText: "They good"
 - tapOn: "Save"
- assertNotVisible: "Create user list"
+- tapOn: "Save"
+- assertNotVisible:
+    id: "createOrEditListModal"
 - tapOn: "People"
 - assertVisible: "Good Ppl"
 - assertVisible: "They good"

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

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

 - tapOn:
-    id: "moreOptionsBtn"
+    label: "Delete the curatelist"
+    point: "90%,9%"
 - tapOn: "Delete List"
 - tapOn:
    id: "confirmBtn"

+- tapOn:
+    label: "Create a new curatelist"
+    id: "e2eGotoLists"
+- tapOn:
+    id: "newUserListBtn"
 - assertVisible:
-    id: "newUserListBtn"
+    id: "createOrEditListModal"
 - tapOn:
-    id: "newUserListBtn"
- assertVisible: "Create user list"
- tapOn:
-    id: "editListNameInput"
+    id: "editNameInput"
 - inputText: "Good Ppl"
 - tapOn:
-    id: "editListDescriptionInput"
+    id: "editDescriptionInput"
 - inputText: "They good"
 - tapOn: "Save"
- assertNotVisible: "Create user list"
+- tapOn: "Save"
+- assertNotVisible:
+    id: "createOrEditListModal"
 - tapOn: "People"
 - assertVisible: "Good Ppl"
 - assertVisible: "They good"
@@ -123,7 +135,7 @@ appId: xyz.blueskyweb.app
    id: "e2eGotoLists"
 - tapOn: "Good Ppl"

- tapOn: "People"
+# - tapOn: "People"
 - assertVisible: "View Bob's profile"
 - tapOn:
    point: "90%,43%"
@@ -134,7 +146,7 @@ appId: xyz.blueskyweb.app

 - tapOn:
    id: "bottomBarSearchBtn"
- tapOn: "Search for posts, users[,]? or feeds"
+- tapOn: "Search for posts, users, or feeds"
 - inputText: "bob"
 - tapOn:
    id: "searchAutoCompleteResult-bob.test"
@@ -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 ✨"
@@ -50,6 +50,6 @@ appId: xyz.blueskyweb.app
    label: "Can delete posts"
    id: "postDropdownBtn"
    childOf:
-      id: "feedItem-by-alice.test"
+        id: "feedItem-by-alice.test"
 - tapOn: "Delete post"
 - tapOn: "Delete"
@@ -23,7 +23,5 @@ appId: xyz.blueskyweb.app
    id: "loginPasswordInput"
 - inputText: "hunter2"
 - pressKey: Enter
- tapOn:
-    text: "Not Now"
-    optional: true
+- tapOn: "Not now"
 - assertVisible: "Following"
@@ -3,14 +3,11 @@ appId: xyz.blueskyweb.app
 - runScript:
    file: ../setupServer.js
    env:
-      SERVER_PATH: "?users&follows&labels"
+        SERVER_PATH: "?users&follows&labels"
 - runFlow:
    file: ../setupApp.yml
 - tapOn:
    id: "e2eSignInAlice"
- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"

 # create a modlist
 - tapOn:
@@ -19,25 +16,32 @@ appId: xyz.blueskyweb.app
    id: "moderationlistsBtn"
 - tapOn: "New list"
 - tapOn:
-    id: "editListNameInput"
+    id: "editNameInput"
 - inputText: "Muted Users"
 - tapOn:
-    id: "editListDescriptionInput"
+    id: "editDescriptionInput"
 - inputText: "Shhh"
 - tapOn: "Save"
+- tapOn: "Save"

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

- tapOn: "Subscribe to this list"
+- tapOn:
+    label: "Dropdown"
+    point: "71%,9%"
+
 - tapOn: "Mute accounts"
 - tapOn: "Mute list"
 - tapOn: "Unmute"

- tapOn: "Subscribe to this list"
+- tapOn:
+      label: "Dropdown"
+      point: "71%,9%"
+
 - tapOn: "Block accounts"
 - tapOn: "Block list"
 - tapOn: "Unblock"

-  # the rest of the behaviors are tested in curate-lists.yml
+ # the rest of the behaviors are tested in curate-lists.yml
@@ -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%"
@@ -3,44 +3,27 @@ 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"
+- assertVisible: "Search your library…"
 - tapOn:
    point: "50%,22%"
 - waitForAnimationToEnd
 - 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%"
@@ -3,22 +3,18 @@ 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:
    id: "postDropdownBtn"
    index: 0
 - tapOn:
    id: "postDropdownReportBtn"
- tapOn: "Create report for Misleading"
- tapOn: "Create report for Spam"
+- tapOn: "Create report for Misleading Post"
 - tapOn: "Send report to Dev-env Moderation"
 - tapOn:
    point: "50%,90%"
@@ -3,7 +3,7 @@ appId: xyz.blueskyweb.app
 - runScript:
    file: ../setupServer.js
    env:
-      SERVER_PATH: "?users&posts&feeds"
+        SERVER_PATH: "?users&posts&feeds"
 - runFlow:
    file: ../setupApp.yml
 - tapOn:
@@ -12,10 +12,10 @@ appId: xyz.blueskyweb.app
 # Navigate to another user profile
 - extendedWaitUntil:
    visible:
-      id: "bottomBarSearchBtn"
+        id: "bottomBarSearchBtn"
 - tapOn:
    id: "bottomBarSearchBtn"
- tapOn: "Search for posts, users[,]? or feeds"
+- tapOn: "Search for posts, users, or feeds"
 - inputText: "b"
 - tapOn:
    id: "searchAutoCompleteResult-bob.test"
@@ -25,8 +25,6 @@ appId: xyz.blueskyweb.app
 # Can follow/unfollow another user
 - tapOn:
    id: "followBtn"
- tapOn:
-    point: 65%,35% # dismiss the subscribe prompt
 - tapOn:
    id: "unfollowBtn"

@@ -38,4 +36,4 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "profileHeaderDropdownBtn"
 - tapOn: "Unmute Account"
- assertNotVisible: "Account Muted"
+- assertNotVisible: "Account Muted"
@@ -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:
@@ -15,11 +15,9 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "profileHeaderDropdownReportBtn"
 - tapOn:
-    id: "report:category:Misleading"
- tapOn:
-    id: "report:option:Spam"
+    id: "report:option:com.atproto.moderation.defs#reasonSpam"
 - assertVisible:
-    text: "Send report to Dev-env Moderation"
+    id: "report:labeler:mod-authority.test"
 - tapOn:
    id: "report:submit"
 - assertNotVisible:
@@ -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:
@@ -15,11 +15,9 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "postDropdownReportBtn"
 - tapOn:
-    id: "report:category:Misleading"
- tapOn:
-    id: "report:option:Spam"
+    id: "report:option:com.atproto.moderation.defs#reasonSpam"
 - assertVisible:
-    text: "Send report to Dev-env Moderation"
+    id: "report:labeler:mod-authority.test"
 - tapOn:
    id: "report:submit"
 - assertNotVisible:
@@ -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:
@@ -15,28 +15,20 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "postDropdownReportBtn"
 - tapOn:
-    id: "report:category:Misleading"
- tapOn:
-    id: "report:option:Other misleading content"
+    id: "report:option:com.atproto.moderation.defs#reasonOther"
 - assertVisible:
-    text: Your report will be sent to Dev-env Moderation.*
+    id: "report:labeler:mod-authority.test"
 # reason "other" defaults with details open
 - assertVisible:
    id: "report:details"
 - tapOn:
-    id: "report:clearReportOption"
+    id: "report:clearOption"
 - 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"
+    id: "report:option:com.atproto.moderation.defs#reasonSpam"
 - assertVisible:
-    text: Your report will be sent to Dev-env Moderation.*
+    id: "report:labeler:mod-authority.test"
 - tapOn:
    id: "report:submit"
 - assertNotVisible:
@@ -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:
@@ -15,11 +15,9 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "postDropdownReportBtn"
 - tapOn:
-    id: "report:category:Misleading"
- tapOn:
-    id: "report:option:Other misleading content"
+    id: "report:option:com.atproto.moderation.defs#reasonOther"
 - assertVisible:
-    text: "Send report to Dev-env Moderation"
+    id: "report:labeler:mod-authority.test"
 # reason "other" defaults with details open
 - assertVisible:
    id: "report:details"
@@ -3,22 +3,20 @@ appId: xyz.blueskyweb.app
 - runScript:
    file: ../setupServer.js
    env:
-      SERVER_PATH: "?users"
+        SERVER_PATH: "?users"
 - runFlow:
    file: ../setupApp.yml
 - tapOn:
    id: "e2eSignInAlice"

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

 # Login, create a thread, and log out
 - tapOn:
    id: "e2eSignInAlice"
- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - assertVisible:
    id: "composeFAB"
 - tapOn:
@@ -22,15 +19,8 @@ appId: xyz.blueskyweb.app
    id: "composerPublishBtn"

 # Login, reply to the thread, and log out
- tapOn:
-    id: "e2eSignOut"
 - tapOn:
    id: "e2eSignInBob"
- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
- tapOn:
-    id: "replyBtn"
 - tapOn:
    id: "replyBtn"
 - inputText: "Reply 1"
@@ -38,13 +28,8 @@ appId: xyz.blueskyweb.app
    id: "composerPublishBtn"

 # Login, confirm notification exists, mute thread, and log out
- tapOn:
-    id: "e2eSignOut"
 - tapOn:
    id: "e2eSignInAlice"
- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
    id: "bottomBarNotificationsBtn"
 - assertVisible:
@@ -54,25 +39,18 @@ 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:
    id: "profilePager-selector-1"
 - tapOn:
    id: "replyBtn"
- tapOn:
-    id: "replyBtn"
 - inputText: "Reply 2"
 - tapOn:
    id: "composerPublishBtn"
@@ -82,35 +60,24 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "composerPublishBtn"

-# Login, confirm notifications dont exist, unmute the thread, ~~confirm notifications exist~~
-# Mute thread behaviour no longer change old notifications after muting/unmuting a thread -sfn
- tapOn:
-    id: "e2eSignOut"
+
+# Login, confirm notifications dont exist, unmute the thread, confirm notifications exist
 - tapOn:
    id: "e2eSignInAlice"
- extendedWaitUntil:
-    visible:
-      id: "viewHeaderHomeFeedPrefsBtn"
 - tapOn:
    id: "bottomBarNotificationsBtn"
- assertVisible: ".*Reply 1.*"
- assertNotVisible: ".*Reply 2.*"
- assertNotVisible: ".*Reply 3.*"
- assertVisible:
+- assertNotVisible:
    id: "feedItem-by-bob.test"
 - tapOn:
-    id: "feedItem-by-bob.test"
+    id: "bottomBarHomeBtn"
 - tapOn:
    id: "postDropdownBtn"
-    childOf:
-      id: "postThreadItem-by-bob.test"
 - tapOn: "Unmute thread"
 - tapOn:
    id: "bottomBarNotificationsBtn"
 - swipe:
    from:
-      id: "notifsFeed"
+        id: "notifsFeed"
    direction: DOWN
- assertVisible: ".*Reply 1.*"
- assertNotVisible: ".*Reply 2.*"
- assertNotVisible: ".*Reply 3.*"
+- assertVisible:
+    id: "feedItem-by-bob.test"
@@ -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()
@@ -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"
@@ -1,18 +1,13 @@
 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
@@ -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
@@ -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,
 }

@@ -1,9 +1,10 @@
-import {createDownloadResumable, deleteAsync} from 'expo-file-system/legacy'
+import {deleteAsync} from 'expo-file-system'
 import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
+import RNFetchBlob from 'rn-fetch-blob'

 import {
  downloadAndResize,
-  type DownloadAndResizeOpts,
+  DownloadAndResizeOpts,
  getResizedDimensions,
 } from '../../src/lib/media/manip'

@@ -31,12 +32,11 @@ describe('downloadAndResize', () => {
  })

  it('should return resized image for valid URI and options', async () => {
-    const mockedFetch = createDownloadResumable as jest.Mock
-    mockedFetch.mockReturnValue({
-      cancelAsync: jest.fn(),
-      downloadAsync: jest
-        .fn()
-        .mockResolvedValue({uri: 'file://resized-image.jpg'}),
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image.jpg'),
+      info: jest.fn().mockReturnValue({status: 200}),
+      flush: jest.fn(),
    })

    const opts: DownloadAndResizeOpts = {
@@ -50,12 +50,13 @@ describe('downloadAndResize', () => {

    const result = await downloadAndResize(opts)
    expect(result).toEqual(mockResizedImage)
-    expect(createDownloadResumable).toHaveBeenCalledWith(
-      opts.uri,
-      expect.anything(),
-      {
-        cache: true,
-      },
+    expect(RNFetchBlob.config).toHaveBeenCalledWith({
+      fileCache: true,
+      appendExt: 'jpeg',
+    })
+    expect(RNFetchBlob.fetch).toHaveBeenCalledWith(
+      'GET',
+      'https://example.com/image.jpg',
    )

    // First time it gets called is to get dimensions
@@ -85,6 +86,28 @@ describe('downloadAndResize', () => {
    expect(result).toBeUndefined()
  })

+  it('should return undefined for non-200 response', async () => {
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image'),
+      info: jest.fn().mockReturnValue({status: 400}),
+      flush: jest.fn(),
+    })
+
+    const opts: DownloadAndResizeOpts = {
+      uri: 'https://example.com/image',
+      width: 100,
+      height: 100,
+      maxSize: 500000,
+      mode: 'cover',
+      timeout: 10000,
+    }
+
+    const result = await downloadAndResize(opts)
+    expect(errorSpy).not.toHaveBeenCalled()
+    expect(result).toBeUndefined()
+  })
+
  it('should not downsize whenever dimensions are below the max dimensions', () => {
    const initialDimensionsOne = {
      width: 1200,
@@ -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 () => {
@@ -6,7 +6,6 @@ import {
  createStarterPackLinkFromAndroidReferrer,
  parseStarterPackUri,
 } from '#/lib/strings/starter-pack'
-import {tenorUrlToBskyGifUrl} from '#/state/queries/tenor'
 import {cleanError} from '../../src/lib/strings/errors'
 import {createFullHandle, makeValidHandle} from '../../src/lib/strings/handles'
 import {enforceLen} from '../../src/lib/strings/helpers'
@@ -378,7 +377,6 @@ describe('parseEmbedPlayerFromUrl', () => {
    'https://music.apple.com/us/playlist/playlistName/playlistId',
    'https://music.apple.com/us/album/albumName/albumId',
    'https://music.apple.com/us/album/albumName/albumId?i=songId',
-    'https://music.apple.com/us/song/songName/songId',

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

    {
      type: 'vimeo_video',
@@ -1004,18 +997,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)
-    },
-  )
-})
@@ -1,4 +1,4 @@
-import {type IsValidHandle, validateServiceHandle} from '#/lib/strings/handles'
+import {IsValidHandle, validateServiceHandle} from '#/lib/strings/handles'

 describe('handle validation', () => {
  const valid = [
@@ -18,17 +18,17 @@ describe('handle validation', () => {
  })

  const invalid = [
-    ['al', 'bsky.social', 'frontLengthNotTooShort'],
+    ['al', 'bsky.social', 'frontLength'],
    ['-alice', 'bsky.social', 'hyphenStartOrEnd'],
    ['alice-', 'bsky.social', 'hyphenStartOrEnd'],
    ['%%%', 'bsky.social', 'handleChars'],
-    ['1234567890123456789', 'bsky.social', 'frontLengthNotTooLong'],
+    ['1234567890123456789', 'bsky.social', 'frontLength'],
    [
      '1234567890123456789',
      'my-custom-pds-with-long-name.social',
-      'frontLengthNotTooLong',
+      'frontLength',
    ],
-    ['al', 'my-custom-pds-with-long-name.social', 'frontLengthNotTooShort'],
+    ['al', 'my-custom-pds-with-long-name.social', 'frontLength'],
    ['a'.repeat(300), 'toolong.com', 'totalLength'],
  ] satisfies [string, string, keyof IsValidHandle][]
  it.each(invalid)(
@@ -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)(
@@ -11,7 +11,7 @@ module.exports = function (_config) {
   *
   * @see https://docs.expo.dev/build-reference/variables/#built-in-environment-variables
   */
-  const PLATFORM = process.env.EAS_BUILD_PLATFORM ?? 'web'
+  const PLATFORM = process.env.EAS_BUILD_PLATFORM

  const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
  const IS_PRODUCTION = process.env.EXPO_PUBLIC_ENV === 'production'
@@ -26,7 +26,12 @@ 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)

@@ -40,20 +45,15 @@ module.exports = function (_config) {
      runtimeVersion: {
        policy: 'appVersion',
      },
-      icon: './assets/app-icons/ios_icon_default_next.png',
+      icon: './assets/app-icons/ios_icon_default_light.png',
      userInterfaceStyle: 'automatic',
      primaryColor: '#1083fe',
-      newArchEnabled: false,
      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:
@@ -107,7 +107,6 @@ module.exports = function (_config) {
            'zh-Hans',
            'zh-Hant',
          ],
-          UIDesignRequiresCompatibility: true,
        },
        associatedDomains: ASSOCIATED_DOMAINS,
        entitlements: {
@@ -116,34 +115,6 @@ module.exports = function (_config) {
          'com.apple.security.application-groups': 'group.app.bsky',
        },
        privacyManifests: {
-          NSPrivacyCollectedDataTypes: [
-            {
-              NSPrivacyCollectedDataType: 'NSPrivacyCollectedDataTypeCrashData',
-              NSPrivacyCollectedDataTypeLinked: false,
-              NSPrivacyCollectedDataTypeTracking: false,
-              NSPrivacyCollectedDataTypePurposes: [
-                'NSPrivacyCollectedDataTypePurposeAppFunctionality',
-              ],
-            },
-            {
-              NSPrivacyCollectedDataType:
-                'NSPrivacyCollectedDataTypePerformanceData',
-              NSPrivacyCollectedDataTypeLinked: false,
-              NSPrivacyCollectedDataTypeTracking: false,
-              NSPrivacyCollectedDataTypePurposes: [
-                'NSPrivacyCollectedDataTypePurposeAppFunctionality',
-              ],
-            },
-            {
-              NSPrivacyCollectedDataType:
-                'NSPrivacyCollectedDataTypeOtherDiagnosticData',
-              NSPrivacyCollectedDataTypeLinked: false,
-              NSPrivacyCollectedDataTypeTracking: false,
-              NSPrivacyCollectedDataTypePurposes: [
-                'NSPrivacyCollectedDataTypePurposeAppFunctionality',
-              ],
-            },
-          ],
          NSPrivacyAccessedAPITypes: [
            {
              NSPrivacyAccessedAPIType:
@@ -175,11 +146,12 @@ module.exports = function (_config) {
        barStyle: 'light-content',
      },
      android: {
-        icon: './assets/app-icons/android_icon_default_next.png',
+        icon: './assets/app-icons/android_icon_default_light.png',
        adaptiveIcon: {
          foregroundImage: './assets/icon-android-foreground.png',
-          monochromeImage: './assets/icon-android-monochrome.png',
-          backgroundColor: '#006AFF',
+          monochromeImage: './assets/icon-android-foreground.png',
+          backgroundImage: './assets/icon-android-background.png',
+          backgroundColor: '#1185FE',
        },
        googleServicesFile: './google-services.json',
        package: 'xyz.blueskyweb.app',
@@ -218,6 +190,7 @@ module.exports = function (_config) {
            }
          : undefined,
        checkAutomatically: 'NEVER',
+        channel: UPDATES_CHANNEL,
      },
      plugins: [
        'expo-video',
@@ -240,12 +213,13 @@ module.exports = function (_config) {
          {
            ios: {
              deploymentTarget: '15.1',
-              buildReactNativeFromSource: true,
+              newArchEnabled: false,
            },
            android: {
              compileSdkVersion: 35,
              targetSdkVersion: 35,
              buildToolsVersion: '35.0.0',
+              newArchEnabled: false,
            },
          },
        ],
@@ -266,9 +240,8 @@ module.exports = function (_config) {
        ],
        './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
        './plugins/withGradleJVMHeapSizeIncrease.js',
-        './plugins/withAndroidManifestLargeHeapPlugin.js',
+        './plugins/withAndroidManifestPlugin.js',
        './plugins/withAndroidManifestFCMIconPlugin.js',
-        './plugins/withAndroidManifestIntentQueriesPlugin.js',
        './plugins/withAndroidStylesAccentColorPlugin.js',
        './plugins/withAndroidDayNightThemePlugin.js',
        './plugins/withAndroidNoJitpackPlugin.js',
@@ -283,12 +256,10 @@ module.exports = function (_config) {
              // Android only
              './assets/fonts/inter/Inter-Regular.otf',
              './assets/fonts/inter/Inter-Italic.otf',
-              './assets/fonts/inter/Inter-Medium.otf',
-              './assets/fonts/inter/Inter-MediumItalic.otf',
              './assets/fonts/inter/Inter-SemiBold.otf',
              './assets/fonts/inter/Inter-SemiBoldItalic.otf',
-              './assets/fonts/inter/Inter-Bold.otf',
-              './assets/fonts/inter/Inter-BoldItalic.otf',
+              './assets/fonts/inter/Inter-ExtraBold.otf',
+              './assets/fonts/inter/Inter-ExtraBoldItalic.otf',
            ],
          },
        ],
@@ -326,13 +297,13 @@ module.exports = function (_config) {
             * Default set
             */
            default_light: {
-              ios: './assets/app-icons/ios_icon_legacy_light.png',
-              android: './assets/app-icons/android_icon_legacy_light.png',
+              ios: './assets/app-icons/ios_icon_default_light.png',
+              android: './assets/app-icons/android_icon_default_light.png',
              prerendered: true,
            },
            default_dark: {
-              ios: './assets/app-icons/ios_icon_legacy_dark.png',
-              android: './assets/app-icons/android_icon_legacy_dark.png',
+              ios: './assets/app-icons/ios_icon_default_dark.png',
+              android: './assets/app-icons/android_icon_default_dark.png',
              prerendered: true,
            },

@@ -387,7 +358,6 @@ module.exports = function (_config) {
          },
        ],
        ['expo-screen-orientation', {initialOrientation: 'PORTRAIT_UP'}],
-        ['expo-location'],
      ].filter(Boolean),
      extra: {
        eas: {
@@ -1,31 +0,0 @@
-{
-  "fill" : {
-    "automatic-gradient" : "srgb:0.00000,0.41569,1.00000,1.00000"
-  },
-  "groups" : [
-    {
-      "layers" : [
-        {
-          "fill" : "none",
-          "glass" : false,
-          "image-name" : "iOS transparent.png",
-          "name" : "iOS transparent"
-        }
-      ],
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M15.793 10.293a1 1 0 0 1 1.338-.068l.076.068 3.293 3.293a2 2 0 0 1 .138 2.677l-.138.151-3.293 3.293a1 1 0 1 1-1.414-1.414L18.086 16H8a5 5 0 0 1-5-5V5a1 1 0 0 1 2 0v6a3 3 0 0 0 3 3h10.086l-2.293-2.293-.068-.076a1 1 0 0 1 .068-1.338Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16Zm-.63 3.225a1 1 0 0 1 1.337.068l3 3 .068.076a1 1 0 0 1-1.406 1.406l-.076-.068L13 10.414V16a1 1 0 1 1-2 0v-5.586l-1.293 1.293a1 1 0 1 1-1.414-1.414l3-3 .076-.068Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2a1 1 0 0 1 0 2 5.85 5.85 0 0 0-5.802 5.08L5.143 17h13.715l-.382-2.868-.01-.102a1 1 0 0 1 1.973-.262l.02.1.532 4a1 1 0 0 1-.99 1.132h-3.357c-.905 1.747-2.606 3-4.644 3s-3.74-1.253-4.643-3H4a1 1 0 0 1-.991-1.132l1.207-9.053A7.85 7.85 0 0 1 12 2ZM9.78 19c.61.637 1.397 1 2.22 1s1.611-.363 2.22-1H9.78ZM17 2.5a1 1 0 0 1 1 1V6h2.5a1 1 0 0 1 0 2H18v2.5a1 1 0 0 1-2 0V8h-2.5a1 1 0 1 1 0-2H16V3.5a1 1 0 0 1 1-1Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2a7.854 7.854 0 0 1 7.784 6.815l1.207 9.053a1 1 0 0 1-.99 1.132h-3.354c-.904 1.748-2.608 3-4.647 3-2.038 0-3.742-1.252-4.646-3H4a1.002 1.002 0 0 1-.991-1.132l1.207-9.053A7.85 7.85 0 0 1 12 2ZM9.78 19c.608.637 1.398 1 2.221 1s1.613-.363 2.222-1H9.779ZM3.193 2.104a1 1 0 0 1 1.53 1.288A9.5 9.5 0 0 0 2.72 7.464a1 1 0 0 1-1.954-.427 11.46 11.46 0 0 1 2.428-4.933Zm16.205-.122a1 1 0 0 1 1.409.122 11.5 11.5 0 0 1 2.429 4.933 1 1 0 0 1-1.954.427 9.5 9.5 0 0 0-2.006-4.072 1 1 0 0 1 .122-1.41Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2a7.854 7.854 0 0 1 7.785 6.815l1.055 7.92.018.224a2 2 0 0 1-2 2.041h-2.215c-.904 1.747-2.605 3-4.643 3s-3.739-1.253-4.643-3H5.142a2 2 0 0 1-1.982-2.265l1.056-7.92.057-.363A7.854 7.854 0 0 1 12 2ZM9.78 19c.609.637 1.398 1 2.22 1s1.611-.363 2.22-1H9.78ZM12 4a5.854 5.854 0 0 0-5.76 4.81l-.041.27L5.142 17h13.716l-1.056-7.92A5.854 5.854 0 0 0 12 4ZM2.718 7.464a1 1 0 1 1-1.953-.427l1.953.427Zm20.518-.427a1 1 0 0 1-1.954.427l1.954-.427ZM3.193 2.105a1 1 0 0 1 1.531 1.287 9.5 9.5 0 0 0-2.006 4.072L.765 7.037a11.46 11.46 0 0 1 2.428-4.932Zm16.205-.123a1 1 0 0 1 1.34.047l.069.076.217.265a11.46 11.46 0 0 1 2.212 4.667l-.978.213-.976.214a9.46 9.46 0 0 0-1.826-3.853l-.18-.22-.062-.081a1 1 0 0 1 .184-1.328Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M9.7 16.895a4 4 0 0 1 4.6 0l3.7 2.6V6.5a2 2 0 0 0-2-2H8a2 2 0 0 0-2 2v12.995l3.7-2.6Zm10.3 2.6c0 1.62-1.825 2.567-3.15 1.636l-3.7-2.6a2 2 0 0 0-2.3 0l-3.7 2.6C5.825 22.062 4 21.115 4 19.495V6.5a4 4 0 0 1 4-4h8a4 4 0 0 1 4 4v12.995Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#405168" d="M14.2 2.625c.834 0 1.482 0 2.001.042.523.043.949.131 1.331.326a3.38 3.38 0 0 1 1.475 1.475c.195.382.283.807.326 1.33.042.52.042 1.168.042 2.002v11.09c0 .495 0 .893-.027 1.199-.028.301-.087.585-.26.809-.249.323-.63.518-1.037.533-.282.01-.547-.107-.808-.26-.265-.154-.588-.385-.991-.673l-3.54-2.528c-.36-.258-.461-.322-.559-.347a.6.6 0 0 0-.306 0c-.098.025-.199.09-.559.347l-3.54 2.528c-.403.288-.726.519-.991.674-.261.152-.526.269-.808.259a1.38 1.38 0 0 1-1.038-.534c-.172-.223-.231-.507-.259-.808a7 7 0 0 1-.024-.528l-.003-.67V7.8c0-.834 0-1.482.042-2.001.043-.523.13-.949.325-1.331a3.38 3.38 0 0 1 1.476-1.475c.382-.195.808-.283 1.33-.326.52-.042 1.168-.042 2.002-.042h4.4Zm-4.4.75c-.846 0-1.458 0-1.94.04-.477.039-.792.114-1.051.246A2.63 2.63 0 0 0 5.66 4.81c-.132.259-.208.574-.247 1.051-.04.482-.039 1.094-.039 1.94v11.09l.003.658c.003.186.01.34.021.473.025.267.07.37.106.418a.63.63 0 0 0 .472.243c.059.002.168-.022.4-.158.23-.133.52-.34.935-.636l3.54-2.529c.308-.22.543-.396.81-.464.222-.056.454-.056.676 0 .267.068.5.244.81.464l3.54 2.529c.414.296.704.503.933.636.233.137.343.16.402.158a.63.63 0 0 0 .472-.243c.036-.048.081-.15.106-.419.024-.263.024-.62.024-1.13V7.8c0-.846 0-1.458-.04-1.94-.039-.477-.114-.792-.246-1.051A2.63 2.63 0 0 0 17.19 3.66c-.259-.132-.575-.207-1.051-.246-.482-.04-1.094-.04-1.94-.04H9.8Zm4.056 4.238a.375.375 0 0 1 .53.53L12.53 10l1.857 1.856a.375.375 0 0 1-.53.53L12 10.53l-1.856 1.857a.375.375 0 0 1-.53-.53L11.47 10 9.613 8.144a.375.375 0 0 1 .53-.53L12 9.47l1.856-1.857Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#006AFF" d="M16 2.5a4 4 0 0 1 4 4v12.995c0 1.62-1.825 2.567-3.15 1.636l-3.7-2.6a2 2 0 0 0-2.3 0l-3.7 2.6C5.825 22.062 4 21.115 4 19.495V6.5a4 4 0 0 1 4-4h8Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 46 38"><path stroke="#405168" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M22.333 31.667H45M22.333 6.333H45m-33.333 0A5.333 5.333 0 1 1 1 6.333a5.333 5.333 0 0 1 10.667 0Zm0 25.334a5.333 5.333 0 1 1-10.667 0 5.333 5.333 0 0 1 10.667 0Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16Zm0 3a1 1 0 0 1 1 1v3h3l.102.005a1 1 0 0 1 0 1.99L16 13h-3v3a1 1 0 1 1-2 0v-3H8a1 1 0 0 1 0-2h3V8a1 1 0 0 1 1-1Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 62 53"><path fill="#405168" d="M28.173.231a5.653 5.653 0 0 1 7.018 3.83l2.66 9.046a20 20 0 0 1 3.986-.397c11.026 0 19.964 8.937 19.964 19.962l-.006.516c-.274 10.787-9.104 19.448-19.958 19.448l-.514-.007c-8.332-.21-15.394-5.528-18.178-12.938l-8.805 2.59a5.654 5.654 0 0 1-7.02-3.83L.232 14.34a5.654 5.654 0 0 1 3.83-7.018L28.172.23ZM41.838 14.71c-1.17 0-2.313.111-3.42.325l3.863 13.137a5.653 5.653 0 0 1-3.83 7.019L25.07 39.126c2.593 6.732 9.122 11.51 16.768 11.51 9.92 0 17.963-8.043 17.963-17.964S51.758 14.71 41.837 14.71ZM33.271 4.624a3.653 3.653 0 0 0-4.535-2.474L4.624 9.24a3.653 3.653 0 0 0-2.475 4.535l7.09 24.113a3.654 3.654 0 0 0 4.536 2.475l8.762-2.577a20 20 0 0 1-.662-5.114c0-8.961 5.905-16.544 14.037-19.069l-2.64-8.98Zm3.204 10.899c-7.302 2.28-12.601 9.096-12.601 17.15 0 1.571.203 3.095.582 4.548l13.431-3.948a3.654 3.654 0 0 0 2.474-4.536l-3.886-13.214Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48"><path fill="#405168" d="M19.667 4.458a1 1 0 1 0 0-2v2Zm25 23a1 1 0 0 0-2 0h2ZM3.912 45.543l.454-.891-.454.89Zm-2.33-2.33.89-.455h0l-.89.454Zm39.173 2.33-.454-.891h0l.454.89Zm2.33-2.33-.89-.455.89.454ZM1.581 6.37l-.89-.454h0l.89.454Zm2.331-2.331-.454-.891.454.89ZM14.333 32.79h-1a1 1 0 0 0 1 1v-1Zm.781-8.781.707.707-.707-.707ZM36.562 2.562l-.707-.707v0l.707.707Zm7.543 0-.707.707v0l.707-.707Zm.457.458.707-.707v0l-.707.707Zm0 7.542.707.707-.707-.707ZM23.114 32.01l.707.707-.707-.707Zm12.02 14.114v-1h-25.6v2h25.6v-1ZM1 37.591h1v-25.6H0v25.6h1ZM9.533 3.458v1h10.134v-2H9.533v1Zm34.134 24h-1V37.59h2V27.457h-1ZM9.533 46.124v-1c-1.51 0-2.582 0-3.421-.07-.828-.067-1.34-.195-1.746-.402l-.454.89-.454.892c.735.374 1.54.537 2.491.614.94.077 2.107.076 3.584.076v-1ZM1 37.591H0c0 1.477 0 2.645.076 3.584.078.951.24 1.756.614 2.491l.891-.454.891-.454c-.207-.406-.335-.918-.403-1.746C2.001 40.173 2 39.101 2 37.591H1Zm2.912 7.952.454-.891a4.33 4.33 0 0 1-1.894-1.894l-.89.454-.892.454a6.33 6.33 0 0 0 2.768 2.768l.454-.891Zm31.221.581v1c1.477 0 2.645.001 3.585-.076.95-.078 1.756-.24 2.49-.614l-.453-.891-.454-.891c-.406.207-.919.335-1.746.403-.84.068-1.912.07-3.422.07v1Zm8.534-8.533h-1c0 1.51-.001 2.582-.07 3.421-.067.828-.196 1.34-.403 1.746l.891.454.891.454c.375-.735.537-1.54.615-2.49.076-.94.076-2.108.076-3.585h-1Zm-2.912 7.952.454.89a6.33 6.33 0 0 0 2.767-2.767l-.89-.454-.892-.454a4.33 4.33 0 0 1-1.893 1.894l.454.89ZM1 11.99h1c0-1.51 0-2.582.07-3.422.067-.827.195-1.34.402-1.745l-.89-.454-.892-.454c-.374.734-.536 1.54-.614 2.49C-.001 9.345 0 10.513 0 11.99h1Zm8.533-8.533v-1c-1.477 0-2.645-.001-3.584.076-.951.077-1.756.24-2.49.614l.453.89.454.892c.406-.207.918-.336 1.746-.403.839-.069 1.911-.07 3.421-.07v-1ZM1.581 6.37l.891.454A4.33 4.33 0 0 1 4.366 4.93l-.454-.891-.454-.891A6.33 6.33 0 0 0 .69 5.916l.891.454Zm12.752 19.525h-1v6.896h2v-6.896h-1Zm0 6.896v1h6.896v-2h-6.896v1Zm.781-8.781.707.707L37.27 3.269l-.707-.707-.707-.707-21.448 21.448.707.707Zm28.99-21.448-.706.707.457.458.707-.707.707-.707-.457-.458-.707.707Zm.458 8-.707-.707-21.448 21.448.707.707.707.707L45.27 11.269l-.707-.707Zm0-7.542-.707.707a4.333 4.333 0 0 1 0 6.128l.707.707.707.707a6.333 6.333 0 0 0 0-8.956l-.707.707Zm-8-.458.707.707a4.333 4.333 0 0 1 6.129 0l.707-.707.707-.707a6.333 6.333 0 0 0-8.957 0l.707.707ZM21.23 32.791v1c.972 0 1.905-.386 2.593-1.074l-.708-.707-.707-.707a1.67 1.67 0 0 1-1.178.488v1Zm-6.896-6.896h1c0-.442.176-.866.489-1.178l-.708-.707-.707-.707a3.67 3.67 0 0 0-1.074 2.592h1Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 46 46"><path stroke="#405168" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14.333 1 9 45M37 1l-5.333 44M1 11.667h44m0 22.666H1"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 50 45"><path stroke="#405168" stroke-linejoin="round" stroke-width="2" d="M49 17c0 15.333-22 26.667-24 26.667S1 32.333 1 17C1 6.333 7.667 1 14.333 1S25 5 25 5s4-4 10.667-4S49 6.333 49 17Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 46 46"><path stroke="#080B12" stroke-linecap="round" stroke-width="1.5" d="m1.417 28.645 7.586-5.676a5.33 5.33 0 0 1 6.867.809c3.98 4.286 8.594 8.182 14.88 8.182 5.794 0 9.633-2.147 13.333-5.847m-38 18.637h33.334a5.333 5.333 0 0 0 5.333-5.333V6.083A5.333 5.333 0 0 0 39.417.75H6.083A5.333 5.333 0 0 0 .75 6.083v33.334a5.333 5.333 0 0 0 5.333 5.333ZM36.75 14.083a5.333 5.333 0 1 1-10.667 0 5.333 5.333 0 0 1 10.667 0Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M3.92 19v-4.153a1 1 0 0 1 1-1H9l.103.005a1 1 0 0 1 0 1.99L9 15.847H7.285c.854.737 1.784 1.38 2.631 1.9.702.431 1.329.769 1.78.997l.291.143a25.6 25.6 0 0 0 3.67-2.326c2.144-1.642 4.073-3.756 4.315-6.023a1 1 0 0 1 1.988.212c-.336 3.154-2.89 5.717-5.086 7.398a27.6 27.6 0 0 1-4.34 2.704l-.078.038-.021.01-.007.003-.002.001-.001.001a1 1 0 0 1-.827.01v0h-.002l-.004-.002-.013-.006q-.016-.006-.045-.02l-.162-.075a27 27 0 0 1-2.503-1.361 22 22 0 0 1-2.95-2.143V19a1 1 0 0 1-2 0ZM2 10c0-2.214.696-3.971 1.833-5.184A5.7 5.7 0 0 1 8 3a7.1 7.1 0 0 1 4 1.228A7.1 7.1 0 0 1 16 3a5.68 5.68 0 0 1 3.469 1.185l.031-1.702a1 1 0 0 1 2 .035l-.081 4.5a1 1 0 0 1-1 .983H16.5a1 1 0 1 1 0-2h2.02A3.68 3.68 0 0 0 16 5a5.12 5.12 0 0 0-3.11 1.053 3 3 0 0 0-.155.129l-.029.025v.002l-.003.002-.072.064a1 1 0 0 1-1.338-.068l-.028-.025a3 3 0 0 0-.155-.13A5.12 5.12 0 0 0 8 5c-.982 0-1.965.392-2.708 1.185C4.554 6.97 4 8.214 4 10q0 .507.099 1.002l.075.328.02.1a1 1 0 0 1-1.925.5l-.03-.097-.102-.446A7 7 0 0 1 2 10Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 50 50"><path stroke="#405168" stroke-linecap="square" stroke-linejoin="round" stroke-width="2" d="M9 1h32a8 8 0 0 1 8 8v21.333a8 8 0 0 1-8 8H27.667L14.333 49V38.333H9a8 8 0 0 1-8-8V9a8 8 0 0 1 8-8Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 43 48"><path stroke="#405168" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20.603 46.333H3.532c-1.572 0-2.816-1.358-2.472-2.891 2.033-9.046 9.421-15.775 19.543-15.775q1.367 0 2.666.16m18.667 7.84L36.603 41m0 0-5.334 5.333M36.603 41l-5.334-5.333M36.603 41l5.333 5.333m-12-36A9.333 9.333 0 1 1 20.603 1a9.333 9.333 0 0 1 9.333 9.333Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M16 6a1 1 0 0 0-1-1H9a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V6ZM2.87 7.225a1 1 0 0 1 1.337 1.482L3.155 9.759a.546.546 0 0 0-.05.714l.119.173c.52.827.52 1.88 0 2.707l-.12.174a.546.546 0 0 0 .051.714l1.052 1.052.069.076a1 1 0 0 1-1.407 1.406l-.076-.068-1.052-1.052a2.55 2.55 0 0 1-.237-3.328l.048-.075a.55.55 0 0 0 0-.504l-.048-.075a2.55 2.55 0 0 1 .237-3.328l1.052-1.052.076-.068Zm16.923.068a1 1 0 0 1 1.338-.068l.076.068 1.052 1.052.16.174c.696.837.78 2.03.209 2.958l-.133.196a.55.55 0 0 0 0 .654l.133.196a2.55 2.55 0 0 1-.21 2.958l-.16.174-1.05 1.052a1 1 0 1 1-1.415-1.414l1.052-1.052.064-.077a.55.55 0 0 0 .04-.552l-.053-.085a2.545 2.545 0 0 1 0-3.054l.052-.085a.55.55 0 0 0-.039-.552l-.064-.077-1.052-1.052-.068-.076a1 1 0 0 1 .068-1.338ZM13 6l.103.005a1 1 0 0 1 0 1.99L13 8h-2a1 1 0 1 1 0-2h2Zm5 12a3 3 0 0 1-3 3H9a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3h6a3 3 0 0 1 3 3v12Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12.591 21.806h.002l.001-.002.006-.004.018-.014a10 10 0 0 0 .304-.235 26 26 0 0 0 3.333-3.196C18.048 16.29 20 13.305 20 10a8 8 0 1 0-16 0c0 3.305 1.952 6.29 3.745 8.355a26 26 0 0 0 3.333 3.196 16 16 0 0 0 .304.235l.018.014.006.004.002.002a1 1 0 0 0 1.183 0Zm-.593-9.306a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2a8 8 0 0 1 8 8c0 3.305-1.953 6.29-3.745 8.355a26 26 0 0 1-3.333 3.197q-.152.12-.237.184l-.067.05-.018.014-.005.004-.002.002h-.001c-.003-.004-.042-.055-.592-.806l.592.807a1 1 0 0 1-1.184 0v-.001l-.003-.002-.005-.004-.018-.014-.067-.05a24 24 0 0 1-1.066-.877 26 26 0 0 1-2.504-2.503C5.953 16.29 4 13.305 4 10a8 8 0 0 1 8-8Zm0 2a6 6 0 0 0-6 6c0 2.56 1.547 5.076 3.255 7.044A24 24 0 0 0 12 19.723a24 24 0 0 0 2.745-2.679C16.453 15.076 18 12.56 18 10a6 6 0 0 0-6-6Zm-.002 2.5a3.5 3.5 0 1 1 0 7 3.5 3.5 0 0 1 0-7Zm0 2a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#080B12" d="M20.002 7a2 2 0 0 0-2-2h-12a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h2a1 1 0 0 1 1 1v1.918l3.375-2.7a1 1 0 0 1 .625-.218h5a2 2 0 0 0 2-2V7Zm2 8a4 4 0 0 1-4 4h-4.648l-4.727 3.781A1.001 1.001 0 0 1 7.002 22v-3h-1a4 4 0 0 1-4-4V7a4 4 0 0 1 4-4h12a4 4 0 0 1 4 4v8Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#080B12" d="M22.002 15a4 4 0 0 1-4 4h-4.648l-4.727 3.781A1.001 1.001 0 0 1 7.002 22v-3h-1a4 4 0 0 1-4-4V7a4 4 0 0 1 4-4h12a4 4 0 0 1 4 4v8Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M6.043 14.293a1 1 0 1 1 1.414 1.414L5.164 18l2.293 2.293.068.076a1 1 0 0 1-1.406 1.406l-.076-.068-2.47-2.47a1.75 1.75 0 0 1 0-2.474l2.47-2.47Zm6.22 0a1 1 0 0 1 1.414 1.414L12.384 17H18a1 1 0 0 0 1-1v-3a1 1 0 1 1 2 0v3a3 3 0 0 1-3 3h-5.616l1.293 1.293.068.076a1 1 0 0 1-1.406 1.406l-.076-.068-2.47-2.47a1.75 1.75 0 0 1 0-2.474l2.47-2.47ZM3 11V8a3 3 0 0 1 3-3h5.586l-1.293-1.293-.068-.076a1 1 0 0 1 1.406-1.406l.076.068 2.47 2.47.12.133a1.75 1.75 0 0 1 0 2.209l-.12.132-2.47 2.47a1 1 0 1 1-1.414-1.414L11.586 7H6a1 1 0 0 0-1 1v3a1 1 0 1 1-2 0Zm13.543-8.707a1 1 0 0 1 1.338-.068l.076.068 2.47 2.47.12.133a1.75 1.75 0 0 1 0 2.209l-.12.132-2.47 2.47a1 1 0 1 1-1.414-1.414L18.836 6l-2.293-2.293-.068-.076a1 1 0 0 1 .068-1.338Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M10.928 18.882a1.95 1.95 0 0 0 2.452-.25l9-9a1.953 1.953 0 0 0-2.76-2.76L12 14.493l-7.62-7.62a1.952 1.952 0 0 0-2.76 2.76l9 9 .308.25Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M6 2a2.998 2.998 0 0 1 1 5.825V8a2 2 0 0 0 2 2h1.174c.412-1.165 1.52-2 2.826-2h5a3 3 0 1 1 0 6h-5a3 3 0 0 1-2.826-2H9a4 4 0 0 1-2-.537V16a2 2 0 0 0 2 2h1.174c.412-1.165 1.52-2 2.826-2h5a3 3 0 1 1 0 6h-5a3 3 0 0 1-2.826-2H9a4 4 0 0 1-4-4V7.825A2.998 2.998 0 0 1 6 2Zm7 16a1 1 0 1 0 0 2h5a1 1 0 1 0 0-2h-5Zm0-8a1 1 0 1 0 0 2h5a1 1 0 1 0 0-2h-5ZM6 4a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 46 46"><path stroke="#405168" stroke-linecap="square" stroke-linejoin="round" stroke-width="2" d="M1 23h10.667M1 23V12m0 11v11m10.667-11h22.666m-22.666 0v11m0-11V12m22.666 11H45m-10.667 0v12.222m0-12.222V12M45 23V12m0 11v12.222M34.333 45h5.334A5.333 5.333 0 0 0 45 39.667v-4.445M34.333 45v-9.778m0 9.778H11.667M34.333 1h5.334A5.333 5.333 0 0 1 45 6.333V12M34.333 1v11m0-11H11.667m22.666 11H45M34.333 35.222H45M11.667 45H6.333A5.333 5.333 0 0 1 1 39.667V34m10.667 11V34m0-33H6.333A5.333 5.333 0 0 0 1 6.333V12M11.667 1v11M1 12h10.667M1 34h10.667"/></svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Samuel Newman	b2e8245c08	actually specify @types/react@19, remove need for transitive dep	2025-06-10 22:45:58 +03:00
Samuel Newman	3d41a82c74	fix rebase mistake	2025-06-10 22:44:42 +03:00
Samuel Newman	6de66ee472	update @types/react	2025-06-10 22:34:30 +03:00
Samuel Newman	8de4c2db61	remove most uses of `import * as React`	2025-06-10 22:34:30 +03:00
Samuel Newman	adb3c82d7c	fix React.JSX	2025-06-10 22:34:22 +03:00
Samuel Newman	f10360406f	rm import type React	2025-06-10 22:34:22 +03:00
Samuel Newman	3e72838119	fix prettier	2025-06-10 22:34:22 +03:00
Samuel Newman	bb733dc085	upgrade @types/react to 19 + run codemod	2025-06-10 22:34:22 +03:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M15.793 10.293a1 1 0 0 1 1.338-.068l.076.068 3.293 3.293a2 2 0 0 1 .138 2.677l-.138.151-3.293 3.293a1 1 0 1 1-1.414-1.414L18.086 16H8a5 5 0 0 1-5-5V5a1 1 0 0 1 2 0v6a3 3 0 0 0 3 3h10.086l-2.293-2.293-.068-.076a1 1 0 0 1 .068-1.338Z"/></svg>`
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12 2a1 1 0 0 1 0 2 5.85 5.85 0 0 0-5.802 5.08L5.143 17h13.715l-.382-2.868-.01-.102a1 1 0 0 1 1.973-.262l.02.1.532 4a1 1 0 0 1-.99 1.132h-3.357c-.905 1.747-2.606 3-4.644 3s-3.74-1.253-4.643-3H4a1 1 0 0 1-.991-1.132l1.207-9.053A7.85 7.85 0 0 1 12 2ZM9.78 19c.61.637 1.397 1 2.22 1s1.611-.363 2.22-1H9.78ZM17 2.5a1 1 0 0 1 1 1V6h2.5a1 1 0 0 1 0 2H18v2.5a1 1 0 0 1-2 0V8h-2.5a1 1 0 1 1 0-2H16V3.5a1 1 0 0 1 1-1Z"/></svg>