actually specify @types/react@19, remove need for transitive dep

.husky/pre-commit

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

__tests__/lib/images.test.ts

@@ -1,9 +1,10 @@
-import {createDownloadResumable, deleteAsync} from 'expo-file-system'
+import {deleteAsync} from 'expo-file-system'
 import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
+import RNFetchBlob from 'rn-fetch-blob'
 
 import {
   downloadAndResize,
-  type DownloadAndResizeOpts,
+  DownloadAndResizeOpts,
   getResizedDimensions,
 } from '../../src/lib/media/manip'
 
@@ -31,12 +32,11 @@ describe('downloadAndResize', () => {
   })
 
   it('should return resized image for valid URI and options', async () => {
-    const mockedFetch = createDownloadResumable as jest.Mock
-    mockedFetch.mockReturnValue({
-      cancelAsync: jest.fn(),
-      downloadAsync: jest
-        .fn()
-        .mockResolvedValue({uri: 'file://resized-image.jpg'}),
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image.jpg'),
+      info: jest.fn().mockReturnValue({status: 200}),
+      flush: jest.fn(),
     })
 
     const opts: DownloadAndResizeOpts = {
@@ -50,12 +50,13 @@ describe('downloadAndResize', () => {
 
     const result = await downloadAndResize(opts)
     expect(result).toEqual(mockResizedImage)
-    expect(createDownloadResumable).toHaveBeenCalledWith(
-      opts.uri,
-      expect.anything(),
-      {
-        cache: true,
-      },
+    expect(RNFetchBlob.config).toHaveBeenCalledWith({
+      fileCache: true,
+      appendExt: 'jpeg',
+    })
+    expect(RNFetchBlob.fetch).toHaveBeenCalledWith(
+      'GET',
+      'https://example.com/image.jpg',
     )
 
     // First time it gets called is to get dimensions
@@ -85,6 +86,28 @@ describe('downloadAndResize', () => {
     expect(result).toBeUndefined()
   })
 
+  it('should return undefined for non-200 response', async () => {
+    const mockedFetch = RNFetchBlob.fetch as jest.Mock
+    mockedFetch.mockResolvedValueOnce({
+      path: jest.fn().mockReturnValue('file://downloaded-image'),
+      info: jest.fn().mockReturnValue({status: 400}),
+      flush: jest.fn(),
+    })
+
+    const opts: DownloadAndResizeOpts = {
+      uri: 'https://example.com/image',
+      width: 100,
+      height: 100,
+      maxSize: 500000,
+      mode: 'cover',
+      timeout: 10000,
+    }
+
+    const result = await downloadAndResize(opts)
+    expect(errorSpy).not.toHaveBeenCalled()
+    expect(result).toBeUndefined()
+  })
+
   it('should not downsize whenever dimensions are below the max dimensions', () => {
     const initialDimensionsOne = {
       width: 1200,

app.config.js

@@ -219,7 +219,7 @@ module.exports = function (_config) {
               compileSdkVersion: 35,
               targetSdkVersion: 35,
               buildToolsVersion: '35.0.0',
-              newArchEnabled: true,
+              newArchEnabled: false,
             },
           },
         ],

assets/icons/arrowTopCircle_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" d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16Zm-.63 3.225a1 1 0 0 1 1.337.068l3 3 .068.076a1 1 0 0 1-1.406 1.406l-.076-.068L13 10.414V16a1 1 0 1 1-2 0v-5.586l-1.293 1.293a1 1 0 1 1-1.414-1.414l3-3 .076-.068Z"/></svg>

assets/icons/circlePlus_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" d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16Zm0 3a1 1 0 0 1 1 1v3h3l.102.005a1 1 0 0 1 0 1.99L16 13h-3v3a1 1 0 1 1-2 0v-3H8a1 1 0 0 1 0-2h3V8a1 1 0 0 1 1-1Z"/></svg>

assets/icons/tree_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" d="M6 2a2.998 2.998 0 0 1 1 5.825V8a2 2 0 0 0 2 2h1.174c.412-1.165 1.52-2 2.826-2h5a3 3 0 1 1 0 6h-5a3 3 0 0 1-2.826-2H9a4 4 0 0 1-2-.537V16a2 2 0 0 0 2 2h1.174c.412-1.165 1.52-2 2.826-2h5a3 3 0 1 1 0 6h-5a3 3 0 0 1-2.826-2H9a4 4 0 0 1-4-4V7.825A2.998 2.998 0 0 1 6 2Zm7 16a1 1 0 1 0 0 2h5a1 1 0 1 0 0-2h-5Zm0-8a1 1 0 1 0 0 2h5a1 1 0 1 0 0-2h-5ZM6 4a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z"/></svg>

bskylink/src/routes/index.ts

@@ -1,6 +1,6 @@
-import {type Express} from 'express'
+import {Express} from 'express'
 
-import {type AppContext} from '../context.js'
+import {AppContext} from '../context.js'
 import {default as createShortLink} from './createShortLink.js'
 import {default as health} from './health.js'
 import {default as redirect} from './redirect.js'

bskylink/src/routes/redirect.ts

@@ -2,9 +2,9 @@ import assert from 'node:assert'
 
 import {DAY, SECOND} from '@atproto/common'
 import escapeHTML from 'escape-html'
-import {type Express} from 'express'
+import {Express} from 'express'
 
-import {type AppContext} from '../context.js'
+import {AppContext} from '../context.js'
 import {handler} from './util.js'
 
 const INTERNAL_IP_REGEX = new RegExp(

bskylink/src/routes/root.ts

@@ -1,6 +1,6 @@
-import {type Express} from 'express'
+import {Express} from 'express'
 
-import {type AppContext} from '../context.js'
+import {AppContext} from '../context.js'
 import {handler} from './util.js'
 
 export default function (ctx: AppContext, app: Express) {

jest/jestSetup.js

@@ -33,10 +33,15 @@ jest.mock('react-native-safe-area-context', () => {
   }
 })
 
+jest.mock('rn-fetch-blob', () => ({
+  config: jest.fn().mockReturnThis(),
+  cancel: jest.fn(),
+  fetch: jest.fn(),
+}))
+
 jest.mock('expo-file-system', () => ({
   getInfoAsync: jest.fn().mockResolvedValue({exists: true, size: 100}),
   deleteAsync: jest.fn(),
-  createDownloadResumable: jest.fn(),
 }))
 
 jest.mock('expo-image-manipulator', () => ({
@@ -96,7 +101,7 @@ jest.mock('expo-modules-core', () => ({
       }
     }
   }),
-  requireNativeViewManager: jest.fn().mockImplementation(_ => {
+  requireNativeViewManager: jest.fn().mockImplementation(moduleName => {
     return () => null
   }),
 }))

package.json

@@ -69,12 +69,12 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.15.15",
+    "@atproto/api": "^0.15.9",
     "@bitdrift/react-native": "^0.6.8",
     "@braintree/sanitize-url": "^6.0.2",
     "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
     "@emoji-mart/react": "^1.1.1",
-    "@expo/html-elements": "^0.12.5",
+    "@expo/html-elements": "^0.12.4",
     "@expo/webpack-config": "^19.0.1",
     "@floating-ui/dom": "^1.6.3",
     "@floating-ui/react-dom": "^2.0.8",
@@ -85,12 +85,12 @@
     "@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.3.1",
+    "@haileyok/bluesky-video": "0.2.6",
     "@ipld/dag-cbor": "^9.2.0",
     "@lingui/react": "^4.14.1",
-    "@mattermost/react-native-paste-input": "mattermost/react-native-paste-input",
-    "@miblanchard/react-native-slider": "^2.6.0",
-    "@mozzius/expo-dynamic-app-icon": "1.5.0",
+    "@mattermost/react-native-paste-input": "^0.7.1",
+    "@miblanchard/react-native-slider": "^2.3.1",
+    "@mozzius/expo-dynamic-app-icon": "^1.5.0",
     "@react-native-async-storage/async-storage": "2.1.2",
     "@react-native-menu/menu": "^1.2.3",
     "@react-native-picker/picker": "2.11.0",
@@ -98,7 +98,7 @@
     "@react-navigation/drawer": "^7.3.12",
     "@react-navigation/native": "^7.1.9",
     "@react-navigation/native-stack": "^7.3.13",
-    "@sentry/react-native": "~6.14.0",
+    "@sentry/react-native": "~6.10.0",
     "@tanstack/query-async-storage-persister": "^5.25.0",
     "@tanstack/react-query": "^5.8.1",
     "@tanstack/react-query-persist-client": "^5.25.0",
@@ -130,33 +130,33 @@
     "emoji-mart": "^5.5.2",
     "emoji-regex": "^10.4.0",
     "eventemitter3": "^5.0.1",
-    "expo": "53.0.11",
+    "expo": "^53.0.5",
     "expo-application": "~6.1.4",
-    "expo-blur": "~14.1.5",
+    "expo-blur": "~14.1.4",
     "expo-build-properties": "~0.14.6",
-    "expo-camera": "~16.1.8",
+    "expo-camera": "~16.1.6",
     "expo-clipboard": "~7.1.4",
-    "expo-dev-client": "~5.2.0",
+    "expo-dev-client": "~5.1.7",
     "expo-device": "~7.1.4",
-    "expo-file-system": "~18.1.10",
-    "expo-font": "~13.3.1",
+    "expo-file-system": "~18.1.8",
+    "expo-font": "~13.3.0",
     "expo-haptics": "~14.1.4",
-    "expo-image": "~2.2.1",
+    "expo-image": "~2.1.6",
     "expo-image-crop-tool": "^0.1.8",
-    "expo-image-manipulator": "~13.1.7",
+    "expo-image-manipulator": "~13.1.5",
     "expo-image-picker": "~16.1.4",
-    "expo-linear-gradient": "~14.1.5",
-    "expo-linking": "~7.1.5",
+    "expo-linear-gradient": "~14.1.4",
+    "expo-linking": "~7.1.4",
     "expo-localization": "~16.1.5",
-    "expo-media-library": "~17.1.7",
-    "expo-notifications": "~0.31.3",
-    "expo-screen-orientation": "~8.1.7",
+    "expo-media-library": "~17.1.6",
+    "expo-notifications": "~0.31.1",
+    "expo-screen-orientation": "~8.1.5",
     "expo-sharing": "~13.1.5",
-    "expo-splash-screen": "~0.30.9",
-    "expo-system-ui": "~5.0.8",
+    "expo-splash-screen": "~0.30.8",
+    "expo-system-ui": "~5.0.7",
     "expo-task-manager": "~13.1.5",
-    "expo-updates": "~0.28.14",
-    "expo-video": "~2.2.1",
+    "expo-updates": "~0.28.12",
+    "expo-video": "~2.1.8",
     "expo-web-browser": "~14.1.6",
     "fast-text-encoding": "^1.0.6",
     "history": "^5.3.0",
@@ -182,34 +182,35 @@
     "react-image-crop": "^11.0.7",
     "react-is": "19",
     "react-keyed-flatten-children": "^5.0.0",
-    "react-native": "^0.79.3",
-    "react-native-compressor": "^1.11.0",
+    "react-native": "0.79.2",
+    "react-native-compressor": "1.11.0",
     "react-native-date-picker": "^5.0.12",
-    "react-native-drawer-layout": "^4.1.8",
+    "react-native-drawer-layout": "^4.1.6",
     "react-native-edge-to-edge": "^1.6.0",
     "react-native-gesture-handler": "2.25.0",
     "react-native-get-random-values": "~1.11.0",
     "react-native-ios-context-menu": "^1.15.3",
     "react-native-keyboard-controller": "^1.17.1",
     "react-native-mmkv": "^2.12.2",
-    "react-native-pager-view": "^6.7.1",
+    "react-native-pager-view": "6.7.1",
     "react-native-progress": "bluesky-social/react-native-progress",
     "react-native-qrcode-styled": "^0.3.3",
     "react-native-reanimated": "~3.17.5",
-    "react-native-root-siblings": "^5.0.1",
+    "react-native-root-siblings": "^4.1.1",
     "react-native-safe-area-context": "5.4.0",
     "react-native-screens": "^4.11.1",
-    "react-native-svg": "15.12.0",
+    "react-native-svg": "15.11.2",
     "react-native-uitextview": "^1.4.0",
     "react-native-url-polyfill": "^1.3.0",
     "react-native-uuid": "^2.0.3",
     "react-native-view-shot": "^4.0.3",
     "react-native-web": "~0.20.0",
     "react-native-web-webview": "^1.0.2",
-    "react-native-webview": "^13.13.5",
+    "react-native-webview": "13.13.5",
     "react-remove-scroll-bar": "^2.3.8",
-    "react-responsive": "^9.0.2",
+    "react-responsive": "^10.0.1",
     "react-textarea-autosize": "^8.5.3",
+    "rn-fetch-blob": "^0.12.0",
     "statsig-react-native-expo": "^4.6.1",
     "tippy.js": "^6.3.7",
     "tlds": "^1.234.0",
@@ -226,9 +227,8 @@
     "@lingui/cli": "^4.14.1",
     "@lingui/macro": "^4.14.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
-    "@react-native/babel-preset": "0.79.3",
-    "@react-native/eslint-config": "^0.79.3",
-    "@react-native/typescript-config": "^0.79.3",
+    "@react-native/eslint-config": "^0.79.2",
+    "@react-native/typescript-config": "^0.79.2",
     "@sentry/webpack-plugin": "^3.2.2",
     "@testing-library/jest-native": "^5.4.3",
     "@testing-library/react-native": "^13.2.0",
@@ -238,8 +238,8 @@
     "@types/lodash.isequal": "^4.5.6",
     "@types/lodash.shuffle": "^4.2.7",
     "@types/psl": "^1.1.1",
+    "@types/react": "^19.1.7",
     "@types/react-dom": "^19.1.2",
-    "@types/react-responsive": "^8.0.5",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "babel-jest": "^29.7.0",
@@ -260,7 +260,7 @@
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
     "jest": "^29.7.0",
-    "jest-expo": "~53.0.7",
+    "jest-expo": "~53.0.3",
     "jest-junit": "^16.0.0",
     "lint-staged": "^13.2.3",
     "lockfile-lint": "^4.14.0",
@@ -275,11 +275,10 @@
   },
   "resolutions": {
     "@expo/image-utils": "0.6.3",
-    "@react-native/babel-preset": "0.79.3",
-    "@react-native/normalize-colors": "0.79.3",
-    "@types/react": "^18",
+    "@react-native/babel-preset": "0.79.2",
+    "@react-native/normalize-colors": "0.79.2",
     "**/expo-constants": "17.0.3",
-    "**/expo-device": "7.1.4",
+    "**/expo-device": "7.0.1",
     "**/zod": "3.23.8",
     "**/multiformats": "9.9.0"
   },
@@ -359,8 +358,7 @@
     ],
     "allowedUrls": [
       "https://codeload.github.com/bluesky-social/react-native-bottom-sheet/tar.gz/28a87d1bb55e10fc355fa1455545a30734995908",
-      "https://codeload.github.com/bluesky-social/react-native-progress/tar.gz/5a372f4f2ce5feb26f4f47b6a4d187ab9b923ab4",
-      "https://codeload.github.com/mattermost/react-native-paste-input/tar.gz/f260447edc645a817ab1ba7b46d8341d84dba8e9"
+      "https://codeload.github.com/bluesky-social/react-native-progress/tar.gz/5a372f4f2ce5feb26f4f47b6a4d187ab9b923ab4"
     ],
     "emptyHostname": false,
     "validatePackageNames": true,

patches/@discord+bottom-sheet+4.6.1.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@discord/bottom-sheet/src/hooks/useStableCallback.ts b/node_modules/@discord/bottom-sheet/src/hooks/useStableCallback.ts
+index 1c788ab..d30f330 100644
+--- a/node_modules/@discord/bottom-sheet/src/hooks/useStableCallback.ts
++++ b/node_modules/@discord/bottom-sheet/src/hooks/useStableCallback.ts
+@@ -6,7 +6,7 @@ type Callback = (...args: any[]) => any;
+  * https://gist.github.com/JakeCoxon/c7ebf6e6496f8468226fd36b596e1985
+  */
+ export const useStableCallback = (callback: Callback) => {
+-  const callbackRef = useRef<Callback>();
++  const callbackRef = useRef<Callback>(undefined);
+   const memoCallback = useCallback(
+     (...args: any) => callbackRef.current && callbackRef.current(...args),
+     []

patches/@mattermost+react-native-paste-input+0.7.1.patch

@@ -114,7 +114,7 @@ index e916023..5049c33 100644
  }
  
  #pragma mark - UIScrollViewDelegate
-@@ -62,7 +92,6 @@ - (void)setSmartPunctuation:(NSString *)smartPunctuation {
+@@ -62,7 +92,6 @@
  - (void)scrollViewDidScroll:(UIScrollView *)scrollView
  {
    RCTDirectEventBlock onScroll = self.onScroll;
@@ -122,7 +122,7 @@ index e916023..5049c33 100644
    if (onScroll) {
      CGPoint contentOffset = scrollView.contentOffset;
      CGSize contentSize = scrollView.contentSize;
-@@ -71,22 +100,22 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
+@@ -71,22 +100,22 @@
  
      onScroll(@{
        @"contentOffset": @{
@@ -155,110 +155,3 @@ index e916023..5049c33 100644
        },
        @"zoomScale": @(scrollView.zoomScale ?: 1),
      });
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm
-index dd50053..2ed7017 100644
---- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm
-@@ -122,8 +122,8 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
-   const auto &newTextInputProps = static_cast<const PasteTextInputProps &>(*props);
- 
-   // Traits:
--  if (newTextInputProps.traits.multiline != oldTextInputProps.traits.multiline) {
--    [self _setMultiline:newTextInputProps.traits.multiline];
-+  if (newTextInputProps.multiline != oldTextInputProps.multiline) {
-+    [self _setMultiline:newTextInputProps.multiline];
-   }
- 
-   if (newTextInputProps.traits.autocapitalizationType != oldTextInputProps.traits.autocapitalizationType) {
-@@ -421,7 +421,7 @@ - (void)textInputDidChangeSelection
-     return;
-   }
-   const auto &props = static_cast<const PasteTextInputProps &>(*_props);
--  if (props.traits.multiline && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
-+  if (props.multiline && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
-     [self textInputDidChange];
-     _ignoreNextTextInputCall = YES;
-   }
-@@ -708,11 +708,11 @@ - (BOOL)_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldTe
- - (SubmitBehavior)getSubmitBehavior
- {
-   const auto &props = static_cast<const PasteTextInputProps &>(*_props);
--  const SubmitBehavior submitBehaviorDefaultable = props.traits.submitBehavior;
-+  const SubmitBehavior submitBehaviorDefaultable = props.submitBehavior;
- 
-   // We should always have a non-default `submitBehavior`, but in case we don't, set it based on multiline.
-   if (submitBehaviorDefaultable == SubmitBehavior::Default) {
--    return props.traits.multiline ? SubmitBehavior::Newline : SubmitBehavior::BlurAndSubmit;
-+    return props.multiline ? SubmitBehavior::Newline : SubmitBehavior::BlurAndSubmit;
-   }
- 
-   return submitBehaviorDefaultable;
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.cpp b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.cpp
-index 29e094f..7ef519a 100644
---- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.cpp
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.cpp
-@@ -22,8 +22,7 @@ PasteTextInputProps::PasteTextInputProps(
-     const PropsParserContext &context,
-     const PasteTextInputProps &sourceProps,
-     const RawProps& rawProps)
--    : ViewProps(context, sourceProps, rawProps),
--    BaseTextProps(context, sourceProps, rawProps),
-+    : BaseTextInputProps(context, sourceProps, rawProps),
-     traits(convertRawProp(context, rawProps, sourceProps.traits, {})),
-     smartPunctuation(convertRawProp(context, rawProps, "smartPunctuation", sourceProps.smartPunctuation, {})),
-     disableCopyPaste(convertRawProp(context, rawProps, "disableCopyPaste", sourceProps.disableCopyPaste, {false})),
-@@ -133,7 +132,7 @@ TextAttributes PasteTextInputProps::getEffectiveTextAttributes(Float fontSizeMul
- ParagraphAttributes PasteTextInputProps::getEffectiveParagraphAttributes() const {
-     auto result = paragraphAttributes;
- 
--    if (!traits.multiline) {
-+    if (!multiline) {
-         result.maximumNumberOfLines = 1;
-     }
- 
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.h b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.h
-index 723d00c..31cfe66 100644
---- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.h
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/Props.h
-@@ -15,6 +15,7 @@
- #include <react/renderer/components/iostextinput/conversions.h>
- #include <react/renderer/components/iostextinput/primitives.h>
- #include <react/renderer/components/text/BaseTextProps.h>
-+#include <react/renderer/components/textinput/BaseTextInputProps.h>
- #include <react/renderer/components/view/ViewProps.h>
- #include <react/renderer/core/Props.h>
- #include <react/renderer/core/PropsParserContext.h>
-@@ -25,7 +26,7 @@
- 
- namespace facebook::react {
- 
--class PasteTextInputProps final : public ViewProps, public BaseTextProps {
-+class PasteTextInputProps final : public BaseTextInputProps {
- public:
-     PasteTextInputProps() = default;
-     PasteTextInputProps(const PropsParserContext& context, const PasteTextInputProps& sourceProps, const RawProps& rawProps);
-diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/ShadowNodes.cpp b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/ShadowNodes.cpp
-index 31e07e3..7f0ebfb 100644
---- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/ShadowNodes.cpp
-+++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputSpecs/ShadowNodes.cpp
-@@ -91,20 +91,11 @@ void PasteTextInputShadowNode::updateStateIfNeeded(
-   const auto& state = getStateData();
- 
-   react_native_assert(textLayoutManager_);
--  react_native_assert(
--      (!state.layoutManager || state.layoutManager == textLayoutManager_) &&
--      "`StateData` refers to a different `TextLayoutManager`");
--
--  if (state.reactTreeAttributedString == reactTreeAttributedString &&
--      state.layoutManager == textLayoutManager_) {
--    return;
--  }
- 
-   auto newState = TextInputState{};
-   newState.attributedStringBox = AttributedStringBox{reactTreeAttributedString};
-   newState.paragraphAttributes = getConcreteProps().paragraphAttributes;
-   newState.reactTreeAttributedString = reactTreeAttributedString;
--  newState.layoutManager = textLayoutManager_;
-   newState.mostRecentEventCount = getConcreteProps().mostRecentEventCount;
-   setStateData(std::move(newState));
- }

patches/react-native+0.79.2.patch

@@ -1,32 +1,3 @@
-diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
-index 914a249..0deac55 100644
---- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
-+++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
-@@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
-  */
- @interface RCTPullToRefreshViewComponentView : RCTViewComponentView <RCTCustomPullToRefreshViewProtocol>
- 
-+- (void)beginRefreshingProgrammatically;
-+
- @end
- 
- NS_ASSUME_NONNULL_END
-diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
-index d029337..0f63ea3 100644
---- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
-+++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
-@@ -1003,6 +1003,11 @@ - (void)_adjustForMaintainVisibleContentPosition
-   }
- }
- 
-++ (BOOL)shouldBeRecycled
-+{
-+  return NO;
-+}
-+
- @end
- 
- Class<RCTComponentViewProtocol> RCTScrollViewCls(void)
 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
 --- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
@@ -44,7 +15,7 @@ diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshCont
 index 53bfd04..ff1b1ed 100644
 --- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
 +++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-@@ -23,6 +23,7 @@ @implementation RCTRefreshControl {
+@@ -23,6 +23,7 @@
    UIColor *_titleColor;
    CGFloat _progressViewOffset;
    BOOL _hasMovedToWindow;
@@ -52,7 +23,7 @@ index 53bfd04..ff1b1ed 100644
  }
  
  - (instancetype)init
-@@ -58,6 +59,12 @@ - (void)layoutSubviews
+@@ -58,6 +59,12 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
    _isInitialRender = false;
  }
  
@@ -65,7 +36,7 @@ index 53bfd04..ff1b1ed 100644
  - (void)didMoveToWindow
  {
    [super didMoveToWindow];
-@@ -221,4 +228,50 @@ - (void)refreshControlValueChanged
+@@ -221,4 +228,50 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
    }
  }
  
@@ -120,7 +91,7 @@ diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshCont
 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
+@@ -22,11 +22,12 @@ RCT_EXPORT_MODULE()
  
  RCT_EXPORT_VIEW_PROPERTY(onRefresh, RCTDirectEventBlock)
  RCT_EXPORT_VIEW_PROPERTY(refreshing, BOOL)
@@ -134,3 +105,15 @@ index 40aaf9c..1c60164 100644
  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/RCTScrollViewManager.m b/node_modules/react-native/React/Views/ScrollView/RCTScrollViewManager.m
+index cd1e7eb..c1d0172 100644
+--- a/node_modules/react-native/React/Views/ScrollView/RCTScrollViewManager.m
++++ b/node_modules/react-native/React/Views/ScrollView/RCTScrollViewManager.m
+@@ -83,6 +83,7 @@ RCT_EXPORT_VIEW_PROPERTY(showsVerticalScrollIndicator, BOOL)
+ RCT_EXPORT_VIEW_PROPERTY(scrollEventThrottle, NSTimeInterval)
+ RCT_EXPORT_VIEW_PROPERTY(zoomScale, CGFloat)
+ RCT_EXPORT_VIEW_PROPERTY(contentInset, UIEdgeInsets)
++RCT_EXPORT_VIEW_PROPERTY(scrollIndicatorInsets, UIEdgeInsets)
+ RCT_EXPORT_VIEW_PROPERTY(verticalScrollIndicatorInsets, UIEdgeInsets)
+ RCT_EXPORT_VIEW_PROPERTY(scrollToOverflowEnabled, BOOL)
+ RCT_EXPORT_VIEW_PROPERTY(snapToInterval, int)

src/App.native.tsx

@@ -58,7 +58,9 @@ import {Provider as ProgressGuideProvider} from '#/state/shell/progress-guide'
 import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
 import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
 import {Provider as HiddenRepliesProvider} from '#/state/threadgate-hidden-replies'
+import {Provider as UnstablePostSourceProvider} from '#/state/unstable-post-source'
 import {TestCtrls} from '#/view/com/testing/TestCtrls'
+import {Provider as VideoVolumeProvider} from '#/view/com/util/post-embeds/VideoVolumeContext'
 import * as Toast from '#/view/com/util/Toast'
 import {Shell} from '#/view/shell'
 import {ThemeProvider as Alf} from '#/alf'
@@ -68,11 +70,9 @@ import {NuxDialogs} from '#/components/dialogs/nuxs'
 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
 import {Provider as PortalProvider} from '#/components/Portal'
-import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
 import {Splash} from '#/Splash'
 import {BottomSheetProvider} from '../modules/bottom-sheet'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
-import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottomBarBorder'
 
 SplashScreen.preventAutoHideAsync()
 if (isIOS) {
@@ -151,7 +151,7 @@ function InnerApp() {
                                           <MutedThreadsProvider>
                                             <ProgressGuideProvider>
                                               <ServiceAccountManager>
-                                                <HideBottomBarBorderProvider>
+                                                <UnstablePostSourceProvider>
                                                   <GestureHandlerRootView
                                                     style={s.h100pct}>
                                                     <IntentDialogProvider>
@@ -160,7 +160,7 @@ function InnerApp() {
                                                       <NuxDialogs />
                                                     </IntentDialogProvider>
                                                   </GestureHandlerRootView>
-                                                </HideBottomBarBorderProvider>
+                                                </UnstablePostSourceProvider>
                                               </ServiceAccountManager>
                                             </ProgressGuideProvider>
                                           </MutedThreadsProvider>

src/App.web.tsx

@@ -48,6 +48,9 @@ import {Provider as ProgressGuideProvider} from '#/state/shell/progress-guide'
 import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
 import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
 import {Provider as HiddenRepliesProvider} from '#/state/threadgate-hidden-replies'
+import {Provider as UnstablePostSourceProvider} from '#/state/unstable-post-source'
+import {Provider as ActiveVideoProvider} from '#/view/com/util/post-embeds/ActiveVideoWebContext'
+import {Provider as VideoVolumeProvider} from '#/view/com/util/post-embeds/VideoVolumeContext'
 import * as Toast from '#/view/com/util/Toast'
 import {ToastContainer} from '#/view/com/util/Toast.web'
 import {Shell} from '#/view/shell/index'
@@ -58,10 +61,7 @@ import {NuxDialogs} from '#/components/dialogs/nuxs'
 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
 import {Provider as PortalProvider} from '#/components/Portal'
-import {Provider as ActiveVideoProvider} from '#/components/Post/Embed/VideoEmbed/ActiveVideoWebContext'
-import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
-import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottomBarBorder'
 
 /**
  * Begin geolocation ASAP
@@ -132,12 +132,12 @@ function InnerApp() {
                                             <SafeAreaProvider>
                                               <ProgressGuideProvider>
                                                 <ServiceConfigProvider>
-                                                  <HideBottomBarBorderProvider>
+                                                  <UnstablePostSourceProvider>
                                                     <IntentDialogProvider>
                                                       <Shell />
                                                       <NuxDialogs />
                                                     </IntentDialogProvider>
-                                                  </HideBottomBarBorderProvider>
+                                                  </UnstablePostSourceProvider>
                                                 </ServiceConfigProvider>
                                               </ProgressGuideProvider>
                                             </SafeAreaProvider>

src/Navigation.tsx

@@ -1,4 +1,4 @@
-import * as React from 'react'
+import {type JSX, useCallback, useRef} from 'react'
 import {i18n, type MessageDescriptor} from '@lingui/core'
 import {msg} from '@lingui/macro'
 import {
@@ -484,7 +484,7 @@ function commonScreens(Stack: typeof Flat, unreadCountLabel?: string) {
  * in 3 distinct tab-stacks with a different root screen on each.
  */
 function TabsNavigator() {
-  const tabBar = React.useCallback(
+  const tabBar = useCallback(
     (props: JSX.IntrinsicAttributes & BottomTabBarProps) => (
       <BottomBar {...props} />
     ),
@@ -712,7 +712,7 @@ const LINKING = {
 function RoutesContainer({children}: React.PropsWithChildren<{}>) {
   const theme = useColorSchemeStyle(DefaultTheme, DarkTheme)
   const {currentAccount} = useSession()
-  const prevLoggedRouteName = React.useRef<string | undefined>(undefined)
+  const prevLoggedRouteName = useRef<string | undefined>(undefined)
   const emailDialogControl = useEmailDialogControl()
 
   function onReady() {

src/alf/atoms.ts

@@ -1051,8 +1051,4 @@ export const atoms = {
       transform: [],
     },
   }) as {transform: Exclude<ViewStyle['transform'], string | undefined>},
-
-  pointer: web({
-    cursor: 'pointer',
-  }),
 } as const

src/alf/typography.tsx

@@ -3,7 +3,6 @@ import {type TextProps as RNTextProps} from 'react-native'
 import {type StyleProp, type TextStyle} from 'react-native'
 import {UITextView} from 'react-native-uitextview'
 import createEmojiRegex from 'emoji-regex'
-import type React from 'react'
 
 import {isNative} from '#/platform/detection'
 import {isIOS} from '#/platform/detection'

src/alf/util/__tests__/colors.test.ts

@@ -1,48 +0,0 @@
-import {jest} from '@jest/globals'
-
-import {logger} from '#/logger'
-import {transparentifyColor} from '../colorGeneration'
-
-jest.mock('#/logger', () => ({
-  logger: {warn: jest.fn()},
-}))
-
-describe('transparentifyColor', () => {
-  beforeEach(() => {
-    jest.clearAllMocks()
-  })
-
-  it('converts hsl() to hsla()', () => {
-    const result = transparentifyColor('hsl(120 100% 50%)', 0.5)
-    expect(result).toBe('hsla(120 100% 50%, 0.5)')
-  })
-
-  it('converts hsl() to hsla() - fully transparent', () => {
-    const result = transparentifyColor('hsl(120 100% 50%)', 0)
-    expect(result).toBe('hsla(120 100% 50%, 0)')
-  })
-
-  it('converts rgb() to rgba()', () => {
-    const result = transparentifyColor('rgb(255 0 0)', 0.75)
-    expect(result).toBe('rgba(255 0 0, 0.75)')
-  })
-
-  it('expands 3-digit hex and appends alpha channel', () => {
-    const result = transparentifyColor('#abc', 0.4)
-    expect(result).toBe('#aabbcc66')
-  })
-
-  it('appends alpha to 6-digit hex', () => {
-    const result = transparentifyColor('#aabbcc', 0.4)
-    expect(result).toBe('#aabbcc66')
-  })
-
-  it('returns the original string and warns for unsupported formats', () => {
-    const unsupported = 'blue'
-    const result = transparentifyColor(unsupported, 0.5)
-    expect(result).toBe(unsupported)
-    expect(logger.warn).toHaveBeenCalledWith(
-      `Could not make '${unsupported}' transparent`,
-    )
-  })
-})

src/alf/util/colorGeneration.ts

@@ -1,5 +1,3 @@
-import {logger} from '#/logger'
-
 export const BLUE_HUE = 211
 export const RED_HUE = 346
 export const GREEN_HUE = 152
@@ -21,29 +19,3 @@ export function generateScale(start: number, end: number) {
 export const defaultScale = generateScale(6, 100)
 // dim shifted 6% lighter
 export const dimScale = generateScale(12, 100)
-
-export function transparentifyColor(color: string, alpha: number) {
-  if (color.startsWith('hsl(')) {
-    return 'hsla(' + color.slice('hsl('.length, -1) + `, ${alpha})`
-  } else if (color.startsWith('rgb(')) {
-    return 'rgba(' + color.slice('rgb('.length, -1) + `, ${alpha})`
-  } else if (color.startsWith('#')) {
-    if (color.length === 7) {
-      const alphaHex = Math.round(alpha * 255).toString(16)
-      // Per MDN: If there is only one number, it is duplicated: e means ee
-      // https://developer.mozilla.org/en-US/docs/Web/CSS/hex-color
-      return color.slice(0, 7) + alphaHex.padStart(2, alphaHex)
-    } else if (color.length === 4) {
-      // convert to 6-digit hex before adding alpha
-      const [r, g, b] = color.slice(1).split('')
-      const alphaHex = Math.round(alpha * 255).toString(16)
-      return `#${r.repeat(2)}${g.repeat(2)}${b.repeat(2)}${alphaHex.padStart(
-        2,
-        alphaHex,
-      )}`
-    }
-  } else {
-    logger.warn(`Could not make '${color}' transparent`)
-  }
-  return color
-}

src/alf/util/systemUI.ts

@@ -1,7 +1,7 @@
 import * as SystemUI from 'expo-system-ui'
 
 import {isAndroid} from '#/platform/detection'
-import {type Theme} from '../types'
+import {Theme} from '../types'
 
 export function setSystemUITheme(themeType: 'theme' | 'lightbox', t: Theme) {
   if (isAndroid) {

src/components/Button.tsx

@@ -65,8 +65,8 @@ export type ButtonState = {
 export type ButtonContext = VariantProps & ButtonState
 
 type NonTextElements =
-  | React.ReactElement
-  | Iterable<React.ReactElement | null | undefined | boolean>
+  | React.ReactElement<any>
+  | Iterable<React.ReactElement<any> | null | undefined | boolean>
 
 export type ButtonProps = Pick<
   PressableProps,

src/components/ContextMenu/Backdrop.tsx

@@ -2,7 +2,7 @@ import {Pressable} from 'react-native'
 import Animated, {
   Extrapolation,
   interpolate,
-  type SharedValue,
+  SharedValue,
   useAnimatedStyle,
 } from 'react-native-reanimated'
 import {msg} from '@lingui/macro'

src/components/ContextMenu/index.tsx

@@ -119,7 +119,8 @@ export function Root({children}: {children: React.ReactNode}) {
   const hoverablesSV = useSharedValue<
     Record<string, {id: string; rect: Measurement}>
   >({})
-  const syncHoverablesThrottleRef = useRef<ReturnType<typeof setTimeout>>()
+  const syncHoverablesThrottleRef =
+    useRef<ReturnType<typeof setTimeout>>(undefined)
   const [hoveredMenuItem, setHoveredMenuItem] = useState<string | null>(null)
 
   const onHoverableTouchUp = useCallback((id: string) => {

src/components/ContextMenu/types.ts

@@ -5,7 +5,6 @@ import {
   type ViewStyle,
 } from 'react-native'
 import {type SharedValue} from 'react-native-reanimated'
-import type React from 'react'
 
 import type * as Dialog from '#/components/Dialog'
 import {

src/components/Dialog/shared.tsx

@@ -5,7 +5,6 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import type React from 'react'
 
 import {atoms as a, useTheme} from '#/alf'
 import {Text} from '#/components/Typography'

src/components/Dialog/types.ts

@@ -1,15 +1,14 @@
-import React from 'react'
-import type {
-  AccessibilityProps,
-  GestureResponderEvent,
-  ScrollViewProps,
+import {
+  type AccessibilityProps,
+  type GestureResponderEvent,
+  type ScrollViewProps,
 } from 'react-native'
-import {ViewStyle} from 'react-native'
-import {StyleProp} from 'react-native'
+import {type ViewStyle} from 'react-native'
+import {type StyleProp} from 'react-native'
 
-import {ViewStyleProp} from '#/alf'
-import {BottomSheetViewProps} from '../../../modules/bottom-sheet'
-import {BottomSheetSnapPoint} from '../../../modules/bottom-sheet/src/BottomSheet.types'
+import {type ViewStyleProp} from '#/alf'
+import {type BottomSheetViewProps} from '../../../modules/bottom-sheet'
+import {type BottomSheetSnapPoint} from '../../../modules/bottom-sheet/src/BottomSheet.types'
 
 type A11yProps = Required<AccessibilityProps>
 
@@ -34,7 +33,7 @@ export type DialogControlRefProps = {
  */
 export type DialogControlProps = DialogControlRefProps & {
   id: string
-  ref: React.RefObject<DialogControlRefProps>
+  ref: React.RefObject<DialogControlRefProps | null>
   isOpen?: boolean
 }
 

src/components/FeedInterstitials.tsx

@@ -1,30 +1,24 @@
 import React from 'react'
 import {View} from 'react-native'
 import {ScrollView} from 'react-native-gesture-handler'
-import {type AppBskyFeedDefs, AtUri} from '@atproto/api'
+import {AppBskyFeedDefs, AtUri} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
 
-import {type NavigationProp} from '#/lib/routes/types'
+import {NavigationProp} from '#/lib/routes/types'
 import {logEvent} from '#/lib/statsig/statsig'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useGetPopularFeedsQuery} from '#/state/queries/feed'
-import {type FeedDescriptor} from '#/state/queries/post-feed'
+import {FeedDescriptor} from '#/state/queries/post-feed'
 import {useProfilesQuery} from '#/state/queries/profile'
 import {useSuggestedFollowsByActorQuery} from '#/state/queries/suggested-follows'
 import {useSession} from '#/state/session'
 import * as userActionHistory from '#/state/userActionHistory'
-import {type SeenPost} from '#/state/userActionHistory'
+import {SeenPost} from '#/state/userActionHistory'
 import {BlockDrawerGesture} from '#/view/shell/BlockDrawerGesture'
-import {
-  atoms as a,
-  useBreakpoints,
-  useTheme,
-  type ViewStyleProp,
-  web,
-} from '#/alf'
+import {atoms as a, useBreakpoints, useTheme, ViewStyleProp, web} from '#/alf'
 import {Button} from '#/components/Button'
 import * as FeedCard from '#/components/FeedCard'
 import {ArrowRight_Stroke2_Corner0_Rounded as Arrow} from '#/components/icons/Arrow'
@@ -33,7 +27,7 @@ import {PersonPlus_Stroke2_Corner0_Rounded as Person} from '#/components/icons/P
 import {InlineLinkText} from '#/components/Link'
 import * as ProfileCard from '#/components/ProfileCard'
 import {Text} from '#/components/Typography'
-import type * as bsky from '#/types/bsky'
+import * as bsky from '#/types/bsky'
 import {ProgressGuideList} from './ProgressGuide/List'
 
 const MOBILE_CARD_WIDTH = 300

src/components/Layout/Header/index.tsx

@@ -1,24 +1,24 @@
 import {createContext, useCallback, useContext} from 'react'
-import {type GestureResponderEvent, Keyboard, View} from 'react-native'
+import {GestureResponderEvent, Keyboard, View} from 'react-native'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
 
 import {HITSLOP_30} from '#/lib/constants'
-import {type NavigationProp} from '#/lib/routes/types'
+import {NavigationProp} from '#/lib/routes/types'
 import {isIOS} from '#/platform/detection'
 import {useSetDrawerOpen} from '#/state/shell'
 import {
   atoms as a,
   platform,
-  type TextStyleProp,
+  TextStyleProp,
   useBreakpoints,
   useGutters,
   useLayoutBreakpoints,
   useTheme,
   web,
 } from '#/alf'
-import {Button, ButtonIcon, type ButtonProps} from '#/components/Button'
+import {Button, ButtonIcon, ButtonProps} from '#/components/Button'
 import {ArrowLeft_Stroke2_Corner0_Rounded as ArrowLeft} from '#/components/icons/Arrow'
 import {Menu_Stroke2_Corner0_Rounded as Menu} from '#/components/icons/Menu'
 import {

src/components/Link.tsx

@@ -4,6 +4,7 @@ import {sanitizeUrl} from '@braintree/sanitize-url'
 import {
   type LinkProps as RNLinkProps,
   StackActions,
+  useLinkBuilder,
 } from '@react-navigation/native'
 
 import {BSKY_DOWNLOAD_URL} from '#/lib/constants'
@@ -94,19 +95,20 @@ export function useLink({
   shouldProxy?: boolean
 }) {
   const navigation = useNavigationDeduped()
+  const {buildHref} = useLinkBuilder()
   const href = useMemo(() => {
     return typeof to === 'string'
       ? convertBskyAppUrlIfNeeded(sanitizeUrl(to))
       : to.screen
-      ? router.matchName(to.screen)?.build(to.params)
+      ? buildHref(to.screen, to.params)
       : to.href
       ? convertBskyAppUrlIfNeeded(sanitizeUrl(to.href))
       : undefined
-  }, [to])
+  }, [to, buildHref])
 
   if (!href) {
     throw new Error(
-      'Could not resolve screen. Link `to` prop must be a string or an object with `screen` and `params` properties',
+      'Link `to` prop must be a string or an object with `screen` and `params` properties',
     )
   }
 

src/components/Menu/context.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import {type ContextType, type ItemContextType} from '#/components/Menu/types'
+import type {ContextType, ItemContextType} from '#/components/Menu/types'
 
 export const Context = React.createContext<ContextType | null>(null)
 

src/components/Portal.tsx

@@ -10,7 +10,7 @@ import {
   useState,
 } from 'react'
 
-type Component = React.ReactElement
+type Component = React.ReactElement<any>
 
 type ContextType = {
   outlet: Component | null

src/components/Post/Embed/FeedEmbed.tsx

@@ -1,52 +0,0 @@
-import React from 'react'
-import {StyleSheet} from 'react-native'
-import {moderateFeedGenerator} from '@atproto/api'
-
-import {usePalette} from '#/lib/hooks/usePalette'
-import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {FeedSourceCard} from '#/view/com/feeds/FeedSourceCard'
-import {ContentHider} from '#/components/moderation/ContentHider'
-import {type EmbedType} from '#/types/bsky/post'
-import {type CommonProps} from './types'
-
-export function FeedEmbed({
-  embed,
-}: CommonProps & {
-  embed: EmbedType<'feed'>
-}) {
-  const pal = usePalette('default')
-  return (
-    <FeedSourceCard
-      feedUri={embed.view.uri}
-      style={[pal.view, pal.border, styles.customFeedOuter]}
-      showLikes
-    />
-  )
-}
-
-export function ModeratedFeedEmbed({
-  embed,
-}: CommonProps & {
-  embed: EmbedType<'feed'>
-}) {
-  const moderationOpts = useModerationOpts()
-  const moderation = React.useMemo(() => {
-    return moderationOpts
-      ? moderateFeedGenerator(embed.view, moderationOpts)
-      : undefined
-  }, [embed.view, moderationOpts])
-  return (
-    <ContentHider modui={moderation?.ui('contentList')}>
-      <FeedEmbed embed={embed} />
-    </ContentHider>
-  )
-}
-
-const styles = StyleSheet.create({
-  customFeedOuter: {
-    borderWidth: StyleSheet.hairlineWidth,
-    borderRadius: 8,
-    paddingHorizontal: 12,
-    paddingVertical: 12,
-  },
-})

src/components/Post/Embed/ImageEmbed.tsx

@@ -1,106 +0,0 @@
-import {InteractionManager, View} from 'react-native'
-import {
-  type AnimatedRef,
-  measure,
-  type MeasuredDimensions,
-  runOnJS,
-  runOnUI,
-} from 'react-native-reanimated'
-import {Image} from 'expo-image'
-
-import {useLightboxControls} from '#/state/lightbox'
-import {type Dimensions} from '#/view/com/lightbox/ImageViewing/@types'
-import {AutoSizedImage} from '#/view/com/util/images/AutoSizedImage'
-import {ImageLayoutGrid} from '#/view/com/util/images/ImageLayoutGrid'
-import {atoms as a} from '#/alf'
-import {PostEmbedViewContext} from '#/components/Post/Embed/types'
-import {type EmbedType} from '#/types/bsky/post'
-import {type CommonProps} from './types'
-
-export function ImageEmbed({
-  embed,
-  ...rest
-}: CommonProps & {
-  embed: EmbedType<'images'>
-}) {
-  const {openLightbox} = useLightboxControls()
-  const {images} = embed.view
-
-  if (images.length > 0) {
-    const items = images.map(img => ({
-      uri: img.fullsize,
-      thumbUri: img.thumb,
-      alt: img.alt,
-      dimensions: img.aspectRatio ?? null,
-    }))
-    const _openLightbox = (
-      index: number,
-      thumbRects: (MeasuredDimensions | null)[],
-      fetchedDims: (Dimensions | null)[],
-    ) => {
-      openLightbox({
-        images: items.map((item, i) => ({
-          ...item,
-          thumbRect: thumbRects[i] ?? null,
-          thumbDimensions: fetchedDims[i] ?? null,
-          type: 'image',
-        })),
-        index,
-      })
-    }
-    const onPress = (
-      index: number,
-      refs: AnimatedRef<any>[],
-      fetchedDims: (Dimensions | null)[],
-    ) => {
-      runOnUI(() => {
-        'worklet'
-        const rects: (MeasuredDimensions | null)[] = []
-        for (const r of refs) {
-          rects.push(measure(r))
-        }
-        runOnJS(_openLightbox)(index, rects, fetchedDims)
-      })()
-    }
-    const onPressIn = (_: number) => {
-      InteractionManager.runAfterInteractions(() => {
-        Image.prefetch(items.map(i => i.uri))
-      })
-    }
-
-    if (images.length === 1) {
-      const image = images[0]
-      return (
-        <View style={[a.mt_sm, rest.style]}>
-          <AutoSizedImage
-            crop={
-              rest.viewContext === PostEmbedViewContext.ThreadHighlighted
-                ? 'none'
-                : rest.viewContext ===
-                  PostEmbedViewContext.FeedEmbedRecordWithMedia
-                ? 'square'
-                : 'constrained'
-            }
-            image={image}
-            onPress={(containerRef, dims) => onPress(0, [containerRef], [dims])}
-            onPressIn={() => onPressIn(0)}
-            hideBadge={
-              rest.viewContext === PostEmbedViewContext.FeedEmbedRecordWithMedia
-            }
-          />
-        </View>
-      )
-    }
-
-    return (
-      <View style={[a.mt_sm, rest.style]}>
-        <ImageLayoutGrid
-          images={images}
-          onPress={onPress}
-          onPressIn={onPressIn}
-          viewContext={rest.viewContext}
-        />
-      </View>
-    )
-  }
-}

src/components/Post/Embed/LazyQuoteEmbed.tsx

@@ -1,37 +0,0 @@
-import {useMemo} from 'react'
-import {View} from 'react-native'
-
-import {createEmbedViewRecordFromPost} from '#/state/queries/postgate/util'
-import {useResolveLinkQuery} from '#/state/queries/resolve-link'
-import {atoms as a, useTheme} from '#/alf'
-import {QuoteEmbed} from '#/components/Post/Embed'
-
-export function LazyQuoteEmbed({uri}: {uri: string}) {
-  const t = useTheme()
-  const {data} = useResolveLinkQuery(uri)
-
-  const view = useMemo(() => {
-    if (!data || data.type !== 'record' || data.kind !== 'post') return
-    return createEmbedViewRecordFromPost(data.view)
-  }, [data])
-
-  return view ? (
-    <QuoteEmbed
-      embed={{
-        type: 'post',
-        view,
-      }}
-    />
-  ) : (
-    <View
-      style={[
-        a.w_full,
-        a.rounded_md,
-        t.atoms.bg_contrast_25,
-        {
-          height: 68,
-        },
-      ]}
-    />
-  )
-}

src/components/Post/Embed/ListEmbed.tsx

@@ -1,42 +0,0 @@
-import React from 'react'
-import {View} from 'react-native'
-import {moderateUserList} from '@atproto/api'
-
-import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {atoms as a, useTheme} from '#/alf'
-import * as ListCard from '#/components/ListCard'
-import {ContentHider} from '#/components/moderation/ContentHider'
-import {type EmbedType} from '#/types/bsky/post'
-import {type CommonProps} from './types'
-
-export function ListEmbed({
-  embed,
-}: CommonProps & {
-  embed: EmbedType<'list'>
-}) {
-  const t = useTheme()
-  return (
-    <View
-      style={[a.border, t.atoms.border_contrast_medium, a.p_md, a.rounded_sm]}>
-      <ListCard.Default view={embed.view} />
-    </View>
-  )
-}
-
-export function ModeratedListEmbed({
-  embed,
-}: CommonProps & {
-  embed: EmbedType<'list'>
-}) {
-  const moderationOpts = useModerationOpts()
-  const moderation = React.useMemo(() => {
-    return moderationOpts
-      ? moderateUserList(embed.view, moderationOpts)
-      : undefined
-  }, [embed.view, moderationOpts])
-  return (
-    <ContentHider modui={moderation?.ui('contentList')}>
-      <ListEmbed embed={embed} />
-    </ContentHider>
-  )
-}

src/components/Post/Embed/PostPlaceholder.tsx

@@ -1,33 +0,0 @@
-import {StyleSheet, View} from 'react-native'
-
-import {usePalette} from '#/lib/hooks/usePalette'
-import {InfoCircleIcon} from '#/lib/icons'
-import {Text} from '#/view/com/util/text/Text'
-import {atoms as a, useTheme} from '#/alf'
-
-export function PostPlaceholder({children}: {children: React.ReactNode}) {
-  const t = useTheme()
-  const pal = usePalette('default')
-  return (
-    <View
-      style={[styles.errorContainer, a.border, t.atoms.border_contrast_low]}>
-      <InfoCircleIcon size={18} style={pal.text} />
-      <Text type="lg" style={pal.text}>
-        {children}
-      </Text>
-    </View>
-  )
-}
-
-const styles = StyleSheet.create({
-  errorContainer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: 4,
-    borderRadius: 8,
-    marginTop: 8,
-    paddingVertical: 14,
-    paddingHorizontal: 14,
-    borderWidth: StyleSheet.hairlineWidth,
-  },
-})

src/components/Post/Embed/index.tsx

@@ -1,332 +0,0 @@
-import React from 'react'
-import {View} from 'react-native'
-import {
-  type $Typed,
-  type AppBskyFeedDefs,
-  AppBskyFeedPost,
-  AtUri,
-  moderatePost,
-  RichText as RichTextAPI,
-} from '@atproto/api'
-import {Trans} from '@lingui/macro'
-import {useQueryClient} from '@tanstack/react-query'
-
-import {usePalette} from '#/lib/hooks/usePalette'
-import {makeProfileLink} from '#/lib/routes/links'
-import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {unstableCacheProfileView} from '#/state/queries/profile'
-import {useSession} from '#/state/session'
-import {Link} from '#/view/com/util/Link'
-import {PostMeta} from '#/view/com/util/PostMeta'
-import {atoms as a, useTheme} from '#/alf'
-import {ContentHider} from '#/components/moderation/ContentHider'
-import {PostAlerts} from '#/components/moderation/PostAlerts'
-import {RichText} from '#/components/RichText'
-import {Embed as StarterPackCard} from '#/components/StarterPack/StarterPackCard'
-import {SubtleWebHover} from '#/components/SubtleWebHover'
-import * as bsky from '#/types/bsky'
-import {
-  type Embed as TEmbed,
-  type EmbedType,
-  parseEmbed,
-} from '#/types/bsky/post'
-import {ExternalEmbed} from './ExternalEmbed'
-import {ModeratedFeedEmbed} from './FeedEmbed'
-import {ImageEmbed} from './ImageEmbed'
-import {ModeratedListEmbed} from './ListEmbed'
-import {PostPlaceholder as PostPlaceholderText} from './PostPlaceholder'
-import {
-  type CommonProps,
-  type EmbedProps,
-  PostEmbedViewContext,
-  QuoteEmbedViewContext,
-} from './types'
-import {VideoEmbed} from './VideoEmbed'
-
-export {PostEmbedViewContext, QuoteEmbedViewContext} from './types'
-
-export function Embed({embed: rawEmbed, ...rest}: EmbedProps) {
-  const embed = parseEmbed(rawEmbed)
-
-  switch (embed.type) {
-    case 'images':
-    case 'link':
-    case 'video': {
-      return <MediaEmbed embed={embed} {...rest} />
-    }
-    case 'feed':
-    case 'list':
-    case 'starter_pack':
-    case 'labeler':
-    case 'post':
-    case 'post_not_found':
-    case 'post_blocked':
-    case 'post_detached': {
-      return <RecordEmbed embed={embed} {...rest} />
-    }
-    case 'post_with_media': {
-      return (
-        <View style={rest.style}>
-          <MediaEmbed embed={embed.media} {...rest} />
-          <RecordEmbed embed={embed.view} {...rest} />
-        </View>
-      )
-    }
-    default: {
-      return null
-    }
-  }
-}
-
-function MediaEmbed({
-  embed,
-  ...rest
-}: CommonProps & {
-  embed: TEmbed
-}) {
-  switch (embed.type) {
-    case 'images': {
-      return (
-        <ContentHider modui={rest.moderation?.ui('contentMedia')}>
-          <ImageEmbed embed={embed} {...rest} />
-        </ContentHider>
-      )
-    }
-    case 'link': {
-      return (
-        <ContentHider modui={rest.moderation?.ui('contentMedia')}>
-          <ExternalEmbed
-            link={embed.view.external}
-            onOpen={rest.onOpen}
-            style={[a.mt_sm, rest.style]}
-          />
-        </ContentHider>
-      )
-    }
-    case 'video': {
-      return (
-        <ContentHider modui={rest.moderation?.ui('contentMedia')}>
-          <VideoEmbed embed={embed.view} />
-        </ContentHider>
-      )
-    }
-    default: {
-      return null
-    }
-  }
-}
-
-function RecordEmbed({
-  embed,
-  ...rest
-}: CommonProps & {
-  embed: TEmbed
-}) {
-  switch (embed.type) {
-    case 'feed': {
-      return (
-        <View style={a.mt_sm}>
-          <ModeratedFeedEmbed embed={embed} {...rest} />
-        </View>
-      )
-    }
-    case 'list': {
-      return (
-        <View style={a.mt_sm}>
-          <ModeratedListEmbed embed={embed} />
-        </View>
-      )
-    }
-    case 'starter_pack': {
-      return (
-        <View style={a.mt_sm}>
-          <StarterPackCard starterPack={embed.view} />
-        </View>
-      )
-    }
-    case 'labeler': {
-      // not implemented
-      return null
-    }
-    case 'post': {
-      if (rest.isWithinQuote && !rest.allowNestedQuotes) {
-        return null
-      }
-
-      return (
-        <QuoteEmbed
-          {...rest}
-          embed={embed}
-          viewContext={
-            rest.viewContext === PostEmbedViewContext.Feed
-              ? QuoteEmbedViewContext.FeedEmbedRecordWithMedia
-              : undefined
-          }
-          isWithinQuote={rest.isWithinQuote}
-          allowNestedQuotes={rest.allowNestedQuotes}
-        />
-      )
-    }
-    case 'post_not_found': {
-      return (
-        <PostPlaceholderText>
-          <Trans>Deleted</Trans>
-        </PostPlaceholderText>
-      )
-    }
-    case 'post_blocked': {
-      return (
-        <PostPlaceholderText>
-          <Trans>Blocked</Trans>
-        </PostPlaceholderText>
-      )
-    }
-    case 'post_detached': {
-      return <PostDetachedEmbed embed={embed} />
-    }
-    default: {
-      return null
-    }
-  }
-}
-
-export function PostDetachedEmbed({
-  embed,
-}: {
-  embed: EmbedType<'post_detached'>
-}) {
-  const {currentAccount} = useSession()
-  const isViewerOwner = currentAccount?.did
-    ? embed.view.uri.includes(currentAccount.did)
-    : false
-
-  return (
-    <PostPlaceholderText>
-      {isViewerOwner ? (
-        <Trans>Removed by you</Trans>
-      ) : (
-        <Trans>Removed by author</Trans>
-      )}
-    </PostPlaceholderText>
-  )
-}
-
-/*
- * Nests parent `Embed` component and therefore must live in this file to avoid
- * circular imports.
- */
-export function QuoteEmbed({
-  embed,
-  onOpen,
-  style,
-  isWithinQuote: parentIsWithinQuote,
-  allowNestedQuotes: parentAllowNestedQuotes,
-}: Omit<CommonProps, 'viewContext'> & {
-  embed: EmbedType<'post'>
-  viewContext?: QuoteEmbedViewContext
-}) {
-  const moderationOpts = useModerationOpts()
-  const quote = React.useMemo<$Typed<AppBskyFeedDefs.PostView>>(
-    () => ({
-      ...embed.view,
-      $type: 'app.bsky.feed.defs#postView',
-      record: embed.view.value,
-      embed: embed.view.embeds?.[0],
-    }),
-    [embed],
-  )
-  const moderation = React.useMemo(() => {
-    return moderationOpts ? moderatePost(quote, moderationOpts) : undefined
-  }, [quote, moderationOpts])
-
-  const t = useTheme()
-  const queryClient = useQueryClient()
-  const pal = usePalette('default')
-  const itemUrip = new AtUri(quote.uri)
-  const itemHref = makeProfileLink(quote.author, 'post', itemUrip.rkey)
-  const itemTitle = `Post by ${quote.author.handle}`
-
-  const richText = React.useMemo(() => {
-    if (
-      !bsky.dangerousIsType<AppBskyFeedPost.Record>(
-        quote.record,
-        AppBskyFeedPost.isRecord,
-      )
-    )
-      return undefined
-    const {text, facets} = quote.record
-    return text.trim()
-      ? new RichTextAPI({text: text, facets: facets})
-      : undefined
-  }, [quote.record])
-
-  const onBeforePress = React.useCallback(() => {
-    unstableCacheProfileView(queryClient, quote.author)
-    onOpen?.()
-  }, [queryClient, quote.author, onOpen])
-
-  const [hover, setHover] = React.useState(false)
-  return (
-    <View
-      onPointerEnter={() => {
-        setHover(true)
-      }}
-      onPointerLeave={() => {
-        setHover(false)
-      }}>
-      <ContentHider
-        modui={moderation?.ui('contentList')}
-        style={[
-          a.rounded_md,
-          a.p_md,
-          a.mt_sm,
-          a.border,
-          t.atoms.border_contrast_low,
-          style,
-        ]}
-        childContainerStyle={[a.pt_sm]}>
-        <SubtleWebHover hover={hover} />
-        <Link
-          hoverStyle={{borderColor: pal.colors.borderLinkHover}}
-          href={itemHref}
-          title={itemTitle}
-          onBeforePress={onBeforePress}>
-          <View pointerEvents="none">
-            <PostMeta
-              author={quote.author}
-              moderation={moderation}
-              showAvatar
-              postHref={itemHref}
-              timestamp={quote.indexedAt}
-            />
-          </View>
-          {moderation ? (
-            <PostAlerts
-              modui={moderation.ui('contentView')}
-              style={[a.py_xs]}
-            />
-          ) : null}
-          {richText ? (
-            <RichText
-              value={richText}
-              style={a.text_md}
-              numberOfLines={20}
-              disableLinks
-            />
-          ) : null}
-          {quote.embed && (
-            <Embed
-              embed={quote.embed}
-              moderation={moderation}
-              isWithinQuote={parentIsWithinQuote ?? true}
-              // already within quote? override nested
-              allowNestedQuotes={
-                parentIsWithinQuote ? false : parentAllowNestedQuotes
-              }
-            />
-          )}
-        </Link>
-      </ContentHider>
-    </View>
-  )
-}

src/components/Post/Embed/types.ts

@@ -1,25 +0,0 @@
-import {type StyleProp, type ViewStyle} from 'react-native'
-import {type AppBskyFeedDefs, type ModerationDecision} from '@atproto/api'
-
-export enum PostEmbedViewContext {
-  ThreadHighlighted = 'ThreadHighlighted',
-  Feed = 'Feed',
-  FeedEmbedRecordWithMedia = 'FeedEmbedRecordWithMedia',
-}
-
-export enum QuoteEmbedViewContext {
-  FeedEmbedRecordWithMedia = PostEmbedViewContext.FeedEmbedRecordWithMedia,
-}
-
-export type CommonProps = {
-  moderation?: ModerationDecision
-  onOpen?: () => void
-  style?: StyleProp<ViewStyle>
-  viewContext?: PostEmbedViewContext
-  isWithinQuote?: boolean
-  allowNestedQuotes?: boolean
-}
-
-export type EmbedProps = CommonProps & {
-  embed?: AppBskyFeedDefs.PostView['embed']
-}

src/components/Post/ShowMoreTextButton.tsx

@@ -1,56 +0,0 @@
-import {useCallback, useMemo} from 'react'
-import {LayoutAnimation, type TextStyle} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {HITSLOP_10} from '#/lib/constants'
-import {atoms as a, flatten, type TextStyleProp, useTheme} from '#/alf'
-import {Button} from '#/components/Button'
-import {Text} from '#/components/Typography'
-
-export function ShowMoreTextButton({
-  onPress: onPressProp,
-  style,
-}: TextStyleProp & {onPress: () => void}) {
-  const t = useTheme()
-  const {_} = useLingui()
-
-  const onPress = useCallback(() => {
-    LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
-    onPressProp()
-  }, [onPressProp])
-
-  const textStyle = useMemo(() => {
-    return flatten([a.leading_snug, a.text_sm, style]) as TextStyle & {
-      fontSize: number
-      lineHeight: number
-    }
-  }, [style])
-
-  return (
-    <Button
-      label={_(msg`Expand post text`)}
-      onPress={onPress}
-      style={[
-        a.self_start,
-        {
-          paddingBottom: textStyle.fontSize / 3,
-        },
-      ]}
-      hitSlop={HITSLOP_10}>
-      {({pressed, hovered}) => (
-        <Text
-          style={[
-            textStyle,
-            {
-              color: t.palette.primary_500,
-              opacity: pressed ? 0.6 : 1,
-              textDecorationLine: hovered ? 'underline' : undefined,
-            },
-          ]}>
-          <Trans>Show More</Trans>
-        </Text>
-      )}
-    </Button>
-  )
-}

src/components/PostControls/PostMenu/index.tsx

@@ -7,7 +7,6 @@ import {
 } from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import type React from 'react'
 
 import {type Shadow} from '#/state/cache/post-shadow'
 import {EventStopper} from '#/view/com/util/EventStopper'

src/components/ProfileHoverCard/types.ts

@@ -1,7 +1,6 @@
-import type React from 'react'
-
 export type ProfileHoverCardProps = {
-  children: React.ReactElement
+  children: React.ReactElement<any>
   did: string
+  inline?: boolean
   disable?: boolean
 }

src/components/ProgressGuide/FollowDialog.tsx

@@ -301,8 +301,8 @@ let Header = ({
   interestsDisplayNames,
 }: {
   guide: Follow10ProgressGuide
-  inputRef: React.RefObject<TextInput>
-  listRef: React.RefObject<ListMethods>
+  inputRef: React.RefObject<TextInput | null>
+  listRef: React.RefObject<ListMethods | null>
   onSelectTab: (v: string) => void
   searchText: string
   setHeaderHeight: (v: number) => void
@@ -653,7 +653,7 @@ function SearchInput({
 }: {
   onChangeText: (text: string) => void
   onEscape: () => void
-  inputRef: React.RefObject<TextInput>
+  inputRef: React.RefObject<TextInput | null>
   defaultValue: string
 }) {
   const t = useTheme()

src/components/ProgressGuide/Toast.tsx

@@ -14,7 +14,7 @@ import {useLingui} from '@lingui/react'
 import {isWeb} from '#/platform/detection'
 import {atoms as a, useTheme} from '#/alf'
 import {Portal} from '#/components/Portal'
-import {AnimatedCheck, AnimatedCheckRef} from '../anim/AnimatedCheck'
+import {AnimatedCheck, type AnimatedCheckRef} from '../anim/AnimatedCheck'
 import {Text} from '../Typography'
 
 export interface ProgressGuideToastRef {
@@ -39,7 +39,7 @@ export const ProgressGuideToast = React.forwardRef<
   const translateY = useSharedValue(0)
   const opacity = useSharedValue(0)
   const animatedCheckRef = React.useRef<AnimatedCheckRef | null>(null)
-  const timeoutRef = React.useRef<NodeJS.Timeout | undefined>()
+  const timeoutRef = React.useRef<NodeJS.Timeout | undefined>(undefined)
   const winDim = useWindowDimensions()
 
   /**

src/components/RichText.tsx

@@ -1,14 +1,14 @@
 import React from 'react'
-import {type TextStyle} from 'react-native'
+import {TextStyle} from 'react-native'
 import {AppBskyRichtextFacet, RichText as RichTextAPI} from '@atproto/api'
 
 import {toShortUrl} from '#/lib/strings/url-helpers'
-import {atoms as a, flatten, type TextStyleProp} from '#/alf'
+import {atoms as a, flatten, TextStyleProp} from '#/alf'
 import {isOnlyEmoji} from '#/alf/typography'
-import {InlineLinkText, type LinkProps} from '#/components/Link'
+import {InlineLinkText, LinkProps} from '#/components/Link'
 import {ProfileHoverCard} from '#/components/ProfileHoverCard'
 import {RichTextTag} from '#/components/RichTextTag'
-import {Text, type TextProps} from '#/components/Typography'
+import {Text, TextProps} from '#/components/Typography'
 
 const WORD_WRAP = {wordWrap: 1}
 
@@ -105,7 +105,7 @@ export function RichText({
       !disableLinks
     ) {
       els.push(
-        <ProfileHoverCard key={key} did={mention.did}>
+        <ProfileHoverCard key={key} inline did={mention.did}>
           <InlineLinkText
             selectable={selectable}
             to={`/profile/${mention.did}`}

src/components/Select/types.ts

@@ -160,7 +160,7 @@ export type ContentProps<T> = {
     item: T,
     index: number,
     selectedValue?: string | null,
-  ) => React.ReactElement
+  ) => React.ReactElement<any>
   /*
    * Extracts the value from an item. Defaults to `item => item.value`
    */

src/components/Skeleton.tsx

@@ -1,107 +0,0 @@
-import {type ReactNode} from 'react'
-import {View} from 'react-native'
-
-import {
-  atoms as a,
-  flatten,
-  type TextStyleProp,
-  useAlf,
-  useTheme,
-  type ViewStyleProp,
-} from '#/alf'
-import {normalizeTextStyles} from '#/alf/typography'
-
-type SkeletonProps = {
-  blend?: boolean
-}
-
-export function Text({blend, style}: TextStyleProp & SkeletonProps) {
-  const {fonts, flags, theme: t} = useAlf()
-  const {width, ...flattened} = flatten(style)
-  const {lineHeight = 14, ...rest} = normalizeTextStyles(
-    [a.text_sm, a.leading_snug, flattened],
-    {
-      fontScale: fonts.scaleMultiplier,
-      fontFamily: fonts.family,
-      flags,
-    },
-  )
-  return (
-    <View
-      style={[a.flex_1, {maxWidth: width, paddingVertical: lineHeight * 0.15}]}>
-      <View
-        style={[
-          a.rounded_md,
-          t.atoms.bg_contrast_25,
-          {
-            height: lineHeight * 0.7,
-            opacity: blend ? 0.6 : 1,
-          },
-          rest,
-        ]}
-      />
-    </View>
-  )
-}
-
-export function Circle({
-  children,
-  size,
-  blend,
-  style,
-}: ViewStyleProp & {children?: ReactNode; size: number} & SkeletonProps) {
-  const t = useTheme()
-  return (
-    <View
-      style={[
-        a.justify_center,
-        a.align_center,
-        a.rounded_full,
-        t.atoms.bg_contrast_25,
-        {
-          width: size,
-          height: size,
-          opacity: blend ? 0.6 : 1,
-        },
-        style,
-      ]}>
-      {children}
-    </View>
-  )
-}
-
-export function Pill({
-  size,
-  blend,
-  style,
-}: ViewStyleProp & {size: number} & SkeletonProps) {
-  const t = useTheme()
-  return (
-    <View
-      style={[
-        a.rounded_full,
-        t.atoms.bg_contrast_25,
-        {
-          width: size * 1.618,
-          height: size,
-          opacity: blend ? 0.6 : 1,
-        },
-        style,
-      ]}
-    />
-  )
-}
-
-export function Col({
-  children,
-  style,
-}: ViewStyleProp & {children?: React.ReactNode}) {
-  return <View style={[a.flex_1, style]}>{children}</View>
-}
-
-export function Row({
-  children,
-  style,
-}: ViewStyleProp & {children?: React.ReactNode}) {
-  return <View style={[a.flex_row, style]}>{children}</View>
-}

src/components/dialogs/GifSelect.tsx

@@ -5,7 +5,7 @@ import React, {
   useRef,
   useState,
 } from 'react'
-import {TextInput, View} from 'react-native'
+import {type TextInput, View} from 'react-native'
 import {useWindowDimensions} from 'react-native'
 import {Image} from 'expo-image'
 import {msg, Trans} from '@lingui/macro'
@@ -15,13 +15,13 @@ import {logEvent} from '#/lib/statsig/statsig'
 import {cleanError} from '#/lib/strings/errors'
 import {isWeb} from '#/platform/detection'
 import {
-  Gif,
+  type Gif,
   useFeaturedGifsQuery,
   useGifSearchQuery,
 } from '#/state/queries/tenor'
 import {ErrorScreen} from '#/view/com/util/error/ErrorScreen'
 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
-import {ListMethods} from '#/view/com/util/List'
+import {type ListMethods} from '#/view/com/util/List'
 import {atoms as a, ios, native, useBreakpoints, useTheme, web} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
@@ -36,7 +36,7 @@ export function GifSelectDialog({
   onClose,
   onSelectGif: onSelectGifProp,
 }: {
-  controlRef: React.RefObject<{open: () => void}>
+  controlRef: React.RefObject<{open: () => void} | null>
   onClose?: () => void
   onSelectGif: (gif: Gif) => void
 }) {

src/components/dialogs/SearchablePeopleList.tsx

@@ -397,7 +397,6 @@ function DefaultProfileCard({
             <ProfileCard.Avatar
               profile={profile}
               moderationOpts={moderationOpts}
-              disabledPreview
             />
             <View style={[a.flex_1]}>
               <ProfileCard.Name
@@ -484,7 +483,7 @@ function SearchInput({
   value: string
   onChangeText: (text: string) => void
   onEscape: () => void
-  inputRef: React.RefObject<TextInput>
+  inputRef: React.RefObject<TextInput | null>
 }) {
   const t = useTheme()
   const {_} = useLingui()

src/components/dms/ActionsWrapper.tsx

@@ -1,5 +1,5 @@
 import {View} from 'react-native'
-import {type ChatBskyConvoDefs} from '@atproto/api'
+import {ChatBskyConvoDefs} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 

src/components/dms/ActionsWrapper.web.tsx

@@ -3,7 +3,6 @@ import {Pressable, View} from 'react-native'
 import {type ChatBskyConvoDefs} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import type React from 'react'
 
 import {useConvoActive} from '#/state/messages/convo'
 import {useSession} from '#/state/session'

src/components/dms/MessageItemEmbed.tsx

@@ -1,16 +1,15 @@
 import React from 'react'
 import {useWindowDimensions, View} from 'react-native'
-import {type $Typed, type AppBskyEmbedRecord} from '@atproto/api'
+import {AppBskyEmbedRecord} from '@atproto/api'
 
+import {PostEmbeds, PostEmbedViewContext} from '#/view/com/util/post-embeds'
 import {atoms as a, native, tokens, useTheme, web} from '#/alf'
-import {PostEmbedViewContext} from '#/components/Post/Embed'
-import {Embed} from '#/components/Post/Embed'
 import {MessageContextProvider} from './MessageContext'
 
 let MessageItemEmbed = ({
   embed,
 }: {
-  embed: $Typed<AppBskyEmbedRecord.View>
+  embed: AppBskyEmbedRecord.View
 }): React.ReactNode => {
   const t = useTheme()
   const screen = useWindowDimensions()
@@ -33,7 +32,7 @@ let MessageItemEmbed = ({
           }),
         ]}>
         <View style={{marginTop: tokens.space.sm * -1}}>
-          <Embed
+          <PostEmbeds
             embed={embed}
             allowNestedQuotes
             viewContext={PostEmbedViewContext.Feed}

src/components/forms/InputGroup.tsx

@@ -21,11 +21,14 @@ export function InputGroup(props: React.PropsWithChildren<{}>) {
               />
             ) : null}
             {React.cloneElement(child, {
-              // @ts-ignore
+              // @ts-expect-error
               style: [
+                // @ts-expect-error
                 ...(Array.isArray(child.props?.style)
-                  ? child.props.style
-                  : [child.props.style || {}]),
+                  ? // @ts-expect-error
+                    child.props.style
+                  : // @ts-expect-error
+                    [child.props.style || {}]),
                 {
                   borderTopLeftRadius: i > 0 ? 0 : undefined,
                   borderTopRightRadius: i > 0 ? 0 : undefined,

src/components/forms/TextField.tsx

@@ -26,7 +26,7 @@ import {type Props as SVGIconProps} from '#/components/icons/common'
 import {Text} from '#/components/Typography'
 
 const Context = React.createContext<{
-  inputRef: React.RefObject<TextInput> | null
+  inputRef: React.RefObject<TextInput | null> | null
   isInvalid: boolean
   hovered: boolean
   onHoverIn: () => void
@@ -140,7 +140,7 @@ export type InputProps = Omit<TextInputProps, 'value' | 'onChangeText'> & {
   value?: string
   onChangeText?: (value: string) => void
   isInvalid?: boolean
-  inputRef?: React.RefObject<TextInput> | React.ForwardedRef<TextInput>
+  inputRef?: React.RefObject<TextInput | null> | React.ForwardedRef<TextInput>
 }
 
 export function createInput(Component: typeof TextInput) {
@@ -196,7 +196,7 @@ export function createInput(Component: typeof TextInput) {
         minWidth: 0,
       },
       ios({paddingTop: 12, paddingBottom: 13}),
-      android(a.py_md),
+      android(a.py_sm),
       // fix for autofill styles covering border
       web({
         paddingTop: 10,

src/components/forms/ToggleButton.tsx

@@ -1,5 +1,10 @@
 import React from 'react'
-import {AccessibilityProps, TextStyle, View, ViewStyle} from 'react-native'
+import {
+  type AccessibilityProps,
+  type TextStyle,
+  View,
+  type ViewStyle,
+} from 'react-native'
 
 import {atoms as a, native, useTheme} from '#/alf'
 import * as Toggle from '#/components/forms/Toggle'
@@ -7,7 +12,7 @@ import {Text} from '#/components/Typography'
 
 type ItemProps = Omit<Toggle.ItemProps, 'style' | 'role' | 'children'> &
   AccessibilityProps & {
-    children: React.ReactElement
+    children: React.ReactElement<any>
     testID?: string
   }
 

src/components/hooks/dates.ts

@@ -8,7 +8,7 @@
  */
 
 import React from 'react'
-import {formatDistance, type Locale} from 'date-fns'
+import {formatDistance, Locale} from 'date-fns'
 import {
   ca,
   cy,
@@ -47,7 +47,7 @@ import {
   zhTW,
 } from 'date-fns/locale'
 
-import {type AppLanguage} from '#/locale/languages'
+import {AppLanguage} from '#/locale/languages'
 import {useLanguagePrefs} from '#/state/preferences'
 
 /**

src/components/hooks/useFullscreen.ts

@@ -14,7 +14,7 @@ function fullscreenSubscribe(onChange: () => void) {
   return () => document.removeEventListener('fullscreenchange', onChange)
 }
 
-export function useFullscreen(ref?: React.RefObject<HTMLElement>) {
+export function useFullscreen(ref?: React.RefObject<HTMLElement | null>) {
   if (!isWeb) throw new Error("'useFullscreen' is a web-only hook")
   const isFullscreen = useSyncExternalStore(fullscreenSubscribe, () =>
     Boolean(document.fullscreenElement),

src/components/icons/ArrowTopCircle.tsx

@@ -1,5 +0,0 @@
-import {createSinglePathSVG} from './TEMPLATE'
-
-export const ArrowTopCircle_Stroke2_Corner0_Rounded = createSinglePathSVG({
-  path: 'M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16Zm-.63 3.225a1 1 0 0 1 1.337.068l3 3 .068.076a1 1 0 0 1-1.406 1.406l-.076-.068L13 10.414V16a1 1 0 1 1-2 0v-5.586l-1.293 1.293a1 1 0 1 1-1.414-1.414l3-3 .076-.068Z',
-})

src/components/icons/CirclePlus.tsx

@@ -1,5 +0,0 @@
-import {createSinglePathSVG} from './TEMPLATE'
-
-export const CirclePlus_Stroke2_Corner0_Rounded = createSinglePathSVG({
-  path: 'M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 2a8 8 0 1 0 0 16 8 8 0 0 0 0-16Zm0 3a1 1 0 0 1 1 1v3h3l.102.005a1 1 0 0 1 0 1.99L16 13h-3v3a1 1 0 1 1-2 0v-3H8a1 1 0 0 1 0-2h3V8a1 1 0 0 1 1-1Z',
-})

src/components/icons/Tree.tsx

@@ -1,5 +0,0 @@
-import {createSinglePathSVG} from './TEMPLATE'
-
-export const Tree_Stroke2_Corner0_Rounded = createSinglePathSVG({
-  path: 'M6 2a2.998 2.998 0 0 1 1 5.825V8a2 2 0 0 0 2 2h1.174c.412-1.165 1.52-2 2.826-2h5a3 3 0 1 1 0 6h-5a2.998 2.998 0 0 1-2.826-2H9a3.98 3.98 0 0 1-2-.537V16a2 2 0 0 0 2 2h1.174c.412-1.165 1.52-2 2.826-2h5a3 3 0 1 1 0 6h-5a2.998 2.998 0 0 1-2.826-2H9a4 4 0 0 1-4-4V7.825A2.998 2.998 0 0 1 6 2Zm7 16a1 1 0 1 0 0 2h5a1 1 0 1 0 0-2h-5Zm0-8a1 1 0 1 0 0 2h5a1 1 0 1 0 0-2h-5ZM6 4a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z',
-})

src/components/moderation/PostHider.tsx

@@ -1,16 +1,6 @@
-import React, {type ComponentProps} from 'react'
-import {
-  Pressable,
-  type StyleProp,
-  StyleSheet,
-  View,
-  type ViewStyle,
-} from 'react-native'
-import {
-  type AppBskyActorDefs,
-  type ModerationCause,
-  type ModerationUI,
-} from '@atproto/api'
+import React, {ComponentProps} from 'react'
+import {Pressable, StyleProp, StyleSheet, View, ViewStyle} from 'react-native'
+import {AppBskyActorDefs, ModerationCause, ModerationUI} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'

src/lib/async/retry.ts

@@ -1,22 +1,17 @@
-import {timeout} from '#/lib/async/timeout'
 import {isNetworkError} from '#/lib/strings/errors'
 
 export async function retry<P>(
   retries: number,
-  shouldRetry: (err: any) => boolean,
-  action: () => Promise<P>,
-  delay?: number,
+  cond: (err: any) => boolean,
+  fn: () => Promise<P>,
 ): Promise<P> {
   let lastErr
   while (retries > 0) {
     try {
-      return await action()
+      return await fn()
     } catch (e: any) {
       lastErr = e
-      if (shouldRetry(e)) {
-        if (delay) {
-          await timeout(delay)
-        }
+      if (cond(e)) {
         retries--
         continue
       }

src/lib/hooks/useAnimatedValue.ts

@@ -1,8 +1,8 @@
-import * as React from 'react'
+import {useRef} from 'react'
 import {Animated} from 'react-native'
 
 export function useAnimatedValue(initialValue: number) {
-  const lazyRef = React.useRef<Animated.Value>()
+  const lazyRef = useRef<Animated.Value>(undefined)
 
   if (lazyRef.current === undefined) {
     lazyRef.current = new Animated.Value(initialValue)

src/lib/hooks/useCallOnce.ts

@@ -1,20 +0,0 @@
-import {useCallback} from 'react'
-
-export enum OnceKey {
-  PreferencesThread = 'preferences:thread',
-}
-
-const called: Record<OnceKey, boolean> = {
-  [OnceKey.PreferencesThread]: false,
-}
-
-export function useCallOnce(key: OnceKey) {
-  return useCallback(
-    (cb: () => void) => {
-      if (called[key] === true) return
-      called[key] = true
-      cb()
-    },
-    [key],
-  )
-}

src/lib/hooks/useHandleRef.ts

@@ -0,0 +1,39 @@
+import {useState} from 'react'
+import {AnimatedRef, measure, MeasuredDimensions} from 'react-native-reanimated'
+
+export type HandleRef = {
+  (node: any): void
+  current: null | number
+}
+
+// This is a lighterweight alternative to `useAnimatedRef()` for imperative UI thread actions.
+// Render it like <View ref={ref} />, then pass `ref.current` to `measureHandle()` and such.
+export function useHandleRef(): HandleRef {
+  return useState(() => {
+    const ref = (node: any) => {
+      if (node) {
+        ref.current =
+          node._nativeTag ??
+          node.__nativeTag ??
+          node.canonical?.nativeTag ??
+          null
+      } else {
+        ref.current = null
+      }
+    }
+    ref.current = null
+    return ref
+  })[0] as HandleRef
+}
+
+// When using this version, you need to read ref.current on the JS thread, and pass it to UI.
+export function measureHandle(
+  current: number | null,
+): MeasuredDimensions | null {
+  'worklet'
+  if (current !== null) {
+    return measure((() => current) as AnimatedRef<any>)
+  } else {
+    return null
+  }
+}

src/lib/hooks/useHideBottomBarBorder.tsx

@@ -1,50 +0,0 @@
-import {createContext, useCallback, useContext, useState} from 'react'
-import {useFocusEffect} from '@react-navigation/native'
-
-type HideBottomBarBorderSetter = () => () => void
-
-const HideBottomBarBorderContext = createContext<boolean>(false)
-const HideBottomBarBorderSetterContext =
-  createContext<HideBottomBarBorderSetter | null>(null)
-
-export function useHideBottomBarBorderSetter() {
-  const hideBottomBarBorder = useContext(HideBottomBarBorderSetterContext)
-  if (!hideBottomBarBorder) {
-    throw new Error(
-      'useHideBottomBarBorderSetter must be used within a HideBottomBarBorderProvider',
-    )
-  }
-  return hideBottomBarBorder
-}
-
-export function useHideBottomBarBorderForScreen() {
-  const hideBorder = useHideBottomBarBorderSetter()
-
-  useFocusEffect(
-    useCallback(() => {
-      const cleanup = hideBorder()
-      return () => cleanup()
-    }, [hideBorder]),
-  )
-}
-
-export function useHideBottomBarBorder() {
-  return useContext(HideBottomBarBorderContext)
-}
-
-export function Provider({children}: {children: React.ReactNode}) {
-  const [refCount, setRefCount] = useState(0)
-
-  const setter = useCallback(() => {
-    setRefCount(prev => prev + 1)
-    return () => setRefCount(prev => prev - 1)
-  }, [])
-
-  return (
-    <HideBottomBarBorderSetterContext.Provider value={setter}>
-      <HideBottomBarBorderContext.Provider value={refCount > 0}>
-        {children}
-      </HideBottomBarBorderContext.Provider>
-    </HideBottomBarBorderSetterContext.Provider>
-  )
-}

src/lib/hooks/useOTAUpdates.ts

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Alert, AppState, AppStateStatus} from 'react-native'
+import {Alert, AppState, type AppStateStatus} from 'react-native'
 import {nativeBuildVersion} from 'expo-application'
 import {
   checkForUpdateAsync,
@@ -35,7 +35,7 @@ export function useOTAUpdates() {
   const appState = React.useRef<AppStateStatus>('active')
   const lastMinimize = React.useRef(0)
   const ranInitialCheck = React.useRef(false)
-  const timeout = React.useRef<NodeJS.Timeout>()
+  const timeout = React.useRef<NodeJS.Timeout>(undefined)
   const {isUpdatePending} = useUpdates()
 
   const setCheckTimeout = React.useCallback(() => {

src/lib/hooks/useTimer.ts

@@ -1,32 +0,0 @@
-import * as React from 'react'
-
-/**
- * Helper hook to run persistent timers on views
- */
-export function useTimer(time: number, handler: () => void) {
-  const timer = React.useRef<undefined | NodeJS.Timeout>(undefined)
-
-  // function to restart the timer
-  const reset = React.useCallback(() => {
-    if (timer.current) {
-      clearTimeout(timer.current)
-    }
-    timer.current = setTimeout(handler, time)
-  }, [time, timer, handler])
-
-  // function to cancel the timer
-  const cancel = React.useCallback(() => {
-    if (timer.current) {
-      clearTimeout(timer.current)
-      timer.current = undefined
-    }
-  }, [timer])
-
-  // start the timer immediately
-  React.useEffect(() => {
-    reset()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  return [reset, cancel]
-}

src/lib/media/manip.ts

@@ -1,9 +1,8 @@
-import {Image as RNImage} from 'react-native'
+import {Image as RNImage, Share as RNShare} from 'react-native'
 import uuid from 'react-native-uuid'
 import {
   cacheDirectory,
   copyAsync,
-  createDownloadResumable,
   deleteAsync,
   EncodingType,
   getInfoAsync,
@@ -15,6 +14,7 @@ import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
 import * as MediaLibrary from 'expo-media-library'
 import * as Sharing from 'expo-sharing'
 import {Buffer} from 'buffer'
+import RNFetchBlob from 'rn-fetch-blob'
 
 import {POST_IMG_MAX} from '#/lib/constants'
 import {logger} from '#/logger'
@@ -68,13 +68,28 @@ export async function downloadAndResize(opts: DownloadAndResizeOpts) {
     return
   }
 
-  const path = createPath(appendExt)
-
+  let downloadRes
   try {
-    await downloadImage(opts.uri, path, opts.timeout)
-    return await doResize(path, opts)
+    const downloadResPromise = RNFetchBlob.config({
+      fileCache: true,
+      appendExt,
+    }).fetch('GET', opts.uri)
+    const to1 = setTimeout(() => downloadResPromise.cancel(), opts.timeout)
+    downloadRes = await downloadResPromise
+    clearTimeout(to1)
+
+    const status = downloadRes.info().status
+    if (status !== 200) {
+      return
+    }
+
+    const localUri = normalizePath(downloadRes.path(), true)
+    return await doResize(localUri, opts)
   } finally {
-    safeDeleteAsync(path)
+    // TODO Whenever we remove `rn-fetch-blob`, we will need to replace this `flush()` with a `deleteAsync()` -hailey
+    if (downloadRes) {
+      downloadRes.flush()
+    }
   }
 }
 
@@ -83,16 +98,32 @@ export async function shareImageModal({uri}: {uri: string}) {
     // TODO might need to give an error to the user in this case -prf
     return
   }
+  const downloadResponse = await RNFetchBlob.config({
+    fileCache: true,
+  }).fetch('GET', uri)
 
+  // NOTE
+  // assuming PNG
   // we're currently relying on the fact our CDN only serves pngs
   // -prf
-  const imageUri = await downloadImage(uri, createPath('png'), 5e3)
-  const imagePath = await moveToPermanentPath(imageUri, '.png')
-  safeDeleteAsync(imageUri)
-  await Sharing.shareAsync(imagePath, {
-    mimeType: 'image/png',
-    UTI: 'image/png',
-  })
+
+  let imagePath = downloadResponse.path()
+  imagePath = normalizePath(await moveToPermanentPath(imagePath, '.png'), true)
+
+  // NOTE
+  // for some reason expo-sharing refuses to work on iOS
+  // ...and visa versa
+  // -prf
+  if (isIOS) {
+    await RNShare.share({url: imagePath})
+  } else {
+    await Sharing.shareAsync(imagePath, {
+      mimeType: 'image/png',
+      UTI: 'image/png',
+    })
+  }
+
+  safeDeleteAsync(imagePath)
 }
 
 const ALBUM_NAME = 'Bluesky'
@@ -103,8 +134,11 @@ export async function saveImageToMediaLibrary({uri}: {uri: string}) {
   // assuming PNG
   // we're currently relying on the fact our CDN only serves pngs
   // -prf
-  const imageUri = await downloadImage(uri, createPath('png'), 5e3)
-  const imagePath = await moveToPermanentPath(imageUri, '.png')
+  const downloadResponse = await RNFetchBlob.config({
+    fileCache: true,
+  }).fetch('GET', uri)
+  let imagePath = downloadResponse.path()
+  imagePath = normalizePath(await moveToPermanentPath(imagePath, '.png'), true)
 
   // save
   try {
@@ -369,24 +403,3 @@ export function getResizedDimensions(originalDims: {
     height: Math.round(originalDims.height * ratio),
   }
 }
-
-function createPath(ext: string) {
-  // cacheDirectory will never be null on native, so the null check here is not necessary except for typescript.
-  // we use a web-only function for downloadAndResize on web
-  return `${cacheDirectory ?? ''}/${uuid.v4()}.${ext}`
-}
-
-async function downloadImage(uri: string, path: string, timeout: number) {
-  const dlResumable = createDownloadResumable(uri, path, {cache: true})
-
-  const to1 = setTimeout(() => dlResumable.cancelAsync(), timeout)
-
-  const dlRes = await dlResumable.downloadAsync()
-  clearTimeout(to1)
-
-  if (!dlRes?.uri) {
-    throw new Error('Failed to download image - dlRes is undefined')
-  }
-
-  return normalizePath(dlRes.uri)
-}

src/lib/merge-refs.ts

@@ -13,7 +13,7 @@
  * returns a ref callback function that can be used to merge multiple refs into a single ref.
  */
 export function mergeRefs<T = any>(
-  refs: Array<React.MutableRefObject<T> | React.LegacyRef<T>>,
+  refs: Array<React.MutableRefObject<T> | React.Ref<T>>,
 ): React.RefCallback<T> {
   return value => {
     refs.forEach(ref => {

src/lib/routes/router.ts

@@ -1,4 +1,4 @@
-import {type Route, type RouteParams} from './types'
+import {Route, RouteParams} from './types'
 
 export class Router {
   routes: [string, Route][] = []
@@ -45,7 +45,7 @@ function createRoute(pattern: string): Route {
   })
   const matcherRe = new RegExp(`^${matcherReInternal}([?]|$)`, 'i')
   return {
-    match(path) {
+    match(path: string) {
       const {pathname, searchParams} = new URL(path, 'http://throwaway.com')
       const addedParams = Object.fromEntries(searchParams.entries())
 
@@ -55,10 +55,10 @@ function createRoute(pattern: string): Route {
       }
       return undefined
     },
-    build(params = {}) {
+    build(params: Record<string, string>) {
       const str = pattern.replace(
         /:([\w]+)/g,
-        (_m, name) => params[encodeURIComponent(name)] || 'undefined',
+        (_m, name) => params[name] || 'undefined',
       )
 
       let hasQp = false

src/lib/routes/types.ts

@@ -143,5 +143,5 @@ export type RouteParams = Record<string, string>
 export type MatchResult = {params: RouteParams}
 export type Route = {
   match: (path: string) => MatchResult | undefined
-  build: (params?: Record<string, any>) => string
+  build: (params: RouteParams) => string
 }

src/lib/statsig/gates.ts

@@ -6,7 +6,6 @@ export type Gate =
   | 'explore_show_suggested_feeds'
   | 'old_postonboarding'
   | 'onboarding_add_video_feed'
-  | 'post_threads_v2_unspecced'
   | 'remove_show_latest_button'
   | 'test_gate_1'
   | 'test_gate_2'

src/locale/helpers.ts

@@ -1,4 +1,4 @@
-import {type AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
+import {AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api'
 import * as bcp47Match from 'bcp-47-match'
 import lande from 'lande'
 

src/logger/metrics.ts

@@ -434,13 +434,4 @@ export type MetricEvents = {
   'share:press:dmSelected': {}
   'share:press:recentDm': {}
   'share:press:embed': {}
-
-  'thread:click:showOtherReplies': {}
-  'thread:preferences:load': {
-    [key: string]: any
-  }
-  'thread:preferences:update': {
-    [key: string]: any
-  }
-  'thread:click:headerMenuOpen': {}
 }

src/logger/sentry/setup/index.ts

@@ -38,12 +38,4 @@ init({
      */
     `Network request failed`,
   ],
-  /**
-   * Does not affect traces of error events or other logs, just disables
-   * automatically attaching stack traces to events. This helps us group events
-   * and prevents explosions of separate issues.
-   *
-   * @see https://docs.sentry.io/platforms/react-native/configuration/options/#attach-stacktrace
-   */
-  attachStacktrace: false,
 })

src/logger/types.ts

@@ -10,8 +10,6 @@ export enum LogContext {
   ConversationAgent = 'conversation-agent',
   DMsAgent = 'dms-agent',
   ReportDialog = 'report-dialog',
-  FeedFeedback = 'feed-feedback',
-  PostSource = 'post-source',
 
   /**
    * METRIC IS FOR INTERNAL USE ONLY, don't create any other loggers using this

src/screens/Login/LoginForm.tsx

@@ -3,12 +3,12 @@ import {
   ActivityIndicator,
   Keyboard,
   LayoutAnimation,
-  type TextInput,
+  TextInput,
   View,
 } from 'react-native'
 import {
   ComAtprotoServerCreateSession,
-  type ComAtprotoServerDescribeServer,
+  ComAtprotoServerDescribeServer,
 } from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'

src/screens/Messages/components/MessagesList.tsx

@@ -16,7 +16,6 @@ import {
   RichText,
 } from '@atproto/api'
 
-import {useHideBottomBarBorderForScreen} from '#/lib/hooks/useHideBottomBarBorder'
 import {ScrollProvider} from '#/lib/ScrollContext'
 import {shortenLinks, stripInvalidMentions} from '#/lib/strings/rich-text-manip'
 import {
@@ -107,8 +106,6 @@ export function MessagesList({
   const getPost = useGetPost()
   const {embedUri, setEmbed} = useMessageEmbed()
 
-  useHideBottomBarBorderForScreen()
-
   const flatListRef = useAnimatedRef<ListMethods>()
 
   const [newMessagesPill, setNewMessagesPill] = useState({

src/screens/Onboarding/StepProfile/index.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import {View} from 'react-native'
 import {Image as ExpoImage} from 'expo-image'
 import {
-  type ImagePickerOptions,
+  ImagePickerOptions,
   launchImageLibraryAsync,
   MediaTypeOptions,
 } from 'expo-image-picker'
@@ -27,7 +27,7 @@ import {AvatarCreatorCircle} from '#/screens/Onboarding/StepProfile/AvatarCreato
 import {AvatarCreatorItems} from '#/screens/Onboarding/StepProfile/AvatarCreatorItems'
 import {
   PlaceholderCanvas,
-  type PlaceholderCanvasRef,
+  PlaceholderCanvasRef,
 } from '#/screens/Onboarding/StepProfile/PlaceholderCanvas'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -38,7 +38,7 @@ import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components
 import {CircleInfo_Stroke2_Corner0_Rounded} from '#/components/icons/CircleInfo'
 import {StreamingLive_Stroke2_Corner0_Rounded as StreamingLive} from '#/components/icons/StreamingLive'
 import {Text} from '#/components/Typography'
-import {type AvatarColor, avatarColors, type Emoji, emojiItems} from './types'
+import {AvatarColor, avatarColors, Emoji, emojiItems} from './types'
 
 export interface Avatar {
   image?: {

src/screens/PostThread/components/HeaderDropdown.tsx

@@ -1,106 +0,0 @@
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {HITSLOP_10} from '#/lib/constants'
-import {logger} from '#/logger'
-import {type ThreadPreferences} from '#/state/queries/preferences/useThreadPreferences'
-import {Button, ButtonIcon} from '#/components/Button'
-import {SettingsSliderVertical_Stroke2_Corner0_Rounded as SettingsSlider} from '#/components/icons/SettingsSlider'
-import * as Menu from '#/components/Menu'
-
-export function HeaderDropdown({
-  sort,
-  view,
-  setSort,
-  setView,
-}: Pick<
-  ThreadPreferences,
-  'sort' | 'setSort' | 'view' | 'setView'
->): React.ReactNode {
-  const {_} = useLingui()
-  return (
-    <Menu.Root>
-      <Menu.Trigger label={_(msg`Thread options`)}>
-        {({props: {onPress, ...props}}) => (
-          <Button
-            label={_(msg`Thread options`)}
-            size="small"
-            variant="ghost"
-            color="secondary"
-            shape="round"
-            hitSlop={HITSLOP_10}
-            onPress={() => {
-              logger.metric('thread:click:headerMenuOpen', {})
-              onPress()
-            }}
-            {...props}>
-            <ButtonIcon icon={SettingsSlider} size="md" />
-          </Button>
-        )}
-      </Menu.Trigger>
-      <Menu.Outer>
-        <Menu.LabelText>
-          <Trans>Show replies as</Trans>
-        </Menu.LabelText>
-        <Menu.Group>
-          <Menu.Item
-            label={_(msg`Linear`)}
-            onPress={() => {
-              setView('linear')
-            }}>
-            <Menu.ItemText>
-              <Trans>Linear</Trans>
-            </Menu.ItemText>
-            <Menu.ItemRadio selected={view === 'linear'} />
-          </Menu.Item>
-          <Menu.Item
-            label={_(msg`Threaded`)}
-            onPress={() => {
-              setView('tree')
-            }}>
-            <Menu.ItemText>
-              <Trans>Threaded</Trans>
-            </Menu.ItemText>
-            <Menu.ItemRadio selected={view === 'tree'} />
-          </Menu.Item>
-        </Menu.Group>
-        <Menu.Divider />
-        <Menu.LabelText>
-          <Trans>Reply sorting</Trans>
-        </Menu.LabelText>
-        <Menu.Group>
-          <Menu.Item
-            label={_(msg`Top replies first`)}
-            onPress={() => {
-              setSort('top')
-            }}>
-            <Menu.ItemText>
-              <Trans>Top replies first</Trans>
-            </Menu.ItemText>
-            <Menu.ItemRadio selected={sort === 'top'} />
-          </Menu.Item>
-          <Menu.Item
-            label={_(msg`Oldest replies first`)}
-            onPress={() => {
-              setSort('oldest')
-            }}>
-            <Menu.ItemText>
-              <Trans>Oldest replies first</Trans>
-            </Menu.ItemText>
-            <Menu.ItemRadio selected={sort === 'oldest'} />
-          </Menu.Item>
-          <Menu.Item
-            label={_(msg`Newest replies first`)}
-            onPress={() => {
-              setSort('newest')
-            }}>
-            <Menu.ItemText>
-              <Trans>Newest replies first</Trans>
-            </Menu.ItemText>
-            <Menu.ItemRadio selected={sort === 'newest'} />
-          </Menu.Item>
-        </Menu.Group>
-      </Menu.Outer>
-    </Menu.Root>
-  )
-}

src/screens/PostThread/components/ThreadError.tsx

@@ -1,89 +0,0 @@
-import {useMemo} from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {useCleanError} from '#/lib/hooks/useCleanError'
-import {OUTER_SPACE} from '#/screens/PostThread/const'
-import {atoms as a, useTheme} from '#/alf'
-import {Button, ButtonIcon, ButtonText} from '#/components/Button'
-import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as RetryIcon} from '#/components/icons/ArrowRotateCounterClockwise'
-import * as Layout from '#/components/Layout'
-import {Text} from '#/components/Typography'
-
-export function ThreadError({
-  error,
-  onRetry,
-}: {
-  error: Error
-  onRetry: () => void
-}) {
-  const t = useTheme()
-  const {_} = useLingui()
-  const cleanError = useCleanError()
-
-  const {title, message} = useMemo(() => {
-    let title = _(msg`Error loading post`)
-    let message = _(msg`Something went wrong. Please try again in a moment.`)
-
-    const {raw, clean} = cleanError(error)
-
-    if (error.message.startsWith('Post not found')) {
-      title = _(msg`Post not found`)
-      message = clean || raw || message
-    }
-
-    return {title, message}
-  }, [_, error, cleanError])
-
-  return (
-    <Layout.Center>
-      <View
-        style={[
-          a.w_full,
-          a.align_center,
-          {
-            padding: OUTER_SPACE,
-            paddingTop: OUTER_SPACE * 2,
-          },
-        ]}>
-        <View
-          style={[
-            a.w_full,
-            a.align_center,
-            a.gap_xl,
-            {
-              maxWidth: 260,
-            },
-          ]}>
-          <View style={[a.gap_xs]}>
-            <Text
-              style={[a.text_center, a.text_lg, a.font_bold, a.leading_snug]}>
-              {title}
-            </Text>
-            <Text
-              style={[
-                a.text_center,
-                a.text_sm,
-                a.leading_snug,
-                t.atoms.text_contrast_medium,
-              ]}>
-              {message}
-            </Text>
-          </View>
-          <Button
-            label={_(msg`Retry`)}
-            size="small"
-            variant="solid"
-            color="secondary_inverted"
-            onPress={onRetry}>
-            <ButtonText>
-              <Trans>Retry</Trans>
-            </ButtonText>
-            <ButtonIcon icon={RetryIcon} position="right" />
-          </Button>
-        </View>
-      </View>
-    </Layout.Center>
-  )
-}

src/screens/PostThread/components/ThreadItemAnchor.tsx

@@ -1,719 +0,0 @@
-import {memo, useCallback, useMemo} from 'react'
-import {type GestureResponderEvent, Text as RNText, View} from 'react-native'
-import {
-  AppBskyFeedDefs,
-  AppBskyFeedPost,
-  type AppBskyFeedThreadgate,
-  AtUri,
-  RichText as RichTextAPI,
-} from '@atproto/api'
-import {msg, Plural, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {useActorStatus} from '#/lib/actor-status'
-import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
-import {useOpenLink} from '#/lib/hooks/useOpenLink'
-import {makeProfileLink} from '#/lib/routes/links'
-import {sanitizeDisplayName} from '#/lib/strings/display-names'
-import {sanitizeHandle} from '#/lib/strings/handles'
-import {niceDate} from '#/lib/strings/time'
-import {getTranslatorLink, isPostInLanguage} from '#/locale/helpers'
-import {logger} from '#/logger'
-import {
-  POST_TOMBSTONE,
-  type Shadow,
-  usePostShadow,
-} from '#/state/cache/post-shadow'
-import {useProfileShadow} from '#/state/cache/profile-shadow'
-import {FeedFeedbackProvider, useFeedFeedback} from '#/state/feed-feedback'
-import {useLanguagePrefs} from '#/state/preferences'
-import {type ThreadItem} from '#/state/queries/usePostThread/types'
-import {useSession} from '#/state/session'
-import {type OnPostSuccessData} from '#/state/shell/composer'
-import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
-import {type PostSource} from '#/state/unstable-post-source'
-import {PostThreadFollowBtn} from '#/view/com/post-thread/PostThreadFollowBtn'
-import {formatCount} from '#/view/com/util/numeric/format'
-import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
-import {
-  LINEAR_AVI_WIDTH,
-  OUTER_SPACE,
-  REPLY_LINE_WIDTH,
-} from '#/screens/PostThread/const'
-import {atoms as a, useTheme} from '#/alf'
-import {colors} from '#/components/Admonition'
-import {Button} from '#/components/Button'
-import {CalendarClock_Stroke2_Corner0_Rounded as CalendarClockIcon} from '#/components/icons/CalendarClock'
-import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
-import {InlineLinkText, Link} from '#/components/Link'
-import {ContentHider} from '#/components/moderation/ContentHider'
-import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
-import {PostAlerts} from '#/components/moderation/PostAlerts'
-import {type AppModerationCause} from '#/components/Pills'
-import {Embed, PostEmbedViewContext} from '#/components/Post/Embed'
-import {PostControls} from '#/components/PostControls'
-import {ProfileHoverCard} from '#/components/ProfileHoverCard'
-import * as Prompt from '#/components/Prompt'
-import {RichText} from '#/components/RichText'
-import * as Skele from '#/components/Skeleton'
-import {Text} from '#/components/Typography'
-import {VerificationCheckButton} from '#/components/verification/VerificationCheckButton'
-import {WhoCanReply} from '#/components/WhoCanReply'
-import * as bsky from '#/types/bsky'
-
-export function ThreadItemAnchor({
-  item,
-  onPostSuccess,
-  threadgateRecord,
-  postSource,
-}: {
-  item: Extract<ThreadItem, {type: 'threadPost'}>
-  onPostSuccess?: (data: OnPostSuccessData) => void
-  threadgateRecord?: AppBskyFeedThreadgate.Record
-  postSource?: PostSource
-}) {
-  const postShadow = usePostShadow(item.value.post)
-  const threadRootUri = item.value.post.record.reply?.root?.uri || item.uri
-  const isRoot = threadRootUri === item.uri
-
-  if (postShadow === POST_TOMBSTONE) {
-    return <ThreadItemAnchorDeleted isRoot={isRoot} />
-  }
-
-  return (
-    <ThreadItemAnchorInner
-      // Safeguard from clobbering per-post state below:
-      key={postShadow.uri}
-      item={item}
-      isRoot={isRoot}
-      postShadow={postShadow}
-      onPostSuccess={onPostSuccess}
-      threadgateRecord={threadgateRecord}
-      postSource={postSource}
-    />
-  )
-}
-
-function ThreadItemAnchorDeleted({isRoot}: {isRoot: boolean}) {
-  const t = useTheme()
-
-  return (
-    <>
-      <ThreadItemAnchorParentReplyLine isRoot={isRoot} />
-
-      <View
-        style={[
-          {
-            paddingHorizontal: OUTER_SPACE,
-            paddingBottom: OUTER_SPACE,
-          },
-          isRoot && [a.pt_lg],
-        ]}>
-        <View
-          style={[
-            a.flex_row,
-            a.align_center,
-            a.py_md,
-            a.rounded_sm,
-            t.atoms.bg_contrast_25,
-          ]}>
-          <View
-            style={[
-              a.flex_row,
-              a.align_center,
-              a.justify_center,
-              {
-                width: LINEAR_AVI_WIDTH,
-              },
-            ]}>
-            <TrashIcon style={[t.atoms.text_contrast_medium]} />
-          </View>
-          <Text style={[a.text_md, a.font_bold, t.atoms.text_contrast_medium]}>
-            <Trans>Post has been deleted</Trans>
-          </Text>
-        </View>
-      </View>
-    </>
-  )
-}
-
-function ThreadItemAnchorParentReplyLine({isRoot}: {isRoot: boolean}) {
-  const t = useTheme()
-
-  return !isRoot ? (
-    <View style={[a.pl_lg, a.flex_row, a.pb_xs, {height: a.pt_lg.paddingTop}]}>
-      <View style={{width: 42}}>
-        <View
-          style={[
-            {
-              width: REPLY_LINE_WIDTH,
-              marginLeft: 'auto',
-              marginRight: 'auto',
-              flexGrow: 1,
-              backgroundColor: t.atoms.border_contrast_low.borderColor,
-            },
-          ]}
-        />
-      </View>
-    </View>
-  ) : null
-}
-
-const ThreadItemAnchorInner = memo(function ThreadItemAnchorInner({
-  item,
-  isRoot,
-  postShadow,
-  onPostSuccess,
-  threadgateRecord,
-  postSource,
-}: {
-  item: Extract<ThreadItem, {type: 'threadPost'}>
-  isRoot: boolean
-  postShadow: Shadow<AppBskyFeedDefs.PostView>
-  onPostSuccess?: (data: OnPostSuccessData) => void
-  threadgateRecord?: AppBskyFeedThreadgate.Record
-  postSource?: PostSource
-}) {
-  const t = useTheme()
-  const {_, i18n} = useLingui()
-  const {openComposer} = useOpenComposer()
-  const {currentAccount, hasSession} = useSession()
-  const feedFeedback = useFeedFeedback(postSource?.feed, hasSession)
-
-  const post = postShadow
-  const record = item.value.post.record
-  const moderation = item.moderation
-  const authorShadow = useProfileShadow(post.author)
-  const {isActive: live} = useActorStatus(post.author)
-  const richText = useMemo(
-    () =>
-      new RichTextAPI({
-        text: record.text,
-        facets: record.facets,
-      }),
-    [record],
-  )
-
-  const threadRootUri = record.reply?.root?.uri || post.uri
-  const authorHref = makeProfileLink(post.author)
-  const isThreadAuthor = getThreadAuthor(post, record) === currentAccount?.did
-
-  const likesHref = useMemo(() => {
-    const urip = new AtUri(post.uri)
-    return makeProfileLink(post.author, 'post', urip.rkey, 'liked-by')
-  }, [post.uri, post.author])
-  const repostsHref = useMemo(() => {
-    const urip = new AtUri(post.uri)
-    return makeProfileLink(post.author, 'post', urip.rkey, 'reposted-by')
-  }, [post.uri, post.author])
-  const quotesHref = useMemo(() => {
-    const urip = new AtUri(post.uri)
-    return makeProfileLink(post.author, 'post', urip.rkey, 'quotes')
-  }, [post.uri, post.author])
-
-  const threadgateHiddenReplies = useMergedThreadgateHiddenReplies({
-    threadgateRecord,
-  })
-  const additionalPostAlerts: AppModerationCause[] = useMemo(() => {
-    const isPostHiddenByThreadgate = threadgateHiddenReplies.has(post.uri)
-    const isControlledByViewer =
-      new AtUri(threadRootUri).host === currentAccount?.did
-    return isControlledByViewer && isPostHiddenByThreadgate
-      ? [
-          {
-            type: 'reply-hidden',
-            source: {type: 'user', did: currentAccount?.did},
-            priority: 6,
-          },
-        ]
-      : []
-  }, [post, currentAccount?.did, threadgateHiddenReplies, threadRootUri])
-  const onlyFollowersCanReply = !!threadgateRecord?.allow?.find(
-    rule => rule.$type === 'app.bsky.feed.threadgate#followerRule',
-  )
-  const showFollowButton =
-    currentAccount?.did !== post.author.did && !onlyFollowersCanReply
-
-  const viaRepost = useMemo(() => {
-    const reason = postSource?.post.reason
-
-    if (AppBskyFeedDefs.isReasonRepost(reason) && reason.uri && reason.cid) {
-      return {
-        uri: reason.uri,
-        cid: reason.cid,
-      }
-    }
-  }, [postSource])
-
-  const onPressReply = useCallback(() => {
-    openComposer({
-      replyTo: {
-        uri: post.uri,
-        cid: post.cid,
-        text: record.text,
-        author: post.author,
-        embed: post.embed,
-        moderation,
-      },
-      onPostSuccess: onPostSuccess,
-    })
-
-    if (postSource) {
-      feedFeedback.sendInteraction({
-        item: post.uri,
-        event: 'app.bsky.feed.defs#interactionReply',
-        feedContext: postSource.post.feedContext,
-        reqId: postSource.post.reqId,
-      })
-    }
-  }, [
-    openComposer,
-    post,
-    record,
-    onPostSuccess,
-    moderation,
-    postSource,
-    feedFeedback,
-  ])
-
-  const onOpenAuthor = () => {
-    if (postSource) {
-      feedFeedback.sendInteraction({
-        item: post.uri,
-        event: 'app.bsky.feed.defs#clickthroughAuthor',
-        feedContext: postSource.post.feedContext,
-        reqId: postSource.post.reqId,
-      })
-    }
-  }
-
-  const onOpenEmbed = () => {
-    if (postSource) {
-      feedFeedback.sendInteraction({
-        item: post.uri,
-        event: 'app.bsky.feed.defs#clickthroughEmbed',
-        feedContext: postSource.post.feedContext,
-        reqId: postSource.post.reqId,
-      })
-    }
-  }
-
-  return (
-    <>
-      <ThreadItemAnchorParentReplyLine isRoot={isRoot} />
-
-      <View
-        testID={`postThreadItem-by-${post.author.handle}`}
-        style={[
-          {
-            paddingHorizontal: OUTER_SPACE,
-          },
-          isRoot && [a.pt_lg],
-        ]}>
-        <View style={[a.flex_row, a.gap_md, a.pb_md]}>
-          <PreviewableUserAvatar
-            size={42}
-            profile={post.author}
-            moderation={moderation.ui('avatar')}
-            type={post.author.associated?.labeler ? 'labeler' : 'user'}
-            live={live}
-            onBeforePress={onOpenAuthor}
-          />
-          <ProfileHoverCard did={post.author.did}>
-            <View style={[a.flex_1]}>
-              <View style={[a.flex_row, a.align_center]}>
-                <Link
-                  to={authorHref}
-                  style={[a.flex_shrink]}
-                  label={sanitizeDisplayName(
-                    post.author.displayName ||
-                      sanitizeHandle(post.author.handle),
-                    moderation.ui('displayName'),
-                  )}
-                  onPress={onOpenAuthor}>
-                  <Text
-                    emoji
-                    style={[
-                      a.text_lg,
-                      a.font_bold,
-                      a.leading_snug,
-                      a.self_start,
-                    ]}
-                    numberOfLines={1}>
-                    {sanitizeDisplayName(
-                      post.author.displayName ||
-                        sanitizeHandle(post.author.handle),
-                      moderation.ui('displayName'),
-                    )}
-                  </Text>
-                </Link>
-
-                <View style={[{paddingLeft: 3, top: -1}]}>
-                  <VerificationCheckButton profile={authorShadow} size="md" />
-                </View>
-              </View>
-              <View style={[a.align_start]}>
-                <Link
-                  style={[a.flex_shrink]}
-                  to={authorHref}
-                  label={sanitizeHandle(post.author.handle, '@')}>
-                  <Text
-                    style={[
-                      a.text_md,
-                      a.leading_snug,
-                      t.atoms.text_contrast_medium,
-                    ]}
-                    numberOfLines={1}>
-                    {sanitizeHandle(post.author.handle, '@')}
-                  </Text>
-                </Link>
-              </View>
-            </View>
-          </ProfileHoverCard>
-          {showFollowButton && (
-            <View>
-              <PostThreadFollowBtn did={post.author.did} />
-            </View>
-          )}
-        </View>
-        <View style={[a.pb_sm]}>
-          <LabelsOnMyPost post={post} style={[a.pb_sm]} />
-          <ContentHider
-            modui={moderation.ui('contentView')}
-            ignoreMute
-            childContainerStyle={[a.pt_sm]}>
-            <PostAlerts
-              modui={moderation.ui('contentView')}
-              size="lg"
-              includeMute
-              style={[a.pb_sm]}
-              additionalCauses={additionalPostAlerts}
-            />
-            {richText?.text ? (
-              <RichText
-                enableTags
-                selectable
-                value={richText}
-                style={[a.flex_1, a.text_xl]}
-                authorHandle={post.author.handle}
-                shouldProxyLinks={true}
-              />
-            ) : undefined}
-            {post.embed && (
-              <View style={[a.py_xs]}>
-                <Embed
-                  embed={post.embed}
-                  moderation={moderation}
-                  viewContext={PostEmbedViewContext.ThreadHighlighted}
-                  onOpen={onOpenEmbed}
-                />
-              </View>
-            )}
-          </ContentHider>
-          <ExpandedPostDetails
-            post={item.value.post}
-            isThreadAuthor={isThreadAuthor}
-          />
-          {post.repostCount !== 0 ||
-          post.likeCount !== 0 ||
-          post.quoteCount !== 0 ? (
-            // Show this section unless we're *sure* it has no engagement.
-            <View
-              style={[
-                a.flex_row,
-                a.align_center,
-                a.gap_lg,
-                a.border_t,
-                a.border_b,
-                a.mt_md,
-                a.py_md,
-                t.atoms.border_contrast_low,
-              ]}>
-              {post.repostCount != null && post.repostCount !== 0 ? (
-                <Link to={repostsHref} label={_(msg`Reposts of this post`)}>
-                  <Text
-                    testID="repostCount-expanded"
-                    style={[a.text_md, t.atoms.text_contrast_medium]}>
-                    <Text style={[a.text_md, a.font_bold, t.atoms.text]}>
-                      {formatCount(i18n, post.repostCount)}
-                    </Text>{' '}
-                    <Plural
-                      value={post.repostCount}
-                      one="repost"
-                      other="reposts"
-                    />
-                  </Text>
-                </Link>
-              ) : null}
-              {post.quoteCount != null &&
-              post.quoteCount !== 0 &&
-              !post.viewer?.embeddingDisabled ? (
-                <Link to={quotesHref} label={_(msg`Quotes of this post`)}>
-                  <Text
-                    testID="quoteCount-expanded"
-                    style={[a.text_md, t.atoms.text_contrast_medium]}>
-                    <Text style={[a.text_md, a.font_bold, t.atoms.text]}>
-                      {formatCount(i18n, post.quoteCount)}
-                    </Text>{' '}
-                    <Plural
-                      value={post.quoteCount}
-                      one="quote"
-                      other="quotes"
-                    />
-                  </Text>
-                </Link>
-              ) : null}
-              {post.likeCount != null && post.likeCount !== 0 ? (
-                <Link to={likesHref} label={_(msg`Likes on this post`)}>
-                  <Text
-                    testID="likeCount-expanded"
-                    style={[a.text_md, t.atoms.text_contrast_medium]}>
-                    <Text style={[a.text_md, a.font_bold, t.atoms.text]}>
-                      {formatCount(i18n, post.likeCount)}
-                    </Text>{' '}
-                    <Plural value={post.likeCount} one="like" other="likes" />
-                  </Text>
-                </Link>
-              ) : null}
-            </View>
-          ) : null}
-          <View
-            style={[
-              a.pt_sm,
-              a.pb_2xs,
-              {
-                marginLeft: -5,
-              },
-            ]}>
-            <FeedFeedbackProvider value={feedFeedback}>
-              <PostControls
-                big
-                post={postShadow}
-                record={record}
-                richText={richText}
-                onPressReply={onPressReply}
-                logContext="PostThreadItem"
-                threadgateRecord={threadgateRecord}
-                feedContext={postSource?.post?.feedContext}
-                reqId={postSource?.post?.reqId}
-                viaRepost={viaRepost}
-              />
-            </FeedFeedbackProvider>
-          </View>
-        </View>
-      </View>
-    </>
-  )
-})
-
-function ExpandedPostDetails({
-  post,
-  isThreadAuthor,
-}: {
-  post: Extract<ThreadItem, {type: 'threadPost'}>['value']['post']
-  isThreadAuthor: boolean
-}) {
-  const t = useTheme()
-  const {_, i18n} = useLingui()
-  const openLink = useOpenLink()
-  const langPrefs = useLanguagePrefs()
-
-  const translatorUrl = getTranslatorLink(
-    post.record?.text || '',
-    langPrefs.primaryLanguage,
-  )
-  const needsTranslation = useMemo(
-    () =>
-      Boolean(
-        langPrefs.primaryLanguage &&
-          !isPostInLanguage(post, [langPrefs.primaryLanguage]),
-      ),
-    [post, langPrefs.primaryLanguage],
-  )
-
-  const onTranslatePress = useCallback(
-    (e: GestureResponderEvent) => {
-      e.preventDefault()
-      openLink(translatorUrl, true)
-
-      if (
-        bsky.dangerousIsType<AppBskyFeedPost.Record>(
-          post.record,
-          AppBskyFeedPost.isRecord,
-        )
-      ) {
-        logger.metric('translate', {
-          sourceLanguages: post.record.langs ?? [],
-          targetLanguage: langPrefs.primaryLanguage,
-          textLength: post.record.text.length,
-        })
-      }
-
-      return false
-    },
-    [openLink, translatorUrl, langPrefs, post],
-  )
-
-  return (
-    <View style={[a.gap_md, a.pt_md, a.align_start]}>
-      <BackdatedPostIndicator post={post} />
-      <View style={[a.flex_row, a.align_center, a.flex_wrap, a.gap_sm]}>
-        <Text style={[a.text_sm, t.atoms.text_contrast_medium]}>
-          {niceDate(i18n, post.indexedAt)}
-        </Text>
-        <WhoCanReply post={post} isThreadAuthor={isThreadAuthor} />
-        {needsTranslation && (
-          <>
-            <Text style={[a.text_sm, t.atoms.text_contrast_medium]}>
-              &middot;
-            </Text>
-
-            <InlineLinkText
-              to={translatorUrl}
-              label={_(msg`Translate`)}
-              style={[a.text_sm]}
-              onPress={onTranslatePress}>
-              <Trans>Translate</Trans>
-            </InlineLinkText>
-          </>
-        )}
-      </View>
-    </View>
-  )
-}
-
-function BackdatedPostIndicator({post}: {post: AppBskyFeedDefs.PostView}) {
-  const t = useTheme()
-  const {_, i18n} = useLingui()
-  const control = Prompt.usePromptControl()
-
-  const indexedAt = new Date(post.indexedAt)
-  const createdAt = bsky.dangerousIsType<AppBskyFeedPost.Record>(
-    post.record,
-    AppBskyFeedPost.isRecord,
-  )
-    ? new Date(post.record.createdAt)
-    : new Date(post.indexedAt)
-
-  // backdated if createdAt is 24 hours or more before indexedAt
-  const isBackdated =
-    indexedAt.getTime() - createdAt.getTime() > 24 * 60 * 60 * 1000
-
-  if (!isBackdated) return null
-
-  const orange = t.name === 'light' ? colors.warning.dark : colors.warning.light
-
-  return (
-    <>
-      <Button
-        label={_(msg`Archived post`)}
-        accessibilityHint={_(
-          msg`Shows information about when this post was created`,
-        )}
-        onPress={e => {
-          e.preventDefault()
-          e.stopPropagation()
-          control.open()
-        }}>
-        {({hovered, pressed}) => (
-          <View
-            style={[
-              a.flex_row,
-              a.align_center,
-              a.rounded_full,
-              t.atoms.bg_contrast_25,
-              (hovered || pressed) && t.atoms.bg_contrast_50,
-              {
-                gap: 3,
-                paddingHorizontal: 6,
-                paddingVertical: 3,
-              },
-            ]}>
-            <CalendarClockIcon fill={orange} size="sm" aria-hidden />
-            <Text
-              style={[
-                a.text_xs,
-                a.font_bold,
-                a.leading_tight,
-                t.atoms.text_contrast_medium,
-              ]}>
-              <Trans>Archived from {niceDate(i18n, createdAt)}</Trans>
-            </Text>
-          </View>
-        )}
-      </Button>
-
-      <Prompt.Outer control={control}>
-        <Prompt.TitleText>
-          <Trans>Archived post</Trans>
-        </Prompt.TitleText>
-        <Prompt.DescriptionText>
-          <Trans>
-            This post claims to have been created on{' '}
-            <RNText style={[a.font_bold]}>{niceDate(i18n, createdAt)}</RNText>,
-            but was first seen by Bluesky on{' '}
-            <RNText style={[a.font_bold]}>{niceDate(i18n, indexedAt)}</RNText>.
-          </Trans>
-        </Prompt.DescriptionText>
-        <Text
-          style={[
-            a.text_md,
-            a.leading_snug,
-            t.atoms.text_contrast_high,
-            a.pb_xl,
-          ]}>
-          <Trans>
-            Bluesky cannot confirm the authenticity of the claimed date.
-          </Trans>
-        </Text>
-        <Prompt.Actions>
-          <Prompt.Action cta={_(msg`Okay`)} onPress={() => {}} />
-        </Prompt.Actions>
-      </Prompt.Outer>
-    </>
-  )
-}
-
-function getThreadAuthor(
-  post: AppBskyFeedDefs.PostView,
-  record: AppBskyFeedPost.Record,
-): string {
-  if (!record.reply) {
-    return post.author.did
-  }
-  try {
-    return new AtUri(record.reply.root.uri).host
-  } catch {
-    return ''
-  }
-}
-
-export function ThreadItemAnchorSkeleton() {
-  return (
-    <View style={[a.p_lg, a.gap_md]}>
-      <Skele.Row style={[a.align_center, a.gap_md]}>
-        <Skele.Circle size={42} />
-
-        <Skele.Col>
-          <Skele.Text style={[a.text_lg, {width: '20%'}]} />
-          <Skele.Text blend style={[a.text_md, {width: '40%'}]} />
-        </Skele.Col>
-      </Skele.Row>
-
-      <View>
-        <Skele.Text style={[a.text_xl, {width: '100%'}]} />
-        <Skele.Text style={[a.text_xl, {width: '60%'}]} />
-      </View>
-
-      <Skele.Text style={[a.text_sm, {width: '50%'}]} />
-
-      <Skele.Row style={[a.justify_between]}>
-        <Skele.Pill blend size={24} />
-        <Skele.Pill blend size={24} />
-        <Skele.Pill blend size={24} />
-        <Skele.Circle blend size={24} />
-        <Skele.Circle blend size={24} />
-      </Skele.Row>
-    </View>
-  )
-}

src/screens/PostThread/components/ThreadItemAnchorNoUnauthenticated.tsx

@@ -1,32 +0,0 @@
-import {View} from 'react-native'
-import {Trans} from '@lingui/macro'
-
-import {atoms as a, useTheme} from '#/alf'
-import {Lock_Stroke2_Corner0_Rounded as LockIcon} from '#/components/icons/Lock'
-import * as Skele from '#/components/Skeleton'
-import {Text} from '#/components/Typography'
-
-export function ThreadItemAnchorNoUnauthenticated() {
-  const t = useTheme()
-
-  return (
-    <View style={[a.p_lg, a.gap_md]}>
-      <Skele.Row style={[a.align_center, a.gap_md]}>
-        <Skele.Circle size={42}>
-          <LockIcon size="md" fill={t.atoms.text_contrast_medium.color} />
-        </Skele.Circle>
-
-        <Skele.Col>
-          <Skele.Text style={[a.text_lg, {width: '20%'}]} />
-          <Skele.Text blend style={[a.text_md, {width: '40%'}]} />
-        </Skele.Col>
-      </Skele.Row>
-
-      <View style={[a.py_sm]}>
-        <Text style={[a.text_xl, a.italic, t.atoms.text_contrast_medium]}>
-          <Trans>You must sign in to view this post.</Trans>
-        </Text>
-      </View>
-    </View>
-  )
-}

src/screens/PostThread/components/ThreadItemPost.tsx

@@ -1,401 +0,0 @@
-import {memo, type ReactNode, useCallback, useMemo, useState} from 'react'
-import {View} from 'react-native'
-import {
-  type AppBskyFeedDefs,
-  type AppBskyFeedThreadgate,
-  AtUri,
-  RichText as RichTextAPI,
-} from '@atproto/api'
-import {Trans} from '@lingui/macro'
-
-import {useActorStatus} from '#/lib/actor-status'
-import {MAX_POST_LINES} from '#/lib/constants'
-import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
-import {makeProfileLink} from '#/lib/routes/links'
-import {countLines} from '#/lib/strings/helpers'
-import {
-  POST_TOMBSTONE,
-  type Shadow,
-  usePostShadow,
-} from '#/state/cache/post-shadow'
-import {type ThreadItem} from '#/state/queries/usePostThread/types'
-import {useSession} from '#/state/session'
-import {type OnPostSuccessData} from '#/state/shell/composer'
-import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
-import {PostMeta} from '#/view/com/util/PostMeta'
-import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
-import {
-  LINEAR_AVI_WIDTH,
-  OUTER_SPACE,
-  REPLY_LINE_WIDTH,
-} from '#/screens/PostThread/const'
-import {atoms as a, useTheme} from '#/alf'
-import {useInteractionState} from '#/components/hooks/useInteractionState'
-import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
-import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
-import {PostAlerts} from '#/components/moderation/PostAlerts'
-import {PostHider} from '#/components/moderation/PostHider'
-import {type AppModerationCause} from '#/components/Pills'
-import {Embed, PostEmbedViewContext} from '#/components/Post/Embed'
-import {ShowMoreTextButton} from '#/components/Post/ShowMoreTextButton'
-import {PostControls} from '#/components/PostControls'
-import {RichText} from '#/components/RichText'
-import * as Skele from '#/components/Skeleton'
-import {SubtleWebHover} from '#/components/SubtleWebHover'
-import {Text} from '#/components/Typography'
-
-export type ThreadItemPostProps = {
-  item: Extract<ThreadItem, {type: 'threadPost'}>
-  overrides?: {
-    moderation?: boolean
-    topBorder?: boolean
-  }
-  onPostSuccess?: (data: OnPostSuccessData) => void
-  threadgateRecord?: AppBskyFeedThreadgate.Record
-}
-
-export function ThreadItemPost({
-  item,
-  overrides,
-  onPostSuccess,
-  threadgateRecord,
-}: ThreadItemPostProps) {
-  const postShadow = usePostShadow(item.value.post)
-
-  if (postShadow === POST_TOMBSTONE) {
-    return <ThreadItemPostDeleted item={item} overrides={overrides} />
-  }
-
-  return (
-    <ThreadItemPostInner
-      item={item}
-      postShadow={postShadow}
-      threadgateRecord={threadgateRecord}
-      overrides={overrides}
-      onPostSuccess={onPostSuccess}
-    />
-  )
-}
-
-function ThreadItemPostDeleted({
-  item,
-  overrides,
-}: Pick<ThreadItemPostProps, 'item' | 'overrides'>) {
-  const t = useTheme()
-
-  return (
-    <ThreadItemPostOuterWrapper item={item} overrides={overrides}>
-      <ThreadItemPostParentReplyLine item={item} />
-
-      <View
-        style={[
-          a.flex_row,
-          a.align_center,
-          a.py_md,
-          a.rounded_sm,
-          t.atoms.bg_contrast_25,
-        ]}>
-        <View
-          style={[
-            a.flex_row,
-            a.align_center,
-            a.justify_center,
-            {
-              width: LINEAR_AVI_WIDTH,
-            },
-          ]}>
-          <TrashIcon style={[t.atoms.text_contrast_medium]} />
-        </View>
-        <Text style={[a.text_md, a.font_bold, t.atoms.text_contrast_medium]}>
-          <Trans>Post has been deleted</Trans>
-        </Text>
-      </View>
-
-      <View style={[{height: 4}]} />
-    </ThreadItemPostOuterWrapper>
-  )
-}
-
-const ThreadItemPostOuterWrapper = memo(function ThreadItemPostOuterWrapper({
-  item,
-  overrides,
-  children,
-}: Pick<ThreadItemPostProps, 'item' | 'overrides'> & {
-  children: ReactNode
-}) {
-  const t = useTheme()
-  const showTopBorder =
-    !item.ui.showParentReplyLine && overrides?.topBorder !== true
-
-  return (
-    <View
-      style={[
-        showTopBorder && [a.border_t, t.atoms.border_contrast_low],
-        {
-          paddingHorizontal: OUTER_SPACE,
-        },
-        // If there's no next child, add a little padding to bottom
-        !item.ui.showChildReplyLine &&
-          !item.ui.precedesChildReadMore && {
-            paddingBottom: OUTER_SPACE / 2,
-          },
-      ]}>
-      {children}
-    </View>
-  )
-})
-
-/**
- * Provides some space between posts as well as contains the reply line
- */
-const ThreadItemPostParentReplyLine = memo(
-  function ThreadItemPostParentReplyLine({
-    item,
-  }: Pick<ThreadItemPostProps, 'item'>) {
-    const t = useTheme()
-    return (
-      <View style={[a.flex_row, {height: 12}]}>
-        <View style={{width: LINEAR_AVI_WIDTH}}>
-          {item.ui.showParentReplyLine && (
-            <View
-              style={[
-                a.mx_auto,
-                a.flex_1,
-                a.mb_xs,
-                {
-                  width: REPLY_LINE_WIDTH,
-                  backgroundColor: t.atoms.border_contrast_low.borderColor,
-                },
-              ]}
-            />
-          )}
-        </View>
-      </View>
-    )
-  },
-)
-
-const ThreadItemPostInner = memo(function ThreadItemPostInner({
-  item,
-  postShadow,
-  overrides,
-  onPostSuccess,
-  threadgateRecord,
-}: ThreadItemPostProps & {
-  postShadow: Shadow<AppBskyFeedDefs.PostView>
-}) {
-  const t = useTheme()
-  const {openComposer} = useOpenComposer()
-  const {currentAccount} = useSession()
-
-  const post = item.value.post
-  const record = item.value.post.record
-  const moderation = item.moderation
-  const richText = useMemo(
-    () =>
-      new RichTextAPI({
-        text: record.text,
-        facets: record.facets,
-      }),
-    [record],
-  )
-  const [limitLines, setLimitLines] = useState(
-    () => countLines(richText?.text) >= MAX_POST_LINES,
-  )
-  const threadRootUri = record.reply?.root?.uri || post.uri
-  const postHref = useMemo(() => {
-    const urip = new AtUri(post.uri)
-    return makeProfileLink(post.author, 'post', urip.rkey)
-  }, [post.uri, post.author])
-  const threadgateHiddenReplies = useMergedThreadgateHiddenReplies({
-    threadgateRecord,
-  })
-  const additionalPostAlerts: AppModerationCause[] = useMemo(() => {
-    const isPostHiddenByThreadgate = threadgateHiddenReplies.has(post.uri)
-    const isControlledByViewer =
-      new AtUri(threadRootUri).host === currentAccount?.did
-    return isControlledByViewer && isPostHiddenByThreadgate
-      ? [
-          {
-            type: 'reply-hidden',
-            source: {type: 'user', did: currentAccount?.did},
-            priority: 6,
-          },
-        ]
-      : []
-  }, [post, currentAccount?.did, threadgateHiddenReplies, threadRootUri])
-
-  const onPressReply = useCallback(() => {
-    openComposer({
-      replyTo: {
-        uri: post.uri,
-        cid: post.cid,
-        text: record.text,
-        author: post.author,
-        embed: post.embed,
-        moderation,
-      },
-      onPostSuccess: onPostSuccess,
-    })
-  }, [openComposer, post, record, onPostSuccess, moderation])
-
-  const onPressShowMore = useCallback(() => {
-    setLimitLines(false)
-  }, [setLimitLines])
-
-  const {isActive: live} = useActorStatus(post.author)
-
-  return (
-    <SubtleHover>
-      <ThreadItemPostOuterWrapper item={item} overrides={overrides}>
-        <PostHider
-          testID={`postThreadItem-by-${post.author.handle}`}
-          href={postHref}
-          disabled={overrides?.moderation === true}
-          modui={moderation.ui('contentList')}
-          iconSize={LINEAR_AVI_WIDTH}
-          iconStyles={{marginLeft: 2, marginRight: 2}}
-          profile={post.author}
-          interpretFilterAsBlur>
-          <ThreadItemPostParentReplyLine item={item} />
-
-          <View style={[a.flex_row, a.gap_md]}>
-            <View>
-              <PreviewableUserAvatar
-                size={LINEAR_AVI_WIDTH}
-                profile={post.author}
-                moderation={moderation.ui('avatar')}
-                type={post.author.associated?.labeler ? 'labeler' : 'user'}
-                live={live}
-              />
-
-              {(item.ui.showChildReplyLine ||
-                item.ui.precedesChildReadMore) && (
-                <View
-                  style={[
-                    a.mx_auto,
-                    a.mt_xs,
-                    a.flex_1,
-                    {
-                      width: REPLY_LINE_WIDTH,
-                      backgroundColor: t.atoms.border_contrast_low.borderColor,
-                    },
-                  ]}
-                />
-              )}
-            </View>
-
-            <View style={[a.flex_1]}>
-              <PostMeta
-                author={post.author}
-                moderation={moderation}
-                timestamp={post.indexedAt}
-                postHref={postHref}
-                style={[a.pb_xs]}
-              />
-              <LabelsOnMyPost post={post} style={[a.pb_xs]} />
-              <PostAlerts
-                modui={moderation.ui('contentList')}
-                style={[a.pb_2xs]}
-                additionalCauses={additionalPostAlerts}
-              />
-              {richText?.text ? (
-                <>
-                  <RichText
-                    enableTags
-                    value={richText}
-                    style={[a.flex_1, a.text_md]}
-                    numberOfLines={limitLines ? MAX_POST_LINES : undefined}
-                    authorHandle={post.author.handle}
-                    shouldProxyLinks={true}
-                  />
-                  {limitLines && (
-                    <ShowMoreTextButton
-                      style={[a.text_md]}
-                      onPress={onPressShowMore}
-                    />
-                  )}
-                </>
-              ) : undefined}
-              {post.embed && (
-                <View style={[a.pb_xs]}>
-                  <Embed
-                    embed={post.embed}
-                    moderation={moderation}
-                    viewContext={PostEmbedViewContext.Feed}
-                  />
-                </View>
-              )}
-              <PostControls
-                post={postShadow}
-                record={record}
-                richText={richText}
-                onPressReply={onPressReply}
-                logContext="PostThreadItem"
-                threadgateRecord={threadgateRecord}
-              />
-            </View>
-          </View>
-        </PostHider>
-      </ThreadItemPostOuterWrapper>
-    </SubtleHover>
-  )
-})
-
-function SubtleHover({children}: {children: ReactNode}) {
-  const {
-    state: hover,
-    onIn: onHoverIn,
-    onOut: onHoverOut,
-  } = useInteractionState()
-  return (
-    <View
-      onPointerEnter={onHoverIn}
-      onPointerLeave={onHoverOut}
-      style={a.pointer}>
-      <SubtleWebHover hover={hover} />
-      {children}
-    </View>
-  )
-}
-
-export function ThreadItemPostSkeleton({index}: {index: number}) {
-  const even = index % 2 === 0
-  return (
-    <View
-      style={[
-        {paddingHorizontal: OUTER_SPACE, paddingVertical: OUTER_SPACE / 1.5},
-        a.gap_md,
-      ]}>
-      <Skele.Row style={[a.align_start, a.gap_md]}>
-        <Skele.Circle size={LINEAR_AVI_WIDTH} />
-
-        <Skele.Col style={[a.gap_xs]}>
-          <Skele.Row style={[a.gap_sm]}>
-            <Skele.Text style={[a.text_md, {width: '20%'}]} />
-            <Skele.Text blend style={[a.text_md, {width: '30%'}]} />
-          </Skele.Row>
-
-          <Skele.Col>
-            {even ? (
-              <>
-                <Skele.Text blend style={[a.text_md, {width: '100%'}]} />
-                <Skele.Text blend style={[a.text_md, {width: '60%'}]} />
-              </>
-            ) : (
-              <Skele.Text blend style={[a.text_md, {width: '60%'}]} />
-            )}
-          </Skele.Col>
-
-          <Skele.Row style={[a.justify_between, a.pt_xs]}>
-            <Skele.Pill blend size={16} />
-            <Skele.Pill blend size={16} />
-            <Skele.Pill blend size={16} />
-            <Skele.Circle blend size={16} />
-            <View />
-          </Skele.Row>
-        </Skele.Col>
-      </Skele.Row>
-    </View>
-  )
-}

src/screens/PostThread/components/ThreadItemPostNoUnauthenticated.tsx

@@ -1,74 +0,0 @@
-import {View} from 'react-native'
-import {Trans} from '@lingui/macro'
-
-import {type ThreadItem} from '#/state/queries/usePostThread/types'
-import {
-  LINEAR_AVI_WIDTH,
-  OUTER_SPACE,
-  REPLY_LINE_WIDTH,
-} from '#/screens/PostThread/const'
-import {atoms as a, useTheme} from '#/alf'
-import {Lock_Stroke2_Corner0_Rounded as LockIcon} from '#/components/icons/Lock'
-import * as Skele from '#/components/Skeleton'
-import {Text} from '#/components/Typography'
-
-export function ThreadItemPostNoUnauthenticated({
-  item,
-}: {
-  item: Extract<ThreadItem, {type: 'threadPostNoUnauthenticated'}>
-}) {
-  const t = useTheme()
-
-  return (
-    <View style={[{paddingHorizontal: OUTER_SPACE}]}>
-      <View style={[a.flex_row, {height: 12}]}>
-        <View style={{width: LINEAR_AVI_WIDTH}}>
-          {item.ui.showParentReplyLine && (
-            <View
-              style={[
-                a.mx_auto,
-                a.flex_1,
-                a.mb_xs,
-                {
-                  width: REPLY_LINE_WIDTH,
-                  backgroundColor: t.atoms.border_contrast_low.borderColor,
-                },
-              ]}
-            />
-          )}
-        </View>
-      </View>
-      <Skele.Row style={[a.align_center, a.gap_md]}>
-        <Skele.Circle size={LINEAR_AVI_WIDTH}>
-          <LockIcon size="md" fill={t.atoms.text_contrast_medium.color} />
-        </Skele.Circle>
-
-        <Text style={[a.text_md, a.italic, t.atoms.text_contrast_medium]}>
-          <Trans>You must sign in to view this post.</Trans>
-        </Text>
-      </Skele.Row>
-      <View
-        style={[
-          a.flex_row,
-          a.justify_center,
-          {
-            height: OUTER_SPACE / 1.5,
-            width: LINEAR_AVI_WIDTH,
-          },
-        ]}>
-        {item.ui.showChildReplyLine && (
-          <View
-            style={[
-              a.mt_xs,
-              a.h_full,
-              {
-                width: REPLY_LINE_WIDTH,
-                backgroundColor: t.atoms.border_contrast_low.borderColor,
-              },
-            ]}
-          />
-        )}
-      </View>
-    </View>
-  )
-}

src/screens/PostThread/components/ThreadItemPostTombstone.tsx

@@ -1,55 +0,0 @@
-import {useMemo} from 'react'
-import {View} from 'react-native'
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {LINEAR_AVI_WIDTH, OUTER_SPACE} from '#/screens/PostThread/const'
-import {atoms as a, useTheme} from '#/alf'
-import {PersonX_Stroke2_Corner0_Rounded as PersonXIcon} from '#/components/icons/Person'
-import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
-import {Text} from '#/components/Typography'
-
-export type ThreadItemPostTombstoneProps = {
-  type: 'not-found' | 'blocked'
-}
-
-export function ThreadItemPostTombstone({type}: ThreadItemPostTombstoneProps) {
-  const t = useTheme()
-  const {_} = useLingui()
-  const {copy, Icon} = useMemo(() => {
-    switch (type) {
-      case 'blocked':
-        return {copy: _(msg`Post blocked`), Icon: PersonXIcon}
-      case 'not-found':
-      default:
-        return {copy: _(msg`Post not found`), Icon: TrashIcon}
-    }
-  }, [_, type])
-
-  return (
-    <View
-      style={[
-        a.mb_xs,
-        {
-          paddingHorizontal: OUTER_SPACE,
-          paddingTop: OUTER_SPACE / 1.2,
-        },
-      ]}>
-      <View
-        style={[
-          a.flex_row,
-          a.align_center,
-          a.rounded_sm,
-          t.atoms.bg_contrast_25,
-          {paddingVertical: OUTER_SPACE / 1.2},
-        ]}>
-        <View style={[a.flex_row, a.justify_center, {width: LINEAR_AVI_WIDTH}]}>
-          <Icon style={[t.atoms.text_contrast_medium]} />
-        </View>
-        <Text style={[a.text_md, a.font_bold, t.atoms.text_contrast_medium]}>
-          {copy}
-        </Text>
-      </View>
-    </View>
-  )
-}

src/screens/PostThread/components/ThreadItemReadMore.tsx

@@ -1,107 +0,0 @@
-import {memo} from 'react'
-import {View} from 'react-native'
-import {msg, Plural, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {
-  type PostThreadParams,
-  type ThreadItem,
-} from '#/state/queries/usePostThread'
-import {
-  LINEAR_AVI_WIDTH,
-  REPLY_LINE_WIDTH,
-  TREE_AVI_WIDTH,
-  TREE_INDENT,
-} from '#/screens/PostThread/const'
-import {atoms as a, useTheme} from '#/alf'
-import {CirclePlus_Stroke2_Corner0_Rounded as CirclePlus} from '#/components/icons/CirclePlus'
-import {Link} from '#/components/Link'
-import {Text} from '#/components/Typography'
-
-export const ThreadItemReadMore = memo(function ThreadItemReadMore({
-  item,
-  view,
-}: {
-  item: Extract<ThreadItem, {type: 'readMore'}>
-  view: PostThreadParams['view']
-}) {
-  const t = useTheme()
-  const {_} = useLingui()
-  const isTreeView = view === 'tree'
-  const indent = Math.max(0, item.depth - 1)
-
-  const spacers = isTreeView
-    ? Array.from(Array(indent)).map((_, n: number) => {
-        const isSkipped = item.skippedIndentIndices.has(n)
-        return (
-          <View
-            key={`${item.key}-padding-${n}`}
-            style={[
-              t.atoms.border_contrast_low,
-              {
-                borderRightWidth: isSkipped ? 0 : REPLY_LINE_WIDTH,
-                width: TREE_INDENT + TREE_AVI_WIDTH / 2,
-                left: 1,
-              },
-            ]}
-          />
-        )
-      })
-    : null
-
-  return (
-    <View style={[a.flex_row]}>
-      {spacers}
-      <View
-        style={[
-          t.atoms.border_contrast_low,
-          {
-            marginLeft: isTreeView
-              ? TREE_INDENT + TREE_AVI_WIDTH / 2 - 1
-              : (LINEAR_AVI_WIDTH - REPLY_LINE_WIDTH) / 2 + 16,
-            borderLeftWidth: 2,
-            borderBottomWidth: 2,
-            borderBottomLeftRadius: a.rounded_sm.borderRadius,
-            height: 18, // magic, Link below is 38px tall
-            width: isTreeView ? TREE_INDENT : LINEAR_AVI_WIDTH / 2 + 10,
-          },
-        ]}
-      />
-      <Link
-        label={_(msg`Read more replies`)}
-        to={item.href}
-        style={[a.pt_sm, a.pb_md, a.gap_xs]}>
-        {({hovered, pressed}) => {
-          const interacted = hovered || pressed
-          return (
-            <>
-              <CirclePlus
-                fill={
-                  interacted
-                    ? t.atoms.text_contrast_high.color
-                    : t.atoms.text_contrast_low.color
-                }
-                width={18}
-              />
-              <Text
-                style={[
-                  a.text_sm,
-                  t.atoms.text_contrast_medium,
-                  interacted && a.underline,
-                ]}>
-                <Trans>
-                  Read {item.moreReplies} more{' '}
-                  <Plural
-                    one="reply"
-                    other="replies"
-                    value={item.moreReplies}
-                  />
-                </Trans>
-              </Text>
-            </>
-          )
-        }}
-      </Link>
-    </View>
-  )
-})