Remove .withProxy() calls

2024-08-13 05:24:26 +01:00
1749 changed files with 122948 additions and 533362 deletions
@@ -1,32 +1,8 @@
-# The env the app is running in e.g. development, testflight, production
+# Copy this to `.env` and `.env.test` files
+
+SENTRY_AUTH_TOKEN=
 EXPO_PUBLIC_ENV=development
-
-# This is the semver release version of the app, pulled from package.json
-EXPO_PUBLIC_RELEASE_VERSION=
-
-# This is the commit hash that the current bundle was made from.
-EXPO_PUBLIC_BUNDLE_IDENTIFIER=
-
-# Should be formatted YYMMDDHH so that it increases for each build.
-EXPO_PUBLIC_BUNDLE_DATE=0
-
-# The log level for the app's logger transports
 EXPO_PUBLIC_LOG_LEVEL=debug
-
-# Enable debug logs for specific logger instances
-EXPO_PUBLIC_LOG_DEBUG=session
-
-# 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=
+EXPO_PUBLIC_LOG_DEBUG=
+EXPO_PUBLIC_BUNDLE_IDENTIFIER=
+EXPO_PUBLIC_BUNDLE_DATE=0
@@ -1,9 +1,8 @@
 module.exports = {
  root: true,
  extends: [
-    '@react-native',
+    '@react-native-community',
    'plugin:react/recommended',
-    'plugin:react/jsx-runtime',
    'plugin:react-native-a11y/ios',
    'prettier',
  ],
@@ -15,28 +14,16 @@ module.exports = {
    'simple-import-sort',
    'bsky-internal',
    'eslint-plugin-react-compiler',
-    'import',
  ],
  rules: {
+    // Temporary until https://github.com/facebook/react-native/pull/43756 gets into a release.
+    'prettier/prettier': 0,
    'react/no-unescaped-entities': 0,
-    'react/prop-types': 0,
    'react-native/no-inline-styles': 0,
    'bsky-internal/avoid-unwrapped-text': [
      'error',
      {
-        impliedTextComponents: [
-          'H1',
-          'H2',
-          'H3',
-          'H4',
-          'H5',
-          'H6',
-          'P',
-          'Admonition',
-          'Admonition.Admonition',
-          'AgeAssuranceAdmonition',
-          'Span',
-        ],
+        impliedTextComponents: ['H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'P'],
        impliedTextProps: [],
        suggestedTextWrappers: {
          Button: 'ButtonText',
@@ -46,9 +33,8 @@ module.exports = {
    ],
    'bsky-internal/use-exact-imports': 'error',
    'bsky-internal/use-typed-gates': 'error',
-    'bsky-internal/use-prefixed-imports': 'error',
    'simple-import-sort/imports': [
-      'error',
+      'warn',
      {
        groups: [
          // Side effect imports.
@@ -82,18 +68,9 @@ module.exports = {
        ],
      },
    ],
-    'simple-import-sort/exports': 'error',
-    'react-compiler/react-compiler': 'warn',
-    'no-unused-vars': 'off',
-    '@typescript-eslint/no-unused-vars': [
-      'error',
-      {argsIgnorePattern: '^_', varsIgnorePattern: '^_'},
-    ],
-    '@typescript-eslint/consistent-type-imports': [
-      'warn',
-      {prefer: 'type-imports', fixStyle: 'inline-type-imports'},
-    ],
-    'import/consistent-type-specifier-style': ['warn', 'prefer-inline'],
+    'simple-import-sort/exports': 'warn',
+    // TODO: Reenable when we figure out why it gets stuck on CI.
+    // 'react-compiler/react-compiler': 'error',
  },
  ignorePatterns: [
    '**/__mocks__/*.ts',
@@ -105,9 +82,9 @@ module.exports = {
    '*.lock',
    '.husky',
    'patches',
+    'bskyweb',
    '*.html',
    'bskyweb',
-    'bskyembed',
    'src/locale/locales/_build/',
    'src/locale/locales/**/*.js',
  ],
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+
+1.
+
+**Expected behavior**
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots**
+
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Details**
+
+ - Platform: <!-- desktop chrome windows, mobile safari, iOS, Android -->
+ - Platform version:
+ - App version:
+
+**Additional context**
+
+<!-- Add any other context about the problem here. -->
@@ -1,64 +0,0 @@
-name: "Bug Report"
-description: "Create a report for an issue you have experience in the app."
-labels: ["bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make sure you've searched for similar issues that are already open and being tracked. If you find an open issue that seems relevant to yours, it is best to leave a response there with your information instead of opening a new issue, since it helps to consolidate the info in one place.
-  - type: textarea
-    attributes:
-      label: Steps to Reproduce
-      description: |
-        Please provide the steps that may reproduce the issue that you are experiencing. The more concise of a
-        reproduction that you provide, the easier it will be for us to identify the issue and fix it in a timely manner.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Attachments
-      description: |
-        If possible, please provide any images or videos that may help us understand the issue you are experiencing.
-    validations:
-      required: false
-  - type: dropdown
-    attributes:
-      label: What platform(s) does this occur on?
-      multiple: true
-      options:
-        - iOS
-        - Android
-        - Web (Desktop)
-        - Web (Mobile)
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Device Info
-      description: |
-        Please provide the device information that you are using when experiencing this issue. This can include the
-        device model, operating system version, and any other relevant information.
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: What version of the app are you using?
-      description: |
-        You can easily find this information by visting the Settings screen in the app, and tapping on the version info
-        at the bottom of the screen. All the relevant information will be copied to your clipboard, and you will be
-        able to share it here.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional Information
-      description: |
-        Please provide any additional information that you think may be helpful in identifying the issue you are
-        experiencing. This can include any error messages, logs, or other information that you think may be relevant.
-    validations:
-        required: false
@@ -1,69 +0,0 @@
-name: "Bug Report - Fabric/New Architecture"
-description: "Create a bug report for builds using the New Architecture. If you are not sure what that means, don't use this template, and instead use the default bug report template."
-labels: ["bug", "fabric"]
-body:
-  - type: checkboxes
-    attributes:
-      label: You're running a build that uses the React Native New Architecture, right?
-      description: This template is specifically for issues related to builds that use the React Native New Architecture. If you are not sure what that means, this template is probably not relevant to you, and you should use the default Bug Report template.
-      options:
-        - label: I am running a build that uses the New Architecture
-          required: true
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make sure you've searched for similar issues that are already open and being tracked. If you find an open issue that seems relevant to yours, it is best to leave a response there with your information instead of opening a new issue, since it helps to consolidate the info in one place.
-  - type: textarea
-    attributes:
-      label: Steps to Reproduce
-      description: |
-        Please provide the steps that may reproduce the issue that you are experiencing. The more concise of a
-        reproduction that you provide, the easier it will be for us to identify the issue and fix it in a timely manner.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Attachments
-      description: |
-        If possible, please provide any images or videos that may help us understand the issue you are experiencing.
-    validations:
-      required: false
-  - type: dropdown
-    attributes:
-      label: What platform(s) does this occur on?
-      multiple: true
-      options:
-        - iOS
-        - Android
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Device Info
-      description: |
-        Please provide the device information that you are using when experiencing this issue. This can include the
-        device model, operating system version, and any other relevant information.
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: What version of the app are you using?
-      description: |
-        You can easily find this information by visting the Settings screen in the app, and tapping on the version info
-        at the bottom of the screen. All the relevant information will be copied to your clipboard, and you will be
-        able to share it here.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional Information
-      description: |
-        Please provide any additional information that you think may be helpful in identifying the issue you are
-        experiencing. This can include any error messages, logs, or other information that you think may be relevant.
-    validations:
-        required: false
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature-request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+
+<!-- Add any other context or screenshots about the feature request here. -->
@@ -1,42 +0,0 @@
-name: "Feature Request"
-description: "Suggest an idea for the Bluesky app."
-labels: ["feature-request"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for submitting a feature request! Before you submit this request, please make sure you've searched for similar requests that are already open and being tracked. If you find an open request that seems relevant to yours, it is best to leave a response there with your information instead of opening a new request, since it helps to consolidate the info in one place.
-  - type: textarea
-    attributes:
-      label: Describe the Feature
-      description: |
-        Please provide a detailed description of the feature you would like to see implemented in the app. The more
-        information you provide, the easier it will be for us to understand the feature you are requesting and to
-        implement it in a timely manner.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Attachments
-      description: |
-        If helpful, provide some images or videos of similar features in other apps that you think would be helpful
-        for us to understand the feature you are requesting, or places within the app that you think the feature belongs
-        in or is missing from.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Describe Alternatives
-      description: |
-        If there are any alternative solutions or features that you think would be helpful to implement in place of the
-        feature you are requesting, please provide a description of those as well.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional Context
-      description: |
-        If there is any additional context or information that you think would be helpful for us to know about the
-        feature you are requesting, please provide that information here.
-    validations:
-      required: false
@@ -43,11 +43,9 @@ jobs:
          tags: |
            type=sha,enable=true,priority=100,prefix=,suffix=,format=long

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

      - name: Build and push Docker image
        id: build-and-push
@@ -61,8 +59,4 @@ jobs:
          cache-from: type=gha
          cache-to: type=gha,mode=max
          build-args: |
-            EXPO_PUBLIC_ENV=production
-            EXPO_PUBLIC_RELEASE_VERSION=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-            EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-            EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}
-            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
+            EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.vars.outputs.sha_short }}
@@ -3,7 +3,8 @@ on:
  push:
    branches:
      - main
-      - echoprom_fix
+      - bnewbold/embedr
+      - bnewbold/embedr-rebase

 env:
  REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -13,7 +13,6 @@ on:

 jobs:
  build:
-    if: github.repository == 'bluesky-social/social-app'
    name: Build and Submit Android
    runs-on: ubuntu-latest
    steps:
@@ -57,36 +56,18 @@ jobs:
        run: yarn install

      - name: 🔤 Compile translations
-        run: yarn intl:build 2>&1 | tee i18n.log
+        run: yarn intl:build

-      - name: Check for i18n compilation errors
-        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi
-
-      # EXPO_PUBLIC_ENV is handled in eas.json
-      - name: Env
-        id: env
+      - name: ✏️ Write environment variables
        run: |
          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
          echo "$json" > google-services.json

      - name: 🏗️ EAS Build
-        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: 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' }}
@@ -148,14 +129,7 @@ jobs:

      - name: 🏗️ Build Production APK
        if: ${{ inputs.profile == 'production' }}
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn use-build-number-with-bump
-          eas build -p android
-          --profile production-apk
-          --local --output build.apk --non-interactive
+        run: yarn use-build-number-with-bump eas build -p android --profile production-apk --local --output build.apk --non-interactive

      - name: 🚀 Upload Production APK Artifact
        id: upload-artifact-production-apk
@@ -13,9 +13,8 @@ on:

 jobs:
  build:
-    if: github.repository == 'bluesky-social/social-app'
    name: Build and Submit iOS
-    runs-on: macos-15
+    runs-on: macos-14
    steps:
      - name: Check for EXPO_TOKEN
        run: >
@@ -53,7 +52,7 @@ jobs:

      - uses: maxim-lobanov/setup-xcode@v1
        with:
-          xcode-version: '16.4'
+          xcode-version: '15.3'

      - name: ☕️ Setup Cocoapods
        uses: maxim-lobanov/setup-cocoapods@v1
@@ -70,35 +69,17 @@ jobs:
          key: ${{ runner.os }}-pods-${{ hashFiles('yarn.lock') }}

      - name: 🔤 Compile translations
-        run: yarn intl:build 2>&1 | tee i18n.log
+        run: yarn intl:build

-      - name: Check for i18n compilation errors
-        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi
-
-      # EXPO_PUBLIC_ENV is handled in eas.json
      - name: ✏️ Write environment variables
-        id: env
        run: |
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json

      - name: 🏗️ EAS Build
-        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.ipa --non-interactive
+        run: yarn use-build-number-with-bump eas build -p ios --profile ${{ inputs.profile || 'testflight' }} --local --output build.ipa --non-interactive

      - name: 🚀 Deploy
        run: eas submit -p ios --non-interactive --path build.ipa
@@ -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:
@@ -70,17 +69,11 @@ jobs:
      - name: Lint check
        run: yarn lint

-      - name: Lint lockfile
-        run: yarn lockfile-lint
-
      - name: Prettier check
        run: yarn prettier --check .

-      - name: 🔤 Compile translations
-        run: yarn intl:build 2>&1 | tee i18n.log
-
-      - name: Check for i18n compilation errors
-        run: if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compilation errors!\n\n"; fi
+      - name: Check & compile i18n
+        run: yarn intl:build

      - name: Type check
        run: yarn typecheck
@@ -101,31 +94,18 @@ jobs:
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
        uses: dcarbone/install-jq-action@v2

-      # eas.json not used here, set EXPO_PUBLIC_ENV
-      - name: Env
-        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 "$json" > google-services.json

      - name: 🏗️ Create Bundle
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn export
+        run: EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export

      - name: 📦 Package Bundle and 🚀 Deploy
        if: ${{ !steps.fingerprint.outputs.includes-changes }}
@@ -150,14 +130,14 @@ jobs:
  # GitHub actions are horrible so let's just copy paste this in
  buildIfNecessaryIOS:
    name: Build and Submit iOS
-    runs-on: macos-15
+    runs-on: macos-14
    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: >
@@ -192,7 +172,7 @@ jobs:

      - uses: maxim-lobanov/setup-xcode@v1
        with:
-          xcode-version: '16.2'
+          xcode-version: '15.3'

      - name: ☕️ Setup Cocoapods
        uses: maxim-lobanov/setup-cocoapods@v1
@@ -211,30 +191,15 @@ jobs:
      - name: 🔤 Compile translations
        run: yarn intl:build

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

      - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn use-build-number-with-bump
-          eas build -p ios
-          --profile testflight
-          --local --output build.ipa --non-interactive
+        run: yarn use-build-number-with-bump eas build -p ios --profile testflight --local --output build.ipa --non-interactive

      - name: 🚀 Deploy
        run: eas submit -p ios --non-interactive --path build.ipa
@@ -257,10 +222,10 @@ jobs:
    concurrency:
      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-android
      cancel-in-progress: false
-    needs: [bundleDeploy]
+    needs: [ bundleDeploy ]
    # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
    # available here
-    if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected && github.repository == 'bluesky-social/social-app'}}
+    if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected }}

    steps:
      - name: Check for EXPO_TOKEN
@@ -302,31 +267,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: |
          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> .env
-          echo "EXPO_PUBLIC_RELEASE_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-          echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
-          echo "EXPO_PUBLIC_GCP_PROJECT_ID=${{ secrets.EXPO_PUBLIC_GCP_PROJECT_ID }}" >> .env
          echo "$json" > google-services.json

      - name: 🏗️ EAS Build
-        run: >
-          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
-          SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
-          yarn use-build-number-with-bump
-          eas build -p android
-          --profile testflight-android
-          --local --output build.apk --non-interactive
+        run: yarn use-build-number-with-bump eas build -p android --profile testflight-android --local --output build.apk --non-interactive

      - name: ⏰ Get a timestamp
        id: timestamp
@@ -19,9 +19,9 @@ jobs:
      - name: Set up Go tooling
        uses: actions/setup-go@v3
        with:
-          go-version: '1.23'
+          go-version: '1.22'
      - name: Dummy Static Files
-        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
+        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
      - name: Check
        run: cd bskyweb/ && make check
      - name: Build (binary)
@@ -36,8 +36,8 @@ jobs:
      - name: Set up Go tooling
        uses: actions/setup-go@v3
        with:
-          go-version: '1.23'
+          go-version: '1.22'
      - name: Dummy Static Files
-        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
+        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
      - name: Lint
        run: cd bskyweb/ &&  make lint
@@ -16,10 +16,6 @@ jobs:
    steps:
      - name: Check out Git repository
        uses: actions/checkout@v3
-      - name: Install node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
      - name: Yarn install
        uses: Wandalen/wretry.action@master
        with:
@@ -28,8 +24,6 @@ jobs:
          attempt_delay: 2000
      - name: Lint check
        run: yarn lint
-      - name: Lint lockfile
-        run: yarn lockfile-lint
      - name: Prettier check
        run: yarn prettier --check .
      - name: Check & compile i18n
@@ -56,4 +50,4 @@ jobs:
        run: yarn intl:build
      - name: Run tests
        run: |
-          NODE_ENV=test yarn test --forceExit
+          NODE_ENV=test EXPO_PUBLIC_ENV=test yarn test --forceExit
@@ -1,49 +0,0 @@
-name: Nightly Update Source Languages
-on:
-  schedule:
-    - cron: '0 2 * * *' # run at 2 AM UTC
-  workflow_dispatch:
-
-jobs:
-  extract-languages:
-    name: Nightly Update Source Languages
-    runs-on: ubuntu-latest
-
-    permissions:
-      # Give the default GITHUB_TOKEN write permission to commit and push the
-      # added or changed files to the repository.
-      contents: write
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v3
-        with:
-          ssh-key: ${{secrets.GH_ACTION_DEPLOY_KEY}}
-      - name: Install node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - name: Yarn install
-        uses: Wandalen/wretry.action@master
-        with:
-          command: yarn --frozen-lockfile
-          attempt_limit: 3
-          attempt_delay: 2000
-      - name: Extract language strings
-        run: yarn intl:extract
-      - name: Create commit
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: Nightly source-language update
-          file_pattern: ./src/locale/locales/en/messages.po
-      - name: Push source lang to Crowdin
-        uses: crowdin/github-action@v2
-        with:
-          upload_sources: true
-          upload_sources_args: "-b main"
-          upload_translations: false
-          push_translations: false
-          push_sources: false
-          create_pull_request: false
-        env:
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
@@ -1,207 +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@v4
-        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@v8
-        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 opening the deep link below in your browser:
-
-            `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) 🤖*
@@ -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

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

-npx lint-staged --concurrent false
+npx lint-staged
@@ -1 +1 @@
-20
+18
@@ -1,4 +1,4 @@
-# Ignore everything except JS-ey or CSS code.
+# Ignore everything except JS-ey code.
 # Based on https://stackoverflow.com/a/70715829/458193
 *
 !**/*.js
@@ -7,14 +7,9 @@
 !**/*.tsx
 !*/

-!**/*.css
-
 # More specific ignores go below.
 .expo
 android
 ios
 src/locale/locales
 lib/react-compiler-runtime
-bskyweb/static
-coverage
-web-build
@@ -1,50 +1,24 @@
-FROM golang:1.24.5-bullseye AS build-env
+FROM golang:1.22-bullseye AS build-env

 WORKDIR /usr/src/social-app

 ENV DEBIAN_FRONTEND=noninteractive

-#
 # Node
-#
-ENV NODE_VERSION=20
+ENV NODE_VERSION=18
 ENV NVM_DIR=/usr/share/nvm

-#
 # Go
-#
 ENV GODEBUG="netdns=go"
 ENV GOOS="linux"
 ENV GOARCH="amd64"
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT="loopvar"

-# The latest git hash of the preview branch on render.com
-# https://render.com/docs/docker-secrets#environment-variables-in-docker-builds
-ARG RENDER_GIT_COMMIT
-
-#
 # Expo
-#
-ARG EXPO_PUBLIC_ENV
-ENV EXPO_PUBLIC_ENV=${EXPO_PUBLIC_ENV:-development}
-ARG EXPO_PUBLIC_RELEASE_VERSION
-ENV EXPO_PUBLIC_RELEASE_VERSION=$EXPO_PUBLIC_RELEASE_VERSION
 ARG EXPO_PUBLIC_BUNDLE_IDENTIFIER
-# If not set by GitHub workflows, we're probably in Render
-ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER=${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-$RENDER_GIT_COMMIT}
+ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER ${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-dev}

-#
-# Sentry
-#
-ARG SENTRY_AUTH_TOKEN
-ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-unknown}
-ARG EXPO_PUBLIC_SENTRY_DSN
-ENV EXPO_PUBLIC_SENTRY_DSN=$EXPO_PUBLIC_SENTRY_DSN
-
-#
-# Copy everything into the container
-#
 COPY . .

 #
@@ -60,16 +34,12 @@ RUN \. "$NVM_DIR/nvm.sh" && \
  nvm install $NODE_VERSION && \
  nvm use $NODE_VERSION && \
  echo "Using bundle identifier: $EXPO_PUBLIC_BUNDLE_IDENTIFIER" && \
-  echo "EXPO_PUBLIC_ENV=$EXPO_PUBLIC_ENV" >> .env && \
-  echo "EXPO_PUBLIC_RELEASE_VERSION=$EXPO_PUBLIC_RELEASE_VERSION" >> .env && \
  echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER" >> .env && \
  echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env && \
-  echo "EXPO_PUBLIC_SENTRY_DSN=$EXPO_PUBLIC_SENTRY_DSN" >> .env && \
  npm install --global yarn && \
  yarn && \
-  yarn intl:build 2>&1 | tee i18n.log && \
-  if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compile errors!\n\n"; fi && \
-  SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN SENTRY_RELEASE=$EXPO_PUBLIC_RELEASE_VERSION SENTRY_DIST=$EXPO_PUBLIC_BUNDLE_IDENTIFIER yarn build-web
+  yarn intl:build && \
+  EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() yarn build-web

 # DEBUG
 RUN find ./bskyweb/static && find ./web-build/static
@@ -1,11 +1,11 @@
-FROM golang:1.24.5-bullseye AS build-env
+FROM golang:1.22-bullseye AS build-env

 WORKDIR /usr/src/social-app

 ENV DEBIAN_FRONTEND=noninteractive

 # Node
-ENV NODE_VERSION=20
+ENV NODE_VERSION=18
 ENV NVM_DIR=/usr/share/nvm

 # Go
@@ -40,7 +40,6 @@ RUN find ./bskyweb/embedr-static && find ./bskyweb/embedr-templates && find ./bs

 # hack around issue with empty directory and go:embed
 RUN touch bskyweb/static/js/empty.txt
-RUN touch bskyweb/static/css/empty.txt
 RUN touch bskyweb/static/media/empty.txt

 #
@@ -1,4 +1,4 @@
-Copyright 2023–2025 Bluesky Social PBC
+Copyright 2023–2024 Bluesky PBC

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

@@ -20,7 +20,7 @@ build-web-embed: ## Compile web embed bundle, copy to bskyweb/embedr* directorie

 .PHONY: test
 test: ## Run all tests
-	NODE_ENV=test yarn test
+	NODE_ENV=test EXPO_PUBLIC_ENV=test yarn test

 .PHONY: lint
 lint: ## Run style checks and verify syntax
@@ -37,6 +37,6 @@ deps: ## Installs dependent libs using 'yarn install'

 .PHONY: nvm-setup
 nvm-setup: ## Use NVM to install and activate node+yarn
-	nvm install 20
-	nvm use 20
+	nvm install 18
+	nvm use 18
 	npm install --global yarn
@@ -10,7 +10,7 @@ Get the app itself:

 ## Development Resources

-This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), which are also open source, but in [a different git repository](https://github.com/bluesky-social/atproto).
+This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), code for which is also open source, but in [a different git repository](https://github.com/bluesky-social/atproto).

 There is a small amount of Go language source code (in `./bskyweb/`), for a web service that returns the React Native Web application.

@@ -19,7 +19,7 @@ The [Build Instructions](./docs/build.md) are a good place to get started with t
 The Authenticated Transfer Protocol ("AT Protocol" or "atproto") is a decentralized social media protocol. You don't *need* to understand AT Protocol to work with this application, but it can help. Learn more at:

 - [Overview and Guides](https://atproto.com/guides/overview)
- [GitHub Discussions](https://github.com/bluesky-social/atproto/discussions) 👈 Great place to ask questions
+- [Github Discussions](https://github.com/bluesky-social/atproto/discussions) 👈 Great place to ask questions
 - [Protocol Specifications](https://atproto.com/specs/atp)
 - [Blogpost on self-authenticating data structures](https://bsky.social/about/blog/3-6-2022-a-self-authenticating-social-protocol)

@@ -27,7 +27,6 @@ The Bluesky Social application encompasses a set of schemas and APIs built in th

 ## Contributions

-> [!NOTE]
 > While we do accept contributions, we prioritize high quality issues and pull requests. Adhering to the below guidelines will ensure a more timely review.

 **Rules:**
@@ -43,7 +42,7 @@ The Bluesky Social application encompasses a set of schemas and APIs built in th
 - Open an issue and give some time for discussion before submitting a PR.
 - Stay away from PRs like...
  - Changing "Post" to "Skeet."
-  - Refactoring the codebase, e.g., to replace React Query with Redux Toolkit or something.
+  - Refactoring the codebase, e.g., to replace MobX with Redux or something.
  - Adding entirely new features without prior discussion. 

 Remember, we serve a wide community of users. Our day-to-day involves us constantly asking "which top priority is our top priority." If you submit well-written PRs that solve problems concisely, that's an awesome contribution. Otherwise, as much as we'd love to accept your ideas and contributions, we really don't have the bandwidth. That's what forking is for!
@@ -60,7 +59,7 @@ Please be sure to:

 ## Security disclosures

-If you discover any security issues, please send an email to security@bsky.app. The email is automatically CC'd to the entire team and we'll respond promptly.
+If you discover any security issues, please send an email to security@bsky.app. The email is automatically CCed to the entire team and we'll respond promptly.

 ## Are you a developer interested in building on atproto?

@@ -1,2 +1,2 @@
 flows:
-  - "flows/**"
+  - "flows/*"
@@ -10,20 +10,21 @@ appId: xyz.blueskyweb.app
    id: "e2eSignInAlice"

 # Post an image with the porn label
- assertVisible:
-      id: "composeFAB"
 - tapOn:
    id: "composeFAB"
 - inputText: "Post with an image"
 - tapOn:
    id: "openGalleryBtn"
- tapOn: "Content warnings"
- tapOn: "Porn"
+- tapOn:
+    id: "labelsBtn"
+- tapOn:
+    label: "Tap on porn"
+    point: 78%,67%
 - tapOn:
    label: "Tap on confirm"
-    id: "confirmBtn"
+    point: 51%,92%
 - tapOn:
    id: "composerPublishBtn"
 - tapOn:
    id: "e2eRefreshHome"
- assertVisible: "Adult Content"
+- assertVisible: "Adult Content"
@@ -8,8 +8,6 @@ appId: xyz.blueskyweb.app
    file: ../setupApp.yml
 - tapOn:
    id: "e2eSignInAlice"
- assertVisible:
-      id: "composeFAB"
 - tapOn:
    id: "composeFAB"
 - inputText: "Post text only"
@@ -62,7 +60,7 @@ appId: xyz.blueskyweb.app
    id: "repostBtn"
 - tapOn:
    id: "quoteBtn"
- inputText: "QP text only"
+- inputText: "QP text only"   
 - tapOn:
    id: "composerPublishBtn"
 - assertVisible:
@@ -10,7 +10,8 @@ appId: xyz.blueskyweb.app
    id: "e2eOpenLoggedOutView"
 - tapOn:
    id: "createAccountButton"
- tapOn: "Bluesky Social"
+- tapOn:
+    id: "selectServiceButton"
 - tapOn:
    id: "customSelectBtn"
 - tapOn:
@@ -24,13 +25,12 @@ appId: xyz.blueskyweb.app
 - inputText: "example@test.com"
 - tapOn:
    id: "passwordInput"
- inputText: "hunter22"
- hideKeyboard
+- inputText: "hunter2"
+- pressKey: Enter
 - tapOn:
    id: "nextBtn"
 - tapOn:
-    text: "Not Now"
-    optional: true
+     id: "handleInput"
 - inputText: "e2e-test"
 - tapOn:
    id: "nextBtn"
@@ -26,7 +26,7 @@ appId: xyz.blueskyweb.app
 - tapOn: "Save"
 - assertNotVisible:
    id: "createOrEditListModal"
- tapOn: "People"
+- tapOn: "About"
 - assertVisible: "Good Ppl"
 - assertVisible: "They good"

@@ -74,6 +74,8 @@ appId: xyz.blueskyweb.app
 - tapOn: "Delete List"
 - tapOn:
    id: "confirmBtn"
+- assertVisible:
+    id: "listsEmpty"

 - tapOn:
    label: "Create a new curatelist"
@@ -92,19 +94,28 @@ appId: xyz.blueskyweb.app
 - tapOn: "Save"
 - assertNotVisible:
    id: "createOrEditListModal"
- tapOn: "People"
+- tapOn: "About"
 - assertVisible: "Good Ppl"
 - assertVisible: "They good"
- tapOn: "People"
+- tapOn: "About"

- tapOn: "Start adding people"
- tapOn: "Search"
+- tapOn:
+    label: "Adds users on curatelists from the list"
+    id: "addUserBtn"
+- assertVisible:
+    id: "listAddUserModal"
+- tapOn:
+    id: "searchInput"
 - inputText: "b"
 - pressKey: Enter
- tapOn: "Add user to list"
- swipe:
-    direction: DOWN
- assertVisible: "View Bob's profile"
+- tapOn:
+    id: "user-bob.test-addBtn"
+- tapOn:
+    id: "doneBtn"
+- assertNotVisible:
+    id: "listAddUserModal"
+- assertVisible:
+    id: "user-bob.test"

 - tapOn: "Posts"
 - assertVisible:
@@ -135,18 +146,37 @@ appId: xyz.blueskyweb.app
    id: "e2eGotoLists"
 - tapOn: "Good Ppl"

- tapOn: "People"
- assertVisible: "View Bob's profile"
+- tapOn: "About"
+- assertVisible:
+    label: "Removes users on curatelists from the list"
+    id: "user-bob.test"
 - tapOn:
    point: "90%,43%"
+- assertVisible:
+    id: "userAddRemoveListsModal"
 - tapOn:
    id: "user-bob.test-addBtn"
 - tapOn:
    id: "doneBtn"
+- assertNotVisible:
+    id: "userAddRemoveListsModal"

 - tapOn:
+    label: "Shows the curatelist on my profile"
+    id: "bottomBarProfileBtn"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
+- tapOn:
+    id: "profilePager-selector-6"
+- tapOn: "Good Ppl"
+
+- tapOn:
+    label: "Adds and removes users on curatelists from the profile"
    id: "bottomBarSearchBtn"
- tapOn: "Search for posts, users, or feeds"
+- tapOn:
+    id: "searchTextInput"
 - inputText: "bob"
 - tapOn:
    id: "searchAutoCompleteResult-bob.test"
@@ -10,13 +10,14 @@ appId: xyz.blueskyweb.app
    id: "e2eSignInAlice"

 # Pin alice's feed
- extendedWaitUntil:
-    visible: "Open drawer menu"
- tapOn: "Open drawer menu"
 - tapOn:
-    id: "profileCardButton"
+    id: "bottomBarProfileBtn"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
 - tapOn:
-    id: "profilePager-selector-5"
+    id: "profilePager-selector-4"
 - tapOn: "alice-favs"
 - tapOn: "Pin to Home"
 - tapOn:
@@ -30,18 +31,19 @@ appId: xyz.blueskyweb.app
    text: "alice-favs"

 # Set alice-favs first
- tapOn: "Open drawer menu"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
    id: "menuItemButton-Feeds"
- tapOn:
+- tapOn: 
    id: "editFeedsBtn"
 - tapOn:
    label: "Tap on down arrow"
-    id: "feed-timeline-moveDown"
+    point: "79%,23%"
 - tapOn:
-      label: "Save button"
-      id: "saveChangesBtn"
- tapOn: "Go back"
+    id: "viewHeaderDrawerBtn"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - assertVisible:
    id: "homeScreenFeedTabs-selector-0"
    text: "alice-favs"
@@ -50,18 +52,19 @@ appId: xyz.blueskyweb.app
    text: "Following"

 # Set following first
- tapOn: "Open drawer menu"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
    id: "menuItemButton-Feeds"
- tapOn:
+- tapOn: 
    id: "editFeedsBtn"
 - tapOn:
    label: "Tap on down arrow"
-    id: "feed-feed-moveDown"
+    point: "79%,23%"
 - tapOn:
-    label: "Save button"
-    id: "saveChangesBtn"
- tapOn: "Go back"
+    id: "viewHeaderDrawerBtn"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - assertVisible:
    id: "homeScreenFeedTabs-selector-0"
    text: "Following"
@@ -70,18 +73,19 @@ appId: xyz.blueskyweb.app
    text: "alice-favs"

 # Remove following
- tapOn: "Open drawer menu"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
    id: "menuItemButton-Feeds"
- tapOn:
+- tapOn: 
    id: "editFeedsBtn"
 - tapOn:
    label: "Tap on unpin"
-    id: "feed-timeline-togglePin"
+    point: "91%,23%"
 - tapOn:
-      label: "Save button"
-      id: "saveChangesBtn"
- tapOn: "Go back"
+    id: "viewHeaderDrawerBtn"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - assertVisible:
    id: "homeScreenFeedTabs-selector-0"
    text: "alice-favs"
@@ -9,9 +9,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "e2eSignInAlice"

- extendedWaitUntil:
-    visible:
-        text: "Feeds ✨"
 - tapOn:
    label: "Can go to feeds page using feeds button in tab bar"
    text: "Feeds ✨"
@@ -20,31 +17,43 @@ appId: xyz.blueskyweb.app
 - tapOn:
    label: "Feeds button disappears after pinning a feed"
    id: "bottomBarProfileBtn"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
 - tapOn:
-    id: "profilePager-selector-5"
+    id: "profilePager-selector-4"
 - tapOn: "alice-favs"
 - tapOn: "Pin to Home"
 - tapOn:
    id: "bottomBarHomeBtn"
 - tapOn:
-    id: "bottomBarHomeBtn"
- tapOn:
-    id: "bottomBarHomeBtn"
+    id: "viewHeaderDrawerBtn"
 - assertNotVisible: "Feeds ✨"

 - tapOn:
    label: "Can like posts"
    id: "likeBtn"
+- assertVisible:
+    id: "likeCount"
+    text: "1"
 - tapOn:
    id: "likeBtn"
+- assertNotVisible:
+    id: "likeCount"

 - tapOn:
    label: "Can repost posts"
    id: "repostBtn"
 - tapOn: "Repost"
+- assertVisible:
+    id: "repostCount"
+    text: "1"
 - tapOn:
    id: "repostBtn"
 - tapOn: "Remove repost"
+- assertNotVisible:
+    id: "repostCount"

 - tapOn:
    label: "Can delete posts"
@@ -9,7 +9,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "e2eOpenLoggedOutView"
 - tapOn: "Sign in"
- tapOn:
+- tapOn: 
    id: "selectServiceButton"
 - tapOn: "Custom"
 - tapOn:
@@ -23,7 +23,4 @@ appId: xyz.blueskyweb.app
    id: "loginPasswordInput"
 - inputText: "hunter2"
 - pressKey: Enter
- tapOn:
-    text: "Not Now"
-    optional: true
- assertVisible: "Following"
+- assertVisible: "Following"
@@ -14,7 +14,7 @@ appId: xyz.blueskyweb.app
    id: "e2eGotoModeration"
 - tapOn:
    id: "moderationlistsBtn"
- tapOn: "New list"
+- tapOn: "New"
 - tapOn:
    id: "editNameInput"
 - inputText: "Muted Users"
@@ -28,20 +28,18 @@ appId: xyz.blueskyweb.app
 - assertVisible: "Muted Users"
 - assertVisible: "Shhh"

+# toggle mute subscription
 - tapOn:
-    label: "Dropdown"
-    point: "71%,9%"
-
+    point: "70%,9%"
 - tapOn: "Mute accounts"
 - tapOn: "Mute list"
 - tapOn: "Unmute"

+# toggle block subscription
 - tapOn:
-      label: "Dropdown"
-      point: "71%,9%"
-
+    point: "70%,9%"
 - tapOn: "Block accounts"
 - tapOn: "Block list"
 - tapOn: "Unblock"
-
- # the rest of the behaviors are tested in curate-lists.yml
+ 
+ # the rest of the behaviors are tested in curate-lists.yml
@@ -12,11 +12,10 @@ appId: xyz.blueskyweb.app
    id: "e2eStartOnboarding"
 - tapOn: "Select an avatar"
 - waitForAnimationToEnd
- assertVisible: "Search your library…"
 - tapOn:
-    point: "50%,22%"
+    point: "16%,22%"
 - waitForAnimationToEnd
- tapOn: "Done"
+- tapOn: "Choose"
 - waitForAnimationToEnd
 - tapOn: "Continue to next step"
 - assertVisible: "What are your interests?"
@@ -1,20 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../setupServer.js
-    env:
-        SERVER_PATH: "?users&follows&posts"
- runFlow:
-    file: ../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn:
-    id: "postDropdownBtn"
-    index: 0
- tapOn:
-    id: "postDropdownReportBtn"
- tapOn: "Create report for Misleading Post"
- tapOn: "Send report to Dev-env Moderation"
- tapOn:
-    point: "50%,90%"
@@ -11,12 +11,24 @@ appId: xyz.blueskyweb.app


 # Navigate to my profile
- extendedWaitUntil:
-    visible:
-        id: "bottomBarSearchBtn"
 - tapOn:
    id: "bottomBarProfileBtn"

+# Can see feeds
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
+- tapOn:
+    id: "profilePager-selector-4"
+- assertVisible: "alice-favs"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: RIGHT
+- tapOn:
+    id: "profilePager-selector-0"
+
 # Open and close edit profile modal
 - tapOn:
    id: "profileHeaderEditProfileButton"
@@ -78,13 +90,13 @@ appId: xyz.blueskyweb.app
    id: "changeBannerBtn"
 - tapOn: "Upload from Library"
 - waitForAnimationToEnd
- tapOn: "Done"
+- tapOn: "Choose"
 - waitForAnimationToEnd
 - tapOn:
    id: "changeAvatarBtn"
 - tapOn: "Upload from Library"
 - waitForAnimationToEnd
- tapOn: "Done"
+- tapOn: "Choose"
 - waitForAnimationToEnd
 - tapOn:
    id: "editProfileSaveBtn"
@@ -10,12 +10,10 @@ appId: xyz.blueskyweb.app
    id: "e2eSignInAlice"

 # Navigate to another user profile
- extendedWaitUntil:
-    visible:
-        id: "bottomBarSearchBtn"
 - tapOn:
    id: "bottomBarSearchBtn"
- tapOn: "Search for posts, users, or feeds"
+- tapOn:
+    id: "searchTextInput"
 - inputText: "b"
 - tapOn:
    id: "searchAutoCompleteResult-bob.test"
@@ -25,8 +23,6 @@ appId: xyz.blueskyweb.app
 # Can follow/unfollow another user
 - tapOn:
    id: "followBtn"
- tapOn:
-    point: 65%,35% # dismiss the subscribe prompt
 - tapOn:
    id: "unfollowBtn"

@@ -1,24 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../../setupServer.js
-    env:
-        SERVER_PATH: ?users&follows&posts&feeds
- runFlow:
-    file: ../../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn: "Carla's avatar"
- tapOn:
-    id: "profileHeaderDropdownBtn"
- tapOn:
-    id: "profileHeaderDropdownReportBtn"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonSpam"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
- tapOn:
-    id: "report:submit"
- assertNotVisible:
-    id: "report:dialog"
@@ -1,24 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../../setupServer.js
-    env:
-        SERVER_PATH: ?users&follows&posts&feeds
- runFlow:
-    file: ../../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn:
-    id: "postDropdownBtn"
-    index: 0
- tapOn:
-    id: "postDropdownReportBtn"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonSpam"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
- tapOn:
-    id: "report:submit"
- assertNotVisible:
-    id: "report:dialog"
@@ -1,35 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../../setupServer.js
-    env:
-        SERVER_PATH: ?users&follows&posts&feeds
- runFlow:
-    file: ../../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn:
-    id: "postDropdownBtn"
-    index: 0
- tapOn:
-    id: "postDropdownReportBtn"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonOther"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
-# reason "other" defaults with details open
- assertVisible:
-    id: "report:details"
- tapOn:
-    id: "report:clearOption"
- assertNotVisible:
-    id: "report:details"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonSpam"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
- tapOn:
-    id: "report:submit"
- assertNotVisible:
-    id: "report:dialog"
@@ -1,30 +0,0 @@
-appId: xyz.blueskyweb.app
---
- runScript:
-    file: ../../setupServer.js
-    env:
-        SERVER_PATH: ?users&follows&posts&feeds
- runFlow:
-    file: ../../setupApp.yml
- tapOn:
-    id: "e2eSignInAlice"
-
- tapOn:
-    id: "postDropdownBtn"
-    index: 0
- tapOn:
-    id: "postDropdownReportBtn"
- tapOn:
-    id: "report:option:com.atproto.moderation.defs#reasonOther"
- assertVisible:
-    id: "report:labeler:mod-authority.test"
-# reason "other" defaults with details open
- assertVisible:
-    id: "report:details"
- tapOn:
-    id: "report:details"
- inputText: "This is a test report"
- tapOn:
-    id: "report:submit"
- assertNotVisible:
-    id: "report:dialog"
@@ -12,8 +12,8 @@ appId: xyz.blueskyweb.app
 # Navigate to another user profile via autocomplete
 - tapOn:
    id: "bottomBarSearchBtn"
- assertVisible: "Search for posts, users, or feeds"
- tapOn: "Search for posts, users, or feeds"
+- tapOn:
+    id: "searchTextInput"
 - inputText: "b"
 - tapOn:
    id: "searchAutoCompleteResult-bob.test"
@@ -8,10 +8,7 @@ appId: xyz.blueskyweb.app
    file: ../setupApp.yml
 - tapOn:
    id: "e2eSignInAlice"
- assertVisible:
-      id: "storybookBtn"
- tapOn:
-    id: "storybookBtn"
+- tapOn: "/sys/debug"
 - tapOn:
    id: "sharedPrefsTestOpenBtn"
 - tapOn:
@@ -19,7 +16,7 @@ appId: xyz.blueskyweb.app
 - assertVisible: "Hello"
 - tapOn:
    id: "removeStringBtn"
- assertVisible: "undefined"
+- assertVisible: "null"
 - tapOn:
    id: "setBoolBtn"
 - assertVisible: "true"
@@ -7,11 +7,10 @@ appId: xyz.blueskyweb.app
 - runFlow:
    file: ../setupApp.yml

+
 # Login, create a thread, and log out
 - tapOn:
    id: "e2eSignInAlice"
- assertVisible:
-    id: "composeFAB"
 - tapOn:
    id: "composeFAB"
 - inputText: "Test thread"
@@ -11,8 +11,6 @@ appId: xyz.blueskyweb.app


 # Navigate to thread
- extendedWaitUntil:
-    visible: "Thread root"
 - tapOn: "Thread root"
 - assertVisible: "Thread reply"

@@ -21,22 +19,32 @@ appId: xyz.blueskyweb.app
    id: "likeBtn"
    childOf:
        id: "postThreadItem-by-bob.test"
- assertVisible: "1 like"
+- assertVisible:
+    id: "likeCount-expanded"
 - tapOn:
    id: "likeBtn"
    childOf:
        id: "postThreadItem-by-bob.test"
- assertNotVisible: "1 like"
+- assertNotVisible:
+    id: "likeCount-expanded"

 # Can like a reply post
 - tapOn:
    id: "likeBtn"
    childOf:
        id: "postThreadItem-by-carla.test"
+- assertVisible:
+    id: "likeCount"
+    childOf:
+        id: "postThreadItem-by-carla.test"
 - tapOn:
    id: "likeBtn"
    childOf:
        id: "postThreadItem-by-carla.test"
+- assertNotVisible:
+    id: "likeCount"
+    childOf:
+        id: "postThreadItem-by-carla.test"

 # Can repost the root post
 - tapOn:
@@ -6,8 +6,6 @@ appId: xyz.blueskyweb.app
 - waitForAnimationToEnd
 - tapOn: "http://localhost:8081"
 - waitForAnimationToEnd
- extendedWaitUntil:
-    visible: "Continue"
 - swipe:
   from: "Bluesky"
   direction: DOWN
@@ -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,3 +0,0 @@
-export const CID = jest.fn().mockImplementation(() => {
-  return {}
-})
@@ -1,7 +0,0 @@
-export const from = jest.fn().mockImplementation(() => {
-  return {
-    digest: jest.fn().mockImplementation(() => {
-      return Promise.resolve('')
-    }),
-  }
-})
@@ -0,0 +1,9 @@
+export const openPicker = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve({uri: ''}))
+export const openCamera = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve({uri: ''}))
+export const openCropper = jest
+  .fn()
+  .mockImplementation(() => Promise.resolve({uri: ''}))
@@ -0,0 +1,47 @@
+export const exampleComHtml = `<!doctype html>
+<html>
+<head>
+    <title>Example Domain</title>
+    <meta name="description" content="An example website">
+
+    <meta charset="utf-8" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style type="text/css">
+    body {
+        background-color: #f0f0f2;
+        margin: 0;
+        padding: 0;
+        font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+
+    }
+    div {
+        width: 600px;
+        margin: 5em auto;
+        padding: 2em;
+        background-color: #fdfdff;
+        border-radius: 0.5em;
+        box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);
+    }
+    a:link, a:visited {
+        color: #38488f;
+        text-decoration: none;
+    }
+    @media (max-width: 700px) {
+        div {
+            margin: 0 auto;
+            width: auto;
+        }
+    }
+    </style>
+</head>
+
+<body>
+<div>
+    <h1>Example Domain</h1>
+    <p>This domain is for use in illustrative examples in documents. You may use this
+    domain in literature without prior coordination or asking for permission.</p>
+    <p><a href="https://www.iana.org/domains/example">More information...</a></p>
+</div>
+</body>
+</html>`
@@ -1,82 +0,0 @@
-import {describe, expect, it} from '@jest/globals'
-import tldts from 'tldts'
-
-import {isEmailMaybeInvalid} from '#/lib/strings/email'
-
-describe('emailTypoChecker', () => {
-  const invalidCases = [
-    'gnail.com',
-    'gnail.co',
-    'gmaill.com',
-    'gmaill.co',
-    'gmai.com',
-    'gmai.co',
-    'gmal.com',
-    'gmal.co',
-    'gmail.co',
-    'iclod.com',
-    'iclod.co',
-    'outllok.com',
-    'outllok.co',
-    'outlook.co',
-    'yaoo.com',
-    'yaoo.co',
-    'yaho.com',
-    'yaho.co',
-    'yahooo.com',
-    'yahooo.co',
-    'yahoo.co',
-    'hithere.jul',
-    'agpowj.notshop',
-    'thisisnot.avalid.tld.nope',
-    // old tld for czechoslovakia
-    'czechoslovakia.cs',
-    // tlds that cbs was registering in 2024 but cancelled
-    'liveon.cbs',
-    'its.showtime',
-  ]
-  const validCases = [
-    'gmail.com',
-    // subdomains (tests end of string)
-    'gnail.com.test.com',
-    'outlook.com',
-    'yahoo.com',
-    'icloud.com',
-    'firefox.com',
-    'firefox.co',
-    'hello.world.com',
-    'buy.me.a.coffee.shop',
-    'mayotte.yt',
-    'aland.ax',
-    'bouvet.bv',
-    'uk.gb',
-    'chad.td',
-    'somalia.so',
-    'plane.aero',
-    'cute.cat',
-    'together.coop',
-    'findme.jobs',
-    'nightatthe.museum',
-    'industrial.mil',
-    'czechrepublic.cz',
-    'lovakia.sk',
-    // new gtlds in 2024
-    'whatsinyour.locker',
-    'letsmakea.deal',
-    'skeet.now',
-    'everyone.みんな',
-    'bourgeois.lifestyle',
-    'california.living',
-    'skeet.ing',
-    'listeningto.music',
-    'createa.meme',
-  ]
-
-  it.each(invalidCases)(`should be invalid: abcde@%s`, domain => {
-    expect(isEmailMaybeInvalid(`abcde@${domain}`, tldts)).toEqual(true)
-  })
-
-  it.each(validCases)(`should be valid: abcde@%s`, domain => {
-    expect(isEmailMaybeInvalid(`abcde@${domain}`, tldts)).toEqual(false)
-  })
-})
@@ -9,11 +9,11 @@ describe('isNetworkError', () => {
  ]
  const outputs = [true, false, false, true]

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

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

-const mockResizedImage = {
-  path: 'file://resized-image.jpg',
-  size: 100,
-  width: 100,
-  height: 100,
-  mime: 'image/jpeg',
-}
-
 describe('downloadAndResize', () => {
  const errorSpy = jest.spyOn(global.console, 'error')

+  const mockResizedImage = {
+    path: jest.fn().mockReturnValue('file://resized-image.jpg'),
+    size: 100,
+    width: 50,
+    height: 50,
+    mime: 'image/jpeg',
+  }
+
  beforeEach(() => {
-    const mockedCreateResizedImage = manipulateAsync as jest.Mock
-    mockedCreateResizedImage.mockResolvedValue({
-      uri: 'file://resized-image.jpg',
-      ...mockResizedImage,
-    })
+    const mockedCreateResizedImage =
+      ImageResizer.createResizedImage as jest.Mock
+    mockedCreateResizedImage.mockResolvedValue(mockResizedImage)
  })

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

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

    const opts: DownloadAndResizeOpts = {
@@ -50,24 +46,25 @@ describe('downloadAndResize', () => {

    const result = await downloadAndResize(opts)
    expect(result).toEqual(mockResizedImage)
-    expect(createDownloadResumable).toHaveBeenCalledWith(
-      opts.uri,
-      expect.anything(),
-      {
-        cache: true,
-      },
-    )
-
-    // First time it gets called is to get dimensions
-    expect(manipulateAsync).toHaveBeenCalledWith(expect.any(String), [], {})
-    expect(manipulateAsync).toHaveBeenCalledWith(
-      expect.any(String),
-      [{resize: {height: opts.height, width: opts.width}}],
-      {format: SaveFormat.JPEG, compress: 1.0},
-    )
-    expect(deleteAsync).toHaveBeenCalledWith(expect.any(String), {
-      idempotent: true,
+    expect(RNFetchBlob.config).toHaveBeenCalledWith({
+      fileCache: true,
+      appendExt: 'jpeg',
    })
+    expect(RNFetchBlob.fetch).toHaveBeenCalledWith(
+      'GET',
+      'https://example.com/image.jpg',
+    )
+    expect(ImageResizer.createResizedImage).toHaveBeenCalledWith(
+      'file://downloaded-image.jpg',
+      100,
+      100,
+      'JPEG',
+      100,
+      undefined,
+      undefined,
+      undefined,
+      {mode: 'cover'},
+    )
  })

  it('should return undefined for invalid URI', async () => {
@@ -85,43 +82,65 @@ describe('downloadAndResize', () => {
    expect(result).toBeUndefined()
  })

-  it('should not downsize whenever dimensions are below the max dimensions', () => {
-    const initialDimensionsOne = {
-      width: 1200,
-      height: 1000,
-    }
-    const resizedDimensionsOne = getResizedDimensions(initialDimensionsOne)
+  it('should return undefined for unsupported file type', async () => {
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image'),
+      info: jest.fn().mockReturnValue({status: 200}),
+      flush: jest.fn(),
+    })

-    const initialDimensionsTwo = {
-      width: 1000,
-      height: 1200,
+    const opts: DownloadAndResizeOpts = {
+      uri: 'https://example.com/image',
+      width: 100,
+      height: 100,
+      maxSize: 500000,
+      mode: 'cover',
+      timeout: 10000,
    }
-    const resizedDimensionsTwo = getResizedDimensions(initialDimensionsTwo)

-    expect(resizedDimensionsOne).toEqual(initialDimensionsOne)
-    expect(resizedDimensionsTwo).toEqual(initialDimensionsTwo)
+    const result = await downloadAndResize(opts)
+    expect(result).toEqual(mockResizedImage)
+    expect(RNFetchBlob.config).toHaveBeenCalledWith({
+      fileCache: true,
+      appendExt: 'jpeg',
+    })
+    expect(RNFetchBlob.fetch).toHaveBeenCalledWith(
+      'GET',
+      'https://example.com/image',
+    )
+    expect(ImageResizer.createResizedImage).toHaveBeenCalledWith(
+      'file://downloaded-image',
+      100,
+      100,
+      'JPEG',
+      100,
+      undefined,
+      undefined,
+      undefined,
+      {mode: 'cover'},
+    )
  })

-  it('should resize dimensions and maintain aspect ratio if they are above the max dimensons', () => {
-    const initialDimensionsOne = {
-      width: 3000,
-      height: 1500,
-    }
-    const resizedDimensionsOne = getResizedDimensions(initialDimensionsOne)
-
-    const initialDimensionsTwo = {
-      width: 2000,
-      height: 4000,
-    }
-    const resizedDimensionsTwo = getResizedDimensions(initialDimensionsTwo)
-
-    expect(resizedDimensionsOne).toEqual({
-      width: 2000,
-      height: 1000,
-    })
-    expect(resizedDimensionsTwo).toEqual({
-      width: 1000,
-      height: 2000,
+  it('should return undefined for non-200 response', async () => {
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image'),
+      info: jest.fn().mockReturnValue({status: 400}),
+      flush: jest.fn(),
    })
+
+    const opts: DownloadAndResizeOpts = {
+      uri: 'https://example.com/image',
+      width: 100,
+      height: 100,
+      maxSize: 500000,
+      mode: 'cover',
+      timeout: 10000,
+    }
+
+    const result = await downloadAndResize(opts)
+    expect(errorSpy).not.toHaveBeenCalled()
+    expect(result).toBeUndefined()
  })
 })
@@ -1,12 +1,11 @@
 import {RichText} from '@atproto/api'

-import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player'
+import {parseEmbedPlayerFromUrl} from 'lib/strings/embed-player'
 import {
  createStarterPackGooglePlayUri,
  createStarterPackLinkFromAndroidReferrer,
  parseStarterPackUri,
-} from '#/lib/strings/starter-pack'
-import {tenorUrlToBskyGifUrl} from '#/state/queries/tenor'
+} from 'lib/strings/starter-pack'
 import {cleanError} from '../../src/lib/strings/errors'
 import {createFullHandle, makeValidHandle} from '../../src/lib/strings/handles'
 import {enforceLen} from '../../src/lib/strings/helpers'
@@ -336,21 +335,17 @@ describe('shortenLinks', () => {
 describe('parseEmbedPlayerFromUrl', () => {
  const inputs = [
    'https://youtu.be/videoId',
-    'https://youtu.be/videoId?t=1s',
    'https://www.youtube.com/watch?v=videoId',
    'https://www.youtube.com/watch?v=videoId&feature=share',
-    'https://www.youtube.com/watch?v=videoId&t=1s',
    'https://youtube.com/watch?v=videoId',
    'https://youtube.com/watch?v=videoId&feature=share',
    'https://youtube.com/shorts/videoId',
-    'https://youtube.com/live/videoId',
    'https://m.youtube.com/watch?v=videoId',
    'https://music.youtube.com/watch?v=videoId',

    'https://youtube.com/shorts/',
    'https://youtube.com/',
    'https://youtube.com/random',
-    'https://youtube.com/live/',

    'https://twitch.tv/channelName',
    'https://www.twitch.tv/channelName',
@@ -444,11 +439,6 @@ describe('parseEmbedPlayerFromUrl', () => {
      source: 'youtube',
      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
    },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=1',
-    },
    {
      type: 'youtube_video',
      source: 'youtube',
@@ -459,11 +449,6 @@ describe('parseEmbedPlayerFromUrl', () => {
      source: 'youtube',
      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
    },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=1',
-    },
    {
      type: 'youtube_video',
      source: 'youtube',
@@ -490,16 +475,10 @@ describe('parseEmbedPlayerFromUrl', () => {
      source: 'youtube',
      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
    },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
-    },

    undefined,
    undefined,
    undefined,
-    undefined,

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

-module.exports = function (_config) {
+const SPLASH_CONFIG = {
+  backgroundColor: '#ffffff',
+  image: './assets/splash.png',
+  resizeMode: 'cover',
+}
+const DARK_SPLASH_CONFIG = {
+  backgroundColor: '#001429',
+  image: './assets/splash-dark.png',
+  resizeMode: 'cover',
+}
+
+const SPLASH_CONFIG_ANDROID = {
+  backgroundColor: '#0c7cff',
+  image: './assets/splash.png',
+  resizeMode: 'cover',
+}
+const DARK_SPLASH_CONFIG_ANDROID = {
+  backgroundColor: '#0f141b',
+  image: './assets/splash-dark.png',
+  resizeMode: 'cover',
+}
+
+module.exports = function (config) {
  /**
   * App version number. Should be incremented as part of a release cycle.
   */
@@ -13,9 +35,9 @@ module.exports = function (_config) {
   */
  const PLATFORM = process.env.EAS_BUILD_PLATFORM

+  const IS_DEV = process.env.EXPO_PUBLIC_ENV === 'development'
  const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
  const IS_PRODUCTION = process.env.EXPO_PUBLIC_ENV === 'production'
-  const IS_DEV = !IS_TESTFLIGHT || !IS_PRODUCTION

  const ASSOCIATED_DOMAINS = [
    'applinks:bsky.app',
@@ -26,9 +48,16 @@ module.exports = function (_config) {
    ...(IS_DEV || IS_TESTFLIGHT ? [] : []),
  ]

-  const UPDATES_ENABLED = IS_TESTFLIGHT || IS_PRODUCTION
+  const UPDATES_CHANNEL = IS_TESTFLIGHT
+    ? 'testflight'
+    : IS_PRODUCTION
+    ? 'production'
+    : undefined
+  const UPDATES_ENABLED = !!UPDATES_CHANNEL

-  const USE_SENTRY = Boolean(process.env.SENTRY_AUTH_TOKEN)
+  const SENTRY_DIST = `${PLATFORM}.${VERSION}.${IS_TESTFLIGHT ? 'tf' : ''}${
+    IS_DEV ? 'dev' : ''
+  }`

  return {
    expo: {
@@ -40,8 +69,11 @@ module.exports = function (_config) {
      runtimeVersion: {
        policy: 'appVersion',
      },
-      icon: './assets/app-icons/ios_icon_default_light.png',
+      orientation: 'portrait',
+      icon: './assets/icon.png',
      userInterfaceStyle: 'automatic',
+      splash: SPLASH_CONFIG,
+      // hsl(211, 99%, 53%), same as palette.default.brandText
      primaryColor: '#1083fe',
      ios: {
        supportsTablet: false,
@@ -59,54 +91,13 @@ module.exports = function (_config) {
            'Used to save images to your library.',
          NSPhotoLibraryUsageDescription:
            'Used for profile pictures, posts, and other kinds of content',
-          CFBundleSpokenName: 'Blue Sky',
-          CFBundleLocalizations: [
-            'en',
-            'an',
-            'ast',
-            'ca',
-            'cy',
-            'da',
-            'de',
-            'el',
-            'eo',
-            'es',
-            'eu',
-            'fi',
-            'fr',
-            'fy',
-            'ga',
-            'gd',
-            'gl',
-            'hi',
-            'hu',
-            'ia',
-            'id',
-            'it',
-            'ja',
-            'km',
-            'ko',
-            'ne',
-            'nl',
-            'pl',
-            'pt-BR',
-            'pt-PT',
-            'ro',
-            'ru',
-            'sv',
-            'th',
-            'tr',
-            'uk',
-            'vi',
-            'yue',
-            'zh-Hans',
-            'zh-Hant',
-          ],
        },
        associatedDomains: ASSOCIATED_DOMAINS,
+        splash: {
+          ...SPLASH_CONFIG,
+          dark: DARK_SPLASH_CONFIG,
+        },
        entitlements: {
-          'com.apple.developer.kernel.increased-memory-limit': true,
-          'com.apple.developer.kernel.extended-virtual-addressing': true,
          'com.apple.security.application-groups': 'group.app.bsky',
        },
        privacyManifests: {
@@ -135,13 +126,15 @@ module.exports = function (_config) {
      },
      androidStatusBar: {
        barStyle: 'light-content',
+        backgroundColor: '#00000000',
      },
      // Dark nav bar in light mode is better than light nav bar in dark mode
      androidNavigationBar: {
        barStyle: 'light-content',
+        backgroundColor: DARK_SPLASH_CONFIG_ANDROID.backgroundColor,
      },
      android: {
-        icon: './assets/app-icons/android_icon_default_light.png',
+        icon: './assets/icon.png',
        adaptiveIcon: {
          foregroundImage: './assets/icon-android-foreground.png',
          monochromeImage: './assets/icon-android-foreground.png',
@@ -167,6 +160,10 @@ module.exports = function (_config) {
            category: ['BROWSABLE', 'DEFAULT'],
          },
        ],
+        splash: {
+          ...SPLASH_CONFIG_ANDROID,
+          dark: DARK_SPLASH_CONFIG_ANDROID,
+        },
      },
      web: {
        favicon: './assets/favicon.png',
@@ -185,34 +182,23 @@ module.exports = function (_config) {
            }
          : undefined,
        checkAutomatically: 'NEVER',
+        channel: UPDATES_CHANNEL,
      },
      plugins: [
-        'expo-video',
        'expo-localization',
-        'expo-web-browser',
-        [
-          'react-native-edge-to-edge',
-          {android: {enforceNavigationBarContrast: false}},
-        ],
-        USE_SENTRY && [
-          '@sentry/react-native/expo',
-          {
-            organization: 'blueskyweb',
-            project: 'app',
-            url: 'https://sentry.io',
-          },
-        ],
+        Boolean(process.env.SENTRY_AUTH_TOKEN) && 'sentry-expo',
        [
          'expo-build-properties',
          {
            ios: {
-              deploymentTarget: '15.1',
+              deploymentTarget: '14.0',
              newArchEnabled: false,
            },
            android: {
-              compileSdkVersion: 35,
-              targetSdkVersion: 35,
-              buildToolsVersion: '35.0.0',
+              compileSdkVersion: 34,
+              targetSdkVersion: 34,
+              buildToolsVersion: '34.0.0',
+              kotlinVersion: '1.8.0',
              newArchEnabled: false,
            },
          },
@@ -225,136 +211,17 @@ module.exports = function (_config) {
            sounds: PLATFORM === 'ios' ? ['assets/dm.aiff'] : ['assets/dm.mp3'],
          },
        ],
+        'expo-video',
        'react-native-compressor',
-        [
-          '@bitdrift/react-native',
-          {
-            networkInstrumentation: true,
-          },
-        ],
        './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
-        './plugins/withGradleJVMHeapSizeIncrease.js',
-        './plugins/withAndroidManifestLargeHeapPlugin.js',
+        './plugins/withAndroidManifestPlugin.js',
        './plugins/withAndroidManifestFCMIconPlugin.js',
-        './plugins/withAndroidManifestIntentQueriesPlugin.js',
+        './plugins/withAndroidStylesWindowBackgroundPlugin.js',
        './plugins/withAndroidStylesAccentColorPlugin.js',
-        './plugins/withAndroidDayNightThemePlugin.js',
-        './plugins/withAndroidNoJitpackPlugin.js',
+        './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',
        './plugins/shareExtension/withShareExtensions.js',
        './plugins/notificationsExtension/withNotificationsExtension.js',
-        [
-          'expo-font',
-          {
-            fonts: [
-              './assets/fonts/inter/InterVariable.woff2',
-              './assets/fonts/inter/InterVariable-Italic.woff2',
-              // Android only
-              './assets/fonts/inter/Inter-Regular.otf',
-              './assets/fonts/inter/Inter-Italic.otf',
-              './assets/fonts/inter/Inter-Medium.otf',
-              './assets/fonts/inter/Inter-MediumItalic.otf',
-              './assets/fonts/inter/Inter-SemiBold.otf',
-              './assets/fonts/inter/Inter-SemiBoldItalic.otf',
-              './assets/fonts/inter/Inter-Bold.otf',
-              './assets/fonts/inter/Inter-BoldItalic.otf',
-            ],
-          },
-        ],
-        [
-          'expo-splash-screen',
-          {
-            ios: {
-              enableFullScreenImage_legacy: true,
-              backgroundColor: '#ffffff',
-              image: './assets/splash.png',
-              resizeMode: 'cover',
-              dark: {
-                enableFullScreenImage_legacy: true,
-                backgroundColor: '#001429',
-                image: './assets/splash-dark.png',
-                resizeMode: 'cover',
-              },
-            },
-            android: {
-              backgroundColor: '#0c7cff',
-              image: './assets/splash-android-icon.png',
-              imageWidth: 150,
-              dark: {
-                backgroundColor: '#0c2a49',
-                image: './assets/splash-android-icon-dark.png',
-                imageWidth: 150,
-              },
-            },
-          },
-        ],
-        [
-          '@mozzius/expo-dynamic-app-icon',
-          {
-            /**
-             * Default set
-             */
-            default_light: {
-              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_default_dark.png',
-              android: './assets/app-icons/android_icon_default_dark.png',
-              prerendered: true,
-            },
-
-            /**
-             * Bluesky+ core set
-             */
-            core_aurora: {
-              ios: './assets/app-icons/ios_icon_core_aurora.png',
-              android: './assets/app-icons/android_icon_core_aurora.png',
-              prerendered: true,
-            },
-            core_bonfire: {
-              ios: './assets/app-icons/ios_icon_core_bonfire.png',
-              android: './assets/app-icons/android_icon_core_bonfire.png',
-              prerendered: true,
-            },
-            core_sunrise: {
-              ios: './assets/app-icons/ios_icon_core_sunrise.png',
-              android: './assets/app-icons/android_icon_core_sunrise.png',
-              prerendered: true,
-            },
-            core_sunset: {
-              ios: './assets/app-icons/ios_icon_core_sunset.png',
-              android: './assets/app-icons/android_icon_core_sunset.png',
-              prerendered: true,
-            },
-            core_midnight: {
-              ios: './assets/app-icons/ios_icon_core_midnight.png',
-              android: './assets/app-icons/android_icon_core_midnight.png',
-              prerendered: true,
-            },
-            core_flat_blue: {
-              ios: './assets/app-icons/ios_icon_core_flat_blue.png',
-              android: './assets/app-icons/android_icon_core_flat_blue.png',
-              prerendered: true,
-            },
-            core_flat_white: {
-              ios: './assets/app-icons/ios_icon_core_flat_white.png',
-              android: './assets/app-icons/android_icon_core_flat_white.png',
-              prerendered: true,
-            },
-            core_flat_black: {
-              ios: './assets/app-icons/ios_icon_core_flat_black.png',
-              android: './assets/app-icons/android_icon_core_flat_black.png',
-              prerendered: true,
-            },
-            core_classic: {
-              ios: './assets/app-icons/ios_icon_core_classic.png',
-              android: './assets/app-icons/android_icon_core_classic.png',
-              prerendered: true,
-            },
-          },
-        ],
-        ['expo-screen-orientation', {initialOrientation: 'PORTRAIT_UP'}],
+        './plugins/withAppDelegateReferrer.js',
      ].filter(Boolean),
      extra: {
        eas: {
@@ -391,6 +258,22 @@ module.exports = function (_config) {
          projectId: '55bd077a-d905-4184-9c7f-94789ba0f302',
        },
      },
+      hooks: {
+        postPublish: [
+          /*
+           * @see https://docs.expo.dev/guides/using-sentry/#app-configuration
+           */
+          {
+            file: 'sentry-expo/upload-sourcemaps',
+            config: {
+              organization: 'blueskyweb',
+              project: 'react-native',
+              release: VERSION,
+              dist: SENTRY_DIST,
+            },
+          },
+        ],
+      },
    },
  }
 }
--- a/Show More
+++ b/Show More