Update ruby version to latest homebrew stable

2024-12-07 14:22:20 -06:00
343 changed files with 45516 additions and 90895 deletions
@@ -1,7 +1,7 @@
 # Copy this to `.env` and `.env.test` files

-BITDRIFT_API_KEY=
 SENTRY_AUTH_TOKEN=
+EXPO_PUBLIC_ENV=development
 EXPO_PUBLIC_LOG_LEVEL=debug
 EXPO_PUBLIC_LOG_DEBUG=
 EXPO_PUBLIC_BUNDLE_IDENTIFIER=
@@ -64,7 +64,6 @@ jobs:
          echo "${{ secrets.ENV_TOKEN }}" > .env
          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

      - name: 🏗️ EAS Build
@@ -76,7 +76,6 @@ jobs:
          echo "${{ secrets.ENV_TOKEN }}" > .env
          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json

      - name: 🏗️ EAS Build
@@ -69,9 +69,6 @@ jobs:
      - name: Lint check
        run: yarn lint

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

@@ -104,7 +101,6 @@ jobs:
          echo "${{ secrets.ENV_TOKEN }}" > .env
          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

      - name: 🏗️ Create Bundle
@@ -200,7 +196,6 @@ jobs:
          echo "${{ secrets.ENV_TOKEN }}" > .env
          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "${{ secrets.GOOGLE_SERVICES_TOKEN }}" > google-services.json

      - name: 🏗️ EAS Build
@@ -227,7 +222,7 @@ jobs:
    concurrency:
      group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-android
      cancel-in-progress: false
-    needs: [bundleDeploy]
+    needs: [ bundleDeploy ]
    # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
    # available here
    if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected }}
@@ -278,7 +273,6 @@ jobs:
          echo "${{ secrets.ENV_TOKEN }}" > .env
          echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env
          echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env
-          echo "BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env
          echo "$json" > google-services.json

      - name: 🏗️ EAS Build
@@ -19,7 +19,7 @@ jobs:
      - name: Set up Go tooling
        uses: actions/setup-go@v3
        with:
-          go-version: '1.23'
+          go-version: '1.22'
      - name: Dummy Static Files
        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
      - name: Check
@@ -36,7 +36,7 @@ jobs:
      - name: Set up Go tooling
        uses: actions/setup-go@v3
        with:
-          go-version: '1.23'
+          go-version: '1.22'
      - name: Dummy Static Files
        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
      - name: Lint
@@ -28,8 +28,6 @@ jobs:
          attempt_delay: 2000
      - name: Lint check
        run: yarn lint
-      - name: Lint lockfile
-        run: yarn lockfile-lint
      - name: Prettier check
        run: yarn prettier --check .
      - name: Check & compile i18n
@@ -56,4 +54,4 @@ jobs:
        run: yarn intl:build
      - name: Run tests
        run: |
-          NODE_ENV=test yarn test --forceExit
+          NODE_ENV=test EXPO_PUBLIC_ENV=test yarn test --forceExit
@@ -1,46 +0,0 @@
-name: Lockfile
-
-on:
-  pull_request:
-concurrency:
-  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
-  cancel-in-progress: true
-
-jobs:
-  verify-yarn-lock:
-    name: No manual yarn.lock edits
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out PR HEAD
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Fetch base branch
-        run: git fetch origin ${{ github.base_ref }} --depth=1
-
-      - name: Install node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Reset yarn.lock to base
-        run: git show "origin/${{ github.base_ref }}:yarn.lock" > yarn.lock
-
-      - name: Yarn install
-        uses: Wandalen/wretry.action@master
-        with:
-          # Fine to skip scripts since we don't run any code
-          command: yarn install --ignore-scripts
-          attempt_limit: 3
-          attempt_delay: 2000
-
-      - name: Verify yarn.lock
-        run: |
-          git diff --quiet --exit-code || {
-            echo '::error::`yarn.lock` does not match what Yarn would generate given the base `yarn.lock` and the head `package.json`.'
-            echo '::error:: - If this is intentional, you can ignore this check.'
-            echo '::error:: - If this is unintentional, apply the following diff:'
-            git --no-pager diff
-            exit 1
-          }
@@ -1 +1 @@
-2.7.6
+3.3.6
@@ -1,4 +1,4 @@
-FROM golang:1.23-bullseye AS build-env
+FROM golang:1.22-bullseye AS build-env

 WORKDIR /usr/src/social-app

@@ -1,4 +1,4 @@
-FROM golang:1.23-bullseye AS build-env
+FROM golang:1.22-bullseye AS build-env

 WORKDIR /usr/src/social-app

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

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

 .PHONY: lint
 lint: ## Run style checks and verify syntax
@@ -26,7 +26,7 @@ appId: xyz.blueskyweb.app
 - tapOn: "Save"
 - assertNotVisible:
    id: "createOrEditListModal"
- tapOn: "People"
+- tapOn: "About"
 - assertVisible: "Good Ppl"
 - assertVisible: "They good"

@@ -74,6 +74,7 @@ appId: xyz.blueskyweb.app
 - tapOn: "Delete List"
 - tapOn:
    id: "confirmBtn"
+- assertVisible: "This list is empty!"

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

- tapOn: "Start adding people"
+- tapOn:
+    label: "Adds users on curatelists from the list"
+    id: "addUserBtn"
 - assertVisible:
    id: "listAddUserModal"
 - tapOn:
@@ -142,7 +145,7 @@ appId: xyz.blueskyweb.app
    id: "e2eGotoLists"
 - tapOn: "Good Ppl"

- tapOn: "People"
+- tapOn: "About"
 - assertVisible:
    label: "Removes users on curatelists from the list"
    id: "user-bob.test"
@@ -11,8 +11,10 @@ appId: xyz.blueskyweb.app

 # Pin alice's feed
 - extendedWaitUntil:
-    visible: "Open drawer menu"
- tapOn: "Open drawer menu"
+    visible:
+        id: "viewHeaderDrawerBtn"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
    id: "profileCardButton"
 - tapOn:
@@ -30,7 +32,8 @@ appId: xyz.blueskyweb.app
    text: "alice-favs"

 # Set alice-favs first
- tapOn: "Open drawer menu"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
    id: "menuItemButton-Feeds"
 - tapOn:
@@ -41,7 +44,8 @@ appId: xyz.blueskyweb.app
 - tapOn:
      label: "Save button"
      id: "saveChangesBtn"
- tapOn: "Go back"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - assertVisible:
    id: "homeScreenFeedTabs-selector-0"
    text: "alice-favs"
@@ -50,7 +54,8 @@ appId: xyz.blueskyweb.app
    text: "Following"

 # Set following first
- tapOn: "Open drawer menu"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
    id: "menuItemButton-Feeds"
 - tapOn:
@@ -61,7 +66,8 @@ appId: xyz.blueskyweb.app
 - tapOn:
    label: "Save button"
    id: "saveChangesBtn"
- tapOn: "Go back"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - assertVisible:
    id: "homeScreenFeedTabs-selector-0"
    text: "Following"
@@ -70,7 +76,8 @@ appId: xyz.blueskyweb.app
    text: "alice-favs"

 # Remove following
- tapOn: "Open drawer menu"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - tapOn:
    id: "menuItemButton-Feeds"
 - tapOn:
@@ -81,7 +88,8 @@ appId: xyz.blueskyweb.app
 - tapOn:
      label: "Save button"
      id: "saveChangesBtn"
- tapOn: "Go back"
+- tapOn:
+    id: "viewHeaderDrawerBtn"
 - assertVisible:
    id: "homeScreenFeedTabs-selector-0"
    text: "alice-favs"
@@ -27,9 +27,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "bottomBarHomeBtn"
 - tapOn:
-    id: "bottomBarHomeBtn"
- tapOn:
-    id: "bottomBarHomeBtn"
+    id: "viewHeaderDrawerBtn"
 - assertNotVisible: "Feeds ✨"

 - tapOn:
@@ -14,7 +14,7 @@ appId: xyz.blueskyweb.app
    id: "e2eGotoModeration"
 - tapOn:
    id: "moderationlistsBtn"
- tapOn: "New list"
+- tapOn: "New"
 - tapOn:
    id: "editNameInput"
 - inputText: "Muted Users"
@@ -6,8 +6,6 @@ appId: xyz.blueskyweb.app
 - waitForAnimationToEnd
 - tapOn: "http://localhost:8081"
 - waitForAnimationToEnd
- extendedWaitUntil:
-    visible: "Continue"
 - swipe:
   from: "Bluesky"
   direction: DOWN
@@ -15,9 +15,9 @@ module.exports = function (config) {
   */
  const PLATFORM = process.env.EAS_BUILD_PLATFORM

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

  const ASSOCIATED_DOMAINS = [
    'applinks:bsky.app',
@@ -50,6 +50,7 @@ module.exports = function (config) {
      runtimeVersion: {
        policy: 'appVersion',
      },
+      orientation: 'portrait',
      icon: './assets/app-icons/ios_icon_default_light.png',
      userInterfaceStyle: 'automatic',
      primaryColor: '#1083fe',
@@ -76,7 +77,6 @@ module.exports = function (config) {
            'ast',
            'ca',
            'de',
-            'el',
            'es',
            'fi',
            'fr',
@@ -87,13 +87,10 @@ module.exports = function (config) {
            'id',
            'it',
            'ja',
-            'km',
            'ko',
-            'ne',
            'nl',
            'pl',
            'pt-BR',
-            'ro',
            'ru',
            'th',
            'tr',
@@ -225,14 +222,11 @@ module.exports = function (config) {
          },
        ],
        'react-native-compressor',
-        // TODO: Reenable when the build issue is fixed.
-        // '@bitdrift/react-native',
        './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
        './plugins/withAndroidManifestPlugin.js',
        './plugins/withAndroidManifestFCMIconPlugin.js',
        './plugins/withAndroidStylesAccentColorPlugin.js',
        './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',
-        './plugins/withAndroidNoJitpackPlugin.js',
        './plugins/shareExtension/withShareExtensions.js',
        './plugins/notificationsExtension/withNotificationsExtension.js',
        './plugins/withAppDelegateReferrer.js',
@@ -240,8 +234,8 @@ module.exports = function (config) {
          'expo-font',
          {
            fonts: [
-              './assets/fonts/inter/InterVariable.woff2',
-              './assets/fonts/inter/InterVariable-Italic.woff2',
+              './assets/fonts/inter/InterVariable.ttf',
+              './assets/fonts/inter/InterVariable-Italic.ttf',
              // Android only
              './assets/fonts/inter/Inter-Regular.otf',
              './assets/fonts/inter/Inter-Italic.otf',
@@ -346,7 +340,6 @@ module.exports = function (config) {
            },
          },
        ],
-        ['expo-screen-orientation', {initialOrientation: 'PORTRAIT_UP'}],
      ].filter(Boolean),
      extra: {
        eas: {
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M7.5 2a1 1 0 0 0-1 1v3.997a6.25 6.25 0 0 1-1.83 4.42l-.377.376A1 1 0 0 0 4 12.5V15a1 1 0 0 0 1 1h6v5a1 1 0 1 0 2 0v-5h6a1 1 0 0 0 1-1v-2.5a1 1 0 0 0-.293-.707l-.376-.377a6.25 6.25 0 0 1-1.831-4.42V3.001a1 1 0 0 0-1-1h-9Z"/></svg>
@@ -1 +1 @@
-<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 0-1 1v4.17a1 1 0 0 0 .667.944 2.001 2.001 0 0 1 0 3.772A1 1 0 0 0 2 14.83V19a1 1 0 0 0 1 1h18a1 1 0 0 0 1-1v-4.17a1 1 0 0 0-.667-.944 2.001 2.001 0 0 1 0-3.772A1 1 0 0 0 22 9.17V5a1 1 0 0 0-1-1H3Zm1 4.535V6h16v2.535A4 4 0 0 0 18 12c0 1.482.805 2.773 2 3.465V18H4v-2.535A4 4 0 0 0 6 12a4 4 0 0 0-2-3.465ZM15 15a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-1-3a1 1 0 1 1 2 0 1 1 0 0 1-2 0Zm1-5a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z" clip-rule="evenodd"/></svg>
+<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.5 3.5 0 0 1 5.5 12a3.5 3.5 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.5 3.5 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>
@@ -4,7 +4,6 @@
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>Bluesky Embed</title>
-  <link rel="preconnect" href="https://public.api.bsky.app">
  <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">
@@ -4,7 +4,6 @@
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>Bluesky Embed</title>
-  <link rel="preconnect" href="https://public.api.bsky.app">
  <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">
@@ -20,7 +20,6 @@ window.addEventListener('message', event => {
    return
  }

-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
  const id = (event.data as {id: string}).id
  if (!id) {
    return
@@ -34,7 +33,6 @@ window.addEventListener('message', event => {
    return
  }

-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
  const height = (event.data as {height: number}).height
  if (height) {
    embed.style.height = `${height}px`
@@ -49,7 +47,7 @@ window.addEventListener('message', event => {
 * @returns
 */
 function scan(node = document) {
-  const embeds = node.querySelectorAll<HTMLIFrameElement>('[data-bluesky-uri]')
+  const embeds = node.querySelectorAll('[data-bluesky-uri]')

  for (let i = 0; i < embeds.length; i++) {
    const id = String(Math.random()).slice(2)
@@ -1,17 +0,0 @@
-export function applyTheme(theme: 'light' | 'dark') {
-  document.documentElement.classList.remove('light', 'dark')
-  document.documentElement.classList.add(theme)
-}
-
-export function initColorMode() {
-  applyTheme(
-    window.matchMedia('(prefers-color-scheme: dark)').matches
-      ? 'dark'
-      : 'light',
-  )
-  window
-    .matchMedia('(prefers-color-scheme: dark)')
-    .addEventListener('change', mql => {
-      applyTheme(mql.matches ? 'dark' : 'light')
-    })
-}
@@ -37,7 +37,7 @@ export function Container({
  return (
    <div
      ref={ref}
-      className="w-full bg-white text-black hover:bg-neutral-50 dark:bg-dimmedBg dark:hover:bg-dimmedBgLighten relative transition-colors max-w-[600px] min-w-[300px] flex border dark:border-slate-600 dark:text-slate-200 rounded-xl"
+      className="w-full bg-white hover:bg-neutral-50 relative transition-colors max-w-[600px] min-w-[300px] flex border rounded-xl"
      onClick={() => {
        if (ref.current && href) {
          // forwardRef requires preact/compat - let's keep it simple
@@ -78,9 +78,9 @@ export function Embed({
        return (
          <Link
            href={`/profile/${record.author.did}/post/${getRkey(record)}`}
-            className="transition-colors hover:bg-neutral-100 dark:hover:bg-slate-700 border dark:border-slate-600 rounded-lg p-2 gap-1.5 w-full flex flex-col">
+            className="transition-colors hover:bg-neutral-100 border rounded-lg p-2 gap-1.5 w-full flex flex-col">
            <div className="flex gap-1.5 items-center">
-              <div className="w-4 h-4 overflow-hidden rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
+              <div className="w-4 h-4 overflow-hidden rounded-full bg-neutral-300 shrink-0">
                <img
                  src={record.author.avatar}
                  style={isAuthorLabeled ? {filter: 'blur(1.5px)'} : undefined}
@@ -88,7 +88,7 @@ export function Embed({
              </div>
              <p className="line-clamp-1 text-sm">
                <span className="font-bold">{record.author.displayName}</span>
-                <span className="text-textLight dark:text-textDimmed ml-1">
+                <span className="text-textLight ml-1">
                  @{record.author.handle}
                </span>
              </p>
@@ -209,7 +209,7 @@ function Info({children}: {children: ComponentChildren}) {
  return (
    <div className="w-full rounded-lg border py-2 px-2.5 flex-row flex gap-2 bg-neutral-50">
      <img src={infoIcon} className="w-4 h-4 shrink-0 mt-0.5" />
-      <p className="text-sm text-textLight dark:text-textDimmed">{children}</p>
+      <p className="text-sm text-textLight">{children}</p>
    </div>
  )
 }
@@ -308,7 +308,7 @@ function ExternalEmbed({
  return (
    <Link
      href={content.external.uri}
-      className="w-full rounded-lg overflow-hidden border dark:border-slate-600 flex flex-col items-stretch"
+      className="w-full rounded-lg overflow-hidden border flex flex-col items-stretch"
      disableTracking>
      {content.external.thumb && (
        <img
@@ -317,11 +317,11 @@ function ExternalEmbed({
        />
      )}
      <div className="py-3 px-4">
-        <p className="text-sm text-textLight dark:text-textDimmed line-clamp-1">
+        <p className="text-sm text-textLight line-clamp-1">
          {toNiceDomain(content.external.uri)}
        </p>
        <p className="font-semibold line-clamp-3">{content.external.title}</p>
-        <p className="text-sm text-textLight dark:text-textDimmed line-clamp-2 mt-0.5">
+        <p className="text-sm text-textLight line-clamp-2 mt-0.5">
          {content.external.description}
        </p>
      </div>
@@ -345,29 +345,23 @@ function GenericWithImageEmbed({
  return (
    <Link
      href={href}
-      className="w-full rounded-lg border dark:border-slate-600 py-2 px-3 flex flex-col gap-2">
+      className="w-full rounded-lg border py-2 px-3 flex flex-col gap-2">
      <div className="flex gap-2.5 items-center">
        {image ? (
          <img
            src={image}
            alt={title}
-            className="w-8 h-8 rounded-md bg-neutral-300 dark:bg-slate-700 shrink-0"
+            className="w-8 h-8 rounded-md bg-neutral-300 shrink-0"
          />
        ) : (
          <div className="w-8 h-8 rounded-md bg-brand shrink-0" />
        )}
        <div className="flex-1">
          <p className="font-bold text-sm">{title}</p>
-          <p className="text-textLight dark:text-textDimmed text-sm">
-            {subtitle}
-          </p>
+          <p className="text-textLight text-sm">{subtitle}</p>
        </div>
      </div>
-      {description && (
-        <p className="text-textLight dark:text-textDimmed text-sm">
-          {description}
-        </p>
-      )}
+      {description && <p className="text-textLight text-sm">{description}</p>}
    </Link>
  )
 }
@@ -412,7 +406,7 @@ function StarterPackEmbed({
  return (
    <Link
      href={starterPackHref}
-      className="w-full rounded-lg overflow-hidden border dark:border-slate-600 flex flex-col items-stretch">
+      className="w-full rounded-lg overflow-hidden border flex flex-col items-stretch">
      <img src={imageUri} className="aspect-[1.91/1] object-cover" />
      <div className="py-3 px-4">
        <div className="flex space-x-2 items-center">
@@ -421,7 +415,7 @@ function StarterPackEmbed({
            <p className="font-semibold leading-[21px]">
              {content.record.name}
            </p>
-            <p className="text-sm text-textLight dark:text-textDimmed line-clamp-2 leading-[18px]">
+            <p className="text-sm text-textLight line-clamp-2 leading-[18px]">
              Starter pack by{' '}
              {content.creator.displayName || `@${content.creator.handle}`}
            </p>
@@ -431,7 +425,7 @@ function StarterPackEmbed({
          <p className="text-sm mt-1">{content.record.description}</p>
        )}
        {!!content.joinedAllTimeCount && content.joinedAllTimeCount > 50 && (
-          <p className="text-sm font-semibold text-textLight dark:text-textDimmed mt-1">
+          <p className="text-sm font-semibold text-textLight mt-1">
            {content.joinedAllTimeCount} users have joined!
          </p>
        )}
@@ -38,7 +38,7 @@ export function Post({thread}: Props) {
      <div className="flex-1 flex-col flex gap-2" lang={record?.langs?.[0]}>
        <div className="flex gap-2.5 items-center cursor-pointer">
          <Link href={`/profile/${post.author.did}`} className="rounded-full">
-            <div className="w-10 h-10 overflow-hidden rounded-full bg-neutral-300 dark:bg-slate-700 shrink-0">
+            <div className="w-10 h-10 overflow-hidden rounded-full bg-neutral-300 shrink-0">
              <img
                src={post.author.avatar}
                style={isAuthorLabeled ? {filter: 'blur(2.5px)'} : undefined}
@@ -53,7 +53,7 @@ export function Post({thread}: Props) {
            </Link>
            <Link
              href={`/profile/${post.author.did}`}
-              className="text-[15px] text-textLight dark:text-textDimmed hover:underline line-clamp-1">
+              className="text-[15px] text-textLight hover:underline line-clamp-1">
              <p>@{post.author.handle}</p>
            </Link>
          </div>
@@ -69,15 +69,15 @@ export function Post({thread}: Props) {
        <Link href={href}>
          <time
            datetime={new Date(post.indexedAt).toISOString()}
-            className="text-textLight dark:text-textDimmed mt-1 text-sm hover:underline">
+            className="text-textLight mt-1 text-sm hover:underline">
            {niceDate(post.indexedAt)}
          </time>
        </Link>
-        <div className="border-t dark:border-slate-600 w-full pt-2.5 flex items-center gap-5 text-sm cursor-pointer">
+        <div className="border-t w-full pt-2.5 flex items-center gap-5 text-sm cursor-pointer">
          {!!post.likeCount && (
            <div className="flex items-center gap-2 cursor-pointer">
              <img src={likeIcon} className="w-5 h-5" />
-              <p className="font-bold text-neutral-500 dark:text-neutral-300 mb-px">
+              <p className="font-bold text-neutral-500 mb-px">
                {prettyNumber(post.likeCount)}
              </p>
            </div>
@@ -85,19 +85,17 @@ export function Post({thread}: Props) {
          {!!post.repostCount && (
            <div className="flex items-center gap-2 cursor-pointer">
              <img src={repostIcon} className="w-5 h-5" />
-              <p className="font-bold text-neutral-500 dark:text-neutral-300 mb-px">
+              <p className="font-bold text-neutral-500 mb-px">
                {prettyNumber(post.repostCount)}
              </p>
            </div>
          )}
          <div className="flex items-center gap-2 cursor-pointer">
            <img src={replyIcon} className="w-5 h-5" />
-            <p className="font-bold text-neutral-500 dark:text-neutral-300 mb-px">
-              Reply
-            </p>
+            <p className="font-bold text-neutral-500 mb-px">Reply</p>
          </div>
          <div className="flex-1" />
-          <p className="cursor-pointer text-brand dark:text-brandLighten font-bold hover:underline hidden min-[450px]:inline">
+          <p className="cursor-pointer text-brand font-bold hover:underline hidden min-[450px]:inline">
            {post.replyCount
              ? `Read ${prettyNumber(post.replyCount)} ${
                  post.replyCount > 1 ? 'replies' : 'reply'
@@ -5,7 +5,3 @@
 .break-word {
  word-break: break-word;
 }
-
-:root {
-  color-scheme: light dark;
-}
@@ -6,7 +6,6 @@ import {useEffect, useMemo, useRef, useState} from 'preact/hooks'

 import arrowBottom from '../../assets/arrowBottom_stroke2_corner0_rounded.svg'
 import logo from '../../assets/logo.svg'
-import {initColorMode} from '../color-mode'
 import {Container} from '../components/container'
 import {Link} from '../components/link'
 import {Post} from '../components/post'
@@ -22,8 +21,6 @@ export const EMBED_SCRIPT = `${EMBED_SERVICE}/static/embed.js`
 const root = document.getElementById('app')
 if (!root) throw new Error('No root element')

-initColorMode()
-
 const agent = new BskyAgent({
  service: 'https://public.api.bsky.app',
 })
@@ -111,7 +108,7 @@ function LandingPage() {
  }, [uri])

  return (
-    <main className="w-full min-h-screen flex flex-col items-center gap-8 py-14 px-4 md:pt-32 dark:bg-dimmedBgDarken dark:text-slate-200">
+    <main className="w-full min-h-screen flex flex-col items-center gap-8 py-14 px-4 md:pt-32">
      <Link
        href="https://bsky.social/about"
        className="transition-transform hover:scale-110">
@@ -124,22 +121,20 @@ function LandingPage() {
        type="text"
        value={uri}
        onInput={e => setUri(e.currentTarget.value)}
-        className="border rounded-lg py-3 w-full max-w-[600px] px-4 dark:bg-dimmedBg dark:border-slate-500"
+        className="border rounded-lg py-3 w-full max-w-[600px] px-4"
        placeholder={DEFAULT_POST}
      />

-      <img src={arrowBottom} className="w-6 dark:invert" />
+      <img src={arrowBottom} className="w-6" />

      {loading ? (
-        <div className="w-full max-w-[600px]">
-          <Skeleton />
-        </div>
+        <Skeleton />
      ) : (
        <div className="w-full max-w-[600px] gap-8 flex flex-col">
          {!error && thread && uri && <Snippet thread={thread} />}
          {!error && thread && <Post thread={thread} key={thread.post.uri} />}
          {error && (
-            <div className="w-full border border-red-500 bg-red-500/10 px-4 py-3 rounded-lg">
+            <div className="w-full border border-red-500 bg-red-50 px-4 py-3 rounded-lg">
              <p className="text-red-500 text-center">{error}</p>
            </div>
          )}
@@ -154,15 +149,15 @@ function Skeleton() {
    <Container>
      <div className="flex-1 flex-col flex gap-2 pb-8">
        <div className="flex gap-2.5 items-center">
-          <div className="w-10 h-10 overflow-hidden rounded-full bg-neutral-100 dark:bg-slate-700 shrink-0 animate-pulse" />
+          <div className="w-10 h-10 overflow-hidden rounded-full bg-neutral-100 shrink-0 animate-pulse" />
          <div className="flex-1">
-            <div className="bg-neutral-100 dark:bg-slate-700 animate-pulse w-64 h-4 rounded" />
-            <div className="bg-neutral-100 dark:bg-slate-700 animate-pulse w-32 h-3 mt-1 rounded" />
+            <div className="bg-neutral-100 animate-pulse w-64 h-4 rounded" />
+            <div className="bg-neutral-100 animate-pulse w-32 h-3 mt-1 rounded" />
          </div>
        </div>
-        <div className="w-full h-4 mt-2 bg-neutral-100 dark:bg-slate-700 rounded animate-pulse" />
-        <div className="w-5/6 h-4 bg-neutral-100 dark:bg-slate-700 rounded animate-pulse" />
-        <div className="w-3/4 h-4 bg-neutral-100 dark:bg-slate-700 rounded animate-pulse" />
+        <div className="w-full h-4 mt-2 bg-neutral-100 rounded animate-pulse" />
+        <div className="w-5/6 h-4 bg-neutral-100 rounded animate-pulse" />
+        <div className="w-3/4 h-4 bg-neutral-100 rounded animate-pulse" />
      </div>
    </Container>
  )
@@ -225,7 +220,7 @@ function Snippet({thread}: {thread: AppBskyFeedDefs.ThreadViewPost}) {
        ref={ref}
        type="text"
        value={snippet}
-        className="border rounded-lg py-3 w-full px-4 dark:bg-dimmedBg dark:border-slate-500"
+        className="border rounded-lg py-3 w-full px-4"
        readOnly
        autoFocus
        onFocus={() => {
@@ -233,7 +228,7 @@ function Snippet({thread}: {thread: AppBskyFeedDefs.ThreadViewPost}) {
        }}
      />
      <button
-        className="rounded-lg bg-brand text-white py-3 px-4 whitespace-nowrap min-w-28"
+        className="rounded-lg bg-brand text-white color-white py-3 px-4 whitespace-nowrap min-w-28"
        onClick={() => {
          ref.current?.focus()
          ref.current?.select()
@@ -4,7 +4,6 @@ import {AppBskyFeedDefs, AtpAgent} from '@atproto/api'
 import {h, render} from 'preact'

 import logo from '../../assets/logo.svg'
-import {initColorMode} from '../color-mode'
 import {Container} from '../components/container'
 import {Link} from '../components/link'
 import {Post} from '../components/post'
@@ -22,8 +21,6 @@ if (!uri) {
  throw new Error('No uri in path')
 }

-initColorMode()
-
 agent
  .getPostThread({
    uri,
@@ -58,13 +55,13 @@ function PwiOptOut({thread}: {thread: AppBskyFeedDefs.ThreadViewPost}) {
        <img src={logo} className="h-6" />
      </Link>
      <div className="w-full py-12 gap-4 flex flex-col items-center">
-        <p className="max-w-80 text-center w-full text-textLight dark:text-textDimmed">
+        <p className="max-w-80 text-center w-full text-textLight">
          The author of this post has requested their posts not be displayed on
          external sites.
        </p>
        <Link
          href={href}
-          className="max-w-80 rounded-lg bg-brand text-white text-center py-1 px-4 w-full mx-auto">
+          className="max-w-80 rounded-lg bg-brand text-white color-white text-center py-1 px-4 w-full mx-auto">
          View on Bluesky
        </Link>
      </div>
@@ -80,7 +77,7 @@ function ErrorMessage() {
        className="transition-transform hover:scale-110 absolute top-4 right-4">
        <img src={logo} className="h-6" />
      </Link>
-      <p className="my-16 text-center w-full text-textLight dark:text-textDimmed">
+      <p className="my-16 text-center w-full text-textLight">
        Post not found, it may have been deleted.
      </p>
    </Container>
@@ -1,19 +1,11 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
  content: ['./index.html', './src/**/*.{js,ts,jsx,tsx}'],
-  darkMode: ['variant', [
-    '&:is(.dark *):not(:is(.dark .light *))',
-  ]],
  theme: {
    extend: {
      colors: {
        brand: 'rgb(10,122,255)',
-        brandLighten: 'rgb(32,139,254)',
        textLight: 'rgb(66,87,108)',
-        textDimmed: 'rgb(174,187,201)',
-        dimmedBgLighten: 'rgb(30,41,54)',
-        dimmedBg: 'rgb(22,30,39)',
-        dimmedBgDarken: 'rgb(18,25,32)',
      },
    },
  },
@@ -1,3 +1,4 @@
+
 {
  "compilerOptions": {
    "target": "ES5",
@@ -19,5 +20,5 @@
    "jsxFragmentFactory": "Fragment",
    "downlevelIteration": true
  },
-  "include": ["src", "snippet", "vite.config.ts"]
+  "include": ["src", "vite.config.ts"]
 }
@@ -24,7 +24,7 @@ Then build and copy over the big 'ol `bundle.web.js` file:

 ### Golang Daemon

-Install golang. We generally develop against the current stable release of the language, as declared in `go.mod`.
+Install golang. We are generally using v1.22+.

 In this directory (`bskyweb/`):

@@ -235,7 +235,6 @@ func serve(cctx *cli.Context) error {

 	// generic routes
 	e.GET("/hashtag/:tag", server.WebGeneric)
-	e.GET("/topic/:topic", server.WebGeneric)
 	e.GET("/search", server.WebGeneric)
 	e.GET("/feeds", server.WebGeneric)
 	e.GET("/notifications", server.WebGeneric)
@@ -1,8 +1,8 @@
 module github.com/bluesky-social/social-app/bskyweb

-go 1.23
+go 1.22

-toolchain go1.23.4
+toolchain go1.22.4

 require (
 	github.com/bluesky-social/indigo v0.0.0-20240624223826-fd66f93ce141
@@ -13,7 +13,8 @@

  <!-- Hello Humans! API docs at https://atproto.com -->

-  <link rel="preload" as="font" type="font/woff2" href="{{ staticCDNHost }}/static/media/InterVariable.c504db5c06caaf7cdfba.woff2" crossorigin>
+  <link rel="preload" as="font" type="font/ttf" href="{{ staticCDNHost }}/static/media/InterVariable.c9f788f6e7ebaec75d7c.ttf">
+  <link rel="preload" as="font" type="font/ttf" href="{{ staticCDNHost }}/static/media/InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf">

  <style>
    /**
@@ -25,14 +26,14 @@
     */
    @font-face {
      font-family: 'InterVariable';
-      src: url("{{ staticCDNHost }}/static/media/InterVariable.c504db5c06caaf7cdfba.woff2") format('woff2');
+      src: url("{{ staticCDNHost }}/static/media/InterVariable.c9f788f6e7ebaec75d7c.ttf") format('truetype');
      font-weight: 300 1000;
      font-style: normal;
      font-display: swap;
    }
    @font-face {
      font-family: 'InterVariableItalic';
-      src: url("{{ staticCDNHost }}/static/media/InterVariable-Italic.01dcbad1bac635f9c9cd.woff2") format('woff2');
+      src: url("{{ staticCDNHost }}/static/media/InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf") format('truetype');
      font-weight: 300 1000;
      font-style: italic;
      font-display: swap;
@@ -12,14 +12,14 @@
 {# don't include the bundle on non-404 error pages #}
 {% block head_bundle %}
  {% if statusCode == 404 %}
-    {{ block.Super }}
+    {{ super() }}
  {% else %}
  {% endif %}
 {% endblock %}

 {%- block body_all %}
  {% if statusCode == 404 %}
-    {{ block.Super }}
+    {{ super() }}
  {% else %}
    <h1>{{ statusCode }}: Server Error</h1>
    <p>Sorry about that! Our <a href="https://bluesky.statuspage.io/">Status Page</a> might have more context.
@@ -87,12 +87,6 @@ However, if you're a part of the Bluesky team and want to enable Sentry, fill in

 If you change `SENTRY_AUTH_TOKEN`, you need to do `yarn prebuild` before running `yarn ios` or `yarn android` again.

-### Adding bitdrift
-
-Adding bitdirft is NOT required. You can keep `BITDRIFT_API_KEY=` in `.env` which will avoid initializing bitdrift during startup.
-
-However, if you're a part of the Bluesky team and want to enable bitdrift, fill in `BITDRIFT_API_KEY` in your `.env` to enable bitdrift.
-
 ### Adding and Updating Locales

 - `yarn intl:build` -> you will also need to run this anytime `./src/locale/{locale}/messages.po` change
@@ -5,8 +5,9 @@ import {LogBox} from 'react-native'
 import {registerRootComponent} from 'expo'

 import App from '#/App'
+import {IS_TEST} from '#/env'

-if (process.env.NODE_ENV === 'test') {
+if (IS_TEST) {
  LogBox.ignoreAllLogs() // suppress all logs in tests
 } else {
  LogBox.ignoreLogs(['Require cycle:']) // suppress require-cycle warnings, it's fine
@@ -105,19 +105,3 @@ jest.mock('expo-modules-core', () => ({
    return () => null
  }),
 }))
-
-jest.mock('expo-localization', () => ({
-  getLocales: () => [],
-}))
-
-jest.mock('statsig-react-native-expo', () => ({
-  Statsig: {
-    initialize() {},
-    initializeCalled() {
-      return false
-    },
-  },
-}))
-
-jest.mock('../src/lib/bitdrift', () => ({}))
-jest.mock('../src/lib/statsig/statsig', () => ({}))
@@ -6,7 +6,6 @@ module.exports = {
    'ast',
    'ca',
    'de',
-    'el',
    'en-GB',
    'es',
    'fi',
@@ -18,13 +17,10 @@ module.exports = {
    'id',
    'it',
    'ja',
-    'km',
    'ko',
-    'ne',
    'nl',
    'pl',
    'pt-BR',
-    'ro',
    'ru',
    'th',
    'tr',
@@ -14,8 +14,6 @@ if (process.env.BSKY_PROFILE) {
  cfg.cacheVersion += ':PROFILE'
 }

-cfg.resolver.assetExts = [...cfg.resolver.assetExts, 'woff2']
-
 cfg.resolver.resolveRequest = (context, moduleName, platform) => {
  // HACK: manually resolve a few packages that use `exports` in `package.json`.
  // A proper solution is to enable `unstable_enablePackageExports` but this needs careful testing.
@@ -1,6 +1,6 @@
 {
  "name": "bsky.app",
-  "version": "1.97.0",
+  "version": "1.96.0",
  "private": true,
  "engines": {
    "node": ">=20"
@@ -54,7 +54,7 @@
    "icons:optimize": "svgo -f ./assets/icons"
  },
  "dependencies": {
-    "@atproto/api": "^0.13.21",
+    "@atproto/api": "^0.13.18",
    "@braintree/sanitize-url": "^6.0.2",
    "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
    "@emoji-mart/react": "^1.1.1",
@@ -62,19 +62,19 @@
    "@expo/webpack-config": "^19.0.0",
    "@floating-ui/dom": "^1.6.3",
    "@floating-ui/react-dom": "^2.0.8",
-    "@formatjs/intl-locale": "^4.2.8",
-    "@formatjs/intl-numberformat": "^8.15.1",
-    "@formatjs/intl-pluralrules": "^5.4.1",
+    "@formatjs/intl-locale": "^4.0.0",
+    "@formatjs/intl-numberformat": "^8.10.3",
+    "@formatjs/intl-pluralrules": "^5.2.14",
    "@fortawesome/fontawesome-svg-core": "^6.1.1",
    "@fortawesome/free-regular-svg-icons": "^6.1.1",
    "@fortawesome/free-solid-svg-icons": "^6.1.1",
    "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@haileyok/bluesky-video": "0.2.6",
+    "@haileyok/bluesky-video": "0.2.4",
    "@ipld/dag-cbor": "^9.2.0",
    "@lingui/react": "^4.14.1",
    "@mattermost/react-native-paste-input": "^0.7.1",
    "@miblanchard/react-native-slider": "^2.3.1",
-    "@mozzius/expo-dynamic-app-icon": "^1.5.0",
+    "@mozzius/expo-dynamic-app-icon": "^1.4.1",
    "@radix-ui/react-dismissable-layer": "^1.1.1",
    "@radix-ui/react-dropdown-menu": "2.0.1",
    "@radix-ui/react-focus-guards": "^1.1.1",
@@ -118,7 +118,7 @@
    "emoji-mart": "^5.5.2",
    "emoji-regex": "^10.4.0",
    "eventemitter3": "^5.0.1",
-    "expo": "~52.0.19",
+    "expo": "~52.0.17",
    "expo-application": "^6.0.1",
    "expo-blur": "^14.0.1",
    "expo-build-properties": "^0.13.1",
@@ -126,7 +126,7 @@
    "expo-clipboard": "^7.0.0",
    "expo-dev-client": "^5.0.4",
    "expo-device": "~7.0.1",
-    "expo-file-system": "^18.0.6",
+    "expo-file-system": "^18.0.4",
    "expo-font": "~13.0.1",
    "expo-haptics": "^14.0.0",
    "expo-image": "~2.0.3",
@@ -137,14 +137,13 @@
    "expo-localization": "~16.0.0",
    "expo-media-library": "~17.0.3",
    "expo-navigation-bar": "~4.0.4",
-    "expo-notifications": "~0.29.11",
-    "expo-screen-orientation": "^8.0.2",
+    "expo-notifications": "~0.29.10",
    "expo-sharing": "^13.0.0",
-    "expo-splash-screen": "~0.29.18",
+    "expo-splash-screen": "~0.29.16",
    "expo-status-bar": "~2.0.0",
    "expo-system-ui": "^4.0.4",
    "expo-task-manager": "~12.0.3",
-    "expo-updates": "~0.26.10",
+    "expo-updates": "~0.26.9",
    "expo-web-browser": "~14.0.1",
    "fast-text-encoding": "^1.0.6",
    "history": "^5.3.0",
@@ -171,7 +170,7 @@
    "react-native": "0.76.3",
    "react-native-compressor": "1.10.3",
    "react-native-date-picker": "^5.0.7",
-    "react-native-drawer-layout": "^4.1.1",
+    "react-native-drawer-layout": "^4.0.4",
    "react-native-gesture-handler": "2.20.2",
    "react-native-get-random-values": "~1.11.0",
    "react-native-image-crop-picker": "^0.41.6",
@@ -182,7 +181,7 @@
    "react-native-picker-select": "^9.3.1",
    "react-native-progress": "bluesky-social/react-native-progress",
    "react-native-qrcode-styled": "^0.3.3",
-    "react-native-reanimated": "3.17.0-nightly-20241211-17e89ca24",
+    "react-native-reanimated": "^3.16.3",
    "react-native-root-siblings": "^4.1.1",
    "react-native-safe-area-context": "4.14.0",
    "react-native-screens": "~4.3.0",
@@ -206,12 +205,13 @@
    "zod": "^3.20.2"
  },
  "devDependencies": {
-    "@atproto/dev-env": "^0.3.67",
+    "@atproto/dev-env": "^0.3.64",
    "@babel/core": "^7.26.0",
    "@babel/preset-env": "^7.26.0",
    "@babel/runtime": "^7.26.0",
    "@did-plc/server": "^0.0.1",
    "@expo/config-plugins": "9.0.10",
+    "@expo/prebuild-config": "8.0.22",
    "@lingui/cli": "^4.14.1",
    "@lingui/macro": "^4.14.1",
    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
@@ -250,7 +250,6 @@
    "jest-expo": "^52.0.2",
    "jest-junit": "^16.0.0",
    "lint-staged": "^13.2.3",
-    "lockfile-lint": "^4.14.0",
    "metro-react-native-babel-preset": "^0.76.9",
    "prettier": "^2.8.3",
    "react-native-dotenv": "^3.4.11",
@@ -267,8 +266,8 @@
    "@react-native/normalize-colors": "0.76.1",
    "@radix-ui/react-focus-scope": "1.1.0",
    "@types/react": "^18",
-    "**/expo-constants": "17.0.3",
-    "**/expo-device": "7.0.1",
+    "**/expo-constants": "16.0.1",
+    "**/expo-device": "6.0.2",
    "**/zod": "3.23.8"
  },
  "jest": {
@@ -330,28 +329,5 @@
    "assets/icons/*.svg": [
      "svgo"
    ]
-  },
-  "lockfile-lint": {
-    "path": "yarn.lock",
-    "allowedHosts": [
-      "npm",
-      "yarn"
-    ],
-    "allowedSchemes": [
-      "https:"
-    ],
-    "allowedPackageNameAliases": [
-      "@babel/traverse--for-generate-function-map:@babel/traverse",
-      "string-width-cjs:string-width",
-      "strip-ansi-cjs:strip-ansi",
-      "wrap-ansi-cjs:wrap-ansi"
-    ],
-    "allowedUrls": [
-      "https://codeload.github.com/bluesky-social/react-native-bottom-sheet/tar.gz/28a87d1bb55e10fc355fa1455545a30734995908",
-      "https://codeload.github.com/bluesky-social/react-native-progress/tar.gz/5a372f4f2ce5feb26f4f47b6a4d187ab9b923ab4"
-    ],
-    "emptyHostname": false,
-    "validatePackageNames": true,
-    "validateIntegrity": true
  }
 }
@@ -1,157 +1,16 @@
 diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-index e916023..5049c33 100644
+index e916023..0564d97 100644
 --- a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
 +++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
-@@ -4,6 +4,7 @@
- //
- //  Created by Elias Nahum on 04-11-20.
- //  Copyright © 2020 Facebook. All rights reserved.
-+//  Updated to remove parent’s default text view
- //
- 
- #import "PasteInputView.h"
-@@ -12,49 +13,78 @@
- 
- @implementation PasteInputView
- {
-    PasteInputTextView *_backedTextInputView;
-+  // We'll store the custom text view in this ivar
-+  PasteInputTextView *_customBackedTextView;
- }
- 
- - (instancetype)initWithBridge:(RCTBridge *)bridge
- {
-+  // Must call the super’s designated initializer
-   if (self = [super initWithBridge:bridge]) {
-    _backedTextInputView = [[PasteInputTextView alloc] initWithFrame:self.bounds];
-    _backedTextInputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    _backedTextInputView.textInputDelegate = self;
-+    // 1. The parent (RCTMultilineTextInputView) has already created
-+    //    its own _backedTextInputView = [RCTUITextView new] in super init.
-+    //    We can remove that subview:
- 
-    [self addSubview:_backedTextInputView];
-  }
-+    id<RCTBackedTextInputViewProtocol> parentInputView = super.backedTextInputView;
-+    if ([parentInputView isKindOfClass:[UIView class]]) {
-+      UIView *parentSubview = (UIView *)parentInputView;
-+      if (parentSubview.superview == self) {
-+        [parentSubview removeFromSuperview];
-+      }
-+    }
- 
-+    // 2. Now create our custom PasteInputTextView
-+    _customBackedTextView = [[PasteInputTextView alloc] initWithFrame:self.bounds];
-+    _customBackedTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-+    _customBackedTextView.textInputDelegate = self;
-+
-+    // Optional: disable inline predictions for iOS 17+
+@@ -22,6 +22,11 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
+     _backedTextInputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+     _backedTextInputView.textInputDelegate = self;
+
+    // Disable inline predictions to prevent jank in the composer
 +    if (@available(iOS 17.0, *)) {
-+      _customBackedTextView.inlinePredictionType = UITextInlinePredictionTypeNo;
+      _backedTextInputView.inlinePredictionType = UITextInlinePredictionTypeNo;
 +    }
 +
-+    // 3. Add your custom text view as the only subview
-+    [self addSubview:_customBackedTextView];
-+  }
-   return self;
- }
- 
-+/**
-+ * Override the parent's accessor so that anywhere in RN that calls
-+ * `self.backedTextInputView` will get the custom PasteInputTextView.
-+ */
- - (id<RCTBackedTextInputViewProtocol>)backedTextInputView
- {
-  return _backedTextInputView;
-+  return _customBackedTextView;
- }
- 
-- (void)setDisableCopyPaste:(BOOL)disableCopyPaste {
-    _backedTextInputView.disableCopyPaste = disableCopyPaste;
-+#pragma mark - Setters for React Props
-+
-+- (void)setDisableCopyPaste:(BOOL)disableCopyPaste
-+{
-+  _customBackedTextView.disableCopyPaste = disableCopyPaste;
- }
- 
-- (void)setOnPaste:(RCTDirectEventBlock)onPaste {
-    _backedTextInputView.onPaste = onPaste;
-+- (void)setOnPaste:(RCTDirectEventBlock)onPaste
-+{
-+  _customBackedTextView.onPaste = onPaste;
- }
- 
-- (void)setSmartPunctuation:(NSString *)smartPunctuation {
-    if ([smartPunctuation isEqualToString:@"enable"]) {
-        [_backedTextInputView setSmartDashesType:UITextSmartDashesTypeYes];
-        [_backedTextInputView setSmartQuotesType:UITextSmartQuotesTypeYes];
-        [_backedTextInputView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeYes];
-    } else if ([smartPunctuation isEqualToString:@"disable"]) {
-        [_backedTextInputView setSmartDashesType:UITextSmartDashesTypeNo];
-        [_backedTextInputView setSmartQuotesType:UITextSmartQuotesTypeNo];
-        [_backedTextInputView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeNo];
-    } else {
-        [_backedTextInputView setSmartDashesType:UITextSmartDashesTypeDefault];
-        [_backedTextInputView setSmartQuotesType:UITextSmartQuotesTypeDefault];
-        [_backedTextInputView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeDefault];
-    }
-+- (void)setSmartPunctuation:(NSString *)smartPunctuation
-+{
-+  if ([smartPunctuation isEqualToString:@"enable"]) {
-+    [_customBackedTextView setSmartDashesType:UITextSmartDashesTypeYes];
-+    [_customBackedTextView setSmartQuotesType:UITextSmartQuotesTypeYes];
-+    [_customBackedTextView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeYes];
-+  } else if ([smartPunctuation isEqualToString:@"disable"]) {
-+    [_customBackedTextView setSmartDashesType:UITextSmartDashesTypeNo];
-+    [_customBackedTextView setSmartQuotesType:UITextSmartQuotesTypeNo];
-+    [_customBackedTextView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeNo];
-+  } else {
-+    [_customBackedTextView setSmartDashesType:UITextSmartDashesTypeDefault];
-+    [_customBackedTextView setSmartQuotesType:UITextSmartQuotesTypeDefault];
-+    [_customBackedTextView setSmartInsertDeleteType:UITextSmartInsertDeleteTypeDefault];
-+  }
- }
- 
- #pragma mark - UIScrollViewDelegate
-@@ -62,7 +92,6 @@
- - (void)scrollViewDidScroll:(UIScrollView *)scrollView
- {
-   RCTDirectEventBlock onScroll = self.onScroll;
-
-   if (onScroll) {
-     CGPoint contentOffset = scrollView.contentOffset;
-     CGSize contentSize = scrollView.contentSize;
-@@ -71,22 +100,22 @@
- 
-     onScroll(@{
-       @"contentOffset": @{
-        @"x": @(contentOffset.x),
-        @"y": @(contentOffset.y)
-+          @"x": @(contentOffset.x),
-+          @"y": @(contentOffset.y)
-       },
-       @"contentInset": @{
-        @"top": @(contentInset.top),
-        @"left": @(contentInset.left),
-        @"bottom": @(contentInset.bottom),
-        @"right": @(contentInset.right)
-+          @"top": @(contentInset.top),
-+          @"left": @(contentInset.left),
-+          @"bottom": @(contentInset.bottom),
-+          @"right": @(contentInset.right)
-       },
-       @"contentSize": @{
-        @"width": @(contentSize.width),
-        @"height": @(contentSize.height)
-+          @"width": @(contentSize.width),
-+          @"height": @(contentSize.height)
-       },
-       @"layoutMeasurement": @{
-        @"width": @(size.width),
-        @"height": @(size.height)
-+          @"width": @(size.width),
-+          @"height": @(size.height)
-       },
-       @"zoomScale": @(scrollView.zoomScale ?: 1),
-     });
+     [self addSubview:_backedTextInputView];
+   }
+
@@ -1,101 +0,0 @@
-diff --git a/node_modules/expo-image-manipulator/src/ImageManipulator.web.ts b/node_modules/expo-image-manipulator/src/ImageManipulator.web.ts
-new file mode 100644
-index 0000000..babbb3b
--- /dev/null
-+++ b/node_modules/expo-image-manipulator/src/ImageManipulator.web.ts
-@@ -0,0 +1,60 @@
-+import { useReleasingSharedObject } from 'expo-modules-core';
-+import { SharedRef } from 'expo-modules-core/types';
-+
-+import { Action, ImageResult, SaveFormat, SaveOptions } from './ImageManipulator.types';
-+import { ImageManipulatorContext } from './ImageManipulatorContext';
-+import ExpoImageManipulator from './NativeImageManipulatorModule';
-+import { validateArguments } from './validators';
-+
-+// @needsAudit
-+/**
-+ * Manipulate the image provided via `uri`. Available modifications are rotating, flipping (mirroring),
-+ * resizing and cropping. Each invocation results in a new file. With one invocation you can provide
-+ * a set of actions to perform over the image. Overwriting the source file would not have an effect
-+ * in displaying the result as images are cached.
-+ * @param uri URI of the file to manipulate. Should be on the local file system or a base64 data URI.
-+ * @param actions An array of objects representing manipulation options. Each object should have
-+ * __only one__ of the keys that corresponds to specific transformation.
-+ * @param saveOptions A map defining how modified image should be saved.
-+ * @return Promise which fulfils with [`ImageResult`](#imageresult) object.
-+ * @deprecated It has been replaced by the new, contextual and object-oriented API.
-+ * Use [`ImageManipulator.manipulate`](#manipulateuri) or [`useImageManipulator`](#useimagemanipulatoruri) instead.
-+ */
-+export async function manipulateAsync(
-+  uri: string,
-+  actions: Action[] = [],
-+  saveOptions: SaveOptions = {}
-+): Promise<ImageResult> {
-+  validateArguments(uri, actions, saveOptions);
-+
-+  const { format = SaveFormat.JPEG, ...rest } = saveOptions;
-+  const context = ExpoImageManipulator.manipulate(uri);
-+
-+  for (const action of actions) {
-+    if ('resize' in action) {
-+      context.resize(action.resize);
-+    } else if ('rotate' in action) {
-+      context.rotate(action.rotate);
-+    } else if ('flip' in action) {
-+      context.flip(action.flip);
-+    } else if ('crop' in action) {
-+      context.crop(action.crop);
-+    } else if ('extent' in action && context.extent) {
-+      context.extent(action.extent);
-+    }
-+  }
-+  const image = await context.renderAsync(saveOptions.compress);
-+  const result = await image.saveAsync({ format, ...rest });
-+
-+  // These shared objects will not be used anymore, so free up some memory.
-+  context.release();
-+  image.release();
-+
-+  return result;
-+}
-+
-+export function useImageManipulator(source: string | SharedRef<'image'>): ImageManipulatorContext {
-+  return useReleasingSharedObject(() => ExpoImageManipulator.manipulate(source), [source]);
-+}
-+
-+export { ExpoImageManipulator as ImageManipulator };
-diff --git a/node_modules/expo-image-manipulator/src/ImageManipulatorContext.ts b/node_modules/expo-image-manipulator/src/ImageManipulatorContext.ts
-index 120d8d3..f8aa49c 100644
--- a/node_modules/expo-image-manipulator/src/ImageManipulatorContext.ts
-+++ b/node_modules/expo-image-manipulator/src/ImageManipulatorContext.ts
-@@ -52,7 +52,7 @@ export declare class ImageManipulatorContext extends SharedObject {
-   /**
-    * Awaits for all manipulation tasks to finish and resolves with a reference to the resulted native image.
-    */
-  renderAsync(): Promise<ImageRef>;
-+  renderAsync(compress?: number): Promise<ImageRef>;
- }
- 
- export default ExpoImageManipulator.Context as typeof ImageManipulatorContext;
-diff --git a/node_modules/expo-image-manipulator/src/web/ImageManipulatorContext.web.ts b/node_modules/expo-image-manipulator/src/web/ImageManipulatorContext.web.ts
-index 428848c..363a57a 100644
--- a/node_modules/expo-image-manipulator/src/web/ImageManipulatorContext.web.ts
-+++ b/node_modules/expo-image-manipulator/src/web/ImageManipulatorContext.web.ts
-@@ -41,7 +41,7 @@ export default class ImageManipulatorContext extends SharedObject {
-     return this;
-   }
- 
-  async renderAsync(): Promise<ImageManipulatorImageRef> {
-+  async renderAsync(compress?: number): Promise<ImageManipulatorImageRef> {
-     const canvas = await this.currentTask;
- 
-     return new Promise((resolve) => {
-@@ -49,7 +49,7 @@ export default class ImageManipulatorContext extends SharedObject {
-         const url = blob ? URL.createObjectURL(blob) : canvas.toDataURL();
- 
-         resolve(new ImageManipulatorImageRef(url, canvas.width, canvas.height));
-      });
-+      }, typeof compress === 'number' ? 'image/jpeg' : undefined, compress);
-     });
-   }
- 
@@ -1,19 +0,0 @@
-diff --git a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
-index b928b8f..7175cf6 100644
--- a/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
-+++ b/node_modules/expo-media-library/android/src/main/java/expo/modules/medialibrary/MediaLibraryModule.kt
-@@ -99,12 +99,12 @@ class MediaLibraryModule : Module() {
-     }
- 
-     AsyncFunction("createAssetAsync") { localUri: String, promise: Promise ->
-      throwUnlessPermissionsGranted {
-+      //throwUnlessPermissionsGranted {
-         withModuleScope(promise) {
-           CreateAsset(context, localUri, promise)
-             .execute()
-         }
-      }
-+      //}
-     }
- 
-     AsyncFunction("addAssetsToAlbumAsync") { assetsId: List<String>, albumId: String, copyToAlbum: Boolean, promise: Promise ->
@@ -1,3 +0,0 @@
-## expo-modules-core Patch
-
-This patch fixes an issue where bitdrift's API stream gets blocked by the Expo interceptor used to power the devtools
@@ -1,15 +0,0 @@
-diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt
-index 47c4d15..afe138d 100644
--- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt
-+++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt
-@@ -125,6 +125,10 @@ internal fun peekResponseBody(
- }
- 
- internal fun shouldParseBody(response: Response): Boolean {
-+  if (response.request.url.encodedPath == "/bitdrift_public.protobuf.client.v1.ApiService/Mux") {
-+    return false
-+  }
-+
-   // Check for Content-Type
-   val skipContentTypes = listOf(
-     "text/event-stream", // Server Sent Events
@@ -222,7 +222,7 @@ index 40aaf9c..1c60164 100644
 {
   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
 diff --git a/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m b/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
-index e9ce48c..84a6fca 100644
+index e9ce48c..ccd9ad6 100644
 --- a/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
 +++ b/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
@@ -159,26 +159,8 @@ - (BOOL)touchesShouldCancelInContentView:(__unused UIView *)view
@@ -329,38 +329,3 @@ index e9ce48c..84a6fca 100644
   }
 }
 
-@@ -1055,6 +1082,22 @@ -(type)getter                                           \
- RCT_SET_AND_PRESERVE_OFFSET(setShowsVerticalScrollIndicator, showsVerticalScrollIndicator, BOOL)
- RCT_SET_AND_PRESERVE_OFFSET(setZoomScale, zoomScale, CGFloat);
- 
-+- (void)setScrollIndicatorInsets:(UIEdgeInsets)value
-+{
-+  [_scrollView setScrollIndicatorInsets:value];
-+}
-+
-+- (UIEdgeInsets)scrollIndicatorInsets
-+{
-+  UIEdgeInsets verticalScrollIndicatorInsets = [_scrollView verticalScrollIndicatorInsets];
-+  UIEdgeInsets horizontalScrollIndicatorInsets = [_scrollView horizontalScrollIndicatorInsets];
-+  return UIEdgeInsetsMake(
-+      verticalScrollIndicatorInsets.top,
-+      horizontalScrollIndicatorInsets.left,
-+      verticalScrollIndicatorInsets.bottom,
-+      horizontalScrollIndicatorInsets.right);
-+}
-+
- - (void)setAutomaticallyAdjustsScrollIndicatorInsets:(BOOL)automaticallyAdjusts API_AVAILABLE(ios(13.0))
- {
-   // `automaticallyAdjustsScrollIndicatorInsets` is available since iOS 13.
-diff --git a/node_modules/react-native/React/Views/ScrollView/RCTScrollViewManager.m b/node_modules/react-native/React/Views/ScrollView/RCTScrollViewManager.m
-index cd1e7eb..c1d0172 100644
--- a/node_modules/react-native/React/Views/ScrollView/RCTScrollViewManager.m
-+++ b/node_modules/react-native/React/Views/ScrollView/RCTScrollViewManager.m
-@@ -83,6 +83,7 @@ - (UIView *)view
- RCT_EXPORT_VIEW_PROPERTY(scrollEventThrottle, NSTimeInterval)
- RCT_EXPORT_VIEW_PROPERTY(zoomScale, CGFloat)
- RCT_EXPORT_VIEW_PROPERTY(contentInset, UIEdgeInsets)
-+RCT_EXPORT_VIEW_PROPERTY(scrollIndicatorInsets, UIEdgeInsets)
- RCT_EXPORT_VIEW_PROPERTY(verticalScrollIndicatorInsets, UIEdgeInsets)
- RCT_EXPORT_VIEW_PROPERTY(scrollToOverflowEnabled, BOOL)
- RCT_EXPORT_VIEW_PROPERTY(snapToInterval, int)
@@ -1,36 +0,0 @@
-diff --git a/node_modules/react-native-gesture-handler/apple/RNGestureHandler.mm b/node_modules/react-native-gesture-handler/apple/RNGestureHandler.mm
-index 43d11b4..5bf0d32 100644
--- a/node_modules/react-native-gesture-handler/apple/RNGestureHandler.mm
-+++ b/node_modules/react-native-gesture-handler/apple/RNGestureHandler.mm
-@@ -461,16 +461,23 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
- - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
-     shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
- {
-  if ([_handlersToWaitFor count]) {
-    RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
-    if (handler != nil) {
-      for (NSNumber *handlerTag in _handlersToWaitFor) {
-        if ([handler.tag isEqual:handlerTag]) {
-          return YES;
-        }
-      }
-+  RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
-+  if (handler == nil) {
-+    return NO;
-+  }
-+
-+  for (NSNumber *handlerTag in _handlersToWaitFor) {
-+    if ([handler.tag isEqual:handlerTag]) {
-+      return YES;
-     }
-   }
-+
-+  for (NSNumber *handlerTag in handler->_handlersThatShouldWait) {
-+    if ([_tag isEqual:handlerTag]) {
-+      return YES;
-+    }
-+  }
-+
-   return NO;
- }
- 
@@ -1,47 +0,0 @@
-diff --git a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
-index 391f303..8e2c3db 100644
--- a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
-+++ b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
-@@ -24,7 +24,7 @@
- 
-         <activity
-             android:name="com.yalantis.ucrop.UCropActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-+            android:theme="@style/Theme.UCropNoEdgeToEdge" />
-     </application>
- 
- </manifest>
-diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
-new file mode 100644
-index 0000000..396d5a8
--- /dev/null
-+++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
-@@ -0,0 +1,5 @@
-+<resources>
-+    <style name="Theme.UCropNoEdgeToEdge" parent="Theme.AppCompat.Light.NoActionBar">
-+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
-+    </style>
-+</resources>
-diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
-new file mode 100644
-index 0000000..50129b6
--- /dev/null
-+++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
-@@ -0,0 +1,3 @@
-+<resources>
-+    <style name="Theme.UCropNoEdgeToEdge" parent="Theme.AppCompat.Light.NoActionBar"/>
-+</resources>
-diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
-index 9f20973..68d4766 100644
--- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
-+++ b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
-@@ -126,7 +126,8 @@ - (void) setConfiguration:(NSDictionary *)options
- 
- - (UIViewController*) getRootVC {
-     UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
-    while (root.presentedViewController != nil) {
-+    while (root.presentedViewController != nil &&
-+           !root.presentedViewController.isBeingDismissed) {
-         root = root.presentedViewController;
-     }
-     
@@ -1,20 +0,0 @@
-const {withProjectBuildGradle} = require('@expo/config-plugins')
-
-const jitpackRepository = "maven { url 'https://www.jitpack.io' }"
-
-module.exports = function withAndroidNoJitpackPlugin(config) {
-  return withProjectBuildGradle(config, config => {
-    if (!config.modResults.contents.includes(jitpackRepository)) {
-      throw Error(
-        'Expected to find the jitpack string in the config. ' +
-          'You MUST verify whether it was actually removed upstream, ' +
-          'or if the format has changed and this plugin no longer recognizes it.',
-      )
-    }
-    config.modResults.contents = config.modResults.contents.replaceAll(
-      jitpackRepository,
-      '',
-    )
-    return config
-  })
-}
@@ -1,119 +1,232 @@
-import {useState} from 'react'
-import {ScrollView, Text, View} from 'react-native'
+import 'react-native-url-polyfill/auto'
+import '#/lib/sentry' // must be near top
+import '#/view/icons'
+
+import React, {useEffect, useState} from 'react'
+import {GestureHandlerRootView} from 'react-native-gesture-handler'
+import {RootSiblingParent} from 'react-native-root-siblings'
 import {
-  Gesture,
-  GestureDetector,
-  GestureHandlerRootView,
-} from 'react-native-gesture-handler'
-import PagerView from 'react-native-pager-view'
-import Animated, {
-  useAnimatedStyle,
-  useSharedValue,
-} from 'react-native-reanimated'
+  initialWindowMetrics,
+  SafeAreaProvider,
+} from 'react-native-safe-area-context'
+import * as SplashScreen from 'expo-splash-screen'
+import * as SystemUI from 'expo-system-ui'
+import {msg} from '@lingui/macro'
+import {useLingui} from '@lingui/react'

-export default function App() {
-  const val = useSharedValue(0)
-  const [swipeEnabled, setSwipeEnabled] = useState(true)
+import {KeyboardControllerProvider} from '#/lib/hooks/useEnableKeyboardController'
+import {QueryProvider} from '#/lib/react-query'
+import {
+  initialize,
+  Provider as StatsigProvider,
+  tryFetchGates,
+} from '#/lib/statsig/statsig'
+import {s} from '#/lib/styles'
+import {ThemeProvider} from '#/lib/ThemeContext'
+import I18nProvider from '#/locale/i18nProvider'
+import {logger} from '#/logger'
+import {isIOS} from '#/platform/detection'
+import {Provider as A11yProvider} from '#/state/a11y'
+import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
+import {Provider as DialogStateProvider} from '#/state/dialogs'
+import {listenSessionDropped} from '#/state/events'
+import {
+  beginResolveGeolocation,
+  ensureGeolocationResolved,
+  Provider as GeolocationProvider,
+} from '#/state/geolocation'
+import {Provider as InvitesStateProvider} from '#/state/invites'
+import {Provider as LightboxStateProvider} from '#/state/lightbox'
+import {MessagesProvider} from '#/state/messages'
+import {Provider as ModalStateProvider} from '#/state/modals'
+import {init as initPersistedState} from '#/state/persisted'
+import {Provider as PrefsStateProvider} from '#/state/preferences'
+import {Provider as LabelDefsProvider} from '#/state/preferences/label-defs'
+import {Provider as ModerationOptsProvider} from '#/state/preferences/moderation-opts'
+import {Provider as UnreadNotifsProvider} from '#/state/queries/notifications/unread'
+import {
+  Provider as SessionProvider,
+  SessionAccount,
+  useSession,
+  useSessionApi,
+} from '#/state/session'
+import {readLastActiveAccount} from '#/state/session/util'
+import {Provider as ShellStateProvider} from '#/state/shell'
+import {Provider as ComposerProvider} from '#/state/shell/composer'
+import {Provider as LoggedOutViewProvider} from '#/state/shell/logged-out'
+import {Provider as ProgressGuideProvider} from '#/state/shell/progress-guide'
+import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
+import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
+import {Provider as HiddenRepliesProvider} from '#/state/threadgate-hidden-replies'
+import {TestCtrls} from '#/view/com/testing/TestCtrls'
+import {Provider as VideoVolumeProvider} from '#/view/com/util/post-embeds/VideoVolumeContext'
+import * as Toast from '#/view/com/util/Toast'
+import {Shell} from '#/view/shell'
+import {ThemeProvider as Alf} from '#/alf'
+import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
+import {NuxDialogs} from '#/components/dialogs/nuxs'
+import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
+import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
+import {Provider as PortalProvider} from '#/components/Portal'
+import {AppProfiler} from '#/AppProfiler'
+import {Splash} from '#/Splash'
+import {BottomSheetProvider} from '../modules/bottom-sheet'
+import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'

-  let pan = Gesture.Pan()
-    .onBegin(() => {
-      'worklet'
-      console.log('begin')
-      val.set(0)
-    })
-    .onUpdate(e => {
-      'worklet'
-      console.log('update')
-      val.set(e.translationX)
-    })
-    .onEnd(() => {
-      'worklet'
-      console.log('end')
-      val.set(0)
-    })
-    .onFinalize(() => {
-      'worklet'
-      console.log('finalize')
-      val.set(0)
-    })
+SplashScreen.preventAutoHideAsync()
+if (isIOS) {
+  SystemUI.setBackgroundColorAsync('black')
+}

-  if (swipeEnabled) {
-    pan = pan.failOffsetX(-1).activeOffsetX(5)
-  } else {
-    pan = pan.failOffsetX([0, 0]).failOffsetY([0, 0])
+/**
+ * Begin geolocation ASAP
+ */
+beginResolveGeolocation()
+
+function InnerApp() {
+  const [isReady, setIsReady] = React.useState(false)
+  const {currentAccount} = useSession()
+  const {resumeSession} = useSessionApi()
+  const theme = useColorModeTheme()
+  const {_} = useLingui()
+
+  const hasCheckedReferrer = useStarterPackEntry()
+
+  // init
+  useEffect(() => {
+    async function onLaunch(account?: SessionAccount) {
+      try {
+        if (account) {
+          await resumeSession(account)
+        } else {
+          await initialize()
+          await tryFetchGates(undefined, 'prefer-fresh-gates')
+        }
+      } catch (e) {
+        logger.error(`session: resume failed`, {message: e})
+      } finally {
+        setIsReady(true)
+      }
+    }
+    const account = readLastActiveAccount()
+    onLaunch(account)
+  }, [resumeSession])
+
+  useEffect(() => {
+    return listenSessionDropped(() => {
+      Toast.show(
+        _(msg`Sorry! Your session expired. Please log in again.`),
+        'info',
+      )
+    })
+  }, [_])
+
+  return (
+    <Alf theme={theme}>
+      <ThemeProvider theme={theme}>
+        <Splash isReady={isReady && hasCheckedReferrer}>
+          <RootSiblingParent>
+            <VideoVolumeProvider>
+              <React.Fragment
+                // Resets the entire tree below when it changes:
+                key={currentAccount?.did}>
+                <QueryProvider currentDid={currentAccount?.did}>
+                  <ComposerProvider>
+                    <StatsigProvider>
+                      <MessagesProvider>
+                        {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
+                        <LabelDefsProvider>
+                          <ModerationOptsProvider>
+                            <LoggedOutViewProvider>
+                              <SelectedFeedProvider>
+                                <HiddenRepliesProvider>
+                                  <UnreadNotifsProvider>
+                                    <BackgroundNotificationPreferencesProvider>
+                                      <MutedThreadsProvider>
+                                        <ProgressGuideProvider>
+                                          <GestureHandlerRootView
+                                            style={s.h100pct}>
+                                            <TestCtrls />
+                                            <Shell />
+                                            <NuxDialogs />
+                                          </GestureHandlerRootView>
+                                        </ProgressGuideProvider>
+                                      </MutedThreadsProvider>
+                                    </BackgroundNotificationPreferencesProvider>
+                                  </UnreadNotifsProvider>
+                                </HiddenRepliesProvider>
+                              </SelectedFeedProvider>
+                            </LoggedOutViewProvider>
+                          </ModerationOptsProvider>
+                        </LabelDefsProvider>
+                      </MessagesProvider>
+                    </StatsigProvider>
+                  </ComposerProvider>
+                </QueryProvider>
+              </React.Fragment>
+            </VideoVolumeProvider>
+          </RootSiblingParent>
+        </Splash>
+      </ThemeProvider>
+    </Alf>
+  )
+}
+
+function App() {
+  const [isReady, setReady] = useState(false)
+
+  React.useEffect(() => {
+    Promise.all([initPersistedState(), ensureGeolocationResolved()]).then(() =>
+      setReady(true),
+    )
+  }, [])
+
+  if (!isReady) {
+    return null
  }

-  const style = useAnimatedStyle(() => {
-    return {
-      flex: 1,
-      transform: [
-        {
-          translateX: val.value,
-        },
-      ],
-    }
-  })
+  /*
+   * NOTE: only nothing here can depend on other data or session state, since
+   * that is set up in the InnerApp component above.
+   */
  return (
-    <GestureHandlerRootView>
-      <GestureDetector gesture={pan}>
-        <Animated.View style={style}>
-          <Pager pan={pan} setSwipeEnabled={setSwipeEnabled}>
-            <InnerScrollView pan={pan} />
-          </Pager>
-        </Animated.View>
-      </GestureDetector>
-    </GestureHandlerRootView>
+    <AppProfiler>
+      <GeolocationProvider>
+        <A11yProvider>
+          <KeyboardControllerProvider>
+            <SessionProvider>
+              <PrefsStateProvider>
+                <I18nProvider>
+                  <ShellStateProvider>
+                    <InvitesStateProvider>
+                      <ModalStateProvider>
+                        <DialogStateProvider>
+                          <LightboxStateProvider>
+                            <PortalProvider>
+                              <BottomSheetProvider>
+                                <StarterPackProvider>
+                                  <SafeAreaProvider
+                                    initialMetrics={initialWindowMetrics}>
+                                    <IntentDialogProvider>
+                                      <InnerApp />
+                                    </IntentDialogProvider>
+                                  </SafeAreaProvider>
+                                </StarterPackProvider>
+                              </BottomSheetProvider>
+                            </PortalProvider>
+                          </LightboxStateProvider>
+                        </DialogStateProvider>
+                      </ModalStateProvider>
+                    </InvitesStateProvider>
+                  </ShellStateProvider>
+                </I18nProvider>
+              </PrefsStateProvider>
+            </SessionProvider>
+          </KeyboardControllerProvider>
+        </A11yProvider>
+      </GeolocationProvider>
+    </AppProfiler>
  )
 }

-function Pager({children, pan, setSwipeEnabled}) {
-  const native = Gesture.Native().requireExternalGestureToFail(pan)
-  return (
-    <GestureDetector gesture={native}>
-      <PagerView
-        overdrag={true}
-        initialPage={0}
-        style={{
-          flex: 1,
-          backgroundColor: 'green',
-        }}
-        onPageSelected={e => {
-          setSwipeEnabled(e.nativeEvent.position === 0)
-        }}>
-        {children}
-        {children}
-        {children}
-      </PagerView>
-    </GestureDetector>
-  )
-}
-
-function InnerScrollView({pan}) {
-  const native = Gesture.Native().blocksExternalGesture(pan)
-  return (
-    <View
-      style={{
-        paddingTop: 200,
-        alignItems: 'center',
-      }}>
-      <GestureDetector gesture={native}>
-        <ScrollView
-          horizontal
-          pagingEnabled
-          style={{
-            width: 300,
-            backgroundColor: 'yellow',
-            height: 200,
-          }}>
-          <Text
-            style={{
-              width: 1000,
-            }}>
-            1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
-            27 28 29 30 31 32 33 34 35 36 37 38 39 40
-          </Text>
-        </ScrollView>
-      </GestureDetector>
-    </View>
-  )
-}
+export default App
@@ -22,7 +22,6 @@ import {
  ensureGeolocationResolved,
  Provider as GeolocationProvider,
 } from '#/state/geolocation'
-import {Provider as HomeBadgeProvider} from '#/state/home-badge'
 import {Provider as InvitesStateProvider} from '#/state/invites'
 import {Provider as LightboxStateProvider} from '#/state/lightbox'
 import {MessagesProvider} from '#/state/messages'
@@ -41,13 +40,11 @@ import {
 import {readLastActiveAccount} from '#/state/session/util'
 import {Provider as ShellStateProvider} from '#/state/shell'
 import {Provider as ComposerProvider} from '#/state/shell/composer'
-import {Provider as LightStatusBarProvider} from '#/state/shell/light-status-bar'
 import {Provider as LoggedOutViewProvider} from '#/state/shell/logged-out'
 import {Provider as ProgressGuideProvider} from '#/state/shell/progress-guide'
 import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
 import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
 import {Provider as HiddenRepliesProvider} from '#/state/threadgate-hidden-replies'
-import {Provider as TrendingConfigProvider} from '#/state/trending-config'
 import {Provider as ActiveVideoProvider} from '#/view/com/util/post-embeds/ActiveVideoWebContext'
 import {Provider as VideoVolumeProvider} from '#/view/com/util/post-embeds/VideoVolumeContext'
 import * as Toast from '#/view/com/util/Toast'
@@ -122,24 +119,18 @@ function InnerApp() {
                            <LoggedOutViewProvider>
                              <SelectedFeedProvider>
                                <HiddenRepliesProvider>
-                                  <HomeBadgeProvider>
-                                    <UnreadNotifsProvider>
-                                      <BackgroundNotificationPreferencesProvider>
-                                        <MutedThreadsProvider>
-                                          <SafeAreaProvider>
-                                            <ProgressGuideProvider>
-                                              <TrendingConfigProvider>
-                                                <IntentDialogProvider>
-                                                  <Shell />
-                                                  <NuxDialogs />
-                                                </IntentDialogProvider>
-                                              </TrendingConfigProvider>
-                                            </ProgressGuideProvider>
-                                          </SafeAreaProvider>
-                                        </MutedThreadsProvider>
-                                      </BackgroundNotificationPreferencesProvider>
-                                    </UnreadNotifsProvider>
-                                  </HomeBadgeProvider>
+                                  <UnreadNotifsProvider>
+                                    <BackgroundNotificationPreferencesProvider>
+                                      <MutedThreadsProvider>
+                                        <SafeAreaProvider>
+                                          <ProgressGuideProvider>
+                                            <Shell />
+                                            <NuxDialogs />
+                                          </ProgressGuideProvider>
+                                        </SafeAreaProvider>
+                                      </MutedThreadsProvider>
+                                    </BackgroundNotificationPreferencesProvider>
+                                  </UnreadNotifsProvider>
                                </HiddenRepliesProvider>
                              </SelectedFeedProvider>
                            </LoggedOutViewProvider>
@@ -189,9 +180,9 @@ function App() {
                      <LightboxStateProvider>
                        <PortalProvider>
                          <StarterPackProvider>
-                            <LightStatusBarProvider>
+                            <IntentDialogProvider>
                              <InnerApp />
-                            </LightStatusBarProvider>
+                            </IntentDialogProvider>
                          </StarterPackProvider>
                        </PortalProvider>
                      </LightboxStateProvider>
@@ -0,0 +1,29 @@
+import React, {Profiler} from 'react'
+
+// Don't let it get stripped out in profiling builds (which apply production Babel preset).
+const log = (global as any)['con' + 'sole'].log
+
+function onRender(id: string, phase: string, actualDuration: number) {
+  if (!__DEV__) {
+    // This block of code will exist in the production build of the app.
+    // However, only profiling builds of React call `onRender` so it's dead code in actual production.
+    const message = `<Profiler> ${id}:${phase} ${
+      actualDuration > 500
+        ? '(╯°□°）╯ '
+        : actualDuration > 100
+        ? '[!!] '
+        : actualDuration > 16
+        ? '[!] '
+        : ''
+    }${Math.round(actualDuration)}ms`
+    log(message)
+  }
+}
+
+export function AppProfiler({children}: {children: React.ReactNode}) {
+  return (
+    <Profiler id="app" onRender={onRender}>
+      {children}
+    </Profiler>
+  )
+}
@@ -55,7 +55,10 @@ import {NotificationsScreen} from '#/view/screens/Notifications'
 import {PostThreadScreen} from '#/view/screens/PostThread'
 import {PrivacyPolicyScreen} from '#/view/screens/PrivacyPolicy'
 import {ProfileScreen} from '#/view/screens/Profile'
+import {ProfileFeedScreen} from '#/view/screens/ProfileFeed'
 import {ProfileFeedLikedByScreen} from '#/view/screens/ProfileFeedLikedBy'
+import {ProfileFollowersScreen} from '#/view/screens/ProfileFollowers'
+import {ProfileFollowsScreen} from '#/view/screens/ProfileFollows'
 import {ProfileListScreen} from '#/view/screens/ProfileList'
 import {SavedFeeds} from '#/view/screens/SavedFeeds'
 import {SearchScreen} from '#/view/screens/Search'
@@ -74,9 +77,6 @@ import {PostLikedByScreen} from '#/screens/Post/PostLikedBy'
 import {PostQuotesScreen} from '#/screens/Post/PostQuotes'
 import {PostRepostedByScreen} from '#/screens/Post/PostRepostedBy'
 import {ProfileKnownFollowersScreen} from '#/screens/Profile/KnownFollowers'
-import {ProfileFeedScreen} from '#/screens/Profile/ProfileFeed'
-import {ProfileFollowersScreen} from '#/screens/Profile/ProfileFollowers'
-import {ProfileFollowsScreen} from '#/screens/Profile/ProfileFollows'
 import {ProfileLabelerLikedByScreen} from '#/screens/Profile/ProfileLabelerLikedBy'
 import {AppearanceSettingsScreen} from '#/screens/Settings/AppearanceSettings'
 import {AppIconSettingsScreen} from '#/screens/Settings/AppIconSettings'
@@ -100,7 +100,6 @@ import {LanguageSettingsScreen} from './screens/Settings/LanguageSettings'
 import {PrivacyAndSecuritySettingsScreen} from './screens/Settings/PrivacyAndSecuritySettings'
 import {SettingsScreen} from './screens/Settings/Settings'
 import {ThreadPreferencesScreen} from './screens/Settings/ThreadPreferences'
-import TopicScreen from './screens/Topic'

 const navigationRef = createNavigationContainerRef<AllNavigatorParams>()

@@ -377,11 +376,6 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
        getComponent={() => HashtagScreen}
        options={{title: title(msg`Hashtag`)}}
      />
-      <Stack.Screen
-        name="Topic"
-        getComponent={() => TopicScreen}
-        options={{title: title(msg`Topic`)}}
-      />
      <Stack.Screen
        name="MessagesConversation"
        getComponent={() => MessagesConversationScreen}
@@ -158,9 +158,6 @@ export const atoms = {
  flex_wrap: {
    flexWrap: 'wrap',
  },
-  flex_nowrap: {
-    flexWrap: 'nowrap',
-  },
  flex_0: {
    flex: web('0 0 auto') || (native(0) as number),
  },
@@ -305,18 +302,6 @@ export const atoms = {
  border_0: {
    borderWidth: 0,
  },
-  border_t_0: {
-    borderTopWidth: 0,
-  },
-  border_b_0: {
-    borderBottomWidth: 0,
-  },
-  border_l_0: {
-    borderLeftWidth: 0,
-  },
-  border_r_0: {
-    borderRightWidth: 0,
-  },
  border: {
    borderWidth: StyleSheet.hairlineWidth,
  },
@@ -1,28 +0,0 @@
-import {useMemo} from 'react'
-import {useMediaQuery} from 'react-responsive'
-
-export type Breakpoint = 'gtPhone' | 'gtMobile' | 'gtTablet'
-
-export function useBreakpoints(): Record<Breakpoint, boolean> & {
-  activeBreakpoint: Breakpoint | undefined
-} {
-  const gtPhone = useMediaQuery({minWidth: 500})
-  const gtMobile = useMediaQuery({minWidth: 800})
-  const gtTablet = useMediaQuery({minWidth: 1300})
-  return useMemo(() => {
-    let active: Breakpoint | undefined
-    if (gtTablet) {
-      active = 'gtTablet'
-    } else if (gtMobile) {
-      active = 'gtMobile'
-    } else if (gtPhone) {
-      active = 'gtPhone'
-    }
-    return {
-      activeBreakpoint: active,
-      gtPhone,
-      gtMobile,
-      gtTablet,
-    }
-  }, [gtPhone, gtMobile, gtTablet])
-}
@@ -1,4 +1,5 @@
 import React from 'react'
+import {useMediaQuery} from 'react-responsive'

 import {
  computeFontScaleMultiplier,
@@ -13,14 +14,13 @@ import {BLUE_HUE, GREEN_HUE, RED_HUE} from '#/alf/util/colorGeneration'
 import {Device} from '#/storage'

 export {atoms} from '#/alf/atoms'
-export * from '#/alf/breakpoints'
 export * from '#/alf/fonts'
 export * as tokens from '#/alf/tokens'
 export * from '#/alf/types'
 export * from '#/alf/util/flatten'
 export * from '#/alf/util/platform'
 export * from '#/alf/util/themeSelector'
-export * from '#/alf/util/useGutters'
+export * from '#/alf/util/useGutterStyles'

 export type Alf = {
  themeName: ThemeName
@@ -142,3 +142,14 @@ export function useTheme(theme?: ThemeName) {
    return theme ? alf.themes[theme] : alf.theme
  }, [theme, alf])
 }
+
+export function useBreakpoints() {
+  const gtPhone = useMediaQuery({minWidth: 500})
+  const gtMobile = useMediaQuery({minWidth: 800})
+  const gtTablet = useMediaQuery({minWidth: 1300})
+  return {
+    gtPhone,
+    gtMobile,
+    gtTablet,
+  }
+}
@@ -60,7 +60,6 @@ export function createThemes({
  dim: Theme
 } {
  const color = {
-    like: '#ec4899',
    trueBlack: '#000000',

    gray_0: `hsl(${hues.primary}, 20%, ${defaultScale[14]}%)`,
@@ -125,7 +124,6 @@ export function createThemes({
  const lightPalette = {
    white: color.gray_0,
    black: color.gray_1000,
-    like: color.like,

    contrast_25: color.gray_25,
    contrast_50: color.gray_50,
@@ -187,7 +185,6 @@ export function createThemes({
  const darkPalette: Palette = {
    white: color.gray_25,
    black: color.trueBlack,
-    like: color.like,

    contrast_25: color.gray_975,
    contrast_50: color.gray_950,
@@ -249,7 +246,6 @@ export function createThemes({
  const dimPalette: Palette = {
    ...darkPalette,
    black: `hsl(${hues.primary}, 28%, ${dimScale[0]}%)`,
-    like: color.like,

    contrast_25: `hsl(${hues.primary}, 28%, ${dimScale[1]}%)`,
    contrast_50: `hsl(${hues.primary}, 28%, ${dimScale[2]}%)`,
@@ -12,7 +12,6 @@ export type ThemeName = 'light' | 'dim' | 'dark'
 export type Palette = {
  white: string
  black: string
-  like: string

  contrast_25: string
  contrast_50: string
@@ -110,7 +110,9 @@ export function renderChildrenWithEmoji(
    return child.split(EMOJI).map((stringPart, index) => [
      stringPart,
      emojis[index] ? (
-        <UITextView {...props} style={[props?.style, {fontFamily: 'System'}]}>
+        <UITextView
+          {...props}
+          style={[props?.style, {color: 'black', fontFamily: 'System'}]}>
          {emojis[index]}
        </UITextView>
      ) : null,
@@ -1,5 +1,4 @@
 import * as NavigationBar from 'expo-navigation-bar'
-import * as SystemUI from 'expo-system-ui'

 import {isAndroid} from '#/platform/detection'
 import {Theme} from '../types'
@@ -10,12 +9,10 @@ export function setNavigationBar(themeType: 'theme' | 'lightbox', t: Theme) {
      NavigationBar.setBackgroundColorAsync(t.atoms.bg.backgroundColor)
      NavigationBar.setBorderColorAsync(t.atoms.bg.backgroundColor)
      NavigationBar.setButtonStyleAsync(t.name !== 'light' ? 'light' : 'dark')
-      SystemUI.setBackgroundColorAsync(t.atoms.bg.backgroundColor)
    } else {
      NavigationBar.setBackgroundColorAsync('black')
      NavigationBar.setBorderColorAsync('black')
      NavigationBar.setButtonStyleAsync('light')
-      SystemUI.setBackgroundColorAsync('black')
    }
  }
 }
@@ -9,7 +9,7 @@ import {useFonts} from 'expo-font'
 */
 export function DO_NOT_USE() {
  return useFonts({
-    InterVariable: require('../../../assets/fonts/inter/InterVariable.woff2'),
-    'InterVariable-Italic': require('../../../assets/fonts/inter/InterVariable-Italic.woff2'),
+    InterVariable: require('../../../assets/fonts/inter/InterVariable.ttf'),
+    'InterVariable-Italic': require('../../../assets/fonts/inter/InterVariable-Italic.ttf'),
  })
 }
@@ -0,0 +1,21 @@
+import React from 'react'
+
+import {atoms as a, useBreakpoints, ViewStyleProp} from '#/alf'
+
+export function useGutterStyles({
+  top,
+  bottom,
+}: {
+  top?: boolean
+  bottom?: boolean
+} = {}) {
+  const {gtMobile} = useBreakpoints()
+  return React.useMemo<ViewStyleProp['style']>(() => {
+    return [
+      a.px_lg,
+      top && a.pt_md,
+      bottom && a.pb_md,
+      gtMobile && [a.px_xl, top && a.pt_lg, bottom && a.pb_lg],
+    ]
+  }, [gtMobile, top, bottom])
+}
@@ -1,66 +0,0 @@
-import React from 'react'
-
-import {Breakpoint, useBreakpoints} from '#/alf/breakpoints'
-import * as tokens from '#/alf/tokens'
-
-type Gutter = 'compact' | 'base' | 'wide' | 0
-
-const gutters: Record<
-  Exclude<Gutter, 0>,
-  Record<Breakpoint | 'default', number>
-> = {
-  compact: {
-    default: tokens.space.sm,
-    gtPhone: tokens.space.sm,
-    gtMobile: tokens.space.md,
-    gtTablet: tokens.space.md,
-  },
-  base: {
-    default: tokens.space.lg,
-    gtPhone: tokens.space.lg,
-    gtMobile: tokens.space.xl,
-    gtTablet: tokens.space.xl,
-  },
-  wide: {
-    default: tokens.space.xl,
-    gtPhone: tokens.space.xl,
-    gtMobile: tokens.space._3xl,
-    gtTablet: tokens.space._3xl,
-  },
-}
-
-type Gutters = {
-  paddingTop: number
-  paddingRight: number
-  paddingBottom: number
-  paddingLeft: number
-}
-
-export function useGutters([all]: [Gutter]): Gutters
-export function useGutters([vertical, horizontal]: [Gutter, Gutter]): Gutters
-export function useGutters([top, right, bottom, left]: [
-  Gutter,
-  Gutter,
-  Gutter,
-  Gutter,
-]): Gutters
-export function useGutters([top, right, bottom, left]: Gutter[]) {
-  const {activeBreakpoint} = useBreakpoints()
-  if (right === undefined) {
-    right = bottom = left = top
-  } else if (bottom === undefined) {
-    bottom = top
-    left = right
-  }
-  return React.useMemo(() => {
-    return {
-      paddingTop: top === 0 ? 0 : gutters[top][activeBreakpoint || 'default'],
-      paddingRight:
-        right === 0 ? 0 : gutters[right][activeBreakpoint || 'default'],
-      paddingBottom:
-        bottom === 0 ? 0 : gutters[bottom][activeBreakpoint || 'default'],
-      paddingLeft:
-        left === 0 ? 0 : gutters[left][activeBreakpoint || 'default'],
-    }
-  }, [activeBreakpoint, top, right, bottom, left])
-}
@@ -131,11 +131,7 @@ function AccountItem({
            (hovered || pressed || isPendingAccount) && t.atoms.bg_contrast_25,
          ]}>
          <View style={a.p_md}>
-            <UserAvatar
-              avatar={profile?.avatar}
-              size={24}
-              type={profile?.associated?.labeler ? 'labeler' : 'user'}
-            />
+            <UserAvatar avatar={profile?.avatar} size={24} />
          </View>
          <Text style={[a.align_baseline, a.flex_1, a.flex_row, a.py_sm]}>
            <Text emoji style={[a.font_bold]}>
@@ -65,7 +65,6 @@ export function AvatarStack({
            <UserAvatar
              size={size - 2}
              avatar={item.profile.avatar}
-              type={item.profile.associated?.labeler ? 'labeler' : 'user'}
              moderation={item.moderation.ui('avatar')}
            />
          )}
@@ -7,7 +7,7 @@ import {
  AtUri,
  RichText as RichTextApi,
 } from '@atproto/api'
-import {msg, Plural, Trans} from '@lingui/macro'
+import {msg, plural, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'

@@ -210,9 +210,10 @@ export function Likes({count}: {count: number}) {
  const t = useTheme()
  return (
    <Text style={[a.text_sm, t.atoms.text_contrast_medium]}>
-      <Trans>
-        Liked by <Plural value={count || 0} one="# user" other="# users" />
-      </Trans>
+      {plural(count || 0, {
+        one: 'Liked by # user',
+        other: 'Liked by # users',
+      })}
    </Text>
  )
 }
@@ -6,6 +6,7 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'

+import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {NavigationProp} from '#/lib/routes/types'
 import {logEvent} from '#/lib/statsig/statsig'
 import {logger} from '#/logger'
@@ -15,6 +16,7 @@ import {FeedDescriptor} from '#/state/queries/post-feed'
 import {useProfilesQuery} from '#/state/queries/profile'
 import {useSuggestedFollowsByActorQuery} from '#/state/queries/suggested-follows'
 import {useSession} from '#/state/session'
+import {useProgressGuide} from '#/state/shell/progress-guide'
 import * as userActionHistory from '#/state/userActionHistory'
 import {SeenPost} from '#/state/userActionHistory'
 import {atoms as a, useBreakpoints, useTheme, ViewStyleProp, web} from '#/alf'
@@ -280,8 +282,8 @@ export function ProfileGrid({
                    profile={profile}
                    moderationOpts={moderationOpts}
                    logContext="FeedInterstitial"
+                    color="secondary_inverted"
                    shape="round"
-                    colorInverted
                  />
                </ProfileCard.Header>
                <ProfileCard.Description profile={profile} numberOfLines={2} />
@@ -504,9 +506,23 @@ export function SuggestedFeeds() {

 export function ProgressGuide() {
  const t = useTheme()
-  return (
-    <View style={[t.atoms.border_contrast_low, a.px_lg, a.py_lg, a.pb_lg]}>
+  const {isDesktop} = useWebMediaQueries()
+  const guide = useProgressGuide('like-10-and-follow-7')
+
+  if (isDesktop) {
+    return null
+  }
+
+  return guide ? (
+    <View
+      style={[
+        a.border_t,
+        t.atoms.border_contrast_low,
+        a.px_lg,
+        a.py_lg,
+        a.pb_lg,
+      ]}>
      <ProgressGuideList />
    </View>
-  )
+  ) : null
 }
@@ -1,13 +1,11 @@
 import {LinearGradient} from 'expo-linear-gradient'

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

 export function GradientFill({
  gradient,
-  style,
-}: ViewStyleProp & {
+}: {
  gradient:
-    | typeof tokens.gradients.primary
    | typeof tokens.gradients.sky
    | typeof tokens.gradients.midnight
    | typeof tokens.gradients.sunrise
@@ -28,7 +26,7 @@ export function GradientFill({
      }
      start={{x: 0, y: 0}}
      end={{x: 1, y: 1}}
-      style={[a.absolute, a.inset_0, style]}
+      style={[a.absolute, a.inset_0]}
    />
  )
 }
@@ -163,7 +163,6 @@ function KnownFollowersInner({
                  size={SIZE}
                  avatar={prof.avatar}
                  moderation={moderation.ui('avatar')}
-                  type={prof.associated?.labeler ? 'labeler' : 'user'}
                />
              </View>
            ))}
@@ -83,7 +83,7 @@ export function RegionalNotice() {
  )
 }

-export function LikeCount({likeCount}: {likeCount: number}) {
+export function LikeCount({count}: {count: number}) {
  const t = useTheme()
  return (
    <Text
@@ -93,9 +93,7 @@ export function LikeCount({likeCount}: {likeCount: number}) {
        t.atoms.text_contrast_medium,
        {fontWeight: '600'},
      ]}>
-      <Trans>
-        Liked by <Plural value={likeCount} one="# user" other="# users" />
-      </Trans>
+      <Plural value={count} one="Liked by # user" other="Liked by # users" />
    </Text>
  )
 }
@@ -140,7 +138,7 @@ export function Default({
          value={labeler.creator.description}
          handle={labeler.creator.handle}
        />
-        {labeler.likeCount ? <LikeCount likeCount={labeler.likeCount} /> : null}
+        {labeler.likeCount ? <LikeCount count={labeler.likeCount} /> : null}
      </Content>
    </Outer>
  )
@@ -13,9 +13,8 @@ import {
  platform,
  TextStyleProp,
  useBreakpoints,
-  useGutters,
+  useGutterStyles,
  useTheme,
-  web,
 } from '#/alf'
 import {Button, ButtonIcon, ButtonProps} from '#/components/Button'
 import {ArrowLeft_Stroke2_Corner0_Rounded as ArrowLeft} from '#/components/icons/Arrow'
@@ -30,33 +29,27 @@ import {Text} from '#/components/Typography'
 export function Outer({
  children,
  noBottomBorder,
-  headerRef,
-  sticky = true,
 }: {
  children: React.ReactNode
  noBottomBorder?: boolean
-  headerRef?: React.MutableRefObject<View | null>
-  sticky?: boolean
 }) {
  const t = useTheme()
-  const gutters = useGutters([0, 'base'])
+  const gutter = useGutterStyles()
  const {gtMobile} = useBreakpoints()
  const {isWithinOffsetView} = useContext(ScrollbarOffsetContext)

  return (
    <View
-      ref={headerRef}
      style={[
        a.w_full,
        !noBottomBorder && a.border_b,
        a.flex_row,
        a.align_center,
        a.gap_sm,
-        sticky && web([a.sticky, {top: 0}, a.z_10, t.atoms.bg]),
-        gutters,
+        gutter,
        platform({
-          native: [a.pb_xs, {minHeight: 48}],
-          web: [a.py_xs, {minHeight: 52}],
+          native: [a.pb_sm, a.pt_xs],
+          web: [a.py_sm],
        }),
        t.atoms.border_contrast_low,
        gtMobile && [a.mx_auto, {maxWidth: 600}],
@@ -92,7 +85,17 @@ export function Content({
 }

 export function Slot({children}: {children?: React.ReactNode}) {
-  return <View style={[a.z_50, {width: HEADER_SLOT_SIZE}]}>{children}</View>
+  return (
+    <View
+      style={[
+        a.z_50,
+        {
+          width: HEADER_SLOT_SIZE,
+        },
+      ]}>
+      {children}
+    </View>
+  )
 }

 export function BackButton({onPress, style, ...props}: Partial<ButtonProps>) {
@@ -172,8 +175,7 @@ export function TitleText({
        gtMobile && a.text_xl,
        style,
      ]}
-      numberOfLines={2}
-      emoji>
+      numberOfLines={2}>
      {children}
    </Text>
  )
@@ -21,7 +21,6 @@ export * as Header from '#/components/Layout/Header'

 export type ScreenProps = React.ComponentProps<typeof View> & {
  style?: StyleProp<ViewStyle>
-  noInsetTop?: boolean
 }

 /**
@@ -29,7 +28,6 @@ export type ScreenProps = React.ComponentProps<typeof View> & {
 */
 export const Screen = React.memo(function Screen({
  style,
-  noInsetTop,
  ...props
 }: ScreenProps) {
  const {top} = useSafeAreaInsets()
@@ -37,7 +35,7 @@ export const Screen = React.memo(function Screen({
    <>
      {isWeb && <WebCenterBorders />}
      <View
-        style={[a.util_screen_outer, {paddingTop: noInsetTop ? 0 : top}, style]}
+        style={[a.util_screen_outer, {paddingTop: top}, style]}
        {...props}
      />
    </>
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .7.6
 .3.6
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M7.5 2a1 1 0 0 0-1 1v3.997a6.25 6.25 0 0 1-1.83 4.42l-.377.376A1 1 0 0 0 4 12.5V15a1 1 0 0 0 1 1h6v5a1 1 0 1 0 2 0v-5h6a1 1 0 0 0 1-1v-2.5a1 1 0 0 0-.293-.707l-.376-.377a6.25 6.25 0 0 1-1.831-4.42V3.001a1 1 0 0 0-1-1h-9Z"/></svg>`