Comments

Hacky fix
Remove comment, revert storybook
2024-02-19 15:49:22 -06:00 · 2024-02-19 14:42:09 -06:00 · 2024-02-19 14:02:30 -06:00 · 2024-02-19 13:59:03 -06:00
490 changed files with 25264 additions and 55759 deletions
@@ -7,52 +7,10 @@ module.exports = {
    'prettier',
  ],
  parser: '@typescript-eslint/parser',
-  plugins: [
-    '@typescript-eslint',
-    'detox',
-    'react',
-    'lingui',
-    'simple-import-sort',
-  ],
+  plugins: ['@typescript-eslint', 'detox', 'react', 'lingui'],
  rules: {
    'react/no-unescaped-entities': 0,
    'react-native/no-inline-styles': 0,
-    'simple-import-sort/imports': [
-      'warn',
-      {
-        groups: [
-          // Side effect imports.
-          ['^\\u0000'],
-          // Node.js builtins prefixed with `node:`.
-          ['^node:'],
-          // Packages.
-          // Things that start with a letter (or digit or underscore), or `@` followed by a letter.
-          // React/React Native priortized, followed by expo
-          // Followed by all packages excluding unprefixed relative ones
-          [
-            '^(react\\/(.*)$)|^(react$)|^(react-native(.*)$)',
-            '^(expo(.*)$)|^(expo$)',
-            '^(?!(?:alf|components|lib|locale|logger|platform|screens|state|view)(?:$|\\/))@?\\w',
-          ],
-          // Relative imports.
-          // Ideally, anything that starts with a dot or #
-          // due to unprefixed relative imports being used, we whitelist the relative paths we use
-          // (?:$|\\/) matches end of string or /
-          [
-            '^(?:#\\/)?(?:lib|state|logger|platform|locale)(?:$|\\/)',
-            '^(?:#\\/)?view(?:$|\\/)',
-            '^(?:#\\/)?screens(?:$|\\/)',
-            '^(?:#\\/)?alf(?:$|\\/)',
-            '^(?:#\\/)?components(?:$|\\/)',
-            '^#\\/',
-            '^\\.',
-          ],
-          // anything else - hopefully we don't have any of these
-          ['^'],
-        ],
-      },
-    ],
-    'simple-import-sort/exports': 'warn',
  },
  ignorePatterns: [
    '**/__mocks__/*.ts',
@@ -73,8 +31,4 @@ module.exports = {
  settings: {
    componentWrapperFunctions: ['observer'],
  },
-  parserOptions: {
-    sourceType: 'module',
-    ecmaVersion: 'latest',
-  },
 }
@@ -3,8 +3,8 @@ on:
  push:
    branches:
      - main
-      - 3p-moderators
-
+      - traffic-reduction
+      - respect-optout-for-embeds
 env:
  REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
  USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}
@@ -1,65 +0,0 @@
---
-name: Build and Submit Android
-
-on:
-  workflow_dispatch:
-    inputs:
-      profile:
-        type: choice
-        description: Build profile to use
-        options:
-          - production
-
-jobs:
-  build:
-    name: Build and Submit Android
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for EXPO_TOKEN
-        run: >
-          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
-            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
-            exit 1
-          fi
-
-      - name: ⬇️ Checkout
-        uses: actions/checkout@v4
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          expo-version: latest
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: ⛏️ Setup EAS local builds
-        run: yarn global add eas-cli-local-build-plugin
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: ⚙️ Install dependencies
-        run: yarn install
-
-      - name: 🔤 Compile translations
-        run: yarn intl:build
-
-      - name: ✏️ Write environment variables
-        run: |
-          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "$json" > google-services.json
-
-      - name: 🏗️ EAS Build
-        run: yarn use-build-number eas build -p android --profile production --local --output build.aab --non-interactive
-
-      - name: 🚀 Deploy
-        run: eas submit -p android --non-interactive --path build.aab
@@ -1,75 +0,0 @@
---
-name: Build and Submit iOS
-
-on:
-  schedule:
-    - cron: '0 5 * * *'
-  workflow_dispatch:
-    inputs:
-      profile:
-        type: choice
-        description: Build profile to use
-        options:
-          - production
-
-jobs:
-  build:
-    name: Build and Submit iOS
-    runs-on: macos-14
-    steps:
-      - name: Check for EXPO_TOKEN
-        run: >
-          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
-            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
-            exit 1
-          fi
-
-      - name: ⬇️ Checkout
-        uses: actions/checkout@v4
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          expo-version: latest
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: ⛏️ Setup EAS local builds
-        run: yarn global add eas-cli-local-build-plugin
-
-      - name: ⚙️ Install dependencies
-        run: yarn install
-
-      - name: ☕️ Setup Cocoapods
-        uses: maxim-lobanov/setup-cocoapods@v1
-        with:
-          version: 1.14.3
-
-      - name: 💾 Cache Pods
-        uses: actions/cache@v3
-        id: pods-cache
-        with:
-          path: ./ios/Pods
-          # We'll use the yarn.lock for our hash since we don't yet have a Podfile.lock. Pod versions will not
-          # change unless the yarn version changes as well.
-          key: ${{ runner.os }}-pods-${{ hashFiles('yarn.lock') }}
-
-      - name: 🔤 Compile translations
-        run: yarn intl:build
-
-      - name: ✏️ Write environment variables
-        run: |
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json
-
-      - name: 🏗️ EAS Build
-        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
@@ -1,55 +0,0 @@
---
-name: Bundle and Deploy EAS Update
-
-on:
-  workflow_dispatch:
-    inputs:
-      runtimeVersion:
-        type: string
-        description: Runtime version (in x.x.x format) that this update is for
-        required: true
-
-jobs:
-  bundleDeploy:
-    name: Bundle and Deploy EAS Update
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🧐 Validate version
-        run: |
-          [[ "${{ github.event.inputs.runtimeVersion }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "Version is valid" || exit 1
-
-      - name: ⬇️ Checkout
-        uses: actions/checkout@v4
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: ⚙️ Install Dependencies
-        run: yarn install
-
-      - 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
-        run: |
-          export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
-          echo "${{ secrets.ENV_TOKEN }}" > .env
-          echo "$json" > google-services.json
-
-      - name: 🏗️ Create Bundle
-        run: yarn export
-
-      - name: 📦 Package Bundle and 🚀 Deploy
-        run: yarn make-deploy-bundle
-        env:
-          DENIS_API_KEY: ${{ secrets.DENIS_API_KEY }}
-          RUNTIME_VERSION: ${{ github.event.inputs.runtimeVersion }}
@@ -0,0 +1,52 @@
+name: Deploy Nightly Testflight Release
+
+on:
+  schedule:
+    - cron: '0 5 * * *'
+
+jobs:
+  build:
+    name: Deploy Nightly Testflight Release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    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@v3
+        with:
+          node-version: 18.x
+          cache: yarn
+
+      - name: Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Bump build number
+        run: yarn bump:ios
+
+      - name: EAS build and submit
+        run: eas build -p ios --profile production --auto-submit --non-interactive
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: Nightly iOS Build Bump
+          branch: main
+          commit_user_name: github-actions[bot]
+          commit_user_email: github-actions[bot]@users.noreply.github.com
@@ -32,12 +32,12 @@ jobs:
    name: Run tests
    runs-on: ubuntu-latest
    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v3
-      - name: Install node
+      - name: Install node 18
        uses: actions/setup-node@v4
        with:
-          node-version-file: .nvmrc
+          node-version: 18
+      - name: Check out Git repository
+        uses: actions/checkout@v3
      - name: Yarn install
        uses: Wandalen/wretry.action@master
        with:
@@ -1,185 +0,0 @@
-# Credit https://github.com/expo/expo
-# https://github.com/expo/expo/blob/main/.github/workflows/pr-labeler.yml
---
-name: PR labeler
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    types: [opened, synchronize]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  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
-        with:
-          fetch-depth: 100
-
-      - name: ⬇️ Fetch commits from base branch
-        run: git fetch origin main:main --depth 100
-        if: github.event_name == 'pull_request'
-
-      - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-
-      - name: ⚙️ Install Dependencies
-        run: yarn install
-
-      - name: Get the base commit
-        id: base-commit
-        run: |
-          # 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
-        uses: expo/expo-github-action/fingerprint@main
-        with:
-          previous-git-commit: ${{ steps.base-commit.outputs.base-commit }}
-
-      - name: 👀 Debug fingerprint
-        run: |
-          echo "previousGitCommit=${{ steps.fingerprint.outputs.previous-git-commit }} currentGitCommit=${{ steps.fingerprint.outputs.current-git-commit }}"
-          echo "isPreviousFingerprintEmpty=${{ steps.fingerprint.outputs.previous-fingerprint == '' }}"
-
-      - name: 🏷️ 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:
-          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
-            ${diff}
-            \`\`\`
-
-            </details>
-
-            ---
-            *Generated by [PR labeler](https://github.com/expo/expo/actions/workflows/pr-labeler.yml) 🤖*
-            `;
-
-            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:
-          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,
-            });
@@ -1 +0,0 @@
-18
@@ -23,7 +23,7 @@ COPY . .
 RUN mkdir --parents $NVM_DIR && \
  wget \
    --output-document=/tmp/nvm-install.sh \
-    https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh && \
+    https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh && \
  bash /tmp/nvm-install.sh

 RUN \. "$NVM_DIR/nvm.sh" && \
@@ -31,7 +31,7 @@ RUN \. "$NVM_DIR/nvm.sh" && \
  nvm use $NODE_VERSION && \
  npm install --global yarn && \
  yarn && \
-  yarn intl:build && \
+  yarn intl:compile && \
  yarn build-web

 # DEBUG
@@ -65,6 +65,8 @@ If you discover any security issues, please send an email to security@bsky.app.

 Bluesky is an open social network built on the AT Protocol, a flexible technology that will never lock developers out of the ecosystems that they help build. With atproto, third-party can be as seamless as first-party through custom feeds, federated services, clients, and more.

+If you're a developer interested in building on atproto, we'd love to email you a Bluesky invite code. Simply share your GitHub (or similar) profile with us via [this form](https://forms.gle/BF21oxVNZiDjDhXF9).
+
 ## License (MIT)

 See [./LICENSE](./LICENSE) for the full license.
@@ -64,7 +64,7 @@ describe('Curate lists', () => {
    await element(by.text('Edit list details')).tap()
    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
    await element(by.id('changeAvatarBtn')).tap()
-    await element(by.text('Upload from Library')).tap()
+    await element(by.text('Library')).tap()
    await sleep(3e3)
    await element(by.id('saveBtn')).tap()
    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
@@ -81,7 +81,7 @@ describe('Curate lists', () => {
    await element(by.text('Edit list details')).tap()
    await expect(element(by.id('createOrEditListModal'))).toBeVisible()
    await element(by.id('changeAvatarBtn')).tap()
-    await element(by.text('Remove Avatar')).tap()
+    await element(by.text('Remove')).tap()
    await element(by.id('saveBtn')).tap()
    await expect(element(by.id('createOrEditListModal'))).not.toBeVisible()
    await expect(element(by.id('userAvatarFallback'))).toExist()
@@ -17,7 +17,7 @@ describe('Home screen', () => {

  it('Can go to feeds page using feeds button in tab bar', async () => {
    await element(by.id('homeScreenFeedTabs-Feeds ✨')).tap()
-    await expect(element(by.text('Discover New Feeds'))).toBeVisible()
+    await expect(element(by.text('Discover new feeds'))).toBeVisible()
  })

  it('Feeds button disappears after pinning a feed', async () => {
@@ -70,10 +70,10 @@ describe('Profile screen', () => {
    await element(by.id('profileHeaderEditProfileButton')).tap()
    await expect(element(by.id('editProfileModal'))).toBeVisible()
    await element(by.id('changeBannerBtn')).tap()
-    await element(by.text('Upload from Library')).tap()
+    await element(by.text('Library')).tap()
    await sleep(3e3)
    await element(by.id('changeAvatarBtn')).tap()
-    await element(by.text('Upload from Library')).tap()
+    await element(by.text('Library')).tap()
    await sleep(3e3)
    await element(by.id('editProfileSaveBtn')).tap()
    await expect(element(by.id('editProfileModal'))).not.toBeVisible()
@@ -87,9 +87,9 @@ describe('Profile screen', () => {
    await element(by.id('profileHeaderEditProfileButton')).tap()
    await expect(element(by.id('editProfileModal'))).toBeVisible()
    await element(by.id('changeBannerBtn')).tap()
-    await element(by.text('Remove Banner')).tap()
+    await element(by.text('Remove')).tap()
    await element(by.id('changeAvatarBtn')).tap()
-    await element(by.text('Remove Avatar')).tap()
+    await element(by.text('Remove')).tap()
    await element(by.id('editProfileSaveBtn')).tap()
    await expect(element(by.id('editProfileModal'))).not.toBeVisible()
    await expect(element(by.id('userBannerFallback'))).toExist()
@@ -12,7 +12,6 @@ describe('Create account', () => {
  })

  it('I can create a new account with text verification', async () => {
-    console.log('SERVICE IS', service)
    await element(by.id('e2eOpenLoggedOutView')).tap()

    await element(by.id('createAccountButton')).tap()
@@ -29,18 +28,17 @@ describe('Create account', () => {
    await device.takeScreenshot('4- entered account details')
    await element(by.id('nextBtn')).tap()

-    await element(by.id('handleInput')).typeText('text-verification-test')
-    await device.takeScreenshot('5- entered handle')
-    await element(by.id('nextBtn')).tap()
-
    await element(by.id('phoneInput')).typeText('8042221111')
    await element(by.id('requestCodeBtn')).tap()
-    await device.takeScreenshot('6- requested code')
+    await device.takeScreenshot('5- requested code')

    await element(by.id('codeInput')).typeText('000000')
-    await device.takeScreenshot('7- entered code')
+    await device.takeScreenshot('6- entered code')
    await element(by.id('nextBtn')).tap()

+    await element(by.id('handleInput')).typeText('text-verification-test')
+    await device.takeScreenshot('7- entered handle')
+
    await element(by.id('nextBtn')).tap()

    await expect(element(by.id('onboardingInterests'))).toBeVisible()
@@ -4,7 +4,6 @@ import {
  linkRequiresWarning,
  isPossiblyAUrl,
  splitApexDomain,
-  isTrustedUrl,
 } from '../../../src/lib/strings/url-helpers'

 describe('linkRequiresWarning', () => {
@@ -75,10 +74,6 @@ describe('linkRequiresWarning', () => {
    // bad uri inputs, default to true
    ['', '', true],
    ['example.com', 'example.com', true],
-    ['/profile', 'Username', false],
-    ['#', 'Show More', false],
-    ['https://docs.bsky.app', 'https://docs.bsky.app', false],
-    ['https://bsky.app/compose/intent?text=test', 'Compose a post', false],
  ]

  it.each(cases)(
@@ -144,36 +139,3 @@ describe('splitApexDomain', () => {
    },
  )
 })
-
-describe('isTrustedUrl', () => {
-  const cases = [
-    ['#', true],
-    ['#profile', true],
-    ['/', true],
-    ['/profile', true],
-    ['/profile/', true],
-    ['/profile/bob.test', true],
-    ['https://bsky.app', true],
-    ['https://bsky.app/', true],
-    ['https://bsky.app/profile/bob.test', true],
-    ['https://www.bsky.app', true],
-    ['https://www.bsky.app/', true],
-    ['https://docs.bsky.app', true],
-    ['https://bsky.social', true],
-    ['https://bsky.social/blog', true],
-    ['https://blueskyweb.xyz', true],
-    ['https://blueskyweb.zendesk.com', true],
-    ['http://bsky.app', true],
-    ['http://bsky.social', true],
-    ['http://blueskyweb.xyz', true],
-    ['http://blueskyweb.zendesk.com', true],
-    ['https://google.com', false],
-    ['https://docs.google.com', false],
-    ['https://google.com/#', false],
-  ]
-
-  it.each(cases)('given input uri %p, returns %p', (str, expected) => {
-    const output = isTrustedUrl(str)
-    expect(output).toEqual(expected)
-  })
-})
@@ -11,23 +11,24 @@ const DARK_SPLASH_CONFIG = {
  resizeMode: 'cover',
 }

-const SPLASH_CONFIG_ANDROID = {
-  backgroundColor: '#0c7cff',
-  image: './assets/splash.png',
-  resizeMode: 'cover',
-}
-const DARK_SPLASH_CONFIG_ANDROID = {
-  backgroundColor: '#0f141b',
-  image: './assets/splash-dark.png',
-  resizeMode: 'cover',
-}
-
-module.exports = function (config) {
+module.exports = function () {
  /**
   * App version number. Should be incremented as part of a release cycle.
   */
  const VERSION = pkg.version

+  /**
+   * iOS build number. Must be incremented for each TestFlight version.
+   * WARNING: Always leave this variable on line 24! If it is moved, you need to update ./scripts/bumpIosBuildNumber.sh
+   */
+  const IOS_BUILD_NUMBER = '7'
+
+  /**
+   * Android build number. Must be incremented for each release.
+   * WARNING: Always leave this variable on line 30! If it is moved, you need to update ./scripts/bumpAndroidBuildNumber.sh
+   */
+  const ANDROID_VERSION_CODE = 62
+
  /**
   * Uses built-in Expo env vars
   *
@@ -35,12 +36,11 @@ module.exports = function (config) {
   */
  const PLATFORM = process.env.EAS_BUILD_PLATFORM

+  /**
+   * Additional granularity for the `dist` field
+   */
  const DIST_BUILD_NUMBER =
-    PLATFORM === 'android'
-      ? process.env.BSKY_ANDROID_VERSION_CODE
-      : process.env.BSKY_IOS_BUILD_NUMBER
-
-  const IS_DEV = process.env.EXPO_PUBLIC_ENV === 'development'
+    PLATFORM === 'android' ? ANDROID_VERSION_CODE : IOS_BUILD_NUMBER

  return {
    expo: {
@@ -57,6 +57,7 @@ module.exports = function (config) {
      userInterfaceStyle: 'automatic',
      splash: SPLASH_CONFIG,
      ios: {
+        buildNumber: IOS_BUILD_NUMBER,
        supportsTablet: false,
        bundleIdentifier: 'xyz.blueskyweb.app',
        config: {
@@ -78,15 +79,13 @@ module.exports = function (config) {
          ...SPLASH_CONFIG,
          dark: DARK_SPLASH_CONFIG,
        },
-        entitlements: {
-          'com.apple.security.application-groups': 'group.app.bsky',
-        },
      },
      androidStatusBar: {
-        barStyle: 'light-content',
-        backgroundColor: '#00000000',
+        barStyle: 'dark-content',
+        backgroundColor: '#ffffff',
      },
      android: {
+        versionCode: ANDROID_VERSION_CODE,
        icon: './assets/icon.png',
        adaptiveIcon: {
          foregroundImage: './assets/icon-android-foreground.png',
@@ -105,17 +104,13 @@ module.exports = function (config) {
                scheme: 'https',
                host: 'bsky.app',
              },
-              IS_DEV && {
-                scheme: 'http',
-                host: 'localhost:19006',
-              },
            ],
            category: ['BROWSABLE', 'DEFAULT'],
          },
        ],
        splash: {
-          ...SPLASH_CONFIG_ANDROID,
-          dark: DARK_SPLASH_CONFIG_ANDROID,
+          ...SPLASH_CONFIG,
+          dark: DARK_SPLASH_CONFIG,
        },
      },
      web: {
@@ -134,14 +129,12 @@ module.exports = function (config) {
          {
            ios: {
              deploymentTarget: '13.4',
-              newArchEnabled: false,
            },
            android: {
              compileSdkVersion: 34,
              targetSdkVersion: 34,
              buildToolsVersion: '34.0.0',
              kotlinVersion: '1.8.0',
-              newArchEnabled: false,
            },
          },
        ],
@@ -155,34 +148,13 @@ module.exports = function (config) {
          'expo-notifications',
          {
            icon: './assets/icon-android-notification.png',
-            color: '#1185fe',
+            color: '#ffffff',
          },
        ],
        './plugins/withAndroidManifestPlugin.js',
-        './plugins/withAndroidManifestFCMIconPlugin.js',
-        './plugins/withAndroidStylesWindowBackgroundPlugin.js',
-        './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',
-        './plugins/shareExtension/withShareExtensions.js',
      ].filter(Boolean),
      extra: {
        eas: {
-          build: {
-            experimental: {
-              ios: {
-                appExtensions: [
-                  {
-                    targetName: 'Share-with-Bluesky',
-                    bundleIdentifier: 'xyz.blueskyweb.app.Share-with-Bluesky',
-                    entitlements: {
-                      'com.apple.security.application-groups': [
-                        'group.app.bsky',
-                      ],
-                    },
-                  },
-                ],
-              },
-            },
-          },
          projectId: '55bd077a-d905-4184-9c7f-94789ba0f302',
        },
      },
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M4.213 6.886c-.673-1.35.334-2.889 1.806-2.889H17.98c1.472 0 2.479 1.539 1.806 2.89l-5.982 11.997c-.74 1.484-2.87 1.484-3.61 0L4.213 6.886Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3 5a1 1 0 0 0 0 2h18a1 1 0 1 0 0-2H3Zm-1 7a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm0 6a1 1 0 0 1 1-1h18a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M5.002 17.036V5h14v12.036h-3.986a1 1 0 0 0-.639.23l-2.375 1.968-2.344-1.965a1 1 0 0 0-.643-.233H5.002ZM20.002 3h-16a1 1 0 0 0-1 1v14.036a1 1 0 0 0 1 1h4.65l2.704 2.266a1 1 0 0 0 1.28.004l2.74-2.27h4.626a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1Zm-7.878 3.663c-1.39 0-2.5 1.135-2.5 2.515a1 1 0 0 0 2 0c0-.294.232-.515.5-.515a.507.507 0 0 1 .489.6.174.174 0 0 1-.027.048 1.1 1.1 0 0 1-.267.226c-.508.345-1.128.923-1.286 1.978a1 1 0 1 0 1.978.297.762.762 0 0 1 .14-.359c.063-.086.155-.169.293-.262.436-.297 1.18-.885 1.18-2.013 0-1.38-1.11-2.515-2.5-2.515ZM12 15.75a1.25 1.25 0 1 1 0-2.5 1.25 1.25 0 0 1 0 2.5Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8 2a1 1 0 0 1 1 1v1h6V3a1 1 0 1 1 2 0v1h2a2 2 0 0 1 2 2v13a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2V3a1 1 0 0 1 1-1ZM5 6v3h14V6H5Zm14 5H5v8h14v-8Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8.371 3.89A2 2 0 0 1 10.035 3h3.93a2 2 0 0 1 1.664.89L17.035 6H20a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h2.965L8.37 3.89ZM12 9a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8.371 3.89A2 2 0 0 1 10.035 3h3.93a2 2 0 0 1 1.664.89L17.035 6H20a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h2.965L8.37 3.89ZM13.965 5h-3.93L8.63 7.11A2 2 0 0 1 6.965 8H4v11h16V8h-2.965a2 2 0 0 1-1.664-.89L13.965 5ZM12 11a2 2 0 1 0 0 4 2 2 0 0 0 0-4Zm-4 2a4 4 0 1 1 8 0 4 4 0 0 1-8 0Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M21.474 2.98a2.5 2.5 0 0 1 .545 3.494l-10.222 14a2.5 2.5 0 0 1-3.528.52L2.49 16.617a2.5 2.5 0 0 1 3.018-3.986l3.75 2.84L17.98 3.525a2.5 2.5 0 0 1 3.493-.545Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3.293 8.293a1 1 0 0 1 1.414 0L12 15.586l7.293-7.293a1 1 0 1 1 1.414 1.414l-8 8a1 1 0 0 1-1.414 0l-8-8a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 6a1 1 0 0 1 .707.293l8 8a1 1 0 0 1-1.414 1.414L12 8.414l-7.293 7.293a1 1 0 0 1-1.414-1.414l8-8A1 1 0 0 1 12 6Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a8 8 0 0 0-6.32 12.906L16.906 5.68A7.962 7.962 0 0 0 12 4Zm6.32 3.094L7.094 18.32A8 8 0 0 0 18.32 7.094ZM2 12C2 6.477 6.477 2 12 2a9.972 9.972 0 0 1 7.071 2.929A9.972 9.972 0 0 1 22 12c0 5.523-4.477 10-10 10a9.972 9.972 0 0 1-7.071-2.929A9.972 9.972 0 0 1 2 12Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8.17 4A3.001 3.001 0 0 1 11 2h2c1.306 0 2.418.835 2.83 2H17a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H7a3 3 0 0 1-3-3V7a3 3 0 0 1 3-3h1.17ZM8 6H7a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V7a1 1 0 0 0-1-1h-1v1a1 1 0 0 1-1 1H9a1 1 0 0 1-1-1V6Zm6 0V5a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1v1h4Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M2 12a2 2 0 1 1 4 0 2 2 0 0 1-4 0Zm16 0a2 2 0 1 1 4 0 2 2 0 0 1-4 0Zm-6-2a2 2 0 1 0 0 4 2 2 0 0 0 0-4Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4.568 4h14.864c.252 0 .498 0 .706.017.229.019.499.063.77.201a2 2 0 0 1 .874.874c.138.271.182.541.201.77.017.208.017.454.017.706v10.864c0 .252 0 .498-.017.706a2.022 2.022 0 0 1-.201.77 2 2 0 0 1-.874.874 2.022 2.022 0 0 1-.77.201c-.208.017-.454.017-.706.017H4.568c-.252 0-.498 0-.706-.017a2.022 2.022 0 0 1-.77-.201 2 2 0 0 1-.874-.874 2.022 2.022 0 0 1-.201-.77C2 17.93 2 17.684 2 17.432V6.568c0-.252 0-.498.017-.706.019-.229.063-.499.201-.77a2 2 0 0 1 .874-.874c.271-.138.541-.182.77-.201C4.07 4 4.316 4 4.568 4Zm.456 2L12 11.708 18.976 6H5.024ZM20 7.747l-6.733 5.509a2 2 0 0 1-2.534 0L4 7.746V17.4a8.187 8.187 0 0 0 .011.589h.014c.116.01.278.011.575.011h14.8a8.207 8.207 0 0 0 .589-.012v-.013c.01-.116.011-.279.011-.575V7.747Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3 4a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v4a1 1 0 0 1-.293.707L15 14.414V20a1 1 0 0 1-.758.97l-4 1A1 1 0 0 1 9 21v-6.586L3.293 8.707A1 1 0 0 1 3 8V4Zm2 1v2.586l5.707 5.707A1 1 0 0 1 11 14v5.72l2-.5V14a1 1 0 0 1 .293-.707L19 7.586V5H5Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4 4a2 2 0 0 1 2-2h13.131c1.598 0 2.55 1.78 1.665 3.11L18.202 9l2.594 3.89c.886 1.33-.067 3.11-1.665 3.11H6v5a1 1 0 1 1-2 0V4Zm2 10h13.131l-2.593-3.89a2 2 0 0 1 0-2.22L19.13 4H6v10Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8 5a2 2 0 1 0 0 4 2 2 0 0 0 0-4ZM4 7a4 4 0 1 1 8 0 4 4 0 0 1-8 0Zm13-1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Zm-3.5 1.5a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0Zm5.826 7.376c-.919-.779-2.052-1.03-3.1-.787a1 1 0 0 1-.451-1.949c1.671-.386 3.45.028 4.844 1.211 1.397 1.185 2.348 3.084 2.524 5.579a1 1 0 0 1-.997 1.07H18a1 1 0 1 1 0-2h3.007c-.29-1.47-.935-2.49-1.681-3.124ZM3.126 19h9.747c-.61-3.495-2.867-5-4.873-5-2.006 0-4.263 1.505-4.873 5ZM8 12c3.47 0 6.64 2.857 6.998 7.93A1 1 0 0 1 14 21H2a1 1 0 0 1-.998-1.07C1.36 14.857 4.53 12 8 12Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M12.489 21.372c8.528-4.78 10.626-10.47 9.022-14.47-.779-1.941-2.414-3.333-4.342-3.763-1.697-.378-3.552.003-5.169 1.287-1.617-1.284-3.472-1.665-5.17-1.287-1.927.43-3.562 1.822-4.34 3.764-1.605 4 .493 9.69 9.021 14.47a1 1 0 0 0 .978 0Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M16.734 5.091c-1.238-.276-2.708.047-4.022 1.38a1 1 0 0 1-1.424 0C9.974 5.137 8.504 4.814 7.266 5.09c-1.263.282-2.379 1.206-2.92 2.556C3.33 10.18 4.252 14.84 12 19.348c7.747-4.508 8.67-9.168 7.654-11.7-.541-1.351-1.657-2.275-2.92-2.557Zm4.777 1.812c1.604 4-.494 9.69-9.022 14.47a1 1 0 0 1-.978 0C2.983 16.592.885 10.902 2.49 6.902c.779-1.942 2.414-3.334 4.342-3.764 1.697-.378 3.552.003 5.169 1.286 1.617-1.283 3.472-1.664 5.17-1.286 1.927.43 3.562 1.822 4.34 3.764Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M7 7a5 5 0 0 1 10 0v2h1a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2v-9a2 2 0 0 1 2-2h1V7Zm-1 4v9h12v-9H6Zm9-2H9V7a3 3 0 1 1 6 0v2Zm-3 4a1 1 0 0 1 1 1v3a1 1 0 1 1-2 0v-3a1 1 0 0 1 1-1Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M11 5a6 6 0 1 0 0 12 6 6 0 0 0 0-12Zm-8 6a8 8 0 1 1 14.32 4.906l3.387 3.387a1 1 0 0 1-1.414 1.414l-3.387-3.387A8 8 0 0 1 3 11Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M20.707 3.293a1 1 0 0 1 0 1.414l-16 16a1 1 0 0 1-1.414-1.414l2.616-2.616A1.998 1.998 0 0 1 5 15V9a2 2 0 0 1 2-2h2.697l5.748-3.832A1 1 0 0 1 17 4v1.586l2.293-2.293a1 1 0 0 1 1.414 0ZM15 7.586 7.586 15H7V9h2.697a2 2 0 0 0 1.11-.336L15 5.87v1.717Zm2 3.657-2 2v4.888l-2.933-1.955-1.442 1.442 4.82 3.214A1 1 0 0 0 17 20v-8.757Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M5 2a1 1 0 0 0-1 1v18a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1H5Zm1 18V4h12v16H6Zm3-6a1 1 0 1 0 0 2h2a1 1 0 1 0 0-2H9Zm-1-3a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2H9a1 1 0 0 1-1-1Zm1-5a1 1 0 0 0 0 2h6a1 1 0 1 0 0-2H9Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M15.586 2.5a2 2 0 0 1 2.828 0L21.5 5.586a2 2 0 0 1 0 2.828l-13 13A2 2 0 0 1 7.086 22H3a1 1 0 0 1-1-1v-4.086a2 2 0 0 1 .586-1.414l13-13ZM17 3.914l-13 13V20h3.086l13-13L17 3.914ZM13 21a1 1 0 0 1 1-1h7a1 1 0 1 1 0 2h-7a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"><path fill="#000" fill-rule="evenodd" d="M10 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM5.5 6.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM16 11a1 1 0 0 1 1-1h5a1 1 0 1 1 0 2h-5a1 1 0 0 1-1-1ZM3.678 19h12.644c-.71-2.909-3.092-5-6.322-5s-5.613 2.091-6.322 5Zm-2.174.906C1.917 15.521 5.242 12 10 12c4.758 0 8.083 3.521 8.496 7.906A1 1 0 0 1 17.5 21h-15a1 1 0 0 1-.996-1.094Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM7.5 6.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM5.679 19c.709-2.902 3.079-5 6.321-5a6.69 6.69 0 0 1 2.612.51 1 1 0 0 0 .776-1.844A8.687 8.687 0 0 0 12 12c-4.3 0-7.447 2.884-8.304 6.696-.29 1.29.767 2.304 1.902 2.304H11a1 1 0 1 0 0-2H5.679Zm14.835-4.857a1 1 0 0 1 .344 1.371l-3 5a1 1 0 0 1-1.458.286l-2-1.5a1 1 0 0 1 1.2-1.6l1.113.835 2.43-4.05a1 1 0 0 1 1.372-.342Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM7.5 6.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM5.679 19c.709-2.902 3.079-5 6.321-5 .302 0 .595.018.878.053a1 1 0 0 0 .243-1.985A9.235 9.235 0 0 0 12 12c-4.3 0-7.447 2.884-8.304 6.696-.29 1.29.767 2.304 1.902 2.304H12a1 1 0 1 0 0-2H5.679Zm9.614-3.707a1 1 0 0 1 1.414 0L18 16.586l1.293-1.293a1 1 0 0 1 1.414 1.414L19.414 18l1.293 1.293a1 1 0 0 1-1.414 1.414L18 19.414l-1.293 1.293a1 1 0 0 1-1.414-1.414L16.586 18l-1.293-1.293a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM7.5 6.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM5.678 19h12.644c-.71-2.909-3.092-5-6.322-5s-5.613 2.091-6.322 5Zm-2.174.906C3.917 15.521 7.242 12 12 12c4.758 0 8.083 3.521 8.496 7.906A1 1 0 0 1 19.5 21h-15a1 1 0 0 1-.996-1.094Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M10.25 4a.75.75 0 0 0-.75.75V11a1 1 0 1 1-2 0V6.75a.75.75 0 0 0-1.5 0V14a6 6 0 0 0 12 0V9a2 2 0 0 0-2 2v1.5a1 1 0 0 1-.684.949l-.628.21A2.469 2.469 0 0 0 13 16a1 1 0 1 1-2 0 4.469 4.469 0 0 1 3-4.22V11c0-.703.181-1.364.5-1.938V5.75a.75.75 0 0 0-1.5 0V9a1 1 0 1 1-2 0V4.75a.75.75 0 0 0-.75-.75Zm2.316-.733A2.75 2.75 0 0 1 16.5 5.75v1.54c.463-.187.97-.29 1.5-.29h1a1 1 0 0 1 1 1v6a8 8 0 1 1-16 0V6.75a2.75 2.75 0 0 1 3.571-2.625 2.751 2.751 0 0 1 4.995-.858Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M11.1 2a1 1 0 0 0-.832.445L8.851 4.57 6.6 4.05a1 1 0 0 0-.932.268l-1.35 1.35a1 1 0 0 0-.267.932l.52 2.251-2.126 1.417A1 1 0 0 0 2 11.1v1.8a1 1 0 0 0 .445.832l2.125 1.417-.52 2.251a1 1 0 0 0 .268.932l1.35 1.35a1 1 0 0 0 .932.267l2.251-.52 1.417 2.126A1 1 0 0 0 11.1 22h1.8a1 1 0 0 0 .832-.445l1.417-2.125 2.251.52a1 1 0 0 0 .932-.268l1.35-1.35a1 1 0 0 0 .267-.932l-.52-2.251 2.126-1.417A1 1 0 0 0 22 12.9v-1.8a1 1 0 0 0-.445-.832L19.43 8.851l.52-2.251a1 1 0 0 0-.268-.932l-1.35-1.35a1 1 0 0 0-.932-.267l-2.251.52-1.417-2.126A1 1 0 0 0 12.9 2h-1.8Zm-.968 4.255L11.635 4h.73l1.503 2.255a1 1 0 0 0 1.057.42l2.385-.551.566.566-.55 2.385a1 1 0 0 0 .42 1.057L20 11.635v.73l-2.255 1.503a1 1 0 0 0-.42 1.057l.551 2.385-.566.566-2.385-.55a1 1 0 0 0-1.057.42L12.365 20h-.73l-1.503-2.255a1 1 0 0 0-1.057-.42l-2.385.551-.566-.566.55-2.385a1 1 0 0 0-.42-1.057L4 12.365v-.73l2.255-1.503a1 1 0 0 0 .42-1.057L6.123 6.69l.566-.566 2.385.55a1 1 0 0 0 1.057-.42ZM8 12a4 4 0 1 1 8 0 4 4 0 0 1-8 0Zm4-2a2 2 0 1 0 0 4 2 2 0 0 0 0-4Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M11.675 2.054a1 1 0 0 1 .65 0l8 2.75A1 1 0 0 1 21 5.75v6.162c0 2.807-1.149 4.83-2.813 6.405-1.572 1.488-3.632 2.6-5.555 3.636l-.157.085a1 1 0 0 1-.95 0l-.157-.085c-1.923-1.037-3.983-2.148-5.556-3.636C4.15 16.742 3 14.719 3 11.912V5.75a1 1 0 0 1 .675-.946l8-2.75ZM5 6.464v5.448c0 2.166.851 3.687 2.188 4.952 1.276 1.209 2.964 2.158 4.812 3.157 1.848-1 3.536-1.948 4.813-3.157C18.148 15.6 19 14.078 19 11.912V6.464l-7-2.407-7 2.407Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12.472 3.118A1 1 0 0 1 13 4v16a1 1 0 0 1-1.555.832L5.697 17H2a1 1 0 0 1-1-1V8a1 1 0 0 1 1-1h3.697l5.748-3.832a1 1 0 0 1 1.027-.05ZM11 5.868 6.555 8.833A1 1 0 0 1 6 9H3v6h3a1 1 0 0 1 .555.168L11 18.131V5.87Zm7.364-1.645a1 1 0 0 1 1.414 0A10.969 10.969 0 0 1 23 12c0 3.037-1.232 5.788-3.222 7.778a1 1 0 1 1-1.414-1.414A8.969 8.969 0 0 0 21 12a8.969 8.969 0 0 0-2.636-6.364 1 1 0 0 1 0-1.414Zm-3.182 3.181a1 1 0 0 1 1.414 0A6.483 6.483 0 0 1 18.5 12a6.483 6.483 0 0 1-1.904 4.597 1 1 0 0 1-1.414-1.415A4.483 4.483 0 0 0 16.5 12a4.483 4.483 0 0 0-1.318-3.182 1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M14 5a1 1 0 1 1 0-2h6a1 1 0 0 1 1 1v6a1 1 0 1 1-2 0V6.414l-7.293 7.293a1 1 0 0 1-1.414-1.414L17.586 5H14ZM3 6a1 1 0 0 1 1-1h5a1 1 0 0 1 0 2H5v12h12v-4a1 1 0 1 1 2 0v5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V6Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8 8V3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1h-5v5a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V9a1 1 0 0 1 1-1h5Zm1 8a1 1 0 0 1-1-1v-5H4v10h10v-4H9Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4 4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H4Zm8 12.5c1.253 0 2.197.609 2.674 1.5H9.326c.477-.891 1.42-1.5 2.674-1.5Zm0-2c2.404 0 4.235 1.475 4.822 3.5H20V6H4v12h3.178c.587-2.025 2.418-3.5 4.822-3.5Zm-1.25-3.75a1.25 1.25 0 1 1 2.5 0 1.25 1.25 0 0 1-2.5 0ZM12 7.5a3.25 3.25 0 1 0 0 6.5 3.25 3.25 0 0 0 0-6.5Zm5.75 2a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" stroke="#000" stroke-linejoin="round" d="M4 5.5a.5.5 0 0 0-.5.5v2.535a.5.5 0 0 0 .25.433A3.498 3.498 0 0 1 5.5 12a3.498 3.498 0 0 1-1.75 3.032.5.5 0 0 0-.25.433V18a.5.5 0 0 0 .5.5h16a.5.5 0 0 0 .5-.5v-2.535a.5.5 0 0 0-.25-.433A3.498 3.498 0 0 1 18.5 12a3.5 3.5 0 0 1 1.75-3.032.5.5 0 0 0 .25-.433V6a.5.5 0 0 0-.5-.5H4ZM2.5 6A1.5 1.5 0 0 1 4 4.5h16A1.5 1.5 0 0 1 21.5 6v3.17a.5.5 0 0 1-.333.472 2.501 2.501 0 0 0 0 4.716.5.5 0 0 1 .333.471V18a1.5 1.5 0 0 1-1.5 1.5H4A1.5 1.5 0 0 1 2.5 18v-3.17a.5.5 0 0 1 .333-.472 2.501 2.501 0 0 0 0-4.716.5.5 0 0 1-.333-.471V6Zm12 2a.5.5 0 1 1 1 0 .5.5 0 0 1-1 0Zm0 4a.5.5 0 1 1 1 0 .5.5 0 0 1-1 0Zm0 4a.5.5 0 1 1 1 0 .5.5 0 0 1-1 0Z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M7.416 5H3a1 1 0 0 0 0 2h1.064l.938 14.067A1 1 0 0 0 6 22h12a1 1 0 0 0 .998-.933L19.936 7H21a1 1 0 1 0 0-2h-4.416a5 5 0 0 0-9.168 0Zm2.348 0h4.472c-.55-.614-1.348-1-2.236-1-.888 0-1.687.386-2.236 1Zm6.087 2H6.07l.867 13h10.128l.867-13h-2.036a1 1 0 0 1-.044 0ZM10 10a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0v-5a1 1 0 0 1 1-1Zm4 0a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0v-5a1 1 0 0 1 1-1Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12.86 4.494a.995.995 0 0 0-1.72 0L4.14 16.502A.996.996 0 0 0 4.999 18h14.003a.996.996 0 0 0 .86-1.498L12.86 4.494ZM9.413 3.487c1.155-1.983 4.019-1.983 5.174 0l7.002 12.007C22.753 17.491 21.314 20 19.002 20H4.998c-2.312 0-3.751-2.509-2.587-4.506L9.413 3.487ZM12 8.019a1 1 0 0 1 1 1v2.994a1 1 0 1 1-2 0V9.02a1 1 0 0 1 1-1Z" clip-rule="evenodd"/><rect width="2.5" height="2.5" x="10.75" y="13.75" fill="#000" rx="1.25"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M11.14 4.494a.995.995 0 0 1 1.72 0l7.001 12.008a.996.996 0 0 1-.86 1.498H4.999a.996.996 0 0 1-.86-1.498L11.14 4.494Zm3.447-1.007c-1.155-1.983-4.019-1.983-5.174 0L2.41 15.494C1.247 17.491 2.686 20 4.998 20h14.004c2.312 0 3.751-2.509 2.587-4.506L14.587 3.487ZM13 9.019a1 1 0 1 0-2 0v2.994a1 1 0 1 0 2 0V9.02Zm-1 4.731a1.25 1.25 0 1 0 0 2.5 1.25 1.25 0 0 0 0-2.5Z" clip-rule="evenodd"/></svg>
@@ -6,9 +6,9 @@ To build the SPA bundle (`bundle.web.js`), first get a JavaScript development
 environment set up. Either follow the top-level README, or something quick
 like:

-    # install nodejs
-    nvm install
-    nvm use
+    # install nodejs 18 (specifically)
+    nvm install 18
+    nvm use 18
    npm install --global yarn

    # setup tools and deps (in top level of this repo)
@@ -0,0 +1,70 @@
+package main
+
+import (
+	"bytes"
+	"context"
+	"crypto/sha256"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+)
+
+type Mailmodo struct {
+	httpClient *http.Client
+	APIKey     string
+	BaseURL    string
+	ListName   string
+}
+
+func NewMailmodo(apiKey, listName string) *Mailmodo {
+	return &Mailmodo{
+		APIKey:     apiKey,
+		BaseURL:    "https://api.mailmodo.com/api/v1",
+		httpClient: &http.Client{},
+		ListName:   listName,
+	}
+}
+
+func (m *Mailmodo) request(ctx context.Context, httpMethod string, apiMethod string, data any) error {
+	endpoint := fmt.Sprintf("%s/%s", m.BaseURL, apiMethod)
+	js, err := json.Marshal(data)
+	if err != nil {
+		return fmt.Errorf("Mailmodo JSON encoding failed: %w", err)
+	}
+	req, err := http.NewRequestWithContext(ctx, httpMethod, endpoint, bytes.NewBuffer(js))
+	if err != nil {
+		return fmt.Errorf("Mailmodo HTTP creating request %s %s failed: %w", httpMethod, apiMethod, err)
+	}
+	req.Header.Set("mmApiKey", m.APIKey)
+	req.Header.Set("Content-Type", "application/json")
+
+	res, err := m.httpClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("Mailmodo HTTP making request %s %s failed: %w", httpMethod, apiMethod, err)
+	}
+	defer res.Body.Close()
+
+	status := struct {
+		Success bool   `json:"success"`
+		Message string `json:"message"`
+	}{}
+	if err := json.NewDecoder(res.Body).Decode(&status); err != nil {
+		return fmt.Errorf("Mailmodo HTTP parsing response %s %s failed: %w", httpMethod, apiMethod, err)
+	}
+	if !status.Success {
+		return fmt.Errorf("Mailmodo API response %s %s failed: %s", httpMethod, apiMethod, status.Message)
+	}
+	return nil
+}
+
+func (m *Mailmodo) AddToList(ctx context.Context, email string) error {
+	return m.request(ctx, "POST", "addToList", map[string]any{
+		"listName": m.ListName,
+		"email":    email,
+		"data": map[string]any{
+			"email_hashed": fmt.Sprintf("%x", sha256.Sum256([]byte(email))),
+		},
+		"created_at": time.Now().UTC().Format(time.RFC3339),
+	})
+}
@@ -40,6 +40,18 @@ func run(args []string) {
 					// retain old PDS env var for easy transition
 					EnvVars: []string{"ATP_APPVIEW_HOST", "ATP_PDS_HOST"},
 				},
+				&cli.StringFlag{
+					Name:     "mailmodo-api-key",
+					Usage:    "Mailmodo API key",
+					Required: false,
+					EnvVars:  []string{"MAILMODO_API_KEY"},
+				},
+				&cli.StringFlag{
+					Name:     "mailmodo-list-name",
+					Usage:    "Mailmodo contact list to add email addresses to",
+					Required: false,
+					EnvVars:  []string{"MAILMODO_LIST_NAME"},
+				},
 				&cli.StringFlag{
 					Name:     "http-address",
 					Usage:    "Specify the local IP/port to bind to",
@@ -2,9 +2,11 @@ package main

 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io/fs"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"os/signal"
@@ -27,19 +29,25 @@ import (
 )

 type Server struct {
-	echo  *echo.Echo
-	httpd *http.Server
-	xrpcc *xrpc.Client
+	echo     *echo.Echo
+	httpd    *http.Server
+	mailmodo *Mailmodo
+	xrpcc    *xrpc.Client
 }

 func serve(cctx *cli.Context) error {
 	debug := cctx.Bool("debug")
 	httpAddress := cctx.String("http-address")
 	appviewHost := cctx.String("appview-host")
+	mailmodoAPIKey := cctx.String("mailmodo-api-key")
+	mailmodoListName := cctx.String("mailmodo-list-name")

 	// Echo
 	e := echo.New()

+	// Mailmodo client.
+	mailmodo := NewMailmodo(mailmodoAPIKey, mailmodoListName)
+
 	// create a new session (no auth)
 	xrpcc := &xrpc.Client{
 		Client: cliutil.NewHttpClient(),
@@ -69,8 +77,9 @@ func serve(cctx *cli.Context) error {
 	// server
 	//
 	server := &Server{
-		echo:  e,
-		xrpcc: xrpcc,
+		echo:     e,
+		mailmodo: mailmodo,
+		xrpcc:    xrpcc,
 	}

 	// Create the HTTP server.
@@ -171,7 +180,6 @@ func serve(cctx *cli.Context) error {
 	e.GET("/", server.WebHome)

 	// generic routes
-	e.GET("/hashtag/:tag", server.WebGeneric)
 	e.GET("/search", server.WebGeneric)
 	e.GET("/feeds", server.WebGeneric)
 	e.GET("/notifications", server.WebGeneric)
@@ -183,19 +191,17 @@ func serve(cctx *cli.Context) error {
 	e.GET("/settings", server.WebGeneric)
 	e.GET("/settings/language", server.WebGeneric)
 	e.GET("/settings/app-passwords", server.WebGeneric)
-	e.GET("/settings/following-feed", server.WebGeneric)
+	e.GET("/settings/home-feed", server.WebGeneric)
 	e.GET("/settings/saved-feeds", server.WebGeneric)
 	e.GET("/settings/threads", server.WebGeneric)
 	e.GET("/settings/external-embeds", server.WebGeneric)
 	e.GET("/sys/debug", server.WebGeneric)
-	e.GET("/sys/debug-mod", server.WebGeneric)
 	e.GET("/sys/log", server.WebGeneric)
 	e.GET("/support", server.WebGeneric)
 	e.GET("/support/privacy", server.WebGeneric)
 	e.GET("/support/tos", server.WebGeneric)
 	e.GET("/support/community-guidelines", server.WebGeneric)
 	e.GET("/support/copyright", server.WebGeneric)
-	e.GET("/intent/compose", server.WebGeneric)

 	// profile endpoints; only first populates info
 	e.GET("/profile/:handleOrDID", server.WebProfile)
@@ -204,7 +210,6 @@ func serve(cctx *cli.Context) error {
 	e.GET("/profile/:handleOrDID/lists/:rkey", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/feed/:rkey", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/feed/:rkey/liked-by", server.WebGeneric)
-	e.GET("/profile/:handleOrDID/labeler/liked-by", server.WebGeneric)

 	// profile RSS feed (DID not handle)
 	e.GET("/profile/:ident/rss", server.WebProfileRSS)
@@ -214,6 +219,9 @@ func serve(cctx *cli.Context) error {
 	e.GET("/profile/:handleOrDID/post/:rkey/liked-by", server.WebGeneric)
 	e.GET("/profile/:handleOrDID/post/:rkey/reposted-by", server.WebGeneric)

+	// Mailmodo
+	e.POST("/api/waitlist", server.apiWaitlist)
+
 	// Start the server.
 	log.Infof("starting server address=%s", httpAddress)
 	go func() {
@@ -388,3 +396,36 @@ func (srv *Server) WebProfile(c echo.Context) error {
 	data["requestHost"] = req.Host
 	return c.Render(http.StatusOK, "profile.html", data)
 }
+
+func (srv *Server) apiWaitlist(c echo.Context) error {
+	type jsonError struct {
+		Error string `json:"error"`
+	}
+
+	// Read the API request.
+	type apiRequest struct {
+		Email string `json:"email"`
+	}
+
+	bodyReader := http.MaxBytesReader(c.Response(), c.Request().Body, 16*1024)
+	payload, err := ioutil.ReadAll(bodyReader)
+	if err != nil {
+		return err
+	}
+	var req apiRequest
+	if err := json.Unmarshal(payload, &req); err != nil {
+		return c.JSON(http.StatusBadRequest, jsonError{Error: "Invalid API request"})
+	}
+
+	if req.Email == "" {
+		return c.JSON(http.StatusBadRequest, jsonError{Error: "Please enter a valid email address."})
+	}
+
+	if err := srv.mailmodo.AddToList(c.Request().Context(), req.Email); err != nil {
+		log.Errorf("adding email to waitlist failed: %s", err)
+		return c.JSON(http.StatusBadRequest, jsonError{
+			Error: "Storing email in waitlist failed. Please enter a valid email address.",
+		})
+	}
+	return c.JSON(http.StatusOK, map[string]bool{"success": true})
+}
@@ -5,14 +5,16 @@
    }
    .container {
        position: relative;
-        overflow: hidden;
-        width: 100vw;
-        height: 100vh;
+        width: 100%;
+        height: 0;
+        padding-bottom: 56.25%;
    }
    .video {
        position: absolute;
-        width: 100vw;
-        height: 100vh;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
    }
 </style>
 <div class="container"><div class="video" id="player"></div></div>
@@ -2,6 +2,7 @@
 <html>
 <head>
  <meta charset="UTF-8">
+  <meta name="theme-color">
  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, viewport-fit=cover">
  <meta name="referrer" content="origin-when-cross-origin">
  <!--
@@ -43,15 +44,6 @@
      height: calc(100% + env(safe-area-inset-top));
      scrollbar-gutter: stable both-edges;
    }
-    html, body {
-      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Liberation Sans", Helvetica, Arial, sans-serif;
-    }
-
-    /* Buttons and inputs have a font set by UA, so we'll have to reset that */
-    button, input, textarea {
-      font: inherit;
-      line-height: inherit;
-    }

    /* Color theming */
    /* Default will always be white */
@@ -141,7 +133,7 @@

    /* ProseMirror */
    .ProseMirror {
-      font: 18px -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Liberation Sans", Helvetica, Arial, sans-serif;
+      font: 18px -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
      min-height: 140px;
    }
    .ProseMirror-dark {
@@ -214,19 +206,13 @@
    [data-tooltip]:hover::before {
      display:block;
    }
-
-    /* NativeDropdown component */
-    .radix-dropdown-item:focus,
-    .nativeDropdown-item:focus {
-      outline: none;
-    }
  </style>
  {% include "scripts.html" %}
  <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
  <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
  <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
  <link rel="mask-icon" href="/static/safari-pinned-tab.svg" color="#1185fe">
-  <meta name="theme-color">
+  <meta name="theme-color" content="#ffffff">
  <meta name="application-name" content="Bluesky">
  <meta name="generator" content="bskyweb">
  <meta property="og:site_name" content="Bluesky Social" />
@@ -1,18 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIC0TCCAbmgAwIBAgIJcMN2yt5KNDqTMA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNV
-BAMTB0JsdWVza3kwHhcNMjQwMzE0MDA1OTU4WhcNMzQwMzE0MDA1OTU4WjASMRAw
-DgYDVQQDEwdCbHVlc2t5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-izSAWEc3wRoa3eTBEh/kE9pH0d6jhEGw9GrYfei60MHT1pSq2cTdyUM1yUZchAeW
-gFFtqFxX0pfIZQyMlIZbjkaOxOqzWhB0aCsxngnhbSahFwRxkVwTAuonhqIpaLBL
-hrCCCQ2IfZUpy8QeasqlTlmvmijuCC34fXxJlxNcj8SqzIZi+civ7U5PMPfIMMnD
-tCDIBy1vxMk57m25X2ikcWUFW64qNVLkFAL36xEnmFTL4Ivqpz23gUcUIe1zbesY
-jAgDtlwnAE7mU3oagCUDcSuOveT4POhT35Xp3Y/07I68kmXtrPxwd5k0L0zbisEm
-poKZ87E2X29BitihicMpBwIDAQABoyowKDAOBgNVHQ8BAf8EBAMCB4AwFgYDVR0l
-AQH/BAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAED1gdMF0yr8Gy87
-RgyaeVpPySwSsO0selmXXrcmOWgiPA05lubyhFEa4P5kdzBEByG2MT+pJkjGYpvK
-XRnqXM5VvdS2RhYYFH0cFOIUqBKwCnzViCMuGQeoGUx4oPcKFS0PQ1WjW2d4pS75
-51GBfB6LOepsCHUG0A9XEk7EAyUWc4M2ITCJsTtJh8CVn2pTks2q14ETDs86YQv4
-peDaJv8nhIe8oQkeGn2o/P/ctkwJg/uBydQUsWgjjGTQZTilVjGTW1mwDr9FucAE
-d5gKIk4rtR/3Zd/NDdqp8PrkoWeVM7Hwr789/mpUOeqa/j7YNkDYQh7x+M/odd1D
-KY0bQEQ=
-----END CERTIFICATE-----
@@ -1,8 +1,7 @@
 {
  "cli": {
    "version": ">= 3.8.1",
-    "promptToConfigurePushNotifications": false,
-    "appVersionSource": "remote"
+    "promptToConfigurePushNotifications": false
  },
  "build": {
    "base": {
@@ -29,21 +28,7 @@
    "production": {
      "extends": "base",
      "ios": {
-        "resourceClass": "large",
-        "autoIncrement": true
-      },
-      "android": {
-        "autoIncrement": true
-      },
-      "channel": "production"
-    },
-    "github": {
-      "extends": "base",
-      "ios": {
-        "autoIncrement": true
-      },
-      "android": {
-        "autoIncrement": true
+        "resourceClass": "large"
      },
      "channel": "production"
    }
@@ -1,5 +1,3 @@
-import '#/platform/markBundleStartTime'
-
 import '#/platform/polyfills'
 import {registerRootComponent} from 'expo'
 import {doPolyfill} from '#/lib/api/api-polyfill'
@@ -88,5 +88,3 @@ jest.mock('sentry-expo', () => ({
    ReactNavigationInstrumentation: jest.fn(),
  },
 }))
-
-jest.mock('crypto', () => ({}))
@@ -72,7 +72,6 @@ export async function createServer(
  const phoneParams = phoneRequired
    ? {
        phoneVerificationRequired: true,
-        phoneVerificationProvider: 'twilio',
        twilioAccountSid: 'ACXXXXXXX',
        twilioAuthToken: 'AUTH',
        twilioServiceSid: 'VAXXXXXXXX',
@@ -96,35 +95,6 @@ export async function createServer(
  })
  mockTwilio(testNet.pds)

-  // add the test mod authority
-  if (!phoneRequired) {
-    const agent = new BskyAgent({service: pdsUrl})
-    const res = await agent.api.com.atproto.server.createAccount({
-      email: 'mod-authority@test.com',
-      handle: 'mod-authority.test',
-      password: 'hunter2',
-    })
-    agent.api.setHeader('Authorization', `Bearer ${res.data.accessJwt}`)
-    await agent.api.app.bsky.actor.profile.create(
-      {repo: res.data.did},
-      {
-        displayName: 'Dev-env Moderation',
-        description: `The pretend version of mod.bsky.app`,
-      },
-    )
-
-    await agent.api.app.bsky.labeler.service.create(
-      {repo: res.data.did, rkey: 'self'},
-      {
-        policies: {
-          labelValues: ['!hide', '!warn'],
-          labelValueDefinitions: [],
-        },
-        createdAt: new Date().toISOString(),
-      },
-    )
-  }
-
  const pic = fs.readFileSync(
    path.join(__dirname, '..', 'assets', 'default-avatar.png'),
  )
@@ -485,13 +455,13 @@ async function getPort(start = 3000) {
 }

 export const mockTwilio = (pds: TestPds) => {
-  if (!pds.ctx.phoneVerifier) return
+  if (!pds.ctx.twilio) return

-  pds.ctx.phoneVerifier.sendCode = async (_number: string) => {
+  pds.ctx.twilio.sendCode = async (_number: string) => {
    // do nothing
  }

-  pds.ctx.phoneVerifier.verifyCode = async (_number: string, code: string) => {
+  pds.ctx.twilio.verifyCode = async (_number: string, code: string) => {
    return code === '000000'
  }
 }
@@ -4,7 +4,6 @@ module.exports = {
    'en',
    'de',
    'es',
-    'fi',
    'fr',
    'hi',
    'id',
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>NSExtension</key>
-    <dict>
-      <key>NSExtensionPrincipalClass</key>
-      <string>$(PRODUCT_MODULE_NAME).ShareViewController</string>
-      <key>NSExtensionAttributes</key>
-      <dict>
-        <key>NSExtensionActivationRule</key>
-        <dict>
-          <key>NSExtensionActivationSupportsText</key>
-          <true/>
-          <key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
-          <integer>1</integer>
-          <key>NSExtensionActivationSupportsImageWithMaxCount</key>
-          <integer>10</integer>
-        </dict>
-      </dict>
-      <key>NSExtensionPointIdentifier</key>
-      <string>com.apple.share-services</string>
-    </dict>
-    <key>MainAppScheme</key>
-    <string>bluesky</string>
-    <key>CFBundleName</key>
-    <string>$(PRODUCT_NAME)</string>
-    <key>CFBundleDisplayName</key>
-    <string>Extension</string>
-    <key>CFBundleIdentifier</key>
-    <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-    <key>CFBundleVersion</key>
-    <string>$(CURRENT_PROJECT_VERSION)</string>
-    <key>CFBundleExecutable</key>
-    <string>$(EXECUTABLE_NAME)</string>
-    <key>CFBundlePackageType</key>
-    <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-    <key>CFBundleShortVersionString</key>
-    <string>$(MARKETING_VERSION)</string>
-  </dict>
-</plist>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>com.apple.security.application-groups</key>
-    <array>
-      <string>group.app.bsky</string>
-    </array>
-  </dict>
-</plist>
@@ -1,153 +0,0 @@
-import UIKit
-
-class ShareViewController: UIViewController {
-  // This allows other forks to use this extension while also changing their
-  // scheme.
-  let appScheme = Bundle.main.object(forInfoDictionaryKey: "MainAppScheme") as? String ?? "bluesky"
-
-  //
-  override func viewDidAppear(_ animated: Bool) {
-    super.viewDidAppear(animated)
-
-    guard let extensionItem = extensionContext?.inputItems.first as? NSExtensionItem,
-          let attachments = extensionItem.attachments,
-          let firstAttachment = extensionItem.attachments?.first
-    else {
-      self.completeRequest()
-      return
-    }
-
-    Task {
-      if firstAttachment.hasItemConformingToTypeIdentifier("public.text") {
-        await self.handleText(item: firstAttachment)
-      } else if firstAttachment.hasItemConformingToTypeIdentifier("public.url") {
-        await self.handleUrl(item: firstAttachment)
-      } else if firstAttachment.hasItemConformingToTypeIdentifier("public.image") {
-        await self.handleImages(items: attachments)
-      } else {
-        self.completeRequest()
-      }
-    }
-  }
-
-  private func handleText(item: NSItemProvider) async -> Void {
-    do {
-      if let data = try await item.loadItem(forTypeIdentifier: "public.text") as? String {
-        if let encoded = data.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed),
-           let url = URL(string: "\(self.appScheme)://intent/compose?text=\(encoded)")
-        {
-          _ = self.openURL(url)
-        }
-      }
-      self.completeRequest()
-    } catch {
-      self.completeRequest()
-    }
-  }
-
-  private func handleUrl(item: NSItemProvider) async -> Void {
-    do {
-      if let data = try await item.loadItem(forTypeIdentifier: "public.url") as? URL {
-        if let encoded = data.absoluteString.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed),
-           let url = URL(string: "\(self.appScheme)://intent/compose?text=\(encoded)")
-        {
-          _ = self.openURL(url)
-        }
-      }
-      self.completeRequest()
-    } catch {
-      self.completeRequest()
-    }
-  }
-
-  private func handleImages(items: [NSItemProvider]) async -> Void {
-    let firstFourItems: [NSItemProvider]
-    if items.count < 4 {
-      firstFourItems = items
-    } else {
-      firstFourItems = Array(items[0...3])
-    }
-
-    var valid = true
-    var imageUris = ""
-
-    for (index, item) in firstFourItems.enumerated() {
-      var imageUriInfo: String? = nil
-
-      do {
-        if let dataUri = try await item.loadItem(forTypeIdentifier: "public.image") as? URL {
-          // We need to duplicate this image, since we don't have access to the outgoing temp directory
-          // We also will get the image dimensions here, sinze RN makes it difficult to get those dimensions for local files
-          let data = try Data(contentsOf: dataUri)
-          let image = UIImage(data: data)
-          imageUriInfo = self.saveImageWithInfo(image)
-        } else if let image = try await item.loadItem(forTypeIdentifier: "public.image") as? UIImage {
-          imageUriInfo = self.saveImageWithInfo(image)
-        }
-      } catch {
-        valid = false
-      }
-
-      if let imageUriInfo = imageUriInfo {
-        imageUris.append(imageUriInfo)
-        if index < items.count - 1 {
-          imageUris.append(",")
-        }
-      } else {
-        valid = false
-      }
-    }
-
-    if valid,
-       let encoded = imageUris.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed),
-       let url = URL(string: "\(self.appScheme)://intent/compose?imageUris=\(encoded)")
-    {
-      _ = self.openURL(url)
-    }
-
-    self.completeRequest()
-  }
-
-  private func saveImageWithInfo(_ image: UIImage?) -> String? {
-    guard let image = image else {
-      return nil
-    }
-
-    do {
-      // Saving this file to the bundle group's directory lets us access it from
-      // inside of the app. Otherwise, we wouldn't have access even though the
-      // extension does.
-      if let dir = FileManager()
-        .containerURL(
-          forSecurityApplicationGroupIdentifier: "group.app.bsky")
-      {
-        let filePath = "\(dir.absoluteString)\(ProcessInfo.processInfo.globallyUniqueString).jpeg"
-
-        if let newUri = URL(string: filePath),
-           let jpegData = image.jpegData(compressionQuality: 1)
-        {
-          try jpegData.write(to: newUri)
-          return "\(newUri.absoluteString)|\(image.size.width)|\(image.size.height)"
-        }
-      }
-      return nil
-    } catch {
-      return nil
-    }
-  }
-
-  private func completeRequest() -> Void {
-    self.extensionContext?.completeRequest(returningItems: nil)
-  }
-
-  @objc func openURL(_ url: URL) -> Bool {
-    var responder: UIResponder? = self
-    while responder != nil {
-      if let application = responder as? UIApplication {
-          return application.perform(#selector(openURL(_:)), with: url) != nil
-      }
-      responder = responder?.next
-    }
-    return false
-  }
-}
@@ -1,8 +0,0 @@
-# Expo Receive Android Intents
-
-This module handles incoming intents on Android. Handled intents are `text/plain` and `image/*` (single or multiple).
-The module handles saving images to the app's filesystem for access within the app, limiting the selection of images
-to a max of four, and handling intent types. No JS code is required for this module, and it is no-op on non-android
-platforms.
-
-No installation is required. Gradle will automatically add this module on build.
@@ -1,15 +0,0 @@
-# OSX
-#
-.DS_Store
-
-# Android/IntelliJ
-#
-build/
-.idea
-.gradle
-local.properties
-*.iml
-*.hprof
-
-# Bundle artifacts
-*.jsbundle
@@ -1,92 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
-
-group = 'xyz.blueskyweb.app.exporeceiveandroidintents'
-version = '0.4.1'
-
-buildscript {
-  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-  if (expoModulesCorePlugin.exists()) {
-    apply from: expoModulesCorePlugin
-    applyKotlinExpoModulesCorePlugin()
-  }
-
-  // Simple helper that allows the root project to override versions declared by this library.
-  ext.safeExtGet = { prop, fallback ->
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-  }
-
-  // Ensures backward compatibility
-  ext.getKotlinVersion = {
-    if (ext.has("kotlinVersion")) {
-      ext.kotlinVersion()
-    } else {
-      ext.safeExtGet("kotlinVersion", "1.8.10")
-    }
-  }
-
-  repositories {
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
-  }
-}
-
-afterEvaluate {
-  publishing {
-    publications {
-      release(MavenPublication) {
-        from components.release
-      }
-    }
-    repositories {
-      maven {
-        url = mavenLocal().url
-      }
-    }
-  }
-}
-
-android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 33)
-
-  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
-    compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
-    }
-
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.majorVersion
-    }
-  }
-
-  namespace "xyz.blueskyweb.app.exporeceiveandroidintents"
-  defaultConfig {
-    minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 34)
-    versionCode 1
-    versionName "0.4.1"
-  }
-  lintOptions {
-    abortOnError false
-  }
-  publishing {
-    singleVariant("release") {
-      withSourcesJar()
-    }
-  }
-}
-
-repositories {
-  mavenCentral()
-}
-
-dependencies {
-  implementation project(':expo-modules-core')
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-}
@@ -1,2 +0,0 @@
-<manifest>
-</manifest>
@@ -1,119 +0,0 @@
-package xyz.blueskyweb.app.exporeceiveandroidintents
-
-import android.content.Intent
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Build
-import android.provider.MediaStore
-import androidx.core.net.toUri
-import expo.modules.kotlin.modules.Module
-import expo.modules.kotlin.modules.ModuleDefinition
-import java.io.File
-import java.io.FileOutputStream
-import java.net.URLEncoder
-
-class ExpoReceiveAndroidIntentsModule : Module() {
-  override fun definition() = ModuleDefinition {
-    Name("ExpoReceiveAndroidIntents")
-
-    OnNewIntent {
-      handleIntent(it)
-    }
-  }
-
-  private fun handleIntent(intent: Intent?) {
-    if(appContext.currentActivity == null || intent == null) return
-
-    if (intent.action == Intent.ACTION_SEND) {
-      if (intent.type == "text/plain") {
-        handleTextIntent(intent)
-      } else if (intent.type.toString().startsWith("image/")) {
-        handleImageIntent(intent)
-      }
-    } else if (intent.action == Intent.ACTION_SEND_MULTIPLE) {
-      if (intent.type.toString().startsWith("image/")) {
-        handleImagesIntent(intent)
-      }
-    }
-  }
-
-  private fun handleTextIntent(intent: Intent) {
-    intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
-      val encoded = URLEncoder.encode(it, "UTF-8")
-      "bluesky://intent/compose?text=${encoded}".toUri().let { uri ->
-        val newIntent = Intent(Intent.ACTION_VIEW, uri)
-        appContext.currentActivity?.startActivity(newIntent)
-      }
-    }
-  }
-
-  private fun handleImageIntent(intent: Intent) {
-    val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
-    } else {
-      intent.getParcelableExtra(Intent.EXTRA_STREAM)
-    }
-    if (uri == null) return
-
-    handleImageIntents(listOf(uri))
-  }
-
-  private fun handleImagesIntent(intent: Intent) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM, Uri::class.java)?.let {
-        handleImageIntents(it.filterIsInstance<Uri>().take(4))
-      }
-    } else {
-      intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.let {
-        handleImageIntents(it.filterIsInstance<Uri>().take(4))
-      }
-    }
-  }
-
-  private fun handleImageIntents(uris: List<Uri>) {
-    var allParams = ""
-
-    uris.forEachIndexed { index, uri ->
-      val info = getImageInfo(uri)
-      val params = buildUriData(info)
-      allParams = "${allParams}${params}"
-
-      if (index < uris.count() - 1) {
-        allParams = "${allParams},"
-      }
-    }
-
-    val encoded = URLEncoder.encode(allParams, "UTF-8")
-
-    "bluesky://intent/compose?imageUris=${encoded}".toUri().let {
-      val newIntent = Intent(Intent.ACTION_VIEW, it)
-      appContext.currentActivity?.startActivity(newIntent)
-    }
-  }
-
-  private fun getImageInfo(uri: Uri): Map<String, Any> {
-    val bitmap = MediaStore.Images.Media.getBitmap(appContext.currentActivity?.contentResolver, uri)
-    // We have to save this so that we can access it later when uploading the image.
-    // createTempFile will automatically place a unique string between "img" and "temp.jpeg"
-    val file = File.createTempFile("img", "temp.jpeg", appContext.currentActivity?.cacheDir)
-    val out = FileOutputStream(file)
-    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, out)
-    out.flush()
-    out.close()
-
-    return mapOf(
-      "width" to bitmap.width,
-      "height" to bitmap.height,
-      "path" to file.path.toString()
-    )
-  }
-
-  // We will pas the width and height to the app here, since getting measurements
-  // on the RN side is a bit more involved, and we already have them here anyway.
-  private fun buildUriData(info: Map<String, Any>): String {
-    val path = info.getValue("path")
-    val width = info.getValue("width")
-    val height = info.getValue("height")
-    return "file://${path}|${width}|${height}"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "platforms": ["android"],
-  "android": {
-    "modules": ["xyz.blueskyweb.app.exporeceiveandroidintents.ExpoReceiveAndroidIntentsModule"]
-  }
-}
@@ -108,26 +108,14 @@ class RNUITextView: UIView {
      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)
-        
+        let range = fullText.range(of: childText)
+
        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
-          {
+          if charIndex >= lowerBound.utf16Offset(in: fullText) && charIndex <= upperBound.utf16Offset(in: fullText) {
            return child
-          } else {
-            lastUpperBound = upperBound
          }
        }
      }
@@ -4,7 +4,6 @@
 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)
@@ -40,19 +40,19 @@ class RNUITextViewShadow: RCTShadowView {
    self.setAttributedText()
  }

-  // Returning true here will tell Yoga to not use flexbox and instead use our custom measure func.
+  // Tell yoga not to use flexbox
  override func isYogaLeafNode() -> Bool {
    return true
  }

-  // We should only insert children that are UITextView shadows
+  // We only need to insert text children
  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.
+  // Whenever the subvies update, set the text
  override func didUpdateReactSubviews() {
    self.setAttributedText()
  }
@@ -64,7 +64,7 @@ class RNUITextViewShadow: RCTShadowView {
      return
    }

-    // Since we are inside the shadow view here, we have to find the real view and update the text.
+    // Update the text
    self.bridge.uiManager.addUIBlock { uiManager, viewRegistry in
      guard let textView = viewRegistry?[self.reactTag] as? RNUITextView else {
        return
@@ -100,25 +100,18 @@ class RNUITextViewShadow: RCTShadowView {
      // 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.
+      // Set the paragraph style attributes if necessary
      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
-
+        paragraphStyle.minimumLineHeight = child.lineHeight
+        paragraphStyle.maximumLineHeight = child.lineHeight
        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.
+        // Store that height
        self.lineHeight = child.lineHeight
      } else {
        self.lineHeight = font.lineHeight
@@ -131,22 +124,24 @@ class RNUITextViewShadow: RCTShadowView {
    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
+  // Create a YGSize based on the max width
  func getNeededSize(maxWidth: Float) -> YGSize {
+    // Create the max size and figure out the size of the entire text
    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))
+    // Figure out how many total lines there are
+    let totalLines = Int(ceil(textSize.height / self.lineHeight))

+    // Default to the text size
+    var neededSize: CGSize = textSize.size
+
+    // If the total lines > max number, return size with the max
    if self.numberOfLines != 0, totalLines > self.numberOfLines {
-      totalLines = self.numberOfLines
+      neededSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(CGFloat(self.numberOfLines) * self.lineHeight))
    }

-    self.frameSize = CGSize(width: CGFloat(maxWidth), height: CGFloat(CGFloat(totalLines) * self.lineHeight))
-    return YGSize(width: Float(self.frameSize.width), height: Float(self.frameSize.height))
+    self.frameSize = neededSize
+    return YGSize(width: Float(neededSize.width), height: Float(neededSize.height))
  }
 }
@@ -1,11 +1,10 @@
 {
  "name": "bsky.app",
-  "version": "1.74.0",
+  "version": "1.68.0",
  "private": true,
  "engines": {
    "node": ">=18"
  },
-  "packageManager": "yarn@1.22.19",
  "scripts": {
    "prepare": "is-ci || husky install",
    "postinstall": "patch-package && yarn intl:compile",
@@ -13,12 +12,8 @@
    "android": "expo run:android",
    "ios": "expo run:ios",
    "web": "expo start --web",
-    "use-build-number": "./scripts/useBuildNumberEnv.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 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",
+    "build-all": "yarn intl:build && eas build --platform all",
    "start": "expo start --dev-client",
    "start:prod": "expo start --dev-client --no-dev --minify",
    "clean-cache": "rm -rf node_modules/.cache/babel-loader/*",
@@ -37,20 +32,19 @@
    "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:build": "yarn intl:check && 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"
+    "bump": "./scripts/bumpIosBuildNumber.sh && ./scripts/bumpAndroidBuildNumber.sh",
+    "bump:ios": "./scripts/bumpIosBuildNumber.sh",
+    "bump:android": "./scripts/bumpAndroidBuildNumber.sh"
  },
  "dependencies": {
-    "@atproto/api": "^0.12.2",
+    "@atproto/api": "^0.9.5",
    "@bam.tech/react-native-image-resizer": "^3.0.4",
    "@braintree/sanitize-url": "^6.0.2",
-    "@discord/bottom-sheet": "https://github.com/bluesky-social/react-native-bottom-sheet.git#discord-fork-4.6.1",
    "@emoji-mart/react": "^1.1.1",
    "@expo/html-elements": "^0.4.2",
    "@expo/webpack-config": "^19.0.0",
@@ -58,14 +52,15 @@
    "@fortawesome/free-regular-svg-icons": "^6.1.1",
    "@fortawesome/free-solid-svg-icons": "^6.1.1",
    "@fortawesome/react-native-fontawesome": "^0.3.0",
+    "@gorhom/bottom-sheet": "^4.5.1",
    "@lingui/react": "^4.5.0",
    "@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.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-community/datetimepicker": "7.6.1",
    "@react-native-masked-view/masked-view": "0.3.0",
    "@react-native-menu/menu": "^0.8.0",
    "@react-native-picker/picker": "2.6.1",
@@ -79,9 +74,7 @@
    "@segment/sovran-react-native": "^0.4.5",
    "@sentry/react-native": "5.5.0",
    "@tamagui/focus-scope": "^1.84.1",
-    "@tanstack/query-async-storage-persister": "^5.25.0",
    "@tanstack/react-query": "^5.8.1",
-    "@tanstack/react-query-persist-client": "^5.25.0",
    "@tiptap/core": "^2.0.0-beta.220",
    "@tiptap/extension-document": "^2.0.0-beta.220",
    "@tiptap/extension-hard-break": "^2.0.3",
@@ -94,7 +87,6 @@
    "@tiptap/pm": "^2.0.0-beta.220",
    "@tiptap/react": "^2.0.0-beta.220",
    "@tiptap/suggestion": "^2.0.0-beta.220",
-    "@types/invariant": "^2.2.37",
    "@types/node": "^18.16.2",
    "@zxing/text-encoding": "^0.9.0",
    "array.prototype.findlast": "^1.2.3",
@@ -116,7 +108,6 @@
    "expo-image": "~1.10.3",
    "expo-image-manipulator": "^11.8.0",
    "expo-image-picker": "~14.7.1",
-    "expo-linking": "^6.2.2",
    "expo-localization": "~14.8.2",
    "expo-media-library": "~15.9.1",
    "expo-notifications": "~0.27.3",
@@ -154,10 +145,8 @@
    "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",
@@ -185,7 +174,6 @@
    "react-responsive": "^9.0.2",
    "rn-fetch-blob": "^0.12.0",
    "sentry-expo": "~7.0.1",
-    "statsig-react-native-expo": "^4.6.1",
    "tippy.js": "^6.3.7",
    "tlds": "^1.234.0",
    "use-deep-compare": "^1.1.0",
@@ -239,7 +227,6 @@
    "eslint-plugin-lingui": "^0.2.0",
    "eslint-plugin-react": "^7.33.2",
    "eslint-plugin-react-native-a11y": "^3.3.0",
-    "eslint-plugin-simple-import-sort": "^12.0.0",
    "html-webpack-plugin": "^5.5.0",
    "husky": "^8.0.3",
    "is-ci": "^3.0.1",
@@ -1,56 +0,0 @@
-diff --git a/node_modules/@react-navigation/native/lib/commonjs/useLinking.js b/node_modules/@react-navigation/native/lib/commonjs/useLinking.js
-index ef4f368..2b0da35 100644
--- a/node_modules/@react-navigation/native/lib/commonjs/useLinking.js
-+++ b/node_modules/@react-navigation/native/lib/commonjs/useLinking.js
-@@ -273,8 +273,12 @@ function useLinking(ref, _ref) {
-           });
-           const currentIndex = history.index;
-           try {
-            if (nextIndex !== -1 && nextIndex < currentIndex) {
-              // An existing entry for this path exists and it's less than current index, go back to that
-+            if (
-+              nextIndex !== -1 &&
-+              nextIndex < currentIndex &&
-+              // We should only go back if the entry exists and it's less than current index
-+              history.get(nextIndex - currentIndex)
-+            ) {              // An existing entry for this path exists and it's less than current index, go back to that
-               await history.go(nextIndex - currentIndex);
-             } else {
-               // We couldn't find an existing entry to go back to, so we'll go back by the delta
-diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
-index 62a3b43..11a5a28 100644
--- a/node_modules/@react-navigation/native/lib/module/useLinking.js
-+++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
-@@ -264,8 +264,12 @@ export default function useLinking(ref, _ref) {
-           });
-           const currentIndex = history.index;
-           try {
-            if (nextIndex !== -1 && nextIndex < currentIndex) {
-              // An existing entry for this path exists and it's less than current index, go back to that
-+            if (
-+              nextIndex !== -1 &&
-+              nextIndex < currentIndex &&
-+              // We should only go back if the entry exists and it's less than current index
-+              history.get(nextIndex - currentIndex)
-+            ) {              // An existing entry for this path exists and it's less than current index, go back to that
-               await history.go(nextIndex - currentIndex);
-             } else {
-               // We couldn't find an existing entry to go back to, so we'll go back by the delta
-diff --git a/node_modules/@react-navigation/native/src/useLinking.tsx b/node_modules/@react-navigation/native/src/useLinking.tsx
-index 3db40b7..9ba4ecd 100644
--- a/node_modules/@react-navigation/native/src/useLinking.tsx
-+++ b/node_modules/@react-navigation/native/src/useLinking.tsx
-@@ -381,7 +381,12 @@ export default function useLinking(
-           const currentIndex = history.index;
- 
-           try {
-            if (nextIndex !== -1 && nextIndex < currentIndex) {
-+            if (
-+              nextIndex !== -1 &&
-+              nextIndex < currentIndex &&
-+              // We should only go back if the entry exists and it's less than current index
-+              history.get(nextIndex - currentIndex)
-+            ) {
-               // An existing entry for this path exists and it's less than current index, go back to that
-               await history.go(nextIndex - currentIndex);
-             } else {
@@ -1,5 +0,0 @@
-# React Navigation history bug patch
-
-This patches react-navigation to fix the issues in https://github.com/bluesky-social/social-app/issues/710.
-
-This is based on the PR found at https://github.com/react-navigation/react-navigation/pull/11833
@@ -1,56 +1,8 @@
-diff --git a/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/ImagePickerModule.kt b/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/ImagePickerModule.kt
-index 3f50f8c..ee47fa1 100644
--- a/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/ImagePickerModule.kt
-+++ b/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/ImagePickerModule.kt
-@@ -33,7 +33,9 @@ import kotlin.coroutines.resumeWithException
- // TODO(@bbarthec): rename to ExpoImagePicker
- private const val moduleName = "ExponentImagePicker"
-
-+
- class ImagePickerModule : Module() {
-+  private var isPickerOpen = false
-
-   override fun definition() = ModuleDefinition {
-     Name(moduleName)
-@@ -129,6 +131,11 @@ class ImagePickerModule : Module() {
-     options: ImagePickerOptions
-   ): Any {
-     return try {
-+      if(isPickerOpen) {
-+        return ImagePickerResponse(canceled = true)
-+      }
-+
-+      isPickerOpen = true
-       var result = launchPicker(pickerLauncher)
-       if (
-         !options.allowsMultipleSelection &&
-@@ -143,6 +150,8 @@ class ImagePickerModule : Module() {
-       mediaHandler.readExtras(result.data, options)
-     } catch (cause: OperationCanceledException) {
-       return ImagePickerResponse(canceled = true)
-+    } finally {
-+      isPickerOpen = false
-     }
-   }
-
 diff --git a/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/contracts/ImageLibraryContract.kt b/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/contracts/ImageLibraryContract.kt
-index ff15c91..9763012 100644
+index ff15c91..41aaf12 100644
 --- a/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/contracts/ImageLibraryContract.kt
 +++ b/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/contracts/ImageLibraryContract.kt
-@@ -5,12 +5,7 @@ import android.content.ContentResolver
- import android.content.Context
- import android.content.Intent
- import android.net.Uri
-import androidx.activity.result.PickVisualMediaRequest
-import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia
-import androidx.activity.result.contract.ActivityResultContracts.PickMultipleVisualMedia
- import expo.modules.imagepicker.ImagePickerOptions
-import expo.modules.imagepicker.MediaTypes
-import expo.modules.imagepicker.UNLIMITED_SELECTION
- import expo.modules.imagepicker.getAllDataUris
- import expo.modules.imagepicker.toMediaType
- import expo.modules.kotlin.activityresult.AppContextActivityResultContract
-@@ -26,51 +21,26 @@ import java.io.Serializable
+@@ -26,51 +26,26 @@ import java.io.Serializable
  * @see [androidx.activity.result.contract.ActivityResultContracts.GetMultipleContents]
  */
 internal class ImageLibraryContract(
@@ -60,7 +12,7 @@ index ff15c91..9763012 100644
   private val contentResolver: ContentResolver
     get() = appContextProvider.appContext.reactContext?.contentResolver
       ?: throw Exceptions.ReactContextLost()
-
+ 
   override fun createIntent(context: Context, input: ImageLibraryContractOptions): Intent {
 -    val request = PickVisualMediaRequest.Builder()
 -      .setMediaType(
@@ -82,7 +34,7 @@ index ff15c91..9763012 100644
 +    val intent = Intent(Intent.ACTION_GET_CONTENT)
 +            .addCategory(Intent.CATEGORY_OPENABLE)
 +            .setType("image/*")
-
+ 
     if (input.options.allowsMultipleSelection) {
 -      val selectionLimit = input.options.selectionLimit
 -
@@ -93,7 +45,7 @@ index ff15c91..9763012 100644
 +      if(input.options.selectionLimit == 1) {
 +        return intent
       }
-
+ 
 -      if (selectionLimit > 1) {
 -        return PickMultipleVisualMedia(selectionLimit).createIntent(context, request)
 -      }
@@ -104,9 +56,9 @@ index ff15c91..9763012 100644
 -      }
 +      intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
     }
-
+ 
 -    return PickVisualMedia().createIntent(context, request)
 +    return intent
   }
-
+ 
   override fun parseResult(input: ImageLibraryContractOptions, resultCode: Int, intent: Intent?) =
@@ -1,19 +1,92 @@
-diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-index b09e653..d290dab 100644
--- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-+++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-@@ -198,6 +198,14 @@ - (void)refreshControlValueChanged
-   [self setCurrentRefreshingState:super.refreshing];
-   _refreshingProgrammatically = NO;
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
+index 9dca6a5..090bda5 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
+++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
+@@ -266,11 +266,10 @@ - (void)textViewDidChange:(__unused UITextView *)textView

-+  if (@available(iOS 17.4, *)) {
-+    if (_currentRefreshingState) {
-+      UIImpactFeedbackGenerator *feedbackGenerator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleLight];
-+      [feedbackGenerator prepare];
-+      [feedbackGenerator impactOccurred];
+ - (void)textViewDidChangeSelection:(__unused UITextView *)textView
+ {
+-  if (_lastStringStateWasUpdatedWith && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
+  if (![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
+     [self textViewDidChange:_backedTextInputView];
+     _ignoreNextTextInputCall = YES;
+   }
+-  _lastStringStateWasUpdatedWith = _backedTextInputView.attributedText;
+   [self textViewProbablyDidChangeSelection];
+ }
+
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm
+index 1f06b79..ab458f3 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm
+++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm
+@@ -87,7 +87,7 @@ - (void)invalidateContentSize
+     return;
+   }
+
+-  CGSize maximumSize = self.layoutMetrics.frame.size;
+  CGSize maximumSize = self.layoutMetrics.contentFrame.size;
+
+   if (_maximumNumberOfLines == 1) {
+     maximumSize.width = CGFLOAT_MAX;
+@@ -158,6 +158,8 @@ - (void)uiManagerWillPerformMounting
+     [attributedText insertAttributedString:propertyAttributedText atIndex:0];
+   }
+
+  [self postprocessAttributedText:attributedText];
+
+   NSAttributedString *newAttributedText;
+   if (![_previousAttributedText isEqualToAttributedString:attributedText]) {
+     // We have to follow `set prop` pattern:
+@@ -191,6 +193,52 @@ - (void)uiManagerWillPerformMounting
+   }];
+ }
+
+- (void)postprocessAttributedText:(NSMutableAttributedString *)attributedText
+{
+  __block CGFloat maximumLineHeight = 0;
+
+  [attributedText enumerateAttribute:NSParagraphStyleAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
+    if (!paragraphStyle) {
+      return;
 +    }
+
+    maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
+  }];
+
+  if (maximumLineHeight == 0) {
+    // `lineHeight` was not specified, nothing to do.
+    return;
 +  }
 +
-   if (_onRefresh) {
-     _onRefresh(nil);
-   }
+  __block CGFloat maximumFontLineHeight = 0;
+
+  [attributedText enumerateAttribute:NSFontAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
+    if (!font) {
+      return;
+    }
+
+    if (maximumFontLineHeight <= font.lineHeight) {
+      maximumFontLineHeight = font.lineHeight;
+    }
+  }];
+
+  if (maximumLineHeight < maximumFontLineHeight) {
+    return;
+  }
+
+  CGFloat baseLineOffset = maximumLineHeight / 2.0 - maximumFontLineHeight / 2.0;
+
+  [attributedText addAttribute:NSBaselineOffsetAttributeName
+                         value:@(baseLineOffset)
+                         range:NSMakeRange(0, attributedText.length)];
+}
+
+ #pragma mark -
+
+ - (NSAttributedString *)measurableAttributedText
@@ -1,5 +1,5 @@
-# RefreshControl Patch
+# TextInput Patch

-Patching `RCTRefreshControl.mm` temporarily to play an impact haptic on refresh when using iOS 17.4 or higher. Since
-17.4, there has been a regression somewhere causing haptics to not play on iOS on refresh. Should monitor for an update
-in the RN repo: https://github.com/facebook/react-native/issues/43388
+Patching `RCTBaseTextShadowInput.mm` from https://github.com/facebook/react-native/pull/38359. This fixes some text
+getting cut off inside the composer. This was merged in December, so we should be able to remove this patch when RN
+ships the next release.
@@ -1,22 +0,0 @@
-# Share extension plugin for Expo
-
-This plugin handles moving the necessary files into their respective iOS and Android targets and updating the build
-phases, plists, manifests, etc.
-
-## Steps
-
-### ios
-
-1. Update entitlements
-2. Set the app group to group.<identifier>
-3. Add the extension plist
-4. Add the view controller
-5. Update the xcode project's build phases
-
-### android
-
-1. Update the manifest with the intents the app can receive
-
-## Credits
-
-Adapted from https://github.com/andrew-levy/react-native-safari-extension and https://github.com/timedtext/expo-config-plugin-ios-share-extension/blob/master/src/withShareExtensionXcodeTarget.ts
@@ -1,13 +0,0 @@
-const {withEntitlementsPlist} = require('@expo/config-plugins')
-
-const withAppEntitlements = config => {
-  // eslint-disable-next-line no-shadow
-  return withEntitlementsPlist(config, async config => {
-    config.modResults['com.apple.security.application-groups'] = [
-      `group.app.bsky`,
-    ]
-    return config
-  })
-}
-
-module.exports = {withAppEntitlements}
@@ -1,31 +0,0 @@
-const {withInfoPlist} = require('@expo/config-plugins')
-const plist = require('@expo/plist')
-const path = require('path')
-const fs = require('fs')
-
-const withExtensionEntitlements = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
-  return withInfoPlist(config, config => {
-    const extensionEntitlementsPath = path.join(
-      config.modRequest.platformProjectRoot,
-      extensionName,
-      `${extensionName}.entitlements`,
-    )
-
-    const shareExtensionEntitlements = {
-      'com.apple.security.application-groups': [`group.app.bsky`],
-    }
-
-    fs.mkdirSync(path.dirname(extensionEntitlementsPath), {
-      recursive: true,
-    })
-    fs.writeFileSync(
-      extensionEntitlementsPath,
-      plist.default.build(shareExtensionEntitlements),
-    )
-
-    return config
-  })
-}
-
-module.exports = {withExtensionEntitlements}
@@ -1,39 +0,0 @@
-const {withInfoPlist} = require('@expo/config-plugins')
-const plist = require('@expo/plist')
-const path = require('path')
-const fs = require('fs')
-
-const withExtensionInfoPlist = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
-  return withInfoPlist(config, config => {
-    const plistPath = path.join(
-      config.modRequest.projectRoot,
-      'modules',
-      extensionName,
-      'Info.plist',
-    )
-    const targetPath = path.join(
-      config.modRequest.platformProjectRoot,
-      extensionName,
-      'Info.plist',
-    )
-
-    const extPlist = plist.default.parse(fs.readFileSync(plistPath).toString())
-
-    extPlist.MainAppScheme = config.scheme
-    extPlist.CFBundleName = '$(PRODUCT_NAME)'
-    extPlist.CFBundleDisplayName = 'Extension'
-    extPlist.CFBundleIdentifier = '$(PRODUCT_BUNDLE_IDENTIFIER)'
-    extPlist.CFBundleVersion = '$(CURRENT_PROJECT_VERSION)'
-    extPlist.CFBundleExecutable = '$(EXECUTABLE_NAME)'
-    extPlist.CFBundlePackageType = '$(PRODUCT_BUNDLE_PACKAGE_TYPE)'
-    extPlist.CFBundleShortVersionString = '$(MARKETING_VERSION)'
-
-    fs.mkdirSync(path.dirname(targetPath), {recursive: true})
-    fs.writeFileSync(targetPath, plist.default.build(extPlist))
-
-    return config
-  })
-}
-
-module.exports = {withExtensionInfoPlist}
@@ -1,31 +0,0 @@
-const {withXcodeProject} = require('@expo/config-plugins')
-const path = require('path')
-const fs = require('fs')
-
-const withExtensionViewController = (
-  config,
-  {controllerName, extensionName},
-) => {
-  // eslint-disable-next-line no-shadow
-  return withXcodeProject(config, config => {
-    const controllerPath = path.join(
-      config.modRequest.projectRoot,
-      'modules',
-      extensionName,
-      `${controllerName}.swift`,
-    )
-
-    const targetPath = path.join(
-      config.modRequest.platformProjectRoot,
-      extensionName,
-      `${controllerName}.swift`,
-    )
-
-    fs.mkdirSync(path.dirname(targetPath), {recursive: true})
-    fs.copyFileSync(controllerPath, targetPath)
-
-    return config
-  })
-}
-
-module.exports = {withExtensionViewController}
@@ -1,89 +0,0 @@
-const {withAndroidManifest} = require('@expo/config-plugins')
-
-const withIntentFilters = config => {
-  // eslint-disable-next-line no-shadow
-  return withAndroidManifest(config, config => {
-    const intents = [
-      {
-        action: [
-          {
-            $: {
-              'android:name': 'android.intent.action.SEND',
-            },
-          },
-        ],
-        category: [
-          {
-            $: {
-              'android:name': 'android.intent.category.DEFAULT',
-            },
-          },
-        ],
-        data: [
-          {
-            $: {
-              'android:mimeType': 'image/*',
-            },
-          },
-        ],
-      },
-      {
-        action: [
-          {
-            $: {
-              'android:name': 'android.intent.action.SEND',
-            },
-          },
-        ],
-        category: [
-          {
-            $: {
-              'android:name': 'android.intent.category.DEFAULT',
-            },
-          },
-        ],
-        data: [
-          {
-            $: {
-              'android:mimeType': 'text/plain',
-            },
-          },
-        ],
-      },
-      {
-        action: [
-          {
-            $: {
-              'android:name': 'android.intent.action.SEND_MULTIPLE',
-            },
-          },
-        ],
-        category: [
-          {
-            $: {
-              'android:name': 'android.intent.category.DEFAULT',
-            },
-          },
-        ],
-        data: [
-          {
-            $: {
-              'android:mimeType': 'image/*',
-            },
-          },
-        ],
-      },
-    ]
-
-    const intentFilter =
-      config.modResults.manifest.application?.[0].activity?.[0]['intent-filter']
-
-    if (intentFilter) {
-      intentFilter.push(...intents)
-    }
-
-    return config
-  })
-}
-
-module.exports = {withIntentFilters}
@@ -1,47 +0,0 @@
-const {withPlugins} = require('@expo/config-plugins')
-const {withAppEntitlements} = require('./withAppEntitlements')
-const {withXcodeTarget} = require('./withXcodeTarget')
-const {withExtensionEntitlements} = require('./withExtensionEntitlements')
-const {withExtensionInfoPlist} = require('./withExtensionInfoPlist')
-const {withExtensionViewController} = require('./withExtensionViewController')
-const {withIntentFilters} = require('./withIntentFilters')
-
-const SHARE_EXTENSION_NAME = 'Share-with-Bluesky'
-const SHARE_EXTENSION_CONTROLLER_NAME = 'ShareViewController'
-
-const withShareExtensions = config => {
-  return withPlugins(config, [
-    // IOS
-    withAppEntitlements,
-    [
-      withExtensionEntitlements,
-      {
-        extensionName: SHARE_EXTENSION_NAME,
-      },
-    ],
-    [
-      withExtensionInfoPlist,
-      {
-        extensionName: SHARE_EXTENSION_NAME,
-      },
-    ],
-    [
-      withExtensionViewController,
-      {
-        extensionName: SHARE_EXTENSION_NAME,
-        controllerName: SHARE_EXTENSION_CONTROLLER_NAME,
-      },
-    ],
-    [
-      withXcodeTarget,
-      {
-        extensionName: SHARE_EXTENSION_NAME,
-        controllerName: SHARE_EXTENSION_CONTROLLER_NAME,
-      },
-    ],
-    // Android
-    withIntentFilters,
-  ])
-}
-
-module.exports = withShareExtensions
@@ -1,63 +0,0 @@
-const {withXcodeProject} = require('@expo/config-plugins')
-
-const withXcodeTarget = (config, {extensionName, controllerName}) => {
-  // eslint-disable-next-line no-shadow
-  return withXcodeProject(config, config => {
-    const pbxProject = config.modResults
-
-    const target = pbxProject.addTarget(
-      extensionName,
-      'app_extension',
-      extensionName,
-    )
-    pbxProject.addBuildPhase([], 'PBXSourcesBuildPhase', 'Sources', target.uuid)
-    pbxProject.addBuildPhase(
-      [],
-      'PBXResourcesBuildPhase',
-      'Resources',
-      target.uuid,
-    )
-    const pbxGroupKey = pbxProject.pbxCreateGroup(extensionName, extensionName)
-    pbxProject.addFile(`${extensionName}/Info.plist`, pbxGroupKey)
-    pbxProject.addSourceFile(
-      `${extensionName}/${controllerName}.swift`,
-      {target: target.uuid},
-      pbxGroupKey,
-    )
-
-    var configurations = pbxProject.pbxXCBuildConfigurationSection()
-    for (var key in configurations) {
-      if (typeof configurations[key].buildSettings !== 'undefined') {
-        var buildSettingsObj = configurations[key].buildSettings
-        if (
-          typeof buildSettingsObj.PRODUCT_NAME !== 'undefined' &&
-          buildSettingsObj.PRODUCT_NAME === `"${extensionName}"`
-        ) {
-          buildSettingsObj.CLANG_ENABLE_MODULES = 'YES'
-          buildSettingsObj.INFOPLIST_FILE = `"${extensionName}/Info.plist"`
-          buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `"${extensionName}/${extensionName}.entitlements"`
-          buildSettingsObj.CODE_SIGN_STYLE = 'Automatic'
-          buildSettingsObj.CURRENT_PROJECT_VERSION = `"${config.ios?.buildNumber}"`
-          buildSettingsObj.GENERATE_INFOPLIST_FILE = 'YES'
-          buildSettingsObj.MARKETING_VERSION = `"${config.version}"`
-          buildSettingsObj.PRODUCT_BUNDLE_IDENTIFIER = `"${config.ios?.bundleIdentifier}.${extensionName}"`
-          buildSettingsObj.SWIFT_EMIT_LOC_STRINGS = 'YES'
-          buildSettingsObj.SWIFT_VERSION = '5.0'
-          buildSettingsObj.TARGETED_DEVICE_FAMILY = `"1,2"`
-          buildSettingsObj.DEVELOPMENT_TEAM = 'B3LX46C5HS'
-        }
-      }
-    }
-
-    pbxProject.addTargetAttribute(
-      'DevelopmentTeam',
-      'B3LX46C5HS',
-      extensionName,
-    )
-    pbxProject.addTargetAttribute('DevelopmentTeam', 'B3LX46C5HS')
-
-    return config
-  })
-}
-
-module.exports = {withXcodeTarget}
@@ -1,37 +0,0 @@
-const {withAndroidManifest} = require('expo/config-plugins')
-
-module.exports = function withAndroidManifestFCMIconPlugin(appConfig) {
-  return withAndroidManifest(appConfig, function (decoratedAppConfig) {
-    try {
-      function addOrModifyMetaData(metaData, name, resource) {
-        const elem = metaData.find(elem => elem.$['android:name'] === name)
-        if (elem === undefined) {
-          metaData.push({
-            $: {
-              'android:name': name,
-              'android:resource': resource,
-            },
-          })
-        } else {
-          elem.$['android:resource'] = resource
-        }
-      }
-      const androidManifest = decoratedAppConfig.modResults.manifest
-      const metaData = androidManifest.application[0]['meta-data']
-      addOrModifyMetaData(
-        metaData,
-        'com.google.firebase.messaging.default_notification_color',
-        '@color/notification_icon_color',
-      )
-      addOrModifyMetaData(
-        metaData,
-        'com.google.firebase.messaging.default_notification_icon',
-        '@drawable/notification_icon',
-      )
-      return decoratedAppConfig
-    } catch (e) {
-      console.error(`withAndroidManifestFCMIconPlugin failed`, e)
-    }
-    return decoratedAppConfig
-  })
-}
@@ -1,28 +0,0 @@
-const {withStringsXml, AndroidConfig} = require('@expo/config-plugins')
-
-module.exports = function withAndroidSplashScreenStatusBarTranslucentPlugin(
-  appConfig,
-) {
-  return withStringsXml(appConfig, function (decoratedAppConfig) {
-    try {
-      decoratedAppConfig.modResults = AndroidConfig.Strings.setStringItem(
-        [
-          {
-            _: 'true',
-            $: {
-              name: 'expo_splash_screen_status_bar_translucent',
-              translatable: 'false',
-            },
-          },
-        ],
-        decoratedAppConfig.modResults,
-      )
-    } catch (e) {
-      console.error(
-        `withAndroidSplashScreenStatusBarTranslucentPlugin failed`,
-        e,
-      )
-    }
-    return decoratedAppConfig
-  })
-}
@@ -1,20 +0,0 @@
-const {withAndroidStyles, AndroidConfig} = require('@expo/config-plugins')
-
-module.exports = function withAndroidStylesWindowBackgroundPlugin(appConfig) {
-  return withAndroidStyles(appConfig, function (decoratedAppConfig) {
-    try {
-      decoratedAppConfig.modResults = AndroidConfig.Styles.assignStylesValue(
-        decoratedAppConfig.modResults,
-        {
-          add: true,
-          parent: AndroidConfig.Styles.getAppThemeLightNoActionBarGroup(),
-          name: 'android:windowBackground',
-          value: '@drawable/splashscreen',
-        },
-      )
-    } catch (e) {
-      console.error(`withAndroidStylesWindowBackgroundPlugin failed`, e)
-    }
-    return decoratedAppConfig
-  })
-}
@@ -1,5 +0,0 @@
-# Tool Scripts
-
-## updateExtensions.sh
-
-Updates the extensions in `/modules` with the current iOS/Android project changes.
@@ -0,0 +1,10 @@
+#!/bin/sh
+# The number here should always be the line number the iOS build variable is on
+line=$(sed "30q;d" ./app.config.js)
+currentBuildNumber=$(echo "$line" | grep -oE '[0-9]+([.][0-9]+)?')
+newBuildNumber=$((currentBuildNumber+1))
+newBuildVariable="const ANDROID_VERSION_CODE = '$newBuildNumber'"
+sed -i.bak "30s/.*/  $newBuildVariable/" ./app.config.js
+rm -rf ./app.config.js.bak
+
+echo "Android build number bumped to $newBuildNumber"
@@ -0,0 +1,10 @@
+#!/bin/sh
+# The number here should always be the line number the iOS build variable is on
+line=$(sed "24q;d" ./app.config.js)
+currentBuildNumber=$(echo "$line" | grep -oE '[0-9]+([.][0-9]+)?')
+newBuildNumber=$((currentBuildNumber+1))
+newBuildVariable="const IOS_BUILD_NUMBER = '$newBuildNumber'"
+sed -i.bak "24s/.*/  $newBuildVariable/" ./app.config.js
+rm -rf ./app.config.js.bak
+
+echo "iOS build number bumped to $newBuildNumber"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric Bailey	04dd8f9eef	Comments	2024-02-19 15:49:22 -06:00
Eric Bailey	a52b840c19	Hacky fix	2024-02-19 14:42:09 -06:00
Eric Bailey	64b8d94bb6	Remove comment, revert storybook	2024-02-19 14:02:30 -06:00
Eric Bailey	bf4fca4f8a	Improve dialogs	2024-02-19 13:59:03 -06:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M4.213 6.886c-.673-1.35.334-2.889 1.806-2.889H17.98c1.472 0 2.479 1.539 1.806 2.89l-5.982 11.997c-.74 1.484-2.87 1.484-3.61 0L4.213 6.886Z"/></svg>`
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M5.002 17.036V5h14v12.036h-3.986a1 1 0 0 0-.639.23l-2.375 1.968-2.344-1.965a1 1 0 0 0-.643-.233H5.002ZM20.002 3h-16a1 1 0 0 0-1 1v14.036a1 1 0 0 0 1 1h4.65l2.704 2.266a1 1 0 0 0 1.28.004l2.74-2.27h4.626a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1Zm-7.878 3.663c-1.39 0-2.5 1.135-2.5 2.515a1 1 0 0 0 2 0c0-.294.232-.515.5-.515a.507.507 0 0 1 .489.6.174.174 0 0 1-.027.048 1.1 1.1 0 0 1-.267.226c-.508.345-1.128.923-1.286 1.978a1 1 0 1 0 1.978.297.762.762 0 0 1 .14-.359c.063-.086.155-.169.293-.262.436-.297 1.18-.885 1.18-2.013 0-1.38-1.11-2.515-2.5-2.515ZM12 15.75a1.25 1.25 0 1 1 0-2.5 1.25 1.25 0 0 1 0 2.5Z" clip-rule="evenodd"/></svg>