Add some logs

Scope query client per DID
Remove useQueryClient dependency from session provider
2024-04-03 13:54:03 -05:00 · 2024-03-22 00:06:25 +00:00 · 2024-03-21 23:41:44 +00:00 · 2024-03-21 23:38:55 +00:00 · 2024-03-21 23:30:33 +00:00 · 2024-03-21 23:24:17 +00:00
215 changed files with 6461 additions and 22803 deletions
@@ -13,24 +13,10 @@ module.exports = {
    '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',
-        },
-      },
-    ],
    'simple-import-sort/imports': [
      'warn',
      {
@@ -8,7 +8,6 @@ on:
        type: choice
        description: Build profile to use
        options:
-          - testflight-android
          - production

 jobs:
@@ -60,41 +59,7 @@ jobs:
          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
+        run: yarn use-build-number eas build -p android --profile production --local --output build.aab --non-interactive

      - name: 🚀 Deploy
-        if: ${{ inputs.profile == 'production' }}
        run: eas submit -p android --non-interactive --path build.aab
-
-      - name: ✍️ Rename bundle
-        if: ${{ inputs.profile != 'production' }}
-        run: mv build.aab build.apk
-
-      - name: ⏰ Get a timestamp
-        id: timestamp
-        if: ${{ inputs.profile != 'production' }}
-        uses: nanzm/get-time-action@master
-        with:
-          format: 'MM-DD-HH-mm-ss'
-
-      - name: 🚀 Upload Artifact
-        id: upload-artifact
-        if: ${{ inputs.profile != 'production' }}
-        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
-        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.outputs.artifact-url }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
@@ -2,13 +2,14 @@
 name: Build and Submit iOS

 on:
+  schedule:
+    - cron: '0 5 * * *'
  workflow_dispatch:
    inputs:
      profile:
        type: choice
        description: Build profile to use
        options:
-          - testflight
          - production

 jobs:
@@ -68,7 +69,7 @@ jobs:
          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
+        run: yarn use-build-number eas build -p ios --profile production --local --output build.ipa --non-interactive

      - name: 🚀 Deploy
        run: eas submit -p ios --non-interactive --path build.ipa
@@ -2,17 +2,8 @@
 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
@@ -22,64 +13,13 @@ 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
+          [[ "${{ github.event.inputs.runtimeVersion }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "Version is valid" || exit 1

      - 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
@@ -90,226 +30,26 @@ jobs:
      - 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'}}
+      - name: 🪛 Install jq
        uses: dcarbone/install-jq-action@v2

+      - name: ⛏️ Setup Expo
+        run: yarn global add eas-cli-local-build-plugin
+
+      - name: 🔤 Compile Translations
+        run: yarn intl:build
+
      - 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 "$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
+        run: 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
+        run: yarn make-deploy-bundle
        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 "${{ 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 "$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
+          RUNTIME_VERSION: ${{ github.event.inputs.runtimeVersion }}
@@ -24,8 +24,6 @@ jobs:
          attempt_delay: 2000
      - name: Lint check
        run: yarn lint
-      - name: Prettier check
-        run: yarn prettier --check .
      - name: Check & compile i18n
        run: yarn intl:build
      - name: Type check
@@ -1,4 +1,4 @@
-# Credit for fingerprint action https://github.com/expo/expo
+# Credit https://github.com/expo/expo
 # https://github.com/expo/expo/blob/main/.github/workflows/pr-labeler.yml
 ---
 name: PR labeler
@@ -13,91 +13,17 @@ 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' }}
+    # REQUIRED: limit concurrency when pushing main(default) branch to prevent conflict for this action to update its fingerprint database
    concurrency: fingerprint-${{ github.event_name != 'pull_request' && 'main' || github.run_id }}
+    permissions:
+      # REQUIRED: Allow comments of PRs
+      pull-requests: write
+      # REQUIRED: Allow updating fingerprint in acton caches
+      actions: write
    steps:
      - name: ⬇️ Checkout
        uses: actions/checkout@v4
@@ -119,7 +45,9 @@ jobs:

      - name: Get the base commit
        id: base-commit
-        run: echo base-commit=$(git log -n 1 main --pretty=format:'%H') >> "$GITHUB_OUTPUT"
+        run: |
+          # Since we limit this pr-labeler workflow only triggered from limited paths, we should use custom base commit
+          echo base-commit=$(git log -n 1 main --pretty=format:'%H') >> "$GITHUB_OUTPUT"

      - name: 📷 Check fingerprint
        id: fingerprint
@@ -132,28 +60,126 @@ jobs:
          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
+      - name: 🏷️ Labeling PR
+        uses: actions/github-script@v6
+        if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff == '[]' }}
+        with:
+          script: |
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: ['bot: fingerprint changed']
+              })
+            } catch (e) {
+              if (e.status != 404) {
+                throw e;
+              }
+            }
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['bot: fingerprint compatible']
+            })
+
+      - name: 🏷️ Labeling PR
+        uses: actions/github-script@v6
        if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' }}
        with:
-          header: fingerprint-diff
-          message: |
+          script: |
+            try {
+              await github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: ['bot: fingerprint compatible']
+              })
+            } catch (e) {
+              if (e.status != 404) {
+                throw e;
+              }
+            }
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['bot: fingerprint changed']
+            })
+
+      - name: 🔍 Find old comment if it exists
+        uses: peter-evans/find-comment@v2
+        if: ${{ github.event_name == 'pull_request' }}
+        id: old_comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: <!-- pr-labeler comment -->
+
+      - name: 💬 Add comment with fingerprint
+        if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' && steps.old_comment.outputs.comment-id == '' }}
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const diff = JSON.stringify(${{ steps.fingerprint.outputs.fingerprint-diff}}, null, 2);
+            const body = `<!-- pr-labeler comment -->
            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 }}
-            ```
+            \`\`\`json
+            ${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 == '[]' }}
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: body,
+            });
+
+      - name: 💬 Update comment with fingerprint
+        if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' && steps.old_comment.outputs.comment-id != '' }}
+        uses: actions/github-script@v6
        with:
-          header: fingerprint-diff
-          delete: true
+          script: |
+            const diff = JSON.stringify(${{ steps.fingerprint.outputs.fingerprint-diff}}, null, 2);
+            const body = `<!-- pr-labeler comment -->
+            The Pull Request introduced fingerprint changes against the base commit: ${{ steps.fingerprint.outputs.previous-git-commit }}
+            <details><summary>Fingerprint diff</summary>

+            \`\`\`json
+            ${diff}
+            \`\`\`
+
+            </details>
+
+            ---
+            *Generated by [PR labeler](https://github.com/expo/expo/actions/workflows/pr-labeler.yml) 🤖*
+            `;
+
+            github.rest.issues.updateComment({
+              issue_number: context.issue.number,
+              comment_id: '${{ steps.old_comment.outputs.comment-id }}',
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: body,
+            });
+
+      - name: 💬 Delete comment with fingerprint
+        if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff == '[]' && steps.old_comment.outputs.comment-id != '' }}
+        uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.issues.deleteComment({
+              issue_number: context.issue.number,
+              comment_id: '${{ steps.old_comment.outputs.comment-id }}',
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            });
@@ -18,6 +18,7 @@ xcuserdata
 *.moved-aside
 DerivedData
 *.hmap
+*.ipa
 *.xcuserstate

 # Android/IntelliJ
@@ -77,7 +78,6 @@ dist/
 *.mobileprovision
 *.orig.*
 web-build/
-stats.json

 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
@@ -104,14 +104,6 @@ google-services.json
 # Performance results (Flashlight)
 .perf/

-# ESLint
-.eslintcache
-
 # i18n
 src/locale/locales/_build/
 src/locale/locales/**/*.js
-
-# local builds
-*.apk
-*.aab
-*.ipa
@@ -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/*
@@ -41,9 +41,6 @@ module.exports = function (config) {
      : process.env.BSKY_IOS_BUILD_NUMBER

  const IS_DEV = process.env.EXPO_PUBLIC_ENV === 'development'
-  const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
-
-  const UPDATES_CHANNEL = IS_TESTFLIGHT ? 'testflight' : 'production'

  return {
    expo: {
@@ -125,24 +122,10 @@ module.exports = function (config) {
        favicon: './assets/favicon.png',
      },
      updates: {
-        url: 'https://updates.bsky.app/manifest',
-        // TODO Eventually we want to enable this for all environments, but for now it will only be used for
-        // TestFlight builds
-        enabled: IS_TESTFLIGHT,
-        fallbackToCacheTimeout: 30000,
-        codeSigningCertificate: IS_TESTFLIGHT
-          ? './code-signing/certificate.pem'
-          : undefined,
-        codeSigningMetadata: IS_TESTFLIGHT
-          ? {
-              keyid: 'main',
-              alg: 'rsa-v1_5-sha256',
-            }
-          : undefined,
-        checkAutomatically: 'NEVER',
-        channel: UPDATES_CHANNEL,
+        enabled: true,
+        fallbackToCacheTimeout: 1000,
+        url: 'https://u.expo.dev/55bd077a-d905-4184-9c7f-94789ba0f302',
      },
-      assetBundlePatterns: ['**/*'],
      plugins: [
        'expo-localization',
        Boolean(process.env.SENTRY_AUTH_TOKEN) && 'sentry-expo',
@@ -162,6 +145,12 @@ module.exports = function (config) {
            },
          },
        ],
+        [
+          'expo-updates',
+          {
+            username: 'blueskysocial',
+          },
+        ],
        [
          'expo-notifications',
          {
@@ -220,21 +220,6 @@
    .nativeDropdown-item:focus {
      outline: none;
    }
-
-    /* Spinner component */
-    @keyframes rotate {
-      0% {
-        transform: rotate(0deg);
-      }
-      100% {
-        transform: rotate(360deg);
-      }
-    }
-    .rotate-500ms {
-      position: absolute;
-      inset:0;
-      animation: rotate 500ms linear infinite;
-    }
  </style>
  {% include "scripts.html" %}
  <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
@@ -16,20 +16,14 @@
      "ios": {
        "simulator": true,
        "resourceClass": "large"
-      },
-      "env": {
-        "EXPO_PUBLIC_ENV": "production"
      }
    },
    "preview": {
      "extends": "base",
      "distribution": "internal",
-      "channel": "production",
+      "channel": "preview",
      "ios": {
        "resourceClass": "large"
-      },
-      "env": {
-        "EXPO_PUBLIC_ENV": "production"
      }
    },
    "production": {
@@ -41,12 +35,9 @@
      "android": {
        "autoIncrement": true
      },
-      "channel": "production",
-      "env": {
-        "EXPO_PUBLIC_ENV": "production"
-      }
+      "channel": "production"
    },
-    "testflight": {
+    "github": {
      "extends": "base",
      "ios": {
        "autoIncrement": true
@@ -54,24 +45,7 @@
      "android": {
        "autoIncrement": true
      },
-      "channel": "testflight",
-      "env": {
-        "EXPO_PUBLIC_ENV": "testflight"
-      }
-    },
-    "testflight-android": {
-      "extends": "base",
-      "distribution": "internal",
-      "ios": {
-        "autoIncrement": true
-      },
-      "android": {
-        "autoIncrement": true
-      },
-      "channel": "testflight",
-      "env": {
-        "EXPO_PUBLIC_ENV": "testflight"
-      }
+      "channel": "production"
    }
  },
  "submit": {
@@ -1,825 +0,0 @@
-const {RuleTester} = require('eslint')
-const avoidUnwrappedText = require('../avoid-unwrapped-text')
-
-const ruleTester = new RuleTester({
-  parser: require.resolve('@typescript-eslint/parser'),
-  parserOptions: {
-    ecmaFeatures: {
-      jsx: true,
-    },
-    ecmaVersion: 6,
-    sourceType: 'module',
-  },
-})
-
-describe('avoid-unwrapped-text', () => {
-  const tests = {
-    valid: [
-      {
-        code: `
-<Text>
-  foo
-</Text>
-        `,
-      },
-
-      {
-        code: `
-<Text>
-  <Trans>
-    foo
-  </Trans>
-</Text>
-        `,
-      },
-
-      {
-        code: `
-<Text>
-  <>
-    foo
-  </>
-</Text>
-        `,
-      },
-
-      {
-        code: `
-<Text>
-  {foo && <Trans>foo</Trans>}
-</Text>
-        `,
-      },
-
-      {
-        code: `
-<Text>
-  {foo ? <Trans>foo</Trans> : <Trans>bar</Trans>}
-</Text>
-        `,
-      },
-
-      {
-        code: `
-<Trans>
-  <Text>
-    foo
-  </Text>
-</Trans>
-        `,
-      },
-
-      {
-        code: `
-<Trans>
-  {foo && <Text>foo</Text>}
-</Trans>
-              `,
-      },
-
-      {
-        code: `
-<Trans>
-  {foo ? <Text>foo</Text> : <Text>bar</Text>}
-</Trans>
-              `,
-      },
-
-      {
-        code: `
-<CustomText>
-  foo
-</CustomText>
-        `,
-      },
-
-      {
-        code: `
-<CustomText>
-  <Trans>
-    foo
-  </Trans>
-</CustomText>
-        `,
-      },
-
-      {
-        code: `
-<Text>
-  {bar}
-</Text>
-        `,
-      },
-
-      {
-        code: `
-<View>
-  {bar}
-</View>
-        `,
-      },
-
-      {
-        code: `
-<Text>
-  foo {bar}
-</Text>
-        `,
-      },
-
-      {
-        code: `
-<View>
-  <Text>
-    foo
-  </Text>
-</View>
-        `,
-      },
-
-      {
-        code: `
-<View>
-  <Text>
-    {bar}
-  </Text>
-</View>
-        `,
-      },
-
-      {
-        code: `
-<View>
-  <Text>
-    foo {bar}
-  </Text>
-</View>
-        `,
-      },
-
-      {
-        code: `
-<View>
-  <CustomText>
-    foo
-  </CustomText>
-</View>
-        `,
-      },
-
-      {
-        code: `
-<View prop={
-  <Text>foo</Text>
-}>
-  <Bar />
-</View>
-        `,
-      },
-
-      {
-        code: `
-<View prop={
-  foo && <Text>foo</Text>
-}>
-  <Bar />
-</View>
-        `,
-      },
-
-      {
-        code: `
-<View prop={
-  foo ? <Text>foo</Text> : <Text>bar</Text>
-}>
-  <Bar />
-</View>
-        `,
-      },
-
-      {
-        code: `
-<View propText={
-  <Trans><Text>foo</Text></Trans>
-}>
-  <Bar />
-</View>
-        `,
-      },
-
-      {
-        code: `
-<View prop={
-  <Text><Trans>foo</Trans></Text>
-}>
-  <Bar />
-</View>
-        `,
-      },
-
-      {
-        code: `
-<Foo propText={
-  <Trans>foo</Trans>
-}>
-  <Bar />
-</Foo>
-        `,
-      },
-
-      {
-        code: `
-<Foo propText={
-  foo && <Trans>foo</Trans>
-}>
-  <Bar />
-</Foo>
-              `,
-      },
-
-      {
-        code: `
-<Foo propText={
-  foo ? <Trans>foo</Trans> : <Trans>bar</Trans>
-}>
-  <Bar />
-</Foo>
-              `,
-      },
-
-      {
-        code: `
-function Stuff() {
-  return <Text>foo</Text>
-}
-        `,
-      },
-
-      {
-        code: `
-function Stuff({ foo }) {
-  return <View>{foo}</View>
-}
-        `,
-      },
-
-      {
-        code: `
-function MyText() {
-  return <Text>foo</Text>
-}
-        `,
-      },
-
-      {
-        code: `
-function MyText({ foo }) {
-  if (foo) {
-    return <Text>foo</Text>
-  }
-  return <Text>foo</Text>
-}
-        `,
-      },
-
-      {
-        code: `
-<View>
-  <Text>{'foo'}</Text>
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  <Text>{foo + 'foo'}</Text>
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  <Text><Trans>{'foo'}</Trans></Text>
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  {foo['bar'] && <Bar />}
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  {(foo === 'bar') && <Bar />}
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  {(foo !== 'bar') && <Bar />}
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  <Text>{\`foo\`}</Text>
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  <Text><Trans>{\`foo\`}</Trans></Text>
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  <Text>{_(msg\`foo\`)}</Text>
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  <Text><Trans>{_(msg\`foo\`)}</Trans></Text>
-</View>
-       `,
-      },
-
-      {
-        code: `
-<Foo>
-  <View prop={stuff('foo')}>
-    <Bar />
-  </View>
-</Foo>
-       `,
-      },
-
-      {
-        code: `
-<Foo>
-  <View onClick={() => stuff('foo')}>
-    <Bar />
-  </View>
-</Foo>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  {renderItem('foo')}
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  {foo === 'foo' && <Bar />}
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  {foo['foo'] && <Bar />}
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  {check('foo') && <Bar />}
-</View>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  {foo.bar && <Bar />}
-</View>
-        `,
-      },
-
-      {
-        code: `
-<Text>
-  <Trans>{renderItem('foo')}</Trans>
-</Text>
-       `,
-      },
-
-      {
-        code: `
-<View>
-  {null}
-</View>
-       `,
-      },
-
-      {
-        code: `
-<Text>
-  <Trans>{null}</Trans>
-</Text>
-       `,
-      },
-    ],
-
-    invalid: [
-      {
-        code: `
-<View> </View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  foo
-</View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <>
-    foo
-  </>
-</View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>
-    foo
-  </Trans>
-</View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  {foo && <Trans>foo</Trans>}
-</View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  {foo ? <Trans>foo</Trans> : <Trans>bar</Trans>}
-</View>
-        `,
-        errors: 2,
-      },
-
-      {
-        code: `
-<Trans>
-  <View>
-    foo
-  </View>
-</Trans>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  foo {bar}
-</View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <View>
-    foo
-  </View>
-</View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<Text>
-  <View>
-    foo
-  </View>
-</Text>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<Text prop={
-  <View>foo</View>
-}>
-  <Bar />
-</Text>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<Text prop={
-  foo && <View>foo</View>
-}>
-  <Bar />
-</Text>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<Text prop={
-  foo ? <View>foo</View> : <View>bar</View>
-}>
-  <Bar />
-</Text>
-        `,
-        errors: 2,
-      },
-
-      {
-        code: `
-<Foo prop={
-  <Trans>foo</Trans>
-}>
-  <Bar />
-</Foo>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-function MyText() {
-  return <Foo />
-}
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-function MyText({ foo }) {
-  return <Foo>{foo}</Foo>
-}
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-function MyText({ foo }) {
-  if (foo) {
-    return <Foo>{foo}</Foo>
-  }
-  return <Text>foo</Text>
-}
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  {'foo'}
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  {foo && 'foo'}
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>{'foo'}</Trans>
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  {foo && <Trans>{'foo'}</Trans>}
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  {10}
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>{10}</Trans>
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>{foo + 10}</Trans>
-</View>
-             `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  {\`foo\`}
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>{\`foo\`}</Trans>
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>{foo + \`foo\`}</Trans>
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  {_(msg\`foo\`)}
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  {foo + _(msg\`foo\`)}
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>{_(msg\`foo\`)}</Trans>
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>{foo + _(msg\`foo\`)}</Trans>
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>foo</Trans>
-</View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans><Trans>foo</Trans></Trans>
-</View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>{foo}</Trans>
-</View>
-        `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View>
-  <Trans>{'foo'}</Trans>
-</View>
-       `,
-        errors: 1,
-      },
-
-      {
-        code: `
-<View prop={
-  <Trans><Text>foo</Text></Trans>
-}>
-  <Bar />
-</View>
-        `,
-        errors: 1,
-      },
-    ],
-  }
-
-  // For easier local testing
-  if (!process.env.CI) {
-    let only = []
-    let skipped = []
-    ;[...tests.valid, ...tests.invalid].forEach(t => {
-      if (t.skip) {
-        delete t.skip
-        skipped.push(t)
-      }
-      if (t.only) {
-        delete t.only
-        only.push(t)
-      }
-    })
-    const predicate = t => {
-      if (only.length > 0) {
-        return only.indexOf(t) !== -1
-      }
-      if (skipped.length > 0) {
-        return skipped.indexOf(t) === -1
-      }
-      return true
-    }
-    tests.valid = tests.valid.filter(predicate)
-    tests.invalid = tests.invalid.filter(predicate)
-  }
-  ruleTester.run('avoid-unwrapped-text', avoidUnwrappedText, tests)
-})
@@ -1,331 +0,0 @@
-'use strict'
-
-// Partially based on eslint-plugin-react-native.
-// Portions of code by Alex Zhukov, MIT license.
-
-function hasOnlyLineBreak(value) {
-  return /^[\r\n\t\f\v]+$/.test(value.replace(/ /g, ''))
-}
-
-function getTagName(node) {
-  const reversedIdentifiers = []
-  if (
-    node.type === 'JSXElement' &&
-    node.openingElement.type === 'JSXOpeningElement'
-  ) {
-    let object = node.openingElement.name
-    while (object.type === 'JSXMemberExpression') {
-      if (object.property.type === 'JSXIdentifier') {
-        reversedIdentifiers.push(object.property.name)
-      }
-      object = object.object
-    }
-
-    if (object.type === 'JSXIdentifier') {
-      reversedIdentifiers.push(object.name)
-    }
-  }
-
-  return reversedIdentifiers.reverse().join('.')
-}
-
-exports.create = function create(context) {
-  const options = context.options[0] || {}
-  const impliedTextProps = options.impliedTextProps ?? []
-  const impliedTextComponents = options.impliedTextComponents ?? []
-  const suggestedTextWrappers = options.suggestedTextWrappers ?? {}
-  const textProps = [...impliedTextProps]
-  const textComponents = ['Text', ...impliedTextComponents]
-
-  function isTextComponent(tagName) {
-    return textComponents.includes(tagName) || tagName.endsWith('Text')
-  }
-
-  return {
-    JSXText(node) {
-      if (typeof node.value !== 'string' || hasOnlyLineBreak(node.value)) {
-        return
-      }
-      let parent = node.parent
-      while (parent) {
-        if (parent.type === 'JSXElement') {
-          const tagName = getTagName(parent)
-          if (isTextComponent(tagName)) {
-            // We're good.
-            return
-          }
-          if (tagName === 'Trans') {
-            // Exit and rely on the traversal for <Trans> JSXElement (code below).
-            // TODO: Maybe validate that it's present.
-            return
-          }
-          const suggestedWrapper = suggestedTextWrappers[tagName]
-          let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
-          if (tagName !== 'View' && !suggestedWrapper) {
-            message +=
-              ' If <' +
-              tagName +
-              '> is guaranteed to render <Text>, ' +
-              'rename it to <' +
-              tagName +
-              'Text> or add it to impliedTextComponents.'
-          }
-          context.report({
-            node,
-            message,
-          })
-          return
-        }
-
-        if (
-          parent.type === 'JSXAttribute' &&
-          parent.name.type === 'JSXIdentifier' &&
-          parent.parent.type === 'JSXOpeningElement' &&
-          parent.parent.parent.type === 'JSXElement'
-        ) {
-          const tagName = getTagName(parent.parent.parent)
-          const propName = parent.name.name
-          if (
-            textProps.includes(tagName + ' ' + propName) ||
-            propName === 'text' ||
-            propName.endsWith('Text')
-          ) {
-            // We're good.
-            return
-          }
-          const message =
-            'Wrap this string in <Text>.' +
-            ' If `' +
-            propName +
-            '` is guaranteed to be wrapped in <Text>, ' +
-            'rename it to `' +
-            propName +
-            'Text' +
-            '` or add it to impliedTextProps.'
-          context.report({
-            node,
-            message,
-          })
-          return
-        }
-
-        parent = parent.parent
-        continue
-      }
-    },
-    Literal(node) {
-      if (typeof node.value !== 'string' && typeof node.value !== 'number') {
-        return
-      }
-      let parent = node.parent
-      while (parent) {
-        if (parent.type === 'JSXElement') {
-          const tagName = getTagName(parent)
-          if (isTextComponent(tagName)) {
-            // We're good.
-            return
-          }
-          if (tagName === 'Trans') {
-            // Exit and rely on the traversal for <Trans> JSXElement (code below).
-            // TODO: Maybe validate that it's present.
-            return
-          }
-          const suggestedWrapper = suggestedTextWrappers[tagName]
-          let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
-          if (tagName !== 'View' && !suggestedWrapper) {
-            message +=
-              ' If <' +
-              tagName +
-              '> is guaranteed to render <Text>, ' +
-              'rename it to <' +
-              tagName +
-              'Text> or add it to impliedTextComponents.'
-          }
-          context.report({
-            node,
-            message,
-          })
-          return
-        }
-
-        if (parent.type === 'BinaryExpression' && parent.operator === '+') {
-          parent = parent.parent
-          continue
-        }
-
-        if (
-          parent.type === 'JSXExpressionContainer' ||
-          parent.type === 'LogicalExpression'
-        ) {
-          parent = parent.parent
-          continue
-        }
-
-        // Be conservative for other types.
-        return
-      }
-    },
-    TemplateLiteral(node) {
-      let parent = node.parent
-      while (parent) {
-        if (parent.type === 'JSXElement') {
-          const tagName = getTagName(parent)
-          if (isTextComponent(tagName)) {
-            // We're good.
-            return
-          }
-          if (tagName === 'Trans') {
-            // Exit and rely on the traversal for <Trans> JSXElement (code below).
-            // TODO: Maybe validate that it's present.
-            return
-          }
-          const suggestedWrapper = suggestedTextWrappers[tagName]
-          let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
-          if (tagName !== 'View' && !suggestedWrapper) {
-            message +=
-              ' If <' +
-              tagName +
-              '> is guaranteed to render <Text>, ' +
-              'rename it to <' +
-              tagName +
-              'Text> or add it to impliedTextComponents.'
-          }
-          context.report({
-            node,
-            message,
-          })
-          return
-        }
-
-        if (
-          parent.type === 'CallExpression' &&
-          parent.callee.type === 'Identifier' &&
-          parent.callee.name === '_'
-        ) {
-          // This is a user-facing string, keep going up.
-          parent = parent.parent
-          continue
-        }
-
-        if (parent.type === 'BinaryExpression' && parent.operator === '+') {
-          parent = parent.parent
-          continue
-        }
-
-        if (
-          parent.type === 'JSXExpressionContainer' ||
-          parent.type === 'LogicalExpression' ||
-          parent.type === 'TaggedTemplateExpression'
-        ) {
-          parent = parent.parent
-          continue
-        }
-
-        // Be conservative for other types.
-        return
-      }
-    },
-    JSXElement(node) {
-      if (getTagName(node) !== 'Trans') {
-        return
-      }
-      let parent = node.parent
-      while (parent) {
-        if (parent.type === 'JSXElement') {
-          const tagName = getTagName(parent)
-          if (isTextComponent(tagName)) {
-            // We're good.
-            return
-          }
-          if (tagName === 'Trans') {
-            // Exit and rely on the traversal for this JSXElement.
-            // TODO: Should nested <Trans> even be allowed?
-            return
-          }
-          const suggestedWrapper = suggestedTextWrappers[tagName]
-          let message = `Wrap this <Trans> in <${suggestedWrapper ?? 'Text'}>.`
-          if (tagName !== 'View' && !suggestedWrapper) {
-            message +=
-              ' If <' +
-              tagName +
-              '> is guaranteed to render <Text>, ' +
-              'rename it to <' +
-              tagName +
-              'Text> or add it to impliedTextComponents.'
-          }
-          context.report({
-            node,
-            message,
-          })
-          return
-        }
-
-        if (
-          parent.type === 'JSXAttribute' &&
-          parent.name.type === 'JSXIdentifier' &&
-          parent.parent.type === 'JSXOpeningElement' &&
-          parent.parent.parent.type === 'JSXElement'
-        ) {
-          const tagName = getTagName(parent.parent.parent)
-          const propName = parent.name.name
-          if (
-            textProps.includes(tagName + ' ' + propName) ||
-            propName === 'text' ||
-            propName.endsWith('Text')
-          ) {
-            // We're good.
-            return
-          }
-          const message =
-            'Wrap this <Trans> in <Text>.' +
-            ' If `' +
-            propName +
-            '` is guaranteed to be wrapped in <Text>, ' +
-            'rename it to `' +
-            propName +
-            'Text' +
-            '` or add it to impliedTextProps.'
-          context.report({
-            node,
-            message,
-          })
-          return
-        }
-
-        parent = parent.parent
-        continue
-      }
-    },
-    ReturnStatement(node) {
-      let fnScope = context.getScope()
-      while (fnScope && fnScope.type !== 'function') {
-        fnScope = fnScope.upper
-      }
-      if (!fnScope) {
-        return
-      }
-      const fn = fnScope.block
-      if (!fn.id || fn.id.type !== 'Identifier' || !fn.id.name) {
-        return
-      }
-      if (!/^[A-Z]\w*Text$/.test(fn.id.name)) {
-        return
-      }
-      if (!node.argument || node.argument.type !== 'JSXElement') {
-        return
-      }
-      const openingEl = node.argument.openingElement
-      if (openingEl.name.type !== 'JSXIdentifier') {
-        return
-      }
-      const returnedComponentName = openingEl.name.name
-      if (!isTextComponent(returnedComponentName)) {
-        context.report({
-          node,
-          message:
-            'Components ending with *Text must return <Text> or <SomeText>.',
-        })
-      }
-    },
-  }
-}
@@ -1,7 +0,0 @@
-'use strict'
-
-module.exports = {
-  rules: {
-    'avoid-unwrapped-text': require('./avoid-unwrapped-text'),
-  },
-}
@@ -2,22 +2,19 @@
 module.exports = {
  locales: [
    'en',
-    'ca',
    'de',
    'es',
    'fi',
    'fr',
-    'ga',
    'hi',
    'id',
-    'it',
    'ja',
    'ko',
    'pt-BR',
-    'tr',
    'uk',
+    'ca',
    'zh-CN',
-    'zh-TW',
+    'it',
  ],
  catalogs: [
    {
@@ -0,0 +1,61 @@
+# React Native UITextView
+
+Drop in replacement for `<Text>` that renders a `UITextView`, support selection and native translation features on iOS.
+
+## Installation
+
+In this project, no installation is required. The pod will be installed automatically during a `pod install`.
+
+In another project, clone the repo and copy the `modules/react-native-ui-text-view` directory to your own project
+directory. Afterward, run `pod install`.
+
+## Usage
+
+Replace the outermost `<Text>` with `<UITextView>`. Styles and press events should be handled the same way they would
+with `<Text>`. Both `<UITextView>` and `<Text>` are supported as children of the root `<UITextView>`.
+
+## Technical
+
+React Native's `Text` component allows for "infinite" nesting of further `Text` components. To make a true "drop-in",
+we want to do the same thing.
+
+To achieve this, we first need to handle determining if we are dealing with an ancestor or root `UITextView` component.
+We can implement similar logic to the `Text` component [see Text.js](https://github.com/facebook/react-native/blob/7f2529de7bc9ab1617eaf571e950d0717c3102a6/packages/react-native/Libraries/Text/Text.js).
+
+We create a context that contains a boolean to tell us if we have already rendered the root `UITextView`. We also store
+the root styles so that we can apply those styles if the ancestor `UITextView`s have not overwritten those styles.
+
+All of our children are placed into `RNUITextView`, which is the main native view that will display the iOS `UITextView`.
+
+We next map each child into the view. We have to be careful here to check if the child's `children` prop is a string. If
+it is, that means we have encountered what was once an RN `Text` component. RN doesn't let us pass plain text as
+children outside of `Text`, so we instead just pass the text into the `text` prop on `RNUITextViewChild`. We continue 
+down the tree, until we run out of children.
+
+On the native side, we make use of the shadow view to calculate text container dimensions before the views are mounted.
+We cannot simply set the `UITextView` text first, since React will not have properly measured the layout before this
+occurs.
+
+
+As for `Text` props, the following props are implemented:
+
+- All accessibility props
+- `allowFontScaling`
+- `adjustsFontSizeToFit`
+- `ellipsizeMode`
+- `numberOfLines`
+- `onLayout`
+- `onPress`
+- `onTextLayout`
+- `selectable`
+
+All `ViewStyle` props will apply to the root `UITextView`. Individual children will respect these `TextStyle` styles:
+
+- `color`
+- `fontSize`
+- `fontStyle`
+- `fontWeight`
+- `fontVariant`
+- `letterSpacing`
+- `lineHeight`
+- `textDecorationLine`
@@ -0,0 +1,3 @@
+#import <React/RCTViewManager.h>
+#import <React/RCTBridge.h>
+#import <React/RCTBridge+Private.h>
@@ -0,0 +1,153 @@
+class RNUITextView: UIView {
+  var textView: UITextView
+
+  @objc var numberOfLines: Int = 0 {
+    didSet {
+      textView.textContainer.maximumNumberOfLines = numberOfLines
+    }
+  }
+  @objc var selectable: Bool = true {
+    didSet {
+      textView.isSelectable = selectable
+    }
+  }
+  @objc var ellipsizeMode: String = "tail" {
+    didSet {
+      textView.textContainer.lineBreakMode = self.getLineBreakMode()
+    }
+  }
+  @objc var onTextLayout: RCTDirectEventBlock?
+
+  override init(frame: CGRect) {
+    if #available(iOS 16.0, *) {
+      textView = UITextView(usingTextLayoutManager: false)
+    } else {
+      textView = UITextView()
+    }
+
+    // Disable scrolling
+    textView.isScrollEnabled = false
+    // Remove all the padding
+    textView.textContainerInset = .zero
+    textView.textContainer.lineFragmentPadding = 0
+
+    // Remove other properties
+    textView.isEditable = false
+    textView.backgroundColor = .clear
+
+    // Init
+    super.init(frame: frame)
+    self.clipsToBounds = true
+
+    // Add the view
+    addSubview(textView)
+
+    let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(callOnPress(_:)))
+    tapGestureRecognizer.isEnabled = true
+    textView.addGestureRecognizer(tapGestureRecognizer)
+  }
+
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  // Resolves some animation issues
+  override func reactSetFrame(_ frame: CGRect) {
+    UIView.performWithoutAnimation {
+      super.reactSetFrame(frame)
+    }
+  }
+
+  func setText(string: NSAttributedString, size: CGSize, numberOfLines: Int) -> Void {
+    self.textView.frame.size = size
+    self.textView.textContainer.maximumNumberOfLines = numberOfLines
+    self.textView.attributedText = string
+    self.textView.selectedTextRange = nil
+
+    if let onTextLayout = self.onTextLayout {
+      var lines: [String] = []
+      textView.layoutManager.enumerateLineFragments(
+        forGlyphRange: NSRange(location: 0, length: textView.attributedText.length))
+      { (rect, usedRect, textContainer, glyphRange, stop) in
+        let characterRange = self.textView.layoutManager.characterRange(forGlyphRange: glyphRange, actualGlyphRange: nil)
+        let line = (self.textView.text as NSString).substring(with: characterRange)
+        lines.append(line)
+      }
+
+      onTextLayout([
+        "lines": lines
+      ])
+    }
+  }
+
+  @IBAction func callOnPress(_ sender: UITapGestureRecognizer) -> Void {
+    // If we find a child, then call onPress
+    if let child = getPressed(sender) {
+      if textView.selectedTextRange == nil, let onPress = child.onPress {
+        onPress(["": ""])
+      } else {
+        // Clear the selected text range if we are not pressing on a link
+        textView.selectedTextRange = nil
+      }
+    }
+  }
+
+  // Try to get the pressed segment
+  func getPressed(_ sender: UITapGestureRecognizer) -> RNUITextViewChild? {
+    let layoutManager = textView.layoutManager
+    var location = sender.location(in: textView)
+
+    // Remove the padding
+    location.x -= textView.textContainerInset.left
+    location.y -= textView.textContainerInset.top
+
+    // Get the index of the char
+    let charIndex = layoutManager.characterIndex(
+      for: location,
+      in: textView.textContainer,
+      fractionOfDistanceBetweenInsertionPoints: nil
+    )
+
+    var lastUpperBound: String.Index? = nil
+    for child in self.reactSubviews() {
+      if let child = child as? RNUITextViewChild, let childText = child.text {
+        let fullText = self.textView.attributedText.string
+        
+        // We want to skip over the children we have already checked, otherwise we could run into
+        // collisions of similar strings (i.e. links that get shortened to the same hostname but
+        // different paths)
+        let range = fullText.range(of: childText, options: [], range: (lastUpperBound ?? String.Index(utf16Offset: 0, in: fullText) )..<fullText.endIndex)
+        
+        if let lowerBound = range?.lowerBound, let upperBound = range?.upperBound {
+          let lowerOffset = lowerBound.utf16Offset(in: fullText)
+          let upperOffset = upperBound.utf16Offset(in: fullText)
+          
+          if charIndex >= lowerOffset,
+             charIndex <= upperOffset
+          {
+            return child
+          } else {
+            lastUpperBound = upperBound
+          }
+        }
+      }
+    }
+
+    return nil
+  }
+
+  func getLineBreakMode() -> NSLineBreakMode {
+    switch self.ellipsizeMode {
+    case "head":
+      return .byTruncatingHead
+    case "middle":
+      return .byTruncatingMiddle
+    case "tail":
+      return .byTruncatingTail
+    case "clip":
+      return .byClipping
+    default:
+      return .byTruncatingTail
+    }
+  }
+}
@@ -0,0 +1,4 @@
+class RNUITextViewChild: UIView {
+  @objc var text: String?
+  @objc var onPress: RCTDirectEventBlock?
+}
@@ -0,0 +1,56 @@
+// We want all of our props to be available in the child's shadow view so we
+// can create the attributed text before mount and calculate the needed size
+// for the view.
+class RNUITextViewChildShadow: RCTShadowView {
+  @objc var text: String = ""
+  @objc var color: UIColor = .black
+  @objc var fontSize: CGFloat = 16.0
+  @objc var fontStyle: String = "normal"
+  @objc var fontWeight: String = "normal"
+  @objc var letterSpacing: CGFloat = 0.0
+  @objc var lineHeight: CGFloat = 0.0
+  @objc var pointerEvents: NSString?
+
+  override func isYogaLeafNode() -> Bool {
+    return true
+  }
+
+  override func didSetProps(_ changedProps: [String]!) {
+    guard let superview = self.superview as? RNUITextViewShadow else {
+      return
+    }
+
+    if !YGNodeIsDirty(superview.yogaNode) {
+      superview.setAttributedText()
+    }
+  }
+
+  func getFontWeight() -> UIFont.Weight {
+    switch self.fontWeight {
+    case "bold":
+      return .bold
+    case "normal":
+      return .regular
+    case "100":
+      return .ultraLight
+    case "200":
+      return .ultraLight
+    case "300":
+      return .light
+    case "400":
+      return .regular
+    case "500":
+      return .medium
+    case "600":
+      return .semibold
+    case "700":
+      return .semibold
+    case "800":
+      return .bold
+    case "900":
+      return .heavy
+    default:
+      return .regular
+    }
+  }
+}
@@ -0,0 +1,26 @@
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_MODULE(RNUITextViewManager, RCTViewManager)
+RCT_REMAP_SHADOW_PROPERTY(numberOfLines, numberOfLines, NSInteger)
+RCT_REMAP_SHADOW_PROPERTY(allowsFontScaling, allowsFontScaling, BOOL)
+
+RCT_EXPORT_VIEW_PROPERTY(numberOfLines, NSInteger)
+RCT_EXPORT_VIEW_PROPERTY(onTextLayout, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(ellipsizeMode, NSString)
+RCT_EXPORT_VIEW_PROPERTY(selectable, BOOL)
+
+@end
+
+@interface RCT_EXTERN_MODULE(RNUITextViewChildManager, RCTViewManager)
+RCT_REMAP_SHADOW_PROPERTY(text, text, NSString)
+RCT_REMAP_SHADOW_PROPERTY(color, color, UIColor)
+RCT_REMAP_SHADOW_PROPERTY(fontSize, fontSize, CGFloat)
+RCT_REMAP_SHADOW_PROPERTY(fontStyle, fontStyle, NSString)
+RCT_REMAP_SHADOW_PROPERTY(fontWeight, fontWeight, NSString)
+RCT_REMAP_SHADOW_PROPERTY(letterSpacing, letterSpacing, CGFloat)
+RCT_REMAP_SHADOW_PROPERTY(lineHeight, lineHeight, CGFloat)
+RCT_REMAP_SHADOW_PROPERTY(pointerEvents, pointerEvents, NSString)
+
+RCT_EXPORT_VIEW_PROPERTY(text, NSString)
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+@end
@@ -0,0 +1,30 @@
+@objc(RNUITextViewManager)
+class RNUITextViewManager: RCTViewManager {
+  override func view() -> (RNUITextView) {
+    return RNUITextView()
+  }
+
+  @objc override static func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+
+  override func shadowView() -> RCTShadowView {
+    // Pass the bridge to the shadow view
+    return RNUITextViewShadow(bridge: self.bridge)
+  }
+}
+
+@objc(RNUITextViewChildManager)
+class RNUITextViewChildManager: RCTViewManager {
+  override func view() -> (RNUITextViewChild) {
+    return RNUITextViewChild()
+  }
+
+  @objc override static func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+
+  override func shadowView() -> RCTShadowView {
+    return RNUITextViewChildShadow()
+  }
+}
@@ -0,0 +1,152 @@
+class RNUITextViewShadow: RCTShadowView {
+  // Props
+  @objc var numberOfLines: Int = 0 {
+    didSet {
+      if !YGNodeIsDirty(self.yogaNode) {
+        self.setAttributedText()
+      }
+    }
+  }
+  @objc var allowsFontScaling: Bool = true
+
+  var attributedText: NSAttributedString = NSAttributedString()
+  var frameSize: CGSize = CGSize()
+
+  var lineHeight: CGFloat = 0
+
+  var bridge: RCTBridge
+
+  init(bridge: RCTBridge) {
+    self.bridge = bridge
+    super.init()
+
+    // We need to set a custom measure func here to calculate the height correctly
+    YGNodeSetMeasureFunc(self.yogaNode) { node, width, widthMode, height, heightMode in
+      // Get the shadowview and determine the needed size to set
+      let shadowView = Unmanaged<RNUITextViewShadow>.fromOpaque(YGNodeGetContext(node)).takeUnretainedValue()
+      return shadowView.getNeededSize(maxWidth: width)
+    }
+
+    // Subscribe to ynamic type size changes
+    NotificationCenter.default.addObserver(
+      self,
+      selector: #selector(preferredContentSizeChanged(_:)),
+      name: UIContentSizeCategory.didChangeNotification,
+      object: nil
+    )
+  }
+
+  @objc func preferredContentSizeChanged(_ notification: Notification) {
+    self.setAttributedText()
+  }
+
+  // Returning true here will tell Yoga to not use flexbox and instead use our custom measure func.
+  override func isYogaLeafNode() -> Bool {
+    return true
+  }
+
+  // We should only insert children that are UITextView shadows
+  override func insertReactSubview(_ subview: RCTShadowView!, at atIndex: Int) {
+    if subview.isKind(of: RNUITextViewChildShadow.self) {
+      super.insertReactSubview(subview, at: atIndex)
+    }
+  }
+
+  // Every time the subviews change, we need to reformat and render the text.
+  override func didUpdateReactSubviews() {
+    self.setAttributedText()
+  }
+
+  // Whenever we layout, update the UI
+  override func layoutSubviews(with layoutContext: RCTLayoutContext) {
+    // Don't do anything if the layout is dirty
+    if(YGNodeIsDirty(self.yogaNode)) {
+      return
+    }
+
+    // Since we are inside the shadow view here, we have to find the real view and update the text.
+    self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in
+      guard let textView = viewRegistry?[self.reactTag] as? RNUITextView else {
+        return
+      }
+      textView.setText(string: self.attributedText, size: self.frameSize, numberOfLines: self.numberOfLines)
+    }
+  }
+
+  override func dirtyLayout() {
+    super.dirtyLayout()
+    YGNodeMarkDirty(self.yogaNode)
+  }
+
+  // Update the attributed text whenever changes are made to the subviews.
+  func setAttributedText() -> Void {
+    // Create an attributed string to store each of the segments
+    let finalAttributedString = NSMutableAttributedString()
+
+    self.reactSubviews().forEach { child in
+      guard let child = child as? RNUITextViewChildShadow else {
+        return
+      }
+      let scaledFontSize = self.allowsFontScaling ?
+        UIFontMetrics.default.scaledValue(for: child.fontSize) : child.fontSize
+      let font = UIFont.systemFont(ofSize: scaledFontSize, weight: child.getFontWeight())
+
+      // Set some generic attributes that don't need ranges
+      let attributes: [NSAttributedString.Key:Any] = [
+        .font: font,
+        .foregroundColor: child.color,
+      ]
+
+      // Create the attributed string with the generic attributes
+      let string = NSMutableAttributedString(string: child.text, attributes: attributes)
+
+      // Set the paragraph style attributes if necessary. We can check this by seeing if the provided
+      // line height is not 0.0.
+      let paragraphStyle = NSMutableParagraphStyle()
+      if child.lineHeight != 0.0 {
+        // Whenever we change the line height for the text, we are also removing the DynamicType
+        // adjustment for line height. We need to get the multiplier and apply that to the
+        // line height.
+        let scaleMultiplier = scaledFontSize / child.fontSize
+        paragraphStyle.minimumLineHeight = child.lineHeight * scaleMultiplier
+        paragraphStyle.maximumLineHeight = child.lineHeight * scaleMultiplier
+
+        string.addAttribute(
+          NSAttributedString.Key.paragraphStyle,
+          value: paragraphStyle,
+          range: NSMakeRange(0, string.length)
+        )
+
+        // To calcualte the size of the text without creating a new UILabel or UITextView, we have
+        // to store this line height for later.
+        self.lineHeight = child.lineHeight
+      } else {
+        self.lineHeight = font.lineHeight
+      }
+
+      finalAttributedString.append(string)
+    }
+
+    self.attributedText = finalAttributedString
+    self.dirtyLayout()
+  }
+
+  // To create the needed size we need to:
+  // 1. Get the max size that we can use for the view
+  // 2. Calculate the height of the text based on that max size
+  // 3. Determine how many lines the text is, and limit that number if it exceeds the max
+  // 4. Set the frame size and return the YGSize. YGSize requires Float values while CGSize needs CGFloat
+  func getNeededSize(maxWidth: Float) -> YGSize {
+    let maxSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(MAXFLOAT))
+    let textSize = self.attributedText.boundingRect(with: maxSize, options: .usesLineFragmentOrigin, context: nil)
+
+    var totalLines = Int(ceil(textSize.height / self.lineHeight))
+
+    if self.numberOfLines != 0, totalLines > self.numberOfLines {
+      totalLines = self.numberOfLines
+    }
+
+    self.frameSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(CGFloat(totalLines) * self.lineHeight))
+    return YGSize(width: Float(self.frameSize.width), height: Float(self.frameSize.height))
+  }
+}
@@ -0,0 +1,9 @@
+{
+  "name": "react-native-ui-text-view",
+  "version": "0.1.0",
+  "description": "UITextView in React Native on iOS",
+  "main": "src/index",
+  "author": "haileyok",
+  "license": "MIT",
+  "homepage": "https://github.com/bluesky-social/social-app/modules/react-native-ui-text-view"
+}
@@ -0,0 +1,42 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+Pod::Spec.new do |s|
+  s.name         = "react-native-ui-text-view"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => "11.0" }
+  s.source       = { :git => ".git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
+
+  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
+  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
+  if respond_to?(:install_modules_dependencies, true)
+    install_modules_dependencies(s)
+  else
+  s.dependency "React-Core"
+
+  # Don't install the dependencies when we run `pod install` in the old architecture.
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    s.pod_target_xcconfig    = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+    s.dependency "React-RCTFabric"
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly"
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+   end
+  end    
+end
@@ -0,0 +1,76 @@
+import React from 'react'
+import {Platform, StyleSheet, TextProps, ViewStyle} from 'react-native'
+import {RNUITextView, RNUITextViewChild} from './index'
+
+const TextAncestorContext = React.createContext<[boolean, ViewStyle]>([
+  false,
+  StyleSheet.create({}),
+])
+const useTextAncestorContext = () => React.useContext(TextAncestorContext)
+
+const textDefaults: TextProps = {
+  allowFontScaling: true,
+  selectable: true,
+}
+
+export function UITextView({style, children, ...rest}: TextProps) {
+  const [isAncestor, rootStyle] = useTextAncestorContext()
+
+  // Flatten the styles, and apply the root styles when needed
+  const flattenedStyle = React.useMemo(
+    () => StyleSheet.flatten([rootStyle, style]),
+    [rootStyle, style],
+  )
+
+  if (Platform.OS !== 'ios') {
+    throw new Error('UITextView is only available on iOS')
+  }
+
+  if (!isAncestor) {
+    return (
+      <TextAncestorContext.Provider value={[true, flattenedStyle]}>
+        <RNUITextView
+          {...textDefaults}
+          {...rest}
+          ellipsizeMode={rest.ellipsizeMode ?? rest.lineBreakMode ?? 'tail'}
+          style={[{flex: 1}, flattenedStyle]}
+          onPress={undefined} // We want these to go to the children only
+          onLongPress={undefined}>
+          {React.Children.toArray(children).map((c, index) => {
+            if (React.isValidElement(c)) {
+              return c
+            } else if (typeof c === 'string') {
+              return (
+                <RNUITextViewChild
+                  key={index}
+                  style={flattenedStyle}
+                  text={c}
+                  {...rest}
+                />
+              )
+            }
+          })}
+        </RNUITextView>
+      </TextAncestorContext.Provider>
+    )
+  } else {
+    return (
+      <>
+        {React.Children.toArray(children).map((c, index) => {
+          if (React.isValidElement(c)) {
+            return c
+          } else if (typeof c === 'string') {
+            return (
+              <RNUITextViewChild
+                key={index}
+                style={flattenedStyle}
+                text={c}
+                {...rest}
+              />
+            )
+          }
+        })}
+      </>
+    )
+  }
+}
@@ -0,0 +1,42 @@
+import {
+  requireNativeComponent,
+  UIManager,
+  Platform,
+  type ViewStyle,
+  TextProps,
+} from 'react-native'
+
+const LINKING_ERROR =
+  `The package 'react-native-ui-text-view' doesn't seem to be linked. Make sure: \n\n` +
+  Platform.select({ios: "- You have run 'pod install'\n", default: ''}) +
+  '- You rebuilt the app after installing the package\n' +
+  '- You are not using Expo Go\n'
+
+export interface RNUITextViewProps extends TextProps {
+  children: React.ReactNode
+  style: ViewStyle[]
+}
+
+export interface RNUITextViewChildProps extends TextProps {
+  text: string
+  onTextPress?: (...args: any[]) => void
+  onTextLongPress?: (...args: any[]) => void
+}
+
+export const RNUITextView =
+  UIManager.getViewManagerConfig &&
+  UIManager.getViewManagerConfig('RNUITextView') != null
+    ? requireNativeComponent<RNUITextViewProps>('RNUITextView')
+    : () => {
+        throw new Error(LINKING_ERROR)
+      }
+
+export const RNUITextViewChild =
+  UIManager.getViewManagerConfig &&
+  UIManager.getViewManagerConfig('RNUITextViewChild') != null
+    ? requireNativeComponent<RNUITextViewChildProps>('RNUITextViewChild')
+    : () => {
+        throw new Error(LINKING_ERROR)
+      }
+
+export * from './UITextView'
@@ -1,6 +1,6 @@
 {
  "name": "bsky.app",
-  "version": "1.76.0",
+  "version": "1.74.0",
  "private": true,
  "engines": {
    "node": ">=18"
@@ -14,12 +14,11 @@
    "ios": "expo run:ios",
    "web": "expo start --web",
    "use-build-number": "./scripts/useBuildNumberEnv.sh",
-    "use-build-number-with-bump": "./scripts/useBuildNumberEnvWithBump.sh",
    "build-web": "expo export:web && node ./scripts/post-web-build.js && cp -v ./web-build/static/js/*.* ./bskyweb/static/js/",
-    "build-all": "yarn intl:build && yarn use-build-number-with-bump eas build --platform all",
-    "build-ios": "yarn use-build-number-with-bump eas build -p ios",
-    "build-android": "yarn use-build-number-with-bump eas build -p android",
-    "build": "yarn use-build-number-with-bump eas build",
+    "build-all": "yarn intl:build && yarn use-build-number eas build --platform all",
+    "build-ios": "yarn use-build-number eas build -p ios",
+    "build-android": "yarn use-build-number eas build -p android",
+    "build": "yarn use-build-number eas build",
    "start": "expo start --dev-client",
    "start:prod": "expo start --dev-client --no-dev --minify",
    "clean-cache": "rm -rf node_modules/.cache/babel-loader/*",
@@ -27,7 +26,7 @@
    "test-watch": "NODE_ENV=test jest --watchAll",
    "test-ci": "NODE_ENV=test jest --ci --forceExit --reporters=default --reporters=jest-junit",
    "test-coverage": "NODE_ENV=test jest --coverage",
-    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src",
+    "lint": "eslint ./src --ext .js,.jsx,.ts,.tsx",
    "typecheck": "tsc --project ./tsconfig.check.json",
    "e2e:mock-server": "./jest/dev-infra/with-test-redis-and-db.sh ts-node --project tsconfig.e2e.json __e2e__/mock-server.ts",
    "e2e:metro": "NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:ios",
@@ -35,18 +34,17 @@
    "e2e:run": "NODE_ENV=test detox test --configuration ios.sim.debug --take-screenshots all",
    "perf:test": "NODE_ENV=test maestro test",
    "perf:test:run": "NODE_ENV=test maestro test __e2e__/maestro/scroll.yaml",
-    "perf:test:measure": "NODE_ENV=test flashlight test --bundleId xyz.blueskyweb.app --testCommand \"yarn perf:test\" --duration 150000 --resultsFilePath .perf/results.json",
+    "perf:test:measure": "NODE_ENV=test flashlight test --bundleId xyz.blueskyweb.app --testCommand 'yarn perf:test' --duration 150000 --resultsFilePath .perf/results.json",
    "perf:test:results": "NODE_ENV=test flashlight report .perf/results.json",
    "perf:measure": "NODE_ENV=test flashlight measure",
    "intl:build": "yarn intl:extract && yarn intl:compile",
+    "intl:check": "yarn intl:extract && git diff-index -G'(^[^\\*# /])|(^#\\w)|(^\\s+[^\\*#/])' HEAD || (echo '\n⚠️ i18n detected un-extracted translations\n' && exit 1)",
    "intl:extract": "lingui extract",
    "intl:compile": "lingui compile",
    "nuke": "rm -rf ./node_modules && rm -rf ./ios && rm -rf ./android",
    "update-extensions": "bash scripts/updateExtensions.sh",
    "export": "npx expo export",
-    "make-deploy-bundle": "bash scripts/bundleUpdate.sh",
-    "generate-webpack-stats-file": "EXPO_PUBLIC_GENERATE_STATS=1 yarn build-web",
-    "open-analyzer": "EXPO_PUBLIC_OPEN_ANALYZER=1 yarn build-web"
+    "make-deploy-bundle": "bash scripts/bundleUpdate.sh"
  },
  "dependencies": {
    "@atproto/api": "^0.12.2",
@@ -64,7 +62,10 @@
    "@mattermost/react-native-paste-input": "^0.6.4",
    "@miblanchard/react-native-slider": "^2.3.1",
    "@radix-ui/react-dropdown-menu": "^2.0.6",
-    "@react-native-async-storage/async-storage": "1.23.1",
+    "@react-native-async-storage/async-storage": "1.21.0",
+    "@react-native-camera-roll/camera-roll": "^5.2.2",
+    "@react-native-clipboard/clipboard": "^1.10.0",
+    "@react-native-community/blur": "^4.3.0",
    "@react-native-masked-view/masked-view": "0.3.0",
    "@react-native-menu/menu": "^0.8.0",
    "@react-native-picker/picker": "2.6.1",
@@ -105,30 +106,27 @@
    "email-validator": "^2.0.4",
    "emoji-mart": "^5.5.2",
    "eventemitter3": "^5.0.1",
-    "expo": "^50.0.8",
-    "expo-application": "^5.8.3",
-    "expo-build-properties": "^0.11.1",
-    "expo-camera": "~14.0.4",
-    "expo-clipboard": "^5.0.1",
-    "expo-constants": "~15.4.5",
-    "expo-dev-client": "~3.3.8",
-    "expo-device": "~5.9.3",
-    "expo-haptics": "^12.8.1",
-    "expo-image": "~1.10.6",
+    "expo": "^50.0.0-preview.10",
+    "expo-application": "~5.8.2",
+    "expo-build-properties": "^0.11.0",
+    "expo-camera": "~14.0.1",
+    "expo-constants": "~15.4.3",
+    "expo-dev-client": "~3.3.5",
+    "expo-device": "~5.9.2",
+    "expo-image": "~1.10.3",
    "expo-image-manipulator": "^11.8.0",
    "expo-image-picker": "~14.7.1",
-    "expo-linear-gradient": "^12.7.2",
    "expo-linking": "^6.2.2",
-    "expo-localization": "~14.8.3",
+    "expo-localization": "~14.8.2",
    "expo-media-library": "~15.9.1",
-    "expo-notifications": "~0.27.6",
+    "expo-notifications": "~0.27.3",
    "expo-sharing": "^11.10.0",
-    "expo-splash-screen": "~0.26.4",
+    "expo-splash-screen": "~0.26.2",
    "expo-status-bar": "~1.11.1",
    "expo-system-ui": "~2.9.3",
-    "expo-task-manager": "~11.7.2",
-    "expo-updates": "~0.24.10",
-    "expo-web-browser": "~12.8.2",
+    "expo-task-manager": "~11.7.0",
+    "expo-updates": "~0.24.7",
+    "expo-web-browser": "~12.8.1",
    "fast-text-encoding": "^1.0.6",
    "history": "^5.3.0",
    "js-sha256": "^0.9.0",
@@ -143,6 +141,7 @@
    "lodash.samplesize": "^4.2.0",
    "lodash.set": "^4.3.2",
    "lodash.shuffle": "^4.2.0",
+    "lru_map": "^0.4.1",
    "mobx": "^6.6.1",
    "mobx-react-lite": "^3.4.0",
    "mobx-utils": "^6.0.6",
@@ -153,16 +152,20 @@
    "psl": "^1.9.0",
    "react": "18.2.0",
    "react-avatar-editor": "^13.0.0",
+    "react-circular-progressbar": "^2.1.0",
    "react-dom": "^18.2.0",
    "react-keyed-flatten-children": "^3.0.0",
    "react-native": "0.73.2",
+    "react-native-appstate-hook": "^1.0.6",
    "react-native-date-picker": "^4.4.0",
    "react-native-drawer-layout": "^4.0.0-alpha.3",
    "react-native-fs": "^2.20.0",
    "react-native-gesture-handler": "~2.14.0",
-    "react-native-get-random-values": "~1.11.0",
+    "react-native-get-random-values": "~1.8.0",
+    "react-native-haptic-feedback": "^1.14.0",
    "react-native-image-crop-picker": "^0.38.1",
    "react-native-ios-context-menu": "^1.15.3",
+    "react-native-linear-gradient": "^2.6.2",
    "react-native-pager-view": "6.2.3",
    "react-native-picker-select": "^8.1.0",
    "react-native-progress": "bluesky-social/react-native-progress",
@@ -171,10 +174,12 @@
    "react-native-safe-area-context": "4.8.2",
    "react-native-screens": "~3.29.0",
    "react-native-svg": "14.1.0",
-    "react-native-uitextview": "^1.1.6",
+    "react-native-ui-text-view": "link:./modules/react-native-ui-text-view",
    "react-native-url-polyfill": "^1.3.0",
    "react-native-uuid": "^2.0.1",
+    "react-native-version-number": "^0.3.6",
    "react-native-web": "~0.19.6",
+    "react-native-web-linear-gradient": "^1.1.2",
    "react-native-web-webview": "^1.0.2",
    "react-native-webview": "13.6.4",
    "react-responsive": "^9.0.2",
@@ -183,6 +188,7 @@
    "statsig-react-native-expo": "^4.6.1",
    "tippy.js": "^6.3.7",
    "tlds": "^1.234.0",
+    "use-deep-compare": "^1.1.0",
    "zeego": "^1.6.2",
    "zod": "^3.20.2"
  },
@@ -228,7 +234,6 @@
    "babel-preset-expo": "^10.0.0",
    "detox": "^20.14.8",
    "eslint": "^8.19.0",
-    "eslint-plugin-bsky-internal": "link:./eslint",
    "eslint-plugin-detox": "^1.0.0",
    "eslint-plugin-ft-flow": "^2.0.3",
    "eslint-plugin-lingui": "^0.2.0",
@@ -252,7 +257,6 @@
    "typescript": "^5.3.3",
    "url-loader": "^4.1.1",
    "webpack": "^5.75.0",
-    "webpack-bundle-analyzer": "^4.10.1",
    "webpack-cli": "^5.0.1",
    "webpack-dev-server": "^4.11.1"
  },
@@ -310,9 +314,6 @@
    ]
  },
  "lint-staged": {
-    "*{.js,.jsx,.ts,.tsx}": [
-      "eslint --cache --fix",
-      "prettier --cache --write --ignore-unknown"
-    ]
+    "*{.js,.jsx,.ts,.tsx}": "yarn eslint --fix"
  }
 }
@@ -3594,19 +3594,3 @@ index 19b61ff..04a9951 100644
 PasteInput_compileSdkVersion=30
 PasteInput_buildToolsVersion=30.0.2
 PasteInput_targetSdkVersion=30
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-index e916023..0564d97 100644
--- a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-@@ -22,6 +22,11 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
-     _backedTextInputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-     _backedTextInputView.textInputDelegate = self;
-     
-+    // Disable inline predictions to prevent jank in the composer
-+    if (@available(iOS 17.0, *)) {
-+      _backedTextInputView.inlinePredictionType = UITextInlinePredictionTypeNo;
-+    }
-+
-     [self addSubview:_backedTextInputView];
-   }
- 
@@ -1,26 +0,0 @@
-diff --git a/node_modules/expo-updates/ios/EXUpdates/Update/NewUpdate.swift b/node_modules/expo-updates/ios/EXUpdates/Update/NewUpdate.swift
-index 189a5f5..8d5b8e6 100644
--- a/node_modules/expo-updates/ios/EXUpdates/Update/NewUpdate.swift
-+++ b/node_modules/expo-updates/ios/EXUpdates/Update/NewUpdate.swift
-@@ -68,13 +68,20 @@ public final class NewUpdate: Update {
-       processedAssets.append(asset)
-     }
-
-+    // Instead of relying on various hacks to get the correct format for the specific
-+    // platform on the backend, we can just add this little patch..
-+    let dateFormatter = DateFormatter()
-+    dateFormatter.locale = Locale(identifier: "en_US_POSIX")
-+    dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"
-+    let date = dateFormatter.date(from:commitTime) ?? RCTConvert.nsDate(commitTime)!
-+
-     return Update(
-       manifest: manifest,
-       config: config,
-       database: database,
-       updateId: uuid,
-       scopeKey: config.scopeKey,
-      commitTime: RCTConvert.nsDate(commitTime),
-+      commitTime: date,
-       runtimeVersion: runtimeVersion,
-       keep: true,
-       status: UpdateStatus.StatusPending,
@@ -1,7 +0,0 @@
-# Expo-Updates Patch
-
-This is a small patch to convert timestamp formats that are returned from the backend. Instead of relying on the
-backend to return the correct format for a specific format (the format required on Android is not the same as on iOS)
-we can just add this conversion in.
-
-Don't remove unless we make changes on the backend to support both platforms.
@@ -9,13 +9,10 @@ rm -rf bundle.tar.gz
 echo "Creating tarball..."
 node scripts/bundleUpdate.js

-if [ -z "$RUNTIME_VERSION" ]; then
-  RUNTIME_VERSION=$(cat package.json | jq '.version' -r)
-fi
-
 cd bundleTempDir || exit
+
 BUNDLE_VERSION=$(date +%s)
-DEPLOYMENT_URL="https://updates.bsky.app/v1/upload?runtime-version=$RUNTIME_VERSION&bundle-version=$BUNDLE_VERSION&channel=$CHANNEL_NAME&ios-build-number=$BSKY_IOS_BUILD_NUMBER&android-build-number=$BSKY_ANDROID_VERSION_CODE"
+DEPLOYMENT_URL="https://updates.bsky.app/v1/upload?runtime-version=$RUNTIME_VERSION&bundle-version=$BUNDLE_VERSION"

 tar czvf bundle.tar.gz ./*

@@ -1,7 +1,11 @@
 #!/bin/bash
 outputIos=$(eas build:version:get -p ios)
 outputAndroid=$(eas build:version:get -p android)
-BSKY_IOS_BUILD_NUMBER=${outputIos#*buildNumber - }
-BSKY_ANDROID_VERSION_CODE=${outputAndroid#*versionCode - }
+currentIosVersion=${outputIos#*buildNumber - }
+currentAndroidVersion=${outputAndroid#*versionCode - }
+
+BSKY_IOS_BUILD_NUMBER=$((currentIosVersion+1))
+BSKY_ANDROID_VERSION_CODE=$((currentAndroidVersion+1))

 bash -c "BSKY_IOS_BUILD_NUMBER=$BSKY_IOS_BUILD_NUMBER BSKY_ANDROID_VERSION_CODE=$BSKY_ANDROID_VERSION_CODE $*"
+
@@ -1,11 +0,0 @@
-#!/bin/bash
-outputIos=$(eas build:version:get -p ios)
-outputAndroid=$(eas build:version:get -p android)
-currentIosVersion=${outputIos#*buildNumber - }
-currentAndroidVersion=${outputAndroid#*versionCode - }
-
-BSKY_IOS_BUILD_NUMBER=$((currentIosVersion+1))
-BSKY_ANDROID_VERSION_CODE=$((currentAndroidVersion+1))
-
-bash -c "BSKY_IOS_BUILD_NUMBER=$BSKY_IOS_BUILD_NUMBER BSKY_ANDROID_VERSION_CODE=$BSKY_ANDROID_VERSION_CODE $*"
-
@@ -16,15 +16,9 @@ import {useQueryClient} from '@tanstack/react-query'

 import {Provider as StatsigProvider} from '#/lib/statsig/statsig'
 import {init as initPersistedState} from '#/state/persisted'
+import * as persisted from '#/state/persisted'
 import {Provider as LabelDefsProvider} from '#/state/preferences/label-defs'
-import {
-  Provider as SessionProvider,
-  useSession,
-  useSessionApi,
-} from '#/state/session'
-import {readLastActiveAccount} from '#/state/session/util'
 import {useIntentHandler} from 'lib/hooks/useIntentHandler'
-import {useOTAUpdates} from 'lib/hooks/useOTAUpdates'
 import {useNotificationsListener} from 'lib/notifications/notifications'
 import {QueryProvider} from 'lib/react-query'
 import {s} from 'lib/styles'
@@ -36,6 +30,11 @@ import {Provider as ModalStateProvider} from 'state/modals'
 import {Provider as MutedThreadsProvider} from 'state/muted-threads'
 import {Provider as PrefsStateProvider} from 'state/preferences'
 import {Provider as UnreadNotifsProvider} from 'state/queries/notifications/unread'
+import {
+  Provider as SessionProvider,
+  useSession,
+  useSessionApi,
+} from 'state/session'
 import {Provider as ShellStateProvider} from 'state/shell'
 import {Provider as LoggedOutViewProvider} from 'state/shell/logged-out'
 import {Provider as SelectedFeedProvider} from 'state/shell/selected-feed'
@@ -58,7 +57,6 @@ function InnerApp() {
  const {_} = useLingui()

  useIntentHandler()
-  useOTAUpdates()

  // init
  useEffect(() => {
@@ -66,7 +64,7 @@ function InnerApp() {
      Toast.show(_(msg`Sorry! Your session expired. Please log in again.`))
    })

-    const account = readLastActiveAccount()
+    const account = persisted.get('session').currentAccount
    resumeSession(account)
  }, [resumeSession, _])

@@ -7,13 +7,8 @@ import {SafeAreaProvider} from 'react-native-safe-area-context'

 import {Provider as StatsigProvider} from '#/lib/statsig/statsig'
 import {init as initPersistedState} from '#/state/persisted'
+import * as persisted from '#/state/persisted'
 import {Provider as LabelDefsProvider} from '#/state/preferences/label-defs'
-import {
-  Provider as SessionProvider,
-  useSession,
-  useSessionApi,
-} from '#/state/session'
-import {readLastActiveAccount} from '#/state/session/util'
 import {useIntentHandler} from 'lib/hooks/useIntentHandler'
 import {QueryProvider} from 'lib/react-query'
 import {ThemeProvider} from 'lib/ThemeContext'
@@ -24,6 +19,11 @@ import {Provider as ModalStateProvider} from 'state/modals'
 import {Provider as MutedThreadsProvider} from 'state/muted-threads'
 import {Provider as PrefsStateProvider} from 'state/preferences'
 import {Provider as UnreadNotifsProvider} from 'state/queries/notifications/unread'
+import {
+  Provider as SessionProvider,
+  useSession,
+  useSessionApi,
+} from 'state/session'
 import {Provider as ShellStateProvider} from 'state/shell'
 import {Provider as LoggedOutViewProvider} from 'state/shell/logged-out'
 import {Provider as SelectedFeedProvider} from 'state/shell/selected-feed'
@@ -42,7 +42,7 @@ function InnerApp() {

  // init
  useEffect(() => {
-    const account = readLastActiveAccount()
+    const account = persisted.get('session').currentAccount
    resumeSession(account)
  }, [resumeSession])

@@ -1,141 +0,0 @@
-import React, {useCallback} from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {useProfileQuery} from '#/state/queries/profile'
-import {type SessionAccount, useSession} from '#/state/session'
-import {UserAvatar} from '#/view/com/util/UserAvatar'
-import {atoms as a, useTheme} from '#/alf'
-import {Check_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
-import {ChevronRight_Stroke2_Corner0_Rounded as Chevron} from '#/components/icons/Chevron'
-import {Button} from './Button'
-import {Text} from './Typography'
-
-export function AccountList({
-  onSelectAccount,
-  onSelectOther,
-  otherLabel,
-}: {
-  onSelectAccount: (account: SessionAccount) => void
-  onSelectOther: () => void
-  otherLabel?: string
-}) {
-  const {isSwitchingAccounts, currentAccount, accounts} = useSession()
-  const t = useTheme()
-  const {_} = useLingui()
-
-  const onPressAddAccount = useCallback(() => {
-    onSelectOther()
-  }, [onSelectOther])
-
-  return (
-    <View
-      style={[
-        a.rounded_md,
-        a.overflow_hidden,
-        a.border,
-        t.atoms.border_contrast_low,
-      ]}>
-      {accounts.map(account => (
-        <React.Fragment key={account.did}>
-          <AccountItem
-            account={account}
-            onSelect={onSelectAccount}
-            isCurrentAccount={account.did === currentAccount?.did}
-          />
-          <View style={[a.border_b, t.atoms.border_contrast_low]} />
-        </React.Fragment>
-      ))}
-      <Button
-        testID="chooseAddAccountBtn"
-        style={[a.flex_1]}
-        onPress={isSwitchingAccounts ? undefined : onPressAddAccount}
-        label={_(msg`Login to account that is not listed`)}>
-        {({hovered, pressed}) => (
-          <View
-            style={[
-              a.flex_1,
-              a.flex_row,
-              a.align_center,
-              {height: 48},
-              (hovered || pressed || isSwitchingAccounts) &&
-                t.atoms.bg_contrast_25,
-            ]}>
-            <Text
-              style={[
-                a.align_baseline,
-                a.flex_1,
-                a.flex_row,
-                a.py_sm,
-                {paddingLeft: 48},
-              ]}>
-              {otherLabel ?? <Trans>Other account</Trans>}
-            </Text>
-            <Chevron size="sm" style={[t.atoms.text, a.mr_md]} />
-          </View>
-        )}
-      </Button>
-    </View>
-  )
-}
-
-function AccountItem({
-  account,
-  onSelect,
-  isCurrentAccount,
-}: {
-  account: SessionAccount
-  onSelect: (account: SessionAccount) => void
-  isCurrentAccount: boolean
-}) {
-  const t = useTheme()
-  const {_} = useLingui()
-  const {data: profile} = useProfileQuery({did: account.did})
-
-  const onPress = React.useCallback(() => {
-    onSelect(account)
-  }, [account, onSelect])
-
-  return (
-    <Button
-      testID={`chooseAccountBtn-${account.handle}`}
-      key={account.did}
-      style={[a.flex_1]}
-      onPress={onPress}
-      label={
-        isCurrentAccount
-          ? _(msg`Continue as ${account.handle} (currently signed in)`)
-          : _(msg`Sign in as ${account.handle}`)
-      }>
-      {({hovered, pressed}) => (
-        <View
-          style={[
-            a.flex_1,
-            a.flex_row,
-            a.align_center,
-            {height: 48},
-            (hovered || pressed) && t.atoms.bg_contrast_25,
-          ]}>
-          <View style={a.p_md}>
-            <UserAvatar avatar={profile?.avatar} size={24} />
-          </View>
-          <Text style={[a.align_baseline, a.flex_1, a.flex_row, a.py_sm]}>
-            <Text style={[a.font_bold]}>
-              {profile?.displayName || account.handle}{' '}
-            </Text>
-            <Text style={[t.atoms.text_contrast_medium]}>{account.handle}</Text>
-          </Text>
-          {isCurrentAccount ? (
-            <Check
-              size="sm"
-              style={[{color: t.palette.positive_600}, a.mr_md]}
-            />
-          ) : (
-            <Chevron size="sm" style={[t.atoms.text, a.mr_md]} />
-          )}
-        </View>
-      )}
-    </Button>
-  )
-}
@@ -1,19 +1,19 @@
 import React from 'react'
 import {
-  AccessibilityProps,
  Pressable,
-  PressableProps,
-  StyleProp,
-  StyleSheet,
  Text,
+  PressableProps,
  TextProps,
-  TextStyle,
-  View,
  ViewStyle,
+  AccessibilityProps,
+  View,
+  TextStyle,
+  StyleSheet,
+  StyleProp,
 } from 'react-native'
-import {LinearGradient} from 'expo-linear-gradient'
+import LinearGradient from 'react-native-linear-gradient'

-import {android, atoms as a, flatten, tokens, useTheme} from '#/alf'
+import {useTheme, atoms as a, tokens, android, flatten} from '#/alf'
 import {Props as SVGIconProps} from '#/components/icons/common'
 import {normalizeTextStyles} from '#/components/Typography'

@@ -58,10 +58,6 @@ export type ButtonState = {

 export type ButtonContext = VariantProps & ButtonState

-type NonTextElements =
-  | React.ReactElement
-  | Iterable<React.ReactElement | null | undefined | boolean>
-
 export type ButtonProps = Pick<
  PressableProps,
  'disabled' | 'onPress' | 'testID'
@@ -71,9 +67,11 @@ export type ButtonProps = Pick<
    testID?: string
    label: string
    style?: StyleProp<ViewStyle>
-    children: NonTextElements | ((context: ButtonContext) => NonTextElements)
+    children:
+      | React.ReactNode
+      | string
+      | ((context: ButtonContext) => React.ReactNode | string)
  }
-
 export type ButtonTextProps = TextProps & VariantProps & {disabled?: boolean}

 const Context = React.createContext<VariantProps & ButtonState>({
@@ -405,7 +403,13 @@ export function Button({
        </View>
      )}
      <Context.Provider value={context}>
-        {typeof children === 'function' ? children(context) : children}
+        {typeof children === 'string' ? (
+          <ButtonText>{children}</ButtonText>
+        ) : typeof children === 'function' ? (
+          children(context)
+        ) : (
+          children
+        )}
      </Context.Provider>
    </Pressable>
  )
@@ -39,8 +39,7 @@ export function useDialogControl(): DialogOuterProps['control'] {
        control.current.open()
      },
      close: cb => {
-        control.current.close()
-        cb?.()
+        control.current.close(cb)
      },
    }),
    [id, control],
@@ -1,24 +1,20 @@
 import React, {useImperativeHandle} from 'react'
-import {TouchableWithoutFeedback, View} from 'react-native'
-import Animated, {FadeIn, FadeInDown} from 'react-native-reanimated'
+import {View, TouchableWithoutFeedback} from 'react-native'
+import {FocusScope} from '@tamagui/focus-scope'
+import Animated, {FadeInDown, FadeIn} from 'react-native-reanimated'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {FocusScope} from '@tamagui/focus-scope'

-import {logger} from '#/logger'
-import {useDialogStateControlContext} from '#/state/dialogs'
-import {atoms as a, flatten, useBreakpoints, useTheme, web} from '#/alf'
-import {Button, ButtonIcon} from '#/components/Button'
-import {Context} from '#/components/Dialog/context'
-import {
-  DialogControlProps,
-  DialogInnerProps,
-  DialogOuterProps,
-} from '#/components/Dialog/types'
-import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
+import {useTheme, atoms as a, useBreakpoints, web, flatten} from '#/alf'
 import {Portal} from '#/components/Portal'

-export {useDialogContext, useDialogControl} from '#/components/Dialog/context'
+import {DialogOuterProps, DialogInnerProps} from '#/components/Dialog/types'
+import {Context} from '#/components/Dialog/context'
+import {Button, ButtonIcon} from '#/components/Button'
+import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
+import {useDialogStateControlContext} from '#/state/dialogs'
+
+export {useDialogControl, useDialogContext} from '#/components/Dialog/context'
 export * from '#/components/Dialog/types'
 export {Input} from '#/components/forms/TextField'

@@ -41,31 +37,14 @@ export function Outer({
    setDialogIsOpen(control.id, true)
  }, [setIsOpen, setDialogIsOpen, control.id])

-  const onCloseInner = React.useCallback(async () => {
+  const close = React.useCallback(async () => {
    setIsVisible(false)
    await new Promise(resolve => setTimeout(resolve, 150))
    setIsOpen(false)
    setIsVisible(true)
    setDialogIsOpen(control.id, false)
    onClose?.()
-  }, [control.id, onClose, setDialogIsOpen])
-
-  const close = React.useCallback<DialogControlProps['close']>(
-    cb => {
-      try {
-        if (cb && typeof cb === 'function') {
-          cb()
-        }
-      } catch (e: any) {
-        logger.error(`Dialog closeCallback failed`, {
-          message: e.message,
-        })
-      } finally {
-        onCloseInner()
-      }
-    },
-    [onCloseInner],
-  )
+  }, [onClose, setIsOpen, setDialogIsOpen, control.id])

  useImperativeHandle(
    control.ref,
@@ -73,7 +52,7 @@ export function Outer({
      open,
      close,
    }),
-    [close, open],
+    [open, close],
  )

  React.useEffect(() => {
@@ -86,7 +65,7 @@ export function Outer({
    document.addEventListener('keydown', handler)

    return () => document.removeEventListener('keydown', handler)
-  }, [close, isOpen])
+  }, [isOpen, close])

  const context = React.useMemo(
    () => ({
@@ -103,7 +82,7 @@ export function Outer({
            <TouchableWithoutFeedback
              accessibilityHint={undefined}
              accessibilityLabel={_(msg`Close active dialog`)}
-              onPress={onCloseInner}>
+              onPress={close}>
              <View
                style={[
                  web(a.fixed),
@@ -1,15 +1,13 @@
 import React from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-import {useNavigation} from '@react-navigation/core'
-import {StackActions} from '@react-navigation/native'

-import {NavigationProp} from 'lib/routes/types'
 import {CenteredView} from 'view/com/util/Views'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
-import {Button, ButtonText} from '#/components/Button'
 import {Text} from '#/components/Typography'
+import {View} from 'react-native'
+import {Button} from '#/components/Button'
+import {useNavigation} from '@react-navigation/core'
+import {NavigationProp} from 'lib/routes/types'
+import {StackActions} from '@react-navigation/native'
 import {router} from '#/routes'

 export function Error({
@@ -22,7 +20,6 @@ export function Error({
  onRetry?: () => unknown
 }) {
  const navigation = useNavigation<NavigationProp>()
-  const {_} = useLingui()
  const t = useTheme()
  const {gtMobile} = useBreakpoints()

@@ -71,25 +68,21 @@ export function Error({
          <Button
            variant="solid"
            color="primary"
-            label={_(msg`Press to retry`)}
+            label="Click here"
            onPress={onRetry}
            size="large"
            style={[a.rounded_sm, a.overflow_hidden, {paddingVertical: 10}]}>
-            <ButtonText>
-              <Trans>Retry</Trans>
-            </ButtonText>
+            Retry
          </Button>
        )}
        <Button
          variant="solid"
          color={onRetry ? 'secondary' : 'primary'}
-          label={_(msg`Return to previous page`)}
+          label="Click here"
          onPress={onGoBack}
          size="large"
          style={[a.rounded_sm, a.overflow_hidden, {paddingVertical: 10}]}>
-          <ButtonText>
-            <Trans>Go Back</Trans>
-          </ButtonText>
+          Go Back
        </Button>
      </View>
    </CenteredView>
@@ -1,5 +1,5 @@
 import React from 'react'
-import {LinearGradient} from 'expo-linear-gradient'
+import LinearGradient from 'react-native-linear-gradient'

 import {atoms as a, tokens} from '#/alf'

@@ -1,54 +1,47 @@
 import React from 'react'
+import {View} from 'react-native'
 import {AppBskyFeedGetLikes as GetLikes} from '@atproto/api'
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
+import {Trans} from '@lingui/macro'

 import {logger} from '#/logger'
-import {useLikedByQuery} from '#/state/queries/post-liked-by'
-import {useResolveUriQuery} from '#/state/queries/resolve-uri'
-import {useInitialNumToRender} from 'lib/hooks/useInitialNumToRender'
-import {cleanError} from 'lib/strings/errors'
-import {ProfileCardWithFollowBtn} from '#/view/com/profile/ProfileCard'
 import {List} from '#/view/com/util/List'
-import {ListFooter, ListMaybePlaceholder} from '#/components/Lists'
+import {ProfileCardWithFollowBtn} from '#/view/com/profile/ProfileCard'
+import {useResolveUriQuery} from '#/state/queries/resolve-uri'
+import {useLikedByQuery} from '#/state/queries/post-liked-by'
+import {useInitialNumToRender} from 'lib/hooks/useInitialNumToRender'
+import {ListFooter} from '#/components/Lists'

-function renderItem({item}: {item: GetLikes.Like}) {
-  return <ProfileCardWithFollowBtn key={item.actor.did} profile={item.actor} />
-}
-
-function keyExtractor(item: GetLikes.Like) {
-  return item.actor.did
-}
+import {atoms as a, useTheme} from '#/alf'
+import {Loader} from '#/components/Loader'
+import {Text} from '#/components/Typography'

 export function LikedByList({uri}: {uri: string}) {
-  const {_} = useLingui()
-  const initialNumToRender = useInitialNumToRender()
+  const t = useTheme()
  const [isPTRing, setIsPTRing] = React.useState(false)
-
  const {
    data: resolvedUri,
    error: resolveError,
-    isLoading: isUriLoading,
+    isFetching: isFetchingResolvedUri,
  } = useResolveUriQuery(uri)
  const {
    data,
-    isLoading: isLikedByLoading,
-    isFetchingNextPage,
+    isFetching,
+    isFetched,
+    isRefetching,
    hasNextPage,
    fetchNextPage,
+    isError,
    error: likedByError,
    refetch,
  } = useLikedByQuery(resolvedUri?.uri)
-
-  const error = resolveError || likedByError
-  const isError = !!resolveError || !!likedByError
-
  const likes = React.useMemo(() => {
    if (data?.pages) {
      return data.pages.flatMap(page => page.likes)
    }
    return []
  }, [data])
+  const initialNumToRender = useInitialNumToRender()
+  const error = resolveError || likedByError

  const onRefresh = React.useCallback(async () => {
    setIsPTRing(true)
@@ -61,47 +54,56 @@ export function LikedByList({uri}: {uri: string}) {
  }, [refetch, setIsPTRing])

  const onEndReached = React.useCallback(async () => {
-    if (isFetchingNextPage || !hasNextPage || isError) return
+    if (isFetching || !hasNextPage || isError) return
    try {
      await fetchNextPage()
    } catch (err) {
      logger.error('Failed to load more likes', {message: err})
    }
-  }, [isFetchingNextPage, hasNextPage, isError, fetchNextPage])
+  }, [isFetching, hasNextPage, isError, fetchNextPage])

-  if (likes.length < 1) {
+  const renderItem = React.useCallback(({item}: {item: GetLikes.Like}) => {
    return (
-      <ListMaybePlaceholder
-        isLoading={isUriLoading || isLikedByLoading}
-        isError={isError}
-        emptyType="results"
-        emptyMessage={_(
-          msg`Nobody has liked this yet. Maybe you should be the first!`,
-        )}
-        errorMessage={cleanError(resolveError || error)}
-        onRetry={isError ? refetch : undefined}
-      />
+      <ProfileCardWithFollowBtn key={item.actor.did} profile={item.actor} />
+    )
+  }, [])
+
+  if (isFetchingResolvedUri || !isFetched) {
+    return (
+      <View style={[a.w_full, a.align_center, a.p_lg]}>
+        <Loader size="xl" />
+      </View>
    )
  }

-  return (
+  return likes.length ? (
    <List
      data={likes}
-      renderItem={renderItem}
-      keyExtractor={keyExtractor}
+      keyExtractor={item => item.actor.did}
      refreshing={isPTRing}
      onRefresh={onRefresh}
      onEndReached={onEndReached}
-      ListFooterComponent={
+      onEndReachedThreshold={3}
+      renderItem={renderItem}
+      initialNumToRender={initialNumToRender}
+      ListFooterComponent={() => (
        <ListFooter
-          isFetchingNextPage={isFetchingNextPage}
-          error={cleanError(error)}
+          isFetching={isFetching && !isRefetching}
+          isError={isError}
+          error={error ? error.toString() : undefined}
          onRetry={fetchNextPage}
        />
-      }
-      onEndReachedThreshold={3}
-      initialNumToRender={initialNumToRender}
-      windowSize={11}
+      )}
    />
+  ) : (
+    <View style={[a.p_lg]}>
+      <View style={[a.p_lg, a.rounded_sm, t.atoms.bg_contrast_25]}>
+        <Text style={[a.text_md, a.leading_snug]}>
+          <Trans>
+            Nobody has liked this yet. Maybe you should be the first!
+          </Trans>
+        </Text>
+      </View>
+    </View>
  )
 }
@@ -1,24 +1,23 @@
 import React from 'react'
 import {GestureResponderEvent} from 'react-native'
+import {useLinkProps, StackActions} from '@react-navigation/native'
 import {sanitizeUrl} from '@braintree/sanitize-url'
-import {StackActions, useLinkProps} from '@react-navigation/native'

+import {useInteractionState} from '#/components/hooks/useInteractionState'
+import {isWeb} from '#/platform/detection'
+import {useTheme, web, flatten, TextStyleProp, atoms as a} from '#/alf'
+import {Button, ButtonProps} from '#/components/Button'
 import {AllNavigatorParams} from '#/lib/routes/types'
-import {shareUrl} from '#/lib/sharing'
 import {
  convertBskyAppUrlIfNeeded,
  isExternalUrl,
  linkRequiresWarning,
 } from '#/lib/strings/url-helpers'
-import {isNative, isWeb} from '#/platform/detection'
 import {useModalControls} from '#/state/modals'
-import {useOpenLink} from '#/state/preferences/in-app-browser'
-import {useNavigationDeduped} from 'lib/hooks/useNavigationDeduped'
-import {atoms as a, flatten, TextStyleProp, useTheme, web} from '#/alf'
-import {Button, ButtonProps} from '#/components/Button'
-import {useInteractionState} from '#/components/hooks/useInteractionState'
-import {Text, TextProps} from '#/components/Typography'
 import {router} from '#/routes'
+import {Text, TextProps} from '#/components/Typography'
+import {useOpenLink} from 'state/preferences/in-app-browser'
+import {useNavigationDeduped} from 'lib/hooks/useNavigationDeduped'

 /**
 * Only available within a `Link`, since that inherits from `Button`.
@@ -61,11 +60,6 @@ type BaseLinkProps = Pick<
   * Web-only attribute. Sets `download` attr on web.
   */
  download?: string
-
-  /**
-   * Native-only attribute. If true, will open the share sheet on long press.
-   */
-  shareOnLongPress?: boolean
 }

 export function useLink({
@@ -74,7 +68,6 @@ export function useLink({
  action = 'push',
  disableMismatchWarning,
  onPress: outerOnPress,
-  shareOnLongPress,
 }: BaseLinkProps & {
  displayText: string
 }) {
@@ -164,34 +157,10 @@ export function useLink({
    ],
  )

-  const handleLongPress = React.useCallback(() => {
-    const requiresWarning = Boolean(
-      !disableMismatchWarning &&
-        displayText &&
-        isExternal &&
-        linkRequiresWarning(href, displayText),
-    )
-
-    if (requiresWarning) {
-      openModal({
-        name: 'link-warning',
-        text: displayText,
-        href: href,
-        share: true,
-      })
-    } else {
-      shareUrl(href)
-    }
-  }, [disableMismatchWarning, displayText, href, isExternal, openModal])
-
-  const onLongPress =
-    isNative && isExternal && shareOnLongPress ? handleLongPress : undefined
-
  return {
    isExternal,
    href,
    onPress,
-    onLongPress,
  }
 }

@@ -250,7 +219,7 @@ export type InlineLinkProps = React.PropsWithChildren<
  BaseLinkProps & TextStyleProp & Pick<TextProps, 'selectable'>
 >

-export function InlineLinkText({
+export function InlineLink({
  children,
  to,
  action = 'push',
@@ -260,18 +229,16 @@ export function InlineLinkText({
  download,
  selectable,
  label,
-  shareOnLongPress,
  ...rest
 }: InlineLinkProps) {
  const t = useTheme()
  const stringChildren = typeof children === 'string'
-  const {href, isExternal, onPress, onLongPress} = useLink({
+  const {href, isExternal, onPress} = useLink({
    to,
    displayText: stringChildren ? children : '',
    action,
    disableMismatchWarning,
    onPress: outerOnPress,
-    shareOnLongPress,
  })
  const {
    state: hovered,
@@ -303,7 +270,6 @@ export function InlineLinkText({
      ]}
      role="link"
      onPress={download ? undefined : onPress}
-      onLongPress={onLongPress}
      onPressIn={onPressIn}
      onPressOut={onPressOut}
      onFocus={onFocus}
@@ -1,23 +1,25 @@
 import React from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {cleanError} from 'lib/strings/errors'
-import {CenteredView} from 'view/com/util/Views'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
-import {Button, ButtonText} from '#/components/Button'
-import {Error} from '#/components/Error'
+import {View} from 'react-native'
+import {useLingui} from '@lingui/react'
+import {Trans, msg} from '@lingui/macro'
+
+import {CenteredView} from 'view/com/util/Views'
 import {Loader} from '#/components/Loader'
+import {cleanError} from 'lib/strings/errors'
+import {Button} from '#/components/Button'
 import {Text} from '#/components/Typography'
+import {Error} from '#/components/Error'

 export function ListFooter({
-  isFetchingNextPage,
+  isFetching,
+  isError,
  error,
  onRetry,
  height,
 }: {
-  isFetchingNextPage?: boolean
+  isFetching?: boolean
+  isError?: boolean
  error?: string
  onRetry?: () => Promise<unknown>
  height?: number
@@ -34,26 +36,32 @@ export function ListFooter({
        t.atoms.border_contrast_low,
        {height: height ?? 180, paddingTop: 30},
      ]}>
-      {isFetchingNextPage ? (
+      {isFetching ? (
        <Loader size="xl" />
      ) : (
-        <ListFooterMaybeError error={error} onRetry={onRetry} />
+        <ListFooterMaybeError
+          isError={isError}
+          error={error}
+          onRetry={onRetry}
+        />
      )}
    </View>
  )
 }

 function ListFooterMaybeError({
+  isError,
  error,
  onRetry,
 }: {
+  isError?: boolean
  error?: string
  onRetry?: () => Promise<unknown>
 }) {
  const t = useTheme()
  const {_} = useLingui()

-  if (!error) return null
+  if (!isError) return null

  return (
    <View style={[a.w_full, a.px_lg]}>
@@ -87,9 +95,7 @@ function ListFooterMaybeError({
            a.py_sm,
          ]}
          onPress={onRetry}>
-          <ButtonText>
-            <Trans>Retry</Trans>
-          </ButtonText>
+          <Trans>Retry</Trans>
        </Button>
      </View>
    </View>
@@ -122,7 +128,7 @@ export function ListHeaderDesktop({

 export function ListMaybePlaceholder({
  isLoading,
-  noEmpty,
+  isEmpty,
  isError,
  emptyTitle,
  emptyMessage,
@@ -132,7 +138,7 @@ export function ListMaybePlaceholder({
  onRetry,
 }: {
  isLoading: boolean
-  noEmpty?: boolean
+  isEmpty?: boolean
  isError?: boolean
  emptyTitle?: string
  emptyMessage?: string
@@ -145,6 +151,16 @@ export function ListMaybePlaceholder({
  const {_} = useLingui()
  const {gtMobile, gtTablet} = useBreakpoints()

+  if (!isLoading && isError) {
+    return (
+      <Error
+        title={errorTitle ?? _(msg`Oops!`)}
+        message={errorMessage ?? _(`Something went wrong!`)}
+        onRetry={onRetry}
+      />
+    )
+  }
+
  if (isLoading) {
    return (
      <CenteredView
@@ -164,17 +180,7 @@ export function ListMaybePlaceholder({
    )
  }

-  if (isError) {
-    return (
-      <Error
-        title={errorTitle ?? _(msg`Oops!`)}
-        message={errorMessage ?? _(`Something went wrong!`)}
-        onRetry={onRetry}
-      />
-    )
-  }
-
-  if (!noEmpty) {
+  if (isEmpty) {
    return (
      <Error
        title={
@@ -191,6 +197,4 @@ export function ListMaybePlaceholder({
      />
    )
  }
-
-  return null
 }
@@ -1,13 +1,13 @@
 import React from 'react'
 import Animated, {
  Easing,
-  useAnimatedStyle,
  useSharedValue,
+  useAnimatedStyle,
  withRepeat,
  withTiming,
 } from 'react-native-reanimated'

-import {atoms as a, flatten, useTheme} from '#/alf'
+import {atoms as a, useTheme, flatten} from '#/alf'
 import {Props, useCommonSVGProps} from '#/components/icons/common'
 import {Loader_Stroke2_Corner0_Rounded as Icon} from '#/components/icons/Loader'

@@ -1,34 +0,0 @@
-import React from 'react'
-import {View} from 'react-native'
-
-import {atoms as a, flatten, useTheme} from '#/alf'
-import {Props, useCommonSVGProps} from '#/components/icons/common'
-import {Loader_Stroke2_Corner0_Rounded as Icon} from '#/components/icons/Loader'
-
-export function Loader(props: Props) {
-  const t = useTheme()
-  const common = useCommonSVGProps(props)
-
-  return (
-    <View
-      style={[
-        a.relative,
-        a.justify_center,
-        a.align_center,
-        {width: common.size, height: common.size},
-      ]}>
-      {/* css rotation animation - /bskyweb/templates/base.html */}
-      <div className="rotate-500ms">
-        <Icon
-          {...props}
-          style={[
-            a.absolute,
-            a.inset_0,
-            t.atoms.text_contrast_high,
-            flatten(props.style),
-          ]}
-        />
-      </div>
-    </View>
-  )
-}
@@ -3,10 +3,11 @@ import {View} from 'react-native'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'

-import {atoms as a, useBreakpoints, useTheme} from '#/alf'
-import {Button, ButtonColor, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
+import {useTheme, atoms as a, useBreakpoints} from '#/alf'
 import {Text} from '#/components/Typography'
+import {Button, ButtonColor, ButtonText} from '#/components/Button'
+
+import * as Dialog from '#/components/Dialog'

 export {useDialogControl as usePromptControl} from '#/components/Dialog'

@@ -51,7 +52,7 @@ export function Outer({
  )
 }

-export function TitleText({children}: React.PropsWithChildren<{}>) {
+export function Title({children}: React.PropsWithChildren<{}>) {
  const {titleId} = React.useContext(Context)
  return (
    <Text nativeID={titleId} style={[a.text_2xl, a.font_bold, a.pb_sm]}>
@@ -60,7 +61,7 @@ export function TitleText({children}: React.PropsWithChildren<{}>) {
  )
 }

-export function DescriptionText({children}: React.PropsWithChildren<{}>) {
+export function Description({children}: React.PropsWithChildren<{}>) {
  const t = useTheme()
  const {descriptionId} = React.useContext(Context)
  return (
@@ -79,7 +80,7 @@ export function Actions({children}: React.PropsWithChildren<{}>) {
    <View
      style={[
        a.w_full,
-        a.gap_md,
+        a.gap_sm,
        a.justify_end,
        gtMobile
          ? [a.flex_row, a.flex_row_reverse, a.justify_start]
@@ -91,13 +92,15 @@ export function Actions({children}: React.PropsWithChildren<{}>) {
 }

 export function Cancel({
+  children,
  cta,
-}: {
+}: React.PropsWithChildren<{
  /**
-   * Optional i18n string. If undefined, it will default to "Cancel".
+   * Optional i18n string, used in lieu of `children` for simple buttons. If
+   * undefined (and `children` is undefined), it will default to "Cancel".
   */
  cta?: string
-}) {
+}>) {
  const {_} = useLingui()
  const {gtMobile} = useBreakpoints()
  const {close} = Dialog.useDialogContext()
@@ -112,30 +115,33 @@ export function Cancel({
      size={gtMobile ? 'small' : 'medium'}
      label={cta || _(msg`Cancel`)}
      onPress={onPress}>
-      <ButtonText>{cta || _(msg`Cancel`)}</ButtonText>
+      {children ? children : <ButtonText>{cta || _(msg`Cancel`)}</ButtonText>}
    </Button>
  )
 }

 export function Action({
+  children,
  onPress,
  color = 'primary',
  cta,
  testID,
-}: {
+}: React.PropsWithChildren<{
  onPress: () => void
  color?: ButtonColor
  /**
-   * Optional i18n string. If undefined, it will default to "Confirm".
+   * Optional i18n string, used in lieu of `children` for simple buttons. If
+   * undefined (and `children` is undefined), it will default to "Confirm".
   */
  cta?: string
  testID?: string
-}) {
+}>) {
  const {_} = useLingui()
  const {gtMobile} = useBreakpoints()
  const {close} = Dialog.useDialogContext()
  const handleOnPress = React.useCallback(() => {
-    close(onPress)
+    close()
+    onPress()
  }, [close, onPress])

  return (
@@ -146,7 +152,7 @@ export function Action({
      label={cta || _(msg`Confirm`)}
      onPress={handleOnPress}
      testID={testID}>
-      <ButtonText>{cta || _(msg`Confirm`)}</ButtonText>
+      {children ? children : <ButtonText>{cta || _(msg`Confirm`)}</ButtonText>}
    </Button>
  )
 }
@@ -170,8 +176,8 @@ export function Basic({
 }>) {
  return (
    <Outer control={control} testID="confirmModal">
-      <TitleText>{title}</TitleText>
-      <DescriptionText>{description}</DescriptionText>
+      <Title>{title}</Title>
+      <Description>{description}</Description>
      <Actions>
        <Action
          cta={confirmButtonCta}
@@ -1,16 +1,18 @@
 import React from 'react'
 import {View} from 'react-native'
-import {AppBskyLabelerDefs} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import {AppBskyLabelerDefs} from '@atproto/api'

 export {useDialogControl as useReportDialogControl} from '#/components/Dialog'
 import {getLabelingServiceTitle} from '#/lib/moderation'
-import {atoms as a, useBreakpoints, useTheme} from '#/alf'
+
+import {atoms as a, useTheme, useBreakpoints} from '#/alf'
+import {Text} from '#/components/Typography'
 import {Button, useButtonContext} from '#/components/Button'
 import {Divider} from '#/components/Divider'
 import * as LabelingServiceCard from '#/components/LabelingServiceCard'
-import {Text} from '#/components/Typography'
+
 import {ReportDialogProps} from './types'

 export function SelectLabelerView({
@@ -1,15 +1,16 @@
 import React from 'react'
 import {View} from 'react-native'
-import {AppBskyLabelerDefs} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import {AppBskyLabelerDefs} from '@atproto/api'

-import {ReportOption, useReportOptions} from '#/lib/moderation/useReportOptions'
-import {Link} from '#/components/Link'
+import {useReportOptions, ReportOption} from '#/lib/moderation/useReportOptions'
 import {DMCA_LINK} from '#/components/ReportDialog/const'
+import {Link} from '#/components/Link'
 export {useDialogControl as useReportDialogControl} from '#/components/Dialog'

-import {atoms as a, useBreakpoints, useTheme} from '#/alf'
+import {atoms as a, useTheme, useBreakpoints} from '#/alf'
+import {Text} from '#/components/Typography'
 import {
  Button,
  ButtonIcon,
@@ -18,11 +19,11 @@ import {
 } from '#/components/Button'
 import {Divider} from '#/components/Divider'
 import {
-  ChevronLeft_Stroke2_Corner0_Rounded as ChevronLeft,
  ChevronRight_Stroke2_Corner0_Rounded as ChevronRight,
+  ChevronLeft_Stroke2_Corner0_Rounded as ChevronLeft,
 } from '#/components/icons/Chevron'
 import {SquareArrowTopRight_Stroke2_Corner0_Rounded as SquareArrowTopRight} from '#/components/icons/SquareArrowTopRight'
-import {Text} from '#/components/Typography'
+
 import {ReportDialogProps} from './types'

 export function SelectReportOptionView({
@@ -1,15 +1,15 @@
 import React from 'react'
-import {AppBskyRichtextFacet, RichText as RichTextAPI} from '@atproto/api'
-import {msg} from '@lingui/macro'
+import {RichText as RichTextAPI, AppBskyRichtextFacet} from '@atproto/api'
 import {useLingui} from '@lingui/react'
+import {msg} from '@lingui/macro'

-import {toShortUrl} from '#/lib/strings/url-helpers'
-import {isNative} from '#/platform/detection'
-import {atoms as a, flatten, native, TextStyleProp, useTheme, web} from '#/alf'
-import {useInteractionState} from '#/components/hooks/useInteractionState'
-import {InlineLinkText} from '#/components/Link'
-import {TagMenu, useTagMenuControl} from '#/components/TagMenu'
+import {atoms as a, TextStyleProp, flatten, useTheme, web, native} from '#/alf'
+import {InlineLink} from '#/components/Link'
 import {Text, TextProps} from '#/components/Typography'
+import {toShortUrl} from 'lib/strings/url-helpers'
+import {TagMenu, useTagMenuControl} from '#/components/TagMenu'
+import {isNative} from '#/platform/detection'
+import {useInteractionState} from '#/components/hooks/useInteractionState'

 const WORD_WRAP = {wordWrap: 1}

@@ -84,7 +84,7 @@ export function RichText({
      !disableLinks
    ) {
      els.push(
-        <InlineLinkText
+        <InlineLink
          selectable={selectable}
          key={key}
          to={`/profile/${mention.did}`}
@@ -92,23 +92,22 @@ export function RichText({
          // @ts-ignore TODO
          dataSet={WORD_WRAP}>
          {segment.text}
-        </InlineLinkText>,
+        </InlineLink>,
      )
    } else if (link && AppBskyRichtextFacet.validateLink(link).success) {
      if (disableLinks) {
        els.push(toShortUrl(segment.text))
      } else {
        els.push(
-          <InlineLinkText
+          <InlineLink
            selectable={selectable}
            key={key}
            to={link.uri}
            style={[...styles, {pointerEvents: 'auto'}]}
            // @ts-ignore TODO
-            dataSet={WORD_WRAP}
-            shareOnLongPress>
+            dataSet={WORD_WRAP}>
            {toShortUrl(segment.text)}
-          </InlineLinkText>,
+          </InlineLink>,
        )
      }
    } else if (
@@ -1,9 +1,14 @@
 import React from 'react'
-import {StyleProp, TextProps as RNTextProps, TextStyle} from 'react-native'
-import {UITextView} from 'react-native-uitextview'
+import {
+  Text as RNText,
+  StyleProp,
+  TextStyle,
+  TextProps as RNTextProps,
+} from 'react-native'
+import {UITextView} from 'react-native-ui-text-view'

-import {isNative} from '#/platform/detection'
-import {atoms, flatten, useTheme, web} from '#/alf'
+import {useTheme, atoms, web, flatten} from '#/alf'
+import {isIOS, isNative} from '#/platform/detection'

 export type TextProps = RNTextProps & {
  /**
@@ -56,8 +61,11 @@ export function normalizeTextStyles(styles: StyleProp<TextStyle>) {
 export function Text({style, selectable, ...rest}: TextProps) {
  const t = useTheme()
  const s = normalizeTextStyles([atoms.text_sm, t.atoms.text, flatten(style)])
-
-  return <UITextView selectable={selectable} uiTextView style={s} {...rest} />
+  return selectable && isIOS ? (
+    <UITextView style={s} {...rest} />
+  ) : (
+    <RNText selectable={selectable} style={s} {...rest} />
+  )
 }

 export function createHeadingElement({level}: {level: number}) {
@@ -1,23 +1,23 @@
 import React from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import {Trans, msg} from '@lingui/macro'
+import {View} from 'react-native'

-import {cleanError} from '#/lib/strings/errors'
+import * as Dialog from '#/components/Dialog'
+import {Text} from '../Typography'
+import {DateInput} from '#/view/com/util/forms/DateInput'
 import {logger} from '#/logger'
-import {isIOS, isWeb} from '#/platform/detection'
 import {
  usePreferencesQuery,
-  UsePreferencesQueryResponse,
  usePreferencesSetBirthDateMutation,
+  UsePreferencesQueryResponse,
 } from '#/state/queries/preferences'
-import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
-import {DateInput} from '#/view/com/util/forms/DateInput'
-import {atoms as a, useTheme} from '#/alf'
-import * as Dialog from '#/components/Dialog'
-import {Loader} from '#/components/Loader'
 import {Button, ButtonIcon, ButtonText} from '../Button'
-import {Text} from '../Typography'
+import {atoms as a, useTheme} from '#/alf'
+import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
+import {cleanError} from '#/lib/strings/errors'
+import {isIOS, isWeb} from '#/platform/detection'
+import {Loader} from '#/components/Loader'

 export function BirthDateSettingsDialog({
  control,
@@ -1,119 +0,0 @@
-import React, {useCallback} from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {
-  type EmbedPlayerSource,
-  embedPlayerSources,
-  externalEmbedLabels,
-} from '#/lib/strings/embed-player'
-import {useSetExternalEmbedPref} from '#/state/preferences'
-import {atoms as a, useBreakpoints, useTheme} from '#/alf'
-import * as Dialog from '#/components/Dialog'
-import {Button, ButtonText} from '../Button'
-import {Text} from '../Typography'
-
-export function EmbedConsentDialog({
-  control,
-  source,
-  onAccept,
-}: {
-  control: Dialog.DialogControlProps
-  source: EmbedPlayerSource
-  onAccept: () => void
-}) {
-  const {_} = useLingui()
-  const t = useTheme()
-  const setExternalEmbedPref = useSetExternalEmbedPref()
-  const {gtMobile} = useBreakpoints()
-
-  const onShowAllPress = useCallback(() => {
-    for (const key of embedPlayerSources) {
-      setExternalEmbedPref(key, 'show')
-    }
-    onAccept()
-    control.close()
-  }, [control, onAccept, setExternalEmbedPref])
-
-  const onShowPress = useCallback(() => {
-    setExternalEmbedPref(source, 'show')
-    onAccept()
-    control.close()
-  }, [control, onAccept, setExternalEmbedPref, source])
-
-  const onHidePress = useCallback(() => {
-    setExternalEmbedPref(source, 'hide')
-    control.close()
-  }, [control, setExternalEmbedPref, source])
-
-  return (
-    <Dialog.Outer control={control}>
-      <Dialog.Handle />
-
-      <Dialog.ScrollableInner
-        label={_(msg`External Media`)}
-        style={[gtMobile ? {width: 'auto', maxWidth: 400} : a.w_full]}>
-        <View style={a.gap_sm}>
-          <Text style={[a.text_2xl, a.font_bold]}>
-            <Trans>External Media</Trans>
-          </Text>
-
-          <View style={[a.mt_sm, a.mb_2xl, a.gap_lg]}>
-            <Text>
-              <Trans>
-                This content is hosted by {externalEmbedLabels[source]}. Do you
-                want to enable external media?
-              </Trans>
-            </Text>
-
-            <Text style={t.atoms.text_contrast_medium}>
-              <Trans>
-                External media may allow websites to collect information about
-                you and your device. No information is sent or requested until
-                you press the "play" button.
-              </Trans>
-            </Text>
-          </View>
-        </View>
-        <View style={a.gap_md}>
-          <Button
-            style={gtMobile && a.flex_1}
-            label={_(msg`Enable external media`)}
-            onPress={onShowAllPress}
-            onAccessibilityEscape={control.close}
-            color="primary"
-            size="medium"
-            variant="solid">
-            <ButtonText>
-              <Trans>Enable external media</Trans>
-            </ButtonText>
-          </Button>
-          <Button
-            style={gtMobile && a.flex_1}
-            label={_(msg`Enable this source only`)}
-            onPress={onShowPress}
-            onAccessibilityEscape={control.close}
-            color="secondary"
-            size="medium"
-            variant="solid">
-            <ButtonText>
-              <Trans>Enable {externalEmbedLabels[source]} only</Trans>
-            </ButtonText>
-          </Button>
-          <Button
-            label={_(msg`No thanks`)}
-            onAccessibilityEscape={control.close}
-            onPress={onHidePress}
-            color="secondary"
-            size="medium"
-            variant="ghost">
-            <ButtonText>
-              <Trans>No thanks</Trans>
-            </ButtonText>
-          </Button>
-        </View>
-      </Dialog.ScrollableInner>
-    </Dialog.Outer>
-  )
-}
@@ -1,36 +1,37 @@
 import React from 'react'
 import {Keyboard, View} from 'react-native'
-import {AppBskyActorDefs, sanitizeMutedWordValue} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import {AppBskyActorDefs, sanitizeMutedWordValue} from '@atproto/api'

-import {logger} from '#/logger'
-import {isNative} from '#/platform/detection'
 import {
  usePreferencesQuery,
-  useRemoveMutedWordMutation,
  useUpsertMutedWordsMutation,
+  useRemoveMutedWordMutation,
 } from '#/state/queries/preferences'
+import {isNative} from '#/platform/detection'
 import {
  atoms as a,
-  native,
-  useBreakpoints,
  useTheme,
+  useBreakpoints,
  ViewStyleProp,
  web,
+  native,
 } from '#/alf'
+import {Text} from '#/components/Typography'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
-import {useGlobalDialogsControlContext} from '#/components/dialogs/Context'
-import {Divider} from '#/components/Divider'
-import * as Toggle from '#/components/forms/Toggle'
-import {Hashtag_Stroke2_Corner0_Rounded as Hashtag} from '#/components/icons/Hashtag'
-import {PageText_Stroke2_Corner0_Rounded as PageText} from '#/components/icons/PageText'
 import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus'
 import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
+import {Hashtag_Stroke2_Corner0_Rounded as Hashtag} from '#/components/icons/Hashtag'
+import {PageText_Stroke2_Corner0_Rounded as PageText} from '#/components/icons/PageText'
+import {Divider} from '#/components/Divider'
 import {Loader} from '#/components/Loader'
+import {logger} from '#/logger'
+import * as Dialog from '#/components/Dialog'
+import * as Toggle from '#/components/forms/Toggle'
 import * as Prompt from '#/components/Prompt'
-import {Text} from '#/components/Typography'
+
+import {useGlobalDialogsControlContext} from '#/components/dialogs/Context'

 export function MutedWordsDialog() {
  const {mutedWordsDialogControl: control} = useGlobalDialogsControlContext()
@@ -129,9 +130,9 @@ function MutedWordsInner({}: {control: Dialog.DialogOuterProps['control']}) {
                <TargetToggle>
                  <View style={[a.flex_row, a.align_center, a.gap_sm]}>
                    <Toggle.Radio />
-                    <Toggle.LabelText>
+                    <Toggle.Label>
                      <Trans>Mute in text & tags</Trans>
-                    </Toggle.LabelText>
+                    </Toggle.Label>
                  </View>
                  <PageText size="sm" />
                </TargetToggle>
@@ -144,9 +145,9 @@ function MutedWordsInner({}: {control: Dialog.DialogOuterProps['control']}) {
                <TargetToggle>
                  <View style={[a.flex_row, a.align_center, a.gap_sm]}>
                    <Toggle.Radio />
-                    <Toggle.LabelText>
+                    <Toggle.Label>
                      <Trans>Mute in tags only</Trans>
-                    </Toggle.LabelText>
+                    </Toggle.Label>
                  </View>
                  <Hashtag size="sm" />
                </TargetToggle>
@@ -1,61 +0,0 @@
-import React, {useCallback} from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {useAccountSwitcher} from '#/lib/hooks/useAccountSwitcher'
-import {type SessionAccount, useSession} from '#/state/session'
-import {useLoggedOutViewControls} from '#/state/shell/logged-out'
-import {useCloseAllActiveElements} from '#/state/util'
-import {atoms as a} from '#/alf'
-import * as Dialog from '#/components/Dialog'
-import {AccountList} from '../AccountList'
-import {Text} from '../Typography'
-
-export function SwitchAccountDialog({
-  control,
-}: {
-  control: Dialog.DialogControlProps
-}) {
-  const {_} = useLingui()
-  const {currentAccount} = useSession()
-  const {onPressSwitchAccount} = useAccountSwitcher()
-  const {setShowLoggedOut} = useLoggedOutViewControls()
-  const closeAllActiveElements = useCloseAllActiveElements()
-
-  const onSelectAccount = useCallback(
-    (account: SessionAccount) => {
-      if (account.did === currentAccount?.did) {
-        control.close()
-      } else {
-        onPressSwitchAccount(account, 'SwitchAccount')
-      }
-    },
-    [currentAccount, control, onPressSwitchAccount],
-  )
-
-  const onPressAddAccount = useCallback(() => {
-    setShowLoggedOut(true)
-    closeAllActiveElements()
-  }, [setShowLoggedOut, closeAllActiveElements])
-
-  return (
-    <Dialog.Outer control={control}>
-      <Dialog.Handle />
-
-      <Dialog.ScrollableInner label={_(msg`Switch Account`)}>
-        <View style={[a.gap_lg]}>
-          <Text style={[a.text_2xl, a.font_bold]}>
-            <Trans>Switch Account</Trans>
-          </Text>
-
-          <AccountList
-            onSelectAccount={onSelectAccount}
-            onSelectOther={onPressAddAccount}
-            otherLabel={_(msg`Add account`)}
-          />
-        </View>
-      </Dialog.ScrollableInner>
-    </Dialog.Outer>
-  )
-}
@@ -8,7 +8,7 @@ import * as TextField from '#/components/forms/TextField'
 import {DateFieldButton} from './index.shared'

 export * as utils from '#/components/forms/DateField/utils'
-export const LabelText = TextField.LabelText
+export const Label = TextField.Label

 export function DateField({
  value,
@@ -13,7 +13,7 @@ import * as TextField from '#/components/forms/TextField'
 import {DateFieldButton} from './index.shared'

 export * as utils from '#/components/forms/DateField/utils'
-export const LabelText = TextField.LabelText
+export const Label = TextField.Label

 /**
 * Date-only input. Accepts a date in the format YYYY-MM-DD, and reports date
@@ -9,7 +9,7 @@ import * as TextField from '#/components/forms/TextField'
 import {CalendarDays_Stroke2_Corner0_Rounded as CalendarDays} from '#/components/icons/CalendarDays'

 export * as utils from '#/components/forms/DateField/utils'
-export const LabelText = TextField.LabelText
+export const Label = TextField.Label

 const InputBase = React.forwardRef<HTMLInputElement, TextInputProps>(
  ({style, ...props}, ref) => {
@@ -225,7 +225,7 @@ export function createInput(Component: typeof TextInput) {

 export const Input = createInput(TextInput)

-export function LabelText({
+export function Label({
  nativeID,
  children,
 }: React.PropsWithChildren<{nativeID?: string}>) {
@@ -288,7 +288,7 @@ export function Icon({icon: Comp}: {icon: React.ComponentType<SVGIconProps>}) {
  )
 }

-export function SuffixText({
+export function Suffix({
  children,
  label,
  accessibilityHint,
@@ -3,16 +3,16 @@ import {Pressable, View, ViewStyle} from 'react-native'

 import {HITSLOP_10} from 'lib/constants'
 import {
-  atoms as a,
-  flatten,
-  native,
-  TextStyleProp,
  useTheme,
+  atoms as a,
+  native,
+  flatten,
  ViewStyleProp,
+  TextStyleProp,
 } from '#/alf'
+import {Text} from '#/components/Typography'
 import {useInteractionState} from '#/components/hooks/useInteractionState'
 import {CheckThick_Stroke2_Corner0_Rounded as Checkmark} from '#/components/icons/Check'
-import {Text} from '#/components/Typography'

 export type ItemState = {
  name: string
@@ -234,7 +234,7 @@ export function Item({
  )
 }

-export function LabelText({
+export function Label({
  children,
  style,
 }: React.PropsWithChildren<TextStyleProp>) {
@@ -1,15 +1,16 @@
 import React from 'react'
-import {AccessibilityProps, TextStyle, View, ViewStyle} from 'react-native'
+import {View, AccessibilityProps, TextStyle, ViewStyle} from 'react-native'

-import {atoms as a, native, useTheme} from '#/alf'
-import * as Toggle from '#/components/forms/Toggle'
+import {atoms as a, useTheme, native} from '#/alf'
 import {Text} from '#/components/Typography'

-type ItemProps = Omit<Toggle.ItemProps, 'style' | 'role' | 'children'> &
-  AccessibilityProps & {
-    children: React.ReactElement
+import * as Toggle from '#/components/forms/Toggle'
+
+export type ItemProps = Omit<Toggle.ItemProps, 'style' | 'role' | 'children'> &
+  AccessibilityProps &
+  React.PropsWithChildren<{
    testID?: string
-  }
+  }>

 export type GroupProps = Omit<Toggle.GroupProps, 'style' | 'type'> & {
  multiple?: boolean
@@ -46,42 +47,49 @@ function ButtonInner({children}: React.PropsWithChildren<{}>) {
  const t = useTheme()
  const state = Toggle.useItemContext()

-  const {baseStyles, hoverStyles, activeStyles} = React.useMemo(() => {
-    const base: ViewStyle[] = []
-    const hover: ViewStyle[] = []
-    const active: ViewStyle[] = []
+  const {baseStyles, hoverStyles, activeStyles, textStyles} =
+    React.useMemo(() => {
+      const base: ViewStyle[] = []
+      const hover: ViewStyle[] = []
+      const active: ViewStyle[] = []
+      const text: TextStyle[] = []

-    hover.push(
-      t.name === 'light' ? t.atoms.bg_contrast_100 : t.atoms.bg_contrast_25,
-    )
+      hover.push(
+        t.name === 'light' ? t.atoms.bg_contrast_100 : t.atoms.bg_contrast_25,
+      )

-    if (state.selected) {
-      active.push({
-        backgroundColor: t.palette.contrast_800,
-      })
-      hover.push({
-        backgroundColor: t.palette.contrast_800,
-      })
+      if (state.selected) {
+        active.push({
+          backgroundColor: t.palette.contrast_800,
+        })
+        text.push(t.atoms.text_inverted)
+        hover.push({
+          backgroundColor: t.palette.contrast_800,
+        })
+
+        if (state.disabled) {
+          active.push({
+            backgroundColor: t.palette.contrast_500,
+          })
+        }
+      }

      if (state.disabled) {
-        active.push({
-          backgroundColor: t.palette.contrast_500,
+        base.push({
+          backgroundColor: t.palette.contrast_100,
+        })
+        text.push({
+          opacity: 0.5,
        })
      }
-    }

-    if (state.disabled) {
-      base.push({
-        backgroundColor: t.palette.contrast_100,
-      })
-    }
-
-    return {
-      baseStyles: base,
-      hoverStyles: hover,
-      activeStyles: active,
-    }
-  }, [t, state])
+      return {
+        baseStyles: base,
+        hoverStyles: hover,
+        activeStyles: active,
+        textStyles: text,
+      }
+    }, [t, state])

  return (
    <View
@@ -102,37 +110,19 @@ function ButtonInner({children}: React.PropsWithChildren<{}>) {
        activeStyles,
        (state.hovered || state.pressed) && hoverStyles,
      ]}>
-      {children}
+      {typeof children === 'string' ? (
+        <Text
+          style={[
+            a.text_center,
+            a.font_bold,
+            t.atoms.text_contrast_medium,
+            textStyles,
+          ]}>
+          {children}
+        </Text>
+      ) : (
+        children
+      )}
    </View>
  )
 }
-
-export function ButtonText({children}: {children: React.ReactNode}) {
-  const t = useTheme()
-  const state = Toggle.useItemContext()
-
-  const textStyles = React.useMemo(() => {
-    const text: TextStyle[] = []
-    if (state.selected) {
-      text.push(t.atoms.text_inverted)
-    }
-    if (state.disabled) {
-      text.push({
-        opacity: 0.5,
-      })
-    }
-    return text
-  }, [t, state])
-
-  return (
-    <Text
-      style={[
-        a.text_center,
-        a.font_bold,
-        t.atoms.text_contrast_medium,
-        textStyles,
-      ]}>
-      {children}
-    </Text>
-  )
-}
@@ -1,21 +1,22 @@
 import React from 'react'
 import {View} from 'react-native'
 import {InterpretedLabelValueDefinition, LabelPreference} from '@atproto/api'
-import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import {msg, Trans} from '@lingui/macro'

 import {useGlobalLabelStrings} from '#/lib/moderation/useGlobalLabelStrings'
-import {useLabelBehaviorDescription} from '#/lib/moderation/useLabelBehaviorDescription'
-import {getLabelStrings} from '#/lib/moderation/useLabelInfo'
 import {
  usePreferencesQuery,
  usePreferencesSetContentLabelMutation,
 } from '#/state/queries/preferences'
-import {atoms as a, useBreakpoints, useTheme} from '#/alf'
-import * as ToggleButton from '#/components/forms/ToggleButton'
-import {InlineLinkText} from '#/components/Link'
+import {useLabelBehaviorDescription} from '#/lib/moderation/useLabelBehaviorDescription'
+import {getLabelStrings} from '#/lib/moderation/useLabelInfo'
+
+import {useTheme, atoms as a, useBreakpoints} from '#/alf'
 import {Text} from '#/components/Typography'
+import {InlineLink} from '#/components/Link'
 import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '../icons/CircleInfo'
+import * as ToggleButton from '#/components/forms/ToggleButton'

 export function Outer({children}: React.PropsWithChildren<{}>) {
  return (
@@ -84,17 +85,17 @@ export function Buttons({
        onChange={onChange}>
        {ignoreLabel && (
          <ToggleButton.Button name="ignore" label={ignoreLabel}>
-            <ToggleButton.ButtonText>{ignoreLabel}</ToggleButton.ButtonText>
+            {ignoreLabel}
          </ToggleButton.Button>
        )}
        {warnLabel && (
          <ToggleButton.Button name="warn" label={warnLabel}>
-            <ToggleButton.ButtonText>{warnLabel}</ToggleButton.ButtonText>
+            {warnLabel}
          </ToggleButton.Button>
        )}
        {hideLabel && (
          <ToggleButton.Button name="hide" label={hideLabel}>
-            <ToggleButton.ButtonText>{hideLabel}</ToggleButton.ButtonText>
+            {hideLabel}
          </ToggleButton.Button>
        )}
      </ToggleButton.Group>
@@ -243,9 +244,9 @@ export function LabelerLabelPreference({
              ) : isGlobalLabel ? (
                <Trans>
                  Configured in{' '}
-                  <InlineLinkText to="/moderation" style={a.text_sm}>
+                  <InlineLink to="/moderation" style={a.text_sm}>
                    moderation settings
-                  </InlineLinkText>
+                  </InlineLink>
                  .
                </Trans>
              ) : null}
@@ -1,19 +1,20 @@
 import React from 'react'
 import {View} from 'react-native'
-import {ComAtprotoLabelDefs, ComAtprotoModerationDefs} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import {ComAtprotoLabelDefs, ComAtprotoModerationDefs} from '@atproto/api'

 import {useLabelInfo} from '#/lib/moderation/useLabelInfo'
 import {makeProfileLink} from '#/lib/routes/links'
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {getAgent} from '#/state/session'
-import * as Toast from '#/view/com/util/Toast'
+
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
-import {Button, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
-import {InlineLinkText} from '#/components/Link'
 import {Text} from '#/components/Typography'
+import * as Dialog from '#/components/Dialog'
+import {Button, ButtonText} from '#/components/Button'
+import {InlineLink} from '#/components/Link'
+import * as Toast from '#/view/com/util/Toast'
 import {Divider} from '../Divider'

 export {useDialogControl as useLabelsOnMeDialogControl} from '#/components/Dialog'
@@ -144,13 +145,13 @@ function Label({
      <View style={[a.px_md, a.py_sm, t.atoms.bg_contrast_25]}>
        <Text style={[t.atoms.text_contrast_medium]}>
          <Trans>Source:</Trans>{' '}
-          <InlineLinkText
+          <InlineLink
            to={makeProfileLink(
              labeler ? labeler.creator : {did: label.src, handle: ''},
            )}
            onPress={() => control.close()}>
            {labeler ? sanitizeHandle(labeler.creator.handle, '@') : label.src}
-          </InlineLinkText>
+          </InlineLink>
        </Text>
      </View>
    </View>
@@ -203,14 +204,14 @@ function AppealForm({
      <Text style={[a.text_md, a.leading_snug]}>
        <Trans>
          This appeal will be sent to{' '}
-          <InlineLinkText
+          <InlineLink
            to={makeProfileLink(
              labeler ? labeler.creator : {did: label.src, handle: ''},
            )}
            onPress={() => control.close()}
            style={[a.text_md, a.leading_snug]}>
            {labeler ? sanitizeHandle(labeler.creator.handle, '@') : label.src}
-          </InlineLinkText>
+          </InlineLink>
          .
        </Trans>
      </Text>
@@ -244,7 +245,7 @@ function AppealForm({
          size="medium"
          onPress={onPressBack}
          label={_(msg`Back`)}>
-          <ButtonText>{_(msg`Back`)}</ButtonText>
+          {_(msg`Back`)}
        </Button>
        <Button
          testID="submitBtn"
@@ -253,7 +254,7 @@ function AppealForm({
          size="medium"
          onPress={onSubmit}
          label={_(msg`Submit`)}>
-          <ButtonText>{_(msg`Submit`)}</ButtonText>
+          {_(msg`Submit`)}
        </Button>
      </View>
    </>
@@ -1,18 +1,19 @@
 import React from 'react'
 import {View} from 'react-native'
-import {ModerationCause} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import {ModerationCause} from '@atproto/api'

+import {listUriToHref} from '#/lib/strings/url-helpers'
 import {useModerationCauseDescription} from '#/lib/moderation/useModerationCauseDescription'
 import {makeProfileLink} from '#/lib/routes/links'
-import {listUriToHref} from '#/lib/strings/url-helpers'
+
 import {isNative} from '#/platform/detection'
-import {atoms as a, useTheme} from '#/alf'
-import * as Dialog from '#/components/Dialog'
-import {Divider} from '#/components/Divider'
-import {InlineLinkText} from '#/components/Link'
+import {useTheme, atoms as a} from '#/alf'
 import {Text} from '#/components/Typography'
+import * as Dialog from '#/components/Dialog'
+import {InlineLink} from '#/components/Link'
+import {Divider} from '#/components/Divider'

 export {useDialogControl as useModerationDetailsDialogControl} from '#/components/Dialog'

@@ -54,9 +55,9 @@ function ModerationDetailsDialogInner({
      description = (
        <Trans>
          This user is included in the{' '}
-          <InlineLinkText to={listUriToHref(list.uri)} style={[a.text_sm]}>
+          <InlineLink to={listUriToHref(list.uri)} style={[a.text_sm]}>
            {list.name}
-          </InlineLinkText>{' '}
+          </InlineLink>{' '}
          list which you have blocked.
        </Trans>
      )
@@ -83,9 +84,9 @@ function ModerationDetailsDialogInner({
      description = (
        <Trans>
          This user is included in the{' '}
-          <InlineLinkText to={listUriToHref(list.uri)} style={[a.text_sm]}>
+          <InlineLink to={listUriToHref(list.uri)} style={[a.text_sm]}>
            {list.name}
-          </InlineLinkText>{' '}
+          </InlineLink>{' '}
          list which you have muted.
        </Trans>
      )
@@ -126,12 +127,12 @@ function ModerationDetailsDialogInner({
              {modcause.source.type === 'user' ? (
                <Trans>the author</Trans>
              ) : (
-                <InlineLinkText
+                <InlineLink
                  to={makeProfileLink({did: modcause.label.src, handle: ''})}
                  onPress={() => control.close()}
                  style={a.text_md}>
                  {desc.source}
-                </InlineLinkText>
+                </InlineLink>
              )}
              .
            </Trans>
@@ -1,26 +1,27 @@
 import React from 'react'
 import {
-  StyleProp,
  TouchableWithoutFeedback,
+  StyleProp,
  View,
  ViewStyle,
 } from 'react-native'
-import {ModerationUI} from '@atproto/api'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
+import {ModerationUI} from '@atproto/api'
+import {Trans, msg} from '@lingui/macro'
+import {useLingui} from '@lingui/react'

-import {useModerationCauseDescription} from '#/lib/moderation/useModerationCauseDescription'
 import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
 import {NavigationProp} from 'lib/routes/types'
+import {useModerationCauseDescription} from '#/lib/moderation/useModerationCauseDescription'
+
+import {useTheme, atoms as a} from '#/alf'
 import {CenteredView} from '#/view/com/util/Views'
-import {atoms as a, useTheme} from '#/alf'
+import {Text} from '#/components/Typography'
 import {Button, ButtonText} from '#/components/Button'
 import {
  ModerationDetailsDialog,
  useModerationDetailsDialogControl,
 } from '#/components/moderation/ModerationDetailsDialog'
-import {Text} from '#/components/Typography'

 export function ScreenHider({
  testID,
@@ -124,15 +125,7 @@ export function ScreenHider({
              accessibilityRole="button"
              accessibilityLabel={_(msg`Learn more about this warning`)}
              accessibilityHint="">
-              <Text
-                style={[
-                  a.text_lg,
-                  {
-                    color: t.palette.primary_500,
-                    // @ts-ignore web only -prf
-                    cursor: 'pointer',
-                  },
-                ]}>
+              <Text style={[a.text_lg, {color: t.palette.primary_500}]}>
                <Trans>Learn More</Trans>
              </Text>
            </TouchableWithoutFeedback>
@@ -1,9 +1,5 @@
-import {nativeApplicationVersion, nativeBuildVersion} from 'expo-application'
+import VersionNumber from 'react-native-version-number'
+import * as Updates from 'expo-updates'
+export const updateChannel = Updates.channel

-export const IS_DEV = process.env.EXPO_PUBLIC_ENV === 'development'
-export const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
-
-const UPDATES_CHANNEL = IS_TESTFLIGHT ? 'testflight' : 'production'
-export const appVersion = `${nativeApplicationVersion} (${nativeBuildVersion}, ${
-  IS_DEV ? 'development' : UPDATES_CHANNEL
-})`
+export const appVersion = `${VersionNumber.appVersion} (${VersionNumber.buildVersion})`
@@ -4,7 +4,6 @@ export const LOCAL_DEV_SERVICE =
  Platform.OS === 'android' ? 'http://10.0.2.2:2583' : 'http://localhost:2583'
 export const STAGING_SERVICE = 'https://staging.bsky.dev'
 export const BSKY_SERVICE = 'https://bsky.social'
-export const PUBLIC_BSKY_SERVICE = 'https://public.api.bsky.app'
 export const DEFAULT_SERVICE = BSKY_SERVICE
 const HELP_DESK_LANG = 'en-us'
 export const HELP_DESK_URL = `https://blueskyweb.zendesk.com/hc/${HELP_DESK_LANG}`
@@ -81,10 +80,8 @@ export const HITSLOP_30 = createHitslop(30)
 export const BACK_HITSLOP = HITSLOP_30
 export const MAX_POST_LINES = 25

-export const BSKY_APP_ACCOUNT_DID = 'did:plc:z72i7hdynmk6r22z27h6tvur'
-
 export const BSKY_FEED_OWNER_DIDS = [
-  BSKY_APP_ACCOUNT_DID,
+  'did:plc:z72i7hdynmk6r22z27h6tvur',
  'did:plc:vpkhqolt662uhesyj6nxm7ys',
  'did:plc:q6gjnaw2blty4crticxkmujt',
 ]
@@ -1,35 +1,28 @@
-import {
-  impactAsync,
-  ImpactFeedbackStyle,
-  notificationAsync,
-  NotificationFeedbackType,
-  selectionAsync,
-} from 'expo-haptics'
-
 import {isIOS, isWeb} from 'platform/detection'
+import ReactNativeHapticFeedback, {
+  HapticFeedbackTypes,
+} from 'react-native-haptic-feedback'

-const hapticImpact: ImpactFeedbackStyle = isIOS
-  ? ImpactFeedbackStyle.Medium
-  : ImpactFeedbackStyle.Light // Users said the medium impact was too strong on Android; see APP-537s
+const hapticImpact: HapticFeedbackTypes = isIOS ? 'impactMedium' : 'impactLight' // Users said the medium impact was too strong on Android; see APP-537s

 export class Haptics {
  static default() {
    if (isWeb) {
      return
    }
-    impactAsync(hapticImpact)
+    ReactNativeHapticFeedback.trigger(hapticImpact)
  }
-  static impact(type: ImpactFeedbackStyle = hapticImpact) {
+  static impact(type: HapticFeedbackTypes = hapticImpact) {
    if (isWeb) {
      return
    }
-    impactAsync(type)
+    ReactNativeHapticFeedback.trigger(type)
  }
  static selection() {
    if (isWeb) {
      return
    }
-    selectionAsync()
+    ReactNativeHapticFeedback.trigger('selection')
  }
  static notification = (type: 'success' | 'warning' | 'error') => {
    if (isWeb) {
@@ -37,11 +30,11 @@ export class Haptics {
    }
    switch (type) {
      case 'success':
-        return notificationAsync(NotificationFeedbackType.Success)
+        return ReactNativeHapticFeedback.trigger('notificationSuccess')
      case 'warning':
-        return notificationAsync(NotificationFeedbackType.Warning)
+        return ReactNativeHapticFeedback.trigger('notificationWarning')
      case 'error':
-        return notificationAsync(NotificationFeedbackType.Error)
+        return ReactNativeHapticFeedback.trigger('notificationError')
    }
  }
 }
@@ -1,12 +1,11 @@
 import {useCallback} from 'react'

-import {useAnalytics} from '#/lib/analytics/analytics'
-import {logger} from '#/logger'
 import {isWeb} from '#/platform/detection'
-import {SessionAccount, useSessionApi} from '#/state/session'
-import {useLoggedOutViewControls} from '#/state/shell/logged-out'
-import {useCloseAllActiveElements} from '#/state/util'
+import {useAnalytics} from '#/lib/analytics/analytics'
+import {useSessionApi, SessionAccount} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
+import {useCloseAllActiveElements} from '#/state/util'
+import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import {LogEvents} from '../statsig/statsig'

 export function useAccountSwitcher() {
@@ -45,14 +44,9 @@ export function useAccountSwitcher() {
            'circle-exclamation',
          )
        }
-      } catch (e: any) {
-        logger.error(`switch account: selectAccount failed`, {
-          message: e.message,
-        })
+      } catch (e) {
+        Toast.show('Sorry! We need you to enter your password.')
        clearCurrentAccount() // back user out to login
-        setTimeout(() => {
-          Toast.show('Sorry! We need you to enter your password.')
-        }, 100)
      }
    },
    [
@@ -1,142 +0,0 @@
-import React from 'react'
-import {Alert, AppState, AppStateStatus} from 'react-native'
-import {nativeBuildVersion} from 'expo-application'
-import {
-  checkForUpdateAsync,
-  fetchUpdateAsync,
-  isEnabled,
-  reloadAsync,
-  setExtraParamAsync,
-  useUpdates,
-} from 'expo-updates'
-
-import {logger} from '#/logger'
-import {IS_TESTFLIGHT} from 'lib/app-info'
-import {isIOS} from 'platform/detection'
-
-const MINIMUM_MINIMIZE_TIME = 15 * 60e3
-
-async function setExtraParams() {
-  await setExtraParamAsync(
-    isIOS ? 'ios-build-number' : 'android-build-number',
-    // Hilariously, `buildVersion` is not actually a string on Android even though the TS type says it is.
-    // This just ensures it gets passed as a string
-    `${nativeBuildVersion}`,
-  )
-  await setExtraParamAsync(
-    'channel',
-    IS_TESTFLIGHT ? 'testflight' : 'production',
-  )
-}
-
-export function useOTAUpdates() {
-  const appState = React.useRef<AppStateStatus>('active')
-  const lastMinimize = React.useRef(0)
-  const ranInitialCheck = React.useRef(false)
-  const timeout = React.useRef<NodeJS.Timeout>()
-  const {isUpdatePending} = useUpdates()
-
-  const setCheckTimeout = React.useCallback(() => {
-    timeout.current = setTimeout(async () => {
-      try {
-        await setExtraParams()
-
-        logger.debug('Checking for update...')
-        const res = await checkForUpdateAsync()
-
-        if (res.isAvailable) {
-          logger.debug('Attempting to fetch update...')
-          await fetchUpdateAsync()
-        } else {
-          logger.debug('No update available.')
-        }
-      } catch (e) {
-        logger.warn('OTA Update Error', {error: `${e}`})
-      }
-    }, 10e3)
-  }, [])
-
-  const onIsTestFlight = React.useCallback(() => {
-    setTimeout(async () => {
-      try {
-        await setExtraParams()
-
-        const res = await checkForUpdateAsync()
-        if (res.isAvailable) {
-          await fetchUpdateAsync()
-
-          Alert.alert(
-            'Update Available',
-            'A new version of the app is available. Relaunch now?',
-            [
-              {
-                text: 'No',
-                style: 'cancel',
-              },
-              {
-                text: 'Relaunch',
-                style: 'default',
-                onPress: async () => {
-                  await reloadAsync()
-                },
-              },
-            ],
-          )
-        }
-      } catch (e: any) {
-        // No need to handle
-      }
-    }, 3e3)
-  }, [])
-
-  React.useEffect(() => {
-    // For Testflight users, we can prompt the user to update immediately whenever there's an available update. This
-    // is suspect however with the Apple App Store guidelines, so we don't want to prompt production users to update
-    // immediately.
-    if (IS_TESTFLIGHT) {
-      onIsTestFlight()
-      return
-    } else if (!isEnabled || __DEV__ || ranInitialCheck.current) {
-      // Development client shouldn't check for updates at all, so we skip that here.
-      return
-    }
-
-    setCheckTimeout()
-    ranInitialCheck.current = true
-  }, [onIsTestFlight, setCheckTimeout])
-
-  // After the app has been minimized for 30 minutes, we want to either A. install an update if one has become available
-  // or B check for an update again.
-  React.useEffect(() => {
-    if (!isEnabled) return
-
-    const subscription = AppState.addEventListener(
-      'change',
-      async nextAppState => {
-        if (
-          appState.current.match(/inactive|background/) &&
-          nextAppState === 'active'
-        ) {
-          // If it's been 15 minutes since the last "minimize", we should feel comfortable updating the client since
-          // chances are that there isn't anything important going on in the current session.
-          if (lastMinimize.current <= Date.now() - MINIMUM_MINIMIZE_TIME) {
-            if (isUpdatePending) {
-              await reloadAsync()
-            } else {
-              setCheckTimeout()
-            }
-          }
-        } else {
-          lastMinimize.current = Date.now()
-        }
-
-        appState.current = nextAppState
-      },
-    )
-
-    return () => {
-      clearTimeout(timeout.current)
-      subscription.remove()
-    }
-  }, [isUpdatePending, setCheckTimeout])
-}
@@ -1,6 +1,6 @@
 import React from 'react'
 import {StyleProp, TextStyle, ViewStyle} from 'react-native'
-import Svg, {Ellipse, Line, Path, Rect} from 'react-native-svg'
+import Svg, {Path, Rect, Line, Ellipse} from 'react-native-svg'

 export function GridIcon({
  style,
@@ -141,8 +141,8 @@ export function MagnifyingGlassIcon2({
      width={size || 24}
      height={size || 24}
      style={style}>
-      <Ellipse cx="12" cy="10.5" rx="9" ry="9" />
-      <Line x1="18.5" y1="17" x2="22" y2="20.5" strokeLinecap="round" />
+      <Ellipse cx="12" cy="11" rx="9" ry="9" />
+      <Line x1="19" y1="17.3" x2="23.5" y2="21" strokeLinecap="round" />
    </Svg>
  )
 }
@@ -167,14 +167,14 @@ export function MagnifyingGlassIcon2Solid({
      style={style}>
      <Ellipse
        cx="12"
-        cy="10.5"
-        rx="6.5"
-        ry="6.5"
+        cy="11"
+        rx="7"
+        ry="7"
        stroke="none"
        fill="currentColor"
      />
-      <Ellipse cx="12" cy="10.5" rx="9" ry="9" />
-      <Line x1="18.5" y1="17" x2="22" y2="20.5" strokeLinecap="round" />
+      <Ellipse cx="12" cy="11" rx="9" ry="9" />
+      <Line x1="19" y1="17.3" x2="23.5" y2="21" strokeLinecap="round" />
    </Svg>
  )
 }
@@ -1,6 +1,6 @@
-import {useMemo} from 'react'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import {useMemo} from 'react'

 export type GlobalLabelStrings = Record<
  string,
@@ -31,7 +31,7 @@ export function useGlobalLabelStrings(): GlobalLabelStrings {
        ),
      },
      porn: {
-        name: _(msg`Adult Content`),
+        name: _(msg`Pornography`),
        description: _(msg`Explicit sexual images.`),
      },
      sexual: {
@@ -1,7 +1,7 @@
-import {useMemo} from 'react'
-import {ComAtprotoModerationDefs} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import {useMemo} from 'react'
+import {ComAtprotoModerationDefs} from '@atproto/api'

 export interface ReportOption {
  reason: string
@@ -68,7 +68,7 @@ export function useReportOptions(): ReportOptions {
        {
          reason: ComAtprotoModerationDefs.REASONSEXUAL,
          title: _(msg`Unwanted Sexual Content`),
-          description: _(msg`Nudity or adult content not labeled as such`),
+          description: _(msg`Nudity or pornography not labeled as such`),
        },
        ...common,
      ],
@@ -11,8 +11,7 @@ import {
 import {isNative} from '#/platform/detection'

 // any query keys in this array will be persisted to AsyncStorage
-export const labelersDetailedInfoQueryKeyRoot = 'labelers-detailed-info'
-const STORED_CACHE_QUERY_KEY_ROOTS = [labelersDetailedInfoQueryKeyRoot]
+const STORED_CACHE_QUERY_KEYS = ['labelers-detailed-info']

 focusManager.setEventListener(onFocus => {
  if (isNative) {
@@ -66,7 +65,7 @@ const dehydrateOptions: PersistQueryClientProviderProps['persistOptions']['dehyd
  {
    shouldDehydrateMutation: (_: any) => false,
    shouldDehydrateQuery: query => {
-      return STORED_CACHE_QUERY_KEY_ROOTS.includes(String(query.queryKey[0]))
+      return STORED_CACHE_QUERY_KEYS.includes(String(query.queryKey[0]))
    },
  }

@@ -114,6 +113,7 @@ function QueryProviderInner({
      dehydrateOptions,
    }
  })
+  console.log('QUERY', currentDid)
  return (
    <PersistQueryClientProvider
      client={queryClient}
@@ -4,7 +4,7 @@
 */

 import {Platform} from 'react-native'
-import {nativeApplicationVersion, nativeBuildVersion} from 'expo-application'
+import app from 'react-native-version-number'
 import * as info from 'expo-updates'
 import {init} from 'sentry-expo'

@@ -21,7 +21,7 @@ const buildChannel = (info.channel || 'development') as
 * - `dev`
 * - `1.57.0`
 */
-const release = nativeApplicationVersion ?? 'dev'
+const release = app.appVersion ?? 'dev'

 /**
 * Examples:
@@ -33,7 +33,7 @@ const release = nativeApplicationVersion ?? 'dev'
 * - `android.1.57.0.46`
 */
 const dist = `${Platform.OS}.${release}${
-  nativeBuildVersion ? `.${nativeBuildVersion}` : ''
+  app.buildVersion ? `.${app.buildVersion}` : ''
 }`

 init({
@@ -1,9 +1,8 @@
-import {Share} from 'react-native'
+import {isIOS, isAndroid} from 'platform/detection'
 // import * as Sharing from 'expo-sharing'
-import {setStringAsync} from 'expo-clipboard'
-
-import {isAndroid, isIOS} from 'platform/detection'
-import * as Toast from '#/view/com/util/Toast'
+import Clipboard from '@react-native-clipboard/clipboard'
+import * as Toast from '../view/com/util/Toast'
+import {Share} from 'react-native'

 /**
 * This function shares a URL using the native Share API if available, or copies it to the clipboard
@@ -19,7 +18,7 @@ export async function shareUrl(url: string) {
  } else {
    // React Native Share is not supported by web. Web Share API
    // has increasing but not full support, so default to clipboard
-    setStringAsync(url)
+    Clipboard.setString(url)
    Toast.show('Copied to clipboard')
  }
 }
@@ -45,12 +45,10 @@ export type LogEvents = {
  'onboarding:moderation:nextPressed': {}
  'onboarding:finished:nextPressed': {}
  'feed:endReached': {
-    feedUrl: string
    feedType: string
    itemCount: number
  }
  'feed:refresh': {
-    feedUrl: string
    feedType: string
    reason: 'pull-to-refresh' | 'soft-reset' | 'load-latest'
  }
@@ -67,10 +65,6 @@ export type LogEvents = {
    logContext: 'Composer'
  }
  'post:like': {
-    doesLikerFollowPoster: boolean | undefined
-    doesPosterFollowLiker: boolean | undefined
-    likerClout: number | undefined
-    postClout: number | undefined
    logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
  }
  'post:repost': {
@@ -83,9 +77,6 @@ export type LogEvents = {
    logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
  }
  'profile:follow': {
-    didBecomeMutual: boolean | undefined
-    followeeClout: number | undefined
-    followerClout: number | undefined
    logContext:
      | 'RecommendedFollowsItem'
      | 'PostThreadItem'
@@ -8,7 +8,6 @@ import {
  useGate as useStatsigGate,
 } from 'statsig-react-native-expo'

-import {logger} from '#/logger'
 import {useSession} from '../../state/session'
 import {LogEvents} from './events'

@@ -43,14 +42,6 @@ export function attachRouteToLogEvents(
  getCurrentRouteName = getRouteName
 }

-export function toClout(n: number | null | undefined): number | undefined {
-  if (n == null) {
-    return undefined
-  } else {
-    return Math.max(0, Math.round(Math.log(n)))
-  }
-}
-
 export function logEvent<E extends keyof LogEvents>(
  eventName: E & string,
  rawMetadata: LogEvents[E] & FlatJSONRecord,
@@ -65,7 +56,10 @@ export function logEvent<E extends keyof LogEvents>(
    }
  } catch (e) {
    // A log should never interrupt the calling code, whatever happens.
-    logger.error('Failed to log an event', {message: e})
+    // Rethrow on a clean stack.
+    setTimeout(() => {
+      throw e
+    })
  }
 }

@@ -86,10 +80,6 @@ function toStatsigUser(did: string | undefined) {
  return {
    userID,
    platform: Platform.OS,
-    custom: {
-      // Need to specify here too for gating.
-      platform: Platform.OS,
-    },
  }
 }

@@ -1,8 +1,7 @@
 import {AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
-import * as bcp47Match from 'bcp-47-match'
 import lande from 'lande'
-
 import {hasProp} from 'lib/type-guards'
+import * as bcp47Match from 'bcp-47-match'
 import {
  AppLanguage,
  LANGUAGES_MAP_CODE2,
@@ -119,8 +118,6 @@ export function sanitizeAppLanguageSetting(appLanguage: string): AppLanguage {
    switch (lang) {
      case 'en':
        return AppLanguage.en
-      case 'ca':
-        return AppLanguage.ca
      case 'de':
        return AppLanguage.de
      case 'es':
@@ -129,28 +126,24 @@ export function sanitizeAppLanguageSetting(appLanguage: string): AppLanguage {
        return AppLanguage.fi
      case 'fr':
        return AppLanguage.fr
-      case 'ga':
-        return AppLanguage.ga
      case 'hi':
        return AppLanguage.hi
      case 'id':
        return AppLanguage.id
-      case 'it':
-        return AppLanguage.it
      case 'ja':
        return AppLanguage.ja
      case 'ko':
        return AppLanguage.ko
      case 'pt-BR':
        return AppLanguage.pt_BR
-      case 'tr':
-        return AppLanguage.tr
      case 'uk':
        return AppLanguage.uk
+      case 'ca':
+        return AppLanguage.ca
      case 'zh-CN':
        return AppLanguage.zh_CN
-      case 'zh-TW':
-        return AppLanguage.zh_TW
+      case 'it':
+        return AppLanguage.it
      default:
        continue
    }
@@ -1,36 +1,30 @@
 import {useEffect} from 'react'
 import {i18n} from '@lingui/core'

-import {sanitizeAppLanguageSetting} from '#/locale/helpers'
-import {AppLanguage} from '#/locale/languages'
-import {messages as messagesCa} from '#/locale/locales/ca/messages'
-import {messages as messagesDe} from '#/locale/locales/de/messages'
+import {useLanguagePrefs} from '#/state/preferences'
 import {messages as messagesEn} from '#/locale/locales/en/messages'
+import {messages as messagesDe} from '#/locale/locales/de/messages'
+import {messages as messagesId} from '#/locale/locales/id/messages'
 import {messages as messagesEs} from '#/locale/locales/es/messages'
 import {messages as messagesFi} from '#/locale/locales/fi/messages'
 import {messages as messagesFr} from '#/locale/locales/fr/messages'
-import {messages as messagesGa} from '#/locale/locales/ga/messages'
 import {messages as messagesHi} from '#/locale/locales/hi/messages'
-import {messages as messagesId} from '#/locale/locales/id/messages'
-import {messages as messagesIt} from '#/locale/locales/it/messages'
 import {messages as messagesJa} from '#/locale/locales/ja/messages'
 import {messages as messagesKo} from '#/locale/locales/ko/messages'
 import {messages as messagesPt_BR} from '#/locale/locales/pt-BR/messages'
-import {messages as messagesTr} from '#/locale/locales/tr/messages'
 import {messages as messagesUk} from '#/locale/locales/uk/messages'
+import {messages as messagesCa} from '#/locale/locales/ca/messages'
 import {messages as messagesZh_CN} from '#/locale/locales/zh-CN/messages'
-import {messages as messagesZh_TW} from '#/locale/locales/zh-TW/messages'
-import {useLanguagePrefs} from '#/state/preferences'
+import {messages as messagesIt} from '#/locale/locales/it/messages'
+
+import {sanitizeAppLanguageSetting} from '#/locale/helpers'
+import {AppLanguage} from '#/locale/languages'

 /**
 * We do a dynamic import of just the catalog that we need
 */
 export async function dynamicActivate(locale: AppLanguage) {
  switch (locale) {
-    case AppLanguage.ca: {
-      i18n.loadAndActivate({locale, messages: messagesCa})
-      break
-    }
    case AppLanguage.de: {
      i18n.loadAndActivate({locale, messages: messagesDe})
      break
@@ -47,10 +41,6 @@ export async function dynamicActivate(locale: AppLanguage) {
      i18n.loadAndActivate({locale, messages: messagesFr})
      break
    }
-    case AppLanguage.ga: {
-      i18n.loadAndActivate({locale, messages: messagesGa})
-      break
-    }
    case AppLanguage.hi: {
      i18n.loadAndActivate({locale, messages: messagesHi})
      break
@@ -59,10 +49,6 @@ export async function dynamicActivate(locale: AppLanguage) {
      i18n.loadAndActivate({locale, messages: messagesId})
      break
    }
-    case AppLanguage.it: {
-      i18n.loadAndActivate({locale, messages: messagesIt})
-      break
-    }
    case AppLanguage.ja: {
      i18n.loadAndActivate({locale, messages: messagesJa})
      break
@@ -75,20 +61,20 @@ export async function dynamicActivate(locale: AppLanguage) {
      i18n.loadAndActivate({locale, messages: messagesPt_BR})
      break
    }
-    case AppLanguage.tr: {
-      i18n.loadAndActivate({locale, messages: messagesTr})
-      break
-    }
    case AppLanguage.uk: {
      i18n.loadAndActivate({locale, messages: messagesUk})
      break
    }
+    case AppLanguage.ca: {
+      i18n.loadAndActivate({locale, messages: messagesCa})
+      break
+    }
    case AppLanguage.zh_CN: {
      i18n.loadAndActivate({locale, messages: messagesZh_CN})
      break
    }
-    case AppLanguage.zh_TW: {
-      i18n.loadAndActivate({locale, messages: messagesZh_TW})
+    case AppLanguage.it: {
+      i18n.loadAndActivate({locale, messages: messagesIt})
      break
    }
    default: {
@@ -1,9 +1,9 @@
 import {useEffect} from 'react'
 import {i18n} from '@lingui/core'

+import {useLanguagePrefs} from '#/state/preferences'
 import {sanitizeAppLanguageSetting} from '#/locale/helpers'
 import {AppLanguage} from '#/locale/languages'
-import {useLanguagePrefs} from '#/state/preferences'

 /**
 * We do a dynamic import of just the catalog that we need
@@ -12,10 +12,6 @@ export async function dynamicActivate(locale: AppLanguage) {
  let mod: any

  switch (locale) {
-    case AppLanguage.ca: {
-      mod = await import(`./locales/ca/messages`)
-      break
-    }
    case AppLanguage.de: {
      mod = await import(`./locales/de/messages`)
      break
@@ -32,10 +28,6 @@ export async function dynamicActivate(locale: AppLanguage) {
      mod = await import(`./locales/fr/messages`)
      break
    }
-    case AppLanguage.ga: {
-      mod = await import(`./locales/ga/messages`)
-      break
-    }
    case AppLanguage.hi: {
      mod = await import(`./locales/hi/messages`)
      break
@@ -44,10 +36,6 @@ export async function dynamicActivate(locale: AppLanguage) {
      mod = await import(`./locales/id/messages`)
      break
    }
-    case AppLanguage.it: {
-      mod = await import(`./locales/it/messages`)
-      break
-    }
    case AppLanguage.ja: {
      mod = await import(`./locales/ja/messages`)
      break
@@ -60,20 +48,20 @@ export async function dynamicActivate(locale: AppLanguage) {
      mod = await import(`./locales/pt-BR/messages`)
      break
    }
-    case AppLanguage.tr: {
-      mod = await import(`./locales/tr/messages`)
-      break
-    }
    case AppLanguage.uk: {
      mod = await import(`./locales/uk/messages`)
      break
    }
+    case AppLanguage.ca: {
+      mod = await import(`./locales/ca/messages`)
+      break
+    }
    case AppLanguage.zh_CN: {
      mod = await import(`./locales/zh-CN/messages`)
      break
    }
-    case AppLanguage.zh_TW: {
-      mod = await import(`./locales/zh-TW/messages`)
+    case AppLanguage.it: {
+      mod = await import(`./locales/it/messages`)
      break
    }
    default: {
@@ -6,22 +6,19 @@ interface Language {

 export enum AppLanguage {
  en = 'en',
-  ca = 'ca',
  de = 'de',
  es = 'es',
  fi = 'fi',
  fr = 'fr',
-  ga = 'ga',
  hi = 'hi',
  id = 'id',
-  it = 'it',
  ja = 'ja',
  ko = 'ko',
  pt_BR = 'pt-BR',
-  tr = 'tr',
  uk = 'uk',
+  ca = 'ca',
  zh_CN = 'zh-CN',
-  zh_TW = 'zh-TW',
+  it = 'it',
 }

 interface AppLanguageConfig {
@@ -31,22 +28,19 @@ interface AppLanguageConfig {

 export const APP_LANGUAGES: AppLanguageConfig[] = [
  {code2: AppLanguage.en, name: 'English'},
-  {code2: AppLanguage.ca, name: 'Català – Catalan'},
  {code2: AppLanguage.de, name: 'Deutsch – German'},
  {code2: AppLanguage.es, name: 'Español – Spanish'},
  {code2: AppLanguage.fi, name: 'Suomi – Finnish'},
  {code2: AppLanguage.fr, name: 'Français – French'},
-  {code2: AppLanguage.ga, name: 'Gaeilge – Irish'},
  {code2: AppLanguage.hi, name: 'हिंदी – Hindi'},
  {code2: AppLanguage.id, name: 'Bahasa Indonesia – Indonesian'},
-  {code2: AppLanguage.it, name: 'Italiano – Italian'},
  {code2: AppLanguage.ja, name: '日本語 – Japanese'},
  {code2: AppLanguage.ko, name: '한국어 – Korean'},
  {code2: AppLanguage.pt_BR, name: 'Português (BR) – Portuguese (BR)'},
-  {code2: AppLanguage.tr, name: 'Türkçe – Turkish'},
  {code2: AppLanguage.uk, name: 'Українська – Ukrainian'},
-  {code2: AppLanguage.zh_CN, name: '简体中文（中国）– Chinese (Simplified)'},
-  {code2: AppLanguage.zh_TW, name: '繁體中文（臺灣）– Chinese (Traditional)'},
+  {code2: AppLanguage.ca, name: 'Català – Catalan'},
+  {code2: AppLanguage.zh_CN, name: '简体中文（中国） – Chinese (Simplified)'},
+  {code2: AppLanguage.it, name: 'Italiano - Italian'},
 ]

 export const LANGUAGES: Language[] = [
@@ -6,32 +6,3 @@ findLast.shim()

 // @ts-ignore whatever typescript wants to complain about here, I dont care about -prf
 window.setImmediate = (cb: () => void) => setTimeout(cb, 0)
-
-if (process.env.NODE_ENV !== 'production') {
-  // In development, react-native-web's <View> tries to validate that
-  // text is wrapped into <Text>. It doesn't catch all cases but is useful.
-  // Unfortunately, it only does that via console.error so it's easy to miss.
-  // This is a hack to get it showing as a redbox on the web so we catch it early.
-  const realConsoleError = console.error
-  const thrownErrors = new WeakSet()
-  console.error = function consoleErrorWrapper(msgOrError) {
-    if (
-      typeof msgOrError === 'string' &&
-      msgOrError.startsWith('Unexpected text node')
-    ) {
-      if (
-        msgOrError ===
-        'Unexpected text node: . A text node cannot be a child of a <View>.'
-      ) {
-        // This is due to a stray empty string.
-        // React already handles this fine, so RNW warning is a false positive. Ignore.
-        return
-      }
-      const err = new Error(msgOrError)
-      thrownErrors.add(err)
-      throw err
-    } else if (!thrownErrors.has(msgOrError)) {
-      return realConsoleError.apply(this, arguments as any)
-    }
-  }
-}
@@ -1,30 +1,28 @@
 import React from 'react'
 import {ListRenderItemInfo, Pressable} from 'react-native'
-import {PostView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
 import {useFocusEffect} from '@react-navigation/native'
-import {NativeStackScreenProps} from '@react-navigation/native-stack'
-
-import {HITSLOP_10} from 'lib/constants'
-import {useInitialNumToRender} from 'lib/hooks/useInitialNumToRender'
-import {CommonNavigatorParams} from 'lib/routes/types'
-import {shareUrl} from 'lib/sharing'
-import {cleanError} from 'lib/strings/errors'
-import {sanitizeHandle} from 'lib/strings/handles'
-import {enforceLen} from 'lib/strings/helpers'
-import {isNative} from 'platform/detection'
-import {useSearchPostsQuery} from 'state/queries/search-posts'
 import {useSetMinimalShellMode} from 'state/shell'
-import {Post} from 'view/com/post/Post'
-import {List} from 'view/com/util/List'
 import {ViewHeader} from 'view/com/util/ViewHeader'
-import {ArrowOutOfBox_Stroke2_Corner0_Rounded} from '#/components/icons/ArrowOutOfBox'
+import {NativeStackScreenProps} from '@react-navigation/native-stack'
+import {CommonNavigatorParams} from 'lib/routes/types'
+import {useSearchPostsQuery} from 'state/queries/search-posts'
+import {Post} from 'view/com/post/Post'
+import {PostView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
+import {enforceLen} from 'lib/strings/helpers'
 import {
  ListFooter,
  ListHeaderDesktop,
  ListMaybePlaceholder,
 } from '#/components/Lists'
+import {List} from 'view/com/util/List'
+import {msg} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+import {sanitizeHandle} from 'lib/strings/handles'
+import {ArrowOutOfBox_Stroke2_Corner0_Rounded} from '#/components/icons/ArrowOutOfBox'
+import {shareUrl} from 'lib/sharing'
+import {HITSLOP_10} from 'lib/constants'
+import {isNative} from 'platform/detection'
+import {useInitialNumToRender} from 'lib/hooks/useInitialNumToRender'

 const renderItem = ({item}: ListRenderItemInfo<PostView>) => {
  return <Post post={item} />
@@ -63,8 +61,9 @@ export default function HashtagScreen({

  const {
    data,
-    isFetchingNextPage,
+    isFetching,
    isLoading,
+    isRefetching,
    isError,
    error,
    refetch,
@@ -98,9 +97,9 @@ export default function HashtagScreen({
  }, [refetch])

  const onEndReached = React.useCallback(() => {
-    if (isFetchingNextPage || !hasNextPage || error) return
+    if (isFetching || !hasNextPage || error) return
    fetchNextPage()
-  }, [isFetchingNextPage, hasNextPage, error, fetchNextPage])
+  }, [isFetching, hasNextPage, error, fetchNextPage])

  return (
    <>
@@ -124,16 +123,16 @@ export default function HashtagScreen({
            : undefined
        }
      />
-      {posts.length < 1 ? (
-        <ListMaybePlaceholder
-          isLoading={isLoading}
-          isError={isError}
-          onRetry={refetch}
-          emptyType="results"
-          emptyMessage={_(msg`We couldn't find any results for that hashtag.`)}
-        />
-      ) : (
-        <List
+      <ListMaybePlaceholder
+        isLoading={isLoading || isRefetching}
+        isError={isError}
+        isEmpty={posts.length < 1}
+        onRetry={refetch}
+        emptyTitle="results"
+        emptyMessage={_(msg`We couldn't find any results for that hashtag.`)}
+      />
+      {!isLoading && posts.length > 0 && (
+        <List<PostView>
          data={posts}
          renderItem={renderItem}
          keyExtractor={keyExtractor}
@@ -151,8 +150,9 @@ export default function HashtagScreen({
          }
          ListFooterComponent={
            <ListFooter
-              isFetchingNextPage={isFetchingNextPage}
-              error={cleanError(error)}
+              isFetching={isFetching && !isRefetching}
+              isError={isError}
+              error={error?.name}
              onRetry={fetchNextPage}
            />
          }
@@ -5,16 +5,76 @@ import {useLingui} from '@lingui/react'

 import {useAnalytics} from '#/lib/analytics/analytics'
 import {logEvent} from '#/lib/statsig/statsig'
-import {logger} from '#/logger'
+import {colors} from '#/lib/styles'
+import {useProfileQuery} from '#/state/queries/profile'
 import {SessionAccount, useSession, useSessionApi} from '#/state/session'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import * as Toast from '#/view/com/util/Toast'
-import {atoms as a} from '#/alf'
-import {AccountList} from '#/components/AccountList'
-import {Button, ButtonText} from '#/components/Button'
+import {UserAvatar} from '#/view/com/util/UserAvatar'
+import {atoms as a, useTheme} from '#/alf'
+import {Button} from '#/components/Button'
 import * as TextField from '#/components/forms/TextField'
+import {Check_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
+import {ChevronRight_Stroke2_Corner0_Rounded as Chevron} from '#/components/icons/Chevron'
+import {Text} from '#/components/Typography'
 import {FormContainer} from './FormContainer'

+function AccountItem({
+  account,
+  onSelect,
+  isCurrentAccount,
+}: {
+  account: SessionAccount
+  onSelect: (account: SessionAccount) => void
+  isCurrentAccount: boolean
+}) {
+  const t = useTheme()
+  const {_} = useLingui()
+  const {data: profile} = useProfileQuery({did: account.did})
+
+  const onPress = React.useCallback(() => {
+    onSelect(account)
+  }, [account, onSelect])
+
+  return (
+    <Button
+      testID={`chooseAccountBtn-${account.handle}`}
+      key={account.did}
+      style={[a.flex_1]}
+      onPress={onPress}
+      label={
+        isCurrentAccount
+          ? _(msg`Continue as ${account.handle} (currently signed in)`)
+          : _(msg`Sign in as ${account.handle}`)
+      }>
+      {({hovered, pressed}) => (
+        <View
+          style={[
+            a.flex_1,
+            a.flex_row,
+            a.align_center,
+            {height: 48},
+            (hovered || pressed) && t.atoms.bg_contrast_25,
+          ]}>
+          <View style={a.p_md}>
+            <UserAvatar avatar={profile?.avatar} size={24} />
+          </View>
+          <Text style={[a.align_baseline, a.flex_1, a.flex_row, a.py_sm]}>
+            <Text style={[a.font_bold]}>
+              {profile?.displayName || account.handle}{' '}
+            </Text>
+            <Text style={[t.atoms.text_contrast_medium]}>{account.handle}</Text>
+          </Text>
+          {isCurrentAccount ? (
+            <Check size="sm" style={[{color: colors.green3}, a.mr_md]} />
+          ) : (
+            <Chevron size="sm" style={[t.atoms.text, a.mr_md]} />
+          )}
+        </View>
+      )}
+    </Button>
+  )
+}
 export const ChooseAccountForm = ({
  onSelectAccount,
  onPressBack,
@@ -24,7 +84,8 @@ export const ChooseAccountForm = ({
 }) => {
  const {track, screen} = useAnalytics()
  const {_} = useLingui()
-  const {currentAccount} = useSession()
+  const t = useTheme()
+  const {accounts, currentAccount} = useSession()
  const {initSession} = useSessionApi()
  const {setShowLoggedOut} = useLoggedOutViewControls()

@@ -39,22 +100,15 @@ export const ChooseAccountForm = ({
          setShowLoggedOut(false)
          Toast.show(_(msg`Already signed in as @${account.handle}`))
        } else {
-          try {
-            await initSession(account)
-            logEvent('account:loggedIn', {
-              logContext: 'ChooseAccountForm',
-              withPassword: false,
-            })
-            track('Sign In', {resumedSession: true})
-            setTimeout(() => {
-              Toast.show(_(msg`Signed in as @${account.handle}`))
-            }, 100)
-          } catch (e: any) {
-            logger.error('choose account: initSession failed', {
-              message: e.message,
-            })
-            onSelectAccount(account)
-          }
+          await initSession(account)
+          logEvent('account:loggedIn', {
+            logContext: 'ChooseAccountForm',
+            withPassword: false,
+          })
+          track('Sign In', {resumedSession: true})
+          setTimeout(() => {
+            Toast.show(_(msg`Signed in as @${account.handle}`))
+          }, 100)
        }
      } else {
        onSelectAccount(account)
@@ -66,15 +120,57 @@ export const ChooseAccountForm = ({
  return (
    <FormContainer
      testID="chooseAccountForm"
-      titleText={<Trans>Select account</Trans>}>
+      title={<Trans>Select account</Trans>}>
      <View>
-        <TextField.LabelText>
+        <TextField.Label>
          <Trans>Sign in as...</Trans>
-        </TextField.LabelText>
-        <AccountList
-          onSelectAccount={onSelect}
-          onSelectOther={() => onSelectAccount()}
-        />
+        </TextField.Label>
+        <View
+          style={[
+            a.rounded_md,
+            a.overflow_hidden,
+            a.border,
+            t.atoms.border_contrast_low,
+          ]}>
+          {accounts.map(account => (
+            <React.Fragment key={account.did}>
+              <AccountItem
+                account={account}
+                onSelect={onSelect}
+                isCurrentAccount={account.did === currentAccount?.did}
+              />
+              <View style={[a.border_b, t.atoms.border_contrast_low]} />
+            </React.Fragment>
+          ))}
+          <Button
+            testID="chooseNewAccountBtn"
+            style={[a.flex_1]}
+            onPress={() => onSelectAccount(undefined)}
+            label={_(msg`Login to account that is not listed`)}>
+            {({hovered, pressed}) => (
+              <View
+                style={[
+                  a.flex_1,
+                  a.flex_row,
+                  a.align_center,
+                  {height: 48},
+                  (hovered || pressed) && t.atoms.bg_contrast_25,
+                ]}>
+                <Text
+                  style={[
+                    a.align_baseline,
+                    a.flex_1,
+                    a.flex_row,
+                    a.py_sm,
+                    {paddingLeft: 48},
+                  ]}>
+                  <Trans>Other account</Trans>
+                </Text>
+                <Chevron size="sm" style={[t.atoms.text, a.mr_md]} />
+              </View>
+            )}
+          </Button>
+        </View>
      </View>
      <View style={[a.flex_row]}>
        <Button
@@ -83,7 +179,7 @@ export const ChooseAccountForm = ({
          color="secondary"
          size="medium"
          onPress={onPressBack}>
-          <ButtonText>{_(msg`Back`)}</ButtonText>
+          {_(msg`Back`)}
        </Button>
        <View style={[a.flex_1]} />
      </View>
@@ -83,11 +83,11 @@ export const ForgotPasswordForm = ({
  return (
    <FormContainer
      testID="forgotPasswordForm"
-      titleText={<Trans>Reset password</Trans>}>
+      title={<Trans>Reset password</Trans>}>
      <View>
-        <TextField.LabelText>
+        <TextField.Label>
          <Trans>Hosting provider</Trans>
-        </TextField.LabelText>
+        </TextField.Label>
        <HostingProvider
          serviceUrl={serviceUrl}
          onSelectServiceUrl={setServiceUrl}
@@ -95,9 +95,9 @@ export const ForgotPasswordForm = ({
        />
      </View>
      <View>
-        <TextField.LabelText>
+        <TextField.Label>
          <Trans>Email address</Trans>
-        </TextField.LabelText>
+        </TextField.Label>
        <TextField.Root>
          <TextField.Icon icon={At} />
          <TextField.Input
@@ -1,32 +1,53 @@
 import React from 'react'
-import {type StyleProp, View, type ViewStyle} from 'react-native'
+import {
+  ScrollView,
+  type StyleProp,
+  StyleSheet,
+  View,
+  type ViewStyle,
+} from 'react-native'

+import {isWeb} from '#/platform/detection'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {Text} from '#/components/Typography'

 export function FormContainer({
  testID,
-  titleText,
+  title,
  children,
  style,
+  contentContainerStyle,
 }: {
  testID?: string
-  titleText?: React.ReactNode
+  title?: React.ReactNode
  children: React.ReactNode
  style?: StyleProp<ViewStyle>
+  contentContainerStyle?: StyleProp<ViewStyle>
 }) {
  const {gtMobile} = useBreakpoints()
  const t = useTheme()
  return (
-    <View
+    <ScrollView
      testID={testID}
-      style={[a.gap_md, a.flex_1, !gtMobile && [a.px_lg, a.py_md], style]}>
-      {titleText && !gtMobile && (
-        <Text style={[a.text_xl, a.font_bold, t.atoms.text_contrast_high]}>
-          {titleText}
-        </Text>
-      )}
-      {children}
-    </View>
+      style={[styles.maxHeight, contentContainerStyle]}
+      keyboardShouldPersistTaps="handled">
+      <View
+        style={[a.gap_md, a.flex_1, !gtMobile && [a.px_lg, a.pt_md], style]}>
+        {title && !gtMobile && (
+          <Text style={[a.text_xl, a.font_bold, t.atoms.text_contrast_high]}>
+            {title}
+          </Text>
+        )}
+        {children}
+      </View>
+    </ScrollView>
  )
 }
+
+const styles = StyleSheet.create({
+  maxHeight: {
+    // @ts-ignore web only -prf
+    maxHeight: isWeb ? '100vh' : undefined,
+    height: !isWeb ? '100%' : undefined,
+  },
+})
@@ -128,11 +128,11 @@ export const LoginForm = ({

  const isReady = !!serviceDescription && !!identifier && !!password
  return (
-    <FormContainer testID="loginForm" titleText={<Trans>Sign in</Trans>}>
+    <FormContainer testID="loginForm" title={<Trans>Sign in</Trans>}>
      <View>
-        <TextField.LabelText>
+        <TextField.Label>
          <Trans>Hosting provider</Trans>
-        </TextField.LabelText>
+        </TextField.Label>
        <HostingProvider
          serviceUrl={serviceUrl}
          onSelectServiceUrl={setServiceUrl}
@@ -140,9 +140,9 @@ export const LoginForm = ({
        />
      </View>
      <View>
-        <TextField.LabelText>
+        <TextField.Label>
          <Trans>Account</Trans>
-        </TextField.LabelText>
+        </TextField.Label>
        <View style={[a.gap_sm]}>
          <TextField.Root>
            <TextField.Icon icon={At} />
@@ -237,9 +237,7 @@ export const LoginForm = ({
            color="secondary"
            size="medium"
            onPress={onPressRetryConnect}>
-            <ButtonText>
-              <Trans>Retry</Trans>
-            </ButtonText>
+            {_(msg`Retry`)}
          </Button>
        ) : !serviceDescription ? (
          <>
@@ -99,7 +99,7 @@ export const SetNewPasswordForm = ({
  return (
    <FormContainer
      testID="setNewPasswordForm"
-      titleText={<Trans>Set new password</Trans>}>
+      title={<Trans>Set new password</Trans>}>
      <Text style={[a.leading_snug, a.mb_sm]}>
        <Trans>
          You will receive an email with a "reset code." Enter that code here,
@@ -108,7 +108,7 @@ export const SetNewPasswordForm = ({
      </Text>

      <View>
-        <TextField.LabelText>Reset code</TextField.LabelText>
+        <TextField.Label>Reset code</TextField.Label>
        <TextField.Root>
          <TextField.Icon icon={Ticket} />
          <TextField.Input
@@ -131,7 +131,7 @@ export const SetNewPasswordForm = ({
      </View>

      <View>
-        <TextField.LabelText>New password</TextField.LabelText>
+        <TextField.Label>New password</TextField.Label>
        <TextField.Root>
          <TextField.Icon icon={Lock} />
          <TextField.Input
@@ -164,11 +164,7 @@ export const Login = ({onPressBack}: {onPressBack: () => void}) => {

  return (
    <KeyboardAvoidingView testID="signIn" behavior="padding" style={a.flex_1}>
-      <LoggedOutLayout
-        leadin=""
-        title={title}
-        description={description}
-        scrollable>
+      <LoggedOutLayout leadin="" title={title} description={description}>
        <LayoutAnimationConfig skipEntering skipExiting>
          <ScreenTransition key={currentForm}>{content}</ScreenTransition>
        </LayoutAnimationConfig>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric Bailey	53f65fac32	Add some logs	2024-04-03 13:54:03 -05:00
Dan Abramov	2e2e554f07	Scope query client per DID	2024-03-22 00:06:25 +00:00
Dan Abramov	8e8bcfbc75	Remove useQueryClient dependency from session provider	2024-03-21 23:41:44 +00:00
Dan Abramov	9e36c4abb0	Pull useQueryClient-dependent code down in App.native	2024-03-21 23:38:55 +00:00
Dan Abramov	17b014f4ae	Move QueryProvider inside the key	2024-03-21 23:30:33 +00:00
Dan Abramov	57a72a1108	Factor out QueryProvider	2024-03-21 23:24:17 +00:00
Dan Abramov	19031bc699	Make notifications init reactive to queryClient	2024-03-21 23:14:51 +00:00
Dan Abramov	f18b801979	Pass queryClient explicitly to updateProfileShadow	2024-03-21 22:53:00 +00:00
Dan Abramov	e56b7e00b5	Pass queryClient explicitly to updatePostShadow	2024-03-21 22:47:02 +00:00
Dan Abramov	698ba036dd	Pass queryClient explicitly to resetProfilePostsQueries	2024-03-21 22:41:24 +00:00