Add intent/verify-email to go server

.eslintrc.js

@@ -1,5 +1,3 @@
-const reactCompilerConfig = require('./react-compiler.config.js')
-
 module.exports = {
   root: true,
   extends: [
@@ -25,16 +23,7 @@ module.exports = {
     'bsky-internal/avoid-unwrapped-text': [
       'error',
       {
-        impliedTextComponents: [
-          'H1',
-          'H2',
-          'H3',
-          'H4',
-          'H5',
-          'H6',
-          'P',
-          'Admonition',
-        ],
+        impliedTextComponents: ['H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'P'],
         impliedTextProps: [],
         suggestedTextWrappers: {
           Button: 'ButtonText',
@@ -44,9 +33,9 @@ module.exports = {
     ],
     'bsky-internal/use-exact-imports': 'error',
     'bsky-internal/use-typed-gates': 'error',
-    'bsky-internal/use-prefixed-imports': 'error',
+    'bsky-internal/use-prefixed-imports': 'warn',
     'simple-import-sort/imports': [
-      'error',
+      'warn',
       {
         groups: [
           // Side effect imports.
@@ -80,8 +69,9 @@ module.exports = {
         ],
       },
     ],
-    'simple-import-sort/exports': 'error',
-    'react-compiler/react-compiler': ['error', reactCompilerConfig],
+    'simple-import-sort/exports': 'warn',
+    // TODO: Reenable when we figure out why it gets stuck on CI.
+    // 'react-compiler/react-compiler': 'error',
     'no-restricted-imports': [
       'error',
       {

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,7 +5,10 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make sure you've searched for similar issues that are already open and being tracked. If you find an open issue that seems relevant to yours, it is best to leave a response there with your information instead of opening a new issue, since it helps to consolidate the info in one place.
+        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make
+        sure you've searched for similar issues that are already open and being tracked. If you find an open issue that
+        seems relevant to yours, it is best to leave a response there with your information instead of opening a new
+        issue, since it helps to consolidate the info in one place.
   - type: textarea
     attributes:
       label: Steps to Reproduce

.github/ISSUE_TEMPLATE/bug_report_fabric.yml

@@ -12,7 +12,10 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make sure you've searched for similar issues that are already open and being tracked. If you find an open issue that seems relevant to yours, it is best to leave a response there with your information instead of opening a new issue, since it helps to consolidate the info in one place.
+        Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make
+        sure you've searched for similar issues that are already open and being tracked. If you find an open issue that
+        seems relevant to yours, it is best to leave a response there with your information instead of opening a new
+        issue, since it helps to consolidate the info in one place.
   - type: textarea
     attributes:
       label: Steps to Reproduce

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -5,7 +5,10 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for submitting a feature request! Before you submit this request, please make sure you've searched for similar requests that are already open and being tracked. If you find an open request that seems relevant to yours, it is best to leave a response there with your information instead of opening a new request, since it helps to consolidate the info in one place.
+        Thanks for submitting a feature request! Before you submit this request, please make sure you've searched for
+        similar requests that are already open and being tracked. If you find an open request that seems relevant to
+        yours, it is best to leave a response there with your information instead of opening a new request, since it
+        helps to consolidate the info in one place.
   - type: textarea
     attributes:
       label: Describe the Feature

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

@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - main
+      - bnewbold/embedr
+      - bnewbold/embedr-rebase
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}

.github/workflows/lint.yml

@@ -16,10 +16,6 @@ jobs:
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v3
-      - name: Install node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
       - name: Yarn install
         uses: Wandalen/wretry.action@master
         with:

.nvmrc

@@ -1 +1 @@
-20
+18

.prettierignore

@@ -15,6 +15,3 @@ android
 ios
 src/locale/locales
 lib/react-compiler-runtime
-bskyweb/static
-coverage
-web-build

Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /usr/src/social-app
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Node
-ENV NODE_VERSION=20
+ENV NODE_VERSION=18
 ENV NVM_DIR=/usr/share/nvm
 
 # Go
@@ -17,7 +17,7 @@ ENV GOEXPERIMENT="loopvar"
 
 # Expo
 ARG EXPO_PUBLIC_BUNDLE_IDENTIFIER
-ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER=${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-dev}
+ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER ${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-dev}
 
 COPY . .
 

Dockerfile.embedr

@@ -5,7 +5,7 @@ WORKDIR /usr/src/social-app
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Node
-ENV NODE_VERSION=20
+ENV NODE_VERSION=18
 ENV NVM_DIR=/usr/share/nvm
 
 # Go

__e2e__/flows/composer-self-label.yml

@@ -10,21 +10,21 @@ appId: xyz.blueskyweb.app
     id: "e2eSignInAlice"
 
 # Post an image with the porn label
-- assertVisible:
-      id: "composeFAB"
 - tapOn:
     id: "composeFAB"
 - inputText: "Post with an image"
 - tapOn:
     id: "openGalleryBtn"
-- tapOn: "Content warnings"
-- tapOn: "Content warnings"
-- tapOn: "Porn"
+- tapOn:
+    id: "labelsBtn"
+- tapOn:
+    label: "Tap on porn"
+    point: 78%,67%
 - tapOn:
     label: "Tap on confirm"
-    id: "confirmBtn"
+    point: 51%,92%
 - tapOn:
     id: "composerPublishBtn"
 - tapOn:
     id: "e2eRefreshHome"
-- assertVisible: "Adult Content"
+- assertVisible: "Adult Content"

__e2e__/flows/composer.yml

@@ -8,8 +8,6 @@ appId: xyz.blueskyweb.app
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- assertVisible:
-      id: "composeFAB"
 - tapOn:
     id: "composeFAB"
 - inputText: "Post text only"
@@ -62,7 +60,7 @@ appId: xyz.blueskyweb.app
     id: "repostBtn"
 - tapOn:
     id: "quoteBtn"
-- inputText: "QP text only"
+- inputText: "QP text only"   
 - tapOn:
     id: "composerPublishBtn"
 - assertVisible:

__e2e__/flows/curate-lists.yml

@@ -163,7 +163,8 @@ appId: xyz.blueskyweb.app
 - tapOn:
     label: "Adds and removes users on curatelists from the profile"
     id: "bottomBarSearchBtn"
-- tapOn: "Search"
+- tapOn:
+    id: "searchTextInput"
 - inputText: "bob"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"

__e2e__/flows/feed-reorder.yml

@@ -17,6 +17,10 @@ appId: xyz.blueskyweb.app
     id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "profileCardButton"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
 - tapOn:
     id: "profilePager-selector-4"
 - tapOn: "alice-favs"
@@ -36,14 +40,13 @@ appId: xyz.blueskyweb.app
     id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "menuItemButton-Feeds"
-- tapOn:
+- tapOn: 
     id: "editFeedsBtn"
 - tapOn:
     label: "Tap on down arrow"
-    id: "feed-timeline-moveDown"
+    point: "79%,23%"
 - tapOn:
-      label: "Save button"
-      id: "saveChangesBtn"
+    id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "viewHeaderDrawerBtn"
 - assertVisible:
@@ -58,14 +61,13 @@ appId: xyz.blueskyweb.app
     id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "menuItemButton-Feeds"
-- tapOn:
+- tapOn: 
     id: "editFeedsBtn"
 - tapOn:
     label: "Tap on down arrow"
-    id: "feed-feed-moveDown"
+    point: "79%,23%"
 - tapOn:
-    label: "Save button"
-    id: "saveChangesBtn"
+    id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "viewHeaderDrawerBtn"
 - assertVisible:
@@ -80,14 +82,13 @@ appId: xyz.blueskyweb.app
     id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "menuItemButton-Feeds"
-- tapOn:
+- tapOn: 
     id: "editFeedsBtn"
 - tapOn:
     label: "Tap on unpin"
-    id: "feed-timeline-togglePin"
+    point: "91%,23%"
 - tapOn:
-      label: "Save button"
-      id: "saveChangesBtn"
+    id: "viewHeaderDrawerBtn"
 - tapOn:
     id: "viewHeaderDrawerBtn"
 - assertVisible:

__e2e__/flows/home-screen.yml

@@ -20,6 +20,10 @@ appId: xyz.blueskyweb.app
 - tapOn:
     label: "Feeds button disappears after pinning a feed"
     id: "bottomBarProfileBtn"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
 - tapOn:
     id: "profilePager-selector-4"
 - tapOn: "alice-favs"

__e2e__/flows/login.yml

@@ -9,7 +9,7 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "e2eOpenLoggedOutView"
 - tapOn: "Sign in"
-- tapOn:
+- tapOn: 
     id: "selectServiceButton"
 - tapOn: "Custom"
 - tapOn:
@@ -23,4 +23,4 @@ appId: xyz.blueskyweb.app
     id: "loginPasswordInput"
 - inputText: "hunter2"
 - pressKey: Enter
-- assertVisible: "Following"
+- assertVisible: "Following"

__e2e__/flows/mod-lists.yml

@@ -28,20 +28,18 @@ appId: xyz.blueskyweb.app
 - assertVisible: "Muted Users"
 - assertVisible: "Shhh"
 
+# toggle mute subscription
 - tapOn:
-    label: "Dropdown"
-    point: "71%,9%"
-
+    point: "70%,9%"
 - tapOn: "Mute accounts"
 - tapOn: "Mute list"
 - tapOn: "Unmute"
 
+# toggle block subscription
 - tapOn:
-      label: "Dropdown"
-      point: "71%,9%"
-
+    point: "70%,9%"
 - tapOn: "Block accounts"
 - tapOn: "Block list"
 - tapOn: "Unblock"
-
- # the rest of the behaviors are tested in curate-lists.yml
+ 
+ # the rest of the behaviors are tested in curate-lists.yml

__e2e__/flows/onboarding.yml

@@ -13,7 +13,7 @@ appId: xyz.blueskyweb.app
 - tapOn: "Select an avatar"
 - waitForAnimationToEnd
 - tapOn:
-    point: "50%,22%"
+    point: "16%,22%"
 - waitForAnimationToEnd
 - tapOn: "Choose"
 - waitForAnimationToEnd

__e2e__/flows/profile-screen-edit.yml

@@ -17,6 +17,21 @@ appId: xyz.blueskyweb.app
 - tapOn:
     id: "bottomBarProfileBtn"
 
+# Can see feeds
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
+- tapOn:
+    id: "profilePager-selector-4"
+- assertVisible: "alice-favs"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: RIGHT
+- tapOn:
+    id: "profilePager-selector-0"
+
 # Open and close edit profile modal
 - tapOn:
     id: "profileHeaderEditProfileButton"

__e2e__/flows/profile-screen.yml

@@ -15,7 +15,8 @@ appId: xyz.blueskyweb.app
         id: "bottomBarSearchBtn"
 - tapOn:
     id: "bottomBarSearchBtn"
-- tapOn: "Search"
+- tapOn:
+    id: "searchTextInput"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"

__e2e__/flows/search-screen.yml

@@ -12,8 +12,8 @@ appId: xyz.blueskyweb.app
 # Navigate to another user profile via autocomplete
 - tapOn:
     id: "bottomBarSearchBtn"
-- assertVisible: "Search"
-- tapOn: "Search"
+- tapOn:
+    id: "searchTextInput"
 - inputText: "b"
 - tapOn:
     id: "searchAutoCompleteResult-bob.test"

__e2e__/flows/shared-prefs.yml

@@ -8,10 +8,7 @@ appId: xyz.blueskyweb.app
     file: ../setupApp.yml
 - tapOn:
     id: "e2eSignInAlice"
-- assertVisible:
-      id: "storybookBtn"
-- tapOn:
-    id: "storybookBtn"
+- tapOn: "/sys/debug"
 - tapOn:
     id: "sharedPrefsTestOpenBtn"
 - tapOn:
@@ -19,7 +16,7 @@ appId: xyz.blueskyweb.app
 - assertVisible: "Hello"
 - tapOn:
     id: "removeStringBtn"
-- assertVisible: "undefined"
+- assertVisible: "null"
 - tapOn:
     id: "setBoolBtn"
 - assertVisible: "true"

__e2e__/flows/thread-muting.yml

@@ -7,11 +7,10 @@ appId: xyz.blueskyweb.app
 - runFlow:
     file: ../setupApp.yml
 
+
 # Login, create a thread, and log out
 - tapOn:
     id: "e2eSignInAlice"
-- assertVisible:
-    id: "composeFAB"
 - tapOn:
     id: "composeFAB"
 - inputText: "Test thread"

__tests__/lib/string.test.ts

@@ -335,10 +335,8 @@ describe('shortenLinks', () => {
 describe('parseEmbedPlayerFromUrl', () => {
   const inputs = [
     'https://youtu.be/videoId',
-    'https://youtu.be/videoId?t=1s',
     'https://www.youtube.com/watch?v=videoId',
     'https://www.youtube.com/watch?v=videoId&feature=share',
-    'https://www.youtube.com/watch?v=videoId&t=1s',
     'https://youtube.com/watch?v=videoId',
     'https://youtube.com/watch?v=videoId&feature=share',
     'https://youtube.com/shorts/videoId',
@@ -443,11 +441,6 @@ describe('parseEmbedPlayerFromUrl', () => {
       source: 'youtube',
       playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
     },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=1',
-    },
     {
       type: 'youtube_video',
       source: 'youtube',
@@ -458,11 +451,6 @@ describe('parseEmbedPlayerFromUrl', () => {
       source: 'youtube',
       playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=0',
     },
-    {
-      type: 'youtube_video',
-      source: 'youtube',
-      playerUri: 'https://bsky.app/iframe/youtube.html?videoId=videoId&start=1',
-    },
     {
       type: 'youtube_video',
       source: 'youtube',

app.config.js

@@ -99,8 +99,6 @@ module.exports = function (config) {
           dark: DARK_SPLASH_CONFIG,
         },
         entitlements: {
-          'com.apple.developer.kernel.increased-memory-limit': true,
-          'com.apple.developer.kernel.extended-virtual-addressing': true,
           'com.apple.security.application-groups': 'group.app.bsky',
         },
         privacyManifests: {
@@ -238,13 +236,6 @@ module.exports = function (config) {
             fonts: [
               './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',
-              './assets/fonts/inter/Inter-SemiBold.otf',
-              './assets/fonts/inter/Inter-SemiBoldItalic.otf',
-              './assets/fonts/inter/Inter-ExtraBold.otf',
-              './assets/fonts/inter/Inter-ExtraBoldItalic.otf',
             ],
           },
         ],

assets/icons/beaker_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M13.5 4a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM10 5a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM8 6a1 1 0 0 0 0 2v2.64q-.319.374-.711.8l-.129.142c-.312.342-.649.711-.974 1.092-.731.857-1.488 1.866-1.89 2.99A4.9 4.9 0 0 0 4 17.298 4.7 4.7 0 0 0 8.702 22h6.596A4.7 4.7 0 0 0 20 17.298a4.8 4.8 0 0 0-.297-1.634c-.401-1.124-1.157-2.133-1.89-2.99-.324-.38-.66-.75-.973-1.092h0l-.129-.141c-.26-.286-.5-.55-.711-.8V8a1 1 0 1 0 0-2H8Zm2 5.35V8h4v3.35l.22.275c.306.383.661.777 1.013 1.163l.13.143h0c.315.345.628.688.93 1.042.372.435.704.861.974 1.28l-.159.025c-.845.13-1.838.242-2.581.222-.842-.022-1.475-.217-2.227-.454l-.027-.008c-.746-.235-1.61-.507-2.746-.538-.743-.02-1.617.064-2.38.165q.26-.342.56-.692c.302-.354.615-.697.93-1.042l.13-.143c.352-.386.707-.78 1.014-1.163L10 11.35Zm7.41 5.905q.316-.048.586-.095.004.07.004.138A2.7 2.7 0 0 1 15.298 20H8.702A2.7 2.7 0 0 1 6 17.298q0-.213.039-.434c.236-.043.53-.093.853-.142.845-.13 1.837-.242 2.581-.222.842.022 1.475.217 2.227.454l.027.008c.746.235 1.61.507 2.746.538.931.024 2.07-.113 2.937-.245Z" clip-rule="evenodd"/></svg>

assets/icons/bubbles_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M6.002 6a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3h-1v1a3 3 0 0 1-3 3h-4.24l-4.274 2.374a1 1 0 0 1-1.486-.874V19a3 3 0 0 1-3-3v-6a3 3 0 0 1 3-3h1V6Zm-1 3a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h1a1 1 0 0 1 1 1v.8l3.015-1.674a1 1 0 0 1 .485-.126h4.5a1 1 0 0 0 1-1v-1.933a1 1 0 0 1 0-.134V10a1 1 0 0 0-1-1h-10Zm13 4v-3a3 3 0 0 0-3-3h-7V6a1 1 0 0 1 1-1h10a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-1Z" clip-rule="evenodd"/></svg>

assets/icons/calendarClock_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M15.439 3.148a1 1 0 0 1 .41.645l.568 3.22a7 7 0 1 1-6.174 10.97L4.32 19.027a1 1 0 0 1-1.159-.811L1.078 6.398a1 1 0 0 1 .81-1.158l12.803-2.258a1 1 0 0 1 .748.166ZM9.325 16.114A7 7 0 0 1 9 14c0-1.56.51-3 1.372-4.164l-6.456 1.139 1.041 5.909 4.368-.77ZM3.568 9.005l10.833-1.91-.347-1.97L3.22 7.036l.347 1.97ZM16 9a5 5 0 1 0 0 10 5 5 0 0 0 0-10Zm0 2a1 1 0 0 1 1 1v1.586l1.374 1.374a1 1 0 0 1-1.414 1.414l-1.667-1.667A1 1 0 0 1 15 14v-2a1 1 0 0 1 1-1Z" clip-rule="evenodd"/></svg>

assets/icons/car_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M7.018 6a1 1 0 0 0-.808.412l-.81-.588.809.588L3 10.825V17a1 1 0 1 0 2 0 1 1 0 0 1 1-1h12a1 1 0 0 1 1 1 1 1 0 1 0 2 0v-5.998l-3.22-4.577A1 1 0 0 0 16.962 6H7.018ZM23 11.686V17a3 3 0 0 1-5.83 1H6.83A3.001 3.001 0 0 1 1 17v-5.5a1 1 0 1 1 0-2h.49l3.102-4.265A3 3 0 0 1 7.018 4h9.944a3 3 0 0 1 2.453 1.274l3.104 4.412H23a1 1 0 1 1 0 2ZM5 13a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2H6a1 1 0 0 1-1-1Zm10 0a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>

assets/icons/circleQuestion_stroke2_corner2_rounded.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="M12 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm10-3a1 1 0 0 0-.879.522 1 1 0 0 1-1.754-.96A3 3 0 0 1 12 7c1.515 0 2.567 1.006 2.866 2.189.302 1.189-.156 2.574-1.524 3.258A.62.62 0 0 0 13 13a1 1 0 1 1-2 0c0-.992.56-1.898 1.447-2.342.455-.227.572-.618.48-.978C12.836 9.314 12.529 9 12 9Zm1 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Z" clip-rule="evenodd"/><path fill="#000" fill-rule="evenodd" d="M12 9a1 1 0 0 0-.879.522 1 1 0 0 1-1.754-.96A3 3 0 0 1 12 7c1.515 0 2.567 1.006 2.866 2.189.302 1.189-.156 2.574-1.524 3.258A.62.62 0 0 0 13 13a1 1 0 1 1-2 0c0-.992.56-1.898 1.447-2.342.455-.227.572-.618.48-.978C12.836 9.314 12.529 9 12 9Z" clip-rule="evenodd"/><path fill="#000" d="M13 16a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/></svg>

assets/icons/codeBrackets_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M14.243 3.03a1 1 0 0 1 .727 1.213l-4 16a1 1 0 1 1-1.94-.485l4-16a1 1 0 0 1 1.213-.728ZM6.707 7.293a1 1 0 0 1 0 1.414l-2.586 2.586a1 1 0 0 0 0 1.414l2.586 2.586a1 1 0 1 1-1.414 1.414l-2.586-2.586a3 3 0 0 1 0-4.242l2.586-2.586a1 1 0 0 1 1.414 0Zm10.586 0a1 1 0 0 1 1.414 0l2.586 2.586a3 3 0 0 1 0 4.242l-2.586 2.586a1 1 0 1 1-1.414-1.414l2.586-2.586a1 1 0 0 0 0-1.414l-2.586-2.586a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>

assets/icons/codeLines_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M2 5a1 1 0 0 1 1-1h10a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm15 0a1 1 0 0 1 1-1h3a1 1 0 1 1 0 2h-3a1 1 0 0 1-1-1ZM2 12a1 1 0 0 1 1-1h5a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm10 0a1 1 0 0 1 1-1h8a1 1 0 1 1 0 2h-8a1 1 0 0 1-1-1ZM2 19a1 1 0 0 1 1-1h7a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1Zm12 0a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2h-6a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>

assets/icons/earth_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4.4 9.493C4.14 10.28 4 11.124 4 12a8 8 0 1 0 10.899-7.459l-.67 2.679a2.95 2.95 0 0 1-2.14 2.142l-2.173.547a.32.32 0 0 0-.205.164 2.316 2.316 0 0 1-3.457.81L4.4 9.493Zm.883-1.84 2.171 1.63a.315.315 0 0 0 .471-.11c.303-.6.851-1.04 1.503-1.204l2.174-.546a.95.95 0 0 0 .687-.688l.97.242-.97-.242.67-2.678a7.99 7.99 0 0 0-7.676 3.597ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm8.048.543a2.2 2.2 0 0 1 1.69-.636l.827.053c.52.033 1.023.204 1.456.495l1.37.921a2.453 2.453 0 0 1-1.367 4.489h-.98a2.95 2.95 0 0 1-2.45-1.312L9.77 15.32a2.2 2.2 0 0 1 .278-2.776Zm1.563 1.36a.197.197 0 0 0-.177.306l.823 1.235c.176.263.471.42.787.42h.98a.453.453 0 0 0 .252-.828l-1.37-.921a.95.95 0 0 0-.468-.159l-.827-.053Z" clip-rule="evenodd"/></svg>

assets/icons/envelope_open_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#080B12" fill-rule="evenodd" d="M4 4a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v6.386c1.064-.002 2 .86 2 2.001V19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2v-6.613c0-1.142.936-2.003 2-2.001V4Zm2 6.946 6 2 6-2V4H6v6.946ZM9 8a1 1 0 0 1 1-1h4a1 1 0 1 1 0 2h-4a1 1 0 0 1-1-1Zm2.367 6.843L4 12.387V19h16v-6.613l-7.367 2.456a2 2 0 0 1-1.265 0Z" clip-rule="evenodd"/></svg>

assets/icons/freeze_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8.789 2.293a1 1 0 0 1 1.414 0l1.793 1.793 1.793-1.793a1 1 0 1 1 1.414 1.414l-2.207 2.207v4.355l3.772-2.178.808-3.015a1 1 0 1 1 1.931.518l-.656 2.449 2.45.656a1 1 0 1 1-.518 1.932l-3.015-.808L13.998 12l3.77 2.177 3.015-.808a1 1 0 1 1 .517 1.932l-2.449.656.657 2.45a1 1 0 1 1-1.932.517l-.808-3.015-3.772-2.178v4.355l2.207 2.207a1 1 0 0 1-1.414 1.414l-1.793-1.793-1.793 1.793a1 1 0 0 1-1.414-1.414l2.207-2.207v-4.353l-3.77 2.176-.807 3.015a1 1 0 0 1-1.932-.518l.656-2.449-2.449-.656a1 1 0 1 1 .518-1.932l3.015.808L9.997 12l-3.77-2.177-3.015.808a1 1 0 0 1-.518-1.932l2.45-.656-.657-2.45a1 1 0 0 1 1.932-.517l.808 3.015 3.77 2.176V5.914L8.788 3.707a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>

assets/icons/haptic_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M9 5a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1H9ZM6 6a3 3 0 0 1 3-3h6a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H9a3 3 0 0 1-3-3V6Zm4 1a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1Zm-5.793.293a1 1 0 0 1 0 1.414L3.155 9.76a.546.546 0 0 0-.05.713 2.55 2.55 0 0 1 0 3.056.546.546 0 0 0 .05.713l1.052 1.052a1 1 0 1 1-1.414 1.414L1.74 15.655a2.546 2.546 0 0 1-.237-3.327.55.55 0 0 0 0-.655 2.546 2.546 0 0 1 .237-3.328l1.052-1.052a1 1 0 0 1 1.414 0Zm15.586 0a1 1 0 0 1 1.414 0l1.052 1.052c.896.896.997 2.314.237 3.327a.55.55 0 0 0 0 .656 2.546 2.546 0 0 1-.237 3.327l-1.052 1.052a1 1 0 0 1-1.414-1.414l1.052-1.052a.546.546 0 0 0 .05-.713 2.55 2.55 0 0 1 0-3.056.546.546 0 0 0-.05-.713l-1.052-1.052a1 1 0 0 1 0-1.414Z" clip-rule="evenodd"/></svg>

assets/icons/home_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12.659 3.905a1 1 0 0 0-1.318 0l-6 5.25A1 1 0 0 0 5 9.907V18a1 1 0 0 0 1 1h3v-3a3 3 0 0 1 6 0v3h3a1 1 0 0 0 1-1V9.907a1 1 0 0 0-.341-.752l-6-5.25ZM10.024 2.4a3 3 0 0 1 3.952 0l6 5.25A3 3 0 0 1 21 9.907V18a3 3 0 0 1-3 3h-3a2 2 0 0 1-2-2v-3a1 1 0 0 0-2 0v3a2 2 0 0 1-2 2H6a3 3 0 0 1-3-3V9.907A3 3 0 0 1 4.024 7.65l6-5.25Z" clip-rule="evenodd"/></svg>

assets/icons/key_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3 12a4 4 0 0 1 7.212-2.385c.363.488.963.885 1.696.885h8.111l1.2 1.5-1.2 1.5h-1.783l-1.789-.894a1 1 0 0 0-.894 0l-1.79.894h-1.855c-.733 0-1.333.397-1.696.885A4 4 0 0 1 3 12Zm4-6a6 6 0 1 0 4.817 9.579.3.3 0 0 1 .076-.072l.017-.007H14a1 1 0 0 0 .447-.106L16 14.618l1.553.776c.139.07.292.106.447.106h2.02a2 2 0 0 0 1.561-.75l1.2-1.5a2 2 0 0 0 0-2.5l-1.2-1.5a2 2 0 0 0-1.562-.75h-8.11l-.016-.007a.3.3 0 0 1-.077-.071A6 6 0 0 0 7 6Zm0 7.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z" clip-rule="evenodd"/></svg>

assets/icons/macintosh_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4 5a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v11a3 3 0 0 1-1 2.236V20a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-1.764c-.614-.55-1-1.348-1-2.236V5Zm3 14v1h10v-1H7ZM7 4a1 1 0 0 0-1 1v11a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1H7Zm0 2a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H8a1 1 0 0 1-1-1V6Zm2 1v4h6V7H9Zm4 8a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>

assets/icons/newspaper_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M1 6.5A2.5 2.5 0 0 1 3.5 4H9a4 4 0 0 1 3 1.354A4 4 0 0 1 15 4h5.5A2.5 2.5 0 0 1 23 6.5v11a2.5 2.5 0 0 1-2.5 2.5h-5.223c-.52 0-1 .125-1.4.372-.421.26-.761.633-.983 1.075a1 1 0 0 1-1.788 0 2.66 2.66 0 0 0-.983-1.075c-.4-.247-.88-.372-1.4-.372H3.5A2.5 2.5 0 0 1 1 17.5v-11ZM11 8a2 2 0 0 0-2-2H3.5a.5.5 0 0 0-.5.5v11a.5.5 0 0 0 .5.5h5.223c.776 0 1.564.173 2.277.569V8Zm2 10.569A4.7 4.7 0 0 1 15.277 18H20.5a.5.5 0 0 0 .5-.5v-11a.5.5 0 0 0-.5-.5H15a2 2 0 0 0-2 2v10.569Z" clip-rule="evenodd"/></svg>

assets/icons/pencilLine_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M15.379 2.707a3 3 0 0 1 4.242 0l1.672 1.672a3 3 0 0 1 0 4.242l-12.5 12.5A3 3 0 0 1 6.672 22H3a1 1 0 0 1-1-1v-3.672a3 3 0 0 1 .879-2.121l12.5-12.5Zm2.828 1.414a1 1 0 0 0-1.414 0l-12.5 12.5a1 1 0 0 0-.293.707V20h2.672a1 1 0 0 0 .707-.293l12.5-12.5.707.707-.707-.707a1 1 0 0 0 0-1.414L18.207 4.12ZM13 21a1 1 0 0 1 1-1h7a1 1 0 0 1 0 2h-7a1 1 0 0 1-1-1Z" clip-rule="evenodd"/></svg>

assets/icons/personGroup_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M8 5a2 2 0 1 0 0 4 2 2 0 0 0 0-4ZM4 7a4 4 0 1 1 8 0 4 4 0 0 1-8 0Zm13-1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Zm-3.5 1.5a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0Zm7.301 9.7c-.836-2.6-2.88-3.503-4.575-3.111a1 1 0 0 1-.451-1.949c2.815-.651 5.81.966 6.93 4.448a2.49 2.49 0 0 1-.506 2.43A2.92 2.92 0 0 1 20 20h-2a1 1 0 1 1 0-2h2a.92.92 0 0 0 .69-.295.49.49 0 0 0 .112-.505ZM8 14c-1.865 0-3.878 1.274-4.681 4.151a.57.57 0 0 0 .132.55c.15.171.4.299.695.299h7.708a.93.93 0 0 0 .695-.299.57.57 0 0 0 .132-.55C11.878 15.274 9.865 14 8 14Zm0-2c2.87 0 5.594 1.98 6.607 5.613.53 1.9-1.09 3.387-2.753 3.387H4.146c-1.663 0-3.283-1.487-2.753-3.387C2.406 13.981 5.129 12 8 12Z" clip-rule="evenodd"/></svg>

assets/icons/personPlus_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM7.5 6.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM12 14c-2.95 0-5.163 1.733-6.08 4.21a.47.47 0 0 0 .09.493.9.9 0 0 0 .687.297H11a1 1 0 1 1 0 2H6.697a2.9 2.9 0 0 1-2.219-1.011 2.46 2.46 0 0 1-.433-2.473C5.235 14.296 8.168 12 12 12c.787 0 1.54.097 2.252.282a1 1 0 1 1-.504 1.936A7 7 0 0 0 12 14Zm6 0a1 1 0 0 1 1 1v2h2a1 1 0 1 1 0 2h-2v2a1 1 0 1 1-2 0v-2h-2a1 1 0 1 1 0-2h2v-2a1 1 0 0 1 1-1Z" clip-rule="evenodd"/></svg>

assets/icons/raisingHand4finger_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12.5 4a.5.5 0 0 0-.5.5V10a1 1 0 1 1-2 0V5.5a.5.5 0 0 0-1 0V11a1 1 0 1 1-2 0V7.5a.5.5 0 0 0-1 0v6a6.5 6.5 0 1 0 13 0V9a1.996 1.996 0 0 0-2 2v.838c0 .826-.529 1.559-1.312 1.82A2.47 2.47 0 0 0 14 16a1 1 0 1 1-2 0 4.47 4.47 0 0 1 3-4.22V11c0-1.014.379-1.941 1-2.646V5.5a.5.5 0 0 0-1 0V10a1 1 0 1 1-2 0V4.5a.5.5 0 0 0-.5-.5Zm2.112-.838A2.5 2.5 0 0 1 18 5.5v1.626q.481-.124 1-.126a2 2 0 0 1 2 2v4.5a8.5 8.5 0 0 1-17 0v-6a2.5 2.5 0 0 1 3.039-2.442 2.5 2.5 0 0 1 3.349-1.896 2.498 2.498 0 0 1 4.224 0Z" clip-rule="evenodd"/></svg>

assets/icons/wrench_stroke2_corner2_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M14.5 4a5.5 5.5 0 0 0-5.078 7.616 1 1 0 0 1-.216 1.092L4.37 17.543a1 1 0 0 0 0 1.414l.672.672a1 1 0 0 0 1.414 0l4.835-4.835a1 1 0 0 1 1.092-.216A5.5 5.5 0 0 0 20 9.414l-1.293 1.293a3.828 3.828 0 1 1-5.414-5.414L14.585 4H14.5ZM7 9.5a7.5 7.5 0 0 1 9.969-7.084 1 1 0 0 1 .378 1.651l-2.64 2.64a1.829 1.829 0 0 0 2.586 2.586l2.64-2.64a1 1 0 0 1 1.65.378 7.5 7.5 0 0 1-9.328 9.627l-4.384 4.385a3 3 0 0 1-4.242 0l-.672-.672a3 3 0 0 1 0-4.242l4.385-4.385A7.5 7.5 0 0 1 7 9.5Z" clip-rule="evenodd"/></svg>

babel.config.js

@@ -1,5 +1,3 @@
-const reactCompilerConfig = require('./react-compiler.config.js')
-
 module.exports = function (api) {
   api.cache(true)
   const isTestEnv = process.env.NODE_ENV === 'test'
@@ -19,7 +17,12 @@ module.exports = function (api) {
     ],
     plugins: [
       'macros',
-      ['babel-plugin-react-compiler', reactCompilerConfig],
+      [
+        'babel-plugin-react-compiler',
+        {
+          runtimeModule: 'react-compiler-runtime',
+        },
+      ],
       [
         'module:react-native-dotenv',
         {

bskyweb/cmd/bskyweb/formating.go

@@ -23,9 +23,7 @@ func ExpandPostText(post *appbsky.FeedPost) string {
 			}
 
 			// bail out if bounds checks fail
-			if facet.Index.ByteStart > facet.Index.ByteEnd ||
-				int(facet.Index.ByteStart)+charsAdded > len(postText) ||
-				int(facet.Index.ByteEnd)+charsAdded > len(postText) {
+			if int(facet.Index.ByteStart)+charsAdded > len(postText) || int(facet.Index.ByteEnd)+charsAdded > len(postText) {
 				return false
 			}
 			linkText := postText[int(facet.Index.ByteStart)+charsAdded : int(facet.Index.ByteEnd)+charsAdded]

bskyweb/cmd/bskyweb/main.go

@@ -87,13 +87,6 @@ func run(args []string) {
 					Value:    cli.NewStringSlice("https://bsky.app", "https://main.bsky.dev", "https://app.staging.bsky.dev"),
 					EnvVars:  []string{"CORS_ALLOWED_ORIGINS"},
 				},
-				&cli.StringFlag{
-					Name:     "static-cdn-host",
-					Usage:    "scheme, hostname, and port of static content CDN, don't end with a slash",
-					Required: false,
-					Value:    "",
-					EnvVars:  []string{"STATIC_CDN_HOST"},
-				},
 			},
 		},
 	}

bskyweb/cmd/bskyweb/server.go

@@ -38,18 +38,15 @@ type Server struct {
 	httpd *http.Server
 	xrpcc *xrpc.Client
 	cfg   *Config
-
-	ipccClient http.Client
 }
 
 type Config struct {
-	debug         bool
-	httpAddress   string
-	appviewHost   string
-	ogcardHost    string
-	linkHost      string
-	ipccHost      string
-	staticCDNHost string
+	debug       bool
+	httpAddress string
+	appviewHost string
+	ogcardHost  string
+	linkHost    string
+	ipccHost    string
 }
 
 func serve(cctx *cli.Context) error {
@@ -61,8 +58,6 @@ func serve(cctx *cli.Context) error {
 	ipccHost := cctx.String("ipcc-host")
 	basicAuthPassword := cctx.String("basic-auth-password")
 	corsOrigins := cctx.StringSlice("cors-allowed-origins")
-	staticCDNHost := cctx.String("static-cdn-host")
-	staticCDNHost = strings.TrimSuffix(staticCDNHost, "/")
 
 	// Echo
 	e := echo.New()
@@ -99,20 +94,12 @@ func serve(cctx *cli.Context) error {
 		echo:  e,
 		xrpcc: xrpcc,
 		cfg: &Config{
-			debug:         debug,
-			httpAddress:   httpAddress,
-			appviewHost:   appviewHost,
-			ogcardHost:    ogcardHost,
-			linkHost:      linkHost,
-			ipccHost:      ipccHost,
-			staticCDNHost: staticCDNHost,
-		},
-		ipccClient: http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					InsecureSkipVerify: true,
-				},
-			},
+			debug:       debug,
+			httpAddress: httpAddress,
+			appviewHost: appviewHost,
+			ogcardHost:  ogcardHost,
+			linkHost:    linkHost,
+			ipccHost:    ipccHost,
 		},
 	}
 
@@ -217,8 +204,14 @@ func serve(cctx *cli.Context) error {
 			path := c.Request().URL.Path
 			maxAge := 1 * (60 * 60) // default is 1 hour
 
-			// all assets in /static/js, /static/css, /static/media are content-hashed and can be cached for a long time
-			if strings.HasPrefix(path, "/static/js/") || strings.HasPrefix(path, "/static/css/") || strings.HasPrefix(path, "/static/media/") {
+			// Cache javascript and images files for 1 week, which works because
+			// they're always versioned (e.g. /static/js/main.64c14927.js)
+			if strings.HasPrefix(path, "/static/js/") || strings.HasPrefix(path, "/static/images/") || strings.HasPrefix(path, "/static/media/") {
+				maxAge = 7 * (60 * 60 * 24) // 1 week
+			}
+
+			// fonts can be cached for a year
+			if strings.HasSuffix(path, ".otf") {
 				maxAge = 365 * (60 * 60 * 24) // 1 year
 			}
 
@@ -253,10 +246,6 @@ func serve(cctx *cli.Context) error {
 	e.GET("/settings/external-embeds", server.WebGeneric)
 	e.GET("/settings/accessibility", server.WebGeneric)
 	e.GET("/settings/appearance", server.WebGeneric)
-	e.GET("/settings/account", server.WebGeneric)
-	e.GET("/settings/privacy-and-security", server.WebGeneric)
-	e.GET("/settings/content-and-media", server.WebGeneric)
-	e.GET("/settings/about", server.WebGeneric)
 	e.GET("/sys/debug", server.WebGeneric)
 	e.GET("/sys/debug-mod", server.WebGeneric)
 	e.GET("/sys/log", server.WebGeneric)
@@ -350,21 +339,15 @@ func (srv *Server) Shutdown() error {
 	return srv.httpd.Shutdown(ctx)
 }
 
-// NewTemplateContext returns a new pongo2 context with some default values.
-func (srv *Server) NewTemplateContext() pongo2.Context {
-	return pongo2.Context{
-		"staticCDNHost": srv.cfg.staticCDNHost,
-	}
-}
-
 func (srv *Server) errorHandler(err error, c echo.Context) {
 	code := http.StatusInternalServerError
 	if he, ok := err.(*echo.HTTPError); ok {
 		code = he.Code
 	}
 	c.Logger().Error(err)
-	data := srv.NewTemplateContext()
-	data["statusCode"] = code
+	data := pongo2.Context{
+		"statusCode": code,
+	}
 	c.Render(code, "error.html", data)
 }
 
@@ -408,18 +391,18 @@ func (srv *Server) LinkProxyMiddleware(url *url.URL) echo.MiddlewareFunc {
 
 // handler for endpoint that have no specific server-side handling
 func (srv *Server) WebGeneric(c echo.Context) error {
-	data := srv.NewTemplateContext()
+	data := pongo2.Context{}
 	return c.Render(http.StatusOK, "base.html", data)
 }
 
 func (srv *Server) WebHome(c echo.Context) error {
-	data := srv.NewTemplateContext()
+	data := pongo2.Context{}
 	return c.Render(http.StatusOK, "home.html", data)
 }
 
 func (srv *Server) WebPost(c echo.Context) error {
 	ctx := c.Request().Context()
-	data := srv.NewTemplateContext()
+	data := pongo2.Context{}
 
 	// sanity check arguments. don't 4xx, just let app handle if not expected format
 	rkeyParam := c.Param("rkey")
@@ -494,7 +477,7 @@ func (srv *Server) WebPost(c echo.Context) error {
 func (srv *Server) WebStarterPack(c echo.Context) error {
 	req := c.Request()
 	ctx := req.Context()
-	data := srv.NewTemplateContext()
+	data := pongo2.Context{}
 	data["requestURI"] = fmt.Sprintf("https://%s%s", req.Host, req.URL.Path)
 	// sanity check arguments. don't 4xx, just let app handle if not expected format
 	rkeyParam := c.Param("rkey")
@@ -532,7 +515,7 @@ func (srv *Server) WebStarterPack(c echo.Context) error {
 
 func (srv *Server) WebProfile(c echo.Context) error {
 	ctx := c.Request().Context()
-	data := srv.NewTemplateContext()
+	data := pongo2.Context{}
 
 	// sanity check arguments. don't 4xx, just let app handle if not expected format
 	handleOrDIDParam := c.Param("handleOrDID")
@@ -597,8 +580,15 @@ func (srv *Server) WebIpCC(c echo.Context) error {
 	}
 	ipccUrlBuilder.Path = "ipccdata.IpCcService/Lookup"
 	ipccUrl := ipccUrlBuilder.String()
+	cl := http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: true,
+			},
+		},
+	}
 	postBodyReader := bytes.NewReader(request)
-	response, err := srv.ipccClient.Post(ipccUrl, "application/json", postBodyReader)
+	response, err := cl.Post(ipccUrl, "application/json", postBodyReader)
 	if err != nil {
 		log.Warnf("ipcc backend error %s", err)
 		return c.JSON(500, IPCCResponse{})

bskyweb/cmd/embedr/server.go

@@ -112,8 +112,8 @@ func serve(cctx *cli.Context) error {
 		Skipper: middleware.DefaultSkipper,
 		Store: middleware.NewRateLimiterMemoryStoreWithConfig(
 			middleware.RateLimiterMemoryStoreConfig{
-				Rate:      20,              // requests per second
-				Burst:     150,             // allow bursts
+				Rate:      10,              // requests per second
+				Burst:     30,              // allow bursts
 				ExpiresIn: 3 * time.Minute, // garbage collect entries older than 3 minutes
 			},
 		),

bskyweb/templates/base.html

@@ -13,8 +13,8 @@
 
   <!-- Hello Humans! API docs at https://atproto.com -->
 
-  <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">
+  <link rel="preload" as="font" type="font/ttf" href="/static/media/InterVariable.c9f788f6e7ebaec75d7c.ttf">
+  <link rel="preload" as="font" type="font/ttf" href="/static/media/InterVariable-Italic.55d6a3f35e9b605ba6f4.ttf">
 
   <style>
     /**
@@ -24,20 +24,6 @@
      *
      * THIS NEEDS TO BE DUPLICATED IN `bskyweb/templates/base.html`
      */
-    @font-face {
-      font-family: 'InterVariable';
-      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.55d6a3f35e9b605ba6f4.ttf") format('truetype');
-      font-weight: 300 1000;
-      font-style: italic;
-      font-display: swap;
-    }
     html {
       background-color: white;
       scrollbar-gutter: stable both-edges;
@@ -67,7 +53,6 @@
       display: flex;
       flex: 1 0 auto;
       min-height: 100%;
-      width: 100%;
     }
     #splash {
       position: fixed;
@@ -76,17 +61,13 @@
       top: 50%;
       transform: translateX(-50%) translateY(-50%) translateY(-50px);
     }
-    /* We need this style to prevent web dropdowns from shifting the display when opening */
-    body {
-      width: 100%;
-    }
   </style>
 
   {% include "scripts.html" %}
-  <link rel="apple-touch-icon" sizes="180x180" href="{{ staticCDNHost }}/static/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="{{ staticCDNHost }}/static/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="{{ staticCDNHost }}/static/favicon-16x16.png">
-  <link rel="mask-icon" href="{{ staticCDNHost }}/static/safari-pinned-tab.svg" color="#1185fe">
+  <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
+  <link rel="mask-icon" href="/static/safari-pinned-tab.svg" color="#1185fe">
   <meta name="theme-color">
   <meta name="application-name" content="Bluesky">
   <meta name="generator" content="bskyweb">

bskyweb/templates/post.html

@@ -38,7 +38,6 @@
   <meta name="article:published_time" content="{{ postView.IndexedAt }}">
   <meta name="article:published_time" content="{{ postView.IndexedAt }}">
   <link rel="alternate" type="application/json+oembed" href="https://embed.bsky.app/oembed?format=json&url={{ postView.Uri | urlencode }}" />
-  <link rel="alternate" href="{{ postView.Uri }}" />
 {% endif -%}
 {%- endblock %}
 

bskyweb/templates/profile.html

@@ -37,7 +37,6 @@
   {%- if requestHost %}
   <link rel="alternate" type="application/rss+xml" href="https://{{ requestHost }}/profile/{{ profileView.Did }}/rss">
   {% endif %}
-  <link rel="alternate" href="at://{{ profileView.Did }}/app.bsky.actor.profile/self" />
 {% endif -%}
 {%- endblock %}
 

docs/build.md

@@ -1,17 +1,6 @@
 # Build instructions
 
-## Running Web App
-
-- `yarn`
-- `yarn web`
-
-You're all set!
-
-## iOS/Android Build
-
-### Native Environment Setup
-
-This is NOT required when developing for web.
+## App Build
 
 - Set up your environment [using the expo instructions](https://docs.expo.dev/guides/local-app-development/).
   - make sure that the JAVA_HOME points to the zulu-17 directory in your `.zshrc` or `.bashrc` file: `export JAVA_HOME=/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home`. DO NOT use another JDK or you will encounter build errors.
@@ -33,68 +22,7 @@ This is NOT required when developing for web.
 - After initial setup:
   - Copy `google-services.json.example` to `google-services.json` or provide your own `google-services.json`. (A real firebase project is NOT required)
   - `npx expo prebuild` -> you will also need to run this anytime `app.json` or native `package.json` deps change
- 
-### Running the Native App
-
-- iOS: `yarn ios`
-  - Xcode must be installed for this to run.
-    - A simulator must be preconfigured in Xcode settings.
-      - if no iOS versions are available, install the iOS runtime at `Xcode > Settings > Platforms`.
-      - if the simulator download keeps failing you can download it from the developer website.
-        - [Apple Developer](https://developer.apple.com/download/all/?q=Simulator%20Runtime)
-        - `xcode-select -s /Applications/Xcode.app`
-        - `xcodebuild -runFirstLaunch`
-        - `xcrun simctl runtime add "~/Downloads/iOS_17.4_Simulator_Runtime.dmg"` (adapt the path to the downloaded file)
-    - In addition, ensure Xcode Command Line Tools are installed using `xcode-select --install`.
-  - Expo will require you to configure Xcode Signing. Follow the linked instructions. Error messages in Xcode related to the signing process can be safely ignored when installing on the iOS Simulator; Expo merely requires the profile to exist in order to install the app on the Simulator.
-    - Make sure you do have a certificate: open Xcode > Settings > Accounts > (sign-in) > Manage Certificates > + > Apple Development > Done.
-    - If you still encounter issues, try `rm -rf ios` before trying to build again (`yarn ios`)
-- Android: `yarn android`
-  - Install "Android Studio"
-    - Make sure you have the Android SDK installed (Android Studio > Tools > Android SDK).
-      - In "SDK Platforms": "Android x" (where x is Android's current version).
-      - In "SDK Tools": "Android SDK Build-Tools" and "Android Emulator" are required.
-      - Add `export ANDROID_HOME=/Users/<your_username>/Library/Android/sdk` to your `.zshrc` or `.bashrc` (and restart your terminal).
-    - Setup an emulator (Android Studio > Tools > Device Manager).
-- Web: `yarn web` (see the top of this file).
-
-After you do `yarn ios` and `yarn android` once, you can later just run `yarn web` and then press either `i` or `a` to open iOS and Android emulators respectively which is much faster. However, if you make native changes, you'll have to do `yarn prebuild -p ios` and `yarn prebuild -p android` and then `yarn ios` and `yarn android` again before you can continue with the same workflow.
-
-### Tips
-
-- Copy the `.env.example` to `.env` and fill in any necessary tokens. (The Sentry token is NOT required; see instructions below if you want to enable Sentry.)
-- To run on the device, add `--device` to the command (e.g. `yarn android --device`). To build in production mode (slower build, faster app), also add `--variant release`.
-- If you want to use Expo EAS on your own builds without ejecting from Expo, make sure to change the `owner` and `extra.eas.projectId` properties. If you do not have an Expo account, you may remove these properties.
-- `npx react-native info` Checks what has been installed.
-- If the Android simulator frequently hangs or is very sluggish, [bump its memory limit](https://stackoverflow.com/a/40068396)
-- The Android simulator won't be able to access localhost services unless you run `adb reverse tcp:{PORT} tcp:{PORT}`
-  - For instance, the locally-hosted dev-wallet will need `adb reverse tcp:3001 tcp:3001`
-- For some reason, the typescript compiler chokes on platform-specific files (e.g. `foo.native.ts`) but only when compiling for Web thus far. Therefore we always have one version of the file that doesn't use a platform specifier, and that should be the Web version. ([More info](https://stackoverflow.com/questions/44001050/platform-specific-import-component-in-react-native-with-typescript).)
-
-### Running E2E Tests
-
-- Start in various console tabs:
-  - `yarn e2e:mock-server`
-  - `yarn e2e:metro`
-- Run once: `yarn e2e:build`
-- Each test run: `yarn e2e:run`
-
-### Adding Sentry
-
-Adding Sentry is NOT required. You can keep `SENTRY_AUTH_TOKEN=` in `.env` which will build the app without Sentry.
-
-However, if you're a part of the Bluesky team and want to enable Sentry, fill in `SENTRY_AUTH_TOKEN` in your `.env`. It can be created on the Sentry dashboard using [these instructions](https://docs.expo.dev/guides/using-sentry/#sign-up-for-a-sentry-account-and-create-a-project).
-
-If you change `SENTRY_AUTH_TOKEN`, you need to do `yarn prebuild` before running `yarn ios` or `yarn android` again.
-
-### Adding and Updating Locales
-
-- `yarn intl:build` -> you will also need to run this anytime `./src/locale/{locale}/messages.po` change
-
-## Running the Backend Locally
-
-This is NOT required for app development but if you also want to develop the Bluesky *backend* locally too, you'll need this.
-
+  - `yarn intl:build` -> you will also need to run this anytime `./src/locale/{locale}/messages.po` change
 - Start the dev servers
   - `git clone git@github.com:bluesky-social/atproto.git`
   - `cd atproto`
@@ -105,13 +33,55 @@ This is NOT required for app development but if you also want to develop the Blu
   - Start the docker daemon (on MacOS this entails starting the Docker Desktop app)
   - Launch a Postgres database on port 5432
   - `cd packages/dev-env && pnpm start`
+- Run the dev app
+  - iOS: `yarn ios`
+    - Xcode must be installed for this to run.
+      - A simulator must be preconfigured in Xcode settings.
+        - if no iOS versions are available, install the iOS runtime at `Xcode > Settings > Platforms`.
+        - if the simulator download keeps failing you can download it from the developer website.
+          - [Apple Developer](https://developer.apple.com/download/all/?q=Simulator%20Runtime)
+          - `xcode-select -s /Applications/Xcode.app`
+          - `xcodebuild -runFirstLaunch`
+          - `xcrun simctl runtime add "~/Downloads/iOS_17.4_Simulator_Runtime.dmg"` (adapt the path to the downloaded file)
+      - In addition, ensure Xcode Command Line Tools are installed using `xcode-select --install`.
+    - Expo will require you to configure Xcode Signing. Follow the linked instructions. Error messages in Xcode related to the signing process can be safely ignored when installing on the iOS Simulator; Expo merely requires the profile to exist in order to install the app on the Simulator.
+      - Make sure you do have a certificate: open Xcode > Settings > Accounts > (sign-in) > Manage Certificates > + > Apple Development > Done.
+      - If you still encounter issues, try `rm -rf ios` before trying to build again (`yarn ios`)
+  - Android: `yarn android`
+    - Install "Android Studio"
+      - Make sure you have the Android SDK installed (Android Studio > Tools > Android SDK).
+        - In "SDK Platforms": "Android x" (where x is Android's current version).
+        - In "SDK Tools": "Android SDK Build-Tools" and "Android Emulator" are required.
+        - Add `export ANDROID_HOME=/Users/<your_username>/Library/Android/sdk` to your `.zshrc` or `.bashrc` (and restart your terminal).
+      - Setup an emulator (Android Studio > Tools > Device Manager).
+  - Web: `yarn web`
+- If you are cloning or forking this repo as an open-source developer, please check the tips below as well
+- Run e2e tests
+  - Start in various console tabs:
+    - `yarn e2e:mock-server`
+    - `yarn e2e:metro`
+  - Run once: `yarn e2e:build`
+  - Each test run: `yarn e2e:run`
+- Tips
+  - Copy the `.env.example` to `.env` and fill in any necessary tokens. (The Sentry token is NOT required; see instructions below if you want to enable Sentry.)
+  - To run on the device, add `--device` to the command (e.g. `yarn android --device`). To build in production mode (slower build, faster app), also add `--variant release`.
+  - If you want to use Expo EAS on your own builds without ejecting from Expo, make sure to change the `owner` and `extra.eas.projectId` properties. If you do not have an Expo account, you may remove these properties.
+  - `npx react-native info` Checks what has been installed.
+  - If the Android simulator frequently hangs or is very sluggish, [bump its memory limit](https://stackoverflow.com/a/40068396)
+  - The Android simulator won't be able to access localhost services unless you run `adb reverse tcp:{PORT} tcp:{PORT}`
+    - For instance, the locally-hosted dev-wallet will need `adb reverse tcp:3001 tcp:3001`
+  - For some reason, the typescript compiler chokes on platform-specific files (e.g. `foo.native.ts`) but only when compiling for Web thus far. Therefore we always have one version of the file that doesn't use a platform specifier, and that should be the Web version. ([More info](https://stackoverflow.com/questions/44001050/platform-specific-import-component-in-react-native-with-typescript).)
 
-Then, when logging in or creating an account, point it to the localhost port of the devserver.
+### Adding Sentry
+
+Adding Sentry is NOT required. You can keep `SENTRY_AUTH_TOKEN=` in `.env` which will build the app without Sentry.
+
+However, if you're a part of the Bluesky team and want to enable Sentry, fill in `SENTRY_AUTH_TOKEN` in your `.env`. It can be created on the Sentry dashboard using [these instructions](https://docs.expo.dev/guides/using-sentry/#sign-up-for-a-sentry-account-and-create-a-project).
+
+If you change `SENTRY_AUTH_TOKEN`, you need to do `yarn prebuild` before running `yarn ios` or `yarn android` again.
 
 ## Go-Server Build
 
-The Go server in this repository is only used for serving the web app in production. Usually you won't need to touch it.
-
 ### Prerequisites
 
 - [Go](https://go.dev/)

jest/jestSetup.js

@@ -96,11 +96,6 @@ jest.mock('expo-modules-core', () => ({
         getIsReducedMotionEnabled: () => false,
       }
     }
-    if (moduleName === 'BottomSheet') {
-      return {
-        dismissAll: () => {},
-      }
-    }
   }),
   requireNativeViewManager: jest.fn().mockImplementation(moduleName => {
     return () => null

lib/react-compiler-runtime/index.js

@@ -0,0 +1,21 @@
+const React = require('react')
+const $empty = Symbol.for('react.memo_cache_sentinel')
+/**
+ * DANGER: this hook is NEVER meant to be called directly!
+ *
+ * Note that this is a temporary userspace implementation of this function
+ * from React 19. It is not as efficient and may invalidate more frequently
+ * than the official API. Please upgrade to React 19 as soon as you can.
+ **/
+export function c(size) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  return React.useState(() => {
+    const $ = new Array(size)
+    for (let ii = 0; ii < size; ii++) {
+      $[ii] = $empty
+    }
+    // @ts-ignore
+    $[$empty] = true
+    return $
+  })[0]
+}

lib/react-compiler-runtime/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "react-compiler-runtime",
+  "version": "0.0.1",
+  "license": "MIT",
+  "main": "index.js",
+  "peerDependencies": {
+    "react": "^18.2.0"
+  }
+}

lingui.config.js

@@ -4,24 +4,20 @@ module.exports = {
     'en',
     'ca',
     'de',
-    'en-GB',
     'es',
     'fi',
     'fr',
     'ga',
     'hi',
-    'hu',
     'id',
     'it',
     'ja',
     'ko',
     'pt-BR',
     'ru',
-    'th',
     'tr',
     'uk',
     'zh-CN',
-    'zh-HK',
     'zh-TW',
   ],
   catalogs: [

metro.config.js

@@ -6,42 +6,15 @@ cfg.resolver.sourceExts = process.env.RN_SRC_EXT
   ? process.env.RN_SRC_EXT.split(',').concat(cfg.resolver.sourceExts)
   : cfg.resolver.sourceExts
 
-if (cfg.resolver.resolveRequest) {
-  throw Error('Update this override because it is conflicting now.')
-}
-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.
-  if (moduleName.startsWith('multiformats/hashes/hasher')) {
-    return context.resolveRequest(
-      context,
-      'multiformats/dist/src/hashes/hasher',
-      platform,
-    )
-  }
-  if (moduleName.startsWith('multiformats/cid')) {
-    return context.resolveRequest(
-      context,
-      'multiformats/dist/src/cid',
-      platform,
-    )
-  }
-  if (moduleName === '@ipld/dag-cbor') {
-    return context.resolveRequest(context, '@ipld/dag-cbor/src', platform)
-  }
-  return context.resolveRequest(context, moduleName, platform)
-}
-
 cfg.transformer.getTransformOptions = async () => ({
   transform: {
     experimentalImportSupport: true,
     inlineRequires: true,
     nonInlinedRequires: [
       // We can remove this option and rely on the default after
-      // https://github.com/facebook/metro/pull/1390 is released.
+      // https://github.com/facebook/metro/pull/1126 is released.
       'React',
       'react',
-      'react-compiler-runtime',
       'react/jsx-dev-runtime',
       'react/jsx-runtime',
       'react-native',

modules/BlueskyClip/ViewController.swift

@@ -34,7 +34,6 @@ class ViewController: UIViewController, WKScriptMessageHandler, WKNavigationDele
     webView.navigationDelegate = self
     self.view.addSubview(webView)
     self.webView = webView
-    self.webView?.load(URLRequest(url: URL(string: "https://bsky.app/?splash=true&clip=true")!))
   }
 
   func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
@@ -43,14 +42,16 @@ class ViewController: UIViewController, WKScriptMessageHandler, WKNavigationDele
           let payload = try? JSONDecoder().decode(WebViewActionPayload.self, from: data) else {
       return
     }
-    
+
     switch payload.action {
     case .present:
-      self.presentAppStoreOverlay()
-
-      if let url = self.starterPackUrl {
-        defaults?.setValue(url.absoluteString, forKey: "starterPackUri")
+      guard let url = self.starterPackUrl else {
+        return
       }
+
+      self.presentAppStoreOverlay()
+      defaults?.setValue(url.absoluteString, forKey: "starterPackUri")
+
     case .store:
       guard let keyToStoreAs = payload.keyToStoreAs, let jsonToStore = payload.jsonToStore else {
         return
@@ -65,51 +66,23 @@ class ViewController: UIViewController, WKScriptMessageHandler, WKNavigationDele
     guard let url = navigationAction.request.url else {
       return .allow
     }
-    
+
     // Store the previous one to compare later, but only set starterPackUrl when we find the right one
     prevUrl = url
     // pathComponents starts with "/" as the first component, then each path name. so...
     // ["/", "start", "name", "rkey"]
-    if isStarterPackUrl(url){
+    if url.pathComponents.count == 4,
+       url.pathComponents[1] == "start" {
       self.starterPackUrl = url
     }
-    
+
     return .allow
   }
-  
-  func isStarterPackUrl(_ url: URL) -> Bool {
-    var host: String?
-    if #available(iOS 16.0, *) {
-      host = url.host()
-    } else {
-      host = url.host
-    }
-    
-    switch host {
-    case "bsky.app":
-      if url.pathComponents.count == 4,
-         (url.pathComponents[1] == "start" || url.pathComponents[1] == "starter-pack") {
-        return true
-      }
-      return false
-    case "go.bsky.app":
-      if url.pathComponents.count == 2 {
-        return true
-      }
-      return false
-    default:
-      return false
-    }
-  }
 
   func handleURL(url: URL) {
-    if isStarterPackUrl(url) {
-      let urlString = "\(url.absoluteString)?clip=true"
-      if let url = URL(string: urlString) {
-        self.webView?.load(URLRequest(url: url))
-      }
-    } else {
-      self.webView?.load(URLRequest(url: URL(string: "https://bsky.app/?splash=true&clip=true")!))
+    let urlString = "\(url.absoluteString)?clip=true"
+    if let url = URL(string: urlString) {
+      self.webView?.load(URLRequest(url: url))
     }
   }
 

modules/Share-with-Bluesky/ShareViewController.swift

@@ -1,5 +1,4 @@
 import UIKit
-import AVKit
 
 let IMAGE_EXTENSIONS: [String] = ["png", "jpg", "jpeg", "gif", "heic"]
 let MOVIE_EXTENSIONS: [String] = ["mov", "mp4", "m4v"]
@@ -120,11 +119,16 @@ class ShareViewController: UIViewController {
   private func handleVideos(items: [NSItemProvider]) async {
     let firstItem = items.first
 
-    if let dataUrl = try? await firstItem?.loadItem(forTypeIdentifier: "public.movie") as? URL {
-      let ext = String(dataUrl.lastPathComponent.split(separator: ".").last ?? "mp4")
-      if let videoUriInfo = saveVideoWithInfo(dataUrl),
-         let url = URL(string: "\(self.appScheme)://intent/compose?videoUri=\(videoUriInfo)") {
-        _ = self.openURL(url)
+    if let dataUri = try? await firstItem?.loadItem(forTypeIdentifier: "public.movie") as? URL {
+      let ext = String(dataUri.lastPathComponent.split(separator: ".").last ?? "mp4")
+      if let tempUrl = getTempUrl(ext: ext) {
+        let data = try? Data(contentsOf: dataUri)
+        try? data?.write(to: tempUrl)
+
+        if let encoded = tempUrl.absoluteString.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed),
+           let url = URL(string: "\(self.appScheme)://intent/compose?videoUri=\(encoded)") {
+          _ = self.openURL(url)
+        }
       }
     }
 
@@ -149,24 +153,6 @@ class ShareViewController: UIViewController {
     return nil
   }
 
-  private func saveVideoWithInfo(_ dataUrl: URL) -> String? {
-    let ext = String(dataUrl.lastPathComponent.split(separator: ".").last ?? "mp4")
-    guard let tempUrl = getTempUrl(ext: ext) else {
-      return nil
-    }
-
-    let data = try? Data(contentsOf: dataUrl)
-    try? data?.write(to: tempUrl)
-
-    guard let track = AVURLAsset(url: dataUrl).tracks(withMediaType: AVMediaType.video).first else {
-      _ = try? FileManager().removeItem(at: tempUrl)
-      return nil
-    }
-
-    let size = track.naturalSize.applying(track.preferredTransform)
-    return "\(tempUrl.absoluteString)|\(size.width)|\(size.height)"
-  }
-
   private func completeRequest() {
     self.extensionContext?.completeRequest(returningItems: nil)
   }

modules/bottom-sheet/android/build.gradle

@@ -1,49 +0,0 @@
-apply plugin: 'com.android.library'
-
-group = 'expo.modules.bottomsheet'
-version = '0.1.0'
-
-def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-apply from: expoModulesCorePlugin
-applyKotlinExpoModulesCorePlugin()
-useCoreDependencies()
-useExpoPublishing()
-
-// If you want to use the managed Android SDK versions from expo-modules-core, set this to true.
-// The Android SDK versions will be bumped from time to time in SDK releases and may introduce breaking changes in your module code.
-// Most of the time, you may like to manage the Android SDK versions yourself.
-def useManagedAndroidSdkVersions = false
-if (useManagedAndroidSdkVersions) {
-  useDefaultAndroidSdkVersions()
-} else {
-  buildscript {
-    // Simple helper that allows the root project to override versions declared by this library.
-    ext.safeExtGet = { prop, fallback ->
-      rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-    }
-  }
-  project.android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 21)
-      targetSdkVersion safeExtGet("targetSdkVersion", 34)
-    }
-  }
-}
-
-android {
-  namespace "expo.modules.bottomsheet"
-  defaultConfig {
-    versionCode 1
-    versionName "0.1.0"
-  }
-  lintOptions {
-    abortOnError false
-  }
-}
-
-dependencies {
-  implementation project(':expo-modules-core')
-  implementation 'com.google.android.material:material:1.12.0'
-  implementation "com.facebook.react:react-native:+"
-}

modules/bottom-sheet/android/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<manifest>
-</manifest>

modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetModule.kt

@@ -1,53 +0,0 @@
-package expo.modules.bottomsheet
-
-import expo.modules.kotlin.modules.Module
-import expo.modules.kotlin.modules.ModuleDefinition
-
-class BottomSheetModule : Module() {
-  override fun definition() =
-    ModuleDefinition {
-      Name("BottomSheet")
-
-      AsyncFunction("dismissAll") {
-        SheetManager.dismissAll()
-      }
-
-      View(BottomSheetView::class) {
-        Events(
-          arrayOf(
-            "onAttemptDismiss",
-            "onSnapPointChange",
-            "onStateChange",
-          ),
-        )
-
-        AsyncFunction("dismiss") { view: BottomSheetView ->
-          view.dismiss()
-        }
-
-        AsyncFunction("updateLayout") { view: BottomSheetView ->
-          view.updateLayout()
-        }
-
-        Prop("disableDrag") { view: BottomSheetView, prop: Boolean ->
-          view.disableDrag = prop
-        }
-
-        Prop("minHeight") { view: BottomSheetView, prop: Float ->
-          view.minHeight = prop
-        }
-
-        Prop("maxHeight") { view: BottomSheetView, prop: Float ->
-          view.maxHeight = prop
-        }
-
-        Prop("preventDismiss") { view: BottomSheetView, prop: Boolean ->
-          view.preventDismiss = prop
-        }
-
-        Prop("preventExpansion") { view: BottomSheetView, prop: Boolean ->
-          view.preventExpansion = prop
-        }
-      }
-    }
-}

modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt

@@ -1,344 +0,0 @@
-package expo.modules.bottomsheet
-
-import android.content.Context
-import android.util.DisplayMetrics
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewStructure
-import android.view.accessibility.AccessibilityEvent
-import android.widget.FrameLayout
-import androidx.core.view.allViews
-import com.facebook.react.bridge.LifecycleEventListener
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.UiThreadUtil
-import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.events.EventDispatcher
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import expo.modules.kotlin.AppContext
-import expo.modules.kotlin.viewevent.EventDispatcher
-import expo.modules.kotlin.views.ExpoView
-
-
-class BottomSheetView(
-  context: Context,
-  appContext: AppContext,
-) : ExpoView(context, appContext),
-  LifecycleEventListener {
-  private var innerView: View? = null
-  private var dialog: BottomSheetDialog? = null
-
-  private lateinit var dialogRootViewGroup: DialogRootViewGroup
-  private var eventDispatcher: EventDispatcher? = null
-
-  private val screenHeight =
-    context.resources.displayMetrics.heightPixels
-      .toFloat()
-
-  private val onAttemptDismiss by EventDispatcher()
-  private val onSnapPointChange by EventDispatcher()
-  private val onStateChange by EventDispatcher()
-
-  // Props
-  var disableDrag = false
-    set (value) {
-      field = value
-      this.setDraggable(!value)
-    }
-
-  var preventDismiss = false
-    set(value) {
-      field = value
-      this.dialog?.setCancelable(!value)
-    }
-  var preventExpansion = false
-
-  var minHeight = 0f
-    set(value) {
-      field =
-        if (value < 0) {
-          0f
-        } else {
-          dpToPx(value)
-        }
-    }
-
-  var maxHeight = this.screenHeight
-    set(value) {
-      val px = dpToPx(value)
-      field =
-        if (px > this.screenHeight) {
-          this.screenHeight
-        } else {
-          px
-        }
-    }
-
-  private var isOpen: Boolean = false
-    set(value) {
-      field = value
-      onStateChange(
-        mapOf(
-          "state" to if (value) "open" else "closed",
-        ),
-      )
-    }
-
-  private var isOpening: Boolean = false
-    set(value) {
-      field = value
-      if (value) {
-        onStateChange(
-          mapOf(
-            "state" to "opening",
-          ),
-        )
-      }
-    }
-
-  private var isClosing: Boolean = false
-    set(value) {
-      field = value
-      if (value) {
-        onStateChange(
-          mapOf(
-            "state" to "closing",
-          ),
-        )
-      }
-    }
-
-  private var selectedSnapPoint = 0
-    set(value) {
-      if (field == value) return
-
-      field = value
-      onSnapPointChange(
-        mapOf(
-          "snapPoint" to value,
-        ),
-      )
-    }
-
-  // Lifecycle
-
-  init {
-    (appContext.reactContext as? ReactContext)?.let {
-      it.addLifecycleEventListener(this)
-      this.eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(it, this.id)
-
-      this.dialogRootViewGroup = DialogRootViewGroup(context)
-      this.dialogRootViewGroup.eventDispatcher = this.eventDispatcher
-    }
-    SheetManager.add(this)
-  }
-
-  override fun onLayout(
-    changed: Boolean,
-    l: Int,
-    t: Int,
-    r: Int,
-    b: Int,
-  ) {
-    this.present()
-  }
-
-  private fun destroy() {
-    this.isClosing = false
-    this.isOpen = false
-    this.dialog = null
-    this.innerView = null
-    SheetManager.remove(this)
-  }
-
-  // Presentation
-
-  private fun present() {
-    if (this.isOpen || this.isOpening || this.isClosing) return
-
-    val contentHeight = this.getContentHeight()
-    val dialog = BottomSheetDialog(context)
-    dialog.setContentView(dialogRootViewGroup)
-    dialog.setCancelable(!preventDismiss)
-    dialog.setOnDismissListener {
-      this.isClosing = true
-      this.destroy()
-    }
-
-    val bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
-    bottomSheet?.let {
-      it.setBackgroundColor(0)
-
-      val behavior = BottomSheetBehavior.from(it)
-      behavior.state = BottomSheetBehavior.STATE_HIDDEN
-      behavior.isFitToContents = true
-      behavior.halfExpandedRatio = this.clampRatio(this.getTargetHeight() / this.screenHeight)
-      behavior.skipCollapsed = true
-      behavior.isDraggable = true
-      behavior.isHideable = true
-
-      if (contentHeight >= this.screenHeight || this.minHeight >= this.screenHeight) {
-        behavior.state = BottomSheetBehavior.STATE_EXPANDED
-        this.selectedSnapPoint = 2
-      } else {
-        behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
-        this.selectedSnapPoint = 1
-      }
-
-      behavior.addBottomSheetCallback(
-        object : BottomSheetBehavior.BottomSheetCallback() {
-          override fun onStateChanged(
-            bottomSheet: View,
-            newState: Int,
-          ) {
-            when (newState) {
-              BottomSheetBehavior.STATE_EXPANDED -> {
-                selectedSnapPoint = 2
-              }
-              BottomSheetBehavior.STATE_COLLAPSED -> {
-                selectedSnapPoint = 1
-              }
-              BottomSheetBehavior.STATE_HALF_EXPANDED -> {
-                selectedSnapPoint = 1
-              }
-              BottomSheetBehavior.STATE_HIDDEN -> {
-                selectedSnapPoint = 0
-              }
-            }
-          }
-
-          override fun onSlide(
-            bottomSheet: View,
-            slideOffset: Float,
-          ) { }
-        },
-      )
-    }
-    this.isOpening = true
-    dialog.show()
-    this.dialog = dialog
-  }
-
-  fun updateLayout() {
-    val dialog = this.dialog ?: return
-    val contentHeight = this.getContentHeight()
-
-    val bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
-    bottomSheet?.let {
-      val behavior = BottomSheetBehavior.from(it)
-
-      behavior.halfExpandedRatio = this.clampRatio(this.getTargetHeight() / this.screenHeight)
-
-      if (contentHeight > this.screenHeight && behavior.state != BottomSheetBehavior.STATE_EXPANDED) {
-        behavior.state = BottomSheetBehavior.STATE_EXPANDED
-      } else if (contentHeight < this.screenHeight && behavior.state != BottomSheetBehavior.STATE_HALF_EXPANDED) {
-        behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
-      }
-    }
-  }
-
-  fun dismiss() {
-    this.dialog?.dismiss()
-  }
-
-  // Util
-
-  private fun getContentHeight(): Float {
-    val innerView = this.innerView ?: return 0f
-    var index = 0
-    innerView.allViews.forEach {
-      if (index == 1) {
-        return it.height.toFloat()
-      }
-      index++
-    }
-    return 0f
-  }
-
-  private fun getTargetHeight(): Float {
-    val contentHeight = this.getContentHeight()
-    val height =
-      if (contentHeight > maxHeight) {
-        maxHeight
-      } else if (contentHeight < minHeight) {
-        minHeight
-      } else {
-        contentHeight
-      }
-    return height
-  }
-
-  private fun clampRatio(ratio: Float): Float {
-    if (ratio < 0.01) {
-      return 0.01f
-    } else if (ratio > 0.99) {
-      return 0.99f
-    }
-    return ratio
-  }
-
-  private fun setDraggable(draggable: Boolean) {
-    val dialog = this.dialog ?: return
-    val bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
-    bottomSheet?.let {
-      val behavior = BottomSheetBehavior.from(it)
-      behavior.isDraggable = draggable
-    }
-  }
-
-  override fun onHostResume() { }
-
-  override fun onHostPause() { }
-
-  override fun onHostDestroy() {
-    (appContext.reactContext as? ReactContext)?.let {
-      it.removeLifecycleEventListener(this)
-      this.destroy()
-    }
-  }
-
-  // View overrides to pass to DialogRootViewGroup instead
-
-  override fun dispatchProvideStructure(structure: ViewStructure?) {
-    dialogRootViewGroup.dispatchProvideStructure(structure)
-  }
-
-  override fun setId(id: Int) {
-    super.setId(id)
-    dialogRootViewGroup.id = id
-  }
-
-  override fun addView(
-    child: View?,
-    index: Int,
-  ) {
-    this.innerView = child
-    (child as ViewGroup).let {
-      dialogRootViewGroup.addView(child, index)
-    }
-  }
-
-  override fun removeView(view: View?) {
-    UiThreadUtil.assertOnUiThread()
-    if (view != null) {
-      dialogRootViewGroup.removeView(view)
-    }
-  }
-
-  override fun removeViewAt(index: Int) {
-    UiThreadUtil.assertOnUiThread()
-    val child = getChildAt(index)
-    dialogRootViewGroup.removeView(child)
-  }
-
-  override fun addChildrenForAccessibility(outChildren: ArrayList<View>?) { }
-
-  override fun dispatchPopulateAccessibilityEvent(event: AccessibilityEvent?): Boolean = false
-
-  // https://stackoverflow.com/questions/11862391/getheight-px-or-dpi
-  fun dpToPx(dp: Float): Float {
-    val displayMetrics = context.resources.displayMetrics
-    val px = dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)
-    return px
-  }
-}

modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/DialogRootViewGroup.kt

@@ -1,171 +0,0 @@
-package expo.modules.bottomsheet
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.view.MotionEvent
-import android.view.View
-import com.facebook.react.bridge.GuardedRunnable
-import com.facebook.react.config.ReactFeatureFlags
-import com.facebook.react.uimanager.JSPointerDispatcher
-import com.facebook.react.uimanager.JSTouchDispatcher
-import com.facebook.react.uimanager.RootView
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.UIManagerModule
-import com.facebook.react.uimanager.events.EventDispatcher
-import com.facebook.react.views.view.ReactViewGroup
-
-// SEE https://github.com/facebook/react-native/blob/309cdea337101cfe2212cfb6abebf1e783e43282/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt#L378
-
-/**
- * DialogRootViewGroup is the ViewGroup which contains all the children of a Modal. It gets all
- * child information forwarded from [ReactModalHostView] and uses that to create children. It is
- * also responsible for acting as a RootView and handling touch events. It does this the same way
- * as ReactRootView.
- *
- * To get layout to work properly, we need to layout all the elements within the Modal as if they
- * can fill the entire window. To do that, we need to explicitly set the styleWidth and
- * styleHeight on the LayoutShadowNode to be the window size. This is done through the
- * UIManagerModule, and will then cause the children to layout as if they can fill the window.
- */
-class DialogRootViewGroup(
-  private val context: Context?,
-) : ReactViewGroup(context),
-  RootView {
-  private var hasAdjustedSize = false
-  private var viewWidth = 0
-  private var viewHeight = 0
-
-  private val jSTouchDispatcher = JSTouchDispatcher(this)
-  private var jSPointerDispatcher: JSPointerDispatcher? = null
-  private var sizeChangeListener: OnSizeChangeListener? = null
-
-  var eventDispatcher: EventDispatcher? = null
-
-  interface OnSizeChangeListener {
-    fun onSizeChange(
-      width: Int,
-      height: Int,
-    )
-  }
-
-  init {
-    if (ReactFeatureFlags.dispatchPointerEvents) {
-      jSPointerDispatcher = JSPointerDispatcher(this)
-    }
-  }
-
-  override fun onSizeChanged(
-    w: Int,
-    h: Int,
-    oldw: Int,
-    oldh: Int,
-  ) {
-    super.onSizeChanged(w, h, oldw, oldh)
-
-    viewWidth = w
-    viewHeight = h
-    updateFirstChildView()
-
-    sizeChangeListener?.onSizeChange(w, h)
-  }
-
-  fun setOnSizeChangeListener(listener: OnSizeChangeListener) {
-    sizeChangeListener = listener
-  }
-
-  private fun updateFirstChildView() {
-    if (childCount > 0) {
-      hasAdjustedSize = false
-      val viewTag = getChildAt(0).id
-      reactContext.runOnNativeModulesQueueThread(
-        object : GuardedRunnable(reactContext) {
-          override fun runGuarded() {
-            val uiManager: UIManagerModule =
-              reactContext
-                .reactApplicationContext
-                .getNativeModule(UIManagerModule::class.java) ?: return
-
-            uiManager.updateNodeSize(viewTag, viewWidth, viewHeight)
-          }
-        },
-      )
-    } else {
-      hasAdjustedSize = true
-    }
-  }
-
-  override fun addView(
-    child: View,
-    index: Int,
-    params: LayoutParams,
-  ) {
-    super.addView(child, index, params)
-    if (hasAdjustedSize) {
-      updateFirstChildView()
-    }
-  }
-
-  override fun handleException(t: Throwable) {
-    reactContext.reactApplicationContext.handleException(RuntimeException(t))
-  }
-
-  private val reactContext: ThemedReactContext
-    get() = context as ThemedReactContext
-
-  override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jSTouchDispatcher.handleTouchEvent(event, it) }
-    jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
-    return super.onInterceptTouchEvent(event)
-  }
-
-  @SuppressLint("ClickableViewAccessibility")
-  override fun onTouchEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jSTouchDispatcher.handleTouchEvent(event, it) }
-    jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
-    super.onTouchEvent(event)
-
-    // In case when there is no children interested in handling touch event, we return true from
-    // the root view in order to receive subsequent events related to that gesture
-    return true
-  }
-
-  override fun onInterceptHoverEvent(event: MotionEvent): Boolean {
-    jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
-    return super.onHoverEvent(event)
-  }
-
-  override fun onHoverEvent(event: MotionEvent): Boolean {
-    jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
-    return super.onHoverEvent(event)
-  }
-
-  @Deprecated("Deprecated in Java")
-  override fun onChildStartedNativeGesture(ev: MotionEvent?) {
-    eventDispatcher?.let {
-      if (ev != null) {
-        jSTouchDispatcher.onChildStartedNativeGesture(ev, it)
-      }
-    }
-  }
-
-  override fun onChildStartedNativeGesture(
-    childView: View,
-    ev: MotionEvent,
-  ) {
-    eventDispatcher?.let { jSTouchDispatcher.onChildStartedNativeGesture(ev, it) }
-    jSPointerDispatcher?.onChildStartedNativeGesture(childView, ev, eventDispatcher)
-  }
-
-  override fun onChildEndedNativeGesture(
-    childView: View,
-    ev: MotionEvent,
-  ) {
-    eventDispatcher?.let { jSTouchDispatcher.onChildEndedNativeGesture(ev, it) }
-    jSPointerDispatcher?.onChildEndedNativeGesture()
-  }
-
-  override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-    // No-op - override in order to still receive events to onInterceptTouchEvent
-    // even when some other view disallow that
-  }
-}

modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/SheetManager.kt

@@ -1,28 +0,0 @@
-package expo.modules.bottomsheet
-
-import java.lang.ref.WeakReference
-
-class SheetManager {
-  companion object {
-    private val sheets = mutableSetOf<WeakReference<BottomSheetView>>()
-
-    fun add(view: BottomSheetView) {
-      sheets.add(WeakReference(view))
-    }
-
-    fun remove(view: BottomSheetView) {
-      sheets.forEach {
-        if (it.get() == view) {
-          sheets.remove(it)
-          return
-        }
-      }
-    }
-
-    fun dismissAll() {
-      sheets.forEach {
-        it.get()?.dismiss()
-      }
-    }
-  }
-}

modules/bottom-sheet/expo-module.config.json

@@ -1,9 +0,0 @@
-{
-  "platforms": ["ios", "android"],
-  "ios": {
-    "modules": ["BottomSheetModule"]
-  },
-  "android": {
-    "modules": ["expo.modules.bottomsheet.BottomSheetModule"]
-  }
-}

modules/bottom-sheet/index.ts

@@ -1,23 +0,0 @@
-import {BottomSheet} from './src/BottomSheet'
-import {
-  BottomSheetSnapPoint,
-  BottomSheetState,
-  BottomSheetViewProps,
-} from './src/BottomSheet.types'
-import {BottomSheetNativeComponent} from './src/BottomSheetNativeComponent'
-import {
-  BottomSheetOutlet,
-  BottomSheetPortalProvider,
-  BottomSheetProvider,
-} from './src/BottomSheetPortal'
-
-export {
-  BottomSheet,
-  BottomSheetNativeComponent,
-  BottomSheetOutlet,
-  BottomSheetPortalProvider,
-  BottomSheetProvider,
-  BottomSheetSnapPoint,
-  type BottomSheetState,
-  type BottomSheetViewProps,
-}

modules/bottom-sheet/ios/BottomSheet.podspec

@@ -1,21 +0,0 @@
-Pod::Spec.new do |s|
-  s.name           = 'BottomSheet'
-  s.version        = '1.0.0'
-  s.summary        = 'A bottom sheet for use in Bluesky'
-  s.description    = 'A bottom sheet for use in Bluesky'
-  s.author         = ''
-  s.homepage       = 'https://github.com/bluesky-social/social-app'
-  s.platforms      = { :ios => '15.0', :tvos => '15.0' }
-  s.source         = { git: '' }
-  s.static_framework = true
-
-  s.dependency 'ExpoModulesCore'
-
-  # Swift/Objective-C compatibility
-  s.pod_target_xcconfig = {
-    'DEFINES_MODULE' => 'YES',
-    'SWIFT_COMPILATION_MODE' => 'wholemodule'
-  }
-
-  s.source_files = "**/*.{h,m,swift}"
-end

modules/bottom-sheet/ios/BottomSheetModule.swift

@@ -1,47 +0,0 @@
-import ExpoModulesCore
-
-public class BottomSheetModule: Module {
-  public func definition() -> ModuleDefinition {
-    Name("BottomSheet")
-
-    AsyncFunction("dismissAll") {
-      SheetManager.shared.dismissAll()
-    }
-
-    View(SheetView.self) {
-      Events([
-        "onAttemptDismiss",
-        "onSnapPointChange",
-        "onStateChange"
-      ])
-
-      AsyncFunction("dismiss") { (view: SheetView) in
-        view.dismiss()
-      }
-
-      AsyncFunction("updateLayout") { (view: SheetView) in
-        view.updateLayout()
-      }
-
-      Prop("cornerRadius") { (view: SheetView, prop: Float) in
-        view.cornerRadius = CGFloat(prop)
-      }
-
-      Prop("minHeight") { (view: SheetView, prop: Double) in
-        view.minHeight = prop
-      }
-
-      Prop("maxHeight") { (view: SheetView, prop: Double) in
-        view.maxHeight = prop
-      }
-
-      Prop("preventDismiss") { (view: SheetView, prop: Bool) in
-        view.preventDismiss = prop
-      }
-
-      Prop("preventExpansion") { (view: SheetView, prop: Bool) in
-        view.preventExpansion = prop
-      }
-    }
-  }
-}

modules/bottom-sheet/ios/SheetManager.swift

@@ -1,28 +0,0 @@
-//
-//  SheetManager.swift
-//  Pods
-//
-//  Created by Hailey on 10/1/24.
-//
-
-import ExpoModulesCore
-
-class SheetManager {
-  static let shared = SheetManager()
-
-  private var sheetViews = NSHashTable<SheetView>(options: .weakMemory)
-
-  func add(_ view: SheetView) {
-    sheetViews.add(view)
-  }
-
-  func remove(_ view: SheetView) {
-    sheetViews.remove(view)
-  }
-
-  func dismissAll() {
-    sheetViews.allObjects.forEach { sheetView in
-      sheetView.dismiss()
-    }
-  }
-}

modules/bottom-sheet/ios/SheetView.swift

@@ -1,192 +0,0 @@
-import ExpoModulesCore
-import UIKit
-
-class SheetView: ExpoView, UISheetPresentationControllerDelegate {
-  // Views
-  private var sheetVc: SheetViewController?
-  private var innerView: UIView?
-  private var touchHandler: RCTTouchHandler?
-
-  // Events
-  private let onAttemptDismiss = EventDispatcher()
-  private let onSnapPointChange = EventDispatcher()
-  private let onStateChange = EventDispatcher()
-
-  // Open event firing
-  private var isOpen: Bool = false {
-    didSet {
-      onStateChange([
-        "state": isOpen ? "open" : "closed"
-      ])
-    }
-  }
-
-  // React view props
-  var preventDismiss = false
-  var preventExpansion = false
-  var cornerRadius: CGFloat?
-  var minHeight = 0.0
-  var maxHeight: CGFloat! {
-    didSet {
-      let screenHeight = Util.getScreenHeight() ?? 0
-      if maxHeight > screenHeight {
-        maxHeight = screenHeight
-      }
-    }
-  }
-
-  private var isOpening = false {
-    didSet {
-      if isOpening {
-        onStateChange([
-          "state": "opening"
-        ])
-      }
-    }
-  }
-  private var isClosing = false {
-    didSet {
-      if isClosing {
-        onStateChange([
-          "state": "closing"
-        ])
-      }
-    }
-  }
-  private var selectedDetentIdentifier: UISheetPresentationController.Detent.Identifier? {
-    didSet {
-      if selectedDetentIdentifier == .large {
-        onSnapPointChange([
-          "snapPoint": 2
-        ])
-      } else {
-        onSnapPointChange([
-          "snapPoint": 1
-        ])
-      }
-    }
-  }
-  private var prevLayoutDetentIdentifier: UISheetPresentationController.Detent.Identifier?
-
-  // MARK: - Lifecycle
-
-  required init (appContext: AppContext? = nil) {
-    super.init(appContext: appContext)
-    self.maxHeight = Util.getScreenHeight()
-    self.touchHandler = RCTTouchHandler(bridge: appContext?.reactBridge)
-    SheetManager.shared.add(self)
-  }
-
-  deinit {
-    self.destroy()
-  }
-
-  // We don't want this view to actually get added to the tree, so we'll simply store it for adding
-  // to the SheetViewController
-  override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    self.touchHandler?.attach(to: subview)
-    self.innerView = subview
-  }
-
-  // We'll grab the content height from here so we know the initial detent to set
-  override func layoutSubviews() {
-    super.layoutSubviews()
-
-    guard let innerView = self.innerView else {
-      return
-    }
-
-    if innerView.subviews.count != 1 {
-      return
-    }
-
-    self.present()
-  }
-
-  private func destroy() {
-    self.isClosing = false
-    self.isOpen = false
-    self.sheetVc = nil
-    self.touchHandler?.detach(from: self.innerView)
-    self.touchHandler = nil
-    self.innerView = nil
-    SheetManager.shared.remove(self)
-  }
-
-  // MARK: - Presentation
-
-  func present() {
-    guard !self.isOpen,
-          !self.isOpening,
-          !self.isClosing,
-          let innerView = self.innerView,
-          let contentHeight = innerView.subviews.first?.frame.height,
-          let rvc = self.reactViewController() else {
-      return
-    }
-
-    let sheetVc = SheetViewController()
-    sheetVc.setDetents(contentHeight: self.clampHeight(contentHeight), preventExpansion: self.preventExpansion)
-    if let sheet = sheetVc.sheetPresentationController {
-      sheet.delegate = self
-      sheet.preferredCornerRadius = self.cornerRadius
-      self.selectedDetentIdentifier = sheet.selectedDetentIdentifier
-    }
-    sheetVc.view.addSubview(innerView)
-
-    self.sheetVc = sheetVc
-    self.isOpening = true
-
-    rvc.present(sheetVc, animated: true) { [weak self] in
-      self?.isOpening = false
-      self?.isOpen = true
-    }
-  }
-
-  func updateLayout() {
-    if self.prevLayoutDetentIdentifier == self.selectedDetentIdentifier,
-       let contentHeight = self.innerView?.subviews.first?.frame.size.height {
-      self.sheetVc?.updateDetents(contentHeight: self.clampHeight(contentHeight),
-                                  preventExpansion: self.preventExpansion)
-      self.selectedDetentIdentifier = self.sheetVc?.getCurrentDetentIdentifier()
-    }
-    self.prevLayoutDetentIdentifier = self.selectedDetentIdentifier
-  }
-
-  func dismiss() {
-    self.isClosing = true
-    self.sheetVc?.dismiss(animated: true) { [weak self] in
-      self?.destroy()
-    }
-  }
-
-  // MARK: - Utils
-
-  private func clampHeight(_ height: CGFloat) -> CGFloat {
-    if height < self.minHeight {
-      return self.minHeight
-    } else if height > self.maxHeight {
-      return self.maxHeight
-    }
-    return height
-  }
-
-  // MARK: - UISheetPresentationControllerDelegate
-
-  func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool {
-    self.onAttemptDismiss()
-    return !self.preventDismiss
-  }
-
-  func presentationControllerWillDismiss(_ presentationController: UIPresentationController) {
-    self.isClosing = true
-  }
-
-  func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
-    self.destroy()
-  }
-
-  func sheetPresentationControllerDidChangeSelectedDetentIdentifier(_ sheetPresentationController: UISheetPresentationController) {
-    self.selectedDetentIdentifier = sheetPresentationController.selectedDetentIdentifier
-  }
-}

modules/bottom-sheet/ios/SheetViewController.swift

@@ -1,89 +0,0 @@
-//
-//  SheetViewController.swift
-//  Pods
-//
-//  Created by Hailey on 9/30/24.
-//
-
-import Foundation
-import UIKit
-
-class SheetViewController: UIViewController {
-  init() {
-    super.init(nibName: nil, bundle: nil)
-
-    self.modalPresentationStyle = .formSheet
-    self.isModalInPresentation = false
-
-    if let sheet = self.sheetPresentationController {
-      sheet.prefersGrabberVisible = false
-    }
-  }
-
-  func setDetents(contentHeight: CGFloat, preventExpansion: Bool) {
-    guard let sheet = self.sheetPresentationController,
-          let screenHeight = Util.getScreenHeight()
-    else {
-      return
-    }
-
-    if #available(iOS 16.0, *) {
-      if contentHeight > screenHeight - 100 {
-        sheet.detents = [
-          .large()
-        ]
-        sheet.selectedDetentIdentifier = .large
-      } else {
-        sheet.detents = [
-          .custom { _ in
-            return contentHeight
-          }
-        ]
-        if !preventExpansion {
-          sheet.detents.append(.large())
-        }
-        sheet.selectedDetentIdentifier = .medium
-      }
-    } else {
-      if contentHeight > screenHeight / 2 {
-        sheet.detents = [
-          .large()
-        ]
-        sheet.selectedDetentIdentifier = .large
-      } else {
-        sheet.detents = [
-          .medium()
-        ]
-        if !preventExpansion {
-          sheet.detents.append(.large())
-        }
-        sheet.selectedDetentIdentifier = .medium
-      }
-    }
-  }
-
-  func updateDetents(contentHeight: CGFloat, preventExpansion: Bool) {
-    if let sheet = self.sheetPresentationController {
-      // Capture `self` weakly to prevent retain cycles.
-      // Also, capture `sheet` weakly to avoid potential strong references held by animateChanges.
-      sheet.animateChanges { [weak self, weak sheet] in
-          guard let weakSelf = self, let weakSheet = sheet else { return }
-          weakSelf.setDetents(contentHeight: contentHeight, preventExpansion: preventExpansion)
-          if #available(iOS 16.0, *) {
-              weakSheet.invalidateDetents()
-          }
-      }
-    }
-  }
-
-  func getCurrentDetentIdentifier() -> UISheetPresentationController.Detent.Identifier? {
-    guard let sheet = self.sheetPresentationController else {
-      return nil
-    }
-    return sheet.selectedDetentIdentifier
-  }
-
-  required init?(coder: NSCoder) {
-    fatalError("init(coder:) has not been implemented")
-  }
-}

modules/bottom-sheet/ios/Util.swift

@@ -1,18 +0,0 @@
-//
-//  Util.swift
-//  Pods
-//
-//  Created by Hailey on 10/2/24.
-//
-
-class Util {
-  static func getScreenHeight() -> CGFloat? {
-    if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-     let window = windowScene.windows.first {
-      let safeAreaInsets = window.safeAreaInsets
-      let fullScreenHeight = UIScreen.main.bounds.height
-      return fullScreenHeight - (safeAreaInsets.top + safeAreaInsets.bottom)
-    }
-    return nil
-  }
-}

modules/bottom-sheet/src/BottomSheet.tsx

@@ -1 +0,0 @@
-export {BottomSheetNativeComponent as BottomSheet} from './BottomSheetNativeComponent'

modules/bottom-sheet/src/BottomSheet.types.ts

@@ -1,35 +0,0 @@
-import React from 'react'
-import {ColorValue, NativeSyntheticEvent} from 'react-native'
-
-export type BottomSheetState = 'closed' | 'closing' | 'open' | 'opening'
-
-export enum BottomSheetSnapPoint {
-  Hidden,
-  Partial,
-  Full,
-}
-
-export type BottomSheetAttemptDismissEvent = NativeSyntheticEvent<object>
-export type BottomSheetSnapPointChangeEvent = NativeSyntheticEvent<{
-  snapPoint: BottomSheetSnapPoint
-}>
-export type BottomSheetStateChangeEvent = NativeSyntheticEvent<{
-  state: BottomSheetState
-}>
-
-export interface BottomSheetViewProps {
-  children: React.ReactNode
-  cornerRadius?: number
-  preventDismiss?: boolean
-  preventExpansion?: boolean
-  backgroundColor?: ColorValue
-  containerBackgroundColor?: ColorValue
-  disableDrag?: boolean
-
-  minHeight?: number
-  maxHeight?: number
-
-  onAttemptDismiss?: (event: BottomSheetAttemptDismissEvent) => void
-  onSnapPointChange?: (event: BottomSheetSnapPointChangeEvent) => void
-  onStateChange?: (event: BottomSheetStateChangeEvent) => void
-}

modules/bottom-sheet/src/BottomSheet.web.tsx

@@ -1,5 +0,0 @@
-import {BottomSheetViewProps} from './BottomSheet.types'
-
-export function BottomSheet(_: BottomSheetViewProps) {
-  throw new Error('BottomSheet is not available on web')
-}

modules/bottom-sheet/src/BottomSheetNativeComponent.tsx

@@ -1,137 +0,0 @@
-import * as React from 'react'
-import {
-  Dimensions,
-  NativeSyntheticEvent,
-  Platform,
-  StyleProp,
-  View,
-  ViewStyle,
-} from 'react-native'
-import {requireNativeModule, requireNativeViewManager} from 'expo-modules-core'
-
-import {BottomSheetState, BottomSheetViewProps} from './BottomSheet.types'
-import {BottomSheetPortalProvider} from './BottomSheetPortal'
-import {Context as PortalContext} from './BottomSheetPortal'
-
-const screenHeight = Dimensions.get('screen').height
-
-const NativeView: React.ComponentType<
-  BottomSheetViewProps & {
-    ref: React.RefObject<any>
-    style: StyleProp<ViewStyle>
-  }
-> = requireNativeViewManager('BottomSheet')
-
-const NativeModule = requireNativeModule('BottomSheet')
-
-const isIOS15 = Platform.OS === 'ios' && Number(Platform.Version) < 16
-
-export class BottomSheetNativeComponent extends React.Component<
-  BottomSheetViewProps,
-  {
-    open: boolean
-    viewHeight?: number
-  }
-> {
-  ref = React.createRef<any>()
-
-  static contextType = PortalContext
-
-  constructor(props: BottomSheetViewProps) {
-    super(props)
-    this.state = {
-      open: false,
-    }
-  }
-
-  present() {
-    this.setState({open: true})
-  }
-
-  dismiss() {
-    this.ref.current?.dismiss()
-  }
-
-  private onStateChange = (
-    event: NativeSyntheticEvent<{state: BottomSheetState}>,
-  ) => {
-    const {state} = event.nativeEvent
-    const isOpen = state !== 'closed'
-    this.setState({open: isOpen})
-    this.props.onStateChange?.(event)
-  }
-
-  private updateLayout = () => {
-    this.ref.current?.updateLayout()
-  }
-
-  static dismissAll = async () => {
-    await NativeModule.dismissAll()
-  }
-
-  render() {
-    const Portal = this.context as React.ContextType<typeof PortalContext>
-    if (!Portal) {
-      throw new Error(
-        'BottomSheet: You need to wrap your component tree with a <BottomSheetPortalProvider> to use the bottom sheet.',
-      )
-    }
-
-    if (!this.state.open) {
-      return null
-    }
-
-    const {children, backgroundColor, ...rest} = this.props
-    const cornerRadius = rest.cornerRadius ?? 0
-
-    let extraStyles
-    if (isIOS15 && this.state.viewHeight) {
-      const {viewHeight} = this.state
-      if (viewHeight < screenHeight / 2) {
-        extraStyles = {
-          height: viewHeight,
-          marginTop: screenHeight / 2 - viewHeight,
-          borderTopLeftRadius: cornerRadius,
-          borderTopRightRadius: cornerRadius,
-        }
-      }
-    }
-
-    return (
-      <Portal>
-        <NativeView
-          {...rest}
-          onStateChange={this.onStateChange}
-          ref={this.ref}
-          style={{
-            position: 'absolute',
-            height: screenHeight,
-            width: '100%',
-          }}
-          containerBackgroundColor={backgroundColor}>
-          <View
-            style={[
-              {
-                flex: 1,
-                backgroundColor,
-              },
-              Platform.OS === 'android' && {
-                borderTopLeftRadius: cornerRadius,
-                borderTopRightRadius: cornerRadius,
-              },
-              extraStyles,
-            ]}>
-            <View
-              onLayout={e => {
-                const {height} = e.nativeEvent.layout
-                this.setState({viewHeight: height})
-                this.updateLayout()
-              }}>
-              <BottomSheetPortalProvider>{children}</BottomSheetPortalProvider>
-            </View>
-          </View>
-        </NativeView>
-      </Portal>
-    )
-  }
-}

modules/bottom-sheet/src/BottomSheetNativeComponent.web.tsx

@@ -1,5 +0,0 @@
-import {BottomSheetViewProps} from './BottomSheet.types'
-
-export function BottomSheetNativeComponent(_: BottomSheetViewProps) {
-  throw new Error('BottomSheetNativeComponent is not available on web')
-}

modules/bottom-sheet/src/BottomSheetPortal.tsx

@@ -1,40 +0,0 @@
-import React from 'react'
-
-import {createPortalGroup_INTERNAL} from './lib/Portal'
-
-type PortalContext = React.ElementType<{children: React.ReactNode}>
-
-export const Context = React.createContext({} as PortalContext)
-
-export const useBottomSheetPortal_INTERNAL = () => React.useContext(Context)
-
-export function BottomSheetPortalProvider({
-  children,
-}: {
-  children: React.ReactNode
-}) {
-  const portal = React.useMemo(() => {
-    return createPortalGroup_INTERNAL()
-  }, [])
-
-  return (
-    <Context.Provider value={portal.Portal}>
-      <portal.Provider>
-        {children}
-        <portal.Outlet />
-      </portal.Provider>
-    </Context.Provider>
-  )
-}
-
-const defaultPortal = createPortalGroup_INTERNAL()
-
-export const BottomSheetOutlet = defaultPortal.Outlet
-
-export function BottomSheetProvider({children}: {children: React.ReactNode}) {
-  return (
-    <Context.Provider value={defaultPortal.Portal}>
-      <defaultPortal.Provider>{children}</defaultPortal.Provider>
-    </Context.Provider>
-  )
-}

modules/bottom-sheet/src/lib/Portal.tsx

@@ -1,67 +0,0 @@
-import React from 'react'
-
-type Component = React.ReactElement
-
-type ContextType = {
-  outlet: Component | null
-  append(id: string, component: Component): void
-  remove(id: string): void
-}
-
-type ComponentMap = {
-  [id: string]: Component
-}
-
-export function createPortalGroup_INTERNAL() {
-  const Context = React.createContext<ContextType>({
-    outlet: null,
-    append: () => {},
-    remove: () => {},
-  })
-
-  function Provider(props: React.PropsWithChildren<{}>) {
-    const map = React.useRef<ComponentMap>({})
-    const [outlet, setOutlet] = React.useState<ContextType['outlet']>(null)
-
-    const append = React.useCallback<ContextType['append']>((id, component) => {
-      if (map.current[id]) return
-      map.current[id] = <React.Fragment key={id}>{component}</React.Fragment>
-      setOutlet(<>{Object.values(map.current)}</>)
-    }, [])
-
-    const remove = React.useCallback<ContextType['remove']>(id => {
-      delete map.current[id]
-      setOutlet(<>{Object.values(map.current)}</>)
-    }, [])
-
-    const contextValue = React.useMemo(
-      () => ({
-        outlet,
-        append,
-        remove,
-      }),
-      [outlet, append, remove],
-    )
-
-    return (
-      <Context.Provider value={contextValue}>{props.children}</Context.Provider>
-    )
-  }
-
-  function Outlet() {
-    const ctx = React.useContext(Context)
-    return ctx.outlet
-  }
-
-  function Portal({children}: React.PropsWithChildren<{}>) {
-    const {append, remove} = React.useContext(Context)
-    const id = React.useId()
-    React.useEffect(() => {
-      append(id, children as Component)
-      return () => remove(id)
-    }, [id, children, append, remove])
-    return null
-  }
-
-  return {Provider, Outlet, Portal}
-}

modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt

@@ -2,7 +2,6 @@ package xyz.blueskyweb.app.exporeceiveandroidintents
 
 import android.content.Intent
 import android.graphics.Bitmap
-import android.media.MediaMetadataRetriever
 import android.net.Uri
 import android.os.Build
 import android.provider.MediaStore
@@ -144,10 +143,7 @@ class ExpoReceiveAndroidIntentsModule : Module() {
     appContext.currentActivity?.contentResolver?.openInputStream(uri)?.use {
       it.copyTo(out)
     }
-
-    val info = getVideoInfo(uri) ?: return
-
-    "bluesky://intent/compose?videoUri=${URLEncoder.encode(file.path, "UTF-8")}|${info["width"]}|${info["height"]}".toUri().let {
+    "bluesky://intent/compose?videoUri=${URLEncoder.encode(file.path, "UTF-8")}".toUri().let {
       val newIntent = Intent(Intent.ACTION_VIEW, it)
       appContext.currentActivity?.startActivity(newIntent)
     }
@@ -170,24 +166,6 @@ class ExpoReceiveAndroidIntentsModule : Module() {
     )
   }
 
-  private fun getVideoInfo(uri: Uri): Map<String, Any>? {
-    val retriever = MediaMetadataRetriever()
-    retriever.setDataSource(appContext.currentActivity, uri)
-
-    val width = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toIntOrNull()
-    val height = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toIntOrNull()
-
-    if (width == null || height == null) {
-      return null
-    }
-
-    return mapOf(
-      "width" to width,
-      "height" to height,
-      "path" to uri.path.toString(),
-    )
-  }
-
   private fun createFile(extension: String): File = File.createTempFile(extension, "temp.$extension", appContext.currentActivity?.cacheDir)
 
   // We will pas the width and height to the app here, since getting measurements

package.json

@@ -1,9 +1,9 @@
 {
   "name": "bsky.app",
-  "version": "1.94.0",
+  "version": "1.91.2",
   "private": true,
   "engines": {
-    "node": ">=20"
+    "node": ">=18"
   },
   "packageManager": "yarn@1.22.19",
   "scripts": {
@@ -53,7 +53,7 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.13.11",
+    "@atproto/api": "^0.13.8",
     "@braintree/sanitize-url": "^6.0.2",
     "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
     "@emoji-mart/react": "^1.1.1",
@@ -68,15 +68,11 @@
     "@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.4",
-    "@ipld/dag-cbor": "^9.2.0",
+    "@haileyok/bluesky-video": "0.1.10",
     "@lingui/react": "^4.5.0",
     "@mattermost/react-native-paste-input": "^0.7.1",
     "@miblanchard/react-native-slider": "^2.3.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",
-    "@radix-ui/react-focus-scope": "^1.1.0",
+    "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-masked-view/masked-view": "0.3.0",
     "@react-native-menu/menu": "^1.1.0",
@@ -85,25 +81,26 @@
     "@react-navigation/drawer": "^6.6.15",
     "@react-navigation/native": "^6.1.17",
     "@react-navigation/native-stack": "^6.9.26",
-    "@sentry/react-native": "5.24.3",
+    "@sentry/react-native": "5.32.0",
+    "@tamagui/focus-scope": "^1.84.1",
     "@tanstack/query-async-storage-persister": "^5.25.0",
     "@tanstack/react-query": "^5.8.1",
     "@tanstack/react-query-persist-client": "^5.25.0",
-    "@tiptap/core": "^2.6.6",
-    "@tiptap/extension-document": "^2.6.6",
-    "@tiptap/extension-hard-break": "^2.6.6",
-    "@tiptap/extension-history": "^2.6.6",
-    "@tiptap/extension-mention": "^2.6.6",
-    "@tiptap/extension-paragraph": "^2.6.6",
-    "@tiptap/extension-placeholder": "^2.6.6",
-    "@tiptap/extension-text": "^2.6.6",
-    "@tiptap/html": "^2.6.6",
-    "@tiptap/pm": "^2.6.6",
-    "@tiptap/react": "^2.6.6",
-    "@tiptap/suggestion": "^2.6.6",
+    "@tiptap/core": "^2.0.0-beta.220",
+    "@tiptap/extension-document": "^2.0.0-beta.220",
+    "@tiptap/extension-hard-break": "^2.0.3",
+    "@tiptap/extension-history": "^2.0.3",
+    "@tiptap/extension-mention": "^2.0.0-beta.220",
+    "@tiptap/extension-paragraph": "^2.0.0-beta.220",
+    "@tiptap/extension-placeholder": "^2.0.0-beta.220",
+    "@tiptap/extension-text": "^2.0.0-beta.220",
+    "@tiptap/html": "^2.1.11",
+    "@tiptap/pm": "^2.0.0-beta.220",
+    "@tiptap/react": "^2.0.0-beta.220",
+    "@tiptap/suggestion": "^2.0.0-beta.220",
     "@types/invariant": "^2.2.37",
     "@types/lodash.throttle": "^4.1.9",
-    "@types/node": "^20.14.3",
+    "@types/node": "^18.16.2",
     "@zxing/text-encoding": "^0.9.0",
     "array.prototype.findlast": "^1.2.3",
     "await-lock": "^2.2.2",
@@ -140,6 +137,7 @@
     "expo-sharing": "^12.0.1",
     "expo-splash-screen": "~0.27.4",
     "expo-status-bar": "~1.12.1",
+    "expo-system-ui": "~3.0.4",
     "expo-task-manager": "~11.8.1",
     "expo-updates": "~0.25.14",
     "expo-web-browser": "~13.0.3",
@@ -159,32 +157,31 @@
     "lodash.set": "^4.3.2",
     "lodash.shuffle": "^4.2.0",
     "lodash.throttle": "^4.1.1",
-    "multiformats": "^13.1.0",
     "nanoid": "^5.0.5",
     "normalize-url": "^8.0.0",
     "patch-package": "^6.5.1",
     "postinstall-postinstall": "^2.1.0",
     "psl": "^1.9.0",
     "react": "18.2.0",
-    "react-compiler-runtime": "^19.0.0-beta-a7bf2bd-20241110",
+    "react-compiler-runtime": "file:./lib/react-compiler-runtime",
     "react-dom": "^18.2.0",
     "react-image-crop": "^11.0.7",
     "react-keyed-flatten-children": "^3.0.0",
     "react-native": "0.74.1",
     "react-native-compressor": "^1.8.24",
     "react-native-date-picker": "^4.4.2",
-    "react-native-drawer-layout": "^4.0.1",
-    "react-native-gesture-handler": "2.20.0",
+    "react-native-drawer-layout": "^4.0.0-alpha.3",
+    "react-native-gesture-handler": "~2.16.2",
     "react-native-get-random-values": "~1.11.0",
     "react-native-image-crop-picker": "0.41.2",
     "react-native-ios-context-menu": "^1.15.3",
-    "react-native-keyboard-controller": "^1.14.0",
+    "react-native-keyboard-controller": "^1.12.1",
     "react-native-mmkv": "^2.12.2",
     "react-native-pager-view": "6.2.3",
     "react-native-picker-select": "^9.1.3",
     "react-native-progress": "bluesky-social/react-native-progress",
     "react-native-qrcode-styled": "^0.3.1",
-    "react-native-reanimated": "^3.16.1",
+    "react-native-reanimated": "^3.11.0",
     "react-native-root-siblings": "^4.1.1",
     "react-native-safe-area-context": "4.10.1",
     "react-native-screens": "~3.31.1",
@@ -207,7 +204,7 @@
     "zod": "^3.20.2"
   },
   "devDependencies": {
-    "@atproto/dev-env": "^0.3.55",
+    "@atproto/dev-env": "^0.3.39",
     "@babel/core": "^7.23.2",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.20.0",
@@ -243,7 +240,7 @@
     "babel-loader": "^9.1.2",
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-module-resolver": "^5.0.0",
-    "babel-plugin-react-compiler": "^19.0.0-beta-a7bf2bd-20241110",
+    "babel-plugin-react-compiler": "^0.0.0-experimental-592953e-20240517",
     "babel-plugin-react-native-web": "^0.18.12",
     "babel-preset-expo": "^10.0.0",
     "eslint": "^8.19.0",
@@ -251,10 +248,9 @@
     "eslint-plugin-ft-flow": "^2.0.3",
     "eslint-plugin-lingui": "^0.2.0",
     "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-compiler": "^19.0.0-beta-a7bf2bd-20241110",
+    "eslint-plugin-react-compiler": "^0.0.0-experimental-c8b3f72-20240517",
     "eslint-plugin-react-native-a11y": "^3.3.0",
     "eslint-plugin-simple-import-sort": "^12.0.0",
-    "file-loader": "6.2.0",
     "html-webpack-plugin": "^5.5.0",
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
@@ -266,6 +262,7 @@
     "prettier": "^2.8.3",
     "react-native-dotenv": "^3.3.1",
     "react-refresh": "^0.14.0",
+    "react-scripts": "^5.0.1",
     "react-test-renderer": "18.2.0",
     "svgo": "^3.3.2",
     "ts-node": "^10.9.1",
@@ -282,8 +279,7 @@
     "**/zod": "3.23.8",
     "**/expo-constants": "16.0.1",
     "**/expo-device": "6.0.2",
-    "@react-native/babel-preset": "0.74.1",
-    "@radix-ui/react-focus-scope": "1.1.0"
+    "@react-native/babel-preset": "0.74.1"
   },
   "jest": {
     "preset": "jest-expo/ios",

patches/expo-image-picker+15.0.5.patch

@@ -1,18 +0,0 @@
-diff --git a/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/exporters/RawImageExporter.kt b/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/exporters/RawImageExporter.kt
-index f339e5f..fa35e82 100644
---- a/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/exporters/RawImageExporter.kt
-+++ b/node_modules/expo-image-picker/android/src/main/java/expo/modules/imagepicker/exporters/RawImageExporter.kt
-@@ -16,7 +16,12 @@ class RawImageExporter : ImageExporter {
-     copyFile(source, output, contentResolver)
-     val exifInterface = ExifInterface(output.absolutePath)
-     val imageRotation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)
--    val isRotatedLandscape = (imageRotation == ExifInterface.ORIENTATION_ROTATE_90 || imageRotation == ExifInterface.ORIENTATION_ROTATE_270)
-+    val isRotatedLandscape = (
-+      imageRotation == ExifInterface.ORIENTATION_ROTATE_90 ||
-+      imageRotation == ExifInterface.ORIENTATION_ROTATE_270 ||
-+      imageRotation == ExifInterface.ORIENTATION_TRANSPOSE ||
-+      imageRotation == ExifInterface.ORIENTATION_TRANSVERSE
-+    )
-     val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
- 
-     BitmapFactory.decodeFile(output.absolutePath, options)

patches/react-native+0.74.1.patch

@@ -9,7 +9,7 @@ index caa5540..c5d4e67 100644
 -                                                  type != nil && [type length] > 0 ? type : @"application/octet-stream",
 +                                                  ![type isEqual:[NSNull null]] && [type length] > 0 ? type : @"application/octet-stream",
                                                    [data base64EncodedStringWithOptions:0]];
- 
+
        resolve(text);
 diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
 index b0d71dc..41b9a0e 100644
@@ -18,7 +18,7 @@ index b0d71dc..41b9a0e 100644
 @@ -377,10 +377,6 @@ - (void)textInputDidBeginEditing
      self.backedTextInputView.attributedText = [NSAttributedString new];
    }
- 
+
 -  if (_selectTextOnFocus) {
 -    [self.backedTextInputView selectAll:nil];
 -  }
@@ -35,68 +35,40 @@ index b0d71dc..41b9a0e 100644
 +    [self.backedTextInputView selectAll:nil];
 +  }
  }
- 
+
  - (void)reactBlur
 diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
-index e9b330f..ec5f58c 100644
+index e9b330f..1ecdf0a 100644
 --- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
 +++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
-@@ -15,5 +15,8 @@
- @property (nonatomic, copy) NSString *title;
+@@ -16,4 +16,6 @@
  @property (nonatomic, copy) RCTDirectEventBlock onRefresh;
  @property (nonatomic, weak) UIScrollView *scrollView;
-+@property (nonatomic, copy) UIColor *customTintColor;
-+
+
 +- (void)forwarderBeginRefreshing;
- 
++
  @end
 diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-index b09e653..d2b4e05 100644
+index b09e653..f93cb46 100644
 --- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
 +++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-@@ -22,6 +22,7 @@ @implementation RCTRefreshControl {
-   NSString *_title;
-   UIColor *_titleColor;
-   CGFloat _progressViewOffset;
-+  UIColor *_customTintColor;
- }
- 
- - (instancetype)init
-@@ -56,6 +57,12 @@ - (void)layoutSubviews
-   _isInitialRender = false;
- }
- 
-+- (void)didMoveToSuperview
-+{
-+  [super didMoveToSuperview];
-+  [self setTintColor:_customTintColor];
-+}
+@@ -198,9 +198,53 @@ - (void)refreshControlValueChanged
+   [self setCurrentRefreshingState:super.refreshing];
+   _refreshingProgrammatically = NO;
+
++  if (@available(iOS 17.4, *)) {
++    if (_currentRefreshingState) {
++      UIImpactFeedbackGenerator *feedbackGenerator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleLight];
++      [feedbackGenerator prepare];
++      [feedbackGenerator impactOccurred];
++    }
++  }
 +
- - (void)beginRefreshingProgrammatically
- {
-   UInt64 beginRefreshingTimestamp = _currentRefreshingStateTimestamp;
-@@ -203,4 +210,58 @@ - (void)refreshControlValueChanged
+   if (_onRefresh) {
+     _onRefresh(nil);
    }
  }
- 
-+- (void)setCustomTintColor:(UIColor *)customTintColor
-+{
-+  _customTintColor = customTintColor;
-+  [self setTintColor:customTintColor];
-+}
-+
-+// Fix for https://github.com/facebook/react-native/issues/43388
-+// A bug in iOS 17.4 causes the haptic to not play when refreshing if the tintColor
-+// is set before the refresh control gets added to the scrollview. We'll call this
-+// function whenever the superview changes. We'll also call it if the value of customTintColor
-+// changes.
-+- (void)setTintColor:(UIColor *)tintColor
-+{
-+  if ([self.superview isKindOfClass:[UIScrollView class]] && self.tintColor != tintColor) {
-+    [super setTintColor:tintColor];
-+  }
-+}
-+
+
 +/*
 + This method is used by Bluesky's ExpoScrollForwarder. This allows other React Native
 + libraries to perform a refresh of a scrollview and access the refresh control's onRefresh
@@ -134,144 +106,13 @@ index b09e653..d2b4e05 100644
 +}
 +
  @end
-diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
-index 40aaf9c..1c60164 100644
---- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
-+++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
-@@ -22,11 +22,12 @@ - (UIView *)view
- 
- RCT_EXPORT_VIEW_PROPERTY(onRefresh, RCTDirectEventBlock)
- RCT_EXPORT_VIEW_PROPERTY(refreshing, BOOL)
--RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
- RCT_EXPORT_VIEW_PROPERTY(title, NSString)
- RCT_EXPORT_VIEW_PROPERTY(titleColor, UIColor)
- RCT_EXPORT_VIEW_PROPERTY(progressViewOffset, CGFloat)
- 
-+RCT_REMAP_VIEW_PROPERTY(tintColor, customTintColor, UIColor)
-+
- RCT_EXPORT_METHOD(setNativeRefreshing : (nonnull NSNumber *)viewTag toRefreshing : (BOOL)refreshing)
- {
-   [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 1aead51..39e6244 100644
---- a/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
-+++ b/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
-@@ -159,31 +159,6 @@ - (BOOL)touchesShouldCancelInContentView:(__unused UIView *)view
-   return !shouldDisableScrollInteraction;
- }
- 
--/*
-- * Automatically centers the content such that if the content is smaller than the
-- * ScrollView, we force it to be centered, but when you zoom or the content otherwise
-- * becomes larger than the ScrollView, there is no padding around the content but it
-- * can still fill the whole view.
-- */
--- (void)setContentOffset:(CGPoint)contentOffset
--{
--  UIView *contentView = [self contentView];
--  if (contentView && _centerContent && !CGSizeEqualToSize(contentView.frame.size, CGSizeZero)) {
--    CGSize subviewSize = contentView.frame.size;
--    CGSize scrollViewSize = self.bounds.size;
--    if (subviewSize.width <= scrollViewSize.width) {
--      contentOffset.x = -(scrollViewSize.width - subviewSize.width) / 2.0;
--    }
--    if (subviewSize.height <= scrollViewSize.height) {
--      contentOffset.y = -(scrollViewSize.height - subviewSize.height) / 2.0;
--    }
--  }
--
--  super.contentOffset = CGPointMake(
--      RCTSanitizeNaNValue(contentOffset.x, @"scrollView.contentOffset.x"),
--      RCTSanitizeNaNValue(contentOffset.y, @"scrollView.contentOffset.y"));
--}
--
- - (void)setFrame:(CGRect)frame
- {
-   // Preserving and revalidating `contentOffset`.
-@@ -427,6 +402,11 @@ - (void)setRemoveClippedSubviews:(__unused BOOL)removeClippedSubviews
-   // Does nothing
- }
- 
-+- (void)setFrame:(CGRect)frame {
-+  [super setFrame:frame];
-+  [self centerContentIfNeeded];
-+}
-+
- - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
- {
-   [super insertReactSubview:view atIndex:atIndex];
-@@ -444,6 +424,8 @@ - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
-     RCTApplyTransformationAccordingLayoutDirection(_contentView, self.reactLayoutDirection);
-     [_scrollView addSubview:view];
-   }
-+
-+  [self centerContentIfNeeded];
- }
- 
- - (void)removeReactSubview:(UIView *)subview
-@@ -652,9 +634,46 @@ -(void)delegateMethod : (UIScrollView *)scrollView        \
-   }
- 
- RCT_SCROLL_EVENT_HANDLER(scrollViewWillBeginDecelerating, onMomentumScrollBegin)
--RCT_SCROLL_EVENT_HANDLER(scrollViewDidZoom, onScroll)
- RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
- 
-+-(void)scrollViewDidZoom : (UIScrollView *)scrollView
-+{
-+  [self centerContentIfNeeded];
-+
-+  RCT_SEND_SCROLL_EVENT(onScroll, nil);
-+  RCT_FORWARD_SCROLL_EVENT(scrollViewDidZoom : scrollView);
-+}
-+
-+/*
-+ * Automatically centers the content such that if the content is smaller than the
-+ * ScrollView, we force it to be centered, but when you zoom or the content otherwise
-+ * becomes larger than the ScrollView, there is no padding around the content but it
-+ * can still fill the whole view.
-+ *
-+ * PATCHED: This deviates from the original React Native implementation to fix two issues:
-+ *
-+ * - The scroll view was swallowing any taps immediately after pinching
-+ * - The scroll view was jittering when crossing the full screen threshold while pinching
-+ *
-+ * This implementation is based on https://petersteinberger.com/blog/2013/how-to-center-uiscrollview/.
-+ */
-+-(void)centerContentIfNeeded
-+{
-+  if (_scrollView.centerContent &&
-+      !CGSizeEqualToSize(self.contentSize, CGSizeZero) &&
-+      !CGSizeEqualToSize(self.bounds.size, CGSizeZero)
-+  ) {
-+    CGFloat top = 0, left = 0;
-+    if (self.contentSize.width < self.bounds.size.width) {
-+      left = (self.bounds.size.width - self.contentSize.width) * 0.5f;
-+    }
-+    if (self.contentSize.height < self.bounds.size.height) {
-+      top = (self.bounds.size.height - self.contentSize.height) * 0.5f;
-+    }
-+    _scrollView.contentInset = UIEdgeInsetsMake(top, left, top, left);
-+  }
-+}
-+
- - (void)addScrollListener:(NSObject<UIScrollViewDelegate> *)scrollListener
- {
-   [_scrollListeners addObject:scrollListener];
-@@ -913,6 +932,7 @@ - (void)updateContentSizeIfNeeded
-   CGSize contentSize = self.contentSize;
-   if (!CGSizeEqualToSize(_scrollView.contentSize, contentSize)) {
-     _scrollView.contentSize = contentSize;
-+    [self centerContentIfNeeded];
-   }
- }
- 
 diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java
 index 5f5e1ab..aac00b6 100644
 --- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java
 +++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java
 @@ -99,8 +99,9 @@ public class JavaTimerManager {
        }
- 
+
        // If the JS thread is busy for multiple frames we cancel any other pending runnable.
 -      if (mCurrentIdleCallbackRunnable != null) {
 -        mCurrentIdleCallbackRunnable.cancel();
@@ -279,5 +120,5 @@ index 5f5e1ab..aac00b6 100644
 +      if (currentRunnable != null) {
 +        currentRunnable.cancel();
        }
- 
+
        mCurrentIdleCallbackRunnable = new IdleCallbackRunnable(frameTimeNanos);

patches/react-native-reanimated+3.11.0.patch

@@ -0,0 +1,209 @@
+diff --git a/node_modules/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts b/node_modules/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts
+index 92ebe62..5f8207e 100644
+--- a/node_modules/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts
++++ b/node_modules/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts
+@@ -96,7 +96,8 @@ export interface AnimatedComponentRef extends Component {
+ export interface IAnimatedComponentInternal {
+   _styles: StyleProps[] | null;
+   _animatedProps?: Partial<AnimatedComponentProps<AnimatedProps>>;
+-  _viewTag: number;
++  _componentViewTag: number;
++  _eventViewTag: number;
+   _isFirstRender: boolean;
+   jestAnimatedStyle: { value: StyleProps };
+   _component: AnimatedComponentRef | HTMLElement | null;
+diff --git a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
+index 88b3fdf..2488ebc 100644
+--- a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
++++ b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
+@@ -122,7 +122,8 @@ export function createAnimatedComponent(
+   {
+     _styles: StyleProps[] | null = null;
+     _animatedProps?: Partial<AnimatedComponentProps<AnimatedProps>>;
+-    _viewTag = -1;
++    _componentViewTag = -1;
++    _eventViewTag = -1;
+     _isFirstRender = true;
+     jestAnimatedStyle: { value: StyleProps } = { value: {} };
+     _component: AnimatedComponentRef | HTMLElement | null = null;
+@@ -143,7 +144,8 @@ export function createAnimatedComponent(
+     }
+
+     componentDidMount() {
+-      this._viewTag = this._getViewInfo().viewTag as number;
++      this._setComponentViewTag();
++      this._setEventViewTag();
+       this._attachNativeEvents();
+       this._jsPropsUpdater.addOnJSPropsChangeListener(this);
+       this._attachAnimatedStyles();
+@@ -185,7 +187,10 @@ export function createAnimatedComponent(
+       if (this.props.sharedTransitionTag) {
+         this._configureSharedTransition(true);
+       }
+-      this._sharedElementTransition?.unregisterTransition(this._viewTag, true);
++      this._sharedElementTransition?.unregisterTransition(
++        this._componentViewTag,
++        true
++      );
+
+       const exiting = this.props.exiting;
+       if (
+@@ -209,7 +214,7 @@ export function createAnimatedComponent(
+             : getReduceMotionFromConfig();
+         if (!reduceMotionInExiting) {
+           updateLayoutAnimations(
+-            this._viewTag,
++            this._componentViewTag,
+             LayoutAnimationType.EXITING,
+             maybeBuild(
+               exiting,
+@@ -221,12 +226,22 @@ export function createAnimatedComponent(
+       }
+     }
+
+-    _getEventViewRef() {
+-      // Make sure to get the scrollable node for components that implement
+-      // `ScrollResponder.Mixin`.
+-      return (this._component as AnimatedComponentRef)?.getScrollableNode
+-        ? (this._component as AnimatedComponentRef).getScrollableNode?.()
+-        : this._component;
++    _setComponentViewTag() {
++      this._componentViewTag = this._getViewInfo().viewTag as number;
++    }
++
++    _setEventViewTag() {
++      // Setting the tag for registering events - since the event emitting view can be nested inside the main component
++      const componentAnimatedRef = this._component as AnimatedComponentRef;
++      if (componentAnimatedRef.getScrollableNode) {
++        const scrollableNode = componentAnimatedRef.getScrollableNode();
++        this._eventViewTag = findNodeHandle(scrollableNode) ?? -1;
++      } else {
++        this._eventViewTag =
++          findNodeHandle(
++            options?.setNativeProps ? this : componentAnimatedRef
++          ) ?? -1;
++      }
+     }
+
+     _attachNativeEvents() {
+@@ -236,7 +251,7 @@ export function createAnimatedComponent(
+           has('workletEventHandler', prop) &&
+           prop.workletEventHandler instanceof WorkletEventHandler
+         ) {
+-          prop.workletEventHandler.registerForEvents(this._viewTag, key);
++          prop.workletEventHandler.registerForEvents(this._eventViewTag, key);
+         }
+       }
+     }
+@@ -248,7 +263,7 @@ export function createAnimatedComponent(
+           has('workletEventHandler', prop) &&
+           prop.workletEventHandler instanceof WorkletEventHandler
+         ) {
+-          prop.workletEventHandler.unregisterFromEvents(this._viewTag);
++          prop.workletEventHandler.unregisterFromEvents(this._eventViewTag);
+         }
+       }
+     }
+@@ -258,15 +273,17 @@ export function createAnimatedComponent(
+         for (const style of this._styles) {
+           style.viewsRef.remove(this);
+         }
+-      } else if (this._viewTag !== -1 && this._styles !== null) {
++      } else if (this._componentViewTag !== -1 && this._styles !== null) {
+         for (const style of this._styles) {
+-          style.viewDescriptors.remove(this._viewTag);
++          style.viewDescriptors.remove(this._componentViewTag);
+         }
+         if (this.props.animatedProps?.viewDescriptors) {
+-          this.props.animatedProps.viewDescriptors.remove(this._viewTag);
++          this.props.animatedProps.viewDescriptors.remove(
++            this._componentViewTag
++          );
+         }
+         if (isFabric()) {
+-          removeFromPropsRegistry(this._viewTag);
++          removeFromPropsRegistry(this._componentViewTag);
+         }
+       }
+     }
+@@ -283,15 +300,19 @@ export function createAnimatedComponent(
+           const newProp = this.props[key];
+           if (!newProp) {
+             // Prop got deleted
+-            prevProp.workletEventHandler.unregisterFromEvents(this._viewTag);
++            prevProp.workletEventHandler.unregisterFromEvents(
++              this._eventViewTag
++            );
+           } else if (
+             has('workletEventHandler', newProp) &&
+             newProp.workletEventHandler instanceof WorkletEventHandler &&
+             newProp.workletEventHandler !== prevProp.workletEventHandler
+           ) {
+             // Prop got changed
+-            prevProp.workletEventHandler.unregisterFromEvents(this._viewTag);
+-            newProp.workletEventHandler.registerForEvents(this._viewTag);
++            prevProp.workletEventHandler.unregisterFromEvents(
++              this._eventViewTag
++            );
++            newProp.workletEventHandler.registerForEvents(this._eventViewTag);
+           }
+         }
+       }
+@@ -304,7 +325,7 @@ export function createAnimatedComponent(
+           !prevProps[key]
+         ) {
+           // Prop got added
+-          newProp.workletEventHandler.registerForEvents(this._viewTag);
++          newProp.workletEventHandler.registerForEvents(this._eventViewTag);
+         }
+       }
+     }
+@@ -381,7 +402,7 @@ export function createAnimatedComponent(
+         adaptViewConfig(viewConfig);
+       }
+
+-      this._viewTag = viewTag as number;
++      this._componentViewTag = viewTag as number;
+
+       // remove old styles
+       if (prevStyles) {
+@@ -487,7 +508,11 @@ export function createAnimatedComponent(
+             AnimatedComponent.displayName
+           )
+         : undefined;
+-      updateLayoutAnimations(this._viewTag, LayoutAnimationType.LAYOUT, layout);
++      updateLayoutAnimations(
++        this._componentViewTag,
++        LayoutAnimationType.LAYOUT,
++        layout
++      );
+     }
+
+     _configureSharedTransition(isUnmounting = false) {
+@@ -497,7 +522,7 @@ export function createAnimatedComponent(
+       const { sharedTransitionTag } = this.props;
+       if (!sharedTransitionTag) {
+         this._sharedElementTransition?.unregisterTransition(
+-          this._viewTag,
++          this._componentViewTag,
+           isUnmounting
+         );
+         this._sharedElementTransition = null;
+@@ -508,7 +533,7 @@ export function createAnimatedComponent(
+         this._sharedElementTransition ??
+         new SharedTransition();
+       sharedElementTransition.registerTransition(
+-        this._viewTag,
++        this._componentViewTag,
+         sharedTransitionTag,
+         isUnmounting
+       );
+@@ -527,7 +552,7 @@ export function createAnimatedComponent(
+           ? (ref as HTMLElement)
+           : findNodeHandle(ref as Component);
+
+-        this._viewTag = tag as number;
++        this._componentViewTag = tag as number;
+
+         const { layout, entering, exiting, sharedTransitionTag } = this.props;
+         if (

react-compiler.config.js

@@ -1,9 +0,0 @@
-'use strict'
-
-module.exports = {
-  target: '18',
-  environment: {
-    enableTreatRefLikeIdentifiersAsRefs: true,
-    validateRefAccessDuringRender: false, // TODO: Make it `true`.
-  },
-}

scripts/post-web-build.js

@@ -23,10 +23,10 @@ const outputFile = entrypoints
     const ext = path.extname(file)
 
     if (ext === '.js') {
-      return `<script defer="defer" src="{{ staticCDNHost }}/static/js/${file}"></script>`
+      return `<script defer="defer" src="/static/js/${file}"></script>`
     }
     if (ext === '.css') {
-      return `<link rel="stylesheet" href="{{ staticCDNHost }}/static/css/${file}">`
+      return `<link rel="stylesheet" href="/static/css/${file}">`
     }
 
     return ''

src/App.native.tsx

@@ -1,6 +1,6 @@
 import 'react-native-url-polyfill/auto'
-import '#/lib/sentry' // must be near top
-import '#/view/icons'
+import 'lib/sentry' // must be near top
+import 'view/icons'
 
 import React, {useEffect, useState} from 'react'
 import {GestureHandlerRootView} from 'react-native-gesture-handler'
@@ -14,6 +14,7 @@ import * as SplashScreen from 'expo-splash-screen'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {useIntentHandler} from '#/lib/hooks/useIntentHandler'
 import {QueryProvider} from '#/lib/react-query'
 import {
   initialize,
@@ -50,7 +51,6 @@ import {
 } 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'
@@ -67,7 +67,6 @@ import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
 import {Provider as PortalProvider} from '#/components/Portal'
 import {Splash} from '#/Splash'
-import {BottomSheetProvider} from '../modules/bottom-sheet'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
 
 SplashScreen.preventAutoHideAsync()
@@ -84,6 +83,7 @@ function InnerApp() {
   const theme = useColorModeTheme()
   const {_} = useLingui()
 
+  useIntentHandler()
   const hasCheckedReferrer = useStarterPackEntry()
 
   // init
@@ -125,37 +125,35 @@ function InnerApp() {
                 // 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>
+                  <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>
                 </QueryProvider>
               </React.Fragment>
             </VideoVolumeProvider>
@@ -196,16 +194,14 @@ function App() {
                       <DialogStateProvider>
                         <LightboxStateProvider>
                           <PortalProvider>
-                            <BottomSheetProvider>
-                              <StarterPackProvider>
-                                <SafeAreaProvider
-                                  initialMetrics={initialWindowMetrics}>
-                                  <IntentDialogProvider>
-                                    <InnerApp />
-                                  </IntentDialogProvider>
-                                </SafeAreaProvider>
-                              </StarterPackProvider>
-                            </BottomSheetProvider>
+                            <StarterPackProvider>
+                              <SafeAreaProvider
+                                initialMetrics={initialWindowMetrics}>
+                                <IntentDialogProvider>
+                                  <InnerApp />
+                                </IntentDialogProvider>
+                              </SafeAreaProvider>
+                            </StarterPackProvider>
                           </PortalProvider>
                         </LightboxStateProvider>
                       </DialogStateProvider>

src/App.web.tsx

@@ -9,6 +9,7 @@ import {SafeAreaProvider} from 'react-native-safe-area-context'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {useIntentHandler} from '#/lib/hooks/useIntentHandler'
 import {QueryProvider} from '#/lib/react-query'
 import {Provider as StatsigProvider} from '#/lib/statsig/statsig'
 import {ThemeProvider} from '#/lib/ThemeContext'
@@ -40,7 +41,7 @@ import {
 } 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 {useComposerKeyboardShortcut} from '#/state/shell/composer/useComposerKeyboardShortcut'
 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'
@@ -70,8 +71,11 @@ function InnerApp() {
   const {resumeSession} = useSessionApi()
   const theme = useColorModeTheme()
   const {_} = useLingui()
+  useIntentHandler()
   const hasCheckedReferrer = useStarterPackEntry()
 
+  useComposerKeyboardShortcut()
+
   // init
   useEffect(() => {
     async function onLaunch(account?: SessionAccount) {
@@ -112,35 +116,33 @@ function InnerApp() {
                   // 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>
-                                          <SafeAreaProvider>
-                                            <ProgressGuideProvider>
-                                              <Shell />
-                                              <NuxDialogs />
-                                            </ProgressGuideProvider>
-                                          </SafeAreaProvider>
-                                        </MutedThreadsProvider>
-                                      </BackgroundNotificationPreferencesProvider>
-                                    </UnreadNotifsProvider>
-                                  </HiddenRepliesProvider>
-                                </SelectedFeedProvider>
-                              </LoggedOutViewProvider>
-                            </ModerationOptsProvider>
-                          </LabelDefsProvider>
-                        </MessagesProvider>
-                      </StatsigProvider>
-                    </ComposerProvider>
+                    <StatsigProvider>
+                      <MessagesProvider>
+                        {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
+                        <LabelDefsProvider>
+                          <ModerationOptsProvider>
+                            <LoggedOutViewProvider>
+                              <SelectedFeedProvider>
+                                <HiddenRepliesProvider>
+                                  <UnreadNotifsProvider>
+                                    <BackgroundNotificationPreferencesProvider>
+                                      <MutedThreadsProvider>
+                                        <SafeAreaProvider>
+                                          <ProgressGuideProvider>
+                                            <Shell />
+                                            <NuxDialogs />
+                                          </ProgressGuideProvider>
+                                        </SafeAreaProvider>
+                                      </MutedThreadsProvider>
+                                    </BackgroundNotificationPreferencesProvider>
+                                  </UnreadNotifsProvider>
+                                </HiddenRepliesProvider>
+                              </SelectedFeedProvider>
+                            </LoggedOutViewProvider>
+                          </ModerationOptsProvider>
+                        </LabelDefsProvider>
+                      </MessagesProvider>
+                    </StatsigProvider>
                   </QueryProvider>
                   <ToastContainer />
                 </React.Fragment>

src/Navigation.tsx

@@ -17,6 +17,7 @@ import {
 
 import {timeout} from '#/lib/async/timeout'
 import {useColorSchemeStyle} from '#/lib/hooks/useColorSchemeStyle'
+import {usePalette} from '#/lib/hooks/usePalette'
 import {useWebScrollRestoration} from '#/lib/hooks/useWebScrollRestoration'
 import {buildStateObject} from '#/lib/routes/helpers'
 import {
@@ -40,11 +41,14 @@ import {
   shouldRequestEmailConfirmation,
   snoozeEmailConfirmationPrompt,
 } from '#/state/shell/reminders'
+import {AccessibilitySettingsScreen} from '#/view/screens/AccessibilitySettings'
+import {AppPasswords} from '#/view/screens/AppPasswords'
 import {CommunityGuidelinesScreen} from '#/view/screens/CommunityGuidelines'
 import {CopyrightPolicyScreen} from '#/view/screens/CopyrightPolicy'
 import {DebugModScreen} from '#/view/screens/DebugMod'
 import {FeedsScreen} from '#/view/screens/Feeds'
 import {HomeScreen} from '#/view/screens/Home'
+import {LanguageSettingsScreen} from '#/view/screens/LanguageSettings'
 import {ListsScreen} from '#/view/screens/Lists'
 import {LogScreen} from '#/view/screens/Log'
 import {ModerationBlockedAccounts} from '#/view/screens/ModerationBlockedAccounts'
@@ -52,7 +56,11 @@ import {ModerationModlistsScreen} from '#/view/screens/ModerationModlists'
 import {ModerationMutedAccounts} from '#/view/screens/ModerationMutedAccounts'
 import {NotFoundScreen} from '#/view/screens/NotFound'
 import {NotificationsScreen} from '#/view/screens/Notifications'
+import {NotificationsSettingsScreen} from '#/view/screens/NotificationsSettings'
 import {PostThreadScreen} from '#/view/screens/PostThread'
+import {PreferencesExternalEmbeds} from '#/view/screens/PreferencesExternalEmbeds'
+import {PreferencesFollowingFeed} from '#/view/screens/PreferencesFollowingFeed'
+import {PreferencesThreads} from '#/view/screens/PreferencesThreads'
 import {PrivacyPolicyScreen} from '#/view/screens/PrivacyPolicy'
 import {ProfileScreen} from '#/view/screens/Profile'
 import {ProfileFeedScreen} from '#/view/screens/ProfileFeed'
@@ -62,6 +70,7 @@ import {ProfileFollowsScreen} from '#/view/screens/ProfileFollows'
 import {ProfileListScreen} from '#/view/screens/ProfileList'
 import {SavedFeeds} from '#/view/screens/SavedFeeds'
 import {SearchScreen} from '#/view/screens/Search'
+import {SettingsScreen} from '#/view/screens/Settings'
 import {Storybook} from '#/view/screens/Storybook'
 import {SupportScreen} from '#/view/screens/Support'
 import {TermsOfServiceScreen} from '#/view/screens/TermsOfService'
@@ -69,8 +78,8 @@ import {BottomBar} from '#/view/shell/bottom-bar/BottomBar'
 import {createNativeStackNavigatorWithAuth} from '#/view/shell/createNativeStackNavigatorWithAuth'
 import {SharedPreferencesTesterScreen} from '#/screens/E2E/SharedPreferencesTesterScreen'
 import HashtagScreen from '#/screens/Hashtag'
-import {MessagesScreen} from '#/screens/Messages/ChatList'
 import {MessagesConversationScreen} from '#/screens/Messages/Conversation'
+import {MessagesScreen} from '#/screens/Messages/List'
 import {MessagesSettingsScreen} from '#/screens/Messages/Settings'
 import {ModerationScreen} from '#/screens/Moderation'
 import {PostLikedByScreen} from '#/screens/Post/PostLikedBy'
@@ -79,26 +88,13 @@ import {PostRepostedByScreen} from '#/screens/Post/PostRepostedBy'
 import {ProfileKnownFollowersScreen} from '#/screens/Profile/KnownFollowers'
 import {ProfileLabelerLikedByScreen} from '#/screens/Profile/ProfileLabelerLikedBy'
 import {AppearanceSettingsScreen} from '#/screens/Settings/AppearanceSettings'
-import {NotificationSettingsScreen} from '#/screens/Settings/NotificationSettings'
 import {
   StarterPackScreen,
   StarterPackScreenShort,
 } from '#/screens/StarterPack/StarterPackScreen'
 import {Wizard} from '#/screens/StarterPack/Wizard'
-import {useTheme} from '#/alf'
 import {router} from '#/routes'
 import {Referrer} from '../modules/expo-bluesky-swiss-army'
-import {AboutSettingsScreen} from './screens/Settings/AboutSettings'
-import {AccessibilitySettingsScreen} from './screens/Settings/AccessibilitySettings'
-import {AccountSettingsScreen} from './screens/Settings/AccountSettings'
-import {AppPasswordsScreen} from './screens/Settings/AppPasswords'
-import {ContentAndMediaSettingsScreen} from './screens/Settings/ContentAndMediaSettings'
-import {ExternalMediaPreferencesScreen} from './screens/Settings/ExternalMediaPreferences'
-import {FollowingFeedPreferencesScreen} from './screens/Settings/FollowingFeedPreferences'
-import {LanguageSettingsScreen} from './screens/Settings/LanguageSettings'
-import {PrivacyAndSecuritySettingsScreen} from './screens/Settings/PrivacyAndSecuritySettings'
-import {SettingsScreen} from './screens/Settings/Settings'
-import {ThreadPreferencesScreen} from './screens/Settings/ThreadPreferences'
 
 const navigationRef = createNavigationContainerRef<AllNavigatorParams>()
 
@@ -285,7 +281,7 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
       />
       <Stack.Screen
         name="AppPasswords"
-        getComponent={() => AppPasswordsScreen}
+        getComponent={() => AppPasswords}
         options={{title: title(msg`App Passwords`), requireAuth: true}}
       />
       <Stack.Screen
@@ -295,7 +291,7 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
       />
       <Stack.Screen
         name="PreferencesFollowingFeed"
-        getComponent={() => FollowingFeedPreferencesScreen}
+        getComponent={() => PreferencesFollowingFeed}
         options={{
           title: title(msg`Following Feed Preferences`),
           requireAuth: true,
@@ -303,12 +299,12 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
       />
       <Stack.Screen
         name="PreferencesThreads"
-        getComponent={() => ThreadPreferencesScreen}
+        getComponent={() => PreferencesThreads}
         options={{title: title(msg`Threads Preferences`), requireAuth: true}}
       />
       <Stack.Screen
         name="PreferencesExternalEmbeds"
-        getComponent={() => ExternalMediaPreferencesScreen}
+        getComponent={() => PreferencesExternalEmbeds}
         options={{
           title: title(msg`External Media Preferences`),
           requireAuth: true,
@@ -326,39 +322,7 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
         name="AppearanceSettings"
         getComponent={() => AppearanceSettingsScreen}
         options={{
-          title: title(msg`Appearance`),
-          requireAuth: true,
-        }}
-      />
-      <Stack.Screen
-        name="AccountSettings"
-        getComponent={() => AccountSettingsScreen}
-        options={{
-          title: title(msg`Account`),
-          requireAuth: true,
-        }}
-      />
-      <Stack.Screen
-        name="PrivacyAndSecuritySettings"
-        getComponent={() => PrivacyAndSecuritySettingsScreen}
-        options={{
-          title: title(msg`Privacy and Security`),
-          requireAuth: true,
-        }}
-      />
-      <Stack.Screen
-        name="ContentAndMediaSettings"
-        getComponent={() => ContentAndMediaSettingsScreen}
-        options={{
-          title: title(msg`Content and Media`),
-          requireAuth: true,
-        }}
-      />
-      <Stack.Screen
-        name="AboutSettings"
-        getComponent={() => AboutSettingsScreen}
-        options={{
-          title: title(msg`About`),
+          title: title(msg`Appearance Settings`),
           requireAuth: true,
         }}
       />
@@ -378,8 +342,8 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
         options={{title: title(msg`Chat settings`), requireAuth: true}}
       />
       <Stack.Screen
-        name="NotificationSettings"
-        getComponent={() => NotificationSettingsScreen}
+        name="NotificationsSettings"
+        getComponent={() => NotificationsSettingsScreen}
         options={{title: title(msg`Notification settings`), requireAuth: true}}
       />
       <Stack.Screen
@@ -448,7 +412,7 @@ function TabsNavigator() {
 }
 
 function HomeTabNavigator() {
-  const t = useTheme()
+  const pal = usePalette('default')
 
   return (
     <HomeTab.Navigator
@@ -458,7 +422,7 @@ function HomeTabNavigator() {
         gestureEnabled: true,
         fullScreenGestureEnabled: true,
         headerShown: false,
-        contentStyle: t.atoms.bg,
+        contentStyle: pal.view,
       }}>
       <HomeTab.Screen name="Home" getComponent={() => HomeScreen} />
       <HomeTab.Screen name="Start" getComponent={() => HomeScreen} />
@@ -468,7 +432,7 @@ function HomeTabNavigator() {
 }
 
 function SearchTabNavigator() {
-  const t = useTheme()
+  const pal = usePalette('default')
   return (
     <SearchTab.Navigator
       screenOptions={{
@@ -477,7 +441,7 @@ function SearchTabNavigator() {
         gestureEnabled: true,
         fullScreenGestureEnabled: true,
         headerShown: false,
-        contentStyle: t.atoms.bg,
+        contentStyle: pal.view,
       }}>
       <SearchTab.Screen name="Search" getComponent={() => SearchScreen} />
       {commonScreens(SearchTab as typeof HomeTab)}
@@ -486,7 +450,7 @@ function SearchTabNavigator() {
 }
 
 function NotificationsTabNavigator() {
-  const t = useTheme()
+  const pal = usePalette('default')
   return (
     <NotificationsTab.Navigator
       screenOptions={{
@@ -495,7 +459,7 @@ function NotificationsTabNavigator() {
         gestureEnabled: true,
         fullScreenGestureEnabled: true,
         headerShown: false,
-        contentStyle: t.atoms.bg,
+        contentStyle: pal.view,
       }}>
       <NotificationsTab.Screen
         name="Notifications"
@@ -508,7 +472,7 @@ function NotificationsTabNavigator() {
 }
 
 function MyProfileTabNavigator() {
-  const t = useTheme()
+  const pal = usePalette('default')
   return (
     <MyProfileTab.Navigator
       screenOptions={{
@@ -517,7 +481,7 @@ function MyProfileTabNavigator() {
         gestureEnabled: true,
         fullScreenGestureEnabled: true,
         headerShown: false,
-        contentStyle: t.atoms.bg,
+        contentStyle: pal.view,
       }}>
       <MyProfileTab.Screen
         // @ts-ignore // TODO: fix this broken type in ProfileScreen
@@ -534,7 +498,7 @@ function MyProfileTabNavigator() {
 }
 
 function MessagesTabNavigator() {
-  const t = useTheme()
+  const pal = usePalette('default')
   return (
     <MessagesTab.Navigator
       screenOptions={{
@@ -543,7 +507,7 @@ function MessagesTabNavigator() {
         gestureEnabled: true,
         fullScreenGestureEnabled: true,
         headerShown: false,
-        contentStyle: t.atoms.bg,
+        contentStyle: pal.view,
       }}>
       <MessagesTab.Screen
         name="Messages"
@@ -563,7 +527,7 @@ function MessagesTabNavigator() {
  * in a single ("flat") stack.
  */
 const FlatNavigator = () => {
-  const t = useTheme()
+  const pal = usePalette('default')
   const numUnread = useUnreadNotifications()
   const screenListeners = useWebScrollRestoration()
   const title = (page: MessageDescriptor) => bskyTitle(i18n._(page), numUnread)
@@ -577,7 +541,7 @@ const FlatNavigator = () => {
         gestureEnabled: true,
         fullScreenGestureEnabled: true,
         headerShown: false,
-        contentStyle: t.atoms.bg,
+        contentStyle: pal.view,
       }}>
       <Flat.Screen
         name="Home"
@@ -696,7 +660,7 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
       onStateChange={() => {
         const routeName = getCurrentRouteName()
         if (routeName === 'Notifications') {
-          logEvent('router:navigate:notifications', {})
+          logEvent('router:navigate:notifications:sampled', {})
         }
       }}
       onReady={() => {

src/Splash.tsx

@@ -1,27 +1,28 @@
 import React, {useCallback, useEffect} from 'react'
 import {
-  AccessibilityInfo,
-  Image as RNImage,
-  StyleSheet,
-  useColorScheme,
   View,
+  StyleSheet,
+  Image as RNImage,
+  AccessibilityInfo,
+  useColorScheme,
 } from 'react-native'
+import * as SplashScreen from 'expo-splash-screen'
+import {Image} from 'expo-image'
 import Animated, {
-  Easing,
   interpolate,
   runOnJS,
   useAnimatedStyle,
   useSharedValue,
   withTiming,
+  Easing,
 } from 'react-native-reanimated'
+import MaskedView from '@react-native-masked-view/masked-view'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import Svg, {Path, SvgProps} from 'react-native-svg'
-import {Image} from 'expo-image'
-import * as SplashScreen from 'expo-splash-screen'
-import MaskedView from '@react-native-masked-view/masked-view'
 
 import {isAndroid} from '#/platform/detection'
 import {Logotype} from '#/view/icons/Logotype'
+
 // @ts-ignore
 import splashImagePointer from '../assets/splash.png'
 // @ts-ignore
@@ -80,40 +81,40 @@ export function Splash(props: React.PropsWithChildren<Props>) {
     return {
       transform: [
         {
-          scale: interpolate(intro.get(), [0, 1], [0.8, 1], 'clamp'),
+          scale: interpolate(intro.value, [0, 1], [0.8, 1], 'clamp'),
         },
         {
           scale: interpolate(
-            outroLogo.get(),
+            outroLogo.value,
             [0, 0.08, 1],
             [1, 0.8, 500],
             'clamp',
           ),
         },
       ],
-      opacity: interpolate(intro.get(), [0, 1], [0, 1], 'clamp'),
+      opacity: interpolate(intro.value, [0, 1], [0, 1], 'clamp'),
     }
   })
   const bottomLogoAnimation = useAnimatedStyle(() => {
     return {
-      opacity: interpolate(intro.get(), [0, 1], [0, 1], 'clamp'),
+      opacity: interpolate(intro.value, [0, 1], [0, 1], 'clamp'),
     }
   })
   const reducedLogoAnimation = useAnimatedStyle(() => {
     return {
       transform: [
         {
-          scale: interpolate(intro.get(), [0, 1], [0.8, 1], 'clamp'),
+          scale: interpolate(intro.value, [0, 1], [0.8, 1], 'clamp'),
         },
       ],
-      opacity: interpolate(intro.get(), [0, 1], [0, 1], 'clamp'),
+      opacity: interpolate(intro.value, [0, 1], [0, 1], 'clamp'),
     }
   })
 
   const logoWrapperAnimation = useAnimatedStyle(() => {
     return {
       opacity: interpolate(
-        outroAppOpacity.get(),
+        outroAppOpacity.value,
         [0, 0.1, 0.2, 1],
         [1, 1, 0, 0],
         'clamp',
@@ -125,11 +126,11 @@ export function Splash(props: React.PropsWithChildren<Props>) {
     return {
       transform: [
         {
-          scale: interpolate(outroApp.get(), [0, 1], [1.1, 1], 'clamp'),
+          scale: interpolate(outroApp.value, [0, 1], [1.1, 1], 'clamp'),
         },
       ],
       opacity: interpolate(
-        outroAppOpacity.get(),
+        outroAppOpacity.value,
         [0, 0.1, 0.2, 1],
         [0, 0, 1, 1],
         'clamp',
@@ -145,37 +146,29 @@ export function Splash(props: React.PropsWithChildren<Props>) {
     if (isReady) {
       SplashScreen.hideAsync()
         .then(() => {
-          intro.set(() =>
-            withTiming(
-              1,
-              {duration: 400, easing: Easing.out(Easing.cubic)},
-              async () => {
-                // set these values to check animation at specific point
-                // outroLogo.set(0.1)
-                // outroApp.set(0.1)
-                outroLogo.set(() =>
-                  withTiming(
-                    1,
-                    {duration: 1200, easing: Easing.in(Easing.cubic)},
-                    () => {
-                      runOnJS(onFinish)()
-                    },
-                  ),
-                )
-                outroApp.set(() =>
-                  withTiming(1, {
-                    duration: 1200,
-                    easing: Easing.inOut(Easing.cubic),
-                  }),
-                )
-                outroAppOpacity.set(() =>
-                  withTiming(1, {
-                    duration: 1200,
-                    easing: Easing.in(Easing.cubic),
-                  }),
-                )
-              },
-            ),
+          intro.value = withTiming(
+            1,
+            {duration: 400, easing: Easing.out(Easing.cubic)},
+            async () => {
+              // set these values to check animation at specific point
+              // outroLogo.value = 0.1
+              // outroApp.value = 0.1
+              outroLogo.value = withTiming(
+                1,
+                {duration: 1200, easing: Easing.in(Easing.cubic)},
+                () => {
+                  runOnJS(onFinish)()
+                },
+              )
+              outroApp.value = withTiming(1, {
+                duration: 1200,
+                easing: Easing.inOut(Easing.cubic),
+              })
+              outroAppOpacity.value = withTiming(1, {
+                duration: 1200,
+                easing: Easing.in(Easing.cubic),
+              })
+            },
           )
         })
         .catch(() => {})

src/alf/atoms.ts

@@ -1,4 +1,4 @@
-import {Platform, StyleProp, StyleSheet, ViewStyle} from 'react-native'
+import {Platform, StyleSheet, ViewStyle} from 'react-native'
 
 import * as tokens from '#/alf/tokens'
 import {native, web} from '#/alf/util/platform'
@@ -102,9 +102,6 @@ export const atoms = {
   /*
    * Flex
    */
-  gap_0: {
-    gap: 0,
-  },
   gap_2xs: {
     gap: tokens.space._2xs,
   },
@@ -279,13 +276,13 @@ export const atoms = {
     letterSpacing: tokens.TRACKING,
   },
   font_normal: {
-    fontWeight: tokens.fontWeight.normal,
+    fontWeight: tokens.fontWeight.regular,
   },
   font_bold: {
-    fontWeight: tokens.fontWeight.bold,
+    fontWeight: tokens.fontWeight.semibold,
   },
   font_heavy: {
-    fontWeight: tokens.fontWeight.heavy,
+    fontWeight: tokens.fontWeight.extrabold,
   },
   italic: {
     fontStyle: 'italic',
@@ -887,9 +884,6 @@ export const atoms = {
   user_select_all: {
     userSelect: 'all',
   },
-  outline_inset_1: {
-    outlineOffset: '-1px',
-  } as StyleProp<ViewStyle>,
 
   /*
    * Text decoration
@@ -907,32 +901,4 @@ export const atoms = {
   hidden: {
     display: 'none',
   },
-
-  /*
-   * Transition
-   */
-  transition_none: web({
-    transitionProperty: 'none',
-  }),
-  transition_all: web({
-    transitionProperty: 'all',
-    transitionTimingFunction: 'cubic-bezier(0.17, 0.73, 0.14, 1)',
-    transitionDuration: '100ms',
-  }),
-  transition_color: web({
-    transitionProperty:
-      'color, background-color, border-color, text-decoration-color, fill, stroke',
-    transitionTimingFunction: 'cubic-bezier(0.17, 0.73, 0.14, 1)',
-    transitionDuration: '100ms',
-  }),
-  transition_opacity: web({
-    transitionProperty: 'opacity',
-    transitionTimingFunction: 'cubic-bezier(0.17, 0.73, 0.14, 1)',
-    transitionDuration: '100ms',
-  }),
-  transition_transform: web({
-    transitionProperty: 'transform',
-    transitionTimingFunction: 'cubic-bezier(0.17, 0.73, 0.14, 1)',
-    transitionDuration: '100ms',
-  }),
 } as const

src/alf/fonts.ts

@@ -1,9 +1,7 @@
-import {TextStyle} from 'react-native'
-
-import {isAndroid, isWeb} from '#/platform/detection'
+import {isWeb} from '#/platform/detection'
 import {Device, device} from '#/storage'
 
-const WEB_FONT_FAMILIES = `system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"`
+const FAMILIES = `-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Liberation Sans", Helvetica, Arial, sans-serif`
 
 const factor = 0.0625 // 1 - (15/16)
 const fontScaleMultipliers: Record<Device['fontScale'], number> = {
@@ -37,65 +35,31 @@ export function setFontFamily(fontFamily: Device['fontFamily']) {
 /*
  * Unused fonts are commented out, but the files are there if we need them.
  */
-export function applyFonts(style: TextStyle, fontFamily: 'system' | 'theme') {
+export function applyFonts(
+  style: Record<string, any>,
+  fontFamily: 'system' | 'theme',
+) {
   if (fontFamily === 'theme') {
-    if (isAndroid) {
-      style.fontFamily =
-        {
-          400: 'Inter-Regular',
-          500: 'Inter-Regular',
-          600: 'Inter-SemiBold',
-          700: 'Inter-SemiBold',
-          800: 'Inter-ExtraBold',
-          900: 'Inter-ExtraBold',
-        }[String(style.fontWeight || '400')] || 'Inter-Regular'
+    style.fontFamily = 'InterVariable'
 
-      if (style.fontStyle === 'italic') {
-        if (style.fontFamily === 'Inter-Regular') {
-          style.fontFamily = 'Inter-Italic'
-        } else {
-          style.fontFamily += 'Italic'
-        }
-      }
-
-      /*
-       * These are not supported on Android and actually break the styling.
-       */
-      delete style.fontWeight
-      delete style.fontStyle
-    } else {
-      style.fontFamily = 'InterVariable'
-
-      if (style.fontStyle === 'italic') {
-        style.fontFamily += 'Italic'
-      }
+    if (style.fontStyle === 'italic') {
+      style.fontFamily += 'Italic'
     }
 
+    // fallback families only supported on web
     if (isWeb) {
-      // fallback families only supported on web
-      style.fontFamily += `, ${WEB_FONT_FAMILIES}`
+      style.fontFamily += `, ${FAMILIES}`
     }
-
-    /**
-     * Disable contextual alternates in Inter
-     * {@link https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant}
-     */
-    style.fontVariant = (style.fontVariant || []).concat('no-contextual')
   } else {
     // fallback families only supported on web
     if (isWeb) {
-      style.fontFamily = style.fontFamily || WEB_FONT_FAMILIES
+      style.fontFamily = style.fontFamily || FAMILIES
     }
-
-    /**
-     * Overridden to previous spacing for the `system` font option.
-     * https://github.com/bluesky-social/social-app/commit/2419096e2409008b7d71fd6b8f8d0dd5b016e267
-     */
-    style.letterSpacing = 0.25
   }
-}
 
-/**
- * Here only for bundling purposes, not actually used.
- */
-export {DO_NOT_USE} from '#/alf/util/unusedUseFonts'
+  /**
+   * Disable contextual ligatures
+   * {@link https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant}
+   */
+  style.fontVariant = ['no-contextual']
+}

src/alf/index.tsx

@@ -103,32 +103,35 @@ export function ThemeProvider({
     })
   }, [])
 
-  const value = React.useMemo<Alf>(
-    () => ({
-      themes,
-      themeName: themeName,
-      theme: themes[themeName],
-      fonts: {
-        scale: fontScale,
-        scaleMultiplier: fontScaleMultiplier,
-        family: fontFamily,
-        setFontScale: setFontScaleAndPersist,
-        setFontFamily: setFontFamilyAndPersist,
-      },
-      flags: {},
-    }),
-    [
-      themeName,
-      themes,
-      fontScale,
-      setFontScaleAndPersist,
-      fontFamily,
-      setFontFamilyAndPersist,
-      fontScaleMultiplier,
-    ],
+  return (
+    <Context.Provider
+      value={React.useMemo<Alf>(
+        () => ({
+          themes,
+          themeName: themeName,
+          theme: themes[themeName],
+          fonts: {
+            scale: fontScale,
+            scaleMultiplier: fontScaleMultiplier,
+            family: fontFamily,
+            setFontScale: setFontScaleAndPersist,
+            setFontFamily: setFontFamilyAndPersist,
+          },
+          flags: {},
+        }),
+        [
+          themeName,
+          themes,
+          fontScale,
+          setFontScaleAndPersist,
+          fontFamily,
+          setFontFamilyAndPersist,
+          fontScaleMultiplier,
+        ],
+      )}>
+      {children}
+    </Context.Provider>
   )
-
-  return <Context.Provider value={value}>{children}</Context.Provider>
 }
 
 export function useAlf() {

src/alf/tokens.ts

@@ -1,6 +1,6 @@
-import {isAndroid} from '#/platform/detection'
+import {Platform} from 'react-native'
 
-export const TRACKING = isAndroid ? 0.1 : 0
+export const TRACKING = Platform.OS === 'android' ? 0.1 : 0
 
 export const color = {
   temp_purple: 'rgb(105 0 255)',
@@ -51,9 +51,12 @@ export const borderRadius = {
  * These correspond to Inter font files we actually load.
  */
 export const fontWeight = {
-  normal: '400',
-  bold: '600',
-  heavy: '800',
+  regular: '400',
+  // medium: '500',
+  semibold: '600',
+  // bold: '700',
+  extrabold: '800',
+  // black: '900',
 } as const
 
 export const gradients = {

src/alf/util/platform.ts

@@ -1,62 +1,25 @@
-import {Platform} from 'react-native'
+import {isAndroid, isIOS, isNative, isWeb} from 'platform/detection'
 
-import {isAndroid, isIOS, isNative, isWeb} from '#/platform/detection'
-
-/**
- * Identity function on web. Returns nothing on other platforms.
- *
- * Note: Platform splitting does not tree-shake away the other platforms,
- * so don't do stuff like e.g. rely on platform-specific imports. Use
- * platform-split files instead.
- */
 export function web(value: any) {
   if (isWeb) {
     return value
   }
 }
 
-/**
- * Identity function on iOS. Returns nothing on other platforms.
- *
- * Note: Platform splitting does not tree-shake away the other platforms,
- * so don't do stuff like e.g. rely on platform-specific imports. Use
- * platform-split files instead.
- */
 export function ios(value: any) {
   if (isIOS) {
     return value
   }
 }
 
-/**
- * Identity function on Android. Returns nothing on other platforms..
- *
- * Note: Platform splitting does not tree-shake away the other platforms,
- * so don't do stuff like e.g. rely on platform-specific imports. Use
- * platform-split files instead.
- */
 export function android(value: any) {
   if (isAndroid) {
     return value
   }
 }
 
-/**
- * Identity function on iOS and Android. Returns nothing on web.
- *
- * Note: Platform splitting does not tree-shake away the other platforms,
- * so don't do stuff like e.g. rely on platform-specific imports. Use
- * platform-split files instead.
- */
 export function native(value: any) {
   if (isNative) {
     return value
   }
 }
-
-/**
- * Note: Platform splitting does not tree-shake away the other platforms,
- * so don't do stuff like e.g. rely on platform-specific imports. Use
- * platform-split files instead.
- */
-export const platform = Platform.select

src/alf/util/unusedUseFonts.android.ts

@@ -1,19 +0,0 @@
-import {useFonts} from 'expo-font'
-
-/*
- * IMPORTANT: This is unused. Expo statically extracts these fonts.
- *
- * All used fonts MUST be configured here. Unused fonts can be commented out.
- *
- * This is used for both web fonts and native fonts.
- */
-export function DO_NOT_USE() {
-  return useFonts({
-    'Inter-Regular': require('../../../assets/fonts/inter/Inter-Regular.otf'),
-    'Inter-Italic': require('../../../assets/fonts/inter/Inter-Italic.otf'),
-    'Inter-Bold': require('../../../assets/fonts/inter/Inter-SemiBold.otf'),
-    'Inter-BoldItalic': require('../../../assets/fonts/inter/Inter-SemiBoldItalic.otf'),
-    'Inter-Black': require('../../../assets/fonts/inter/Inter-ExtraBold.otf'),
-    'Inter-BlackItalic': require('../../../assets/fonts/inter/Inter-ExtraBoldItalic.otf'),
-  })
-}

src/alf/util/unusedUseFonts.ts

@@ -1,15 +0,0 @@
-import {useFonts} from 'expo-font'
-
-/*
- * IMPORTANT: This is unused. Expo statically extracts these fonts.
- *
- * All used fonts MUST be configured here. Unused fonts can be commented out.
- *
- * This is used for both web fonts and native fonts.
- */
-export function DO_NOT_USE() {
-  return useFonts({
-    InterVariable: require('../../../assets/fonts/inter/InterVariable.ttf'),
-    'InterVariable-Italic': require('../../../assets/fonts/inter/InterVariable-Italic.ttf'),
-  })
-}