testing some perf vars

2024-11-09 13:04:45 -08:00
181 changed files with 35759 additions and 39093 deletions
@@ -1,5 +1,3 @@
-const reactCompilerConfig = require('./react-compiler.config.js')
-
 module.exports = {
  root: true,
  extends: [
@@ -81,7 +79,8 @@ module.exports = {
      },
    ],
    'simple-import-sort/exports': 'error',
-    'react-compiler/react-compiler': ['error', reactCompilerConfig],
+    // TODO: Reenable when we figure out why it gets stuck on CI.
+    // 'react-compiler/react-compiler': 'error',
    'no-restricted-imports': [
      'error',
      {
@@ -3,6 +3,8 @@ on:
  push:
    branches:
      - main
+      - bnewbold/embedr
+      - bnewbold/embedr-rebase

 env:
  REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -16,10 +16,6 @@ jobs:
    steps:
      - name: Check out Git repository
        uses: actions/checkout@v3
-      - name: Install node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
      - name: Yarn install
        uses: Wandalen/wretry.action@master
        with:
@@ -1 +1 @@
-20
+18
@@ -5,7 +5,7 @@ WORKDIR /usr/src/social-app
 ENV DEBIAN_FRONTEND=noninteractive

 # Node
-ENV NODE_VERSION=20
+ENV NODE_VERSION=18
 ENV NVM_DIR=/usr/share/nvm

 # Go
@@ -17,7 +17,7 @@ ENV GOEXPERIMENT="loopvar"

 # Expo
 ARG EXPO_PUBLIC_BUNDLE_IDENTIFIER
-ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER=${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-dev}
+ENV EXPO_PUBLIC_BUNDLE_IDENTIFIER ${EXPO_PUBLIC_BUNDLE_IDENTIFIER:-dev}

 COPY . .

@@ -5,7 +5,7 @@ WORKDIR /usr/src/social-app
 ENV DEBIAN_FRONTEND=noninteractive

 # Node
-ENV NODE_VERSION=20
+ENV NODE_VERSION=18
 ENV NVM_DIR=/usr/share/nvm

 # Go
@@ -17,8 +17,8 @@ appId: xyz.blueskyweb.app
 - inputText: "Post with an image"
 - tapOn:
    id: "openGalleryBtn"
- tapOn: "Content warnings"
- tapOn: "Content warnings"
+- tapOn:
+    id: "labelsBtn"
 - tapOn: "Porn"
 - tapOn:
    label: "Tap on confirm"
@@ -29,6 +29,7 @@ appId: xyz.blueskyweb.app
 - pressKey: Enter
 - tapOn:
    id: "nextBtn"
+- tapOn: "Not now"
 - tapOn:
     id: "handleInput"
 - inputText: "e2e-test"
@@ -23,7 +23,6 @@ appId: xyz.blueskyweb.app
    id: "editDescriptionInput"
 - inputText: "They good"
 - tapOn: "Save"
- tapOn: "Save"
 - assertNotVisible:
    id: "createOrEditListModal"
 - tapOn: "About"
@@ -46,7 +45,6 @@ appId: xyz.blueskyweb.app
 - eraseText
 - inputText: "They bad"
 - tapOn: "Save"
- tapOn: "Save"
 - assertNotVisible:
    id: "createOrEditListModal"
 - assertVisible: Bad Ppl
@@ -62,7 +60,6 @@ appId: xyz.blueskyweb.app
    id: "editDescriptionInput"
 - eraseText
 - tapOn: "Save"
- tapOn: "Save"
 - assertNotVisible:
    id: "createOrEditListModal"
 - assertNotVisible:
@@ -90,7 +87,6 @@ appId: xyz.blueskyweb.app
    id: "editDescriptionInput"
 - inputText: "They good"
 - tapOn: "Save"
- tapOn: "Save"
 - assertNotVisible:
    id: "createOrEditListModal"
 - tapOn: "About"
@@ -23,4 +23,5 @@ appId: xyz.blueskyweb.app
    id: "loginPasswordInput"
 - inputText: "hunter2"
 - pressKey: Enter
+- tapOn: "Not now"
 - assertVisible: "Following"
@@ -22,7 +22,6 @@ appId: xyz.blueskyweb.app
    id: "editDescriptionInput"
 - inputText: "Shhh"
 - tapOn: "Save"
- tapOn: "Save"

 # view modlist
 - assertVisible: "Muted Users"
@@ -13,7 +13,7 @@ appId: xyz.blueskyweb.app
 - tapOn: "Select an avatar"
 - waitForAnimationToEnd
 - tapOn:
-    point: "50%,22%"
+    point: "16%,22%"
 - waitForAnimationToEnd
 - tapOn: "Choose"
 - waitForAnimationToEnd
@@ -99,8 +99,6 @@ module.exports = function (config) {
          dark: DARK_SPLASH_CONFIG,
        },
        entitlements: {
-          'com.apple.developer.kernel.increased-memory-limit': true,
-          'com.apple.developer.kernel.extended-virtual-addressing': true,
          'com.apple.security.application-groups': 'group.app.bsky',
        },
        privacyManifests: {
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M15.439 3.148a1 1 0 0 1 .41.645l.568 3.22a7 7 0 1 1-6.174 10.97L4.32 19.027a1 1 0 0 1-1.159-.811L1.078 6.398a1 1 0 0 1 .81-1.158l12.803-2.258a1 1 0 0 1 .748.166ZM9.325 16.114A7 7 0 0 1 9 14c0-1.56.51-3 1.372-4.164l-6.456 1.139 1.041 5.909 4.368-.77ZM3.568 9.005l10.833-1.91-.347-1.97L3.22 7.036l.347 1.97ZM16 9a5 5 0 1 0 0 10 5 5 0 0 0 0-10Zm0 2a1 1 0 0 1 1 1v1.586l1.374 1.374a1 1 0 0 1-1.414 1.414l-1.667-1.667A1 1 0 0 1 15 14v-2a1 1 0 0 1 1-1Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM7.5 6.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM12 14c-2.95 0-5.163 1.733-6.08 4.21a.47.47 0 0 0 .09.493.9.9 0 0 0 .687.297H11a1 1 0 1 1 0 2H6.697a2.9 2.9 0 0 1-2.219-1.011 2.46 2.46 0 0 1-.433-2.473C5.235 14.296 8.168 12 12 12c.787 0 1.54.097 2.252.282a1 1 0 1 1-.504 1.936A7 7 0 0 0 12 14Zm6 0a1 1 0 0 1 1 1v2h2a1 1 0 1 1 0 2h-2v2a1 1 0 1 1-2 0v-2h-2a1 1 0 1 1 0-2h2v-2a1 1 0 0 1 1-1Z" clip-rule="evenodd"/></svg>
@@ -1,5 +1,3 @@
-const reactCompilerConfig = require('./react-compiler.config.js')
-
 module.exports = function (api) {
  api.cache(true)
  const isTestEnv = process.env.NODE_ENV === 'test'
@@ -19,7 +17,12 @@ module.exports = function (api) {
    ],
    plugins: [
      'macros',
-      ['babel-plugin-react-compiler', reactCompilerConfig],
+      [
+        'babel-plugin-react-compiler',
+        {
+          runtimeModule: 'react-compiler-runtime',
+        },
+      ],
      [
        'module:react-native-dotenv',
        {
@@ -112,8 +112,8 @@ func serve(cctx *cli.Context) error {
 		Skipper: middleware.DefaultSkipper,
 		Store: middleware.NewRateLimiterMemoryStoreWithConfig(
 			middleware.RateLimiterMemoryStoreConfig{
-				Rate:      20,              // requests per second
-				Burst:     150,             // allow bursts
+				Rate:      10,              // requests per second
+				Burst:     30,              // allow bursts
 				ExpiresIn: 3 * time.Minute, // garbage collect entries older than 3 minutes
 			},
 		),
@@ -0,0 +1,21 @@
+const React = require('react')
+const $empty = Symbol.for('react.memo_cache_sentinel')
+/**
+ * DANGER: this hook is NEVER meant to be called directly!
+ *
+ * Note that this is a temporary userspace implementation of this function
+ * from React 19. It is not as efficient and may invalidate more frequently
+ * than the official API. Please upgrade to React 19 as soon as you can.
+ **/
+export function c(size) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  return React.useState(() => {
+    const $ = new Array(size)
+    for (let ii = 0; ii < size; ii++) {
+      $[ii] = $empty
+    }
+    // @ts-ignore
+    $[$empty] = true
+    return $
+  })[0]
+}
@@ -0,0 +1,9 @@
+{
+  "name": "react-compiler-runtime",
+  "version": "0.0.1",
+  "license": "MIT",
+  "main": "index.js",
+  "peerDependencies": {
+    "react": "^18.2.0"
+  }
+}
@@ -38,10 +38,9 @@ cfg.transformer.getTransformOptions = async () => ({
    inlineRequires: true,
    nonInlinedRequires: [
      // We can remove this option and rely on the default after
-      // https://github.com/facebook/metro/pull/1390 is released.
+      // https://github.com/facebook/metro/pull/1126 is released.
      'React',
      'react',
-      'react-compiler-runtime',
      'react/jsx-dev-runtime',
      'react/jsx-runtime',
      'react-native',
@@ -64,14 +64,11 @@ class SheetViewController: UIViewController {

  func updateDetents(contentHeight: CGFloat, preventExpansion: Bool) {
    if let sheet = self.sheetPresentationController {
-      // Capture `self` weakly to prevent retain cycles.
-      // Also, capture `sheet` weakly to avoid potential strong references held by animateChanges.
-      sheet.animateChanges { [weak self, weak sheet] in
-          guard let weakSelf = self, let weakSheet = sheet else { return }
-          weakSelf.setDetents(contentHeight: contentHeight, preventExpansion: preventExpansion)
-          if #available(iOS 16.0, *) {
-              weakSheet.invalidateDetents()
-          }
+      sheet.animateChanges {
+        self.setDetents(contentHeight: contentHeight, preventExpansion: preventExpansion)
+        if #available(iOS 16.0, *) {
+          sheet.invalidateDetents()
+        }
      }
    }
  }
@@ -1 +1,24 @@
-export {BottomSheetNativeComponent as BottomSheet} from './BottomSheetNativeComponent'
+import React from 'react'
+
+import {BottomSheetViewProps} from './BottomSheet.types'
+import {BottomSheetNativeComponent} from './BottomSheetNativeComponent'
+import {useBottomSheetPortal_INTERNAL} from './BottomSheetPortal'
+
+export const BottomSheet = React.forwardRef<
+  BottomSheetNativeComponent,
+  BottomSheetViewProps
+>(function BottomSheet(props, ref) {
+  const Portal = useBottomSheetPortal_INTERNAL()
+
+  if (__DEV__ && !Portal) {
+    throw new Error(
+      'BottomSheet: You need to wrap your component tree with a <BottomSheetPortalProvider> to use the bottom sheet.',
+    )
+  }
+
+  return (
+    <Portal>
+      <BottomSheetNativeComponent {...props} ref={ref} />
+    </Portal>
+  )
+})
@@ -11,7 +11,6 @@ import {requireNativeModule, requireNativeViewManager} from 'expo-modules-core'

 import {BottomSheetState, BottomSheetViewProps} from './BottomSheet.types'
 import {BottomSheetPortalProvider} from './BottomSheetPortal'
-import {Context as PortalContext} from './BottomSheetPortal'

 const screenHeight = Dimensions.get('screen').height

@@ -35,8 +34,6 @@ export class BottomSheetNativeComponent extends React.Component<
 > {
  ref = React.createRef<any>()

-  static contextType = PortalContext
-
  constructor(props: BottomSheetViewProps) {
    super(props)
    this.state = {
@@ -70,17 +67,6 @@ export class BottomSheetNativeComponent extends React.Component<
  }

  render() {
-    const Portal = this.context as React.ContextType<typeof PortalContext>
-    if (!Portal) {
-      throw new Error(
-        'BottomSheet: You need to wrap your component tree with a <BottomSheetPortalProvider> to use the bottom sheet.',
-      )
-    }
-
-    if (!this.state.open) {
-      return null
-    }
-
    const {children, backgroundColor, ...rest} = this.props
    const cornerRadius = rest.cornerRadius ?? 0

@@ -97,41 +83,43 @@ export class BottomSheetNativeComponent extends React.Component<
      }
    }

+    if (!this.state.open) {
+      return null
+    }
+
    return (
-      <Portal>
-        <NativeView
-          {...rest}
-          onStateChange={this.onStateChange}
-          ref={this.ref}
-          style={{
-            position: 'absolute',
-            height: screenHeight,
-            width: '100%',
-          }}
-          containerBackgroundColor={backgroundColor}>
+      <NativeView
+        {...rest}
+        onStateChange={this.onStateChange}
+        ref={this.ref}
+        style={{
+          position: 'absolute',
+          height: screenHeight,
+          width: '100%',
+        }}
+        containerBackgroundColor={backgroundColor}>
+        <View
+          style={[
+            {
+              flex: 1,
+              backgroundColor,
+            },
+            Platform.OS === 'android' && {
+              borderTopLeftRadius: cornerRadius,
+              borderTopRightRadius: cornerRadius,
+            },
+            extraStyles,
+          ]}>
          <View
-            style={[
-              {
-                flex: 1,
-                backgroundColor,
-              },
-              Platform.OS === 'android' && {
-                borderTopLeftRadius: cornerRadius,
-                borderTopRightRadius: cornerRadius,
-              },
-              extraStyles,
-            ]}>
-            <View
-              onLayout={e => {
-                const {height} = e.nativeEvent.layout
-                this.setState({viewHeight: height})
-                this.updateLayout()
-              }}>
-              <BottomSheetPortalProvider>{children}</BottomSheetPortalProvider>
-            </View>
+            onLayout={e => {
+              const {height} = e.nativeEvent.layout
+              this.setState({viewHeight: height})
+              this.updateLayout()
+            }}>
+            <BottomSheetPortalProvider>{children}</BottomSheetPortalProvider>
          </View>
-        </NativeView>
-      </Portal>
+        </View>
+      </NativeView>
    )
  }
 }
@@ -4,7 +4,7 @@ import {createPortalGroup_INTERNAL} from './lib/Portal'

 type PortalContext = React.ElementType<{children: React.ReactNode}>

-export const Context = React.createContext({} as PortalContext)
+const Context = React.createContext({} as PortalContext)

 export const useBottomSheetPortal_INTERNAL = () => React.useContext(Context)

@@ -3,7 +3,7 @@
  "version": "1.94.0",
  "private": true,
  "engines": {
-    "node": ">=20"
+    "node": ">=18"
  },
  "packageManager": "yarn@1.22.19",
  "scripts": {
@@ -103,7 +103,7 @@
    "@tiptap/suggestion": "^2.6.6",
    "@types/invariant": "^2.2.37",
    "@types/lodash.throttle": "^4.1.9",
-    "@types/node": "^20.14.3",
+    "@types/node": "^18.16.2",
    "@zxing/text-encoding": "^0.9.0",
    "array.prototype.findlast": "^1.2.3",
    "await-lock": "^2.2.2",
@@ -166,14 +166,14 @@
    "postinstall-postinstall": "^2.1.0",
    "psl": "^1.9.0",
    "react": "18.2.0",
-    "react-compiler-runtime": "^19.0.0-beta-a7bf2bd-20241110",
+    "react-compiler-runtime": "file:./lib/react-compiler-runtime",
    "react-dom": "^18.2.0",
    "react-image-crop": "^11.0.7",
    "react-keyed-flatten-children": "^3.0.0",
    "react-native": "0.74.1",
    "react-native-compressor": "^1.8.24",
    "react-native-date-picker": "^4.4.2",
-    "react-native-drawer-layout": "^4.0.1",
+    "react-native-drawer-layout": "^4.0.0-alpha.3",
    "react-native-gesture-handler": "2.20.0",
    "react-native-get-random-values": "~1.11.0",
    "react-native-image-crop-picker": "0.41.2",
@@ -243,7 +243,7 @@
    "babel-loader": "^9.1.2",
    "babel-plugin-macros": "^3.1.0",
    "babel-plugin-module-resolver": "^5.0.0",
-    "babel-plugin-react-compiler": "^19.0.0-beta-a7bf2bd-20241110",
+    "babel-plugin-react-compiler": "^0.0.0-experimental-592953e-20240517",
    "babel-plugin-react-native-web": "^0.18.12",
    "babel-preset-expo": "^10.0.0",
    "eslint": "^8.19.0",
@@ -251,10 +251,9 @@
    "eslint-plugin-ft-flow": "^2.0.3",
    "eslint-plugin-lingui": "^0.2.0",
    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-compiler": "^19.0.0-beta-a7bf2bd-20241110",
+    "eslint-plugin-react-compiler": "^0.0.0-experimental-c8b3f72-20240517",
    "eslint-plugin-react-native-a11y": "^3.3.0",
    "eslint-plugin-simple-import-sort": "^12.0.0",
-    "file-loader": "6.2.0",
    "html-webpack-plugin": "^5.5.0",
    "husky": "^8.0.3",
    "is-ci": "^3.0.1",
@@ -266,6 +265,7 @@
    "prettier": "^2.8.3",
    "react-native-dotenv": "^3.3.1",
    "react-refresh": "^0.14.0",
+    "react-scripts": "^5.0.1",
    "react-test-renderer": "18.2.0",
    "svgo": "^3.3.2",
    "ts-node": "^10.9.1",
@@ -9,7 +9,7 @@ index caa5540..c5d4e67 100644
 -                                                  type != nil && [type length] > 0 ? type : @"application/octet-stream",
 +                                                  ![type isEqual:[NSNull null]] && [type length] > 0 ? type : @"application/octet-stream",
                                                   [data base64EncodedStringWithOptions:0]];
- 
+
       resolve(text);
 diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
 index b0d71dc..41b9a0e 100644
@@ -18,7 +18,7 @@ index b0d71dc..41b9a0e 100644
@@ -377,10 +377,6 @@ - (void)textInputDidBeginEditing
     self.backedTextInputView.attributedText = [NSAttributedString new];
   }
- 
+
 -  if (_selectTextOnFocus) {
 -    [self.backedTextInputView selectAll:nil];
 -  }
@@ -35,7 +35,7 @@ index b0d71dc..41b9a0e 100644
 +    [self.backedTextInputView selectAll:nil];
 +  }
 }
- 
+
 - (void)reactBlur
 diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
 index e9b330f..ec5f58c 100644
@@ -48,10 +48,10 @@ index e9b330f..ec5f58c 100644
 +@property (nonatomic, copy) UIColor *customTintColor;
 +
 +- (void)forwarderBeginRefreshing;
- 
+
 @end
 diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-index b09e653..d2b4e05 100644
+index b09e653..288e60c 100644
 --- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
 +++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
@@ -22,6 +22,7 @@ @implementation RCTRefreshControl {
@@ -60,12 +60,12 @@ index b09e653..d2b4e05 100644
   CGFloat _progressViewOffset;
 +  UIColor *_customTintColor;
 }
- 
+
 - (instancetype)init
@@ -56,6 +57,12 @@ - (void)layoutSubviews
   _isInitialRender = false;
 }
- 
+
 +- (void)didMoveToSuperview
 +{
 +  [super didMoveToSuperview];
@@ -78,7 +78,7 @@ index b09e653..d2b4e05 100644
@@ -203,4 +210,58 @@ - (void)refreshControlValueChanged
   }
 }
- 
+
 +- (void)setCustomTintColor:(UIColor *)customTintColor
 +{
 +  _customTintColor = customTintColor;
@@ -139,139 +139,26 @@ index 40aaf9c..1c60164 100644
 --- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
 +++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m
@@ -22,11 +22,12 @@ - (UIView *)view
- 
+
 RCT_EXPORT_VIEW_PROPERTY(onRefresh, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(refreshing, BOOL)
 -RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(title, NSString)
 RCT_EXPORT_VIEW_PROPERTY(titleColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(progressViewOffset, CGFloat)
- 
+
 +RCT_REMAP_VIEW_PROPERTY(tintColor, customTintColor, UIColor)
 +
 RCT_EXPORT_METHOD(setNativeRefreshing : (nonnull NSNumber *)viewTag toRefreshing : (BOOL)refreshing)
 {
   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-diff --git a/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m b/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
-index 1aead51..39e6244 100644
--- a/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
-+++ b/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
-@@ -159,31 +159,6 @@ - (BOOL)touchesShouldCancelInContentView:(__unused UIView *)view
-   return !shouldDisableScrollInteraction;
- }
- 
-/*
- * Automatically centers the content such that if the content is smaller than the
- * ScrollView, we force it to be centered, but when you zoom or the content otherwise
- * becomes larger than the ScrollView, there is no padding around the content but it
- * can still fill the whole view.
- */
-- (void)setContentOffset:(CGPoint)contentOffset
-{
-  UIView *contentView = [self contentView];
-  if (contentView && _centerContent && !CGSizeEqualToSize(contentView.frame.size, CGSizeZero)) {
-    CGSize subviewSize = contentView.frame.size;
-    CGSize scrollViewSize = self.bounds.size;
-    if (subviewSize.width <= scrollViewSize.width) {
-      contentOffset.x = -(scrollViewSize.width - subviewSize.width) / 2.0;
-    }
-    if (subviewSize.height <= scrollViewSize.height) {
-      contentOffset.y = -(scrollViewSize.height - subviewSize.height) / 2.0;
-    }
-  }
-
-  super.contentOffset = CGPointMake(
-      RCTSanitizeNaNValue(contentOffset.x, @"scrollView.contentOffset.x"),
-      RCTSanitizeNaNValue(contentOffset.y, @"scrollView.contentOffset.y"));
-}
-
- - (void)setFrame:(CGRect)frame
- {
-   // Preserving and revalidating `contentOffset`.
-@@ -427,6 +402,11 @@ - (void)setRemoveClippedSubviews:(__unused BOOL)removeClippedSubviews
-   // Does nothing
- }
- 
-+- (void)setFrame:(CGRect)frame {
-+  [super setFrame:frame];
-+  [self centerContentIfNeeded];
-+}
-+
- - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
- {
-   [super insertReactSubview:view atIndex:atIndex];
-@@ -444,6 +424,8 @@ - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
-     RCTApplyTransformationAccordingLayoutDirection(_contentView, self.reactLayoutDirection);
-     [_scrollView addSubview:view];
-   }
-+
-+  [self centerContentIfNeeded];
- }
- 
- - (void)removeReactSubview:(UIView *)subview
-@@ -652,9 +634,46 @@ -(void)delegateMethod : (UIScrollView *)scrollView        \
-   }
- 
- RCT_SCROLL_EVENT_HANDLER(scrollViewWillBeginDecelerating, onMomentumScrollBegin)
-RCT_SCROLL_EVENT_HANDLER(scrollViewDidZoom, onScroll)
- RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
- 
-+-(void)scrollViewDidZoom : (UIScrollView *)scrollView
-+{
-+  [self centerContentIfNeeded];
-+
-+  RCT_SEND_SCROLL_EVENT(onScroll, nil);
-+  RCT_FORWARD_SCROLL_EVENT(scrollViewDidZoom : scrollView);
-+}
-+
-+/*
-+ * Automatically centers the content such that if the content is smaller than the
-+ * ScrollView, we force it to be centered, but when you zoom or the content otherwise
-+ * becomes larger than the ScrollView, there is no padding around the content but it
-+ * can still fill the whole view.
-+ *
-+ * PATCHED: This deviates from the original React Native implementation to fix two issues:
-+ *
-+ * - The scroll view was swallowing any taps immediately after pinching
-+ * - The scroll view was jittering when crossing the full screen threshold while pinching
-+ *
-+ * This implementation is based on https://petersteinberger.com/blog/2013/how-to-center-uiscrollview/.
-+ */
-+-(void)centerContentIfNeeded
-+{
-+  if (_scrollView.centerContent &&
-+      !CGSizeEqualToSize(self.contentSize, CGSizeZero) &&
-+      !CGSizeEqualToSize(self.bounds.size, CGSizeZero)
-+  ) {
-+    CGFloat top = 0, left = 0;
-+    if (self.contentSize.width < self.bounds.size.width) {
-+      left = (self.bounds.size.width - self.contentSize.width) * 0.5f;
-+    }
-+    if (self.contentSize.height < self.bounds.size.height) {
-+      top = (self.bounds.size.height - self.contentSize.height) * 0.5f;
-+    }
-+    _scrollView.contentInset = UIEdgeInsetsMake(top, left, top, left);
-+  }
-+}
-+
- - (void)addScrollListener:(NSObject<UIScrollViewDelegate> *)scrollListener
- {
-   [_scrollListeners addObject:scrollListener];
-@@ -913,6 +932,7 @@ - (void)updateContentSizeIfNeeded
-   CGSize contentSize = self.contentSize;
-   if (!CGSizeEqualToSize(_scrollView.contentSize, contentSize)) {
-     _scrollView.contentSize = contentSize;
-+    [self centerContentIfNeeded];
-   }
- }
- 
 diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java
 index 5f5e1ab..aac00b6 100644
 --- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java
 +++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java
@@ -99,8 +99,9 @@ public class JavaTimerManager {
       }
- 
+
       // If the JS thread is busy for multiple frames we cancel any other pending runnable.
 -      if (mCurrentIdleCallbackRunnable != null) {
 -        mCurrentIdleCallbackRunnable.cancel();
@@ -279,5 +166,5 @@ index 5f5e1ab..aac00b6 100644
 +      if (currentRunnable != null) {
 +        currentRunnable.cancel();
       }
- 
+
       mCurrentIdleCallbackRunnable = new IdleCallbackRunnable(frameTimeNanos);
@@ -1,9 +0,0 @@
-'use strict'
-
-module.exports = {
-  target: '18',
-  environment: {
-    enableTreatRefLikeIdentifiersAsRefs: true,
-    validateRefAccessDuringRender: false, // TODO: Make it `true`.
-  },
-}
@@ -40,11 +40,14 @@ import {
  shouldRequestEmailConfirmation,
  snoozeEmailConfirmationPrompt,
 } from '#/state/shell/reminders'
+import {AccessibilitySettingsScreen} from '#/view/screens/AccessibilitySettings'
+import {AppPasswords} from '#/view/screens/AppPasswords'
 import {CommunityGuidelinesScreen} from '#/view/screens/CommunityGuidelines'
 import {CopyrightPolicyScreen} from '#/view/screens/CopyrightPolicy'
 import {DebugModScreen} from '#/view/screens/DebugMod'
 import {FeedsScreen} from '#/view/screens/Feeds'
 import {HomeScreen} from '#/view/screens/Home'
+import {LanguageSettingsScreen} from '#/view/screens/LanguageSettings'
 import {ListsScreen} from '#/view/screens/Lists'
 import {LogScreen} from '#/view/screens/Log'
 import {ModerationBlockedAccounts} from '#/view/screens/ModerationBlockedAccounts'
@@ -53,6 +56,9 @@ import {ModerationMutedAccounts} from '#/view/screens/ModerationMutedAccounts'
 import {NotFoundScreen} from '#/view/screens/NotFound'
 import {NotificationsScreen} from '#/view/screens/Notifications'
 import {PostThreadScreen} from '#/view/screens/PostThread'
+import {PreferencesExternalEmbeds} from '#/view/screens/PreferencesExternalEmbeds'
+import {PreferencesFollowingFeed} from '#/view/screens/PreferencesFollowingFeed'
+import {PreferencesThreads} from '#/view/screens/PreferencesThreads'
 import {PrivacyPolicyScreen} from '#/view/screens/PrivacyPolicy'
 import {ProfileScreen} from '#/view/screens/Profile'
 import {ProfileFeedScreen} from '#/view/screens/ProfileFeed'
@@ -62,6 +68,7 @@ import {ProfileFollowsScreen} from '#/view/screens/ProfileFollows'
 import {ProfileListScreen} from '#/view/screens/ProfileList'
 import {SavedFeeds} from '#/view/screens/SavedFeeds'
 import {SearchScreen} from '#/view/screens/Search'
+import {SettingsScreen} from '#/view/screens/Settings'
 import {Storybook} from '#/view/screens/Storybook'
 import {SupportScreen} from '#/view/screens/Support'
 import {TermsOfServiceScreen} from '#/view/screens/TermsOfService'
@@ -89,16 +96,9 @@ import {useTheme} from '#/alf'
 import {router} from '#/routes'
 import {Referrer} from '../modules/expo-bluesky-swiss-army'
 import {AboutSettingsScreen} from './screens/Settings/AboutSettings'
-import {AccessibilitySettingsScreen} from './screens/Settings/AccessibilitySettings'
 import {AccountSettingsScreen} from './screens/Settings/AccountSettings'
-import {AppPasswordsScreen} from './screens/Settings/AppPasswords'
 import {ContentAndMediaSettingsScreen} from './screens/Settings/ContentAndMediaSettings'
-import {ExternalMediaPreferencesScreen} from './screens/Settings/ExternalMediaPreferences'
-import {FollowingFeedPreferencesScreen} from './screens/Settings/FollowingFeedPreferences'
-import {LanguageSettingsScreen} from './screens/Settings/LanguageSettings'
 import {PrivacyAndSecuritySettingsScreen} from './screens/Settings/PrivacyAndSecuritySettings'
-import {SettingsScreen} from './screens/Settings/Settings'
-import {ThreadPreferencesScreen} from './screens/Settings/ThreadPreferences'

 const navigationRef = createNavigationContainerRef<AllNavigatorParams>()

@@ -285,7 +285,7 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
      />
      <Stack.Screen
        name="AppPasswords"
-        getComponent={() => AppPasswordsScreen}
+        getComponent={() => AppPasswords}
        options={{title: title(msg`App Passwords`), requireAuth: true}}
      />
      <Stack.Screen
@@ -295,7 +295,7 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
      />
      <Stack.Screen
        name="PreferencesFollowingFeed"
-        getComponent={() => FollowingFeedPreferencesScreen}
+        getComponent={() => PreferencesFollowingFeed}
        options={{
          title: title(msg`Following Feed Preferences`),
          requireAuth: true,
@@ -303,12 +303,12 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) {
      />
      <Stack.Screen
        name="PreferencesThreads"
-        getComponent={() => ThreadPreferencesScreen}
+        getComponent={() => PreferencesThreads}
        options={{title: title(msg`Threads Preferences`), requireAuth: true}}
      />
      <Stack.Screen
        name="PreferencesExternalEmbeds"
-        getComponent={() => ExternalMediaPreferencesScreen}
+        getComponent={() => PreferencesExternalEmbeds}
        options={{
          title: title(msg`External Media Preferences`),
          requireAuth: true,
@@ -696,7 +696,7 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
      onStateChange={() => {
        const routeName = getCurrentRouteName()
        if (routeName === 'Notifications') {
-          logEvent('router:navigate:notifications', {})
+          logEvent('router:navigate:notifications:sampled', {})
        }
      }}
      onReady={() => {
@@ -56,6 +56,7 @@ type Props = {
 const AnimatedLogo = Animated.createAnimatedComponent(Logo)

 export function Splash(props: React.PropsWithChildren<Props>) {
+  'use no memo'
  const insets = useSafeAreaInsets()
  const intro = useSharedValue(0)
  const outroLogo = useSharedValue(0)
@@ -80,40 +81,40 @@ export function Splash(props: React.PropsWithChildren<Props>) {
    return {
      transform: [
        {
-          scale: interpolate(intro.get(), [0, 1], [0.8, 1], 'clamp'),
+          scale: interpolate(intro.value, [0, 1], [0.8, 1], 'clamp'),
        },
        {
          scale: interpolate(
-            outroLogo.get(),
+            outroLogo.value,
            [0, 0.08, 1],
            [1, 0.8, 500],
            'clamp',
          ),
        },
      ],
-      opacity: interpolate(intro.get(), [0, 1], [0, 1], 'clamp'),
+      opacity: interpolate(intro.value, [0, 1], [0, 1], 'clamp'),
    }
  })
  const bottomLogoAnimation = useAnimatedStyle(() => {
    return {
-      opacity: interpolate(intro.get(), [0, 1], [0, 1], 'clamp'),
+      opacity: interpolate(intro.value, [0, 1], [0, 1], 'clamp'),
    }
  })
  const reducedLogoAnimation = useAnimatedStyle(() => {
    return {
      transform: [
        {
-          scale: interpolate(intro.get(), [0, 1], [0.8, 1], 'clamp'),
+          scale: interpolate(intro.value, [0, 1], [0.8, 1], 'clamp'),
        },
      ],
-      opacity: interpolate(intro.get(), [0, 1], [0, 1], 'clamp'),
+      opacity: interpolate(intro.value, [0, 1], [0, 1], 'clamp'),
    }
  })

  const logoWrapperAnimation = useAnimatedStyle(() => {
    return {
      opacity: interpolate(
-        outroAppOpacity.get(),
+        outroAppOpacity.value,
        [0, 0.1, 0.2, 1],
        [1, 1, 0, 0],
        'clamp',
@@ -125,11 +126,11 @@ export function Splash(props: React.PropsWithChildren<Props>) {
    return {
      transform: [
        {
-          scale: interpolate(outroApp.get(), [0, 1], [1.1, 1], 'clamp'),
+          scale: interpolate(outroApp.value, [0, 1], [1.1, 1], 'clamp'),
        },
      ],
      opacity: interpolate(
-        outroAppOpacity.get(),
+        outroAppOpacity.value,
        [0, 0.1, 0.2, 1],
        [0, 0, 1, 1],
        'clamp',
@@ -145,37 +146,29 @@ export function Splash(props: React.PropsWithChildren<Props>) {
    if (isReady) {
      SplashScreen.hideAsync()
        .then(() => {
-          intro.set(() =>
-            withTiming(
-              1,
-              {duration: 400, easing: Easing.out(Easing.cubic)},
-              async () => {
-                // set these values to check animation at specific point
-                // outroLogo.set(0.1)
-                // outroApp.set(0.1)
-                outroLogo.set(() =>
-                  withTiming(
-                    1,
-                    {duration: 1200, easing: Easing.in(Easing.cubic)},
-                    () => {
-                      runOnJS(onFinish)()
-                    },
-                  ),
-                )
-                outroApp.set(() =>
-                  withTiming(1, {
-                    duration: 1200,
-                    easing: Easing.inOut(Easing.cubic),
-                  }),
-                )
-                outroAppOpacity.set(() =>
-                  withTiming(1, {
-                    duration: 1200,
-                    easing: Easing.in(Easing.cubic),
-                  }),
-                )
-              },
-            ),
+          intro.value = withTiming(
+            1,
+            {duration: 400, easing: Easing.out(Easing.cubic)},
+            async () => {
+              // set these values to check animation at specific point
+              // outroLogo.value = 0.1
+              // outroApp.value = 0.1
+              outroLogo.value = withTiming(
+                1,
+                {duration: 1200, easing: Easing.in(Easing.cubic)},
+                () => {
+                  runOnJS(onFinish)()
+                },
+              )
+              outroApp.value = withTiming(1, {
+                duration: 1200,
+                easing: Easing.inOut(Easing.cubic),
+              })
+              outroAppOpacity.value = withTiming(1, {
+                duration: 1200,
+                easing: Easing.in(Easing.cubic),
+              })
+            },
          )
        })
        .catch(() => {})
@@ -103,32 +103,35 @@ export function ThemeProvider({
    })
  }, [])

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

 export function useAlf() {
@@ -1,76 +0,0 @@
-import React from 'react'
-import {View} from 'react-native'
-import {moderateProfile} from '@atproto/api'
-
-import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {useProfilesQuery} from '#/state/queries/profile'
-import {UserAvatar} from '#/view/com/util/UserAvatar'
-import {atoms as a, useTheme} from '#/alf'
-
-export function AvatarStack({
-  profiles,
-  size = 26,
-}: {
-  profiles: string[]
-  size?: number
-}) {
-  const halfSize = size / 2
-  const {data, error} = useProfilesQuery({handles: profiles})
-  const t = useTheme()
-  const moderationOpts = useModerationOpts()
-
-  if (error) {
-    console.error(error)
-    return null
-  }
-
-  const isPending = !data || !moderationOpts
-
-  const items = isPending
-    ? Array.from({length: profiles.length}).map((_, i) => ({
-        key: i,
-        profile: null,
-        moderation: null,
-      }))
-    : data.profiles.map(item => ({
-        key: item.did,
-        profile: item,
-        moderation: moderateProfile(item, moderationOpts),
-      }))
-
-  return (
-    <View
-      style={[
-        a.flex_row,
-        a.align_center,
-        a.relative,
-        {width: size + (items.length - 1) * halfSize},
-      ]}>
-      {items.map((item, i) => (
-        <View
-          key={item.key}
-          style={[
-            t.atoms.bg_contrast_25,
-            a.relative,
-            {
-              width: size,
-              height: size,
-              left: i * -halfSize,
-              borderWidth: 1,
-              borderColor: t.atoms.bg.backgroundColor,
-              borderRadius: 999,
-              zIndex: 3 - i,
-            },
-          ]}>
-          {item.profile && (
-            <UserAvatar
-              size={size - 2}
-              avatar={item.profile.avatar}
-              moderation={item.moderation.ui('avatar')}
-            />
-          )}
-        </View>
-      ))}
-    </View>
-  )
-}
@@ -29,10 +29,10 @@ export function useDialogControl(): DialogOuterProps['control'] {
  const {activeDialogs} = useDialogStateContext()

  React.useEffect(() => {
-    const map = activeDialogs.current
-    map.set(id, control)
+    activeDialogs.current.set(id, control)
    return () => {
-      map.delete(id)
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      activeDialogs.current.delete(id)
    }
  }, [id, activeDialogs])

@@ -32,7 +32,7 @@ export function Error({
  return (
    <CenteredView
      style={[
-        a.h_full_vh,
+        a.flex_1,
        a.align_center,
        a.gap_5xl,
        !gtMobile && a.justify_between,
@@ -17,12 +17,13 @@ export function Loader(props: Props) {
  const rotation = useSharedValue(0)

  const animatedStyles = useAnimatedStyle(() => ({
-    transform: [{rotate: rotation.get() + 'deg'}],
+    transform: [{rotate: rotation.value + 'deg'}],
  }))

  React.useEffect(() => {
-    rotation.set(() =>
-      withRepeat(withTiming(360, {duration: 500, easing: Easing.linear}), -1),
+    rotation.value = withRepeat(
+      withTiming(360, {duration: 500, easing: Easing.linear}),
+      -1,
    )
  }, [rotation])

@@ -283,8 +283,8 @@ export function DescriptionPlaceholder({
 export type FollowButtonProps = {
  profile: AppBskyActorDefs.ProfileViewBasic
  moderationOpts: ModerationOpts
-  logContext: LogEvents['profile:follow']['logContext'] &
-    LogEvents['profile:unfollow']['logContext']
+  logContext: LogEvents['profile:follow:sampled']['logContext'] &
+    LogEvents['profile:unfollow:sampled']['logContext']
 } & Partial<ButtonProps>

 export function FollowButton(props: FollowButtonProps) {
@@ -55,15 +55,13 @@ export const ProgressGuideToast = React.forwardRef<

    // animate the opacity then set isOpen to false when done
    const setIsntOpen = () => setIsOpen(false)
-    opacity.set(() =>
-      withTiming(
-        0,
-        {
-          duration: 400,
-          easing: Easing.out(Easing.cubic),
-        },
-        () => runOnJS(setIsntOpen)(),
-      ),
+    opacity.value = withTiming(
+      0,
+      {
+        duration: 400,
+        easing: Easing.out(Easing.cubic),
+      },
+      () => runOnJS(setIsntOpen)(),
    )
  }, [setIsOpen, opacity])

@@ -73,24 +71,20 @@ export const ProgressGuideToast = React.forwardRef<

    // animate the vertical translation, the opacity, and the checkmark
    const playCheckmark = () => animatedCheckRef.current?.play()
-    opacity.set(0)
-    opacity.set(() =>
-      withTiming(
-        1,
-        {
-          duration: 100,
-          easing: Easing.out(Easing.cubic),
-        },
-        () => runOnJS(playCheckmark)(),
-      ),
-    )
-    translateY.set(0)
-    translateY.set(() =>
-      withTiming(insets.top + 10, {
-        duration: 500,
+    opacity.value = 0
+    opacity.value = withTiming(
+      1,
+      {
+        duration: 100,
        easing: Easing.out(Easing.cubic),
-      }),
+      },
+      () => runOnJS(playCheckmark)(),
    )
+    translateY.value = 0
+    translateY.value = withTiming(insets.top + 10, {
+      duration: 500,
+      easing: Easing.out(Easing.cubic),
+    })

    // start the countdown timer to autoclose
    timeoutRef.current = setTimeout(close, visibleDuration || 5e3)
@@ -120,8 +114,8 @@ export const ProgressGuideToast = React.forwardRef<
  }, [winDim.width])

  const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{translateY: translateY.get()}],
-    opacity: opacity.get(),
+    transform: [{translateY: translateY.value}],
+    opacity: opacity.value,
  }))

  return (
@@ -14,7 +14,6 @@ import {InfiniteData, UseInfiniteQueryResult} from '@tanstack/react-query'

 import {useGenerateStarterPackMutation} from '#/lib/generate-starterpack'
 import {useBottomBarOffset} from '#/lib/hooks/useBottomBarOffset'
-import {useEmail} from '#/lib/hooks/useEmail'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {NavigationProp} from '#/lib/routes/types'
 import {parseStarterPackUri} from '#/lib/strings/starter-pack'
@@ -28,7 +27,6 @@ import {LinearGradientBackground} from '#/components/LinearGradientBackground'
 import {Loader} from '#/components/Loader'
 import * as Prompt from '#/components/Prompt'
 import {Default as StarterPackCard} from '#/components/StarterPack/StarterPackCard'
-import {VerifyEmailDialog} from '../dialogs/VerifyEmailDialog'
 import {PlusSmall_Stroke2_Corner0_Rounded as Plus} from '../icons/Plus'

 interface SectionRef {
@@ -188,9 +186,6 @@ function Empty() {
  const followersDialogControl = useDialogControl()
  const errorDialogControl = useDialogControl()

-  const {needsEmailVerification} = useEmail()
-  const verifyEmailControl = useDialogControl()
-
  const [isGenerating, setIsGenerating] = React.useState(false)

  const {mutate: generateStarterPack} = useGenerateStarterPackMutation({
@@ -254,13 +249,7 @@ function Empty() {
          color="primary"
          size="small"
          disabled={isGenerating}
-          onPress={() => {
-            if (needsEmailVerification) {
-              verifyEmailControl.open()
-            } else {
-              confirmDialogControl.open()
-            }
-          }}
+          onPress={confirmDialogControl.open}
          style={{backgroundColor: 'transparent'}}>
          <ButtonText style={{color: 'white'}}>
            <Trans>Make one for me</Trans>
@@ -273,13 +262,7 @@ function Empty() {
          color="primary"
          size="small"
          disabled={isGenerating}
-          onPress={() => {
-            if (needsEmailVerification) {
-              verifyEmailControl.open()
-            } else {
-              navigation.navigate('StarterPackWizard')
-            }
-          }}
+          onPress={() => navigation.navigate('StarterPackWizard')}
          style={{
            backgroundColor: 'white',
            borderColor: 'white',
@@ -335,12 +318,6 @@ function Empty() {
        onConfirm={generate}
        confirmButtonCta={_(msg`Retry`)}
      />
-      <VerifyEmailDialog
-        reasonText={_(
-          msg`Before creating a starter pack, you must first verify your email.`,
-        )}
-        control={verifyEmailControl}
-      />
    </LinearGradientBackground>
  )
 }
@@ -1,5 +1,3 @@
-import {ViewStyleProp} from '#/alf'
-
-export function SubtleWebHover({}: ViewStyleProp & {hover: boolean}) {
+export function SubtleWebHover({}: {hover: boolean}) {
  return null
 }
@@ -2,12 +2,9 @@ import React from 'react'
 import {StyleSheet, View} from 'react-native'

 import {isTouchDevice} from '#/lib/browser'
-import {useTheme, ViewStyleProp} from '#/alf'
+import {useTheme} from '#/alf'

-export function SubtleWebHover({
-  style,
-  hover,
-}: ViewStyleProp & {hover: boolean}) {
+export function SubtleWebHover({hover}: {hover: boolean}) {
  const t = useTheme()
  if (isTouchDevice) {
    return null
@@ -29,8 +26,9 @@ export function SubtleWebHover({
      style={[
        t.atoms.bg_contrast_25,
        styles.container,
-        {opacity: hover ? opacity : 0},
-        style,
+        {
+          opacity: hover ? opacity : 0,
+        },
      ]}
    />
  )
@@ -32,25 +32,21 @@ export const AnimatedCheck = React.forwardRef<
  const checkAnim = useSharedValue(0)

  const circleAnimatedProps = useAnimatedProps(() => ({
-    strokeDashoffset: 166 - circleAnim.get() * 166,
+    strokeDashoffset: 166 - circleAnim.value * 166,
  }))
  const checkAnimatedProps = useAnimatedProps(() => ({
-    strokeDashoffset: 48 - 48 * checkAnim.get(),
+    strokeDashoffset: 48 - 48 * checkAnim.value,
  }))

  const play = React.useCallback(
    (cb?: () => void) => {
-      circleAnim.set(0)
-      checkAnim.set(0)
+      circleAnim.value = 0
+      checkAnim.value = 0

-      circleAnim.set(() =>
-        withTiming(1, {duration: 500, easing: Easing.linear}),
-      )
-      checkAnim.set(() =>
-        withDelay(
-          500,
-          withTiming(1, {duration: 300, easing: Easing.linear}, cb),
-        ),
+      circleAnim.value = withTiming(1, {duration: 500, easing: Easing.linear})
+      checkAnim.value = withDelay(
+        500,
+        withTiming(1, {duration: 300, easing: Easing.linear}, cb),
      )
    },
    [circleAnim, checkAnim],
@@ -18,14 +18,8 @@ import {Text} from '#/components/Typography'

 export function VerifyEmailDialog({
  control,
-  onCloseWithoutVerifying,
-  onCloseAfterVerifying,
-  reasonText,
 }: {
  control: Dialog.DialogControlProps
-  onCloseWithoutVerifying?: () => void
-  onCloseAfterVerifying?: () => void
-  reasonText?: string
 }) {
  const agent = useAgent()

@@ -36,24 +30,18 @@ export function VerifyEmailDialog({
      control={control}
      onClose={async () => {
        if (!didVerify) {
-          onCloseWithoutVerifying?.()
          return
        }

        try {
          await agent.resumeSession(agent.session!)
-          onCloseAfterVerifying?.()
        } catch (e: unknown) {
          logger.error(String(e))
          return
        }
      }}>
      <Dialog.Handle />
-      <Inner
-        control={control}
-        setDidVerify={setDidVerify}
-        reasonText={reasonText}
-      />
+      <Inner control={control} setDidVerify={setDidVerify} />
    </Dialog.Outer>
  )
 }
@@ -61,11 +49,9 @@ export function VerifyEmailDialog({
 export function Inner({
  control,
  setDidVerify,
-  reasonText,
 }: {
  control: Dialog.DialogControlProps
  setDidVerify: (value: boolean) => void
-  reasonText?: string
 }) {
  const {_} = useLingui()
  const {currentAccount} = useSession()
@@ -146,63 +132,34 @@ export function Inner({
              <ErrorMessage message={error} />
            </View>
          ) : null}
-          {currentStep === 'StepOne' ? (
-            <View>
-              {reasonText ? (
-                <View style={[a.gap_sm]}>
-                  <Text style={[a.text_md, a.leading_snug]}>{reasonText}</Text>
-                  <Text style={[a.text_md, a.leading_snug]}>
-                    Don't have access to{' '}
-                    <Text style={[a.text_md, a.leading_snug, a.font_bold]}>
-                      {currentAccount?.email}
-                    </Text>
-                    ?{' '}
-                    <InlineLinkText
-                      to="#"
-                      label={_(msg`Change email address`)}
-                      style={[a.text_md, a.leading_snug]}
-                      onPress={e => {
-                        e.preventDefault()
-                        control.close(() => {
-                          openModal({name: 'change-email'})
-                        })
-                        return false
-                      }}>
-                      <Trans>Change your email address</Trans>
-                    </InlineLinkText>
-                    .
-                  </Text>
-                </View>
-              ) : (
-                <Text style={[a.text_md, a.leading_snug]}>
-                  <Trans>
-                    You'll receive an email at{' '}
-                    <Text style={[a.text_md, a.leading_snug, a.font_bold]}>
-                      {currentAccount?.email}
-                    </Text>{' '}
-                    to verify it's you.
-                  </Trans>{' '}
-                  <InlineLinkText
-                    to="#"
-                    label={_(msg`Change email address`)}
-                    style={[a.text_md, a.leading_snug]}
-                    onPress={e => {
-                      e.preventDefault()
-                      control.close(() => {
-                        openModal({name: 'change-email'})
-                      })
-                      return false
-                    }}>
-                    <Trans>Need to change it?</Trans>
-                  </InlineLinkText>
-                </Text>
-              )}
-            </View>
-          ) : (
-            <Text style={[a.text_md, a.leading_snug]}>
-              {uiStrings[currentStep].message}
-            </Text>
-          )}
+          <Text style={[a.text_md, a.leading_snug]}>
+            {currentStep === 'StepOne' ? (
+              <>
+                <Trans>
+                  You'll receive an email at{' '}
+                  <Text style={[a.text_md, a.leading_snug, a.font_bold]}>
+                    {currentAccount?.email}
+                  </Text>{' '}
+                  to verify it's you.
+                </Trans>{' '}
+                <InlineLinkText
+                  to="#"
+                  label={_(msg`Change email address`)}
+                  style={[a.text_md, a.leading_snug]}
+                  onPress={e => {
+                    e.preventDefault()
+                    control.close(() => {
+                      openModal({name: 'change-email'})
+                    })
+                    return false
+                  }}>
+                  <Trans>Need to change it?</Trans>
+                </InlineLinkText>
+              </>
+            ) : (
+              uiStrings[currentStep].message
+            )}
+          </Text>
        </View>
        {currentStep === 'StepTwo' ? (
          <View>
@@ -0,0 +1,117 @@
+import React from 'react'
+import {View} from 'react-native'
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {AppearanceToggleButtonGroup} from '#/screens/Settings/AppearanceSettings'
+import {atoms as a, useAlf, useTheme} from '#/alf'
+import * as Dialog from '#/components/Dialog'
+import {useNuxDialogContext} from '#/components/dialogs/nuxs'
+import {Divider} from '#/components/Divider'
+import {TextSize_Stroke2_Corner0_Rounded as TextSize} from '#/components/icons/TextSize'
+import {TitleCase_Stroke2_Corner0_Rounded as Aa} from '#/components/icons/TitleCase'
+import {Text} from '#/components/Typography'
+
+export function NeueTypography() {
+  const t = useTheme()
+  const {_} = useLingui()
+  const nuxDialogs = useNuxDialogContext()
+  const control = Dialog.useDialogControl()
+  const {fonts} = useAlf()
+
+  Dialog.useAutoOpen(control, 3e3)
+
+  const onClose = React.useCallback(() => {
+    nuxDialogs.dismissActiveNux()
+  }, [nuxDialogs])
+
+  const onChangeFontFamily = React.useCallback(
+    (values: string[]) => {
+      const next = values[0] === 'system' ? 'system' : 'theme'
+      fonts.setFontFamily(next)
+    },
+    [fonts],
+  )
+
+  const onChangeFontScale = React.useCallback(
+    (values: string[]) => {
+      const next = values[0] || ('0' as any)
+      fonts.setFontScale(next)
+    },
+    [fonts],
+  )
+
+  return (
+    <Dialog.Outer control={control} onClose={onClose}>
+      <Dialog.Handle />
+      <Dialog.ScrollableInner label={_(msg`Introducing new font settings`)}>
+        <View style={[a.gap_xl]}>
+          <View style={[a.gap_md]}>
+            <Text style={[a.text_3xl, a.font_heavy]}>
+              <Trans>New font settings ✨</Trans>
+            </Text>
+            <Text style={[a.text_lg, a.leading_snug, {maxWidth: 400}]}>
+              <Trans>
+                We're introducing a new theme font, along with adjustable font
+                sizing.
+              </Trans>
+            </Text>
+            <Text
+              style={[a.text_sm, a.leading_snug, t.atoms.text_contrast_medium]}>
+              <Trans>
+                You can adjust these in your Appearance Settings later.
+              </Trans>
+            </Text>
+          </View>
+
+          <Divider />
+
+          <View style={[a.gap_lg]}>
+            <AppearanceToggleButtonGroup
+              title={_(msg`Font`)}
+              description={_(
+                msg`For the best experience, we recommend using the theme font.`,
+              )}
+              icon={Aa}
+              items={[
+                {
+                  label: _(msg`System`),
+                  name: 'system',
+                },
+                {
+                  label: _(msg`Theme`),
+                  name: 'theme',
+                },
+              ]}
+              values={[fonts.family]}
+              onChange={onChangeFontFamily}
+            />
+
+            <AppearanceToggleButtonGroup
+              title={_(msg`Font size`)}
+              icon={TextSize}
+              items={[
+                {
+                  label: _(msg`Smaller`),
+                  name: '-1',
+                },
+                {
+                  label: _(msg`Default`),
+                  name: '0',
+                },
+                {
+                  label: _(msg`Larger`),
+                  name: '1',
+                },
+              ]}
+              values={[fonts.scale]}
+              onChange={onChangeFontScale}
+            />
+          </View>
+        </View>
+
+        <Dialog.Close />
+      </Dialog.ScrollableInner>
+    </Dialog.Outer>
+  )
+}
@@ -19,6 +19,7 @@ import {useOnboardingState} from '#/state/shell'
 /*
 * NUXs
 */
+import {NeueTypography} from '#/components/dialogs/nuxs/NeueTypography'
 import {isSnoozed, snooze, unsnooze} from '#/components/dialogs/nuxs/snoozing'
 import {IS_DEV} from '#/env'

@@ -35,7 +36,19 @@ const queuedNuxs: {
    currentProfile: AppBskyActorDefs.ProfileViewDetailed
    preferences: UsePreferencesQueryResponse
  }) => boolean
-}[] = []
+}[] = [
+  {
+    id: Nux.NeueTypography,
+    enabled(props) {
+      if (props.currentProfile.createdAt) {
+        if (new Date(props.currentProfile.createdAt) < new Date('2024-10-09')) {
+          return true
+        }
+      }
+      return false
+    },
+  },
+]

 const Context = React.createContext<Context>({
  activeNux: undefined,
@@ -53,14 +66,7 @@ export function NuxDialogs() {
  const onboardingActive = useOnboardingState().isActive

  const isLoading =
-    onboardingActive ||
-    !currentAccount ||
-    !preferences ||
-    !profile ||
-    // Profile isn't legit ready until createdAt is a real date.
-    !profile.createdAt ||
-    profile.createdAt === '0001-01-01T00:00:00.000Z' // TODO: Fix this in AppView.
-
+    !currentAccount || !preferences || !profile || onboardingActive
  return !isLoading ? (
    <Inner
      currentAccount={currentAccount}
@@ -100,7 +106,6 @@ function Inner({

  if (IS_DEV && typeof window !== 'undefined') {
    // @ts-ignore
-    // eslint-disable-next-line react-compiler/react-compiler
    window.clearNuxDialog = (id: Nux) => {
      if (!IS_DEV || !id) return
      removeNuxs([id])
@@ -169,7 +174,7 @@ function Inner({

  return (
    <Context.Provider value={ctx}>
-      {/*For example, activeNux === Nux.NeueTypography && <NeueTypography />*/}
+      {activeNux === Nux.NeueTypography && <NeueTypography />}
    </Context.Provider>
  )
 }
@@ -34,7 +34,7 @@ export function ActionsWrapper({
  const scale = useSharedValue(1)

  const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{scale: scale.get()}],
+    transform: [{scale: scale.value}],
  }))

  const open = React.useCallback(() => {
@@ -46,7 +46,7 @@ export function ActionsWrapper({
  const shrink = React.useCallback(() => {
    'worklet'
    cancelAnimation(scale)
-    scale.set(() => withTiming(1, {duration: 200}))
+    scale.value = withTiming(1, {duration: 200})
  }, [scale])

  const doubleTapGesture = Gesture.Tap()
@@ -58,13 +58,11 @@ export function ActionsWrapper({
  const pressAndHoldGesture = Gesture.LongPress()
    .onStart(() => {
      'worklet'
-      scale.set(() =>
-        withTiming(1.05, {duration: 200}, finished => {
-          if (!finished) return
-          runOnJS(open)()
-          shrink()
-        }),
-      )
+      scale.value = withTiming(1.05, {duration: 200}, finished => {
+        if (!finished) return
+        runOnJS(open)()
+        shrink()
+      })
    })
    .onTouchesUp(shrink)
    .onTouchesMove(shrink)
@@ -42,12 +42,12 @@ export function ChatEmptyPill() {

  const onPressIn = React.useCallback(() => {
    if (isWeb) return
-    scale.set(() => withTiming(1.075, {duration: 100}))
+    scale.value = withTiming(1.075, {duration: 100})
  }, [scale])

  const onPressOut = React.useCallback(() => {
    if (isWeb) return
-    scale.set(() => withTiming(1, {duration: 100}))
+    scale.value = withTiming(1, {duration: 100})
  }, [scale])

  const onPress = React.useCallback(() => {
@@ -61,7 +61,7 @@ export function ChatEmptyPill() {
  }, [playHaptic, prompts.length])

  const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{scale: scale.get()}],
+    transform: [{scale: scale.value}],
  }))

  return (
@@ -62,7 +62,7 @@ export let MessageMenu = ({
      message.text,
      langPrefs.primaryLanguage,
    )
-    openLink(translatorUrl, true)
+    openLink(translatorUrl)
  }, [langPrefs.primaryLanguage, message.text, openLink])

  const onDelete = React.useCallback(() => {
@@ -3,18 +3,14 @@ import {View} from 'react-native'
 import {AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {useNavigation} from '@react-navigation/native'

-import {useEmail} from '#/lib/hooks/useEmail'
-import {NavigationProp} from '#/lib/routes/types'
 import {logEvent} from '#/lib/statsig/statsig'
 import {useMaybeConvoForUser} from '#/state/queries/messages/get-convo-for-members'
 import {atoms as a, useTheme} from '#/alf'
-import {Button, ButtonIcon} from '#/components/Button'
+import {ButtonIcon} from '#/components/Button'
 import {canBeMessaged} from '#/components/dms/util'
 import {Message_Stroke2_Corner0_Rounded as Message} from '#/components/icons/Message'
-import {useDialogControl} from '../Dialog'
-import {VerifyEmailDialog} from '../dialogs/VerifyEmailDialog'
+import {Link} from '#/components/Link'

 export function MessageProfileButton({
  profile,
@@ -23,29 +19,15 @@ export function MessageProfileButton({
 }) {
  const {_} = useLingui()
  const t = useTheme()
-  const navigation = useNavigation<NavigationProp>()
-  const {needsEmailVerification} = useEmail()
-  const verifyEmailControl = useDialogControl()

  const {data: convo, isPending} = useMaybeConvoForUser(profile.did)

  const onPress = React.useCallback(() => {
-    if (!convo?.id) {
-      return
-    }
-
-    if (needsEmailVerification) {
-      verifyEmailControl.open()
-      return
-    }
-
    if (convo && !convo.lastMessage) {
      logEvent('chat:create', {logContext: 'ProfileHeader'})
    }
    logEvent('chat:open', {logContext: 'ProfileHeader'})
-
-    navigation.navigate('MessagesConversation', {conversation: convo.id})
-  }, [needsEmailVerification, verifyEmailControl, convo, navigation])
+  }, [convo])

  if (isPending) {
    // show pending state based on declaration
@@ -71,26 +53,18 @@ export function MessageProfileButton({

  if (convo) {
    return (
-      <>
-        <Button
-          accessibilityRole="button"
-          testID="dmBtn"
-          size="small"
-          color="secondary"
-          variant="solid"
-          shape="round"
-          label={_(msg`Message ${profile.handle}`)}
-          style={[a.justify_center]}
-          onPress={onPress}>
-          <ButtonIcon icon={Message} size="md" />
-        </Button>
-        <VerifyEmailDialog
-          reasonText={_(
-            msg`Before you may message another user, you must first verify your email.`,
-          )}
-          control={verifyEmailControl}
-        />
-      </>
+      <Link
+        testID="dmBtn"
+        size="small"
+        color="secondary"
+        variant="solid"
+        shape="round"
+        label={_(msg`Message ${profile.handle}`)}
+        to={`/messages/${convo.id}`}
+        style={[a.justify_center]}
+        onPress={onPress}>
+        <ButtonIcon icon={Message} size="md" />
+      </Link>
    )
  } else {
    return null
@@ -147,7 +147,7 @@ function HeaderReady({

  const isDeletedAccount = profile?.handle === 'missing.invalid'
  const displayName = isDeletedAccount
-    ? _(msg`Deleted Account`)
+    ? 'Deleted Account'
    : sanitizeDisplayName(
        profile.displayName || profile.handle,
        moderation.ui('displayName'),
@@ -35,12 +35,12 @@ export function NewMessagesPill({

  const onPressIn = React.useCallback(() => {
    if (isWeb) return
-    scale.set(() => withTiming(1.075, {duration: 100}))
+    scale.value = withTiming(1.075, {duration: 100})
  }, [scale])

  const onPressOut = React.useCallback(() => {
    if (isWeb) return
-    scale.set(() => withTiming(1, {duration: 100}))
+    scale.value = withTiming(1, {duration: 100})
  }, [scale])

  const onPress = React.useCallback(() => {
@@ -49,7 +49,7 @@ export function NewMessagesPill({
  }, [onPressInner, playHaptic])

  const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{scale: scale.get()}],
+    transform: [{scale: scale.value}],
  }))

  return (
@@ -2,7 +2,6 @@ import React, {useCallback} from 'react'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'

-import {useEmail} from '#/lib/hooks/useEmail'
 import {logEvent} from '#/lib/statsig/statsig'
 import {logger} from '#/logger'
 import {useGetConvoForMembers} from '#/state/queries/messages/get-convo-for-members'
@@ -10,8 +9,6 @@ import {FAB} from '#/view/com/util/fab/FAB'
 import * as Toast from '#/view/com/util/Toast'
 import {useTheme} from '#/alf'
 import * as Dialog from '#/components/Dialog'
-import {useDialogControl} from '#/components/Dialog'
-import {VerifyEmailDialog} from '#/components/dialogs/VerifyEmailDialog'
 import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus'
 import {SearchablePeopleList} from './SearchablePeopleList'

@@ -24,8 +21,6 @@ export function NewChat({
 }) {
  const t = useTheme()
  const {_} = useLingui()
-  const {needsEmailVerification} = useEmail()
-  const verifyEmailControl = useDialogControl()

  const {mutate: createChat} = useGetConvoForMembers({
    onSuccess: data => {
@@ -53,13 +48,7 @@ export function NewChat({
    <>
      <FAB
        testID="newChatFAB"
-        onPress={() => {
-          if (needsEmailVerification) {
-            verifyEmailControl.open()
-          } else {
-            control.open()
-          }
-        }}
+        onPress={control.open}
        icon={<Plus size="lg" fill={t.palette.white} />}
        accessibilityRole="button"
        accessibilityLabel={_(msg`New chat`)}
@@ -73,13 +62,6 @@ export function NewChat({
          onSelectChat={onCreateChat}
        />
      </Dialog.Outer>
-
-      <VerifyEmailDialog
-        reasonText={_(
-          msg`Before you may message another user, you must first verify your email.`,
-        )}
-        control={verifyEmailControl}
-      />
    </>
  )
 }
@@ -278,7 +278,7 @@ export function SearchablePeopleList({
          ) : null}
        </View>

-        <View style={web([a.pt_xs])}>
+        <View style={[, web([a.pt_xs])]}>
          <SearchInput
            inputRef={inputRef}
            value={searchText}
@@ -313,7 +313,6 @@ export function SearchablePeopleList({
        web([a.py_0, {height: '100vh', maxHeight: 600}, a.px_0]),
        native({height: '100%'}),
      ]}
-      webInnerContentContainerStyle={a.py_0}
      webInnerStyle={[a.py_0, {maxWidth: 500, minWidth: 200}]}
      keyboardDismissMode="on-drag"
    />
@@ -15,8 +15,8 @@ export function useFollowMethods({
  logContext,
 }: {
  profile: Shadow<AppBskyActorDefs.ProfileViewBasic>
-  logContext: LogEvents['profile:follow']['logContext'] &
-    LogEvents['profile:unfollow']['logContext']
+  logContext: LogEvents['profile:follow:sampled']['logContext'] &
+    LogEvents['profile:unfollow:sampled']['logContext']
 }) {
  const {_} = useLingui()
  const requireAuth = useRequireAuth()
@@ -1,5 +0,0 @@
-import {createSinglePathSVG} from './TEMPLATE'
-
-export const CalendarClock_Stroke2_Corner0_Rounded = createSinglePathSVG({
-  path: 'M15.439 3.148a1 1 0 0 1 .41.645l.568 3.22a7 7 0 1 1-6.174 10.97L4.32 19.027a1 1 0 0 1-1.159-.811L1.078 6.398a1 1 0 0 1 .81-1.158l12.803-2.258a1 1 0 0 1 .748.166ZM9.325 16.114A7 7 0 0 1 9 14c0-1.56.51-3 1.372-4.164l-6.456 1.139 1.041 5.909 4.368-.77ZM3.568 9.005l10.833-1.91-.347-1.97L3.22 7.036l.347 1.97ZM16 9a5 5 0 1 0 0 10 5 5 0 0 0 0-10Zm0 2a1 1 0 0 1 1 1v1.586l1.374 1.374a1 1 0 0 1-1.414 1.414l-1.667-1.667A1 1 0 0 1 15 14v-2a1 1 0 0 1 1-1Z',
-})
@@ -24,10 +24,6 @@ export const PersonPlus_Filled_Stroke2_Corner0_Rounded = createSinglePathSVG({
  path: 'M7.5 6.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM12 12c-4.758 0-8.083 3.521-8.496 7.906A1 1 0 0 0 4.5 21H15a3 3 0 1 1 0-6c0-.824.332-1.571.87-2.113C14.739 12.32 13.435 12 12 12Zm6 2a1 1 0 0 1 1 1v2h2a1 1 0 1 1 0 2h-2v2a1 1 0 1 1-2 0v-2h-2a1 1 0 1 1 0-2h2v-2a1 1 0 0 1 1-1Z',
 })

-export const PersonPlus_Stroke2_Corner2_Rounded = createSinglePathSVG({
-  path: 'M12 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM7.5 6.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM12 14c-2.95 0-5.163 1.733-6.08 4.21a.47.47 0 0 0 .09.493.9.9 0 0 0 .687.297H11a1 1 0 1 1 0 2H6.697a2.9 2.9 0 0 1-2.219-1.011 2.46 2.46 0 0 1-.433-2.473C5.235 14.296 8.168 12 12 12c.787 0 1.54.097 2.252.282a1 1 0 1 1-.504 1.936A7 7 0 0 0 12 14Zm6 0a1 1 0 0 1 1 1v2h2a1 1 0 1 1 0 2h-2v2a1 1 0 1 1-2 0v-2h-2a1 1 0 1 1 0-2h2v-2a1 1 0 0 1 1-1Z',
-})
-
 export const PersonGroup_Stroke2_Corner2_Rounded = createSinglePathSVG({
  path: 'M8 5a2 2 0 1 0 0 4 2 2 0 0 0 0-4ZM4 7a4 4 0 1 1 8 0 4 4 0 0 1-8 0Zm13-1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Zm-3.5 1.5a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0Zm7.301 9.7c-.836-2.6-2.88-3.503-4.575-3.111a1 1 0 0 1-.451-1.949c2.815-.651 5.81.966 6.93 4.448a2.49 2.49 0 0 1-.506 2.43A2.92 2.92 0 0 1 20 20h-2a1 1 0 1 1 0-2h2a.92.92 0 0 0 .69-.295.49.49 0 0 0 .112-.505ZM8 14c-1.865 0-3.878 1.274-4.681 4.151a.57.57 0 0 0 .132.55c.15.171.4.299.695.299h7.708a.93.93 0 0 0 .695-.299.57.57 0 0 0 .132-.55C11.878 15.274 9.865 14 8 14Zm0-2c2.87 0 5.594 1.98 6.607 5.613.53 1.9-1.09 3.387-2.753 3.387H4.146c-1.663 0-3.283-1.487-2.753-3.387C2.406 13.981 5.129 12 8 12Z',
 })
@@ -68,8 +68,6 @@ export function ContentHider({
          if (hasAdultContentLabel) {
            return false
          }
-          // https://github.com/facebook/react/issues/31569
-          // eslint-disable-next-line react-compiler/react-compiler
          hasAdultContentLabel = true
        }
        return true
@@ -22,7 +22,7 @@ export function Outer({children}: React.PropsWithChildren<{}>) {
    <View
      style={[
        a.flex_row,
-        a.gap_sm,
+        a.gap_md,
        a.px_lg,
        a.py_lg,
        a.justify_between,
@@ -74,9 +74,10 @@ export function Buttons({
  hideLabel?: string
 }) {
  const {_} = useLingui()
+  const {gtPhone} = useBreakpoints()

  return (
-    <View style={[{minHeight: 35}, a.w_full]}>
+    <View style={[{minHeight: 35}, gtPhone ? undefined : a.w_full]}>
      <ToggleButton.Group
        label={_(
          msg`Configure content filtering setting for category: ${name}`,
@@ -258,7 +259,7 @@ export function LabelerLabelPreference({
      </Content>

      {showConfig && (
-        <>
+        <View style={[gtPhone ? undefined : a.w_full]}>
          {cantConfigure ? (
            <View
              style={[
@@ -289,7 +290,7 @@ export function LabelerLabelPreference({
              hideLabel={hideLabel}
            />
          )}
-        </>
+        </View>
      )}
    </Outer>
  )
@@ -21,7 +21,7 @@ export const STARTER_PACK_MAX_SIZE = 150
 // code and update this number with each release until we can get the
 // server route done.
 // -prf
-export const JOINED_THIS_WEEK = 3500000 // estimate as of 11/16/24
+export const JOINED_THIS_WEEK = 650000 // estimate as of 10/28/24

 export const DISCOVER_DEBUG_DIDS: Record<string, true> = {
  'did:plc:oisofpd7lj26yvgiivf3lxsi': true, // hailey.at
@@ -61,7 +61,7 @@ export function GestureActionView({
  const clampedTransX = useDerivedValue(() => {
    const min = actions.leftFirst ? -MAX_WIDTH : 0
    const max = actions.rightFirst ? MAX_WIDTH : 0
-    return clamp(transX.get(), min, max)
+    return clamp(transX.value, min, max)
  })

  const iconScale = useSharedValue(1)
@@ -75,23 +75,21 @@ export function GestureActionView({
      return
    }

-    iconScale.set(() =>
-      withSequence(
-        withTiming(1.2, {duration: 175}),
-        withTiming(1, {duration: 100}),
-      ),
+    iconScale.value = withSequence(
+      withTiming(1.2, {duration: 175}),
+      withTiming(1, {duration: 100}),
    )
  }

  useAnimatedReaction(
    () => transX,
    () => {
-      if (transX.get() === 0) {
+      if (transX.value === 0) {
        runOnJS(setActiveAction)(null)
-      } else if (transX.get() < 0) {
+      } else if (transX.value < 0) {
        if (
          actions.leftSecond &&
-          transX.get() <= -actions.leftSecond.threshold
+          transX.value <= -actions.leftSecond.threshold
        ) {
          if (activeAction !== 'leftSecond') {
            runOnJS(setActiveAction)('leftSecond')
@@ -99,10 +97,10 @@ export function GestureActionView({
        } else if (activeAction !== 'leftFirst') {
          runOnJS(setActiveAction)('leftFirst')
        }
-      } else if (transX.get() > 0) {
+      } else if (transX.value > 0) {
        if (
          actions.rightSecond &&
-          transX.get() > actions.rightSecond.threshold
+          transX.value > actions.rightSecond.threshold
        ) {
          if (activeAction !== 'rightSecond') {
            runOnJS(setActiveAction)('rightSecond')
@@ -121,44 +119,44 @@ export function GestureActionView({
    .activeOffsetY([-200, 200])
    .onStart(() => {
      'worklet'
-      isActive.set(true)
+      isActive.value = true
    })
    .onChange(e => {
      'worklet'
-      transX.set(e.translationX)
+      transX.value = e.translationX

      if (e.translationX < 0) {
        // Left side
        if (actions.leftSecond) {
          if (
            e.translationX <= -actions.leftSecond.threshold &&
-            !hitSecond.get()
+            !hitSecond.value
          ) {
            runPopAnimation()
            runOnJS(haptic)()
-            hitSecond.set(true)
+            hitSecond.value = true
          } else if (
-            hitSecond.get() &&
+            hitSecond.value &&
            e.translationX > -actions.leftSecond.threshold
          ) {
            runPopAnimation()
-            hitSecond.set(false)
+            hitSecond.value = false
          }
        }

-        if (!hitSecond.get() && actions.leftFirst) {
+        if (!hitSecond.value && actions.leftFirst) {
          if (
            e.translationX <= -actions.leftFirst.threshold &&
-            !hitFirst.get()
+            !hitFirst.value
          ) {
            runPopAnimation()
            runOnJS(haptic)()
-            hitFirst.set(true)
+            hitFirst.value = true
          } else if (
-            hitFirst.get() &&
+            hitFirst.value &&
            e.translationX > -actions.leftFirst.threshold
          ) {
-            hitFirst.set(false)
+            hitFirst.value = false
          }
        }
      } else if (e.translationX > 0) {
@@ -166,33 +164,33 @@ export function GestureActionView({
        if (actions.rightSecond) {
          if (
            e.translationX >= actions.rightSecond.threshold &&
-            !hitSecond.get()
+            !hitSecond.value
          ) {
            runPopAnimation()
            runOnJS(haptic)()
-            hitSecond.set(true)
+            hitSecond.value = true
          } else if (
-            hitSecond.get() &&
+            hitSecond.value &&
            e.translationX < actions.rightSecond.threshold
          ) {
            runPopAnimation()
-            hitSecond.set(false)
+            hitSecond.value = false
          }
        }

-        if (!hitSecond.get() && actions.rightFirst) {
+        if (!hitSecond.value && actions.rightFirst) {
          if (
            e.translationX >= actions.rightFirst.threshold &&
-            !hitFirst.get()
+            !hitFirst.value
          ) {
            runPopAnimation()
            runOnJS(haptic)()
-            hitFirst.set(true)
+            hitFirst.value = true
          } else if (
-            hitFirst.get() &&
+            hitFirst.value &&
            e.translationX < actions.rightFirst.threshold
          ) {
-            hitFirst.set(false)
+            hitFirst.value = false
          }
        }
      }
@@ -200,29 +198,29 @@ export function GestureActionView({
    .onEnd(e => {
      'worklet'
      if (e.translationX < 0) {
-        if (hitSecond.get() && actions.leftSecond) {
+        if (hitSecond.value && actions.leftSecond) {
          runOnJS(actions.leftSecond.action)()
-        } else if (hitFirst.get() && actions.leftFirst) {
+        } else if (hitFirst.value && actions.leftFirst) {
          runOnJS(actions.leftFirst.action)()
        }
      } else if (e.translationX > 0) {
-        if (hitSecond.get() && actions.rightSecond) {
+        if (hitSecond.value && actions.rightSecond) {
          runOnJS(actions.rightSecond.action)()
-        } else if (hitSecond.get() && actions.rightFirst) {
+        } else if (hitSecond.value && actions.rightFirst) {
          runOnJS(actions.rightFirst.action)()
        }
      }
-      transX.set(() => withTiming(0, {duration: 200}))
-      hitFirst.set(false)
-      hitSecond.set(false)
-      isActive.set(false)
+      transX.value = withTiming(0, {duration: 200})
+      hitFirst.value = false
+      hitSecond.value = false
+      isActive.value = false
    })

  const composedGesture = Gesture.Simultaneous(panGesture)

  const animatedSliderStyle = useAnimatedStyle(() => {
    return {
-      transform: [{translateX: clampedTransX.get()}],
+      transform: [{translateX: clampedTransX.value}],
    }
  })

@@ -276,7 +274,7 @@ export function GestureActionView({
  const animatedBackgroundStyle = useAnimatedStyle(() => {
    return {
      backgroundColor: interpolateColor(
-        clampedTransX.get(),
+        clampedTransX.value,
        interpolation.inputRange,
        // @ts-expect-error - Weird type expected by reanimated, but this is okay
        interpolation.outputRange,
@@ -285,10 +283,10 @@ export function GestureActionView({
  })

  const animatedIconStyle = useAnimatedStyle(() => {
-    const absTransX = Math.abs(clampedTransX.get())
+    const absTransX = Math.abs(clampedTransX.value)
    return {
      opacity: interpolate(absTransX, [0, 75], [0.15, 1]),
-      transform: [{scale: iconScale.get()}],
+      transform: [{scale: iconScale.value}],
    }
  })

@@ -2,6 +2,7 @@ import React from 'react'
 import {Pressable, PressableProps, StyleProp, ViewStyle} from 'react-native'
 import Animated, {
  cancelAnimation,
+  runOnJS,
  useAnimatedStyle,
  useReducedMotion,
  useSharedValue,
@@ -31,25 +32,27 @@ export function PressableScale({
  const scale = useSharedValue(1)

  const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{scale: scale.get()}],
+    transform: [{scale: scale.value}],
  }))

  return (
    <AnimatedPressable
      accessibilityRole="button"
      onPressIn={e => {
+        'worklet'
        if (onPressIn) {
-          onPressIn(e)
+          runOnJS(onPressIn)(e)
        }
        cancelAnimation(scale)
-        scale.set(() => withTiming(targetScale, {duration: 100}))
+        scale.value = withTiming(targetScale, {duration: 100})
      }}
      onPressOut={e => {
+        'worklet'
        if (onPressOut) {
-          onPressOut(e)
+          runOnJS(onPressOut)(e)
        }
        cancelAnimation(scale)
-        scale.set(() => withTiming(1, {duration: 100}))
+        scale.value = withTiming(1, {duration: 100})
      }}
      style={[!reducedMotion && animatedStyle, style]}
      {...rest}>
@@ -0,0 +1,14 @@
+import React from 'react'
+
+import {choose} from '#/lib/functions'
+import {useTheme} from '#/lib/ThemeContext'
+
+export function useCustomPalette<T>({light, dark}: {light: T; dark: T}) {
+  const theme = useTheme()
+  return React.useMemo(() => {
+    return choose<T, Record<string, T>>(theme.colorScheme, {
+      dark,
+      light,
+    })
+  }, [theme.colorScheme, dark, light])
+}
@@ -1,32 +0,0 @@
-import {useServiceConfigQuery} from '#/state/queries/email-verification-required'
-import {useProfileQuery} from '#/state/queries/profile'
-import {useSession} from '#/state/session'
-import {BSKY_SERVICE} from '../constants'
-import {getHostnameFromUrl} from '../strings/url-helpers'
-
-export function useEmail() {
-  const {currentAccount} = useSession()
-
-  const {data: serviceConfig} = useServiceConfigQuery()
-  const {data: profile} = useProfileQuery({did: currentAccount?.did})
-
-  const checkEmailConfirmed = !!serviceConfig?.checkEmailConfirmed
-
-  // Date set for 11 AM PST on the 18th of November
-  const isNewEnough =
-    !!profile?.createdAt &&
-    Date.parse(profile.createdAt) >= Date.parse('2024-11-18T19:00:00.000Z')
-
-  const isSelfHost =
-    currentAccount &&
-    getHostnameFromUrl(currentAccount.service) !==
-      getHostnameFromUrl(BSKY_SERVICE)
-
-  const needsEmailVerification =
-    !isSelfHost &&
-    checkEmailConfirmed &&
-    !currentAccount?.emailConfirmed &&
-    isNewEnough
-
-  return {needsEmailVerification}
-}
@@ -10,16 +10,15 @@ export function useMinimalShellHeaderTransform() {
  const {headerHeight} = useShellLayout()

  const headerTransform = useAnimatedStyle(() => {
-    const headerModeValue = headerMode.get()
    return {
-      pointerEvents: headerModeValue === 0 ? 'auto' : 'none',
-      opacity: Math.pow(1 - headerModeValue, 2),
+      pointerEvents: headerMode.value === 0 ? 'auto' : 'none',
+      opacity: Math.pow(1 - headerMode.value, 2),
      transform: [
        {
          translateY: interpolate(
-            headerModeValue,
+            headerMode.value,
            [0, 1],
-            [0, -headerHeight.get()],
+            [0, -headerHeight.value],
          ),
        },
      ],
@@ -34,16 +33,15 @@ export function useMinimalShellFooterTransform() {
  const {footerHeight} = useShellLayout()

  const footerTransform = useAnimatedStyle(() => {
-    const footerModeValue = footerMode.get()
    return {
-      pointerEvents: footerModeValue === 0 ? 'auto' : 'none',
-      opacity: Math.pow(1 - footerModeValue, 2),
+      pointerEvents: footerMode.value === 0 ? 'auto' : 'none',
+      opacity: Math.pow(1 - footerMode.value, 2),
      transform: [
        {
          translateY: interpolate(
-            footerModeValue,
+            footerMode.value,
            [0, 1],
-            [0, footerHeight.get()],
+            [0, footerHeight.value],
          ),
        },
      ],
@@ -60,7 +58,7 @@ export function useMinimalShellFabTransform() {
    return {
      transform: [
        {
-          translateY: interpolate(footerMode.get(), [0, 1], [-44, 0]),
+          translateY: interpolate(footerMode.value, [0, 1], [-44, 0]),
        },
      ],
    }
@@ -0,0 +1,32 @@
+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]
+}
@@ -9,24 +9,20 @@ if ('scrollRestoration' in history) {

 function createInitialScrollState() {
  return {
-    // Not used for rendering.
-    // Treat it as a ref so that we can mutate it without upsetting the compiler.
-    current: {
-      scrollYs: new Map(),
-      focusedKey: null as string | null,
-    },
+    scrollYs: new Map(),
+    focusedKey: null as string | null,
  }
 }

 export function useWebScrollRestoration() {
-  const [ref] = useState(createInitialScrollState)
+  const [state] = useState(createInitialScrollState)
  const navigation = useNavigation()

  useEffect(() => {
    function onDispatch() {
-      if (ref.current.focusedKey) {
+      if (state.focusedKey) {
        // Remember where we were for later.
-        ref.current.scrollYs.set(ref.current.focusedKey, window.scrollY)
+        state.scrollYs.set(state.focusedKey, window.scrollY)
        // TODO: Strictly speaking, this is a leak. We never clean up.
        // This is because I'm not sure when it's appropriate to clean it up.
        // It doesn't seem like popstate is enough because it can still Forward-Back again.
@@ -40,17 +36,17 @@ export function useWebScrollRestoration() {
    return () => {
      navigation.removeListener('__unsafe_action__' as any, onDispatch)
    }
-  }, [ref, navigation])
+  }, [state, navigation])

  const screenListeners = useMemo(
    () => ({
      focus(e: EventArg<'focus', boolean | undefined, unknown>) {
-        const scrollY = ref.current.scrollYs.get(e.target) ?? 0
+        const scrollY = state.scrollYs.get(e.target) ?? 0
        window.scrollTo(0, scrollY)
-        ref.current.focusedKey = e.target ?? null
+        state.focusedKey = e.target ?? null
      },
    }),
-    [ref],
+    [state],
  )
  return screenListeners
 }
@@ -0,0 +1,93 @@
+import {useEffect, useState} from 'react'
+import {Image} from 'react-native'
+
+import type {Dimensions} from '#/lib/media/types'
+
+type CacheStorageItem<T> = {key: string; value: T}
+const createCache = <T>(cacheSize: number) => ({
+  _storage: [] as CacheStorageItem<T>[],
+  get(key: string) {
+    const {value} =
+      this._storage.find(({key: storageKey}) => storageKey === key) || {}
+    return value
+  },
+  set(key: string, value: T) {
+    if (this._storage.length >= cacheSize) {
+      this._storage.shift()
+    }
+    this._storage.push({key, value})
+  },
+})
+
+const sizes = createCache<Dimensions>(50)
+const activeRequests: Map<string, Promise<Dimensions>> = new Map()
+
+export function get(uri: string): Dimensions | undefined {
+  return sizes.get(uri)
+}
+
+export function fetch(uri: string): Promise<Dimensions> {
+  const dims = sizes.get(uri)
+  if (dims) {
+    return Promise.resolve(dims)
+  }
+  const activeRequest = activeRequests.get(uri)
+  if (activeRequest) {
+    return activeRequest
+  }
+  const prom = new Promise<Dimensions>((resolve, reject) => {
+    Image.getSize(
+      uri,
+      (width: number, height: number) => {
+        const size = {width, height}
+        sizes.set(uri, size)
+        resolve(size)
+      },
+      (err: any) => {
+        console.error('Failed to fetch image dimensions for', uri, err)
+        reject(new Error('Could not fetch dimensions'))
+      },
+    )
+  }).finally(() => {
+    activeRequests.delete(uri)
+  })
+  activeRequests.set(uri, prom)
+  return prom
+}
+
+export function useImageDimensions({
+  src,
+  knownDimensions,
+}: {
+  src: string
+  knownDimensions: Dimensions | null
+}): [number | undefined, Dimensions | undefined] {
+  const [dims, setDims] = useState(() => knownDimensions ?? get(src))
+  const [prevSrc, setPrevSrc] = useState(src)
+  if (src !== prevSrc) {
+    setDims(knownDimensions ?? get(src))
+    setPrevSrc(src)
+  }
+
+  useEffect(() => {
+    let aborted = false
+    if (dims !== undefined) return
+    fetch(src).then(newDims => {
+      if (aborted) return
+      setDims(newDims)
+    })
+    return () => {
+      aborted = true
+    }
+  }, [dims, setDims, src])
+
+  let aspectRatio: number | undefined
+  if (dims) {
+    aspectRatio = dims.width / dims.height
+    if (Number.isNaN(aspectRatio)) {
+      aspectRatio = undefined
+    }
+  }
+
+  return [aspectRatio, dims]
+}
@@ -21,11 +21,11 @@ export type LogEvents = {
    context: 'StartOnboarding' | 'AfterOnboarding' | 'Login' | 'Home'
    status: 'granted' | 'denied' | 'undetermined'
  }
-  'state:background': {
+  'state:background:sampled': {
    secondsActive: number
  }
-  'state:foreground': {}
-  'router:navigate:notifications': {}
+  'state:foreground:sampled': {}
+  'router:navigate:notifications:sampled': {}
  'deepLink:referrerReceived': {
    to: string
    referrer: string
@@ -76,7 +76,7 @@ export type LogEvents = {
  'onboarding:finished:avatarResult': {
    avatarResult: 'default' | 'created' | 'uploaded'
  }
-  'home:feedDisplayed': {
+  'home:feedDisplayed:sampled': {
    feedUrl: string
    feedType: string
    index: number
@@ -87,12 +87,12 @@ export type LogEvents = {
      | 'desktop-sidebar-click'
      | 'starter-pack-initial-feed'
  }
-  'feed:endReached': {
+  'feed:endReached:sampled': {
    feedUrl: string
    feedType: string
    itemCount: number
  }
-  'feed:refresh': {
+  'feed:refresh:sampled': {
    feedUrl: string
    feedType: string
    reason: 'pull-to-refresh' | 'soft-reset' | 'load-latest'
@@ -103,13 +103,13 @@ export type LogEvents = {
  'discover:showLess': {
    feedContext: string
  }
-  'discover:clickthrough': {
+  'discover:clickthrough:sampled': {
    count: number
  }
-  'discover:engaged': {
+  'discover:engaged:sampled': {
    count: number
  }
-  'discover:seen': {
+  'discover:seen:sampled': {
    count: number
  }

@@ -132,27 +132,27 @@ export type LogEvents = {
    postCount: number
    isReply: boolean
  }
-  'post:like': {
+  'post:like:sampled': {
    doesLikerFollowPoster: boolean | undefined
    doesPosterFollowLiker: boolean | undefined
    likerClout: number | undefined
    postClout: number | undefined
    logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
  }
-  'post:repost': {
+  'post:repost:sampled': {
    logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
  }
-  'post:unlike': {
+  'post:unlike:sampled': {
    logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
  }
-  'post:unrepost': {
+  'post:unrepost:sampled': {
    logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
  }
  'post:mute': {}
  'post:unmute': {}
  'post:pin': {}
  'post:unpin': {}
-  'profile:follow': {
+  'profile:follow:sampled': {
    didBecomeMutual: boolean | undefined
    followeeClout: number | undefined
    followerClout: number | undefined
@@ -169,7 +169,7 @@ export type LogEvents = {
      | 'FeedInterstitial'
      | 'ProfileHeaderSuggestedFollows'
  }
-  'profile:unfollow': {
+  'profile:unfollow:sampled': {
    logContext:
      | 'RecommendedFollowsItem'
      | 'PostThreadItem'
@@ -59,7 +59,6 @@ function createStatsigOptions(prefetchUsers: StatsigUser[]) {
    initTimeoutMs: 1,
    // Get fresh flags for other accounts as well, if any.
    prefetchUsers,
-    api: 'https://events.bsky.app/v2',
  }
 }

@@ -90,14 +89,51 @@ export function toClout(n: number | null | undefined): number | undefined {
  }
 }

+const DOWNSAMPLE_RATE = 0.99 // 99% likely
+const DOWNSAMPLED_EVENTS: Set<keyof LogEvents> = new Set([
+  'router:navigate:notifications:sampled',
+  'state:background:sampled',
+  'state:foreground:sampled',
+  'home:feedDisplayed:sampled',
+  'feed:endReached:sampled',
+  'feed:refresh:sampled',
+  'discover:clickthrough:sampled',
+  'discover:engaged:sampled',
+  'discover:seen:sampled',
+  'post:like:sampled',
+  'post:unlike:sampled',
+  'post:repost:sampled',
+  'post:unrepost:sampled',
+  'profile:follow:sampled',
+  'profile:unfollow:sampled',
+])
+const isDownsampledSession = Math.random() < DOWNSAMPLE_RATE
+
 export function logEvent<E extends keyof LogEvents>(
  eventName: E & string,
  rawMetadata: LogEvents[E] & FlatJSONRecord,
 ) {
  try {
+    if (
+      process.env.NODE_ENV === 'development' &&
+      eventName.endsWith(':sampled') &&
+      !DOWNSAMPLED_EVENTS.has(eventName)
+    ) {
+      logger.error(
+        'Did you forget to add ' + eventName + ' to DOWNSAMPLED_EVENTS?',
+      )
+    }
+
+    const isDownsampledEvent = DOWNSAMPLED_EVENTS.has(eventName)
+    if (isDownsampledSession && isDownsampledEvent) {
+      return
+    }
    const fullMetadata = {
      ...rawMetadata,
    } as Record<string, string> // Statsig typings are unnecessarily strict here.
+    if (isDownsampledEvent) {
+      fullMetadata.downsampleRate = DOWNSAMPLE_RATE.toString()
+    }
    fullMetadata.routeName = getCurrentRouteName() ?? '(Uninitialized)'
    if (Statsig.initializeCalled()) {
      Statsig.logEvent(eventName, null, fullMetadata)
@@ -196,13 +232,13 @@ AppState.addEventListener('change', (state: AppStateStatus) => {
  lastState = state
  if (state === 'active') {
    lastActive = performance.now()
-    logEvent('state:foreground', {})
+    logEvent('state:foreground:sampled', {})
  } else {
    let secondsActive = 0
    if (lastActive != null) {
      secondsActive = Math.round((performance.now() - lastActive) / 1e3)
      lastActive = null
-      logEvent('state:background', {
+      logEvent('state:background:sampled', {
        secondsActive,
      })
    }
@@ -1,5 +1,3 @@
-import {t} from '@lingui/macro'
-
 export function cleanError(str: any): string {
  if (!str) {
    return ''
@@ -8,17 +6,13 @@ export function cleanError(str: any): string {
    str = str.toString()
  }
  if (isNetworkError(str)) {
-    return t`Unable to connect. Please check your internet connection and try again.`
+    return 'Unable to connect. Please check your internet connection and try again.'
  }
-  if (
-    str.includes('Upstream Failure') ||
-    str.includes('NotEnoughResources') ||
-    str.includes('pipethrough network error')
-  ) {
-    return t`The server appears to be experiencing issues. Please try again in a few moments.`
+  if (str.includes('Upstream Failure')) {
+    return 'The server appears to be experiencing issues. Please try again in a few moments.'
  }
  if (str.includes('Bad token scope')) {
-    return t`This feature is not available while using an App Password. Please sign in with your main password.`
+    return 'This feature is not available while using an App Password. Please sign in with your main password.'
  }
  if (str.startsWith('Error: ')) {
    return str.slice('Error: '.length)
@@ -4,11 +4,10 @@ import {useKeyboardController} from 'react-native-keyboard-controller'
 import {AppBskyActorDefs, moderateProfile, ModerationOpts} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {useFocusEffect, useNavigation} from '@react-navigation/native'
+import {useFocusEffect} from '@react-navigation/native'
 import {NativeStackScreenProps} from '@react-navigation/native-stack'

-import {useEmail} from '#/lib/hooks/useEmail'
-import {CommonNavigatorParams, NavigationProp} from '#/lib/routes/types'
+import {CommonNavigatorParams} from '#/lib/routes/types'
 import {isWeb} from '#/platform/detection'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {ConvoProvider, isConvoActive, useConvo} from '#/state/messages/convo'
@@ -20,8 +19,6 @@ import {useSetMinimalShellMode} from '#/state/shell'
 import {CenteredView} from '#/view/com/util/Views'
 import {MessagesList} from '#/screens/Messages/components/MessagesList'
 import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
-import {useDialogControl} from '#/components/Dialog'
-import {VerifyEmailDialog} from '#/components/dialogs/VerifyEmailDialog'
 import {MessagesListBlockedFooter} from '#/components/dms/MessagesListBlockedFooter'
 import {MessagesListHeader} from '#/components/dms/MessagesListHeader'
 import {Error} from '#/components/Error'
@@ -164,12 +161,8 @@ function InnerReady({
  hasScrolled: boolean
  setHasScrolled: React.Dispatch<React.SetStateAction<boolean>>
 }) {
-  const {_} = useLingui()
  const convoState = useConvo()
-  const navigation = useNavigation<NavigationProp>()
  const recipient = useProfileShadow(recipientUnshadowed)
-  const verifyEmailControl = useDialogControl()
-  const {needsEmailVerification} = useEmail()

  const moderation = React.useMemo(() => {
    return moderateProfile(recipient, moderationOpts)
@@ -186,12 +179,6 @@ function InnerReady({
    }
  }, [moderation])

-  React.useEffect(() => {
-    if (needsEmailVerification) {
-      verifyEmailControl.open()
-    }
-  }, [needsEmailVerification, verifyEmailControl])
-
  return (
    <>
      <MessagesListHeader
@@ -214,15 +201,6 @@ function InnerReady({
          }
        />
      )}
-      <VerifyEmailDialog
-        reasonText={_(
-          msg`Before you may message another user, you must first verify your email.`,
-        )}
-        control={verifyEmailControl}
-        onCloseWithoutVerifying={() => {
-          navigation.navigate('Home')
-        }}
-      />
    </>
  )
 }
@@ -104,7 +104,7 @@ function ChatListItemReady({

  const isDeletedAccount = profile.handle === 'missing.invalid'
  const displayName = isDeletedAccount
-    ? _(msg`Deleted Account`)
+    ? 'Deleted Account'
    : sanitizeDisplayName(
        profile.displayName || profile.handle,
        moderation.ui('displayName'),
@@ -18,7 +18,6 @@ import Graphemer from 'graphemer'

 import {HITSLOP_10, MAX_DM_GRAPHEME_LENGTH} from '#/lib/constants'
 import {useHaptics} from '#/lib/haptics'
-import {useEmail} from '#/lib/hooks/useEmail'
 import {isIOS} from '#/platform/detection'
 import {
  useMessageDraft,
@@ -62,15 +61,10 @@ export function MessageInput({
  const [message, setMessage] = React.useState(getDraft)
  const inputRef = useAnimatedRef<TextInput>()

-  const {needsEmailVerification} = useEmail()
-
  useSaveMessageDraft(message)
  useExtractEmbedFromFacets(message, setEmbed)

  const onSubmit = React.useCallback(() => {
-    if (needsEmailVerification) {
-      return
-    }
    if (!hasEmbed && message.trim() === '') {
      return
    }
@@ -90,7 +84,6 @@ export function MessageInput({
      inputRef.current?.focus()
    }, 100)
  }, [
-    needsEmailVerification,
    hasEmbed,
    message,
    clearDraft,
@@ -108,22 +101,22 @@ export function MessageInput({
        const measurement = measure(inputRef)
        if (!measurement) return

-        const max = windowHeight - -keyboardHeight.get() - topInset - 150
+        const max = windowHeight - -keyboardHeight.value - topInset - 150
        const availableSpace = max - measurement.height

-        maxHeight.set(max)
-        isInputScrollable.set(availableSpace < 30)
+        maxHeight.value = max
+        isInputScrollable.value = availableSpace < 30
      },
    },
    [windowHeight, topInset],
  )

  const animatedStyle = useAnimatedStyle(() => ({
-    maxHeight: maxHeight.get(),
+    maxHeight: maxHeight.value,
  }))

  const animatedProps = useAnimatedProps(() => ({
-    scrollEnabled: isInputScrollable.get(),
+    scrollEnabled: isInputScrollable.value,
  }))

  return (
@@ -166,7 +159,6 @@ export function MessageInput({
          ref={inputRef}
          hitSlop={HITSLOP_10}
          animatedProps={animatedProps}
-          editable={!needsEmailVerification}
        />
        <Pressable
          accessibilityRole="button"
@@ -179,8 +171,7 @@ export function MessageInput({
            a.justify_center,
            {height: 30, width: 30, backgroundColor: t.palette.primary_500},
          ]}
-          onPress={onSubmit}
-          disabled={needsEmailVerification}>
+          onPress={onSubmit}>
          <PaperPlane fill={t.palette.white} style={[a.relative, {left: 1}]} />
        </Pressable>
      </View>
@@ -145,7 +145,7 @@ export function MessagesList({
    (_: number, height: number) => {
      // Because web does not have `maintainVisibleContentPosition` support, we will need to manually scroll to the
      // previous off whenever we add new content to the previous offset whenever we add new content to the list.
-      if (isWeb && isAtTop.get() && hasScrolled) {
+      if (isWeb && isAtTop.value && hasScrolled) {
        flatListRef.current?.scrollToOffset({
          offset: height - prevContentHeight.current,
          animated: false,
@@ -153,7 +153,7 @@ export function MessagesList({
      }

      // This number _must_ be the height of the MaybeLoader component
-      if (height > 50 && isAtBottom.get()) {
+      if (height > 50 && isAtBottom.value) {
        // If the size of the content is changing by more than the height of the screen, then we don't
        // want to scroll further than the start of all the new content. Since we are storing the previous offset,
        // we can just scroll the user to that offset and add a little bit of padding. We'll also show the pill
@@ -161,7 +161,7 @@ export function MessagesList({
        if (
          didBackground.current &&
          hasScrolled &&
-          height - prevContentHeight.current > layoutHeight.get() - 50 &&
+          height - prevContentHeight.current > layoutHeight.value - 50 &&
          convoState.items.length - prevItemCount.current > 1
        ) {
          flatListRef.current?.scrollToOffset({
@@ -209,7 +209,7 @@ export function MessagesList({
  )

  const onStartReached = useCallback(() => {
-    if (hasScrolled && prevContentHeight.current > layoutHeight.get()) {
+    if (hasScrolled && prevContentHeight.current > layoutHeight.value) {
      convoState.fetchMessageHistory()
    }
  }, [convoState, hasScrolled, layoutHeight])
@@ -217,18 +217,18 @@ export function MessagesList({
  const onScroll = React.useCallback(
    (e: ReanimatedScrollEvent) => {
      'worklet'
-      layoutHeight.set(e.layoutMeasurement.height)
+      layoutHeight.value = e.layoutMeasurement.height
      const bottomOffset = e.contentOffset.y + e.layoutMeasurement.height

      // Most apps have a little bit of space the user can scroll past while still automatically scrolling ot the bottom
      // when a new message is added, hence the 100 pixel offset
-      isAtBottom.set(e.contentSize.height - 100 < bottomOffset)
-      isAtTop.set(e.contentOffset.y <= 1)
+      isAtBottom.value = e.contentSize.height - 100 < bottomOffset
+      isAtTop.value = e.contentOffset.y <= 1

      if (
        newMessagesPill.show &&
        (e.contentOffset.y > newMessagesPill.startContentOffset + 200 ||
-          isAtBottom.get())
+          isAtBottom.value)
      ) {
        runOnJS(setNewMessagesPill)({
          show: false,
@@ -256,28 +256,28 @@ export function MessagesList({
      // Immediate updates - like opening the emoji picker - will have a duration of zero. In those cases, we should
      // just update the height here instead of having the `onMove` event do it (that event will not fire!)
      if (e.duration === 0) {
-        layoutScrollWithoutAnimation.set(true)
-        keyboardHeight.set(e.height)
+        layoutScrollWithoutAnimation.value = true
+        keyboardHeight.value = e.height
      } else {
-        keyboardIsOpening.set(true)
+        keyboardIsOpening.value = true
      }
    },
    onMove: e => {
      'worklet'
-      keyboardHeight.set(e.height)
+      keyboardHeight.value = e.height
      if (e.height > bottomOffset) {
        scrollTo(flatListRef, 0, 1e7, false)
      }
    },
    onEnd: () => {
      'worklet'
-      keyboardIsOpening.set(false)
+      keyboardIsOpening.value = false
    },
  })

  const animatedListStyle = useAnimatedStyle(() => ({
    marginBottom:
-      keyboardHeight.get() > bottomOffset ? keyboardHeight.get() : bottomOffset,
+      keyboardHeight.value > bottomOffset ? keyboardHeight.value : bottomOffset,
  }))

  // -- Message sending
@@ -363,13 +363,13 @@ export function MessagesList({
  // -- List layout changes (opening emoji keyboard, etc.)
  const onListLayout = React.useCallback(
    (e: LayoutChangeEvent) => {
-      layoutHeight.set(e.nativeEvent.layout.height)
+      layoutHeight.value = e.nativeEvent.layout.height

-      if (isWeb || !keyboardIsOpening.get()) {
+      if (isWeb || !keyboardIsOpening.value) {
        flatListRef.current?.scrollToEnd({
-          animated: !layoutScrollWithoutAnimation.get(),
+          animated: !layoutScrollWithoutAnimation.value,
        })
-        layoutScrollWithoutAnimation.set(false)
+        layoutScrollWithoutAnimation.value = false
      }
    },
    [
@@ -1,11 +1,13 @@
 import React from 'react'
 import {Linking, View} from 'react-native'
 import {useSafeAreaFrame} from 'react-native-safe-area-context'
+import {ComAtprotoLabelDefs} from '@atproto/api'
 import {LABELS} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useFocusEffect} from '@react-navigation/native'

+import {IS_INTERNAL} from '#/lib/app-info'
 import {getLabelingServiceTitle} from '#/lib/moderation'
 import {CommonNavigatorParams, NativeStackScreenProps} from '#/lib/routes/types'
 import {logger} from '#/logger'
@@ -16,6 +18,11 @@ import {
  UsePreferencesQueryResponse,
  usePreferencesSetAdultContentMutation,
 } from '#/state/queries/preferences'
+import {
+  useProfileQuery,
+  useProfileUpdateMutation,
+} from '#/state/queries/profile'
+import {useSession} from '#/state/session'
 import {isNonConfigurableModerationAuthority} from '#/state/session/additional-moderation-authorities'
 import {useSetMinimalShellMode} from '#/state/shell'
 import {ViewHeader} from '#/view/com/util/ViewHeader'
@@ -462,7 +469,131 @@ export function ModerationScreenInner({
          })}
        </View>
      )}
+
+      {!IS_INTERNAL && (
+        <>
+          <Text
+            style={[
+              a.text_md,
+              a.font_bold,
+              a.pt_2xl,
+              a.pb_md,
+              t.atoms.text_contrast_high,
+            ]}>
+            <Trans>Logged-out visibility</Trans>
+          </Text>
+
+          <PwiOptOut />
+        </>
+      )}
+
      <View style={{height: 200}} />
    </ScrollView>
  )
 }
+
+function PwiOptOut() {
+  const t = useTheme()
+  const {_} = useLingui()
+  const {currentAccount} = useSession()
+  const {data: profile} = useProfileQuery({did: currentAccount?.did})
+  const updateProfile = useProfileUpdateMutation()
+
+  const isOptedOut =
+    profile?.labels?.some(l => l.val === '!no-unauthenticated') || false
+  const canToggle = profile && !updateProfile.isPending
+
+  const onToggleOptOut = React.useCallback(() => {
+    if (!profile) {
+      return
+    }
+    let wasAdded = false
+    updateProfile.mutate({
+      profile,
+      updates: existing => {
+        // create labels attr if needed
+        existing.labels = ComAtprotoLabelDefs.isSelfLabels(existing.labels)
+          ? existing.labels
+          : {
+              $type: 'com.atproto.label.defs#selfLabels',
+              values: [],
+            }
+
+        // toggle the label
+        const hasLabel = existing.labels.values.some(
+          l => l.val === '!no-unauthenticated',
+        )
+        if (hasLabel) {
+          wasAdded = false
+          existing.labels.values = existing.labels.values.filter(
+            l => l.val !== '!no-unauthenticated',
+          )
+        } else {
+          wasAdded = true
+          existing.labels.values.push({val: '!no-unauthenticated'})
+        }
+
+        // delete if no longer needed
+        if (existing.labels.values.length === 0) {
+          delete existing.labels
+        }
+        return existing
+      },
+      checkCommitted: res => {
+        const exists = !!res.data.labels?.some(
+          l => l.val === '!no-unauthenticated',
+        )
+        return exists === wasAdded
+      },
+    })
+  }, [updateProfile, profile])
+
+  return (
+    <View style={[a.pt_sm]}>
+      <View style={[a.flex_row, a.align_center, a.justify_between, a.gap_lg]}>
+        <Toggle.Item
+          disabled={!canToggle}
+          value={isOptedOut}
+          onChange={onToggleOptOut}
+          name="logged_out_visibility"
+          style={a.flex_1}
+          label={_(
+            msg`Discourage apps from showing my account to logged-out users`,
+          )}>
+          <Toggle.Switch />
+          <Toggle.LabelText style={[a.text_md, a.flex_1]}>
+            <Trans>
+              Discourage apps from showing my account to logged-out users
+            </Trans>
+          </Toggle.LabelText>
+        </Toggle.Item>
+
+        {updateProfile.isPending && <Loader />}
+      </View>
+
+      <View style={[a.pt_md, a.gap_md, {paddingLeft: 38}]}>
+        <Text style={[a.leading_snug, t.atoms.text_contrast_high]}>
+          <Trans>
+            Bluesky will not show your profile and posts to logged-out users.
+            Other apps may not honor this request. This does not make your
+            account private.
+          </Trans>
+        </Text>
+        <Text style={[a.font_bold, a.leading_snug, t.atoms.text_contrast_high]}>
+          <Trans>
+            Note: Bluesky is an open and public network. This setting only
+            limits the visibility of your content on the Bluesky app and
+            website, and other apps may not respect this setting. Your content
+            may still be shown to logged-out users by other apps and websites.
+          </Trans>
+        </Text>
+
+        <InlineLinkText
+          label={_(msg`Learn more about what is public on Bluesky.`)}
+          to="https://blueskyweb.zendesk.com/hc/en-us/articles/15835264007693-Data-Privacy">
+          <Trans>Learn more about what is public on Bluesky.</Trans>
+        </InlineLinkText>
+      </View>
+    </View>
+  )
+}
@@ -127,36 +127,31 @@ export function StepFinished() {
        })(),
        (async () => {
          const {imageUri, imageMime} = profileStepResults
-          const blobPromise =
-            imageUri && imageMime
-              ? uploadBlob(agent, imageUri, imageMime)
-              : undefined
-
-          await agent.upsertProfile(async existing => {
-            existing = existing ?? {}
-
-            if (blobPromise) {
+          if (imageUri && imageMime) {
+            const blobPromise = uploadBlob(agent, imageUri, imageMime)
+            await agent.upsertProfile(async existing => {
+              existing = existing ?? {}
              const res = await blobPromise
              if (res.data.blob) {
                existing.avatar = res.data.blob
              }
-            }

-            if (starterPack) {
-              existing.joinedViaStarterPack = {
-                uri: starterPack.uri,
-                cid: starterPack.cid,
+              if (starterPack) {
+                existing.joinedViaStarterPack = {
+                  uri: starterPack.uri,
+                  cid: starterPack.cid,
+                }
              }
-            }

-            existing.displayName = ''
-            // HACKFIX
-            // creating a bunch of identical profile objects is breaking the relay
-            // tossing this unspecced field onto it to reduce the size of the problem
-            // -prf
-            existing.createdAt = new Date().toISOString()
-            return existing
-          })
+              existing.displayName = ''
+              // HACKFIX
+              // creating a bunch of identical profile objects is breaking the relay
+              // tossing this unspecced field onto it to reduce the size of the problem
+              // -prf
+              existing.createdAt = new Date().toISOString()
+              return existing
+            })
+          }

          logEvent('onboarding:finished:avatarResult', {
            avatarResult: profileStepResults.isCreatedAvatar
@@ -45,7 +45,7 @@ function GrowableAvatarInner({
  const animatedStyle = useAnimatedStyle(() => ({
    transform: [
      {
-        scale: interpolate(scrollY.get(), [-150, 0], [1.2, 1], {
+        scale: interpolate(scrollY.value, [-150, 0], [1.2, 1], {
          extrapolateRight: Extrapolation.CLAMP,
        }),
      },
@@ -66,7 +66,7 @@ function GrowableBannerInner({
  const animatedStyle = useAnimatedStyle(() => ({
    transform: [
      {
-        scale: interpolate(scrollY.get(), [-150, 0], [2, 1], {
+        scale: interpolate(scrollY.value, [-150, 0], [2, 1], {
          extrapolateRight: Extrapolation.CLAMP,
        }),
      },
@@ -76,7 +76,7 @@ function GrowableBannerInner({
  const animatedBlurViewProps = useAnimatedProps(() => {
    return {
      intensity: interpolate(
-        scrollY.get(),
+        scrollY.value,
        [-300, -65, -15],
        [50, 40, 0],
        Extrapolation.CLAMP,
@@ -85,17 +85,16 @@ function GrowableBannerInner({
  })

  const animatedSpinnerStyle = useAnimatedStyle(() => {
-    const scrollYValue = scrollY.get()
    return {
-      display: scrollYValue < 0 ? 'flex' : 'none',
+      display: scrollY.value < 0 ? 'flex' : 'none',
      opacity: interpolate(
-        scrollYValue,
+        scrollY.value,
        [-60, -15],
        [1, 0],
        Extrapolation.CLAMP,
      ),
      transform: [
-        {translateY: interpolate(scrollYValue, [-150, 0], [-75, 0])},
+        {translateY: interpolate(scrollY.value, [-150, 0], [-75, 0])},
        {rotate: '90deg'},
      ],
    }
@@ -104,7 +103,7 @@ function GrowableBannerInner({
  const animatedBackButtonStyle = useAnimatedStyle(() => ({
    transform: [
      {
-        translateY: interpolate(scrollY.get(), [-150, 60], [-150, 60], {
+        translateY: interpolate(scrollY.value, [-150, 60], [-150, 60], {
          extrapolateRight: Extrapolation.CLAMP,
        }),
      },
@@ -169,7 +168,7 @@ function useShouldAnimateSpinner({
  const stickyIsOverscrolled = useStickyToggle(isOverscrolled, 10)

  useAnimatedReaction(
-    () => scrollY.get() < -5,
+    () => scrollY.value < -5,
    (value, prevValue) => {
      if (value !== prevValue) {
        runOnJS(setIsOverscrolled)(value)
@@ -1,12 +1,5 @@
 import React, {memo} from 'react'
 import {StyleSheet, TouchableWithoutFeedback, View} from 'react-native'
-import Animated, {
-  measure,
-  MeasuredDimensions,
-  runOnJS,
-  runOnUI,
-  useAnimatedRef,
-} from 'react-native-reanimated'
 import {AppBskyActorDefs, ModerationDecision} from '@atproto/api'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {msg} from '@lingui/macro'
@@ -49,7 +42,6 @@ let ProfileHeaderShell = ({
  const {openLightbox} = useLightboxControls()
  const navigation = useNavigation<NavigationProp>()
  const {isDesktop} = useWebMediaQueries()
-  const aviRef = useAnimatedRef()

  const onPressBack = React.useCallback(() => {
    if (navigation.canGoBack()) {
@@ -59,40 +51,27 @@ let ProfileHeaderShell = ({
    }
  }, [navigation])

-  const _openLightbox = React.useCallback(
-    (uri: string, thumbRect: MeasuredDimensions | null) => {
+  const onPressAvi = React.useCallback(() => {
+    const modui = moderation.ui('avatar')
+    if (profile.avatar && !(modui.blur && modui.noOverride)) {
      openLightbox({
        images: [
          {
-            uri,
-            thumbUri: uri,
-            thumbRect,
+            uri: profile.avatar,
+            thumbUri: profile.avatar,
            dimensions: {
              // It's fine if it's actually smaller but we know it's 1:1.
              height: 1000,
              width: 1000,
            },
-            thumbDimensions: null,
            type: 'circle-avi',
          },
        ],
        index: 0,
+        thumbDims: null,
      })
-    },
-    [openLightbox],
-  )
-
-  const onPressAvi = React.useCallback(() => {
-    const modui = moderation.ui('avatar')
-    const avatar = profile.avatar
-    if (avatar && !(modui.blur && modui.noOverride)) {
-      runOnUI(() => {
-        'worklet'
-        const rect = measure(aviRef)
-        runOnJS(_openLightbox)(avatar, rect)
-      })()
    }
-  }, [profile, moderation, _openLightbox, aviRef])
+  }, [openLightbox, profile, moderation])

  const isMe = React.useMemo(
    () => currentAccount?.did === profile.did,
@@ -170,14 +149,12 @@ let ProfileHeaderShell = ({
              styles.avi,
              profile.associated?.labeler && styles.aviLabeler,
            ]}>
-            <Animated.View ref={aviRef} collapsable={false}>
-              <UserAvatar
-                type={profile.associated?.labeler ? 'labeler' : 'user'}
-                size={90}
-                avatar={profile.avatar}
-                moderation={moderation.ui('avatar')}
-              />
-            </Animated.View>
+            <UserAvatar
+              type={profile.associated?.labeler ? 'labeler' : 'user'}
+              size={90}
+              avatar={profile.avatar}
+              moderation={moderation.ui('avatar')}
+            />
          </View>
        </TouchableWithoutFeedback>
      </GrowableAvatar>
@@ -6,6 +6,7 @@ import {NativeStackScreenProps} from '@react-navigation/native-stack'
 import {CommonNavigatorParams} from '#/lib/routes/types'
 import {useModalControls} from '#/state/modals'
 import {useSession} from '#/state/session'
+import {ExportCarDialog} from '#/view/screens/Settings/ExportCarDialog'
 import * as SettingsList from '#/screens/Settings/components/SettingsList'
 import {atoms as a, useTheme} from '#/alf'
 import {useDialogControl} from '#/components/Dialog'
@@ -23,7 +24,6 @@ import {Verified_Stroke2_Corner2_Rounded as VerifiedIcon} from '#/components/ico
 import * as Layout from '#/components/Layout'
 import {ChangeHandleDialog} from './components/ChangeHandleDialog'
 import {DeactivateAccountDialog} from './components/DeactivateAccountDialog'
-import {ExportCarDialog} from './components/ExportCarDialog'

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