Bump deps

.detoxrc.js

@@ -14,14 +14,14 @@ module.exports = {
       type: 'ios.app',
       binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/bluesky.app',
       build:
-        'xcodebuild -workspace ios/Bluesky.xcworkspace -scheme Bluesky -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build',
+        'xcodebuild -workspace ios/bluesky.xcworkspace -scheme bluesky -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build',
     },
     'ios.release': {
       type: 'ios.app',
       binaryPath:
         'ios/build/Build/Products/Release-iphonesimulator/bluesky.app',
       build:
-        'xcodebuild -workspace ios/Bluesky.xcworkspace -scheme Bluesky -configuration Release -sdk iphonesimulator -derivedDataPath ios/build',
+        'xcodebuild -workspace ios/bluesky.xcworkspace -scheme bluesky -configuration Release -sdk iphonesimulator -derivedDataPath ios/build',
     },
     'android.debug': {
       type: 'android.apk',
@@ -41,7 +41,7 @@ module.exports = {
     simulator: {
       type: 'ios.simulator',
       device: {
-        type: 'iPhone 15 Pro',
+        type: 'iPhone 14',
       },
     },
     attached: {

.easignore

@@ -1,102 +0,0 @@
-# OSX
-#
-.DS_Store
-
-# Xcode
-#
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
-
-# Android/IntelliJ
-#
-build/
-.idea
-.gradle
-local.properties
-*.iml
-*.hprof
-
-# node.js
-#
-node_modules/
-npm-debug.log
-yarn-error.log
-
-# BUCK
-buck-out/
-\.buckd/
-*.keystore
-!debug.keystore
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/
-
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
-
-# Bundle artifact
-*.jsbundle
-
-# Ruby / CocoaPods
-/ios/Pods/
-/vendor/bundle/
-
-# Testing
-coverage/
-junit.xml
-artifacts
-
-# Web bundle outputs
-/dist/
-
-# Expo
-.expo/
-dist/
-*.jks
-*.p8
-*.p12
-*.key
-*.mobileprovision
-*.orig.*
-web-build/
-
-# Temporary files created by Metro to check the health of the file watcher
-.metro-health-check*
-
-# VSCode
-.vscode
-
-# gitignore and github actions
-!.gitignore
-!.github
-
-
-# Android & iOS folders
-/android/
-/ios/
-
-# environment variables
-.env
-.env.*
-
-# Firebase (Android) Google services
-# INCLUDED: google-services.json

.env.example

@@ -1,8 +0,0 @@
-# Copy this to `.env` and `.env.test` files
-
-SENTRY_AUTH_TOKEN=
-EXPO_PUBLIC_ENV=development
-EXPO_PUBLIC_LOG_LEVEL=debug
-EXPO_PUBLIC_LOG_DEBUG=
-EXPO_PUBLIC_BUNDLE_IDENTIFIER=
-EXPO_PUBLIC_BUNDLE_DATE=0

.eslintrc.js

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

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

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

@@ -1,10 +1,9 @@
 name: build-and-push-bskyweb-aws
 on:
-  workflow_dispatch:
   push:
     branches:
       - main
-
+      - jake/bskyweb-additions
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}
@@ -13,7 +12,6 @@ env:
 
 jobs:
   bskyweb-container-aws:
-    if: github.repository == 'bluesky-social/social-app'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -54,6 +52,3 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-        env:
-          EXPO_PUBLIC_BUNDLE_IDENTIFIER: $(git rev-parse --short HEAD)
-          EXPO_PUBLIC_BUNDLE_DATE: $(date -u +"%y%m%d%H")

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

@@ -14,7 +14,6 @@ env:
 
 jobs:
   bskyweb-container-ghcr:
-    if: github.repository == 'bluesky-social/social-app'
     runs-on: ubuntu-latest
     permissions:
       contents: read

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

@@ -1,57 +0,0 @@
-name: build-and-push-embedr-aws
-on:
-  push:
-    branches:
-      - main
-      - bnewbold/embedr
-      - bnewbold/embedr-rebase
-
-env:
-  REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
-  USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}
-  PASSWORD: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_PASSWORD }}
-  IMAGE_NAME: embed
-
-jobs:
-  embedr-container-aws:
-    if: github.repository == 'bluesky-social/social-app'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ env.USERNAME}}
-          password: ${{ env.PASSWORD }}
-
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=sha,enable=true,priority=100,prefix=,suffix=,format=long
-
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          file: ./Dockerfile.embedr
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

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

@@ -1,119 +0,0 @@
----
-name: Build and Submit Android
-
-on:
-  workflow_dispatch:
-    inputs:
-      profile:
-        type: choice
-        description: Build profile to use
-        options:
-          - testflight-android
-          - production
-
-jobs:
-  build:
-    name: Build and Submit Android
-    runs-on: ubuntu-latest
-    steps:
-      - 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
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          expo-version: latest
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: ⛏️ Setup EAS local builds
-        run: yarn global add eas-cli-local-build-plugin
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: ⚙️ Install dependencies
-        run: yarn install
-
-      - name: 🔤 Compile translations
-        run: yarn intl:build
-
-      - name: ✏️ Write environment variables
-        run: |
-          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "$json" > google-services.json
-
-      - name: 🏗️ EAS Build
-        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' }}
-        run: mv build.aab build.apk
-
-      - name: ⏰ Get a timestamp
-        id: timestamp
-        uses: nanzm/get-time-action@master
-        with:
-          format: 'MM-DD-HH-mm-ss'
-
-      - name: 🚀 Upload Production Artifact
-        id: upload-artifact-production
-        if: ${{ inputs.profile == 'production' }}
-        uses: actions/upload-artifact@v4
-        with:
-          retention-days: 30
-          compression-level: 6
-          name: build-${{ steps.timestamp.outputs.time }}.aab
-          path: build.aab
-
-      - name: 🚀 Upload Testflight Artifact
-        id: upload-artifact-testflight
-        if: ${{ inputs.profile != 'production' }}
-        uses: actions/upload-artifact@v4
-        with:
-          retention-days: 30
-          compression-level: 6
-          name: build-${{ steps.timestamp.outputs.time }}.apk
-          path: build.apk
-
-      - name: 🔔 Notify Slack of Production Build
-        if: ${{ inputs.profile == 'production' }}
-        uses: slackapi/slack-github-action@v1.25.0
-        with:
-          payload: |
-            {
-              "text": "Android build is ready for submission. This is a production build! Download the artifact here: ${{ steps.upload-artifact-production.outputs.artifact-url }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-
-      - name: 🔔 Notify Slack of Testflight Build
-        if: ${{ inputs.profile != 'production' }}
-        uses: slackapi/slack-github-action@v1.25.0
-        with:
-          payload: |
-            {
-              "text": "Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact-testflight.outputs.artifact-url }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

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

@@ -1,76 +0,0 @@
----
-name: Build and Submit iOS
-
-on:
-  workflow_dispatch:
-    inputs:
-      profile:
-        type: choice
-        description: Build profile to use
-        options:
-          - testflight
-          - production
-
-jobs:
-  build:
-    name: Build and Submit iOS
-    runs-on: macos-14
-    steps:
-      - 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
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          expo-version: latest
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: ⛏️ Setup EAS local builds
-        run: yarn global add eas-cli-local-build-plugin
-
-      - name: ⚙️ Install dependencies
-        run: yarn install
-
-      - name: ☕️ Setup Cocoapods
-        uses: maxim-lobanov/setup-cocoapods@v1
-        with:
-          version: 1.14.3
-
-      - name: 💾 Cache Pods
-        uses: actions/cache@v3
-        id: pods-cache
-        with:
-          path: ./ios/Pods
-          # We'll use the yarn.lock for our hash since we don't yet have a Podfile.lock. Pod versions will not
-          # change unless the yarn version changes as well.
-          key: ${{ runner.os }}-pods-${{ hashFiles('yarn.lock') }}
-
-      - name: 🔤 Compile translations
-        run: yarn intl:build
-
-      - name: ✏️ Write environment variables
-        run: |
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json
-
-      - name: 🏗️ EAS Build
-        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

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

@@ -1,321 +0,0 @@
----
-name: Bundle and Deploy EAS Update
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-    inputs:
-      channel:
-        type: choice
-        description: Deployment channel to use
-        options:
-          - testflight
-          - production
-      runtimeVersion:
-        type: string
-        description: Runtime version (in x.x.x format) that this update is for
-        required: true
-
-jobs:
-  bundleDeploy:
-    name: Bundle and Deploy EAS Update
-    runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-deploy
-      cancel-in-progress: true
-    outputs:
-      fingerprint-is-different: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different }}
-
-    steps:
-      - 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
-
-      # Validate the version if one is supplied. This should generally happen if the update is for a production client
-      - name: 🧐 Validate version
-        if: ${{ inputs.runtimeVersion }}
-        run: |
-          if [ -z "${{ inputs.runtimeVersion }}" ]; then
-            [[ "${{ inputs.runtimeVersion }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "Version is valid" || exit 1
-          fi
-
-      - name: ⬇️ Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: ⬇️ Get last successful deployment commit from the cache
-        id: get-base-commit
-        uses: actions/cache@v4
-        with:
-          path: last-successful-commit-hash.txt
-          key: last-successful-deployment-commit-${{ github.ref_name }}
-
-      - name: Add the last successful deployment commit to the output
-        id: last-successful-commit
-        run: echo base-commit=$(cat last-successful-commit-hash.txt) >> "$GITHUB_OUTPUT"
-
-      - name: ⬇️ Fetch commits from base branch
-        if: ${{ github.ref != 'refs/heads/main' }}
-        run: git fetch origin main:main --depth 100
-
-      # This should get the current production release's commit's hash to see if the update is compatible
-      - name: 🕵️ Get the base commit
-        id: base-commit
-        run: |
-          if [ -z "${{ inputs.channel == 'production' }}" ]; then
-            echo base-commit=$(git show-ref -s ${{ inputs.runtimeVersion }}) >> "$GITHUB_OUTPUT"
-          else
-            echo base-commit=${{ steps.last-successful-commit.base-commit }} >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: ✓ Make sure we found a base commit
-        run: |
-          if [ -z "${{ steps.base-commit.outputs.base-commit }}" && ${{ inputs.channel == 'production' }} ]; then
-            echo "Could not find a base commit for this release. Exiting."
-            exit 1
-          fi
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: ⚙️ Install Dependencies
-        run: yarn install
-
-      # Run the fingerprint
-      - name: 📷 Check fingerprint
-        id: fingerprint
-        uses: expo/expo-github-action/fingerprint@main
-        with:
-          previous-git-commit: ${{ steps.base-commit.outputs.base-commit }}
-
-      - name: 👀 Debug fingerprint
-        id: fingerprint-debug
-        run: |
-          echo "previousGitCommit=${{ steps.fingerprint.outputs.previous-git-commit }} currentGitCommit=${{ steps.fingerprint.outputs.current-git-commit }}"
-          echo "isPreviousFingerprintEmpty=${{ steps.fingerprint.outputs.previous-fingerprint == '' }}"
-          
-          fingerprintDiff='$(echo "${{ steps.fingerprint.outputs.fingerprint-diff }}")'
-          
-          if [[ $fingerprintDiff =~ "bareRncliAutolinking" || $fingerprintDiff =~ "expoAutolinkingAndroid" || $fingerprintDiff =~ "expoAutolinkingIos" ]]; then
-            echo fingerprint-is-different="true" >> "$GITHUB_OUTPUT"
-          else
-            echo fingerprint-is-different="false" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Lint check
-        run: yarn lint
-
-      - name: Prettier check
-        run: yarn prettier --check .
-
-      - name: Check & compile i18n
-        run: yarn intl:build
-
-      - name: Type check
-        run: yarn typecheck
-
-      - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
-        if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
-        with:
-          expo-version: latest
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: ⛏️ Setup Expo
-        if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
-        run: yarn global add eas-cli-local-build-plugin
-
-      - name: 🪛 Setup jq
-        if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
-        uses: dcarbone/install-jq-action@v2
-
-      - name: ✏️ Write environment variables
-        if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
-        run: |
-          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "$json" > google-services.json
-
-      - name: 🏗️ Create Bundle
-        if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
-        run: EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export
-
-      - name: 📦 Package Bundle and 🚀 Deploy
-        if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
-        run: yarn use-build-number bash scripts/bundleUpdate.sh
-        env:
-          DENIS_API_KEY: ${{ secrets.DENIS_API_KEY }}
-          RUNTIME_VERSION: ${{ inputs.runtimeVersion }}
-          CHANNEL_NAME: ${{ inputs.channel || 'testflight' }}
-
-      - name: Save successful deployment commit hash
-        run: echo ${{ steps.fingerprint.outputs.current-git-commit }} > last-successful-commit-hash.txt
-
-  # GitHub actions are horrible so let's just copy paste this in
-  buildIfNecessaryIOS:
-    name: Build and Submit iOS
-    runs-on: macos-14
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-ios
-      cancel-in-progress: false
-    needs: [bundleDeploy]
-    # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
-    # available here
-    if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.fingerprint-is-different == 'true' }}
-    steps:
-      - 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
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          expo-version: latest
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: ⛏️ Setup EAS local builds
-        run: yarn global add eas-cli-local-build-plugin
-
-      - name: ⚙️ Install dependencies
-        run: yarn install
-
-      - name: ☕️ Setup Cocoapods
-        uses: maxim-lobanov/setup-cocoapods@v1
-        with:
-          version: 1.14.3
-
-      - name: 💾 Cache Pods
-        uses: actions/cache@v3
-        id: pods-cache
-        with:
-          path: ./ios/Pods
-          # We'll use the yarn.lock for our hash since we don't yet have a Podfile.lock. Pod versions will not
-          # change unless the yarn version changes as well.
-          key: ${{ runner.os }}-pods-${{ hashFiles('yarn.lock') }}
-
-      - name: 🔤 Compile translations
-        run: yarn intl:build
-
-      - name: ✏️ Write environment variables
-        run: |
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json
-
-      - name: 🏗️ EAS Build
-        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
-
-  buildIfNecessaryAndroid:
-    name: Build and Submit Android
-    runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-android
-      cancel-in-progress: false
-    needs: [ bundleDeploy ]
-    # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
-    # available here
-    if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.fingerprint-is-different == 'true' }}
-
-    steps:
-      - 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
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          expo-version: latest
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: ⛏️ Setup EAS local builds
-        run: yarn global add eas-cli-local-build-plugin
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: ⚙️ Install dependencies
-        run: yarn install
-
-      - name: 🔤 Compile translations
-        run: yarn intl:build
-
-      - name: ✏️ Write environment variables
-        run: |
-          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
-          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "$json" > google-services.json
-
-      - name: 🏗️ EAS Build
-        run: yarn use-build-number-with-bump eas build -p android --profile testflight-android --local --output build.apk --non-interactive
-
-      - name: ⏰ Get a timestamp
-        id: timestamp
-        uses: nanzm/get-time-action@master
-        with:
-          format: 'MM-DD-HH-mm-ss'
-
-      - name: 🚀 Upload Artifact
-        id: upload-artifact
-        uses: actions/upload-artifact@v4
-        with:
-          retention-days: 30
-          compression-level: 0
-          name: build-${{ steps.timestamp.outputs.time }}.apk
-          path: build.apk
-
-      - name: 🔔 Notify Slack
-        uses: slackapi/slack-github-action@v1.25.0
-        with:
-          payload: |
-            {
-              "text": "Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact.outputs.artifact-url }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

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

@@ -19,9 +19,9 @@ jobs:
       - name: Set up Go tooling
         uses: actions/setup-go@v3
         with:
-          go-version: '1.21'
-      - name: Dummy Static Files
-        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
+          go-version: '1.20'
+      - name: Dummy JS File
+        run: touch bskyweb/static/js/blah.js
       - 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.21'
-      - name: Dummy Static Files
-        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
+          go-version: '1.20'
+      - name: Dummy JS File
+        run: touch bskyweb/static/js/blah.js
       - name: Lint
         run: cd bskyweb/ &&  make lint

.github/workflows/lint.yml

@@ -17,37 +17,21 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v3
       - name: Yarn install
-        uses: Wandalen/wretry.action@master
-        with:
-          command: yarn --frozen-lockfile
-          attempt_limit: 3
-          attempt_delay: 2000
-      - name: Lint check
+        run: yarn
+      - name: Typescript & Lint check
         run: yarn lint
-      - name: Prettier check
-        run: yarn prettier --check .
-      - name: Check & compile i18n
-        run: yarn intl:build
-      - name: Type check
-        run: yarn typecheck
   testing:
     name: Run tests
     runs-on: ubuntu-latest
     steps:
+      - name: Install node 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
       - 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:
-          command: yarn --frozen-lockfile
-          attempt_limit: 3
-          attempt_delay: 2000
-      - name: Check & compile i18n
-        run: yarn intl:build
+        run: yarn
       - name: Run tests
         run: |
-          NODE_ENV=test EXPO_PUBLIC_ENV=test yarn test --forceExit
+          yarn test --forceExit

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

@@ -1,159 +0,0 @@
-# Credit for fingerprint action https://github.com/expo/expo
-# https://github.com/expo/expo/blob/main/.github/workflows/pr-labeler.yml
----
-name: PR labeler
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    types: [opened, synchronize]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  pull-requests: write
-  actions: write
-  contents: read
-
-jobs:
-  webpack-analyzer:
-    runs-on: ubuntu-22.04
-    if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-    steps:
-      - name: ⬇️ Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: Ensure tracking relevant branches and checkout base
-        run: |
-          git checkout ${{ github.head_ref }}
-          git checkout ${{ github.base_ref }}
-
-      - name: Get the base commit
-        id: base-commit
-        run: echo base-commit=$(git log -n 1 ${{ github.base_ref }} --pretty=format:'%H') >> "$GITHUB_OUTPUT"
-
-      - name: Merge PR commit
-        run: |
-          # Have to set a git config for the merge to work
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
-          git merge --no-edit ${{ github.head_ref }}
-          yarn install
-
-      - name: 🔦 Generate stats file for PR
-        run: |
-          yarn generate-webpack-stats-file
-          mv stats.json ../stats-new.json
-
-      - name: ⬇️ Get base stats from cache
-        id: get-base-stats
-        uses: actions/cache@v4
-        with:
-          path: stats-base.json
-          key: stats-base-${{ steps.base-commit.outputs.base-commit }}
-
-      - name: Restore to base commit
-        if: ${{ !steps.get-base-stats.outputs.cache-hit }}
-        run: |
-          git reset HEAD~
-          git restore .
-
-      - name: 🔦 Generate stats file from base commit
-        if: ${{ !steps.get-base-stats.outputs.cache-hit }}
-        run: |
-          yarn install
-          yarn generate-webpack-stats-file
-          mv stats.json stats-base.json
-
-      - name: ％ Get diff
-        id: get-diff
-        uses: NejcZdovc/bundle-size-diff@v1
-        with:
-          base_path: 'stats-base.json'
-          pr_path: '../stats-new.json'
-          excluded_assets: '(.+).chunk.js|(.+).js.map|(.+).json|(.+).png'
-
-      - name: 💬 Drop a comment
-        uses: marocchino/sticky-pull-request-comment@v2
-        with:
-          header: bundle-diff
-          message: |
-            | Old size | New size | Diff                  |
-            |----------|----------|-----------------------|
-            | ${{ steps.get-diff.outputs.base_file_string }} | ${{ steps.get-diff.outputs.pr_file_string }} | ${{ steps.get-diff.outputs.diff_file_string }} (${{ steps.get-diff.outputs.percent }}%) |
-            ---
-
-  test-suite-fingerprint:
-    runs-on: ubuntu-22.04
-    if: ${{ github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push' }}
-    concurrency: fingerprint-${{ github.event_name != 'pull_request' && 'main' || github.run_id }}
-    steps:
-      - name: ⬇️ Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 100
-
-      - name: ⬇️ Fetch commits from base branch
-        run: git fetch origin main:main --depth 100
-        if: github.event_name == 'pull_request'
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: ⚙️ Install Dependencies
-        run: yarn install
-
-      - name: Get the base commit
-        id: base-commit
-        run: echo base-commit=$(git log -n 1 main --pretty=format:'%H') >> "$GITHUB_OUTPUT"
-
-      - name: 📷 Check fingerprint
-        id: fingerprint
-        uses: expo/expo-github-action/fingerprint@main
-        with:
-          previous-git-commit: ${{ steps.base-commit.outputs.base-commit }}
-
-      - name: 👀 Debug fingerprint
-        run: |
-          echo "previousGitCommit=${{ steps.fingerprint.outputs.previous-git-commit }} currentGitCommit=${{ steps.fingerprint.outputs.current-git-commit }}"
-          echo "isPreviousFingerprintEmpty=${{ steps.fingerprint.outputs.previous-fingerprint == '' }}"
-
-      - name: 💬 Drop a comment
-        uses: marocchino/sticky-pull-request-comment@v2
-        if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' }}
-        with:
-          header: fingerprint-diff
-          message: |
-            The Pull Request introduced fingerprint changes against the base commit: ${{ steps.fingerprint.outputs.previous-git-commit }}
-            <details><summary>Fingerprint diff</summary>
-
-            ```json
-            ${{ steps.fingerprint.outputs.fingerprint-diff }}
-            ```
-
-            </details>
-
-            ---
-            *Generated by [PR labeler](https://github.com/expo/expo/actions/workflows/pr-labeler.yml) 🤖*
-
-      - name: 💬 Delete comment
-        uses: marocchino/sticky-pull-request-comment@v2
-        if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff == '[]' }}
-        with:
-          header: fingerprint-diff
-          delete: true
-

.gitignore

@@ -18,6 +18,7 @@ xcuserdata
 *.moved-aside
 DerivedData
 *.hmap
+*.ipa
 *.xcuserstate
 
 # Android/IntelliJ
@@ -77,41 +78,15 @@ dist/
 *.mobileprovision
 *.orig.*
 web-build/
-stats.json
 
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
 
-# VSCode
-.vscode
-
 # gitignore and github actions
 !.gitignore
 !.github
 
 
 # Android & iOS folders
-/android/
-/ios/
-
-# environment variables
-.env
-.env.*
-
-# Firebase (Android) Google services
-google-services.json
-
-# Performance results (Flashlight)
-.perf/
-
-# ESLint
-.eslintcache
-
-# i18n
-src/locale/locales/_build/
-src/locale/locales/**/*.js
-
-# local builds
-*.apk
-*.aab
-*.ipa
+android/
+ios/

.husky/pre-commit

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

.nvmrc

@@ -1 +0,0 @@
-18

.prettierignore

@@ -1,14 +1,12 @@
-# Ignore everything except JS-ey code.
-# Based on https://stackoverflow.com/a/70715829/458193
-*
-!**/*.js
-!**/*.jsx
-!**/*.ts
-!**/*.tsx
-!*/
-
-# More specific ignores go below.
-.expo
-android
 ios
-src/locale/locales
+android
+src/third-party
+src/app.json
+public
+/bskyweb/templates
+/dist/
+/.watchmanconfig
+/app.json
+
+web/index.html
+web-build/*

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21-bullseye AS build-env
+FROM golang:1.20-bullseye AS build-env
 
 WORKDIR /usr/src/social-app
 
@@ -13,17 +13,16 @@ ENV GODEBUG="netdns=go"
 ENV GOOS="linux"
 ENV GOARCH="amd64"
 ENV CGO_ENABLED=1
-ENV GOEXPERIMENT="loopvar"
 
 COPY . .
 
 #
-# Generate the JavaScript webpack.
+# Generate the Javascript webpack.
 #
 RUN mkdir --parents $NVM_DIR && \
   wget \
     --output-document=/tmp/nvm-install.sh \
-    https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh && \
+    https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh && \
   bash /tmp/nvm-install.sh
 
 RUN \. "$NVM_DIR/nvm.sh" && \
@@ -31,14 +30,16 @@ RUN \. "$NVM_DIR/nvm.sh" && \
   nvm use $NODE_VERSION && \
   npm install --global yarn && \
   yarn && \
-  yarn intl:build && \
   yarn build-web
 
 # DEBUG
 RUN find ./bskyweb/static && find ./web-build/static
 
+# Copy the bundle js files.
+RUN cp --verbose ./web-build/static/js/*.* ./bskyweb/static/js/
+
 #
-# Generate the bskyweb Go binary.
+# Generate the bksyweb Go binary.
 #
 RUN cd bskyweb/ && \
   go mod download && \
@@ -72,5 +73,3 @@ CMD ["/usr/bin/bskyweb"]
 LABEL org.opencontainers.image.source=https://github.com/bluesky-social/social-app
 LABEL org.opencontainers.image.description="bsky.app Web App"
 LABEL org.opencontainers.image.licenses=MIT
-
-# NOOP

Dockerfile.embedr

@@ -1,79 +0,0 @@
-FROM golang:1.21-bullseye AS build-env
-
-WORKDIR /usr/src/social-app
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Node
-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"
-
-COPY . .
-
-#
-# Generate the JavaScript webpack. NOTE: this will change
-#
-RUN mkdir --parents $NVM_DIR && \
-  wget \
-    --output-document=/tmp/nvm-install.sh \
-    https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh && \
-  bash /tmp/nvm-install.sh
-
-RUN \. "$NVM_DIR/nvm.sh" && \
-  nvm install $NODE_VERSION && \
-  nvm use $NODE_VERSION && \
-  npm install --global yarn && \
-  yarn && \
-  cd bskyembed && yarn install --frozen-lockfile && cd .. && \
-  yarn intl:build && \
-  yarn build-embed
-
-# DEBUG
-RUN find ./bskyweb/embedr-static && find ./bskyweb/embedr-templates && find ./bskyembed/dist
-
-# hack around issue with empty directory and go:embed
-RUN touch bskyweb/static/js/empty.txt
-RUN touch bskyweb/static/media/empty.txt
-
-#
-# Generate the embedr Go binary.
-#
-RUN cd bskyweb/ && \
-  go mod download && \
-  go mod verify
-
-RUN cd bskyweb/ && \
-  go build \
-    -v  \
-    -trimpath \
-    -tags timetzdata \
-    -o /embedr \
-    ./cmd/embedr
-
-FROM debian:bullseye-slim
-
-ENV GODEBUG=netdns=go
-ENV TZ=Etc/UTC
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install --yes \
-  dumb-init \
-  ca-certificates
-
-ENTRYPOINT ["dumb-init", "--"]
-
-WORKDIR /embedr
-COPY --from=build-env /embedr /usr/bin/embedr
-
-CMD ["/usr/bin/embedr"]
-
-LABEL org.opencontainers.image.source=https://github.com/bluesky-social/social-app
-LABEL org.opencontainers.image.description="embed.bsky.app Web App"
-LABEL org.opencontainers.image.licenses=MIT

LICENSE

@@ -1,7 +0,0 @@
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Makefile

@@ -1,42 +0,0 @@
-
-SHELL = /bin/bash
-.SHELLFLAGS = -o pipefail -c
-
-.PHONY: help
-help: ## Print info about all commands
-	@echo "Commands:"
-	@echo
-	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "    \033[01;32m%-20s\033[0m %s\n", $$1, $$2}'
-
-.PHONY: build-web
-build-web: ## Compile web bundle, copy to bskyweb directory
-	yarn intl:build
-	yarn build-web
-
-.PHONY: build-web-embed
-build-web-embed: ## Compile web embed bundle, copy to bskyweb/embedr* directories
-	yarn intl:build
-	yarn build-embed
-
-.PHONY: test
-test: ## Run all tests
-	NODE_ENV=test EXPO_PUBLIC_ENV=test yarn test
-
-.PHONY: lint
-lint: ## Run style checks and verify syntax
-	yarn run lint
-
-#.PHONY: fmt
-#fmt: ## Run syntax re-formatting
-#	yarn prettier
-
-.PHONY: deps
-deps: ## Installs dependent libs using 'yarn install'
-	yarn install --frozen-lockfile
-	cd bskyembed && yarn install --frozen-lockfile
-
-.PHONY: nvm-setup
-nvm-setup: ## Use NVM to install and activate node+yarn
-	nvm install 18
-	nvm use 18
-	npm install --global yarn

README.md

@@ -1,74 +1,52 @@
-# Bluesky Social App
+# Bluesky
 
-Welcome friends! This is the codebase for the Bluesky Social app.
+## Build instructions
 
-Get the app itself:
+- Setup your environment [using the react native instructions](https://reactnative.dev/docs/environment-setup).
+- Setup your environment [for e2e testing using detox](https://wix.github.io/Detox/docs/introduction/getting-started):
+  - yarn global add detox-cli
+  - brew tap wix/brew
+  - brew install applesimutils
+- After initial setup:
+  - `cd ios ; pod install`
+- Start the dev servers
+  - `git clone git@github.com:bluesky-social/atproto.git`
+  - `cd atproto`
+  - `yarn`
+  - `cd packages/dev-env && yarn start`
+- Run the dev app
+  - iOS: `yarn ios`
+  - Android: `yarn android`
+  - Web: `yarn web`
+- Run e2e tests
+  - Start in various console tabs:
+    - `yarn e2e:server`
+    - `yarn e2e:metro`
+  - Run once: `yarn e2e:build`
+  - Each test run: `yarn e2e:run`
+- Tips
+  - `npx react-native info` Checks what has been installed.
+  - On M1 macs, [you need to exclude "arm64" from the target architectures](https://stackoverflow.com/a/65399525)
+    - Annoyingly this must be re-set via XCode after every pod install
+  - The android simulator won't be able to access localhost services unless you run `adb reverse tcp:{PORT} tcp:{PORT}`
+    - For instance, the localhosted dev-wallet will need `adb reverse tcp:3001 tcp:3001`
+  - For some reason, the typescript compiler chokes on platform-specific files (e.g. `foo.native.ts`) but only when compiling for Web thus far. Therefore we always have one version of the file which doesn't use a platform specifier, and that should bee the Web version. ([More info](https://stackoverflow.com/questions/44001050/platform-specific-import-component-in-react-native-with-typescript).)
 
-- **Web: [bsky.app](https://bsky.app)**
-- **iOS: [App Store](https://apps.apple.com/us/app/bluesky-social/id6444370199)**
-- **Android: [Play Store](https://play.google.com/store/apps/details?id=xyz.blueskyweb.app)**
+## Various notes
 
-## Development Resources
+### Debugging
 
-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 on open source, but in [a different git repository](https://github.com/bluesky-social/atproto).
+- Note that since 0.70, debugging using the old debugger (which shows up using CMD+D) doesn't work anymore. Follow the instructions below to debug the code: https://reactnative.dev/docs/next/hermes#debugging-js-on-hermes-using-google-chromes-devtools
 
-There is a small amount of Go language source code (in `./bskyweb/`), for a web service that returns the React Native Web application.
+### Running E2E Tests
 
-The [Build Instructions](./docs/build.md) are a good place to get started with the app itself.
+- Make sure you've setup your environment following above
+- Make sure Metro and the dev server are running
+- Run `yarn e2e`
+- Find the artifacts in the `artifact` folder
 
-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:
+### Polyfills
 
-- [Overview and Guides](https://atproto.com/guides/overview)
-- [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)
+`./platform/polyfills.*.ts` adds polyfills to the environment. Currently this includes:
 
-The Bluesky Social application encompasses a set of schemas and APIs built in the overall AT Protocol framework. The namespace for these "Lexicons" is `app.bsky.*`.
-
-## Contributions
-
-> 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:**
-
-- We may not respond to your issue or PR.
-- We may close an issue or PR without much feedback.
-- We may lock discussions or contributions if our attention is getting DDOSed.
-- We're not going to provide support for build issues.
-
-**Guidelines:**
-
-- Check for existing issues before filing a new one please.
-- 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, eg 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!
-
-## Forking guidelines
-
-You have our blessing 🪄✨ to fork this application! However, it's very important to be clear to users when you're giving them a fork.
-
-Please be sure to:
-
-- Change all branding in the repository and UI to clearly differentiate from Bluesky.
-- Change any support links (feedback, email, terms of service, etc) to your own systems.
-- Replace any analytics or error-collection systems with your own so we don't get super confused.
-
-## Security disclosures
-
-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?
-
-Bluesky is an open social network built on the AT Protocol, a flexible technology that will never lock developers out of the ecosystems that they help build. With atproto, third-party can be as seamless as first-party through custom feeds, federated services, clients, and more.
-
-## License (MIT)
-
-See [./LICENSE](./LICENSE) for the full license.
-
-## P.S.
-
-We ❤️ you and all of the ways you support us. Thank you for making Bluesky a great place!
+- TextEncoder / TextDecoder

__e2e__/maestro/scroll.yaml

@@ -1,77 +0,0 @@
-# flow.yaml
-
-appId: xyz.blueskyweb.app
----
-- launchApp
-# Login
-# - runFlow:
-#    when:
-# - tapOn: "Sign In"
-# - tapOn: "Username or email address"
-# - inputText: "ansh.bsky.team"
-# - tapOn: "Password"
-# - inputText: "PASSWORd"
-# - tapOn: "Next"
-# Allow notifications if popup is visible
-# - runFlow:
-#     when:
-#       visible: "Notifications"
-#     commands:
-#       - tapOn: "Allow"
-# Scroll in main feed
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-# Swipe between feeds
-- swipe:
-    direction: "LEFT"
-- swipe:
-    direction: "LEFT"
-- swipe: 
-    direction: "LEFT"
-- swipe:
-    direction: "RIGHT"
-- swipe:
-    direction: "RIGHT"
-- swipe:
-    direction: "RIGHT"
-# Go to Notifications
-- tapOn:
-    id: "viewHeaderDrawerBtn"
-- tapOn: "Notifications"
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-- swipe:
-    direction: "DOWN" # Make header visible
-# Go to Feeds tab
-- tapOn:
-    id: "viewHeaderDrawerBtn"
-- tapOn: "Feeds"
-- scrollUntilVisible:
-    element: "Discover"
-    direction: UP
-- tapOn: "Discover"
-- waitForAnimationToEnd
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-# Click on post
-- tapOn:
-    id: "postText"
-    index: 0
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-- "scroll"
-

__e2e__/mock-server.ts

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

__e2e__/tests/composer.test.ts

@@ -1,20 +1,18 @@
 /* eslint-env detox/detox */
 
-import {beforeAll, describe, it} from '@jest/globals'
-import {expect} from 'detox'
-
-import {createServer, loginAsAlice, openApp, sleep} from '../util'
+import {openApp, login, createServer, sleep} from '../util'
 
 describe('Composer', () => {
+  let service: string
   beforeAll(async () => {
-    await createServer('?users')
+    service = await createServer('?users')
     await openApp({
       permissions: {notifications: 'YES', medialibrary: 'YES', photos: 'YES'},
     })
   })
 
   it('Login', async () => {
-    await loginAsAlice()
+    await login(service, 'alice', 'hunter2')
     await element(by.id('homeScreenFeedTabs-Following')).tap()
   })
 
@@ -42,13 +40,12 @@ describe('Composer', () => {
     await element(by.id('composerTextInput')).typeText(
       'Post with a https://example.com link card',
     )
+    await element(by.id('addLinkCardBtn')).tap()
     await element(by.id('composerPublishBtn')).tap()
     await expect(element(by.id('composeFAB'))).toBeVisible()
   })
 
   it('Reply text only', async () => {
-    await element(by.id('e2eRefreshHome')).tap()
-
     const post = by.id('feedItem-by-alice.test')
     await element(by.id('replyBtn').withAncestor(post)).atIndex(0).tap()
     await element(by.id('composerTextInput')).typeText('Reply text only')
@@ -72,6 +69,7 @@ describe('Composer', () => {
     await element(by.id('composerTextInput')).typeText(
       'Reply with a https://example.com link card',
     )
+    await element(by.id('addLinkCardBtn')).tap()
     await element(by.id('composerPublishBtn')).tap()
     await expect(element(by.id('composeFAB'))).toBeVisible()
   })
@@ -103,6 +101,7 @@ describe('Composer', () => {
     await element(by.id('composerTextInput')).typeText(
       'QP with a https://example.com link card',
     )
+    await element(by.id('addLinkCardBtn')).tap()
     await element(by.id('composerPublishBtn')).tap()
     await expect(element(by.id('composeFAB'))).toBeVisible()
   })

__e2e__/tests/create-account.test.ts

@@ -1,7 +1,5 @@
 /* eslint-env detox/detox */
 
-import {describe, beforeAll, it} from '@jest/globals'
-import {expect} from 'detox'
 import {openApp, createServer} from '../util'
 
 describe('Create account', () => {
@@ -12,28 +10,22 @@ describe('Create account', () => {
   })
 
   it('I can create a new account', async () => {
-    await element(by.id('e2eOpenLoggedOutView')).tap()
-
     await element(by.id('createAccountButton')).tap()
     await device.takeScreenshot('1- opened create account screen')
-    await element(by.id('selectServiceButton')).tap()
+    await element(by.id('otherServerBtn')).tap()
     await device.takeScreenshot('2- selected other server')
-    await element(by.id('customSelectBtn')).tap()
-    await element(by.id('customServerTextInput')).typeText(service)
-    await element(by.id('customServerTextInput')).tapReturnKey()
-    await element(by.id('doneBtn')).tap()
+    await element(by.id('customServerInput')).clearText()
+    await element(by.id('customServerInput')).typeText(service)
     await device.takeScreenshot('3- input test server URL')
+    await element(by.id('nextBtn')).tap()
     await element(by.id('emailInput')).typeText('example@test.com')
     await element(by.id('passwordInput')).typeText('hunter2')
+    await element(by.id('is13Input')).tap()
     await device.takeScreenshot('4- entered account details')
-
     await element(by.id('nextBtn')).tap()
-
     await element(by.id('handleInput')).typeText('e2e-test')
-    await device.takeScreenshot('5- entered handle')
-
+    await device.takeScreenshot('4- entered handle')
     await element(by.id('nextBtn')).tap()
-
-    await expect(element(by.id('onboardingInterests'))).toBeVisible()
+    await expect(element(by.id('homeScreen'))).toBeVisible()
   })
 })

__e2e__/tests/curate-lists.test.ts

@@ -1,213 +0,0 @@
-/* eslint-env detox/detox */
-
-import {beforeAll, describe, it} from '@jest/globals'
-import {expect} from 'detox'
-
-import {createServer, loginAsAlice, loginAsBob, openApp, sleep} from '../util'
-
-describe('Curate lists', () => {
-  beforeAll(async () => {
-    await createServer('?users&follows&posts')
-    await openApp({
-      permissions: {notifications: 'YES', medialibrary: 'YES', photos: 'YES'},
-    })
-  })
-
-  it('Login and create a curatelists', async () => {
-    await loginAsAlice()
-    await element(by.id('e2eGotoLists')).tap()
-    await element(by.id('newUserListBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-    await element(by.id('editNameInput')).typeText('Good Ppl')
-    await element(by.id('editDescriptionInput')).typeText('They good')
-    await element(by.id('saveBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-    await element(by.text('About')).tap()
-    await expect(element(by.id('headerTitle'))).toHaveText('Good Ppl')
-    await expect(element(by.id('listDescription'))).toHaveText('They good')
-  })
-
-  it('Edit display name and description via the edit curatelist modal', async () => {
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Edit list details')).tap()
-    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-    await element(by.id('editNameInput')).clearText()
-    await element(by.id('editNameInput')).typeText('Bad Ppl')
-    await element(by.id('editDescriptionInput')).clearText()
-    await element(by.id('editDescriptionInput')).typeText('They bad')
-    await element(by.id('saveBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-    await expect(element(by.id('headerTitle'))).toHaveText('Bad Ppl')
-    await expect(element(by.id('listDescription'))).toHaveText('They bad')
-    // have to wait for the toast to clear
-    await waitFor(element(by.id('headerDropdownBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-  })
-
-  it('Remove description via the edit curatelist modal', async () => {
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Edit list details')).tap()
-    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-    await element(by.id('editDescriptionInput')).clearText()
-    await element(by.id('saveBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-    await expect(element(by.id('listDescription'))).not.toBeVisible()
-    // have to wait for the toast to clear
-    await waitFor(element(by.id('headerDropdownBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-  })
-
-  it('Set avi via the edit curatelist modal', async () => {
-    await expect(element(by.id('userAvatarFallback'))).toExist()
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Edit list details')).tap()
-    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-    await element(by.id('changeAvatarBtn')).tap()
-    await element(by.text('Upload from Library')).tap()
-    await sleep(3e3)
-    await element(by.id('saveBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-    await expect(element(by.id('userAvatarImage'))).toExist()
-    // have to wait for the toast to clear
-    await waitFor(element(by.id('headerDropdownBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-  })
-
-  it('Remove avi via the edit curatelist modal', async () => {
-    await expect(element(by.id('userAvatarImage'))).toExist()
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Edit list details')).tap()
-    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-    await element(by.id('changeAvatarBtn')).tap()
-    await element(by.text('Remove Avatar')).tap()
-    await element(by.id('saveBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-    await expect(element(by.id('userAvatarFallback'))).toExist()
-    // have to wait for the toast to clear
-    await waitFor(element(by.id('headerDropdownBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-  })
-
-  it('Delete the curatelist', async () => {
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Delete List')).tap()
-    await element(by.id('confirmBtn')).tap()
-    await expect(element(by.id('listsEmpty'))).toBeVisible()
-  })
-
-  it('Create a new curatelist', async () => {
-    await element(by.id('e2eGotoLists')).tap()
-    await element(by.id('newUserListBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-    await element(by.id('editNameInput')).typeText('Good Ppl')
-    await element(by.id('editDescriptionInput')).typeText('They good')
-    await element(by.id('saveBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-    await element(by.text('About')).tap()
-    await expect(element(by.id('headerTitle'))).toHaveText('Good Ppl')
-    await expect(element(by.id('listDescription'))).toHaveText('They good')
-  })
-
-  it('Adds users on curatelists from the list', async () => {
-    await element(by.text('About')).tap()
-    await element(by.id('addUserBtn')).tap()
-    await expect(element(by.id('listAddUserModal'))).toBeVisible()
-    await element(by.id('searchInput')).typeText('b')
-    await waitFor(element(by.id('user-bob.test-addBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-    await element(by.id('user-bob.test-addBtn')).tap()
-    await element(by.id('doneBtn')).tap()
-    await expect(element(by.id('listAddUserModal'))).not.toBeVisible()
-    await expect(element(by.id('user-bob.test'))).toBeVisible()
-  })
-
-  it('Shows posts by the users in the list', async () => {
-    await element(by.text('Posts')).tap()
-    await expect(element(by.id('feedItem-by-bob.test'))).toBeVisible()
-  })
-
-  it('Pins the list', async () => {
-    await expect(element(by.id('pinBtn'))).toBeVisible()
-    await element(by.id('pinBtn')).tap()
-    await element(by.id('e2eGotoHome')).tap()
-    await element(by.id('homeScreenFeedTabs-Good Ppl')).tap()
-    await expect(element(by.id('feedItem-by-bob.test'))).toBeVisible()
-
-    await element(by.id('bottomBarFeedsBtn')).tap()
-    await element(by.id('saved-feed-Good Ppl')).tap()
-    await expect(element(by.id('feedItem-by-bob.test'))).toBeVisible()
-
-    await element(by.id('unpinBtn')).tap()
-    await element(by.id('bottomBarHomeBtn')).tap()
-    await expect(
-      element(by.id('homeScreenFeedTabs-Good Ppl')),
-    ).not.toBeVisible()
-
-    await element(by.id('e2eGotoLists')).tap()
-    await element(by.id('list-Good Ppl')).tap()
-  })
-
-  it('Removes users on curatelists from the list', async () => {
-    await element(by.text('About')).tap()
-    await expect(element(by.id('user-bob.test'))).toBeVisible()
-    await element(by.id('user-bob.test-editBtn')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).toBeVisible()
-    await element(by.id('user-bob.test-addBtn')).tap()
-    await element(by.id('doneBtn')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).not.toBeVisible()
-  })
-
-  it('Shows the curatelist on my profile', async () => {
-    await element(by.id('bottomBarProfileBtn')).tap()
-    await element(by.id('profilePager-selector')).swipe('left')
-    await element(by.id('profilePager-selector-5')).tap()
-    await element(by.id('list-Good Ppl')).tap()
-  })
-
-  it('Adds and removes users on curatelists from the profile', async () => {
-    await element(by.id('bottomBarSearchBtn')).tap()
-    await element(by.id('searchTextInput')).typeText('bob')
-    await element(by.id('searchAutoCompleteResult-bob.test')).tap()
-    await expect(element(by.id('profileView'))).toBeVisible()
-
-    await element(by.id('profileHeaderDropdownBtn')).tap()
-    await element(by.text('Add to Lists')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).toBeVisible()
-    await element(by.id('user-bob.test-addBtn')).tap()
-    await element(by.id('doneBtn')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).not.toBeVisible()
-
-    await element(by.id('profileHeaderDropdownBtn')).tap()
-    await element(by.text('Add to Lists')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).toBeVisible()
-    await element(by.id('user-bob.test-addBtn')).tap()
-    await element(by.id('doneBtn')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).not.toBeVisible()
-  })
-
-  it('Can report a user list', async () => {
-    await element(by.id('e2eGotoSettings')).tap()
-    await element(by.id('signOutBtn')).tap()
-    await loginAsBob()
-    await element(by.id('bottomBarSearchBtn')).tap()
-    await element(by.id('searchTextInput')).typeText('alice')
-    await element(by.id('searchAutoCompleteResult-alice.test')).tap()
-    await element(by.id('profilePager-selector')).swipe('left')
-    await element(by.id('profilePager-selector-3')).tap()
-    await element(by.id('list-Good Ppl')).tap()
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Report List')).tap()
-    await expect(element(by.id('reportModal'))).toBeVisible()
-    await expect(element(by.text('Report List'))).toBeVisible()
-    await element(
-      by.id('reportReasonRadios-com.atproto.moderation.defs#reasonRude'),
-    ).tap()
-    await element(by.id('sendReportBtn')).tap()
-    await expect(element(by.id('reportModal'))).not.toBeVisible()
-  })
-})

__e2e__/tests/home-screen.test.ts

@@ -1,43 +1,24 @@
 /* eslint-env detox/detox */
 
-import {beforeAll, describe, it} from '@jest/globals'
-import {expect} from 'detox'
-
-import {createServer, loginAsAlice, openApp} from '../util'
+import {openApp, login, createServer} from '../util'
 
 describe('Home screen', () => {
+  let service: string
   beforeAll(async () => {
-    await createServer('?users&follows&posts&feeds')
+    service = await createServer('?users&follows&posts')
     await openApp({permissions: {notifications: 'YES'}})
   })
 
   it('Login', async () => {
-    await loginAsAlice()
+    await login(service, 'alice', 'hunter2')
     await element(by.id('homeScreenFeedTabs-Following')).tap()
   })
 
-  it('Can go to feeds page using feeds button in tab bar', async () => {
-    await element(by.id('homeScreenFeedTabs-Feeds ✨')).tap()
-    await expect(element(by.text('Discover New Feeds'))).toBeVisible()
-  })
-
-  it('Feeds button disappears after pinning a feed', async () => {
-    await element(by.id('bottomBarProfileBtn')).tap()
-    await element(by.id('profilePager-selector')).swipe('left')
-    await element(by.id('profilePager-selector-4')).tap()
-    await element(by.id('feed-alice-favs')).tap()
-    await element(by.id('pinBtn')).tap()
-    await element(by.id('bottomBarHomeBtn')).tap()
-    await expect(
-      element(by.id('homeScreenFeedTabs-Feeds ✨')),
-    ).not.toBeVisible()
-  })
-
   it('Can like posts', async () => {
     const carlaPosts = by.id('feedItem-by-carla.test')
     await expect(
       element(by.id('likeCount').withAncestor(carlaPosts)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
     await element(by.id('likeBtn').withAncestor(carlaPosts)).atIndex(0).tap()
     await expect(
       element(by.id('likeCount').withAncestor(carlaPosts)).atIndex(0),
@@ -45,14 +26,14 @@ describe('Home screen', () => {
     await element(by.id('likeBtn').withAncestor(carlaPosts)).atIndex(0).tap()
     await expect(
       element(by.id('likeCount').withAncestor(carlaPosts)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
   })
 
   it('Can repost posts', async () => {
     const carlaPosts = by.id('feedItem-by-carla.test')
     await expect(
       element(by.id('repostCount').withAncestor(carlaPosts)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
     await element(by.id('repostBtn').withAncestor(carlaPosts)).atIndex(0).tap()
     await expect(element(by.id('repostModal'))).toBeVisible()
     await element(by.id('repostBtn').withAncestor(by.id('repostModal'))).tap()
@@ -66,30 +47,31 @@ describe('Home screen', () => {
     await expect(element(by.id('repostModal'))).not.toBeVisible()
     await expect(
       element(by.id('repostCount').withAncestor(carlaPosts)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
   })
 
-  // TODO skipping because the test env PDS isnt setup correctly to handle the report -prf
-  // it('Can report posts', async () => {
-  //   const carlaPosts = by.id('feedItem-by-carla.test')
-  //   await element(by.id('postDropdownBtn').withAncestor(carlaPosts))
-  //     .atIndex(0)
-  //     .tap()
-  //   await element(by.text('Report post')).tap()
-  //   await element(by.id('com.atproto.moderation.defs#reasonSpam')).tap()
-  //   await element(by.id('sendReportBtn')).tap()
-  // })
+  it('Can report posts', async () => {
+    const carlaPosts = by.id('feedItem-by-carla.test')
+    await element(by.id('postDropdownBtn').withAncestor(carlaPosts))
+      .atIndex(0)
+      .tap()
+    await element(by.id('postDropdownReportBtn')).tap()
+    await expect(element(by.id('reportPostModal'))).toBeVisible()
+    await element(by.id('reportPostRadios-spam')).tap()
+    await element(by.id('sendReportBtn')).tap()
+    await expect(element(by.id('reportPostModal'))).not.toBeVisible()
+  })
 
   it('Can swipe between feeds', async () => {
     await element(by.id('homeScreen')).swipe('left', 'fast', 0.75)
-    await expect(element(by.id('customFeedPage'))).toBeVisible()
+    await expect(element(by.id('whatshotFeedPage'))).toBeVisible()
     await element(by.id('homeScreen')).swipe('right', 'fast', 0.75)
     await expect(element(by.id('followingFeedPage'))).toBeVisible()
   })
 
   it('Can tap between feeds', async () => {
-    await element(by.id('homeScreenFeedTabs-alice-favs')).tap()
-    await expect(element(by.id('customFeedPage'))).toBeVisible()
+    await element(by.id("homeScreenFeedTabs-What's hot")).tap()
+    await expect(element(by.id('whatshotFeedPage'))).toBeVisible()
     await element(by.id('homeScreenFeedTabs-Following')).tap()
     await expect(element(by.id('followingFeedPage'))).toBeVisible()
   })
@@ -100,7 +82,7 @@ describe('Home screen', () => {
     await element(by.id('postDropdownBtn').withAncestor(alicePosts))
       .atIndex(0)
       .tap()
-    await element(by.text('Delete post')).tap()
+    await element(by.id('postDropdownDeleteBtn')).tap()
     await expect(element(by.id('confirmModal'))).toBeVisible()
     await element(by.id('confirmBtn')).tap()
     await expect(

__e2e__/tests/invite-codes.test.skip.ts

@@ -1,47 +0,0 @@
-/* eslint-env detox/detox */
-
-import {beforeAll, describe, it} from '@jest/globals'
-import {expect} from 'detox'
-
-import {createServer, loginAsAlice, openApp} from '../util'
-
-describe('invite-codes', () => {
-  let service: string
-  let inviteCode = ''
-  beforeAll(async () => {
-    service = await createServer('?users&invite')
-    await openApp({permissions: {notifications: 'YES'}})
-  })
-
-  it('I can fetch invite codes', async () => {
-    await loginAsAlice()
-    await element(by.id('e2eOpenInviteCodesModal')).tap()
-    await expect(element(by.id('inviteCodesModal'))).toBeVisible()
-    const attrs = await element(by.id('inviteCode-0-code')).getAttributes()
-    inviteCode = attrs.text
-    await element(by.id('closeBtn')).tap()
-    await element(by.id('e2eSignOut')).tap()
-  })
-
-  it('I can create a new account with the invite code', async () => {
-    await element(by.id('e2eOpenLoggedOutView')).tap()
-    await element(by.id('createAccountButton')).tap()
-    await device.takeScreenshot('1- opened create account screen')
-    await element(by.id('selectServiceButton')).tap()
-    await device.takeScreenshot('2- selected other server')
-    await element(by.id('customSelectBtn')).tap()
-    await element(by.id('customServerTextInput')).typeText(service)
-    await element(by.id('customServerTextInput')).tapReturnKey()
-    await element(by.id('doneBtn')).tap()
-    await device.takeScreenshot('3- input test server URL')
-    await element(by.id('inviteCodeInput')).typeText(inviteCode)
-    await element(by.id('emailInput')).typeText('example@test.com')
-    await element(by.id('passwordInput')).typeText('hunter2')
-    await device.takeScreenshot('4- entered account details')
-    await element(by.id('nextBtn')).tap()
-    await element(by.id('handleInput')).typeText('e2e-test')
-    await device.takeScreenshot('4- entered handle')
-    await element(by.id('nextBtn')).tap()
-    await expect(element(by.id('onboardingInterests'))).toBeVisible()
-  })
-})

__e2e__/tests/invite-codes.test.ts

@@ -0,0 +1,64 @@
+/* eslint-env detox/detox */
+
+import {openApp, login, createServer} from '../util'
+
+describe('invite-codes', () => {
+  let service: string
+  let inviteCode = ''
+  beforeAll(async () => {
+    service = await createServer('?users&invite')
+    await openApp({permissions: {notifications: 'YES'}})
+  })
+
+  it('I can fetch invite codes', async () => {
+    await expect(element(by.id('signInButton'))).toBeVisible()
+    await login(service, 'alice', 'hunter2')
+    await element(by.id('viewHeaderDrawerBtn')).tap()
+    await expect(element(by.id('drawer'))).toBeVisible()
+    await element(by.id('menuItemInviteCodes')).tap()
+    await expect(element(by.id('inviteCodesModal'))).toBeVisible()
+    const attrs = await element(by.id('inviteCode-0-code')).getAttributes()
+    inviteCode = attrs.text
+    await element(by.id('closeBtn')).tap()
+    await element(by.id('viewHeaderDrawerBtn')).tap()
+    await element(by.id('menuItemButton-Settings')).tap()
+    await element(by.id('signOutBtn')).tap()
+  })
+
+  it('I can create a new account with the invite code', async () => {
+    await element(by.id('createAccountButton')).tap()
+    await device.takeScreenshot('1- opened create account screen')
+    await element(by.id('otherServerBtn')).tap()
+    await device.takeScreenshot('2- selected other server')
+    await element(by.id('customServerInput')).clearText()
+    await element(by.id('customServerInput')).typeText(service)
+    await device.takeScreenshot('3- input test server URL')
+    await element(by.id('nextBtn')).tap()
+    await element(by.id('inviteCodeInput')).typeText(inviteCode)
+    await element(by.id('emailInput')).typeText('example@test.com')
+    await element(by.id('passwordInput')).typeText('hunter2')
+    await element(by.id('is13Input')).tap()
+    await device.takeScreenshot('4- entered account details')
+    await element(by.id('nextBtn')).tap()
+    await element(by.id('handleInput')).typeText('e2e-test')
+    await device.takeScreenshot('4- entered handle')
+    await element(by.id('nextBtn')).tap()
+    await expect(element(by.id('homeScreen'))).toBeVisible()
+    await element(by.id('viewHeaderDrawerBtn')).tap()
+    await element(by.id('menuItemButton-Settings')).tap()
+    await element(by.id('signOutBtn')).tap()
+  })
+
+  it('I get a notification for the new user', async () => {
+    await expect(element(by.id('signInButton'))).toBeVisible()
+    await login(service, 'alice', 'hunter2')
+    await element(by.id('viewHeaderDrawerBtn')).tap()
+    await element(by.id('menuItemButton-Notifications')).tap()
+    await expect(element(by.id('invitedUser'))).toBeVisible()
+  })
+
+  it('I can dismiss the new user notification', async () => {
+    await element(by.id('dismissBtn')).tap()
+    await expect(element(by.id('invitedUser'))).not.toBeVisible()
+  })
+})

__e2e__/tests/login.test.ts

@@ -1,7 +1,5 @@
 /* eslint-env detox/detox */
 
-import {describe, beforeAll, it} from '@jest/globals'
-import {expect} from 'detox'
 import {openApp, login, createServer} from '../util'
 
 describe('Login', () => {
@@ -12,8 +10,6 @@ describe('Login', () => {
   })
 
   it('As Alice, I can login', async () => {
-    await element(by.id('e2eOpenLoggedOutView')).tap()
-
     await expect(element(by.id('signInButton'))).toBeVisible()
     await login(service, 'alice', 'hunter2', {
       takeScreenshots: true,

__e2e__/tests/merge-feed.test.skip.ts

@@ -1,163 +0,0 @@
-/* eslint-env detox/detox */
-
-import {describe, beforeAll, it} from '@jest/globals'
-import {expect} from 'detox'
-import {openApp, loginAsAlice, createServer} from '../util'
-
-describe('Mergefeed', () => {
-  beforeAll(async () => {
-    await createServer('?mergefeed')
-    await openApp({permissions: {notifications: 'YES'}})
-  })
-
-  it('Login', async () => {
-    await element(by.id('e2eOpenLoggedOutView')).tap()
-    await loginAsAlice()
-    await element(by.id('e2eToggleMergefeed')).tap()
-    await element(by.id('bottomBarFeedsBtn')).tap()
-    await element(by.id('feed-alice-favs-toggleSave')).tap()
-    await element(by.id('e2eGotoHome')).tap()
-  })
-
-  it('Sees the expected mix of posts with default filters', async () => {
-    await element(by.id('followingFeedPage-feed-flatlist')).swipe(
-      'down',
-      'slow',
-      1,
-      0.5,
-      0.5,
-    )
-    // followed users
-    await expect(
-      element(
-        by.id('postText').withAncestor(by.id('feedItem-by-carla.test')),
-      ).atIndex(0),
-    ).toHaveText('Post 9')
-    await expect(
-      element(
-        by.id('postText').withAncestor(by.id('feedItem-by-bob.test')),
-      ).atIndex(0),
-    ).toHaveText('Post 9')
-    await element(by.id('followingFeedPage-feed-flatlist')).swipe(
-      'up',
-      'fast',
-      1,
-      0.5,
-      0.5,
-    )
-    // feed users
-    await expect(
-      element(
-        by.id('postText').withAncestor(by.id('feedItem-by-dan.test')),
-      ).atIndex(0),
-    ).toHaveText('Post 0')
-  })
-
-  it('Sees the expected mix of posts with replies disabled', async () => {
-    await element(by.id('followingFeedPage-feed-flatlist')).swipe(
-      'down',
-      'fast',
-      1,
-      0.5,
-      0.5,
-    )
-    await element(by.id('followingFeedPage-feed-flatlist')).swipe(
-      'down',
-      'fast',
-      1,
-      0.5,
-      0.5,
-    )
-    await element(by.id('viewHeaderHomeFeedPrefsBtn')).tap()
-    await element(by.id('toggleRepliesBtn')).tap()
-    await element(by.id('confirmBtn')).tap()
-    await element(by.id('followingFeedPage-feed-flatlist')).swipe(
-      'down',
-      'slow',
-      1,
-      0.5,
-      0.5,
-    )
-
-    // followed users
-    await expect(
-      element(
-        by.id('postText').withAncestor(by.id('feedItem-by-carla.test')),
-      ).atIndex(0),
-    ).toHaveText('Post 9')
-    await expect(
-      element(
-        by.id('postText').withAncestor(by.id('feedItem-by-bob.test')),
-      ).atIndex(0),
-    ).toHaveText('Post 9')
-    await element(by.id('followingFeedPage-feed-flatlist')).swipe(
-      'up',
-      'fast',
-      1,
-      0.5,
-      0.5,
-    )
-
-    // feed users
-    await expect(
-      element(
-        by.id('postText').withAncestor(by.id('feedItem-by-dan.test')),
-      ).atIndex(0),
-    ).toHaveText('Post 0')
-  })
-
-  it('Sees the expected mix of posts with no follows', async () => {
-    await element(by.id('followingFeedPage-feed-flatlist')).swipe(
-      'down',
-      'fast',
-      1,
-      0.5,
-      0.5,
-    )
-
-    await element(by.id('bottomBarSearchBtn')).tap()
-    await element(by.id('searchTextInput')).typeText('bob')
-    await element(by.id('searchAutoCompleteResult-bob.test')).tap()
-    await expect(element(by.id('profileView'))).toBeVisible()
-    await element(by.id('unfollowBtn')).tap()
-    await element(by.id('profileHeaderBackBtn')).tap()
-
-    // have to wait for the toast to clear
-    await waitFor(element(by.id('searchTextInputClearBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-    await element(by.id('searchTextInputClearBtn')).tap()
-    await element(by.id('searchTextInput')).typeText('carla')
-    await element(by.id('searchAutoCompleteResult-carla.test')).tap()
-    await expect(element(by.id('profileView'))).toBeVisible()
-    await element(by.id('unfollowBtn')).tap()
-    await element(by.id('profileHeaderBackBtn')).tap()
-
-    await element(by.id('bottomBarHomeBtn')).tap()
-    await element(by.id('followingFeedPage-feed-flatlist')).swipe(
-      'down',
-      'slow',
-      1,
-      0.5,
-      0.5,
-    )
-    await element(by.id('followingFeedPage-feed-flatlist')).swipe(
-      'down',
-      'slow',
-      1,
-      0.5,
-      0.5,
-    )
-
-    // followed users NOT present
-    await expect(element(by.id('feedItem-by-carla.test'))).not.toExist()
-    await expect(element(by.id('feedItem-by-bob.test'))).not.toExist()
-
-    // feed users
-    await expect(
-      element(
-        by.id('postText').withAncestor(by.id('feedItem-by-dan.test')),
-      ).atIndex(0),
-    ).toHaveText('Post 0')
-  })
-})

__e2e__/tests/mod-lists.test.ts

@@ -1,189 +0,0 @@
-/* eslint-env detox/detox */
-
-import {describe, beforeAll, it} from '@jest/globals'
-import {expect} from 'detox'
-import {openApp, loginAsAlice, loginAsBob, createServer} from '../util'
-
-describe('Mod lists', () => {
-  beforeAll(async () => {
-    await createServer('?users&follows&labels')
-    await openApp({
-      permissions: {notifications: 'YES', medialibrary: 'YES', photos: 'YES'},
-    })
-  })
-
-  it('Login and view my modlists', async () => {
-    await loginAsAlice()
-    await element(by.id('e2eGotoModeration')).tap()
-    await element(by.id('moderationlistsBtn')).tap()
-    await expect(element(by.id('list-Muted Users'))).toBeVisible()
-    await element(by.id('list-Muted Users')).tap()
-    await expect(
-      element(by.id('user-muted-by-list-account.test')),
-    ).toBeVisible()
-  })
-
-  it('Toggle mute subscription', async () => {
-    await element(by.id('unmuteBtn')).tap()
-    await element(by.id('subscribeBtn')).tap()
-    await element(by.text('Mute accounts')).tap()
-    await element(by.id('confirmBtn')).tap()
-  })
-
-  it('Edit display name and description via the edit modlist modal', async () => {
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Edit list details')).tap()
-    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-    await element(by.id('editNameInput')).clearText()
-    await element(by.id('editNameInput')).typeText('Bad Ppl')
-    await element(by.id('editDescriptionInput')).clearText()
-    await element(by.id('editDescriptionInput')).typeText('They bad')
-    await element(by.id('saveBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-    await expect(element(by.id('headerTitle'))).toHaveText('Bad Ppl')
-    await expect(element(by.id('listDescription'))).toHaveText('They bad')
-    // have to wait for the toast to clear
-    await waitFor(element(by.id('headerDropdownBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-  })
-
-  it('Remove description via the edit modlist modal', async () => {
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Edit list details')).tap()
-    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-    await element(by.id('editDescriptionInput')).clearText()
-    await element(by.id('saveBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-    await expect(element(by.id('listDescription'))).not.toBeVisible()
-    // have to wait for the toast to clear
-    await waitFor(element(by.id('headerDropdownBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-  })
-
-  // DISABLED e2e environment is real finicky about avatar uploads -prf
-  // it('Set avi via the edit modlist modal', async () => {
-  //   await expect(element(by.id('userAvatarFallback'))).toExist()
-  //   await element(by.id('headerDropdownBtn')).tap()
-  //   await element(by.text('Edit list details')).tap()
-  //   await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-  //   await element(by.id('changeAvatarBtn')).tap()
-  //   await element(by.text('Library')).tap()
-  //   await sleep(3e3)
-  //   await element(by.id('saveBtn')).tap()
-  //   await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-  //   await expect(element(by.id('userAvatarImage'))).toExist()
-  //   // have to wait for the toast to clear
-  //   await waitFor(element(by.id('headerDropdownBtn')))
-  //     .toBeVisible()
-  //     .withTimeout(5000)
-  // })
-
-  // it('Remove avi via the edit modlist modal', async () => {
-  //   await expect(element(by.id('userAvatarImage'))).toExist()
-  //   await element(by.id('headerDropdownBtn')).tap()
-  //   await element(by.text('Edit list details')).tap()
-  //   await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-  //   await element(by.id('changeAvatarBtn')).tap()
-  //   await element(by.text('Remove')).tap()
-  //   await element(by.id('saveBtn')).tap()
-  //   await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-  //   await expect(element(by.id('userAvatarFallback'))).toExist()
-  //   // have to wait for the toast to clear
-  //   await waitFor(element(by.id('headerDropdownBtn')))
-  //     .toBeVisible()
-  //     .withTimeout(5000)
-  // })
-
-  it('Delete the modlist', async () => {
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Delete List')).tap()
-    await element(by.id('confirmBtn')).tap()
-    await expect(element(by.id('listsEmpty'))).toBeVisible()
-  })
-
-  it('Create a new modlist', async () => {
-    await element(by.id('newModListBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
-    await element(by.id('editNameInput')).typeText('Bad Ppl')
-    await element(by.id('editDescriptionInput')).typeText('They bad')
-    await element(by.id('saveBtn')).tap()
-    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
-    await expect(element(by.id('headerTitle'))).toHaveText('Bad Ppl')
-    await expect(element(by.id('listDescription'))).toHaveText('They bad')
-  })
-
-  it('Adds and removes users on modlists from the list', async () => {
-    await element(by.id('addUserBtn')).tap()
-    await expect(element(by.id('listAddUserModal'))).toBeVisible()
-    await waitFor(element(by.id('user-warn-posts.test-addBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-    await element(by.id('user-warn-posts.test-addBtn')).tap()
-    await element(by.id('doneBtn')).tap()
-    await expect(element(by.id('listAddUserModal'))).not.toBeVisible()
-    await element(by.id('listItems-flatlist')).swipe(
-      'down',
-      'slow',
-      1,
-      0.5,
-      0.5,
-    )
-    await expect(element(by.id('user-warn-posts.test'))).toBeVisible()
-    await element(by.id('user-warn-posts.test-editBtn')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).toBeVisible()
-    await element(by.id('user-warn-posts.test-addBtn')).tap()
-    await element(by.id('doneBtn')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).not.toBeVisible()
-  })
-
-  it('Shows the modlist on my profile', async () => {
-    await element(by.id('bottomBarProfileBtn')).tap()
-    await element(by.id('profilePager-selector')).swipe('left')
-    await element(by.id('profilePager-selector-5')).tap()
-    await element(by.id('list-Bad Ppl')).tap()
-  })
-
-  it('Adds and removes users on modlists from the profile', async () => {
-    await element(by.id('bottomBarSearchBtn')).tap()
-    await element(by.id('searchTextInput')).typeText('bob')
-    await element(by.id('searchAutoCompleteResult-bob.test')).tap()
-    await expect(element(by.id('profileView'))).toBeVisible()
-
-    await element(by.id('profileHeaderDropdownBtn')).tap()
-    await element(by.text('Add to Lists')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).toBeVisible()
-    await element(by.id('user-bob.test-addBtn')).tap()
-    await element(by.id('doneBtn')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).not.toBeVisible()
-
-    await element(by.id('profileHeaderDropdownBtn')).tap()
-    await element(by.text('Add to Lists')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).toBeVisible()
-    await element(by.id('user-bob.test-addBtn')).tap()
-    await element(by.id('doneBtn')).tap()
-    await expect(element(by.id('userAddRemoveListsModal'))).not.toBeVisible()
-  })
-
-  it('Can report a mute list', async () => {
-    await element(by.id('e2eGotoSettings')).tap()
-    await element(by.id('signOutBtn')).tap()
-    await loginAsBob()
-    await element(by.id('bottomBarSearchBtn')).tap()
-    await element(by.id('searchTextInput')).typeText('alice')
-    await element(by.id('searchAutoCompleteResult-alice.test')).tap()
-    await element(by.id('profilePager-selector')).swipe('left')
-    await element(by.id('profilePager-selector-3')).tap()
-    await element(by.id('list-Bad Ppl')).tap()
-    await element(by.id('headerDropdownBtn')).tap()
-    await element(by.text('Report List')).tap()
-    await expect(element(by.id('reportModal'))).toBeVisible()
-    await expect(element(by.text('Report List'))).toBeVisible()
-    await element(
-      by.id('reportReasonRadios-com.atproto.moderation.defs#reasonRude'),
-    ).tap()
-    await element(by.id('sendReportBtn')).tap()
-    await expect(element(by.id('reportModal'))).not.toBeVisible()
-  })
-})

__e2e__/tests/profile-screen.test.ts

@@ -1,31 +1,22 @@
 /* eslint-env detox/detox */
 
-import {beforeAll, describe, it} from '@jest/globals'
-import {expect} from 'detox'
-
-import {createServer, loginAsAlice, openApp, sleep} from '../util'
+import {openApp, login, createServer, sleep} from '../util'
 
 describe('Profile screen', () => {
+  let service: string
   beforeAll(async () => {
-    await createServer('?users&posts&feeds')
+    service = await createServer('?users&posts')
     await openApp({
       permissions: {notifications: 'YES', medialibrary: 'YES', photos: 'YES'},
     })
   })
 
   it('Login and navigate to my profile', async () => {
-    await loginAsAlice()
+    await expect(element(by.id('signInButton'))).toBeVisible()
+    await login(service, 'alice', 'hunter2')
     await element(by.id('bottomBarProfileBtn')).tap()
   })
 
-  it('Can see feeds', async () => {
-    await element(by.id('profilePager-selector')).swipe('left')
-    await element(by.id('profilePager-selector-4')).tap()
-    await expect(element(by.id('feed-alice-favs'))).toBeVisible()
-    await element(by.id('profilePager-selector')).swipe('right')
-    await element(by.id('profilePager-selector-0')).tap()
-  })
-
   it('Open and close edit profile modal', async () => {
     await element(by.id('profileHeaderEditProfileButton')).tap()
     await expect(element(by.id('editProfileModal'))).toBeVisible()
@@ -62,7 +53,7 @@ describe('Profile screen', () => {
     await expect(element(by.id('profileHeaderDisplayName'))).toHaveText(
       'alice.test',
     )
-    await expect(element(by.id('profileHeaderDescription'))).not.toExist()
+    await expect(element(by.id('profileHeaderDescription'))).toHaveText('')
   })
 
   it('Set avi and banner via the edit profile modal', async () => {
@@ -71,10 +62,10 @@ describe('Profile screen', () => {
     await element(by.id('profileHeaderEditProfileButton')).tap()
     await expect(element(by.id('editProfileModal'))).toBeVisible()
     await element(by.id('changeBannerBtn')).tap()
-    await element(by.text('Upload from Library')).tap()
+    await element(by.id('changeBannerLibraryBtn')).tap()
     await sleep(3e3)
     await element(by.id('changeAvatarBtn')).tap()
-    await element(by.text('Upload from Library')).tap()
+    await element(by.id('changeAvatarLibraryBtn')).tap()
     await sleep(3e3)
     await element(by.id('editProfileSaveBtn')).tap()
     await expect(element(by.id('editProfileModal'))).not.toBeVisible()
@@ -88,9 +79,9 @@ describe('Profile screen', () => {
     await element(by.id('profileHeaderEditProfileButton')).tap()
     await expect(element(by.id('editProfileModal'))).toBeVisible()
     await element(by.id('changeBannerBtn')).tap()
-    await element(by.text('Remove Banner')).tap()
+    await element(by.id('changeBannerRemoveBtn')).tap()
     await element(by.id('changeAvatarBtn')).tap()
-    await element(by.text('Remove Avatar')).tap()
+    await element(by.id('changeAvatarRemoveBtn')).tap()
     await element(by.id('editProfileSaveBtn')).tap()
     await expect(element(by.id('editProfileModal'))).not.toBeVisible()
     await expect(element(by.id('userBannerFallback'))).toExist()
@@ -102,7 +93,7 @@ describe('Profile screen', () => {
     // have to wait for the toast to clear
     await waitFor(element(by.id('searchTextInput')))
       .toBeVisible()
-      .withTimeout(5000)
+      .withTimeout(2000)
     await element(by.id('searchTextInput')).typeText('bob')
     await element(by.id('searchAutoCompleteResult-bob.test')).tap()
     await expect(element(by.id('profileView'))).toBeVisible()
@@ -116,40 +107,29 @@ describe('Profile screen', () => {
   })
 
   it('Can mute/unmute another user', async () => {
-    await expect(element(by.id('profileHeaderAlert'))).not.toExist()
+    await expect(element(by.id('profileHeaderMutedNotice'))).not.toExist()
     await element(by.id('profileHeaderDropdownBtn')).tap()
-    await element(by.text('Mute Account')).tap()
-    await expect(element(by.id('profileHeaderAlert'))).toBeVisible()
+    await element(by.id('profileHeaderDropdownMuteBtn')).tap()
+    await expect(element(by.id('profileHeaderMutedNotice'))).toBeVisible()
     await element(by.id('profileHeaderDropdownBtn')).tap()
-    await element(by.text('Unmute Account')).tap()
-    await expect(element(by.id('profileHeaderAlert'))).not.toExist()
+    await element(by.id('profileHeaderDropdownMuteBtn')).tap()
+    await expect(element(by.id('profileHeaderMutedNotice'))).not.toExist()
   })
 
-  // TODO skipping because the test env PDS isnt setup correctly to handle the report -prf
-  // it('Can report another user', async () => {
-  //   await element(by.id('profileHeaderDropdownBtn')).tap()
-  //   await element(by.text('Report Account')).tap()
-  //   await expect(element(by.id('reportModal'))).toBeVisible()
-  //   await element(
-  //     by.id('reportReasonRadios-com.atproto.moderation.defs#reasonSpam'),
-  //   ).tap()
-  //   await element(by.id('sendReportBtn')).tap()
-  //   await expect(element(by.id('reportModal'))).not.toBeVisible()
-  // })
+  it('Can report another user', async () => {
+    await element(by.id('profileHeaderDropdownBtn')).tap()
+    await element(by.id('profileHeaderDropdownReportBtn')).tap()
+    await expect(element(by.id('reportAccountModal'))).toBeVisible()
+    await element(by.id('reportAccountRadios-spam')).tap()
+    await element(by.id('sendReportBtn')).tap()
+    await expect(element(by.id('reportAccountModal'))).not.toBeVisible()
+  })
 
   it('Can like posts', async () => {
-    await element(by.id('postsFeed-flatlist')).swipe(
-      'down',
-      'slow',
-      1,
-      0.5,
-      0.5,
-    )
-
     const posts = by.id('feedItem-by-bob.test')
     await expect(
       element(by.id('likeCount').withAncestor(posts)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
     await element(by.id('likeBtn').withAncestor(posts)).atIndex(0).tap()
     await expect(
       element(by.id('likeCount').withAncestor(posts)).atIndex(0),
@@ -157,14 +137,14 @@ describe('Profile screen', () => {
     await element(by.id('likeBtn').withAncestor(posts)).atIndex(0).tap()
     await expect(
       element(by.id('likeCount').withAncestor(posts)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
   })
 
   it('Can repost posts', async () => {
     const posts = by.id('feedItem-by-bob.test')
     await expect(
       element(by.id('repostCount').withAncestor(posts)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
     await element(by.id('repostBtn').withAncestor(posts)).atIndex(0).tap()
     await expect(element(by.id('repostModal'))).toBeVisible()
     await element(by.id('repostBtn').withAncestor(by.id('repostModal'))).tap()
@@ -178,19 +158,16 @@ describe('Profile screen', () => {
     await expect(element(by.id('repostModal'))).not.toBeVisible()
     await expect(
       element(by.id('repostCount').withAncestor(posts)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
   })
 
-  // TODO skipping because the test env PDS isnt setup correctly to handle the report -prf
-  // it('Can report posts', async () => {
-  //   const posts = by.id('feedItem-by-bob.test')
-  //   await element(by.id('postDropdownBtn').withAncestor(posts)).atIndex(0).tap()
-  //   await element(by.text('Report post')).tap()
-  //   await expect(element(by.id('reportModal'))).toBeVisible()
-  //   await element(
-  //     by.id('reportReasonRadios-com.atproto.moderation.defs#reasonSpam'),
-  //   ).tap()
-  //   await element(by.id('sendReportBtn')).tap()
-  //   await expect(element(by.id('reportModal'))).not.toBeVisible()
-  // })
+  it('Can report posts', async () => {
+    const posts = by.id('feedItem-by-bob.test')
+    await element(by.id('postDropdownBtn').withAncestor(posts)).atIndex(0).tap()
+    await element(by.id('postDropdownReportBtn')).tap()
+    await expect(element(by.id('reportPostModal'))).toBeVisible()
+    await element(by.id('reportPostRadios-spam')).tap()
+    await element(by.id('sendReportBtn')).tap()
+    await expect(element(by.id('reportPostModal'))).not.toBeVisible()
+  })
 })

__e2e__/tests/search-screen.test.ts

@@ -1,19 +1,18 @@
 /* eslint-env detox/detox */
 
-import {describe, beforeAll, it} from '@jest/globals'
-import {expect} from 'detox'
-import {openApp, loginAsAlice, createServer} from '../util'
+import {openApp, login, createServer} from '../util'
 
 describe('Search screen', () => {
+  let service: string
   beforeAll(async () => {
-    await createServer('?users')
+    service = await createServer('?users')
     await openApp({
       permissions: {notifications: 'YES', medialibrary: 'YES', photos: 'YES'},
     })
   })
 
   it('Login', async () => {
-    await loginAsAlice()
+    await login(service, 'alice', 'hunter2')
   })
 
   it('Navigate to another user profile via autocomplete', async () => {

__e2e__/tests/self-labeling.test.ts

@@ -1,36 +0,0 @@
-/* eslint-env detox/detox */
-
-import {describe, beforeAll, it} from '@jest/globals'
-import {expect} from 'detox'
-import {openApp, loginAsAlice, createServer, sleep} from '../util'
-
-describe('Self-labeling', () => {
-  beforeAll(async () => {
-    await createServer('?users')
-    await openApp({
-      permissions: {notifications: 'YES', medialibrary: 'YES', photos: 'YES'},
-    })
-  })
-
-  it('Login', async () => {
-    await loginAsAlice()
-    await element(by.id('homeScreenFeedTabs-Following')).tap()
-  })
-
-  it('Post an image with the porn label', async () => {
-    await element(by.id('composeFAB')).tap()
-    await element(by.id('composerTextInput')).typeText('Post with an image')
-    await element(by.id('openGalleryBtn')).tap()
-    await sleep(3e3)
-    await element(by.id('labelsBtn')).tap()
-    await element(by.id('pornLabelBtn')).tap()
-    await element(by.id('confirmBtn')).tap()
-    await element(by.id('composerPublishBtn')).tap()
-    await expect(element(by.id('composeFAB'))).toBeVisible()
-    const posts = by.id('feedItem-by-alice.test')
-    await element(by.id('e2eRefreshHome')).tap()
-    await expect(
-      element(by.id('contentHider-embed').withAncestor(posts)).atIndex(0),
-    ).toExist()
-  })
-})

__e2e__/tests/shell.test.ts

@@ -1,15 +1,16 @@
 /* eslint-env detox/detox */
 
-import {openApp, loginAsAlice, createServer} from '../util'
+import {openApp, login, createServer} from '../util'
 
 describe('Shell', () => {
+  let service: string
   beforeAll(async () => {
-    await createServer('?users')
+    service = await createServer('?users')
     await openApp({permissions: {notifications: 'YES'}})
   })
 
   it('Login', async () => {
-    await loginAsAlice()
+    await login(service, 'alice', 'hunter2')
     await element(by.id('homeScreenFeedTabs-Following')).tap()
   })
 

__e2e__/tests/thread-muting.test.ts

@@ -1,103 +0,0 @@
-/* eslint-env detox/detox */
-
-import {describe, beforeAll, it} from '@jest/globals'
-import {expect} from 'detox'
-import {openApp, loginAsAlice, loginAsBob, createServer} from '../util'
-
-describe('Thread muting', () => {
-  beforeAll(async () => {
-    await createServer('?users&follows')
-    await openApp({permissions: {notifications: 'YES'}})
-  })
-
-  it('Login, create a thread, and log out', async () => {
-    await loginAsAlice()
-    await element(by.id('homeScreenFeedTabs-Following')).tap()
-    await element(by.id('composeFAB')).tap()
-    await element(by.id('composerTextInput')).typeText('Test thread')
-    await element(by.id('composerPublishBtn')).tap()
-    await expect(element(by.id('composeFAB'))).toBeVisible()
-  })
-
-  it('Login, reply to the thread, and log out', async () => {
-    await loginAsBob()
-    await element(by.id('homeScreenFeedTabs-Following')).tap()
-    const alicePosts = by.id('feedItem-by-alice.test')
-    await element(by.id('replyBtn').withAncestor(alicePosts)).atIndex(0).tap()
-    await element(by.id('composerTextInput')).typeText('Reply 1')
-    await element(by.id('composerPublishBtn')).tap()
-    await expect(element(by.id('composeFAB'))).toBeVisible()
-  })
-
-  it('Login, confirm notification exists, mute thread, and log out', async () => {
-    await loginAsAlice()
-    await element(by.id('bottomBarNotificationsBtn')).tap()
-    const bobNotifs = by.id('feedItem-by-bob.test')
-    await expect(
-      element(by.id('postText').withAncestor(bobNotifs)).atIndex(0),
-    ).toHaveText('Reply 1')
-    await element(by.id('postDropdownBtn').withAncestor(bobNotifs))
-      .atIndex(0)
-      .tap()
-    await element(by.text('Mute thread')).tap()
-    // have to wait for the toast to clear
-    await waitFor(element(by.id('viewHeaderDrawerBtn')))
-      .toBeVisible()
-      .withTimeout(5000)
-  })
-
-  it('Login, reply to the thread twice, and log out', async () => {
-    await loginAsBob()
-
-    await element(by.id('bottomBarProfileBtn')).tap()
-    await element(by.id('profilePager-selector-1')).tap()
-    const bobPosts = by.id('feedItem-by-bob.test')
-    await element(by.id('replyBtn').withAncestor(bobPosts)).atIndex(0).tap()
-    await element(by.id('composerTextInput')).typeText('Reply 2')
-    await element(by.id('composerPublishBtn')).tap()
-    await expect(element(by.id('composeFAB'))).toBeVisible()
-
-    const alicePosts = by.id('feedItem-by-alice.test')
-    await element(by.id('replyBtn').withAncestor(alicePosts)).atIndex(0).tap()
-    await element(by.id('composerTextInput')).typeText('Reply 3')
-    await element(by.id('composerPublishBtn')).tap()
-    await expect(element(by.id('composeFAB'))).toBeVisible()
-
-    await element(by.id('bottomBarHomeBtn')).tap()
-  })
-
-  it('Login, confirm notifications dont exist, unmute the thread, confirm notifications exist', async () => {
-    await loginAsAlice()
-
-    await element(by.id('bottomBarNotificationsBtn')).tap()
-    const bobNotifs = by.id('feedItem-by-bob.test')
-    await expect(
-      element(by.id('postText').withAncestor(bobNotifs)).atIndex(0),
-    ).not.toExist()
-
-    await element(by.id('bottomBarHomeBtn')).tap()
-    const alicePosts = by.id('feedItem-by-alice.test')
-    await element(by.id('postDropdownBtn').withAncestor(alicePosts))
-      .atIndex(0)
-      .tap()
-    await element(by.text('Unmute thread')).tap()
-
-    // TODO
-    // the swipe down to trigger PTR isnt working and I dont want to block on this
-    // -prf
-    // await element(by.id('bottomBarNotificationsBtn')).tap()
-    // await element(by.id('notifsFeed')).swipe('down', 'fast')
-    // await waitFor(element(by.id('postText').withAncestor(bobNotifs)))
-    //   .toBeVisible()
-    //   .withTimeout(5000)
-    // await expect(
-    //   element(by.id('postText').withAncestor(bobNotifs)).atIndex(0),
-    // ).toHaveText('Reply 2')
-    // await expect(
-    //   element(by.id('postText').withAncestor(bobNotifs)).atIndex(1),
-    // ).toHaveText('Reply 3')
-    // await expect(
-    //   element(by.id('postText').withAncestor(bobNotifs)).atIndex(2),
-    // ).toHaveText('Reply 1')
-  })
-})

__e2e__/tests/thread-screen.test.ts

@@ -1,18 +1,16 @@
 /* eslint-env detox/detox */
 
-import {beforeAll, describe, it} from '@jest/globals'
-import {expect} from 'detox'
-
-import {createServer, loginAsAlice, openApp} from '../util'
+import {openApp, login, createServer} from '../util'
 
 describe('Thread screen', () => {
+  let service: string
   beforeAll(async () => {
-    await createServer('?users&follows&thread')
+    service = await createServer('?users&follows&thread')
     await openApp({permissions: {notifications: 'YES'}})
   })
 
   it('Login & navigate to thread', async () => {
-    await loginAsAlice()
+    await login(service, 'alice', 'hunter2')
     await element(by.id('homeScreenFeedTabs-Following')).tap()
     await element(by.id('feedItem-by-bob.test')).atIndex(0).tap()
     await expect(
@@ -34,15 +32,15 @@ describe('Thread screen', () => {
   it('Can like the root post', async () => {
     const post = by.id('postThreadItem-by-bob.test')
     await expect(
-      element(by.id('likeCount-expanded').withAncestor(post)).atIndex(0),
+      element(by.id('likeCount').withAncestor(post)).atIndex(0),
     ).not.toExist()
     await element(by.id('likeBtn').withAncestor(post)).atIndex(0).tap()
     await expect(
-      element(by.id('likeCount-expanded').withAncestor(post)).atIndex(0),
+      element(by.id('likeCount').withAncestor(post)).atIndex(0),
     ).toHaveText('1 like')
     await element(by.id('likeBtn').withAncestor(post)).atIndex(0).tap()
     await expect(
-      element(by.id('likeCount-expanded').withAncestor(post)).atIndex(0),
+      element(by.id('likeCount').withAncestor(post)).atIndex(0),
     ).not.toExist()
   })
 
@@ -50,7 +48,7 @@ describe('Thread screen', () => {
     const post = by.id('postThreadItem-by-carla.test')
     await expect(
       element(by.id('likeCount').withAncestor(post)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
     await element(by.id('likeBtn').withAncestor(post)).atIndex(0).tap()
     await expect(
       element(by.id('likeCount').withAncestor(post)).atIndex(0),
@@ -58,27 +56,27 @@ describe('Thread screen', () => {
     await element(by.id('likeBtn').withAncestor(post)).atIndex(0).tap()
     await expect(
       element(by.id('likeCount').withAncestor(post)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
   })
 
   it('Can repost the root post', async () => {
     const post = by.id('postThreadItem-by-bob.test')
     await expect(
-      element(by.id('repostCount-expanded').withAncestor(post)).atIndex(0),
+      element(by.id('repostCount').withAncestor(post)).atIndex(0),
     ).not.toExist()
     await element(by.id('repostBtn').withAncestor(post)).atIndex(0).tap()
     await expect(element(by.id('repostModal'))).toBeVisible()
     await element(by.id('repostBtn').withAncestor(by.id('repostModal'))).tap()
     await expect(element(by.id('repostModal'))).not.toBeVisible()
     await expect(
-      element(by.id('repostCount-expanded').withAncestor(post)).atIndex(0),
+      element(by.id('repostCount').withAncestor(post)).atIndex(0),
     ).toHaveText('1 repost')
     await element(by.id('repostBtn').withAncestor(post)).atIndex(0).tap()
     await expect(element(by.id('repostModal'))).toBeVisible()
     await element(by.id('repostBtn').withAncestor(by.id('repostModal'))).tap()
     await expect(element(by.id('repostModal'))).not.toBeVisible()
     await expect(
-      element(by.id('repostCount-expanded').withAncestor(post)).atIndex(0),
+      element(by.id('repostCount').withAncestor(post)).atIndex(0),
     ).not.toExist()
   })
 
@@ -86,7 +84,7 @@ describe('Thread screen', () => {
     const post = by.id('postThreadItem-by-carla.test')
     await expect(
       element(by.id('repostCount').withAncestor(post)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
     await element(by.id('repostBtn').withAncestor(post)).atIndex(0).tap()
     await expect(element(by.id('repostModal'))).toBeVisible()
     await element(by.id('repostBtn').withAncestor(by.id('repostModal'))).tap()
@@ -100,32 +98,26 @@ describe('Thread screen', () => {
     await expect(element(by.id('repostModal'))).not.toBeVisible()
     await expect(
       element(by.id('repostCount').withAncestor(post)).atIndex(0),
-    ).not.toExist()
+    ).toHaveText('0')
   })
 
-  // TODO skipping because the test env PDS isnt setup correctly to handle the report -prf
-  // it('Can report the root post', async () => {
-  //   const post = by.id('postThreadItem-by-bob.test')
-  //   await element(by.id('postDropdownBtn').withAncestor(post)).atIndex(0).tap()
-  //   await element(by.text('Report post')).tap()
-  //   await expect(element(by.id('reportModal'))).toBeVisible()
-  //   await element(
-  //     by.id('reportReasonRadios-com.atproto.moderation.defs#reasonSpam'),
-  //   ).tap()
-  //   await element(by.id('sendReportBtn')).tap()
-  //   await expect(element(by.id('reportModal'))).not.toBeVisible()
-  // })
+  it('Can report the root post', async () => {
+    const post = by.id('postThreadItem-by-bob.test')
+    await element(by.id('postDropdownBtn').withAncestor(post)).atIndex(0).tap()
+    await element(by.id('postDropdownReportBtn')).tap()
+    await expect(element(by.id('reportPostModal'))).toBeVisible()
+    await element(by.id('reportPostRadios-spam')).tap()
+    await element(by.id('sendReportBtn')).tap()
+    await expect(element(by.id('reportPostModal'))).not.toBeVisible()
+  })
 
-  // TODO skipping because the test env PDS isnt setup correctly to handle the report -prf
-  // it('Can report a reply post', async () => {
-  //   const post = by.id('postThreadItem-by-carla.test')
-  //   await element(by.id('postDropdownBtn').withAncestor(post)).atIndex(0).tap()
-  //   await element(by.text('Report post')).tap()
-  //   await expect(element(by.id('reportModal'))).toBeVisible()
-  //   await element(
-  //     by.id('reportReasonRadios-com.atproto.moderation.defs#reasonSpam'),
-  //   ).tap()
-  //   await element(by.id('sendReportBtn')).tap()
-  //   await expect(element(by.id('reportModal'))).not.toBeVisible()
-  // })
+  it('Can report a reply post', async () => {
+    const post = by.id('postThreadItem-by-carla.test')
+    await element(by.id('postDropdownBtn').withAncestor(post)).atIndex(0).tap()
+    await element(by.id('postDropdownReportBtn')).tap()
+    await expect(element(by.id('reportPostModal'))).toBeVisible()
+    await element(by.id('reportPostRadios-spam')).tap()
+    await element(by.id('sendReportBtn')).tap()
+    await expect(element(by.id('reportPostModal'))).not.toBeVisible()
+  })
 })

__e2e__/util.ts

@@ -1,25 +1,10 @@
-import {execSync} from 'child_process'
 import {resolveConfig} from 'detox/internals'
-import http from 'http'
 
 const platform = device.getPlatform()
 
 export async function openApp(opts: any) {
   opts = opts || {}
   const config = await resolveConfig()
-
-  if (device.getPlatform() === 'ios') {
-    // disable password autofill
-    execSync(
-      `plutil -replace restrictedBool.allowPasswordAutoFill.value -bool NO ~/Library/Developer/CoreSimulator/Devices/${device.id}/data/Containers/Shared/SystemGroup/systemgroup.com.apple.configurationprofiles/Library/ConfigurationProfiles/UserSettings.plist`,
-    )
-    execSync(
-      `plutil -replace restrictedBool.allowPasswordAutoFill.value -bool NO ~/Library/Developer/CoreSimulator/Devices/${device.id}/data/Library/UserConfigurationProfiles/EffectiveUserSettings.plist`,
-    )
-    execSync(
-      `plutil -replace restrictedBool.allowPasswordAutoFill.value -bool NO ~/Library/Developer/CoreSimulator/Devices/${device.id}/data/Library/UserConfigurationProfiles/PublicInfo/PublicEffectiveUserSettings.plist`,
-    )
-  }
   if (config.configurationName.split('.').includes('debug')) {
     return await openAppForDebugBuild(platform, opts)
   } else {
@@ -52,14 +37,12 @@ export async function login(
   if (await isVisible('chooseAccountForm')) {
     await element(by.id('chooseNewAccountBtn')).tap()
   }
-  await element(by.id('selectServiceButton')).tap()
+  await element(by.id('loginSelectServiceButton')).tap()
   if (takeScreenshots) {
     await device.takeScreenshot('2- opened service selector')
   }
-  await element(by.id('customSelectBtn')).tap()
   await element(by.id('customServerTextInput')).typeText(service)
-  await element(by.id('customServerTextInput')).tapReturnKey()
-  await element(by.id('doneBtn')).tap()
+  await element(by.id('customServerSelectBtn')).tap()
   if (takeScreenshots) {
     await device.takeScreenshot('3- input custom service')
   }
@@ -71,14 +54,6 @@ export async function login(
   await element(by.id('loginNextButton')).tap()
 }
 
-export async function loginAsAlice() {
-  await element(by.id('e2eSignInAlice')).tap()
-}
-
-export async function loginAsBob() {
-  await element(by.id('e2eSignInBob')).tap()
-}
-
 async function openAppForDebugBuild(platform: string, opts: any) {
   const deepLinkUrl = // Local testing with packager
     /*process.env.EXPO_USE_UPDATES
@@ -106,30 +81,10 @@ async function openAppForDebugBuild(platform: string, opts: any) {
   await sleep(3000)
 }
 
-export async function createServer(path = ''): Promise<string> {
-  return new Promise(function (resolve, reject) {
-    var req = http.request(
-      {
-        method: 'POST',
-        host: 'localhost',
-        port: 1986,
-        path: `/${path}`,
-      },
-      function (res) {
-        const body: Buffer[] = []
-        res.on('data', chunk => body.push(chunk))
-        res.on('end', function () {
-          try {
-            resolve(Buffer.concat(body).toString())
-          } catch (e) {
-            reject(e)
-          }
-        })
-      },
-    )
-    req.on('error', reject)
-    req.end()
-  })
+export async function createServer(path = '') {
+  const res = await fetch(`http://localhost:1986/${path}`, {method: 'POST'})
+  const resBody = await res.text()
+  return resBody
 }
 
 const getDeepLinkUrl = (url: string) =>

__mocks__/@gorhom/bottom-sheet.tsx

@@ -1,4 +1,4 @@
-import React, {ReactNode} from 'react'
+import React from 'react'
 import {View, ScrollView, Modal, FlatList, TextInput} from 'react-native'
 
 const BottomSheetModalContext = React.createContext(null)
@@ -6,10 +6,7 @@ const BottomSheetModalContext = React.createContext(null)
 const BottomSheetModalProvider = (props: any) => {
   return <BottomSheetModalContext.Provider {...props} value={{}} />
 }
-class BottomSheet extends React.Component<{
-  onClose?: () => void
-  children?: ReactNode
-}> {
+class BottomSheet extends React.Component<{onClose?: () => void}> {
   snapToIndex() {}
   snapToPosition() {}
   expand() {}

__mocks__/@miblanchard/react-native-slider.js

@@ -1 +0,0 @@
-export const Slider = {}

__mocks__/expo-localization.js

@@ -1 +0,0 @@
-export const getLocales = jest.fn().mockResolvedValue([])

__mocks__/sentry-expo.js

@@ -1,3 +0,0 @@
-jest.mock('sentry-expo', () => ({
-  init: () => jest.fn(),
-}))

__mocks__/zeego/dropdown-menu.js

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

__tests__/lib/images.test.ts

@@ -1,10 +1,9 @@
-import ImageResizer from '@bam.tech/react-native-image-resizer'
-import RNFetchBlob from 'rn-fetch-blob'
-
 import {
   downloadAndResize,
   DownloadAndResizeOpts,
 } from '../../src/lib/media/manip'
+import ImageResizer from '@bam.tech/react-native-image-resizer'
+import RNFetchBlob from 'rn-fetch-blob'
 
 describe('downloadAndResize', () => {
   const errorSpy = jest.spyOn(global.console, 'error')
@@ -31,7 +30,6 @@ describe('downloadAndResize', () => {
     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(),
     })
 
@@ -86,7 +84,6 @@ describe('downloadAndResize', () => {
     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(),
     })
 
@@ -121,26 +118,4 @@ describe('downloadAndResize', () => {
       {mode: 'cover'},
     )
   })
-
-  it('should return undefined for non-200 response', async () => {
-    const mockedFetch = RNFetchBlob.fetch as jest.Mock
-    mockedFetch.mockResolvedValueOnce({
-      path: jest.fn().mockReturnValue('file://downloaded-image'),
-      info: jest.fn().mockReturnValue({status: 400}),
-      flush: jest.fn(),
-    })
-
-    const opts: DownloadAndResizeOpts = {
-      uri: 'https://example.com/image',
-      width: 100,
-      height: 100,
-      maxSize: 500000,
-      mode: 'cover',
-      timeout: 10000,
-    }
-
-    const result = await downloadAndResize(opts)
-    expect(errorSpy).not.toHaveBeenCalled()
-    expect(result).toBeUndefined()
-  })
 })

__tests__/lib/link-meta.test.ts

@@ -1,4 +1,106 @@
-import {LikelyType, getLikelyType} from '../../src/lib/link-meta/link-meta'
+import {
+  LikelyType,
+  getLinkMeta,
+  getLikelyType,
+} from '../../src/lib/link-meta/link-meta'
+import {exampleComHtml} from './__mocks__/exampleComHtml'
+import {BskyAgent} from '@atproto/api'
+import {DEFAULT_SERVICE, RootStoreModel} from '../../src/state'
+
+describe('getLinkMeta', () => {
+  let rootStore: RootStoreModel
+
+  beforeEach(() => {
+    rootStore = new RootStoreModel(new BskyAgent({service: DEFAULT_SERVICE}))
+  })
+
+  const inputs = [
+    '',
+    'httpbadurl',
+    'https://example.com',
+    'https://example.com/index.html',
+    'https://example.com/image.png',
+    'https://example.com/video.avi',
+    'https://example.com/audio.ogg',
+    'https://example.com/text.txt',
+    'https://example.com/javascript.js',
+    'https://bsky.app/',
+    'https://bsky.app/index.html',
+  ]
+  const outputs = [
+    {
+      error: 'Invalid URL',
+      likelyType: LikelyType.Other,
+      url: '',
+    },
+    {
+      error: 'Invalid URL',
+      likelyType: LikelyType.Other,
+      url: 'httpbadurl',
+    },
+    {
+      likelyType: LikelyType.HTML,
+      url: 'https://example.com',
+      title: 'Example Domain',
+      description: 'An example website',
+    },
+    {
+      likelyType: LikelyType.HTML,
+      url: 'https://example.com/index.html',
+      title: 'Example Domain',
+      description: 'An example website',
+    },
+    {
+      likelyType: LikelyType.Image,
+      url: 'https://example.com/image.png',
+    },
+    {
+      likelyType: LikelyType.Video,
+      url: 'https://example.com/video.avi',
+    },
+    {
+      likelyType: LikelyType.Audio,
+      url: 'https://example.com/audio.ogg',
+    },
+    {
+      likelyType: LikelyType.Text,
+      url: 'https://example.com/text.txt',
+    },
+    {
+      likelyType: LikelyType.Other,
+      url: 'https://example.com/javascript.js',
+    },
+    {
+      likelyType: LikelyType.AtpData,
+      url: '/',
+    },
+    {
+      likelyType: LikelyType.AtpData,
+      url: '/index.html',
+    },
+    {
+      likelyType: LikelyType.Other,
+      url: '',
+      title: '',
+    },
+  ]
+  it('correctly handles a set of text inputs', async () => {
+    for (let i = 0; i < inputs.length; i++) {
+      global.fetch = jest.fn().mockImplementationOnce(() => {
+        return new Promise((resolve, _reject) => {
+          resolve({
+            ok: true,
+            status: 200,
+            text: () => exampleComHtml,
+          })
+        })
+      })
+      const input = inputs[i]
+      const output = await getLinkMeta(rootStore, input)
+      expect(output).toEqual(outputs[i])
+    }
+  })
+})
 
 describe('getLikelyType', () => {
   it('correctly handles non-parsed url', async () => {

__tests__/lib/string.test.ts

@@ -1,18 +1,15 @@
-import {RichText} from '@atproto/api'
-
-import {parseEmbedPlayerFromUrl} from 'lib/strings/embed-player'
-import {cleanError} from '../../src/lib/strings/errors'
-import {createFullHandle, makeValidHandle} from '../../src/lib/strings/handles'
-import {enforceLen, pluralize} from '../../src/lib/strings/helpers'
-import {detectLinkables} from '../../src/lib/strings/rich-text-detection'
-import {shortenLinks} from '../../src/lib/strings/rich-text-manip'
-import {ago} from '../../src/lib/strings/time'
 import {
+  getYoutubeVideoId,
   makeRecordUri,
   toNiceDomain,
-  toShareUrl,
   toShortUrl,
+  toShareUrl,
 } from '../../src/lib/strings/url-helpers'
+import {pluralize, enforceLen} from '../../src/lib/strings/helpers'
+import {ago} from '../../src/lib/strings/time'
+import {detectLinkables} from '../../src/lib/strings/rich-text-detection'
+import {makeValidHandle, createFullHandle} from '../../src/lib/strings/handles'
+import {cleanError} from '../../src/lib/strings/errors'
 
 describe('detectLinkables', () => {
   const inputs = [
@@ -51,7 +48,7 @@ describe('detectLinkables', () => {
     'Classic article https://socket3.wordpress.com/2018/02/03/designing-windows-95s-user-interface/ ',
     'https://foo.com https://bar.com/whatever https://baz.com',
     'punctuation https://foo.com, https://bar.com/whatever; https://baz.com.',
-    'parenthetical (https://foo.com)',
+    'parenthentical (https://foo.com)',
     'except for https://foo.com/thing_(cool)',
   ]
   const outputs = [
@@ -115,7 +112,7 @@ describe('detectLinkables', () => {
       {link: 'https://baz.com'},
       '.',
     ],
-    ['parenthetical (', {link: 'https://foo.com'}, ')'],
+    ['parenthentical (', {link: 'https://foo.com'}, ')'],
     ['except for ', {link: 'https://foo.com/thing_(cool)'}],
   ]
   it('correctly handles a set of text inputs', () => {
@@ -176,7 +173,6 @@ describe('ago', () => {
     1671461038,
     '04 Dec 1995 00:12:00 GMT',
     new Date(),
-    new Date().setSeconds(new Date().getSeconds() - 10),
     new Date().setMinutes(new Date().getMinutes() - 10),
     new Date().setHours(new Date().getHours() - 1),
     new Date().setDate(new Date().getDate() - 1),
@@ -185,8 +181,7 @@ describe('ago', () => {
   const outputs = [
     new Date(1671461038).toLocaleDateString(),
     new Date('04 Dec 1995 00:12:00 GMT').toLocaleDateString(),
-    'now',
-    '10s',
+    '0s',
     '10m',
     '1h',
     '1d',
@@ -301,15 +296,11 @@ describe('toShortUrl', () => {
     'https://bsky.app',
     'https://bsky.app/3jk7x4irgv52r',
     'https://bsky.app/3jk7x4irgv52r2313y182h9',
-    'https://very-long-domain-name.com/foo',
-    'https://very-long-domain-name.com/foo?bar=baz#andsomemore',
   ]
   const outputs = [
     'bsky.app',
     'bsky.app/3jk7x4irgv52r',
-    'bsky.app/3jk7x4irgv52...',
-    'very-long-domain-name.com/foo',
-    'very-long-domain-name.com/foo?bar=baz#...',
+    'bsky.app/3jk7x4irgv52r2313y...',
   ]
 
   it('shortens the url', () => {
@@ -336,443 +327,28 @@ describe('toShareUrl', () => {
   })
 })
 
-describe('shortenLinks', () => {
-  const inputs = [
-    'start https://middle.com/foo/bar?baz=bux#hash end',
-    'https://start.com/foo/bar?baz=bux#hash middle end',
-    'start middle https://end.com/foo/bar?baz=bux#hash',
-    'https://newline1.com/very/long/url/here\nhttps://newline2.com/very/long/url/here',
-    'Classic article https://socket3.wordpress.com/2018/02/03/designing-windows-95s-user-interface/',
-  ]
-  const outputs = [
-    [
-      'start middle.com/foo/bar?baz=... end',
-      ['https://middle.com/foo/bar?baz=bux#hash'],
-    ],
-    [
-      'start.com/foo/bar?baz=... middle end',
-      ['https://start.com/foo/bar?baz=bux#hash'],
-    ],
-    [
-      'start middle end.com/foo/bar?baz=...',
-      ['https://end.com/foo/bar?baz=bux#hash'],
-    ],
-    [
-      'newline1.com/very/long/ur...\nnewline2.com/very/long/ur...',
-      [
-        'https://newline1.com/very/long/url/here',
-        'https://newline2.com/very/long/url/here',
-      ],
-    ],
-    [
-      'Classic article socket3.wordpress.com/2018/02/03/d...',
-      [
-        'https://socket3.wordpress.com/2018/02/03/designing-windows-95s-user-interface/',
-      ],
-    ],
-  ]
+describe('getYoutubeVideoId', () => {
+  it(' should return undefined for invalid youtube links', () => {
+    expect(getYoutubeVideoId('')).toBeUndefined()
+    expect(getYoutubeVideoId('https://www.google.com')).toBeUndefined()
+    expect(getYoutubeVideoId('https://www.youtube.com')).toBeUndefined()
+    expect(
+      getYoutubeVideoId('https://www.youtube.com/channelName'),
+    ).toBeUndefined()
+    expect(
+      getYoutubeVideoId('https://www.youtube.com/channel/channelName'),
+    ).toBeUndefined()
+  })
 
-  it('correctly shortens rich text while preserving facet URIs', () => {
-    for (let i = 0; i < inputs.length; i++) {
-      const input = inputs[i]
-      const inputRT = new RichText({text: input})
-      inputRT.detectFacetsWithoutResolution()
-      const outputRT = shortenLinks(inputRT)
-      expect(outputRT.text).toEqual(outputs[i][0])
-      expect(outputRT.facets?.length).toEqual(outputs[i][1].length)
-      for (let j = 0; j < outputs[i][1].length; j++) {
-        expect(outputRT.facets![j].features[0].uri).toEqual(outputs[i][1][j])
-      }
-    }
-  })
-})
-
-describe('parseEmbedPlayerFromUrl', () => {
-  const inputs = [
-    'https://youtu.be/videoId',
-    'https://www.youtube.com/watch?v=videoId',
-    'https://www.youtube.com/watch?v=videoId&feature=share',
-    'https://youtube.com/watch?v=videoId',
-    'https://youtube.com/watch?v=videoId&feature=share',
-    'https://youtube.com/shorts/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://twitch.tv/channelName',
-    'https://www.twitch.tv/channelName',
-    'https://m.twitch.tv/channelName',
-
-    'https://twitch.tv/channelName/clip/clipId',
-    'https://twitch.tv/videos/videoId',
-
-    'https://open.spotify.com/playlist/playlistId',
-    'https://open.spotify.com/playlist/playlistId?param=value',
-    'https://open.spotify.com/locale/playlist/playlistId',
-
-    'https://open.spotify.com/track/songId',
-    'https://open.spotify.com/track/songId?param=value',
-    'https://open.spotify.com/locale/track/songId',
-
-    'https://open.spotify.com/album/albumId',
-    'https://open.spotify.com/album/albumId?param=value',
-    'https://open.spotify.com/locale/album/albumId',
-
-    'https://soundcloud.com/user/track',
-    'https://soundcloud.com/user/sets/set',
-    'https://soundcloud.com/user/',
-
-    'https://music.apple.com/us/playlist/playlistName/playlistId',
-    'https://music.apple.com/us/album/albumName/albumId',
-    'https://music.apple.com/us/album/albumName/albumId?i=songId',
-
-    'https://vimeo.com/videoId',
-    'https://vimeo.com/videoId?autoplay=0',
-
-    'https://giphy.com/gifs/some-random-gif-name-gifId',
-    'https://giphy.com/gif/some-random-gif-name-gifId',
-    'https://giphy.com/gifs/',
-
-    'https://giphy.com/gifs/39248209509382934029?hh=100&ww=100',
-
-    'https://media.giphy.com/media/gifId/giphy.webp',
-    'https://media0.giphy.com/media/gifId/giphy.webp',
-    'https://media1.giphy.com/media/gifId/giphy.gif',
-    'https://media2.giphy.com/media/gifId/giphy.webp',
-    'https://media3.giphy.com/media/gifId/giphy.mp4',
-    'https://media4.giphy.com/media/gifId/giphy.webp',
-    'https://media5.giphy.com/media/gifId/giphy.mp4',
-    'https://media0.giphy.com/media/gifId/giphy.mp3',
-    'https://media1.google.com/media/gifId/giphy.webp',
-
-    'https://media.giphy.com/media/trackingId/gifId/giphy.webp',
-
-    'https://i.giphy.com/media/gifId/giphy.webp',
-    'https://i.giphy.com/media/gifId/giphy.webp',
-    'https://i.giphy.com/gifId.gif',
-    'https://i.giphy.com/gifId.gif',
-
-    'https://tenor.com/view/gifId',
-    'https://tenor.com/notView/gifId',
-    'https://tenor.com/view',
-    'https://tenor.com/view/gifId.gif',
-    'https://tenor.com/intl/view/gifId.gif',
-
-    'https://media.tenor.com/someID_AAAAC/someName.gif?hh=100&ww=100',
-    'https://media.tenor.com/someID_AAAAC/someName.gif',
-    'https://media.tenor.com/someID/someName.gif',
-    'https://media.tenor.com/someID',
-    'https://media.tenor.com',
-  ]
-
-  const outputs = [
-    {
-      type: 'youtube_video',
-      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',
-    },
-    {
-      type: 'youtube_video',
-      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',
-    },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
-    },
-    {
-      type: 'youtube_short',
-      source: 'youtubeShorts',
-      hideDetails: true,
-      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',
-    },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
-    },
-
-    undefined,
-    undefined,
-    undefined,
-
-    {
-      type: 'twitch_video',
-      source: 'twitch',
-      playerUri: `https://player.twitch.tv/?volume=0.5&!muted&autoplay&channel=channelName&parent=localhost`,
-    },
-    {
-      type: 'twitch_video',
-      source: 'twitch',
-      playerUri: `https://player.twitch.tv/?volume=0.5&!muted&autoplay&channel=channelName&parent=localhost`,
-    },
-    {
-      type: 'twitch_video',
-      source: 'twitch',
-      playerUri: `https://player.twitch.tv/?volume=0.5&!muted&autoplay&channel=channelName&parent=localhost`,
-    },
-    {
-      type: 'twitch_video',
-      source: 'twitch',
-      playerUri: `https://clips.twitch.tv/embed?volume=0.5&autoplay=true&clip=clipId&parent=localhost`,
-    },
-    {
-      type: 'twitch_video',
-      source: 'twitch',
-      playerUri: `https://player.twitch.tv/?volume=0.5&!muted&autoplay&video=videoId&parent=localhost`,
-    },
-
-    {
-      type: 'spotify_playlist',
-      source: 'spotify',
-      playerUri: `https://open.spotify.com/embed/playlist/playlistId`,
-    },
-    {
-      type: 'spotify_playlist',
-      source: 'spotify',
-      playerUri: `https://open.spotify.com/embed/playlist/playlistId`,
-    },
-    {
-      type: 'spotify_playlist',
-      source: 'spotify',
-      playerUri: `https://open.spotify.com/embed/playlist/playlistId`,
-    },
-
-    {
-      type: 'spotify_song',
-      source: 'spotify',
-      playerUri: `https://open.spotify.com/embed/track/songId`,
-    },
-    {
-      type: 'spotify_song',
-      source: 'spotify',
-      playerUri: `https://open.spotify.com/embed/track/songId`,
-    },
-    {
-      type: 'spotify_song',
-      source: 'spotify',
-      playerUri: `https://open.spotify.com/embed/track/songId`,
-    },
-
-    {
-      type: 'spotify_album',
-      source: 'spotify',
-      playerUri: `https://open.spotify.com/embed/album/albumId`,
-    },
-    {
-      type: 'spotify_album',
-      source: 'spotify',
-      playerUri: `https://open.spotify.com/embed/album/albumId`,
-    },
-    {
-      type: 'spotify_album',
-      source: 'spotify',
-      playerUri: `https://open.spotify.com/embed/album/albumId`,
-    },
-
-    {
-      type: 'soundcloud_track',
-      source: 'soundcloud',
-      playerUri: `https://w.soundcloud.com/player/?url=https://soundcloud.com/user/track&auto_play=true&visual=false&hide_related=true`,
-    },
-    {
-      type: 'soundcloud_set',
-      source: 'soundcloud',
-      playerUri: `https://w.soundcloud.com/player/?url=https://soundcloud.com/user/sets/set&auto_play=true&visual=false&hide_related=true`,
-    },
-    undefined,
-
-    {
-      type: 'apple_music_playlist',
-      source: 'appleMusic',
-      playerUri:
-        'https://embed.music.apple.com/us/playlist/playlistName/playlistId',
-    },
-    {
-      type: 'apple_music_album',
-      source: 'appleMusic',
-      playerUri: 'https://embed.music.apple.com/us/album/albumName/albumId',
-    },
-    {
-      type: 'apple_music_song',
-      source: 'appleMusic',
-      playerUri:
-        'https://embed.music.apple.com/us/album/albumName/albumId?i=songId',
-    },
-
-    {
-      type: 'vimeo_video',
-      source: 'vimeo',
-      playerUri: 'https://player.vimeo.com/video/videoId?autoplay=1',
-    },
-    {
-      type: 'vimeo_video',
-      source: 'vimeo',
-      playerUri: 'https://player.vimeo.com/video/videoId?autoplay=1',
-    },
-
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    undefined,
-    undefined,
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/39248209509382934029',
-      playerUri: 'https://i.giphy.com/media/39248209509382934029/200.webp',
-    },
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    undefined,
-    undefined,
-    undefined,
-
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-    {
-      type: 'giphy_gif',
-      source: 'giphy',
-      isGif: true,
-      hideDetails: true,
-      metaUri: 'https://giphy.com/gifs/gifId',
-      playerUri: 'https://i.giphy.com/media/gifId/200.webp',
-    },
-
-    undefined,
-    undefined,
-    undefined,
-    undefined,
-    undefined,
-
-    {
-      type: 'tenor_gif',
-      source: 'tenor',
-      isGif: true,
-      hideDetails: true,
-      playerUri: 'https://t.gifs.bsky.app/someID_AAAAM/someName.gif',
-      dimensions: {
-        width: 100,
-        height: 100,
-      },
-    },
-    undefined,
-    undefined,
-    undefined,
-    undefined,
-  ]
-
-  it('correctly grabs the correct id from uri', () => {
-    for (let i = 0; i < inputs.length; i++) {
-      const input = inputs[i]
-      const output = outputs[i]
-
-      const res = parseEmbedPlayerFromUrl(input)
-
-      expect(res).toEqual(output)
-    }
+  it('getYoutubeVideoId should return video id for valid youtube links', () => {
+    expect(getYoutubeVideoId('https://www.youtube.com/watch?v=videoId')).toBe(
+      'videoId',
+    )
+    expect(
+      getYoutubeVideoId(
+        'https://www.youtube.com/watch?v=videoId&feature=share',
+      ),
+    ).toBe('videoId')
+    expect(getYoutubeVideoId('https://youtu.be/videoId')).toBe('videoId')
   })
 })

__tests__/lib/strings/url-helpers.test.ts

@@ -1,180 +0,0 @@
-import {describe, expect, it} from '@jest/globals'
-
-import {
-  isPossiblyAUrl,
-  isTrustedUrl,
-  linkRequiresWarning,
-  splitApexDomain,
-} from '../../../src/lib/strings/url-helpers'
-
-describe('linkRequiresWarning', () => {
-  type Case = [string, string, boolean]
-
-  const cases: Case[] = [
-    ['http://example.com', 'http://example.com', false],
-    ['http://example.com', 'example.com', false],
-    ['http://example.com', 'example.com/page', false],
-    ['http://example.com', '', true],
-    ['http://example.com', 'other.com', true],
-    ['http://example.com', 'http://other.com', true],
-    ['http://example.com', 'some label', true],
-    ['http://example.com', 'example.com more', true],
-    ['http://example.com', 'http://example.co', true],
-    ['http://example.co', 'http://example.com', true],
-    ['http://example.com', 'example.co', true],
-    ['http://example.co', 'example.com', true],
-    ['http://site.pages.dev', 'http://site.page', true],
-    ['http://site.page', 'http://site.pages.dev', true],
-    ['http://site.pages.dev', 'site.page', true],
-    ['http://site.page', 'site.pages.dev', true],
-    ['http://site.pages.dev', 'http://site.pages', true],
-    ['http://site.pages', 'http://site.pages.dev', true],
-    ['http://site.pages.dev', 'site.pages', true],
-    ['http://site.pages', 'site.pages.dev', true],
-    ['http://bsky.app/profile/bob.test/post/3kbeuduu7m22v', 'my post', false],
-    ['https://bsky.app/profile/bob.test/post/3kbeuduu7m22v', 'my post', false],
-    ['http://bsky.app/', 'bluesky', false],
-    ['https://bsky.app/', 'bluesky', false],
-    [
-      'http://bsky.app/profile/bob.test/post/3kbeuduu7m22v',
-      'http://bsky.app/profile/bob.test/post/3kbeuduu7m22v',
-      false,
-    ],
-    [
-      'https://bsky.app/profile/bob.test/post/3kbeuduu7m22v',
-      'http://bsky.app/profile/bob.test/post/3kbeuduu7m22v',
-      false,
-    ],
-    [
-      'http://bsky.app/',
-      'http://bsky.app/profile/bob.test/post/3kbeuduu7m22v',
-      false,
-    ],
-    [
-      'https://bsky.app/',
-      'http://bsky.app/profile/bob.test/post/3kbeuduu7m22v',
-      false,
-    ],
-    [
-      'http://bsky.app/profile/bob.test/post/3kbeuduu7m22v',
-      'https://google.com',
-      true,
-    ],
-    [
-      'https://bsky.app/profile/bob.test/post/3kbeuduu7m22v',
-      'https://google.com',
-      true,
-    ],
-    ['http://bsky.app/', 'https://google.com', true],
-    ['https://bsky.app/', 'https://google.com', true],
-
-    // case insensitive
-    ['https://Example.com', 'example.com', false],
-    ['https://example.com', 'Example.com', false],
-
-    // bad uri inputs, default to true
-    ['', '', true],
-    ['example.com', 'example.com', true],
-    ['/profile', 'Username', false],
-    ['#', 'Show More', false],
-    ['https://docs.bsky.app', 'https://docs.bsky.app', false],
-    ['https://bsky.app/compose/intent?text=test', 'Compose a post', false],
-  ]
-
-  it.each(cases)(
-    'given input uri %p and text %p, returns %p',
-    (uri, text, expected) => {
-      const output = linkRequiresWarning(uri, text)
-      expect(output).toEqual(expected)
-    },
-  )
-})
-
-describe('isPossiblyAUrl', () => {
-  type Case = [string, boolean]
-  const cases: Case[] = [
-    ['', false],
-    ['text', false],
-    ['some text', false],
-    ['some text', false],
-    ['some domain.com', false],
-    ['domain.com', true],
-    [' domain.com', true],
-    ['domain.com ', true],
-    [' domain.com ', true],
-    ['http://domain.com', true],
-    [' http://domain.com', true],
-    ['http://domain.com ', true],
-    [' http://domain.com ', true],
-    ['https://domain.com', true],
-    [' https://domain.com', true],
-    ['https://domain.com ', true],
-    [' https://domain.com ', true],
-    ['http://domain.com/foo', true],
-    ['http://domain.com stuff', true],
-  ]
-
-  it.each(cases)('given input uri %p, returns %p', (str, expected) => {
-    const output = isPossiblyAUrl(str)
-    expect(output).toEqual(expected)
-  })
-})
-
-describe('splitApexDomain', () => {
-  type Case = [string, string, string]
-  const cases: Case[] = [
-    ['', '', ''],
-    ['example.com', '', 'example.com'],
-    ['foo.example.com', 'foo.', 'example.com'],
-    ['foo.bar.example.com', 'foo.bar.', 'example.com'],
-    ['example.co.uk', '', 'example.co.uk'],
-    ['foo.example.co.uk', 'foo.', 'example.co.uk'],
-    ['example.nonsense', '', 'example.nonsense'],
-    ['foo.example.nonsense', '', 'foo.example.nonsense'],
-    ['foo.bar.example.nonsense', '', 'foo.bar.example.nonsense'],
-    ['example.com.example.com', 'example.com.', 'example.com'],
-  ]
-
-  it.each(cases)(
-    'given input uri %p, returns %p,%p',
-    (str, expected1, expected2) => {
-      const output = splitApexDomain(str)
-      expect(output[0]).toEqual(expected1)
-      expect(output[1]).toEqual(expected2)
-    },
-  )
-})
-
-describe('isTrustedUrl', () => {
-  const cases = [
-    ['#', true],
-    ['#profile', true],
-    ['/', true],
-    ['/profile', true],
-    ['/profile/', true],
-    ['/profile/bob.test', true],
-    ['https://bsky.app', true],
-    ['https://bsky.app/', true],
-    ['https://bsky.app/profile/bob.test', true],
-    ['https://www.bsky.app', true],
-    ['https://www.bsky.app/', true],
-    ['https://docs.bsky.app', true],
-    ['https://bsky.social', true],
-    ['https://bsky.social/blog', true],
-    ['https://blueskyweb.xyz', true],
-    ['https://blueskyweb.zendesk.com', true],
-    ['http://bsky.app', true],
-    ['http://bsky.social', true],
-    ['http://blueskyweb.xyz', true],
-    ['http://blueskyweb.zendesk.com', true],
-    ['https://google.com', false],
-    ['https://docs.google.com', false],
-    ['https://google.com/#', false],
-    ['https://blueskywebxzendesk.com', false],
-  ]
-
-  it.each(cases)('given input uri %p, returns %p', (str, expected) => {
-    const output = isTrustedUrl(str)
-    expect(output).toEqual(expected)
-  })
-})

app.config.js

@@ -1,229 +0,0 @@
-const pkg = require('./package.json')
-
-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.
-   */
-  const VERSION = pkg.version
-
-  /**
-   * Uses built-in Expo env vars
-   *
-   * @see https://docs.expo.dev/build-reference/variables/#built-in-environment-variables
-   */
-  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 UPDATES_CHANNEL = IS_TESTFLIGHT
-    ? 'testflight'
-    : IS_PRODUCTION
-    ? 'production'
-    : undefined
-  const UPDATES_ENABLED = !!UPDATES_CHANNEL
-
-  const SENTRY_DIST = `${PLATFORM}.${VERSION}.${IS_TESTFLIGHT ? 'tf' : ''}${
-    IS_DEV ? 'dev' : ''
-  }`
-
-  return {
-    expo: {
-      version: VERSION,
-      name: 'Bluesky',
-      slug: 'bluesky',
-      scheme: 'bluesky',
-      owner: 'blueskysocial',
-      runtimeVersion: {
-        policy: 'appVersion',
-      },
-      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,
-        bundleIdentifier: 'xyz.blueskyweb.app',
-        config: {
-          usesNonExemptEncryption: false,
-        },
-        infoPlist: {
-          UIBackgroundModes: ['remote-notification'],
-          NSCameraUsageDescription:
-            'Used for profile pictures, posts, and other kinds of content.',
-          NSMicrophoneUsageDescription:
-            'Used for posts and other kinds of content.',
-          NSPhotoLibraryAddUsageDescription:
-            'Used to save images to your library.',
-          NSPhotoLibraryUsageDescription:
-            'Used for profile pictures, posts, and other kinds of content',
-        },
-        associatedDomains: ['applinks:bsky.app', 'applinks:staging.bsky.app'],
-        splash: {
-          ...SPLASH_CONFIG,
-          dark: DARK_SPLASH_CONFIG,
-        },
-        entitlements: {
-          'com.apple.security.application-groups': 'group.app.bsky',
-        },
-      },
-      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/icon.png',
-        adaptiveIcon: {
-          foregroundImage: './assets/icon-android-foreground.png',
-          monochromeImage: './assets/icon-android-foreground.png',
-          backgroundImage: './assets/icon-android-background.png',
-          backgroundColor: '#1185FE',
-        },
-        googleServicesFile: './google-services.json',
-        package: 'xyz.blueskyweb.app',
-        intentFilters: [
-          {
-            action: 'VIEW',
-            autoVerify: true,
-            data: [
-              {
-                scheme: 'https',
-                host: 'bsky.app',
-              },
-              IS_DEV && {
-                scheme: 'http',
-                host: 'localhost:19006',
-              },
-            ],
-            category: ['BROWSABLE', 'DEFAULT'],
-          },
-        ],
-        splash: {
-          ...SPLASH_CONFIG_ANDROID,
-          dark: DARK_SPLASH_CONFIG_ANDROID,
-        },
-      },
-      web: {
-        favicon: './assets/favicon.png',
-      },
-      updates: {
-        url: 'https://updates.bsky.app/manifest',
-        enabled: UPDATES_ENABLED,
-        fallbackToCacheTimeout: 30000,
-        codeSigningCertificate: UPDATES_ENABLED
-          ? './code-signing/certificate.pem'
-          : undefined,
-        codeSigningMetadata: UPDATES_ENABLED
-          ? {
-              keyid: 'main',
-              alg: 'rsa-v1_5-sha256',
-            }
-          : undefined,
-        checkAutomatically: 'NEVER',
-        channel: UPDATES_CHANNEL,
-      },
-      assetBundlePatterns: ['**/*'],
-      plugins: [
-        'expo-localization',
-        Boolean(process.env.SENTRY_AUTH_TOKEN) && 'sentry-expo',
-        [
-          'expo-build-properties',
-          {
-            ios: {
-              deploymentTarget: '13.4',
-              newArchEnabled: false,
-            },
-            android: {
-              compileSdkVersion: 34,
-              targetSdkVersion: 34,
-              buildToolsVersion: '34.0.0',
-              kotlinVersion: '1.8.0',
-              newArchEnabled: false,
-            },
-          },
-        ],
-        [
-          'expo-notifications',
-          {
-            icon: './assets/icon-android-notification.png',
-            color: '#1185fe',
-          },
-        ],
-        './plugins/withAndroidManifestPlugin.js',
-        './plugins/withAndroidManifestFCMIconPlugin.js',
-        './plugins/withAndroidStylesWindowBackgroundPlugin.js',
-        './plugins/withAndroidStylesAccentColorPlugin.js',
-        './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',
-        './plugins/shareExtension/withShareExtensions.js',
-      ].filter(Boolean),
-      extra: {
-        eas: {
-          build: {
-            experimental: {
-              ios: {
-                appExtensions: [
-                  {
-                    targetName: 'Share-with-Bluesky',
-                    bundleIdentifier: 'xyz.blueskyweb.app.Share-with-Bluesky',
-                    entitlements: {
-                      'com.apple.security.application-groups': [
-                        'group.app.bsky',
-                      ],
-                    },
-                  },
-                ],
-              },
-            },
-          },
-          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,
-            },
-          },
-        ],
-      },
-    },
-  }
-}

app.json

@@ -0,0 +1,69 @@
+{
+  "expo": {
+    "name": "Bluesky",
+    "slug": "bluesky",
+    "owner": "blueskysocial",
+    "version": "1.15.0",
+    "orientation": "portrait",
+    "icon": "./assets/icon.png",
+    "userInterfaceStyle": "light",
+    "splash": {
+      "image": "./assets/cloud-splash.png",
+      "resizeMode": "cover",
+      "backgroundColor": "#ffffff"
+    },
+    "ios": {
+      "supportsTablet": false,
+      "bundleIdentifier": "xyz.blueskyweb.app",
+      "config": {
+        "usesNonExemptEncryption": false
+      },
+      "infoPlist": {
+        "UIBackgroundModes": [
+          "fetch",
+          "processing"
+        ],
+        "BGTaskSchedulerPermittedIdentifiers": [
+          "com.transistorsoft.fetch"
+        ]
+      }
+    },
+    "androidStatusBar": {
+      "barStyle": "dark-content",
+      "backgroundColor": "#ffffff"
+    },
+    "android": {
+      "adaptiveIcon": {
+        "foregroundImage": "./assets/adaptive-icon.png",
+        "backgroundColor": "#ffffff"
+      },
+      "package": "xyz.blueskyweb.app"
+    },
+    "web": {
+      "favicon": "./assets/favicon.png"
+    },
+    "plugins": [
+      "expo-localization",
+      "react-native-background-fetch",
+      [
+        "expo-build-properties",
+        {
+          "android": {
+            "kotlinVersion": "1.8.0"
+          }
+        }
+      ],
+      [
+        "expo-updates",
+        {
+          "username": "blueskysocial"
+        }
+      ]
+    ],
+    "extra": {
+      "eas": {
+        "projectId": "55bd077a-d905-4184-9c7f-94789ba0f302"
+      }
+    }
+  }
+}

assets/icons/alien_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M5 11a7 7 0 0 1 14 0c0 2.625-1.547 5.138-3.354 7.066a17.23 17.23 0 0 1-2.55 2.242 8.246 8.246 0 0 1-.924.577 2.904 2.904 0 0 1-.172.083 2.904 2.904 0 0 1-.172-.083 8.246 8.246 0 0 1-.923-.577 17.227 17.227 0 0 1-2.55-2.242C6.547 16.138 5 13.625 5 11Zm6.882 10.012Zm.232-.001h-.003a.047.047 0 0 0 .007.001l-.004-.001ZM12 2a9 9 0 0 0-9 9c0 3.375 1.953 6.362 3.895 8.434a19.216 19.216 0 0 0 2.856 2.508c.425.3.82.545 1.159.72.168.087.337.164.498.222.14.05.356.116.592.116s.451-.066.592-.116c.16-.058.33-.135.498-.222.339-.175.734-.42 1.159-.72.85-.6 1.87-1.457 2.856-2.508C19.047 17.362 21 14.375 21 11a9 9 0 0 0-9-9ZM7.38 9.927c2.774-.094 3.459 1.31 3.591 3.19a.89.89 0 0 1-.855.956c-2.774.094-3.458-1.31-3.59-3.19a.89.89 0 0 1 .854-.956Zm9.236 0c-2.774-.094-3.458 1.31-3.59 3.19a.89.89 0 0 0 .854.956c2.774.094 3.459-1.31 3.591-3.19a.89.89 0 0 0-.855-.956Z" clip-rule="evenodd"/></svg>

assets/icons/apple_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8.148 2.034a1 1 0 0 1 1.35-.419c1.054.556 1.873 1.266 2.46 2.174.369.57.63 1.197.807 1.873 1.143-.349 2.194-.46 3.15-.342a5.122 5.122 0 0 1 3.134 1.556c1.564 1.63 2.086 4.183 1.922 6.58-.166 2.414-1.043 4.938-2.607 6.619-.792.851-1.78 1.505-2.95 1.782-1.063.251-2.213.176-3.415-.262-1.202.438-2.351.513-3.414.262-1.17-.277-2.158-.93-2.95-1.782-1.563-1.682-2.44-4.205-2.606-6.62-.164-2.396.358-4.949 1.921-6.579A5.121 5.121 0 0 1 8.085 5.32c.777-.095 1.617-.04 2.518.172a4.011 4.011 0 0 0-.325-.618c-.372-.576-.912-1.068-1.712-1.49a1 1 0 0 1-.418-1.35Zm.897 17.877c.71.167 1.557.117 2.562-.31a1 1 0 0 1 .784 0c1.005.428 1.853.477 2.563.31.715-.17 1.37-.579 1.946-1.198 1.171-1.26 1.932-3.303 2.076-5.394.144-2.109-.353-3.998-1.37-5.059a3.124 3.124 0 0 0-1.936-.955c-.83-.102-1.912.043-3.282.621a1 1 0 0 1-.778 0c-1.37-.578-2.45-.723-3.281-.62-.815.1-1.445.443-1.935.954-1.017 1.06-1.514 2.95-1.37 5.059.144 2.09.905 4.135 2.076 5.394.575.62 1.23 1.029 1.945 1.198Z" clip-rule="evenodd"/></svg>

assets/icons/arrowBoxLeft_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3.293 3.293A1 1 0 0 1 4 3h7.25a1 1 0 1 1 0 2H5v14h6.25a1 1 0 1 1 0 2H4a1 1 0 0 1-1-1V4a1 1 0 0 1 .293-.707Zm11.5 3.5a1 1 0 0 1 1.414 0l4.5 4.5a1 1 0 0 1 0 1.414l-4.5 4.5a1 1 0 0 1-1.414-1.414L17.586 13H8.75a1 1 0 1 1 0-2h8.836l-2.793-2.793a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>

assets/icons/arrowLeft_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3 12a1 1 0 0 1 .293-.707l6-6a1 1 0 0 1 1.414 1.414L6.414 11H20a1 1 0 1 1 0 2H6.414l4.293 4.293a1 1 0 0 1-1.414 1.414l-6-6A1 1 0 0 1 3 12Z" clip-rule="evenodd"/></svg>

assets/icons/arrowOutOfBox_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12.707 3.293a1 1 0 0 0-1.414 0l-4.5 4.5a1 1 0 0 0 1.414 1.414L11 6.414v8.836a1 1 0 1 0 2 0V6.414l2.793 2.793a1 1 0 1 0 1.414-1.414l-4.5-4.5ZM5 12.75a1 1 0 1 0-2 0V20a1 1 0 0 0 1 1h16a1 1 0 0 0 1-1v-7.25a1 1 0 1 0-2 0V19H5v-6.25Z" clip-rule="evenodd"/></svg>

assets/icons/arrowRotateCounterClockwise_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M5 3a1 1 0 0 1 1 1v1.423c.498-.46 1.02-.869 1.58-1.213C8.863 3.423 10.302 3 12.028 3a9 9 0 1 1-8.487 12 1 1 0 0 1 1.885-.667A7 7 0 1 0 12.028 5c-1.37 0-2.444.327-3.402.915-.474.29-.93.652-1.383 1.085H9a1 1 0 0 1 0 2H5a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1Z" clip-rule="evenodd"/></svg>

assets/icons/arrowTopRight_stoke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8 6a1 1 0 0 1 1-1h9a1 1 0 0 1 1 1v9a1 1 0 1 1-2 0V8.414l-9.793 9.793a1 1 0 0 1-1.414-1.414L15.586 7H9a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>

assets/icons/arrowTriangleBottom_stroke2_corner1_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M4.213 6.886c-.673-1.35.334-2.889 1.806-2.889H17.98c1.472 0 2.479 1.539 1.806 2.89l-5.982 11.997c-.74 1.484-2.87 1.484-3.61 0L4.213 6.886Z"/></svg>

assets/icons/at_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a8 8 0 1 0 4.21 14.804 1 1 0 0 1 1.054 1.7A9.958 9.958 0 0 1 12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10c0 1.104-.27 2.31-.949 3.243-.716.984-1.849 1.6-3.331 1.465a4.207 4.207 0 0 1-2.93-1.585c-.94 1.21-2.388 1.94-3.985 1.715-2.53-.356-4.04-2.91-3.682-5.458.358-2.547 2.514-4.586 5.044-4.23.905.127 1.68.536 2.286 1.126a1 1 0 0 1 1.964.368l-.515 3.545v.002a2.222 2.222 0 0 0 1.999 2.526c.75.068 1.212-.21 1.533-.65.358-.493.566-1.245.566-2.067a8 8 0 0 0-8-8Zm-.112 5.13c-1.195-.168-2.544.819-2.784 2.529-.24 1.71.784 3.03 1.98 3.198 1.195.168 2.543-.819 2.784-2.529.24-1.71-.784-3.03-1.98-3.198Z" clip-rule="evenodd"/></svg>

assets/icons/atom_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M6.17 5.004c-.553-.029-.814.107-.937.23-.122.122-.258.383-.23.936.03.552.222 1.28.611 2.15.282.628.655 1.304 1.112 2.005a28.26 28.26 0 0 1 1.72-1.88 28.258 28.258 0 0 1 1.88-1.719 14.886 14.886 0 0 0-2.007-1.112c-.868-.39-1.597-.581-2.15-.61Zm5.83.44c-.985-.688-1.953-1.247-2.863-1.655-.998-.447-1.978-.736-2.863-.782-.885-.047-1.791.148-2.455.812-.664.664-.859 1.57-.812 2.455.046.885.335 1.865.782 2.863.408.91.967 1.878 1.655 2.863-.688.985-1.247 1.953-1.655 2.863-.447.998-.736 1.978-.782 2.863-.047.885.148 1.791.812 2.455.664.663 1.57.859 2.455.812.885-.046 1.865-.335 2.863-.782.91-.408 1.878-.967 2.863-1.655.985.688 1.952 1.247 2.863 1.655.998.447 1.978.736 2.863.782.885.047 1.791-.148 2.455-.812.663-.664.859-1.57.812-2.455-.046-.885-.335-1.865-.782-2.863-.408-.91-.967-1.878-1.655-2.863.688-.985 1.247-1.952 1.655-2.863.447-.998.736-1.978.782-2.863.047-.885-.148-1.791-.812-2.455-.664-.664-1.57-.859-2.455-.812-.885.046-1.865.335-2.863.782-.91.408-1.878.967-2.863 1.655Zm0 2.497A25.9 25.9 0 0 0 9.86 9.86 25.899 25.899 0 0 0 7.94 12c.569.711 1.211 1.431 1.92 2.14.709.709 1.429 1.351 2.14 1.92a25.925 25.925 0 0 0 2.14-1.92A25.925 25.925 0 0 0 16.06 12a25.921 25.921 0 0 0-1.92-2.14A25.904 25.904 0 0 0 12 7.94Zm5.274 2.384a28.232 28.232 0 0 0-1.72-1.88 28.27 28.27 0 0 0-1.88-1.719 14.89 14.89 0 0 1 2.007-1.112c.868-.39 1.597-.581 2.15-.61.552-.029.813.107.936.23.123.122.258.383.23.936-.03.552-.222 1.28-.611 2.15a14.883 14.883 0 0 1-1.112 2.005Zm0 3.35a28.24 28.24 0 0 1-1.72 1.88 28.24 28.24 0 0 1-1.88 1.719c.702.457 1.378.83 2.007 1.112.868.39 1.597.581 2.15.61.552.03.813-.106.936-.23.123-.122.258-.383.23-.935-.03-.553-.222-1.282-.611-2.15a14.888 14.888 0 0 0-1.112-2.006Zm-6.949 3.599a28.23 28.23 0 0 1-1.88-1.72 28.27 28.27 0 0 1-1.719-1.88 14.89 14.89 0 0 0-1.112 2.007c-.39.868-.581 1.597-.61 2.15-.029.552.107.813.23.936.122.123.383.258.936.23.552-.03 1.28-.222 2.15-.611a14.884 14.884 0 0 0 2.005-1.112Z" clip-rule="evenodd"/></svg>

assets/icons/bars3_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3 5a1 1 0 0 0 0 2h18a1 1 0 1 0 0-2H3Zm-1 7a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm0 6a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>

assets/icons/bubbleQuestion_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M5.002 17.036V5h14v12.036h-3.986a1 1 0 0 0-.639.23l-2.375 1.968-2.344-1.965a1 1 0 0 0-.643-.233H5.002ZM20.002 3h-16a1 1 0 0 0-1 1v14.036a1 1 0 0 0 1 1h4.65l2.704 2.266a1 1 0 0 0 1.28.004l2.74-2.27h4.626a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1Zm-7.878 3.663c-1.39 0-2.5 1.135-2.5 2.515a1 1 0 0 0 2 0c0-.294.232-.515.5-.515a.507.507 0 0 1 .489.6.174.174 0 0 1-.027.048 1.1 1.1 0 0 1-.267.226c-.508.345-1.128.923-1.286 1.978a1 1 0 1 0 1.978.297.762.762 0 0 1 .14-.359c.063-.086.155-.169.293-.262.436-.297 1.18-.885 1.18-2.013 0-1.38-1.11-2.515-2.5-2.515ZM12 15.75a1.25 1.25 0 1 1 0-2.5 1.25 1.25 0 0 1 0 2.5Z" clip-rule="evenodd"/></svg>

assets/icons/bubble_filled_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M19.002 3a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H12.28l-4.762 2.858A1 1 0 0 1 6.002 21v-2h-1a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3h14Z"/></svg>

assets/icons/bubble_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M2.002 6a3 3 0 0 1 3-3h14a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H12.28l-4.762 2.858A1 1 0 0 1 6.002 21v-2h-1a3 3 0 0 1-3-3V6Zm3-1a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h2a1 1 0 0 1 1 1v1.234l3.486-2.092a1 1 0 0 1 .514-.142h7a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-14Z" clip-rule="evenodd"/></svg>

assets/icons/calendarDays_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4 3a1 1 0 0 0-1 1v16a1 1 0 0 0 1 1h16a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4Zm1 16V9h14v10H5ZM5 7h14V5H5v2Zm3 10.25a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5ZM17.25 12a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0ZM12 13.25a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5ZM9.25 12a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0ZM12 17.25a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Z" clip-rule="evenodd"/></svg>

assets/icons/calendar_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8 2a1 1 0 0 1 1 1v1h6V3a1 1 0 1 1 2 0v1h2a2 2 0 0 1 2 2v13a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2V3a1 1 0 0 1 1-1ZM5 6v3h14V6H5Zm14 5H5v8h14v-8Z" clip-rule="evenodd"/></svg>

assets/icons/camera_filled_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8.371 3.89A2 2 0 0 1 10.035 3h3.93a2 2 0 0 1 1.664.89L17.035 6H20a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h2.965L8.37 3.89ZM12 9a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7Z" clip-rule="evenodd"/></svg>

assets/icons/camera_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8.371 3.89A2 2 0 0 1 10.035 3h3.93a2 2 0 0 1 1.664.89L17.035 6H20a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h2.965L8.37 3.89ZM13.965 5h-3.93L8.63 7.11A2 2 0 0 1 6.965 8H4v11h16V8h-2.965a2 2 0 0 1-1.664-.89L13.965 5ZM12 11a2 2 0 1 0 0 4 2 2 0 0 0 0-4Zm-4 2a4 4 0 1 1 8 0 4 4 0 0 1-8 0Z" clip-rule="evenodd"/></svg>

assets/icons/celebrate_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M13.832 1.014a1 1 0 0 1 1.154.818L14 2l.986-.168v.003l.001.005.002.014.007.045.021.156c.017.13.035.312.048.527.025.42.028 1.01-.082 1.6-.127.69-.447 1.31-.701 1.726a7.107 7.107 0 0 1-.498.712l-.01.014-.004.005-.002.001v.002L13 6l.767.642a1 1 0 0 1-1.535-1.282l.002-.003.017-.02a5.13 5.13 0 0 0 .324-.47c.198-.325.378-.705.442-1.049.068-.37.071-.78.051-1.12a6.268 6.268 0 0 0-.05-.504l-.004-.025m.818-1.155a1 1 0 0 0-.818 1.155Zm5.257 1.545a1 1 0 0 1 .602 1.28l-.45 1.25a1 1 0 0 1-1.882-.678l.45-1.25a1 1 0 0 1 1.28-.602ZM6.524 7.136a2 2 0 0 1 3.294-.732l7.778 7.778a2 2 0 0 1-.732 3.294L4.653 21.91c-1.596.579-3.142-.967-2.563-2.563L6.524 7.136Zm9.658 8.46L8.404 7.818 3.97 20.03l12.212-4.434Zm5.712-8.543a1 1 0 0 1-.447 1.341l-1 .5a1 1 0 1 1-.894-1.788l1-.5a1 1 0 0 1 1.341.447Zm-4.687-.26a1 1 0 0 1 0 1.414l-1 1a1 1 0 1 1-1.414-1.414l1-1a1 1 0 0 1 1.414 0Zm-.206 4.165A1 1 0 0 1 18.042 10L18 11l.042-1 .003.001h.014l.035.003.117.008a7.693 7.693 0 0 1 1.594.306c.423.135.861.352 1.168.516a11.873 11.873 0 0 1 .508.288l.032.02.01.006.004.002L21 12l.527-.85a1 1 0 0 1-1.054 1.7l-.005-.003-.023-.014a7.477 7.477 0 0 0-.415-.236 5.497 5.497 0 0 0-.835-.374A5.684 5.684 0 0 0 17.973 12l-.015-.002h-.002a1 1 0 0 1-.955-1.041Z" clip-rule="evenodd"/></svg>

assets/icons/checkThick_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M21.474 2.98a2.5 2.5 0 0 1 .545 3.494l-10.222 14a2.5 2.5 0 0 1-3.528.52L2.49 16.617a2.5 2.5 0 0 1 3.018-3.986l3.75 2.84L17.98 3.525a2.5 2.5 0 0 1 3.493-.545Z" clip-rule="evenodd"/></svg>

assets/icons/check_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M21.59 3.193a1 1 0 0 1 .217 1.397l-11.706 16a1 1 0 0 1-1.429.193l-6.294-5a1 1 0 1 1 1.244-1.566l5.48 4.353 11.09-15.16a1 1 0 0 1 1.398-.217Z" clip-rule="evenodd"/></svg>

assets/icons/chevronBottom_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3.293 8.293a1 1 0 0 1 1.414 0L12 15.586l7.293-7.293a1 1 0 1 1 1.414 1.414l-8 8a1 1 0 0 1-1.414 0l-8-8a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>

assets/icons/chevronLeft_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M15.707 3.293a1 1 0 0 1 0 1.414L8.414 12l7.293 7.293a1 1 0 0 1-1.414 1.414l-8-8a1 1 0 0 1 0-1.414l8-8a1 1 0 0 1 1.414 0Z" clip-rule="evenodd"/></svg>

assets/icons/chevronRight_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8.293 3.293a1 1 0 0 1 1.414 0l8 8a1 1 0 0 1 0 1.414l-8 8a1 1 0 0 1-1.414-1.414L15.586 12 8.293 4.707a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>

assets/icons/chevronTop_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 6a1 1 0 0 1 .707.293l8 8a1 1 0 0 1-1.414 1.414L12 8.414l-7.293 7.293a1 1 0 0 1-1.414-1.414l8-8A1 1 0 0 1 12 6Z" clip-rule="evenodd"/></svg>

assets/icons/circleBanSign_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a8 8 0 0 0-6.32 12.906L16.906 5.68A7.962 7.962 0 0 0 12 4Zm6.32 3.094L7.094 18.32A8 8 0 0 0 18.32 7.094ZM2 12C2 6.477 6.477 2 12 2a9.972 9.972 0 0 1 7.071 2.929A9.972 9.972 0 0 1 22 12c0 5.523-4.477 10-10 10a9.972 9.972 0 0 1-7.071-2.929A9.972 9.972 0 0 1 2 12Z" clip-rule="evenodd"/></svg>

assets/icons/circleInfo_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm8-1a1 1 0 0 1 1-1h1a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0v-4a1 1 0 0 1-1-1Zm1-3a1 1 0 1 0 2 0 1 1 0 0 0-2 0Z" clip-rule="evenodd"/></svg>

assets/icons/clipboard_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8.17 4A3.001 3.001 0 0 1 11 2h2c1.306 0 2.418.835 2.83 2H17a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H7a3 3 0 0 1-3-3V7a3 3 0 0 1 3-3h1.17ZM8 6H7a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V7a1 1 0 0 0-1-1h-1v1a1 1 0 0 1-1 1H9a1 1 0 0 1-1-1V6Zm6 0V5a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1v1h4Z" clip-rule="evenodd"/></svg>

assets/icons/codeBrackets_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M14.242 3.03a1 1 0 0 1 .728 1.213l-4 16a1 1 0 1 1-1.94-.485l4-16a1 1 0 0 1 1.213-.728ZM6.707 7.293a1 1 0 0 1 0 1.414L3.414 12l3.293 3.293a1 1 0 1 1-1.414 1.414l-4-4a1 1 0 0 1 0-1.414l4-4a1 1 0 0 1 1.414 0Zm10.586 0a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1 0 1.414l-4 4a1 1 0 1 1-1.414-1.414L20.586 12l-3.293-3.293a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>

assets/icons/coffee_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M7 2a1 1 0 0 1 1 1v2a1 1 0 0 1-2 0V3a1 1 0 0 1 1-1Zm4 0a1 1 0 0 1 1 1v2a1 1 0 1 1-2 0V3a1 1 0 0 1 1-1Zm4 0a1 1 0 0 1 1 1v2a1 1 0 1 1-2 0V3a1 1 0 0 1 1-1ZM4 9a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2h.5a3.5 3.5 0 1 1 0 7H18v4a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V9Zm12 0H6v11h10V9Zm2 5h.5a1.5 1.5 0 0 0 0-3H18v3Z" clip-rule="evenodd"/></svg>

assets/icons/colorPalette_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4 12c0-4.09 3.527-7.5 8-7.5s8 3.41 8 7.5c0 1.579-.419 2.056-.708 2.236-.388.241-1.031.286-2.058.153-.33-.043-.652-.096-.991-.152a65.905 65.905 0 0 0-.531-.087c-.52-.081-1.077-.156-1.61-.164-1.065-.016-2.336.245-2.996 1.567-.418.834-.295 1.67-.078 2.314.18.534.47 1.055.683 1.437v.001l.097.175.01.018C7.432 19.407 4 16.033 4 12Zm8-9.5C6.532 2.5 2 6.7 2 12s4.532 9.5 10 9.5c.401 0 .812-.04 1.166-.193.41-.176.761-.517.866-1.028.085-.416-.03-.796-.118-1.029a5.981 5.981 0 0 0-.351-.73l-.12-.215c-.215-.392-.403-.73-.52-1.078-.13-.387-.111-.614-.029-.78.146-.291.404-.473 1.178-.461.385.005.825.06 1.329.14.15.023.308.05.47.077.36.059.742.122 1.105.17 1.021.132 2.325.213 3.373-.439C21.496 15.22 22 13.874 22 12c0-5.3-4.532-9.5-10-9.5Zm3.5 8.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM9 12.25a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0Zm1.5-2.75a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z" clip-rule="evenodd"/></svg>

assets/icons/dotGrid1x3Horizontal_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M2 12a2 2 0 1 1 4 0 2 2 0 0 1-4 0Zm16 0a2 2 0 1 1 4 0 2 2 0 0 1-4 0Zm-6-2a2 2 0 1 0 0 4 2 2 0 0 0 0-4Z" clip-rule="evenodd"/></svg>

assets/icons/emojiArc_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm8-5a1 1 0 0 1 1 1v3a1 1 0 1 1-2 0V8a1 1 0 0 1 1-1Zm4 0a1 1 0 0 1 1 1v3a1 1 0 1 1-2 0V8a1 1 0 0 1 1-1Zm-5.894 7.803a1 1 0 0 1 1.341-.447c1.719.859 3.387.859 5.106 0a1 1 0 1 1 .894 1.788c-2.281 1.141-4.613 1.141-6.894 0a1 1 0 0 1-.447-1.341Z" clip-rule="evenodd"/></svg>

assets/icons/emojiHeartEyes_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4 12a8 8 0 1 1 16 0 8 8 0 0 1-16 0Zm8-10C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2ZM9.351 12.13c1.898-1.507 2.176-2.95 1.613-3.83a1.524 1.524 0 0 0-1.225-.707 1.562 1.562 0 0 0-1.218.53 1.561 1.561 0 0 0-1.326-.082c-.456.186-.8.588-.91 1.083-.227 1.02.527 2.282 2.826 3.048a.256.256 0 0 0 .24-.043Zm5.538.042c2.299-.766 3.053-2.027 2.826-3.048a1.524 1.524 0 0 0-.91-1.082 1.561 1.561 0 0 0-1.326.081 1.562 1.562 0 0 0-1.217-.53 1.524 1.524 0 0 0-1.226.706c-.563.881-.285 2.325 1.613 3.83.068.054.158.07.24.043Zm1.072 2.38a4 4 0 0 1-7.924 0c-.04-.293.218-.525.514-.499 2.309.206 4.587.206 6.896 0 .296-.026.555.206.514.5Z" clip-rule="evenodd"/></svg>

assets/icons/emojiSad_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M6.343 6.343a8 8 0 1 1 11.314 11.314A8 8 0 0 1 6.343 6.343ZM19.071 4.93c-3.905-3.905-10.237-3.905-14.142 0-3.905 3.905-3.905 10.237 0 14.142 3.905 3.905 10.237 3.905 14.142 0 3.905-3.905 3.905-10.237 0-14.142Zm-3.537 9.535a5 5 0 0 0-7.07 0 1 1 0 1 0 1.413 1.415 3 3 0 0 1 4.243 0 1 1 0 0 0 1.414-1.415ZM16 9.5c0 .828-.56 1.5-1.25 1.5s-1.25-.672-1.25-1.5.56-1.5 1.25-1.5S16 8.672 16 9.5ZM9.25 11c.69 0 1.25-.672 1.25-1.5S9.94 8 9.25 8 8 8.672 8 9.5 8.56 11 9.25 11Z" clip-rule="evenodd"/></svg>

assets/icons/envelope_filled_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 11.708 2.654 4.06A.998.998 0 0 1 3 4h18c.122 0 .238.022.346.061L12 11.708ZM2 19V6.11l9.367 7.664a1 1 0 0 0 1.266 0L22 6.11V19a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>

assets/icons/envelope_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4.568 4h14.864c.252 0 .498 0 .706.017.229.019.499.063.77.201a2 2 0 0 1 .874.874c.138.271.182.541.201.77.017.208.017.454.017.706v10.864c0 .252 0 .498-.017.706a2.022 2.022 0 0 1-.201.77 2 2 0 0 1-.874.874 2.022 2.022 0 0 1-.77.201c-.208.017-.454.017-.706.017H4.568c-.252 0-.498 0-.706-.017a2.022 2.022 0 0 1-.77-.201 2 2 0 0 1-.874-.874 2.022 2.022 0 0 1-.201-.77C2 17.93 2 17.684 2 17.432V6.568c0-.252 0-.498.017-.706.019-.229.063-.499.201-.77a2 2 0 0 1 .874-.874c.271-.138.541-.182.77-.201C4.07 4 4.316 4 4.568 4Zm.456 2L12 11.708 18.976 6H5.024ZM20 7.747l-6.733 5.509a2 2 0 0 1-2.534 0L4 7.746V17.4a8.187 8.187 0 0 0 .011.589h.014c.116.01.278.011.575.011h14.8a8.207 8.207 0 0 0 .589-.012v-.013c.01-.116.011-.279.011-.575V7.747Z" clip-rule="evenodd"/></svg>

assets/icons/explosion_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 2a1 1 0 0 1 .889.542l1.679 3.259 3.491-1.117a1 1 0 0 1 1.257 1.257L18.2 9.432l3.259 1.679a1 1 0 0 1 0 1.778l-3.124 1.61 2.609 5.098a1 1 0 0 1-1.346 1.346l-5.098-2.61-1.61 3.125a1 1 0 0 1-1.778 0l-1.679-3.259-3.491 1.117a1 1 0 0 1-1.257-1.257L5.8 14.568l-3.259-1.679a1 1 0 0 1 0-1.778l3.124-1.61-2.609-5.098a1 1 0 0 1 1.346-1.346l5.098 2.61-.455.89.455-.89 1.61-3.125A1 1 0 0 1 12 2Zm0 3.183-.72 1.4a2 2 0 0 1-2.69.864L6.248 6.248 7.447 8.59a2 2 0 0 1-.865 2.69L5.183 12l1.534.79a2 2 0 0 1 .989 2.387L7.18 16.82l1.643-.526a2 2 0 0 1 2.387.99l.79 1.533.72-1.4a2 2 0 0 1 2.69-.864l2.342 1.199-1.199-2.342a2 2 0 0 1 .864-2.69l1.4-.72-1.534-.79a2 2 0 0 1-.989-2.387l.526-1.643-1.643.526a2 2 0 0 1-2.387-.99L12 5.184Z" clip-rule="evenodd"/></svg>