Reset default AA debug for E2E

.env.example

@@ -28,13 +28,6 @@ EXPO_PUBLIC_CHAT_PROXY_DID=
 #
 #
 
-# Bluesky's metrics API
-EXPO_PUBLIC_METRICS_API_HOST=
-
-# Growthbook config
-EXPO_PUBLIC_GROWTHBOOK_API_HOST=
-EXPO_PUBLIC_GROWTHBOOK_CLIENT_KEY=
-
 # Sentry DSN for telemetry
 EXPO_PUBLIC_SENTRY_DSN=
 

.eslintrc.js

@@ -0,0 +1,127 @@
+module.exports = {
+  root: true,
+  extends: [
+    '@react-native',
+    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:react-native-a11y/ios',
+    'prettier',
+  ],
+  parser: '@typescript-eslint/parser',
+  plugins: [
+    '@typescript-eslint',
+    'react',
+    'lingui',
+    'simple-import-sort',
+    'bsky-internal',
+    'eslint-plugin-react-compiler',
+    'import',
+  ],
+  rules: {
+    'react/no-unescaped-entities': 0,
+    'react/prop-types': 0,
+    'react-native/no-inline-styles': 0,
+    'bsky-internal/avoid-unwrapped-text': [
+      'error',
+      {
+        impliedTextComponents: [
+          'H1',
+          'H2',
+          'H3',
+          'H4',
+          'H5',
+          'H6',
+          'P',
+          'Admonition',
+          'Admonition.Admonition',
+          'Toast.Action',
+          'toast.Action',
+          'AgeAssuranceAdmonition',
+          'Span',
+          'StackedButton',
+        ],
+        impliedTextProps: [],
+        suggestedTextWrappers: {
+          Button: 'ButtonText',
+          'ToggleButton.Button': 'ToggleButton.ButtonText',
+          'SegmentedControl.Item': 'SegmentedControl.ItemText',
+        },
+      },
+    ],
+    'bsky-internal/use-exact-imports': 'error',
+    'bsky-internal/use-typed-gates': 'error',
+    'bsky-internal/use-prefixed-imports': 'error',
+    'simple-import-sort/imports': [
+      'error',
+      {
+        groups: [
+          // Side effect imports.
+          ['^\\u0000'],
+          // Node.js builtins prefixed with `node:`.
+          ['^node:'],
+          // Packages.
+          // Things that start with a letter (or digit or underscore), or `@` followed by a letter.
+          // React/React Native priortized, followed by expo
+          // Followed by all packages excluding unprefixed relative ones
+          [
+            '^(react\\/(.*)$)|^(react$)|^(react-native(.*)$)',
+            '^(expo(.*)$)|^(expo$)',
+            '^(?!(?:alf|components|lib|locale|logger|platform|screens|state|view)(?:$|\\/))@?\\w',
+          ],
+          // Relative imports.
+          // Ideally, anything that starts with a dot or #
+          // due to unprefixed relative imports being used, we whitelist the relative paths we use
+          // (?:$|\\/) matches end of string or /
+          [
+            '^(?:#\\/)?(?:lib|state|logger|platform|locale)(?:$|\\/)',
+            '^(?:#\\/)?view(?:$|\\/)',
+            '^(?:#\\/)?screens(?:$|\\/)',
+            '^(?:#\\/)?alf(?:$|\\/)',
+            '^(?:#\\/)?components(?:$|\\/)',
+            '^#\\/',
+            '^\\.',
+          ],
+          // anything else - hopefully we don't have any of these
+          ['^'],
+        ],
+      },
+    ],
+    'simple-import-sort/exports': 'error',
+    'react-compiler/react-compiler': 'warn',
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': [
+      'error',
+      {argsIgnorePattern: '^_', varsIgnorePattern: '^_.+'},
+    ],
+    '@typescript-eslint/consistent-type-imports': [
+      'warn',
+      {prefer: 'type-imports', fixStyle: 'inline-type-imports'},
+    ],
+    'import/consistent-type-specifier-style': ['warn', 'prefer-inline'],
+  },
+  ignorePatterns: [
+    '**/__mocks__/*.ts',
+    'src/platform/polyfills.ts',
+    'src/third-party',
+    'ios',
+    'android',
+    'coverage',
+    '*.lock',
+    '.husky',
+    'patches',
+    '*.html',
+    'bskyweb',
+    'bskyembed',
+    'src/locale/locales/_build/',
+    'src/locale/locales/**/*.js',
+    '*.e2e.ts',
+    '*.e2e.tsx',
+  ],
+  settings: {
+    componentWrapperFunctions: ['observer'],
+  },
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 'latest',
+  },
+}

.github/workflows/golang-test-lint.yml

@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Set up Go tooling
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v3
         with:
-          go-version-file: bskyweb/go.mod
+          go-version: "1.25"
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
       - name: Check
@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Set up Go tooling
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v3
         with:
-          go-version-file: bskyweb/go.mod
+          go-version: "1.25"
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
       - name: Lint

CLAUDE.md

@@ -29,7 +29,7 @@ yarn lint               # Run ESLint
 yarn typecheck          # Run TypeScript type checking
 
 # Internationalization
-yarn intl:extract       # Extract translation strings (you don't typically need to run this manually, we have CI for it)
+yarn intl:extract       # Extract translation strings
 yarn intl:compile       # Compile translations for runtime
 
 # Build
@@ -119,7 +119,7 @@ if (gtMobile) {
 
 ### Naming Conventions
 
-- Spacing: `2xs`, `xs`, `sm`, `md`, `lg`, `xl`, `2xl` (t-shirt sizes)
+- Spacing: `xxs`, `xs`, `sm`, `md`, `lg`, `xl`, `xxl` (t-shirt sizes)
 - Text: `text_xs`, `text_sm`, `text_md`, `text_lg`, `text_xl`
 - Gaps/Padding: `gap_sm`, `p_md`, `px_lg`, `py_xl`
 - Flex: `flex_row`, `flex_1`, `align_center`, `justify_between`
@@ -144,8 +144,7 @@ function MyFeature() {
       </Button>
 
       <Dialog.Outer control={control}>
-        {/* Typically the inner part is in its own component */}
-        <Dialog.Handle />  {/* Native-only drag handle */}
+        <Dialog.Handle />  {/* Native drag handle */}
         <Dialog.ScrollableInner label={_(msg`My Dialog`)}>
           <Dialog.Header>
             <Dialog.HeaderText>Title</Dialog.HeaderText>
@@ -153,10 +152,9 @@ function MyFeature() {
 
           <Text>Dialog content here</Text>
 
-          <Button label="Done" onPress={() => control.close()}>
-            <ButtonText>Done</ButtonText>
+          <Button label="Close" onPress={() => control.close()}>
+            <ButtonText>Close</ButtonText>
           </Button>
-          <Dialog.Close /> {/* Web-only X button in top left */}
         </Dialog.ScrollableInner>
       </Dialog.Outer>
     </>
@@ -217,7 +215,7 @@ import {Button, ButtonText, ButtonIcon} from '#/components/Button'
 
 // Icon-only button
 <Button label="Close" onPress={handleClose} color="secondary" size="small" shape="round">
-  <ButtonIcon icon={XIcon} />
+  <ButtonIcon icon={X} />
 </Button>
 
 // Ghost variant (deprecated - use color prop)
@@ -227,7 +225,7 @@ import {Button, ButtonText, ButtonIcon} from '#/components/Button'
 ```
 
 **Button Props:**
-- `color`: `'primary'` | `'secondary'` | `'negative'` | `'primary_subtle'` | `'negative_subtle'` | `'secondary_inverted'`
+- `color`: `'primary'` | `'secondary'` | `'negative'` | `'primary_subtle'` | `'negative_subtle'`
 - `size`: `'tiny'` | `'small'` | `'large'`
 - `shape`: `'default'` (pill) | `'round'` | `'square'` | `'rectangular'`
 - `variant`: `'solid'` | `'outline'` | `'ghost'` (deprecated, use `color`)
@@ -341,16 +339,6 @@ export function useUpdateProfile() {
     onSuccess: (_, variables) => {
       queryClient.invalidateQueries({queryKey: RQKEY(variables.did)})
     },
-    onError: (error) => {
-      if (isNetworkError(error)) {
-        // don't log, but inform user
-      } else if (error instanceof AppBskyExampleProcedure.ExampleError) {
-        // XRPC APIs often have typed errors, allows nicer handling
-      } else {
-        // Log unexpected errors to Sentry
-        logger.error('Error updating profile', {safeMessage: error})
-      }
-    }
   })
 }
 ```
@@ -364,26 +352,6 @@ STALE.HOURS.ONE        // 1 hour
 STALE.INFINITY         // Never stale
 ```
 
-**Paginated APIs:** Many atproto APIs return paginated results with a `cursor`. Use `useInfiniteQuery` for these:
-
-```tsx
-export function useDraftsQuery() {
-  const agent = useAgent()
-
-  return useInfiniteQuery({
-    queryKey: ['drafts'],
-    queryFn: async ({pageParam}) => {
-      const res = await agent.app.bsky.draft.getDrafts({cursor: pageParam})
-      return res.data
-    },
-    initialPageParam: undefined as string | undefined,
-    getNextPageParam: page => page.cursor,
-  })
-}
-```
-
-To get all items from pages: `data?.pages.flatMap(page => page.items) ?? []`
-
 ### Preferences (React Context)
 
 ```tsx
@@ -469,23 +437,11 @@ Example from Dialog:
 - `src/components/Dialog/index.tsx` - Native (uses BottomSheet)
 - `src/components/Dialog/index.web.tsx` - Web (uses modal with Radix primitives)
 
-**Important:** The bundler automatically resolves platform-specific files. Just import normally:
-
+Platform detection:
 ```tsx
-// CORRECT - bundler picks storage.ts or storage.web.ts automatically
-import * as storage from '#/state/drafts/storage'
+import {isWeb, isNative, isIOS, isAndroid} from '#/platform/detection'
 
-// WRONG - don't use require() or conditional imports for platform files
-const storage = IS_NATIVE
-  ? require('#/state/drafts/storage')
-  : require('#/state/drafts/storage.web')
-```
-
-Platform detection (for runtime logic, not imports):
-```tsx
-import {IS_WEB, IS_NATIVE, IS_IOS, IS_ANDROID} from '#/env'
-
-if (IS_NATIVE) {
+if (isNative) {
   // Native-specific logic
 }
 ```

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023–2026 Bluesky Social PBC
+Copyright 2023–2025 Bluesky Social PBC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

app.config.js

@@ -1,10 +1,5 @@
-// @ts-check
 const pkg = require('./package.json')
 
-/**
- * @param {import('@expo/config-types').ExpoConfig} _config
- * @returns {{ expo: import('@expo/config-types').ExpoConfig }}
- */
 module.exports = function (_config) {
   /**
    * App version number. Should be incremented as part of a release cycle.
@@ -20,7 +15,7 @@ module.exports = function (_config) {
 
   const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
   const IS_PRODUCTION = process.env.EXPO_PUBLIC_ENV === 'production'
-  const IS_DEV = !IS_TESTFLIGHT && !IS_PRODUCTION
+  const IS_DEV = !IS_TESTFLIGHT || !IS_PRODUCTION
 
   const ASSOCIATED_DOMAINS = [
     'applinks:bsky.app',
@@ -197,14 +192,10 @@ module.exports = function (_config) {
                 scheme: 'https',
                 host: 'bsky.app',
               },
-              ...(IS_DEV
-                ? [
-                    {
-                      scheme: 'http',
-                      host: 'localhost:19006',
-                    },
-                  ]
-                : []),
+              IS_DEV && {
+                scheme: 'http',
+                host: 'localhost:19006',
+              },
             ],
             category: ['BROWSABLE', 'DEFAULT'],
           },
@@ -236,25 +227,20 @@ module.exports = function (_config) {
           'react-native-edge-to-edge',
           {android: {enforceNavigationBarContrast: false}},
         ],
-        ...(USE_SENTRY
-          ? [
-              /** @type {[string, any]} */ ([
-                '@sentry/react-native/expo',
-                {
-                  organization: 'blueskyweb',
-                  project: 'app',
-                  url: 'https://sentry.io',
-                },
-              ]),
-            ]
-          : []),
+        USE_SENTRY && [
+          '@sentry/react-native/expo',
+          {
+            organization: 'blueskyweb',
+            project: 'app',
+            url: 'https://sentry.io',
+          },
+        ],
         [
           'expo-build-properties',
           {
             ios: {
               deploymentTarget: '15.1',
               buildReactNativeFromSource: true,
-              ccacheEnabled: IS_DEV,
             },
             android: {
               compileSdkVersion: 35,
@@ -311,25 +297,25 @@ module.exports = function (_config) {
           'expo-splash-screen',
           {
             ios: {
-              enableFullScreenImage_legacy: true, // iOS only
-              backgroundColor: '#A8CCFF', // primary_200
-              image: './assets/splash/splash.png',
+              enableFullScreenImage_legacy: true,
+              backgroundColor: '#ffffff',
+              image: './assets/splash.png',
               resizeMode: 'cover',
               dark: {
-                enableFullScreenImage_legacy: true, // iOS only
-                backgroundColor: '#00398A', // primary_800
-                image: './assets/splash/splash-dark.png',
+                enableFullScreenImage_legacy: true,
+                backgroundColor: '#001429',
+                image: './assets/splash-dark.png',
                 resizeMode: 'cover',
               },
             },
             android: {
-              backgroundColor: '#A8CCFF', // primary_200
-              image: './assets/splash/android-splash-logo-white.png',
-              imageWidth: 102, // even division of 306px
+              backgroundColor: '#0c7cff',
+              image: './assets/splash-android-icon.png',
+              imageWidth: 150,
               dark: {
-                backgroundColor: '#00398A', // primary_800
-                image: './assets/splash/android-splash-logo-white.png',
-                imageWidth: 102,
+                backgroundColor: '#0c2a49',
+                image: './assets/splash-android-icon-dark.png',
+                imageWidth: 150,
               },
             },
           },
@@ -410,7 +396,7 @@ module.exports = function (_config) {
               'I agree to allow Bluesky to use my contacts for friend discovery until I opt out.',
           },
         ],
-      ],
+      ].filter(Boolean),
       extra: {
         eas: {
           build: {

assets/icons/pageX_stroke2_corner0_rounded_large.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 64 64"><path fill="#000" d="M32.457 7c1.68 0 3.29.668 4.478 1.855L49.813 21.73a6.33 6.33 0 0 1 1.854 4.479v24.458A6.333 6.333 0 0 1 45.333 57H18.666a6.334 6.334 0 0 1-6.333-6.333V13.333A6.334 6.334 0 0 1 18.666 7h13.791ZM18.666 9a4.334 4.334 0 0 0-4.333 4.333v37.334A4.334 4.334 0 0 0 18.666 55h26.667a4.333 4.333 0 0 0 4.333-4.333V26.209c0-.418-.061-.829-.177-1.223a1 1 0 0 1-.155.014H40a6.334 6.334 0 0 1-6.325-6.008l-.008-.326V9.333q0-.08.013-.156A4.3 4.3 0 0 0 32.457 9H18.666Zm18.627 22.293a1 1 0 1 1 1.414 1.414L33.414 38l5.293 5.293a1 1 0 1 1-1.414 1.414L32 39.414l-5.293 5.293a1 1 0 1 1-1.414-1.414L30.586 38l-5.293-5.293a1 1 0 1 1 1.414-1.414L32 36.586l5.293-5.293Zm-1.626-12.627.006.224A4.333 4.333 0 0 0 40 23h8.253L35.667 10.414v8.252Z"/></svg>

bskyembed/.eslintrc.cjs

@@ -0,0 +1,22 @@
+module.exports = {
+  root: true,
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint', 'simple-import-sort'],
+  extends: [
+    'eslint:recommended',
+    'preact',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:@typescript-eslint/recommended-requiring-type-checking',
+  ],
+  rules: {
+    'simple-import-sort/imports': 'warn',
+    'simple-import-sort/exports': 'warn',
+    'no-else-return': 'off',
+  },
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 'latest',
+    project: ['./tsconfig.json'],
+    tsconfigRootDir: __dirname,
+  },
+}

bskyembed/eslint.config.mjs

@@ -1,52 +0,0 @@
-// @ts-check
-import js from '@eslint/js'
-import tseslint from 'typescript-eslint'
-import simpleImportSort from 'eslint-plugin-simple-import-sort'
-import globals from 'globals'
-
-export default tseslint.config(
-  // Global ignores
-  {
-    ignores: ['dist/**', 'node_modules/**'],
-  },
-
-  // Base JS recommended rules
-  js.configs.recommended,
-
-  // TypeScript rules with type checking
-  ...tseslint.configs.recommendedTypeChecked,
-
-  // Main configuration
-  {
-    files: ['**/*.{js,jsx,ts,tsx}'],
-    plugins: {
-      'simple-import-sort': simpleImportSort,
-    },
-    languageOptions: {
-      ecmaVersion: 'latest',
-      sourceType: 'module',
-      globals: {
-        ...globals.browser,
-      },
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: import.meta.dirname,
-      },
-    },
-    rules: {
-      'simple-import-sort/imports': 'warn',
-      'simple-import-sort/exports': 'warn',
-      'no-else-return': 'off',
-      '@typescript-eslint/no-require-imports': 'off',
-      '@typescript-eslint/no-unused-vars': [
-        'error',
-        {
-          argsIgnorePattern: '^_',
-          varsIgnorePattern: '^_.+',
-          caughtErrors: 'none',
-          ignoreRestSiblings: true,
-        },
-      ],
-    },
-  },
-)

bskyembed/package.json

@@ -7,7 +7,7 @@
     "dev-snippet": "tsc --project tsconfig.snippet.json && serve -s dist -p 3000 -n",
     "build": "tsc && vite build",
     "build-snippet": "tsc --project tsconfig.snippet.json",
-    "lint": "eslint --cache src",
+    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
@@ -17,21 +17,16 @@
   "devDependencies": {
     "@preact/preset-vite": "^2.10.2",
     "@vitejs/plugin-legacy": "^7.0.0",
-    "@eslint/js": "^9.18.0",
     "autoprefixer": "^10.4.19",
-    "eslint": "^9.18.0",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
-    "globals": "^15.14.0",
+    "eslint": "^8.19.0",
+    "eslint-config-preact": "^1.3.0",
+    "eslint-plugin-simple-import-sort": "^12.0.0",
     "postcss": "^8.4.38",
-    "typescript-eslint": "^8.20.0",
     "serve": "^14.2.5",
     "tailwindcss": "^3.4.3",
     "terser": "^5.43.1",
     "typescript": "^5.8.3",
     "vite": "^7.0.4",
     "vite-tsconfig-paths": "^5.1.4"
-  },
-  "resolutions": {
-    "@types/estree": "1.0.6"
   }
 }

eslint.config.mjs

@@ -1,273 +0,0 @@
-// @ts-check
-import js from '@eslint/js'
-import tseslint from 'typescript-eslint'
-import { defineConfig } from 'eslint/config';
-import react from 'eslint-plugin-react'
-import reactHooks from 'eslint-plugin-react-hooks'
-// @ts-expect-error no types
-import reactNative from 'eslint-plugin-react-native'
-// @ts-expect-error no types
-import reactNativeA11y from 'eslint-plugin-react-native-a11y'
-import simpleImportSort from 'eslint-plugin-simple-import-sort'
-import importX from 'eslint-plugin-import-x'
-import lingui from 'eslint-plugin-lingui'
-import reactCompiler from 'eslint-plugin-react-compiler'
-import bskyInternal from 'eslint-plugin-bsky-internal'
-import globals from 'globals'
-import tsParser from '@typescript-eslint/parser'
-
-export default defineConfig(
-  /**
-   * Global ignores
-   */
-  {
-    ignores: [
-      '**/__mocks__/*.ts',
-      'src/platform/polyfills.ts',
-      'src/third-party/**',
-      'ios/**',
-      'android/**',
-      'coverage/**',
-      '*.lock',
-      '.husky/**',
-      'patches/**',
-      '*.html',
-      'bskyweb/**',
-      'bskyembed/**',
-      'src/locale/locales/_build/**',
-      'src/locale/locales/**/*.js',
-      '*.e2e.ts',
-      '*.e2e.tsx',
-      'eslint.config.mjs',
-    ],
-  },
-
-  /**
-   * Base configurations
-   */
-  js.configs.recommended,
-  tseslint.configs.recommendedTypeChecked,
-  reactHooks.configs.flat.recommended,
-  // @ts-expect-error https://github.com/un-ts/eslint-plugin-import-x/issues/439
-  importX.flatConfigs.recommended,
-  importX.flatConfigs.typescript,
-  importX.flatConfigs['react-native'],
-
-  /**
-   * Main configuration for all JS/TS/JSX/TSX files
-   */
-  {
-    files: ['**/*.{js,jsx,ts,tsx}'],
-    plugins: {
-      react,
-      'react-native': reactNative,
-      'react-native-a11y': reactNativeA11y,
-      'simple-import-sort': simpleImportSort,
-      lingui,
-      'react-compiler': reactCompiler,
-      'bsky-internal': bskyInternal,
-    },
-    languageOptions: {
-      ecmaVersion: 'latest',
-      sourceType: 'module',
-      globals: {
-        ...globals.browser,
-        ...globals.node,
-      },
-      parserOptions: {
-        parser: tsParser,
-        projectService: true,
-        tsconfigRootDir: import.meta.dirname,
-        ecmaFeatures: {
-          jsx: true,
-        },
-      },
-    },
-    settings: {
-      react: {
-        version: 'detect',
-      },
-      componentWrapperFunctions: ['observer'],
-    },
-    rules: {
-      /**
-       * Custom rules
-       */
-      'bsky-internal/avoid-unwrapped-text': [
-        'error',
-        {
-          impliedTextComponents: [
-            'H1',
-            'H2',
-            'H3',
-            'H4',
-            'H5',
-            'H6',
-            'P',
-            'Admonition',
-            'Admonition.Admonition',
-            'Toast.Action',
-            'AgeAssuranceAdmonition',
-            'Span',
-            'StackedButton',
-          ],
-          impliedTextProps: [],
-          suggestedTextWrappers: {
-            Button: 'ButtonText',
-            'ToggleButton.Button': 'ToggleButton.ButtonText',
-            'SegmentedControl.Item': 'SegmentedControl.ItemText',
-          },
-        },
-      ],
-      'bsky-internal/use-exact-imports': 'error',
-      'bsky-internal/use-prefixed-imports': 'error',
-      'bsky-internal/lingui-msg-rule': 'error',
-
-      /**
-       * React & React Native
-       */
-      ...react.configs.recommended.rules,
-      ...react.configs['jsx-runtime'].rules,
-      'react/no-unescaped-entities': 'off',
-      'react/prop-types': 'off',
-      'react-native/no-inline-styles': 'off',
-      ...reactNativeA11y.configs.all.rules,
-      'react-compiler/react-compiler': 'warn',
-      // TODO: Fix these and set to error
-      'react-hooks/set-state-in-effect': 'warn',
-      'react-hooks/purity': 'warn',
-      'react-hooks/refs': 'warn',
-      'react-hooks/immutability': 'warn',
-
-      /**
-       * Import sorting
-       */
-      'simple-import-sort/imports': [
-        'error',
-        {
-          groups: [
-            // Side effect imports.
-            ['^\\u0000'],
-            // Node.js builtins prefixed with `node:`.
-            ['^node:'],
-            // Packages.
-            // Things that start with a letter (or digit or underscore), or `@` followed by a letter.
-            // React/React Native prioritized, followed by expo
-            // Followed by all packages excluding unprefixed relative ones
-            [
-              '^(react\\/(.*)$)|^(react$)|^(react-native(.*)$)',
-              '^(expo(.*)$)|^(expo$)',
-              '^(?!(?:alf|components|lib|locale|logger|platform|screens|state|view)(?:$|\\/))@?\\w',
-            ],
-            // Relative imports.
-            // Ideally, anything that starts with a dot or #
-            // due to unprefixed relative imports being used, we whitelist the relative paths we use
-            // (?:$|\\/) matches end of string or /
-            [
-              '^(?:#\\/)?(?:lib|state|logger|platform|locale)(?:$|\\/)',
-              '^(?:#\\/)?view(?:$|\\/)',
-              '^(?:#\\/)?screens(?:$|\\/)',
-              '^(?:#\\/)?alf(?:$|\\/)',
-              '^(?:#\\/)?components(?:$|\\/)',
-              '^#\\/',
-              '^\\.',
-            ],
-            // anything else - hopefully we don't have any of these
-            ['^'],
-          ],
-        },
-      ],
-      'simple-import-sort/exports': 'error',
-
-      /**
-       * Import linting
-       */
-      'import-x/consistent-type-specifier-style': ['warn', 'prefer-inline'],
-      'import-x/no-unresolved': ['error', {
-        /*
-         * The `postinstall` hook runs `compile-if-needed` locally, but not in
-         * CI. For CI-sake, ignore this.
-         */
-        ignore: ['^#\/locale\/locales\/.+\/messages'],
-      }],
-
-      /**
-       * TypeScript-specific rules
-       */
-      'no-unused-vars': 'off', // off, we use TS-specific rule below
-      '@typescript-eslint/no-unused-vars': [
-        'error',
-        {
-          argsIgnorePattern: '^_',
-          varsIgnorePattern: '^_.+',
-          caughtErrors: 'none',
-          ignoreRestSiblings: true,
-        },
-      ],
-      '@typescript-eslint/consistent-type-imports': [
-        'warn',
-        {prefer: 'type-imports', fixStyle: 'inline-type-imports'},
-      ],
-      '@typescript-eslint/no-require-imports': 'off',
-      '@typescript-eslint/no-unused-expressions': ['error', {
-        allowTernary: true,
-      }],
-      /**
-       * Maintain previous behavior - these are stricter in typescript-eslint
-       * v8 `warn` ones are probably worth fixing. `off` ones are a bit too
-       * nit-picky
-       */
-      '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/ban-ts-comment': 'off',
-      '@typescript-eslint/no-empty-object-type': 'off',
-      '@typescript-eslint/no-unsafe-function-type': 'off',
-      '@typescript-eslint/no-unsafe-assignment': 'off',
-      '@typescript-eslint/unbound-method': 'off',
-      '@typescript-eslint/no-unsafe-argument': 'off',
-      '@typescript-eslint/no-unsafe-return': 'off',
-      '@typescript-eslint/no-unsafe-member-access': 'warn',
-      '@typescript-eslint/no-unsafe-call': 'warn',
-      '@typescript-eslint/no-floating-promises': 'warn',
-      '@typescript-eslint/no-misused-promises': 'warn',
-      '@typescript-eslint/require-await': 'warn',
-      '@typescript-eslint/no-unsafe-enum-comparison': 'warn',
-      '@typescript-eslint/no-unnecessary-type-assertion': 'warn',
-      '@typescript-eslint/no-redundant-type-constituents': 'warn',
-      '@typescript-eslint/no-duplicate-type-constituents': 'warn',
-      '@typescript-eslint/no-base-to-string': 'warn',
-      '@typescript-eslint/prefer-promise-reject-errors': 'warn',
-      '@typescript-eslint/await-thenable': 'warn',
-
-      /**
-       * Turn off rules that we haven't enforced thus far
-       */
-      'no-empty-pattern': 'off',
-      'no-async-promise-executor': 'off',
-      'no-constant-binary-expression': 'warn',
-      'prefer-const': 'off',
-      'no-empty': 'off',
-      'no-unsafe-optional-chaining': 'off',
-      'no-prototype-builtins': 'off',
-      'no-var': 'off',
-      'prefer-rest-params': 'off',
-      'no-case-declarations': 'off',
-      'no-irregular-whitespace': 'off',
-      'no-useless-escape': 'off',
-      'no-sparse-arrays': 'off',
-      'no-fallthrough': 'off',
-      'no-control-regex': 'off',
-    },
-  },
-
-  /**
-   * Test files configuration
-   */
-  {
-    files: ['**/__tests__/**/*.{js,jsx,ts,tsx}', '**/*.test.{js,jsx,ts,tsx}'],
-    languageOptions: {
-      globals: {
-        ...globals.jest,
-      }
-    },
-  },
-)

eslint/__tests__/avoid-unwrapped-text.test.js

@@ -1,17 +1,14 @@
 const {RuleTester} = require('eslint')
-const tseslint = require('typescript-eslint')
 const avoidUnwrappedText = require('../avoid-unwrapped-text')
 
 const ruleTester = new RuleTester({
-  languageOptions: {
-    parser: tseslint.parser,
-    parserOptions: {
-      ecmaFeatures: {
-        jsx: true,
-      },
-      ecmaVersion: 'latest',
-      sourceType: 'module',
+  parser: require.resolve('@typescript-eslint/parser'),
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
     },
+    ecmaVersion: 6,
+    sourceType: 'module',
   },
 })
 
@@ -776,6 +773,15 @@ function MyText({ foo }) {
         errors: 1,
       },
 
+      {
+        code: `
+<View>
+  <Trans>{'foo'}</Trans>
+</View>
+       `,
+        errors: 1,
+      },
+
       {
         code: `
 <View prop={

eslint/__tests__/lingui-msg-rule.test.js

@@ -1,188 +0,0 @@
-const {RuleTester} = require('eslint')
-const tseslint = require('typescript-eslint')
-const linguiMsgRule = require('../lingui-msg-rule')
-
-const ruleTester = new RuleTester({
-  languageOptions: {
-    parser: tseslint.parser,
-    parserOptions: {
-      ecmaFeatures: {
-        jsx: true,
-      },
-      ecmaVersion: 'latest',
-      sourceType: 'module',
-    },
-  },
-})
-
-describe('lingui-msg-rule', () => {
-  const tests = {
-    valid: [
-      // msg template literal
-      {
-        code: `
-const {_} = useLingui()
-const x = _(msg\`Hello\`)
-        `,
-      },
-      // msg template literal with interpolation
-      {
-        code: `
-const {_} = useLingui()
-const name = 'World'
-const x = _(msg\`Hello \${name}\`)
-        `,
-      },
-      // plural macro
-      {
-        code: `
-const {_} = useLingui()
-const count = 5
-const x = _(plural(count, {one: '# item', other: '# items'}))
-        `,
-      },
-      // select macro
-      {
-        code: `
-const {_} = useLingui()
-const gender = 'female'
-const x = _(select(gender, {male: 'He', female: 'She', other: 'They'}))
-        `,
-      },
-      // selectOrdinal macro
-      {
-        code: `
-const {_} = useLingui()
-const position = 1
-const x = _(selectOrdinal(position, {one: '#st', two: '#nd', few: '#rd', other: '#th'}))
-        `,
-      },
-      // msg function call with object (descriptor form)
-      {
-        code: `
-const {_} = useLingui()
-const x = _(msg({message: 'Hello'}))
-        `,
-      },
-      // msg function call with object and context
-      {
-        code: `
-const {_} = useLingui()
-const x = _(msg({message: 'Hello', context: 'greeting'}))
-        `,
-      },
-    ],
-    invalid: [
-      // Plain string literal (single quotes) - with auto-fix
-      {
-        code: `
-const {_} = useLingui()
-const x = _('Bad')
-        `,
-        output: `
-const {_} = useLingui()
-const x = _(msg\`Bad\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Plain string literal (double quotes) - with auto-fix
-      {
-        code: `
-const {_} = useLingui()
-const x = _("Bad")
-        `,
-        output: `
-const {_} = useLingui()
-const x = _(msg\`Bad\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Template literal without msg tag - with auto-fix
-      {
-        code: `
-const {_} = useLingui()
-const x = _(\`Bad\`)
-        `,
-        output: `
-const {_} = useLingui()
-const x = _(msg\`Bad\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Template literal with interpolation - with auto-fix
-      {
-        code: `
-const {_} = useLingui()
-const name = 'World'
-const x = _(\`Hello \${name}\`)
-        `,
-        output: `
-const {_} = useLingui()
-const name = 'World'
-const x = _(msg\`Hello \${name}\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // String with backticks that need escaping
-      {
-        code: `
-const {_} = useLingui()
-const x = _('Use \\\`code\\\` here')
-        `,
-        output: `
-const {_} = useLingui()
-const x = _(msg\`Use \\\`code\\\` here\`)
-        `,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Variable/identifier - no auto-fix possible
-      {
-        code: `
-const {_} = useLingui()
-const message = 'Hello'
-const x = _(message)
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Arbitrary function call - no auto-fix possible
-      {
-        code: `
-const {_} = useLingui()
-const x = _(getMessage())
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Empty call - no auto-fix possible
-      {
-        code: `
-const {_} = useLingui()
-const x = _()
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Tagged template with wrong tag - no auto-fix (would need to replace tag)
-      {
-        code: `
-const {_} = useLingui()
-const x = _(html\`Hello\`)
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-      // Number literal - no auto-fix possible
-      {
-        code: `
-const {_} = useLingui()
-const x = _(123)
-        `,
-        output: null,
-        errors: [{messageId: 'missingMsg'}],
-      },
-    ],
-  }
-
-  ruleTester.run('lingui-msg-rule', linguiMsgRule, tests)
-})

eslint/avoid-unwrapped-text.js

@@ -29,331 +29,303 @@ function getTagName(node) {
   return reversedIdentifiers.reverse().join('.')
 }
 
-module.exports = {
-  meta: {
-    type: 'problem',
-    docs: {
-      description: 'Enforce text strings are wrapped in <Text> components',
-    },
-    schema: [
-      {
-        type: 'object',
-        properties: {
-          impliedTextComponents: {
-            type: 'array',
-            items: {type: 'string'},
-          },
-          impliedTextProps: {
-            type: 'array',
-            items: {type: 'string'},
-          },
-          suggestedTextWrappers: {
-            type: 'object',
-            additionalProperties: {type: 'string'},
-          },
-        },
-        additionalProperties: false,
-      },
-    ],
-  },
-  create(context) {
-    const options = context.options[0] || {}
-    const impliedTextProps = options.impliedTextProps ?? []
-    const impliedTextComponents = options.impliedTextComponents ?? []
-    const suggestedTextWrappers = options.suggestedTextWrappers ?? {}
-    const textProps = [...impliedTextProps]
-    const textComponents = ['Text', ...impliedTextComponents]
+exports.create = function create(context) {
+  const options = context.options[0] || {}
+  const impliedTextProps = options.impliedTextProps ?? []
+  const impliedTextComponents = options.impliedTextComponents ?? []
+  const suggestedTextWrappers = options.suggestedTextWrappers ?? {}
+  const textProps = [...impliedTextProps]
+  const textComponents = ['Text', ...impliedTextComponents]
 
-    function isTextComponent(tagName) {
-      return textComponents.includes(tagName) || tagName.endsWith('Text')
-    }
+  function isTextComponent(tagName) {
+    return textComponents.includes(tagName) || tagName.endsWith('Text')
+  }
 
-    return {
-      JSXText(node) {
-        if (typeof node.value !== 'string' || hasOnlyLineBreak(node.value)) {
-          return
-        }
-        let parent = node.parent
-        while (parent) {
-          if (parent.type === 'JSXElement') {
-            const tagName = getTagName(parent)
-            if (isTextComponent(tagName)) {
-              // We're good.
-              return
-            }
-            if (tagName === 'Trans') {
-              // Exit and rely on the traversal for <Trans> JSXElement (code below).
-              // TODO: Maybe validate that it's present.
-              return
-            }
-            const suggestedWrapper = suggestedTextWrappers[tagName]
-            let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
-            if (tagName !== 'View' && !suggestedWrapper) {
-              message +=
-                ' If <' +
-                tagName +
-                '> is guaranteed to render <Text>, ' +
-                'rename it to <' +
-                tagName +
-                'Text> or add it to impliedTextComponents.'
-            }
-            context.report({
-              node,
-              message,
-            })
+  return {
+    JSXText(node) {
+      if (typeof node.value !== 'string' || hasOnlyLineBreak(node.value)) {
+        return
+      }
+      let parent = node.parent
+      while (parent) {
+        if (parent.type === 'JSXElement') {
+          const tagName = getTagName(parent)
+          if (isTextComponent(tagName)) {
+            // We're good.
             return
           }
-
-          if (
-            parent.type === 'JSXAttribute' &&
-            parent.name.type === 'JSXIdentifier' &&
-            parent.parent.type === 'JSXOpeningElement' &&
-            parent.parent.parent.type === 'JSXElement'
-          ) {
-            const tagName = getTagName(parent.parent.parent)
-            const propName = parent.name.name
-            if (
-              textProps.includes(tagName + ' ' + propName) ||
-              propName === 'text' ||
-              propName.endsWith('Text')
-            ) {
-              // We're good.
-              return
-            }
-            const message =
-              'Wrap this string in <Text>.' +
-              ' If `' +
-              propName +
-              '` is guaranteed to be wrapped in <Text>, ' +
-              'rename it to `' +
-              propName +
-              'Text' +
-              '` or add it to impliedTextProps.'
-            context.report({
-              node,
-              message,
-            })
+          if (tagName === 'Trans') {
+            // Exit and rely on the traversal for <Trans> JSXElement (code below).
+            // TODO: Maybe validate that it's present.
             return
           }
-
-          parent = parent.parent
-          continue
-        }
-      },
-      Literal(node) {
-        if (typeof node.value !== 'string' && typeof node.value !== 'number') {
-          return
-        }
-        let parent = node.parent
-        while (parent) {
-          if (parent.type === 'JSXElement') {
-            const tagName = getTagName(parent)
-            if (isTextComponent(tagName)) {
-              // We're good.
-              return
-            }
-            if (tagName === 'Trans') {
-              // Exit and rely on the traversal for <Trans> JSXElement (code below).
-              // TODO: Maybe validate that it's present.
-              return
-            }
-            const suggestedWrapper = suggestedTextWrappers[tagName]
-            let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
-            if (tagName !== 'View' && !suggestedWrapper) {
-              message +=
-                ' If <' +
-                tagName +
-                '> is guaranteed to render <Text>, ' +
-                'rename it to <' +
-                tagName +
-                'Text> or add it to impliedTextComponents.'
-            }
-            context.report({
-              node,
-              message,
-            })
-            return
+          const suggestedWrapper = suggestedTextWrappers[tagName]
+          let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
+          if (tagName !== 'View' && !suggestedWrapper) {
+            message +=
+              ' If <' +
+              tagName +
+              '> is guaranteed to render <Text>, ' +
+              'rename it to <' +
+              tagName +
+              'Text> or add it to impliedTextComponents.'
           }
-
-          if (parent.type === 'BinaryExpression' && parent.operator === '+') {
-            parent = parent.parent
-            continue
-          }
-
-          if (
-            parent.type === 'JSXExpressionContainer' ||
-            parent.type === 'LogicalExpression'
-          ) {
-            parent = parent.parent
-            continue
-          }
-
-          // Be conservative for other types.
-          return
-        }
-      },
-      TemplateLiteral(node) {
-        let parent = node.parent
-        while (parent) {
-          if (parent.type === 'JSXElement') {
-            const tagName = getTagName(parent)
-            if (isTextComponent(tagName)) {
-              // We're good.
-              return
-            }
-            if (tagName === 'Trans') {
-              // Exit and rely on the traversal for <Trans> JSXElement (code below).
-              // TODO: Maybe validate that it's present.
-              return
-            }
-            const suggestedWrapper = suggestedTextWrappers[tagName]
-            let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
-            if (tagName !== 'View' && !suggestedWrapper) {
-              message +=
-                ' If <' +
-                tagName +
-                '> is guaranteed to render <Text>, ' +
-                'rename it to <' +
-                tagName +
-                'Text> or add it to impliedTextComponents.'
-            }
-            context.report({
-              node,
-              message,
-            })
-            return
-          }
-
-          if (
-            parent.type === 'CallExpression' &&
-            parent.callee.type === 'Identifier' &&
-            parent.callee.name === '_'
-          ) {
-            // This is a user-facing string, keep going up.
-            parent = parent.parent
-            continue
-          }
-
-          if (parent.type === 'BinaryExpression' && parent.operator === '+') {
-            parent = parent.parent
-            continue
-          }
-
-          if (
-            parent.type === 'JSXExpressionContainer' ||
-            parent.type === 'LogicalExpression' ||
-            parent.type === 'TaggedTemplateExpression'
-          ) {
-            parent = parent.parent
-            continue
-          }
-
-          // Be conservative for other types.
-          return
-        }
-      },
-      JSXElement(node) {
-        if (getTagName(node) !== 'Trans') {
-          return
-        }
-        let parent = node.parent
-        while (parent) {
-          if (parent.type === 'JSXElement') {
-            const tagName = getTagName(parent)
-            if (isTextComponent(tagName)) {
-              // We're good.
-              return
-            }
-            if (tagName === 'Trans') {
-              // Exit and rely on the traversal for this JSXElement.
-              // TODO: Should nested <Trans> even be allowed?
-              return
-            }
-            const suggestedWrapper = suggestedTextWrappers[tagName]
-            let message = `Wrap this <Trans> in <${suggestedWrapper ?? 'Text'}>.`
-            if (tagName !== 'View' && !suggestedWrapper) {
-              message +=
-                ' If <' +
-                tagName +
-                '> is guaranteed to render <Text>, ' +
-                'rename it to <' +
-                tagName +
-                'Text> or add it to impliedTextComponents.'
-            }
-            context.report({
-              node,
-              message,
-            })
-            return
-          }
-
-          if (
-            parent.type === 'JSXAttribute' &&
-            parent.name.type === 'JSXIdentifier' &&
-            parent.parent.type === 'JSXOpeningElement' &&
-            parent.parent.parent.type === 'JSXElement'
-          ) {
-            const tagName = getTagName(parent.parent.parent)
-            const propName = parent.name.name
-            if (
-              textProps.includes(tagName + ' ' + propName) ||
-              propName === 'text' ||
-              propName.endsWith('Text')
-            ) {
-              // We're good.
-              return
-            }
-            const message =
-              'Wrap this <Trans> in <Text>.' +
-              ' If `' +
-              propName +
-              '` is guaranteed to be wrapped in <Text>, ' +
-              'rename it to `' +
-              propName +
-              'Text' +
-              '` or add it to impliedTextProps.'
-            context.report({
-              node,
-              message,
-            })
-            return
-          }
-
-          parent = parent.parent
-          continue
-        }
-      },
-      ReturnStatement(node) {
-        let fnScope = context.sourceCode.getScope(node)
-        while (fnScope && fnScope.type !== 'function') {
-          fnScope = fnScope.upper
-        }
-        if (!fnScope) {
-          return
-        }
-        const fn = fnScope.block
-        if (!fn.id || fn.id.type !== 'Identifier' || !fn.id.name) {
-          return
-        }
-        if (!/^[A-Z]\w*Text$/.test(fn.id.name)) {
-          return
-        }
-        if (!node.argument || node.argument.type !== 'JSXElement') {
-          return
-        }
-        const openingEl = node.argument.openingElement
-        if (openingEl.name.type !== 'JSXIdentifier') {
-          return
-        }
-        const returnedComponentName = openingEl.name.name
-        if (!isTextComponent(returnedComponentName)) {
           context.report({
             node,
-            message:
-              'Components ending with *Text must return <Text> or <SomeText>.',
+            message,
           })
+          return
         }
-      },
-    }
-  },
+
+        if (
+          parent.type === 'JSXAttribute' &&
+          parent.name.type === 'JSXIdentifier' &&
+          parent.parent.type === 'JSXOpeningElement' &&
+          parent.parent.parent.type === 'JSXElement'
+        ) {
+          const tagName = getTagName(parent.parent.parent)
+          const propName = parent.name.name
+          if (
+            textProps.includes(tagName + ' ' + propName) ||
+            propName === 'text' ||
+            propName.endsWith('Text')
+          ) {
+            // We're good.
+            return
+          }
+          const message =
+            'Wrap this string in <Text>.' +
+            ' If `' +
+            propName +
+            '` is guaranteed to be wrapped in <Text>, ' +
+            'rename it to `' +
+            propName +
+            'Text' +
+            '` or add it to impliedTextProps.'
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        parent = parent.parent
+        continue
+      }
+    },
+    Literal(node) {
+      if (typeof node.value !== 'string' && typeof node.value !== 'number') {
+        return
+      }
+      let parent = node.parent
+      while (parent) {
+        if (parent.type === 'JSXElement') {
+          const tagName = getTagName(parent)
+          if (isTextComponent(tagName)) {
+            // We're good.
+            return
+          }
+          if (tagName === 'Trans') {
+            // Exit and rely on the traversal for <Trans> JSXElement (code below).
+            // TODO: Maybe validate that it's present.
+            return
+          }
+          const suggestedWrapper = suggestedTextWrappers[tagName]
+          let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
+          if (tagName !== 'View' && !suggestedWrapper) {
+            message +=
+              ' If <' +
+              tagName +
+              '> is guaranteed to render <Text>, ' +
+              'rename it to <' +
+              tagName +
+              'Text> or add it to impliedTextComponents.'
+          }
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        if (parent.type === 'BinaryExpression' && parent.operator === '+') {
+          parent = parent.parent
+          continue
+        }
+
+        if (
+          parent.type === 'JSXExpressionContainer' ||
+          parent.type === 'LogicalExpression'
+        ) {
+          parent = parent.parent
+          continue
+        }
+
+        // Be conservative for other types.
+        return
+      }
+    },
+    TemplateLiteral(node) {
+      let parent = node.parent
+      while (parent) {
+        if (parent.type === 'JSXElement') {
+          const tagName = getTagName(parent)
+          if (isTextComponent(tagName)) {
+            // We're good.
+            return
+          }
+          if (tagName === 'Trans') {
+            // Exit and rely on the traversal for <Trans> JSXElement (code below).
+            // TODO: Maybe validate that it's present.
+            return
+          }
+          const suggestedWrapper = suggestedTextWrappers[tagName]
+          let message = `Wrap this string in <${suggestedWrapper ?? 'Text'}>.`
+          if (tagName !== 'View' && !suggestedWrapper) {
+            message +=
+              ' If <' +
+              tagName +
+              '> is guaranteed to render <Text>, ' +
+              'rename it to <' +
+              tagName +
+              'Text> or add it to impliedTextComponents.'
+          }
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        if (
+          parent.type === 'CallExpression' &&
+          parent.callee.type === 'Identifier' &&
+          parent.callee.name === '_'
+        ) {
+          // This is a user-facing string, keep going up.
+          parent = parent.parent
+          continue
+        }
+
+        if (parent.type === 'BinaryExpression' && parent.operator === '+') {
+          parent = parent.parent
+          continue
+        }
+
+        if (
+          parent.type === 'JSXExpressionContainer' ||
+          parent.type === 'LogicalExpression' ||
+          parent.type === 'TaggedTemplateExpression'
+        ) {
+          parent = parent.parent
+          continue
+        }
+
+        // Be conservative for other types.
+        return
+      }
+    },
+    JSXElement(node) {
+      if (getTagName(node) !== 'Trans') {
+        return
+      }
+      let parent = node.parent
+      while (parent) {
+        if (parent.type === 'JSXElement') {
+          const tagName = getTagName(parent)
+          if (isTextComponent(tagName)) {
+            // We're good.
+            return
+          }
+          if (tagName === 'Trans') {
+            // Exit and rely on the traversal for this JSXElement.
+            // TODO: Should nested <Trans> even be allowed?
+            return
+          }
+          const suggestedWrapper = suggestedTextWrappers[tagName]
+          let message = `Wrap this <Trans> in <${suggestedWrapper ?? 'Text'}>.`
+          if (tagName !== 'View' && !suggestedWrapper) {
+            message +=
+              ' If <' +
+              tagName +
+              '> is guaranteed to render <Text>, ' +
+              'rename it to <' +
+              tagName +
+              'Text> or add it to impliedTextComponents.'
+          }
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        if (
+          parent.type === 'JSXAttribute' &&
+          parent.name.type === 'JSXIdentifier' &&
+          parent.parent.type === 'JSXOpeningElement' &&
+          parent.parent.parent.type === 'JSXElement'
+        ) {
+          const tagName = getTagName(parent.parent.parent)
+          const propName = parent.name.name
+          if (
+            textProps.includes(tagName + ' ' + propName) ||
+            propName === 'text' ||
+            propName.endsWith('Text')
+          ) {
+            // We're good.
+            return
+          }
+          const message =
+            'Wrap this <Trans> in <Text>.' +
+            ' If `' +
+            propName +
+            '` is guaranteed to be wrapped in <Text>, ' +
+            'rename it to `' +
+            propName +
+            'Text' +
+            '` or add it to impliedTextProps.'
+          context.report({
+            node,
+            message,
+          })
+          return
+        }
+
+        parent = parent.parent
+        continue
+      }
+    },
+    ReturnStatement(node) {
+      let fnScope = context.getScope()
+      while (fnScope && fnScope.type !== 'function') {
+        fnScope = fnScope.upper
+      }
+      if (!fnScope) {
+        return
+      }
+      const fn = fnScope.block
+      if (!fn.id || fn.id.type !== 'Identifier' || !fn.id.name) {
+        return
+      }
+      if (!/^[A-Z]\w*Text$/.test(fn.id.name)) {
+        return
+      }
+      if (!node.argument || node.argument.type !== 'JSXElement') {
+        return
+      }
+      const openingEl = node.argument.openingElement
+      if (openingEl.name.type !== 'JSXIdentifier') {
+        return
+      }
+      const returnedComponentName = openingEl.name.name
+      if (!isTextComponent(returnedComponentName)) {
+        context.report({
+          node,
+          message:
+            'Components ending with *Text must return <Text> or <SomeText>.',
+        })
+      }
+    },
+  }
 }

eslint/index.js

@@ -1,16 +1,10 @@
 'use strict'
 
-const plugin = {
-  meta: {
-    name: 'eslint-plugin-bsky-internal',
-    version: '1.0.0',
-  },
+module.exports = {
   rules: {
     'avoid-unwrapped-text': require('./avoid-unwrapped-text'),
     'use-exact-imports': require('./use-exact-imports'),
+    'use-typed-gates': require('./use-typed-gates'),
     'use-prefixed-imports': require('./use-prefixed-imports'),
-    'lingui-msg-rule': require('./lingui-msg-rule'),
   },
 }
-
-module.exports = plugin

eslint/lingui-msg-rule.js

@@ -1,110 +0,0 @@
-'use strict'
-
-/**
- * @type {import('eslint').Rule.RuleModule}
- */
-module.exports = {
-  meta: {
-    type: 'problem',
-    docs: {
-      description:
-        'Enforce that Lingui _() function is called with msg`` template literal or plural/select macros',
-      recommended: true,
-    },
-    fixable: 'code',
-    messages: {
-      missingMsg:
-        'Lingui _() must be called with msg`...` or msg({...}) or plural/select/selectOrdinal. Example: _(msg`Hello`)',
-    },
-    schema: [],
-  },
-
-  create(context) {
-    // Valid Lingui macro functions that can be passed to _()
-    const VALID_MACRO_FUNCTIONS = new Set([
-      'msg',
-      'plural',
-      'select',
-      'selectOrdinal',
-    ])
-
-    /**
-     * Escape backticks and backslashes for template literal
-     */
-    function escapeForTemplateLiteral(str) {
-      return str.replace(/\\`/g, '`').replace(/`/g, '\\`')
-    }
-
-    /**
-     * Try to get a fixer for the given argument
-     * Returns null if we can't safely fix it
-     */
-    function getFixer(firstArg) {
-      const sourceCode = context.sourceCode ?? context.getSourceCode()
-
-      // Fix string literals: _('foo') -> _(msg`foo`)
-      if (firstArg.type === 'Literal' && typeof firstArg.value === 'string') {
-        const escaped = escapeForTemplateLiteral(firstArg.value)
-        return function (fixer) {
-          return fixer.replaceText(firstArg, 'msg`' + escaped + '`')
-        }
-      }
-
-      // Fix untagged template literals: _(`foo`) -> _(msg`foo`)
-      if (firstArg.type === 'TemplateLiteral') {
-        const text = sourceCode.getText(firstArg)
-        return function (fixer) {
-          return fixer.replaceText(firstArg, 'msg' + text)
-        }
-      }
-
-      return null
-    }
-
-    return {
-      CallExpression(node) {
-        // Check if this is a call to _()
-        if (node.callee.type !== 'Identifier' || node.callee.name !== '_') {
-          return
-        }
-
-        // Must have at least one argument
-        if (node.arguments.length === 0) {
-          context.report({
-            node,
-            messageId: 'missingMsg',
-          })
-          return
-        }
-
-        const firstArg = node.arguments[0]
-
-        // Valid: _(msg`...`)
-        if (
-          firstArg.type === 'TaggedTemplateExpression' &&
-          firstArg.tag.type === 'Identifier' &&
-          firstArg.tag.name === 'msg'
-        ) {
-          return
-        }
-
-        // Valid: _(msg(...)), _(plural(...)), _(select(...)), _(selectOrdinal(...))
-        if (
-          firstArg.type === 'CallExpression' &&
-          firstArg.callee.type === 'Identifier' &&
-          VALID_MACRO_FUNCTIONS.has(firstArg.callee.name)
-        ) {
-          return
-        }
-
-        // Everything else is invalid
-        const fix = getFixer(firstArg)
-        context.report({
-          node,
-          messageId: 'missingMsg',
-          fix,
-        })
-      },
-    }
-  },
-}

eslint/use-exact-imports.js

@@ -3,29 +3,20 @@ const BANNED_IMPORTS = [
   '@fortawesome/free-solid-svg-icons',
 ]
 
-module.exports = {
-  meta: {
-    type: 'suggestion',
-    docs: {
-      description: 'Prevent importing entire icon packages',
+exports.create = function create(context) {
+  return {
+    ImportDeclaration(node) {
+      const source = node.source
+      if (typeof source.value !== 'string') {
+        return
+      }
+      if (BANNED_IMPORTS.includes(source.value)) {
+        context.report({
+          node,
+          message:
+            'Import the specific thing you want instead of the entire package',
+        })
+      }
     },
-    schema: [],
-  },
-  create(context) {
-    return {
-      ImportDeclaration(node) {
-        const source = node.source
-        if (typeof source.value !== 'string') {
-          return
-        }
-        if (BANNED_IMPORTS.includes(source.value)) {
-          context.report({
-            node,
-            message:
-              'Import the specific thing you want instead of the entire package',
-          })
-        }
-      },
-    }
-  },
+  }
 }

eslint/use-prefixed-imports.js

@@ -13,11 +13,7 @@ const BANNED_IMPORT_PREFIXES = [
 module.exports = {
   meta: {
     type: 'suggestion',
-    docs: {
-      description: 'Enforce using prefixed imports for internal paths',
-    },
     fixable: 'code',
-    schema: [],
   },
   create(context) {
     return {

eslint/use-typed-gates.js

@@ -0,0 +1,31 @@
+'use strict'
+
+exports.create = function create(context) {
+  return {
+    ImportSpecifier(node) {
+      if (
+        !node.local ||
+        node.local.type !== 'Identifier' ||
+        node.local.name !== 'useGate'
+      ) {
+        return
+      }
+      if (
+        node.parent.type !== 'ImportDeclaration' ||
+        !node.parent.source ||
+        node.parent.source.type !== 'Literal'
+      ) {
+        return
+      }
+      const source = node.parent.source.value
+      if (source.startsWith('statsig') || source.startsWith('@statsig')) {
+        context.report({
+          node,
+          message:
+            "Use useGate() from '#/lib/statsig/statsig' instead of the one on npm.",
+        })
+      }
+      // TODO: Verify gate() call results aren't stored in variables.
+    },
+  }
+}

index.web.js

@@ -1,4 +1,3 @@
-import '@expo/metro-runtime'
 import '#/platform/markBundleStartTime'
 import '#/platform/polyfills'
 

jest/jestSetup.js

@@ -99,9 +99,20 @@ jest.mock('expo-modules-core', () => ({
   requireNativeViewManager: jest.fn().mockImplementation(_ => {
     return () => null
   }),
-  createPermissionHook: () => () => [true],
 }))
 
 jest.mock('expo-localization', () => ({
   getLocales: () => [],
 }))
+
+jest.mock('statsig-react-native-expo', () => ({
+  Statsig: {
+    initialize() {},
+    initializeCalled() {
+      return false
+    },
+  },
+}))
+
+jest.mock('../src/logger/bitdrift/lib', () => ({}))
+jest.mock('../src/lib/statsig/statsig', () => ({}))

modules/bottom-sheet/src/BottomSheetNativeComponent.tsx

@@ -11,7 +11,7 @@ import {
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {requireNativeModule, requireNativeViewManager} from 'expo-modules-core'
 
-import {IS_IOS} from '#/env'
+import {isIOS} from '#/platform/detection'
 import {
   type BottomSheetState,
   type BottomSheetViewProps,
@@ -30,7 +30,7 @@ const NativeView: React.ComponentType<
 
 const NativeModule = requireNativeModule('BottomSheet')
 
-const IS_IOS15 =
+const isIOS15 =
   Platform.OS === 'ios' &&
   // semvar - can be 3 segments, so can't use Number(Platform.Version)
   Number(Platform.Version.split('.').at(0)) < 16
@@ -91,7 +91,7 @@ export class BottomSheetNativeComponent extends React.Component<
     }
 
     let extraStyles
-    if (IS_IOS15 && this.state.viewHeight) {
+    if (isIOS15 && this.state.viewHeight) {
       const {viewHeight} = this.state
       const cornerRadius = this.props.cornerRadius ?? 0
       if (viewHeight < screenHeight / 2) {
@@ -112,7 +112,7 @@ export class BottomSheetNativeComponent extends React.Component<
           onStateChange={this.onStateChange}
           extraStyles={extraStyles}
           onLayout={e => {
-            if (IS_IOS15) {
+            if (isIOS15) {
               const {height} = e.nativeEvent.layout
               this.setState({viewHeight: height})
             }
@@ -153,7 +153,7 @@ function BottomSheetNativeComponentInner({
   const insets = useSafeAreaInsets()
   const cornerRadius = rest.cornerRadius ?? 0
 
-  const sheetHeight = IS_IOS ? screenHeight - insets.top : screenHeight
+  const sheetHeight = isIOS ? screenHeight - insets.top : screenHeight
 
   return (
     <NativeView

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bsky.app",
-  "version": "1.116.0",
+  "version": "1.114.0",
   "private": true,
   "engines": {
     "node": ">=20"
@@ -41,15 +41,15 @@
     "test-watch": "NODE_ENV=test jest --watchAll",
     "test-ci": "NODE_ENV=test jest --ci --forceExit --reporters=default --reporters=jest-junit",
     "test-coverage": "NODE_ENV=test jest --coverage",
-    "lint": "eslint --cache --quiet src",
+    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx src",
     "lint-native": "swiftlint ./modules && ktlint ./modules",
     "lint-native:fix": "swiftlint --fix ./modules && ktlint --format ./modules",
     "typecheck": "tsc --project ./tsconfig.check.json",
     "e2e:mock-server": "NODE_ENV=development ./jest/dev-infra/with-test-redis-and-db.sh ts-node --project tsconfig.e2e.json __e2e__/mock-server.ts",
     "e2e:build": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:ios",
     "e2e:build-android": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:android",
-    "e2e:start": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo start -c",
-    "e2e:run": "maestro test",
+    "e2e:start": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo start",
+    "e2e:run": "maestro test __e2e__",
     "perf:test": "NODE_ENV=test maestro test",
     "perf:test:run": "NODE_ENV=test maestro test __e2e__/perf-test.yml",
     "perf:test:measure": "NODE_ENV=test flashlight test --bundleId xyz.blueskyweb.app --testCommand \"yarn perf:test\" --duration 150000 --resultsFilePath .perf/results.json",
@@ -73,7 +73,7 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.18.18",
+    "@atproto/api": "^0.18.15",
     "@bitdrift/react-native": "^0.6.8",
     "@braintree/sanitize-url": "^6.0.2",
     "@bsky.app/alf": "^0.1.6",
@@ -93,7 +93,6 @@
     "@fortawesome/free-regular-svg-icons": "^6.1.1",
     "@fortawesome/free-solid-svg-icons": "^6.1.1",
     "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@growthbook/growthbook-react": "^1.6.2",
     "@haileyok/bluesky-video": "0.3.2",
     "@ipld/dag-cbor": "^9.2.0",
     "@lingui/react": "^4.14.1",
@@ -166,13 +165,11 @@
     "expo-task-manager": "~14.0.9",
     "expo-updates": "~29.0.14",
     "expo-video": "~3.0.15",
-    "expo-video-thumbnails": "^10.0.8",
     "expo-web-browser": "~15.0.10",
     "fast-deep-equal": "^3.1.3",
     "fast-text-encoding": "^1.0.6",
     "history": "^5.3.0",
     "hls.js": "^1.6.2",
-    "idb-keyval": "^6.2.2",
     "js-sha256": "^0.9.0",
     "jwt-decode": "^4.0.0",
     "lande": "^1.0.10",
@@ -222,6 +219,7 @@
     "react-textarea-autosize": "^8.5.3",
     "sonner": "^2.0.7",
     "sonner-native": "^0.21.0",
+    "statsig-react-native-expo": "^4.6.1",
     "tippy.js": "^6.3.7",
     "tlds": "^1.234.0",
     "tldts": "^6.1.46",
@@ -229,13 +227,11 @@
     "zod": "^3.20.2"
   },
   "devDependencies": {
-    "@atproto/dev-env": "^0.3.206",
+    "@atproto/dev-env": "^0.3.204",
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@babel/runtime": "^7.26.0",
-    "@eslint/js": "^9.39.2",
     "@expo/config-plugins": "~54.0.1",
-    "@expo/metro-runtime": "~6.1.2",
     "@lingui/cli": "^4.14.1",
     "@lingui/macro": "^4.14.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
@@ -252,24 +248,23 @@
     "@types/psl": "^1.1.1",
     "@types/react": "^19.1.12",
     "@types/react-dom": "^19.1.9",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "babel-jest": "^29.7.0",
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-react-compiler": "^19.1.0-rc.3",
     "babel-preset-expo": "~54.0.0",
-    "eslint": "^9.39.2",
-    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint": "^8.19.0",
     "eslint-plugin-bsky-internal": "link:./eslint",
-    "eslint-plugin-import-x": "^4.16.1",
-    "eslint-plugin-lingui": "^0.11.0",
-    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-ft-flow": "^2.0.3",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-lingui": "^0.2.0",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-compiler": "^19.1.0-rc.2",
-    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-native": "^5.0.0",
-    "eslint-plugin-react-native-a11y": "^3.5.1",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-react-native-a11y": "^3.3.0",
+    "eslint-plugin-simple-import-sort": "^12.0.0",
     "file-loader": "6.2.0",
-    "globals": "^17.0.0",
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
     "jest": "^29.7.0",
@@ -284,7 +279,6 @@
     "ts-node": "^10.9.1",
     "ts-plugin-sort-import-suggestions": "^1.0.4",
     "typescript": "^5.9.2",
-    "typescript-eslint": "^8.53.0",
     "webpack-bundle-analyzer": "^4.10.1"
   },
   "resolutions": {
@@ -294,9 +288,9 @@
     "**/@react-native-async-storage/async-storage": "2.2.0",
     "**/expo-constants": "18.0.8",
     "**/expo-device": "7.1.4",
+    "**/zod": "3.23.8",
     "**/multiformats": "9.9.0",
-    "unicode-segmenter": "0.14.5",
-    "@types/estree": "1.0.6"
+    "unicode-segmenter": "0.14.5"
   },
   "jest": {
     "preset": "jest-expo/ios",

src/App.native.tsx

@@ -1,4 +1,5 @@
 import '#/logger/sentry/setup'
+import '#/logger/bitdrift/setup'
 import '#/view/icons'
 
 import React, {useEffect, useState} from 'react'
@@ -17,10 +18,12 @@ import * as Sentry from '@sentry/react-native'
 import {KeyboardControllerProvider} from '#/lib/hooks/useEnableKeyboardController'
 import {Provider as HideBottomBarBorderProvider} from '#/lib/hooks/useHideBottomBarBorder'
 import {QueryProvider} from '#/lib/react-query'
+import {Provider as StatsigProvider, tryFetchGates} from '#/lib/statsig/statsig'
 import {s} from '#/lib/styles'
 import {ThemeProvider} from '#/lib/ThemeContext'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
+import {isAndroid, isIOS} from '#/platform/detection'
 import {Provider as A11yProvider} from '#/state/a11y'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
@@ -64,17 +67,8 @@ import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdate
 import {Provider as PortalProvider} from '#/components/Portal'
 import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
 import {ToastOutlet} from '#/components/Toast'
-import {
-  prefetchAgeAssuranceConfig,
-  Provider as AgeAssuranceV2Provider,
-} from '#/ageAssurance'
-import {
-  AnalyticsContext,
-  AnalyticsFeaturesContext,
-  features,
-  setupDeviceId,
-} from '#/analytics'
-import {IS_ANDROID, IS_IOS} from '#/env'
+import {Provider as AgeAssuranceV2Provider} from '#/ageAssurance'
+import {prefetchAgeAssuranceConfig} from '#/ageAssurance'
 import {
   prefetchLiveEvents,
   Provider as LiveEventsProvider,
@@ -85,10 +79,10 @@ import {BottomSheetProvider} from '../modules/bottom-sheet'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
 
 SplashScreen.preventAutoHideAsync()
-if (IS_IOS) {
+if (isIOS) {
   SystemUI.setBackgroundColorAsync('black')
 }
-if (IS_ANDROID) {
+if (isAndroid) {
   // iOS is handled by the config plugin -sfn
   ScreenOrientation.lockAsync(
     ScreenOrientation.OrientationLock.PORTRAIT_UP,
@@ -119,7 +113,7 @@ function InnerApp() {
         if (account) {
           await resumeSession(account)
         } else {
-          await features.init
+          await tryFetchGates(undefined, 'prefer-fresh-gates')
         }
       } catch (e) {
         logger.error(`session: resume failed`, {message: e})
@@ -149,9 +143,9 @@ function InnerApp() {
               <React.Fragment
                 // Resets the entire tree below when it changes:
                 key={currentAccount?.did}>
-                <AnalyticsFeaturesContext>
-                  <QueryProvider currentDid={currentAccount?.did}>
-                    <PolicyUpdateOverlayProvider>
+                <QueryProvider currentDid={currentAccount?.did}>
+                  <PolicyUpdateOverlayProvider>
+                    <StatsigProvider>
                       <LiveEventsProvider>
                         <AgeAssuranceV2Provider>
                           <ComposerProvider>
@@ -197,9 +191,9 @@ function InnerApp() {
                           </ComposerProvider>
                         </AgeAssuranceV2Provider>
                       </LiveEventsProvider>
-                    </PolicyUpdateOverlayProvider>
-                  </QueryProvider>
-                </AnalyticsFeaturesContext>
+                    </StatsigProvider>
+                  </PolicyUpdateOverlayProvider>
+                </QueryProvider>
               </React.Fragment>
             </VideoVolumeProvider>
           </Splash>
@@ -213,7 +207,7 @@ function App() {
   const [isReady, setReady] = useState(false)
 
   React.useEffect(() => {
-    Promise.all([initPersistedState(), Geo.resolve(), setupDeviceId]).then(() =>
+    Promise.all([initPersistedState(), Geo.resolve()]).then(() =>
       setReady(true),
     )
   }, [])
@@ -231,32 +225,30 @@ function App() {
       <A11yProvider>
         <KeyboardControllerProvider>
           <OnboardingProvider>
-            <AnalyticsContext>
-              <SessionProvider>
-                <PrefsStateProvider>
-                  <I18nProvider>
-                    <ShellStateProvider>
-                      <ModalStateProvider>
-                        <DialogStateProvider>
-                          <LightboxStateProvider>
-                            <PortalProvider>
-                              <BottomSheetProvider>
-                                <StarterPackProvider>
-                                  <SafeAreaProvider
-                                    initialMetrics={initialWindowMetrics}>
-                                    <InnerApp />
-                                  </SafeAreaProvider>
-                                </StarterPackProvider>
-                              </BottomSheetProvider>
-                            </PortalProvider>
-                          </LightboxStateProvider>
-                        </DialogStateProvider>
-                      </ModalStateProvider>
-                    </ShellStateProvider>
-                  </I18nProvider>
-                </PrefsStateProvider>
-              </SessionProvider>
-            </AnalyticsContext>
+            <SessionProvider>
+              <PrefsStateProvider>
+                <I18nProvider>
+                  <ShellStateProvider>
+                    <ModalStateProvider>
+                      <DialogStateProvider>
+                        <LightboxStateProvider>
+                          <PortalProvider>
+                            <BottomSheetProvider>
+                              <StarterPackProvider>
+                                <SafeAreaProvider
+                                  initialMetrics={initialWindowMetrics}>
+                                  <InnerApp />
+                                </SafeAreaProvider>
+                              </StarterPackProvider>
+                            </BottomSheetProvider>
+                          </PortalProvider>
+                        </LightboxStateProvider>
+                      </DialogStateProvider>
+                    </ModalStateProvider>
+                  </ShellStateProvider>
+                </I18nProvider>
+              </PrefsStateProvider>
+            </SessionProvider>
           </OnboardingProvider>
         </KeyboardControllerProvider>
       </A11yProvider>

src/App.web.tsx

@@ -9,6 +9,7 @@ import {useLingui} from '@lingui/react'
 import * as Sentry from '@sentry/react-native'
 
 import {QueryProvider} from '#/lib/react-query'
+import {Provider as StatsigProvider} from '#/lib/statsig/statsig'
 import {ThemeProvider} from '#/lib/ThemeContext'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
@@ -54,16 +55,8 @@ import {Provider as PortalProvider} from '#/components/Portal'
 import {Provider as ActiveVideoProvider} from '#/components/Post/Embed/VideoEmbed/ActiveVideoWebContext'
 import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
 import {ToastOutlet} from '#/components/Toast'
-import {
-  prefetchAgeAssuranceConfig,
-  Provider as AgeAssuranceV2Provider,
-} from '#/ageAssurance'
-import {
-  AnalyticsContext,
-  AnalyticsFeaturesContext,
-  features,
-  setupDeviceId,
-} from '#/analytics'
+import {Provider as AgeAssuranceV2Provider} from '#/ageAssurance'
+import {prefetchAgeAssuranceConfig} from '#/ageAssurance'
 import {
   prefetchLiveEvents,
   Provider as LiveEventsProvider,
@@ -94,8 +87,6 @@ function InnerApp() {
       try {
         if (account) {
           await resumeSession(account)
-        } else {
-          await features.init
         }
       } catch (e) {
         logger.error(`session: resumeSession failed`, {message: e})
@@ -128,9 +119,9 @@ function InnerApp() {
               <React.Fragment
                 // Resets the entire tree below when it changes:
                 key={currentAccount?.did}>
-                <AnalyticsFeaturesContext>
-                  <QueryProvider currentDid={currentAccount?.did}>
-                    <PolicyUpdateOverlayProvider>
+                <QueryProvider currentDid={currentAccount?.did}>
+                  <PolicyUpdateOverlayProvider>
+                    <StatsigProvider>
                       <LiveEventsProvider>
                         <AgeAssuranceV2Provider>
                           <ComposerProvider>
@@ -172,9 +163,9 @@ function InnerApp() {
                           </ComposerProvider>
                         </AgeAssuranceV2Provider>
                       </LiveEventsProvider>
-                    </PolicyUpdateOverlayProvider>
-                  </QueryProvider>
-                </AnalyticsFeaturesContext>
+                    </StatsigProvider>
+                  </PolicyUpdateOverlayProvider>
+                </QueryProvider>
               </React.Fragment>
             </ActiveVideoProvider>
           </VideoVolumeProvider>
@@ -188,7 +179,7 @@ function App() {
   const [isReady, setReady] = useState(false)
 
   React.useEffect(() => {
-    Promise.all([initPersistedState(), Geo.resolve(), setupDeviceId]).then(() =>
+    Promise.all([initPersistedState(), Geo.resolve()]).then(() =>
       setReady(true),
     )
   }, [])
@@ -205,27 +196,25 @@ function App() {
     <Geo.Provider>
       <A11yProvider>
         <OnboardingProvider>
-          <AnalyticsContext>
-            <SessionProvider>
-              <PrefsStateProvider>
-                <I18nProvider>
-                  <ShellStateProvider>
-                    <ModalStateProvider>
-                      <DialogStateProvider>
-                        <LightboxStateProvider>
-                          <PortalProvider>
-                            <StarterPackProvider>
-                              <InnerApp />
-                            </StarterPackProvider>
-                          </PortalProvider>
-                        </LightboxStateProvider>
-                      </DialogStateProvider>
-                    </ModalStateProvider>
-                  </ShellStateProvider>
-                </I18nProvider>
-              </PrefsStateProvider>
-            </SessionProvider>
-          </AnalyticsContext>
+          <SessionProvider>
+            <PrefsStateProvider>
+              <I18nProvider>
+                <ShellStateProvider>
+                  <ModalStateProvider>
+                    <DialogStateProvider>
+                      <LightboxStateProvider>
+                        <PortalProvider>
+                          <StarterPackProvider>
+                            <InnerApp />
+                          </StarterPackProvider>
+                        </PortalProvider>
+                      </LightboxStateProvider>
+                    </DialogStateProvider>
+                  </ModalStateProvider>
+                </ShellStateProvider>
+              </I18nProvider>
+            </PrefsStateProvider>
+          </SessionProvider>
         </OnboardingProvider>
       </A11yProvider>
     </Geo.Provider>

src/Navigation.tsx

@@ -28,7 +28,7 @@ import {
   storePayloadForAccountSwitch,
 } from '#/lib/hooks/useNotificationHandler'
 import {useWebScrollRestoration} from '#/lib/hooks/useWebScrollRestoration'
-import {useCallOnce} from '#/lib/once'
+import {logger as notyLogger} from '#/lib/notifications/util'
 import {buildStateObject} from '#/lib/routes/helpers'
 import {
   type AllNavigatorParams,
@@ -38,11 +38,13 @@ import {
   type MessagesTabNavigatorParams,
   type MyProfileTabNavigatorParams,
   type NotificationsTabNavigatorParams,
-  type RouteParams,
   type SearchTabNavigatorParams,
-  type State,
 } from '#/lib/routes/types'
+import {type RouteParams, type State} from '#/lib/routes/types'
+import {attachRouteToLogEvents, logEvent} from '#/lib/statsig/statsig'
 import {bskyTitle} from '#/lib/strings/headings'
+import {logger} from '#/logger'
+import {isNative, isWeb} from '#/platform/detection'
 import {useUnreadNotifications} from '#/state/queries/notifications/unread'
 import {useSession} from '#/state/session'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
@@ -136,9 +138,6 @@ import {
   EmailDialogScreenID,
   useEmailDialogControl,
 } from '#/components/dialogs/EmailDialog'
-import {useAnalytics} from '#/analytics'
-import {setNavigationMetadata} from '#/analytics/metadata'
-import {IS_NATIVE, IS_WEB} from '#/env'
 import {router} from '#/routes'
 import {Referrer} from '../modules/expo-bluesky-swiss-army'
 
@@ -843,11 +842,11 @@ const LINKING = {
     // native, since the home tab and the home screen are defined as initial routes, we don't need to return a state
     // since it will be created by react-navigation.
     if (path.includes('intent/')) {
-      if (IS_NATIVE) return
+      if (isNative) return
       return buildStateObject('Flat', 'Home', params)
     }
 
-    if (IS_NATIVE) {
+    if (isNative) {
       if (name === 'Search') {
         return buildStateObject('SearchTab', 'Search', params)
       }
@@ -880,13 +879,11 @@ const LINKING = {
 let lastHandledNotificationDateDedupe: number | undefined
 
 function RoutesContainer({children}: React.PropsWithChildren<{}>) {
-  const ax = useAnalytics()
-  const notyLogger = ax.logger.useChild(ax.logger.Context.Notifications)
   const theme = useColorSchemeStyle(DefaultTheme, DarkTheme)
   const {currentAccount, accounts} = useSession()
   const {onPressSwitchAccount} = useAccountSwitcher()
   const {setShowLoggedOut} = useLoggedOutViewControls()
-  const previousScreen = useRef<string | undefined>(undefined)
+  const prevLoggedRouteName = useRef<string | undefined>(undefined)
   const emailDialogControl = useEmailDialogControl()
   const closeAllActiveElements = useCloseAllActiveElements()
 
@@ -924,7 +921,7 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
   )
 
   async function handlePushNotificationEntry() {
-    if (!IS_NATIVE) return
+    if (!isNative) return
 
     // deep links take precedence - on android,
     // getLastNotificationResponseAsync returns a "notification"
@@ -948,10 +945,11 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
       const payload = getNotificationPayload(response.notification)
 
       if (payload) {
-        ax.metric('notifications:openApp', {
-          reason: payload.reason,
-          causedBoot: true,
-        })
+        notyLogger.metric(
+          'notifications:openApp',
+          {reason: payload.reason, causedBoot: true},
+          {statsig: false},
+        )
 
         if (payload.reason === 'chat-message') {
           handleChatMessage(payload)
@@ -975,69 +973,47 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
     }
   }
 
-  const onNavigationReady = useCallOnce(() => {
-    const currentScreen = getCurrentRouteName()
-    setNavigationMetadata({
-      previousScreen: currentScreen,
-      currentScreen,
-    })
-    previousScreen.current = currentScreen
-
-    handlePushNotificationEntry()
-
-    ax.metric('router:navigate', {})
-
+  function onReady() {
+    prevLoggedRouteName.current = getCurrentRouteName()
     if (currentAccount && shouldRequestEmailConfirmation(currentAccount)) {
       emailDialogControl.open({
         id: EmailDialogScreenID.VerificationReminder,
       })
       snoozeEmailConfirmationPrompt()
     }
-
-    ax.metric('init', {
-      initMs: Math.round(
-        // @ts-ignore Emitted by Metro in the bundle prelude
-        performance.now() - global.__BUNDLE_START_TIME__,
-      ),
-    })
-
-    if (IS_WEB) {
-      const referrerInfo = Referrer.getReferrerInfo()
-      if (referrerInfo && referrerInfo.hostname !== 'bsky.app') {
-        ax.metric('deepLink:referrerReceived', {
-          to: window.location.href,
-          referrer: referrerInfo?.referrer,
-          hostname: referrerInfo?.hostname,
-        })
-      }
-    }
-  })
+  }
 
   return (
-    <NavigationContainer
-      ref={navigationRef}
-      linking={LINKING}
-      theme={theme}
-      onStateChange={() => {
-        const currentScreen = getCurrentRouteName()
-        // do this before metric
-        setNavigationMetadata({
-          previousScreen: previousScreen.current,
-          currentScreen,
-        })
-        ax.metric('router:navigate', {from: previousScreen.current})
-        previousScreen.current = currentScreen
-      }}
-      onReady={onNavigationReady}
-      // WARNING: Implicit navigation to nested navigators is depreciated in React Navigation 7.x
-      // However, there's a fair amount of places we do that, especially in when popping to the top of stacks.
-      // See BottomBar.tsx for an example of how to handle nested navigators in the tabs correctly.
-      // I'm scared of missing a spot (esp. with push notifications etc) so let's enable this legacy behaviour for now.
-      // We will need to confirm we handle nested navigators correctly by the time we migrate to React Navigation 8.x
-      // -sfn
-      navigationInChildEnabled>
-      {children}
-    </NavigationContainer>
+    <>
+      <NavigationContainer
+        ref={navigationRef}
+        linking={LINKING}
+        theme={theme}
+        onStateChange={() => {
+          logger.metric(
+            'router:navigate',
+            {from: prevLoggedRouteName.current},
+            {statsig: false},
+          )
+          prevLoggedRouteName.current = getCurrentRouteName()
+        }}
+        onReady={() => {
+          attachRouteToLogEvents(getCurrentRouteName)
+          logModuleInitTime()
+          onReady()
+          logger.metric('router:navigate', {}, {statsig: false})
+          handlePushNotificationEntry()
+        }}
+        // WARNING: Implicit navigation to nested navigators is depreciated in React Navigation 7.x
+        // However, there's a fair amount of places we do that, especially in when popping to the top of stacks.
+        // See BottomBar.tsx for an example of how to handle nested navigators in the tabs correctly.
+        // I'm scared of missing a spot (esp. with push notifications etc) so let's enable this legacy behaviour for now.
+        // We will need to confirm we handle nested navigators correctly by the time we migrate to React Navigation 8.x
+        // -sfn
+        navigationInChildEnabled>
+        {children}
+      </NavigationContainer>
+    </>
   )
 }
 
@@ -1093,7 +1069,7 @@ function reset(): Promise<void> {
     navigationRef.dispatch(
       CommonActions.reset({
         index: 0,
-        routes: [{name: IS_NATIVE ? 'HomeTab' : 'Home'}],
+        routes: [{name: isNative ? 'HomeTab' : 'Home'}],
       }),
     )
     return Promise.race([
@@ -1111,6 +1087,44 @@ function reset(): Promise<void> {
   }
 }
 
+let didInit = false
+function logModuleInitTime() {
+  if (didInit) {
+    return
+  }
+  didInit = true
+
+  const initMs = Math.round(
+    // @ts-ignore Emitted by Metro in the bundle prelude
+    performance.now() - global.__BUNDLE_START_TIME__,
+  )
+  console.log(`Time to first paint: ${initMs} ms`)
+  logEvent('init', {
+    initMs,
+  })
+
+  if (isWeb) {
+    const referrerInfo = Referrer.getReferrerInfo()
+    if (referrerInfo && referrerInfo.hostname !== 'bsky.app') {
+      logEvent('deepLink:referrerReceived', {
+        to: window.location.href,
+        referrer: referrerInfo?.referrer,
+        hostname: referrerInfo?.hostname,
+      })
+    }
+  }
+
+  if (__DEV__) {
+    // This log is noisy, so keep false committed
+    const shouldLog = false
+    // Relies on our patch to polyfill.js in metro-runtime
+    const initLogs = (global as any).__INIT_LOGS__
+    if (shouldLog && Array.isArray(initLogs)) {
+      console.log(initLogs.join('\n'))
+    }
+  }
+}
+
 export {
   FlatNavigator,
   navigate,

src/Splash.tsx

@@ -21,9 +21,9 @@ import * as SplashScreen from 'expo-splash-screen'
 
 import {Logotype} from '#/view/icons/Logotype'
 // @ts-ignore
-import splashImagePointer from '../assets/splash/splash.png'
+import splashImagePointer from '../assets/splash.png'
 // @ts-ignore
-import darkSplashImagePointer from '../assets/splash/splash-dark.png'
+import darkSplashImagePointer from '../assets/splash-dark.png'
 const splashImageUri = RNImage.resolveAssetSource(splashImagePointer).uri
 const darkSplashImageUri = RNImage.resolveAssetSource(
   darkSplashImagePointer,

src/ageAssurance/components/NoAccessScreen.tsx

@@ -9,6 +9,9 @@ import {
   useCreateSupportLink,
 } from '#/lib/hooks/useCreateSupportLink'
 import {dateDiff, useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
+import {logger} from '#/logger'
+import {isWeb} from '#/platform/detection'
+import {isNative} from '#/platform/detection'
 import {useIsBirthdateUpdateAllowed} from '#/state/birthdate'
 import {useSessionApi} from '#/state/session'
 import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
@@ -35,8 +38,6 @@ import {
   isLegacyBirthdateBug,
   useAgeAssuranceRegionConfig,
 } from '#/ageAssurance/util'
-import {useAnalytics} from '#/analytics'
-import {IS_NATIVE, IS_WEB} from '#/env'
 import {useDeviceGeolocationApi} from '#/geolocation'
 
 const textStyles = [a.text_md, a.leading_snug]
@@ -44,7 +45,6 @@ const textStyles = [a.text_md, a.leading_snug]
 export function NoAccessScreen() {
   const t = useTheme()
   const {_} = useLingui()
-  const ax = useAnalytics()
   const {gtPhone} = useBreakpoints()
   const insets = useSafeAreaInsets()
   const birthdateControl = useDialogControl()
@@ -63,8 +63,8 @@ export function NoAccessScreen() {
 
   useEffect(() => {
     // just counting overall hits here
-    ax.metric(`blockedGeoOverlay:shown`, {})
-    ax.metric(`ageAssurance:noAccessScreen:shown`, {
+    logger.metric(`blockedGeoOverlay:shown`, {})
+    logger.metric(`ageAssurance:noAccessScreen:shown`, {
       accountCreatedAt: data?.accountCreatedAt || 'unknown',
       isAARegion,
       hasDeclaredAge,
@@ -74,7 +74,7 @@ export function NoAccessScreen() {
   }, [])
 
   const onPressLogout = useCallback(() => {
-    if (IS_WEB) {
+    if (isWeb) {
       // We're switching accounts, which remounts the entire app.
       // On mobile, this gets us Home, but on the web we also need reset the URL.
       // We can't change the URL via a navigate() call because the navigator
@@ -103,7 +103,10 @@ export function NoAccessScreen() {
             label={_(msg`Click here to update your birthdate`)}
             style={[textStyles]}
             {...createStaticClick(() => {
-              ax.metric('ageAssurance:noAccessScreen:openBirthdateDialog', {})
+              logger.metric(
+                'ageAssurance:noAccessScreen:openBirthdateDialog',
+                {},
+              )
               birthdateControl.open()
             })}>
             clicking here
@@ -136,7 +139,7 @@ export function NoAccessScreen() {
           contentContainerStyle={[
             a.px_2xl,
             {
-              paddingTop: IS_WEB
+              paddingTop: isWeb
                 ? a.p_5xl.padding
                 : insets.top + a.p_2xl.padding,
               paddingBottom: 100,
@@ -269,7 +272,6 @@ export function NoAccessScreen() {
 function AccessSection() {
   const t = useTheme()
   const {_, i18n} = useLingui()
-  const ax = useAnalytics()
   const control = useDialogControl()
   const appealControl = Dialog.useDialogControl()
   const locationControl = Dialog.useDialogControl()
@@ -303,7 +305,7 @@ function AccessSection() {
                 label={_(msg`Contact our moderation team`)}
                 {...createStaticClick(() => {
                   appealControl.open()
-                  ax.metric('ageAssurance:appealDialogOpen', {})
+                  logger.metric('ageAssurance:appealDialogOpen', {})
                 })}>
                 contact our moderation team
               </SimpleInlineLinkText>{' '}
@@ -319,7 +321,7 @@ function AccessSection() {
                 color={hasInitiated ? 'secondary' : 'primary'}
                 onPress={() => {
                   control.open()
-                  ax.metric('ageAssurance:initDialogOpen', {
+                  logger.metric('ageAssurance:initDialogOpen', {
                     hasInitiatedPreviously: hasInitiated,
                   })
                 }}>
@@ -357,7 +359,7 @@ function AccessSection() {
         )}
 
         <View style={[a.gap_xs]}>
-          {IS_NATIVE && (
+          {isNative && (
             <>
               <Admonition>
                 <Trans>

src/ageAssurance/components/RedirectOverlay.tsx

@@ -15,6 +15,8 @@ import {useLingui} from '@lingui/react'
 import {retry} from '#/lib/async/retry'
 import {wait} from '#/lib/async/wait'
 import {parseLinkingUrl} from '#/lib/parseLinkingUrl'
+import {isWeb} from '#/platform/detection'
+import {isIOS} from '#/platform/detection'
 import {useAgent, useSession} from '#/state/session'
 import {atoms as a, platform, useBreakpoints, useTheme} from '#/alf'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
@@ -25,8 +27,7 @@ import {CircleInfo_Stroke2_Corner0_Rounded as ErrorIcon} from '#/components/icon
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {refetchAgeAssuranceServerState} from '#/ageAssurance'
-import {useAnalytics} from '#/analytics'
-import {IS_IOS, IS_WEB} from '#/env'
+import {logger} from '#/ageAssurance'
 
 export type RedirectOverlayState = {
   result: 'success' | 'unknown'
@@ -91,7 +92,7 @@ export function Provider({children}: {children?: React.ReactNode}) {
       actorDid: params.get('actorDid') ?? undefined,
     })
 
-    if (IS_WEB) {
+    if (isWeb) {
       // Clear the URL parameters so they don't re-trigger
       history.pushState(null, '', '/')
     }
@@ -144,7 +145,7 @@ export function RedirectOverlay() {
           // setting a zIndex when using FullWindowOverlay on iOS
           // means the taps pass straight through to the underlying content (???)
           // so don't set it on iOS. FullWindowOverlay already does the job.
-          !IS_IOS && {zIndex: 9999},
+          !isIOS && {zIndex: 9999},
           t.atoms.bg,
           gtMobile ? a.p_2xl : a.p_xl,
           a.align_center,
@@ -173,7 +174,6 @@ export function RedirectOverlay() {
 
 function Inner() {
   const t = useTheme()
-  const ax = useAnalytics()
   const {_} = useLingui()
   const agent = useAgent()
   const polling = useRef(false)
@@ -187,7 +187,7 @@ function Inner() {
 
     polling.current = true
 
-    ax.metric('ageAssurance:redirectDialogOpen', {})
+    logger.metric('ageAssurance:redirectDialogOpen', {})
 
     wait(
       3e3,
@@ -218,18 +218,18 @@ function Inner() {
 
         setSuccess(true)
 
-        ax.metric('ageAssurance:redirectDialogSuccess', {})
+        logger.metric('ageAssurance:redirectDialogSuccess', {})
       })
       .catch(() => {
         if (unmounted.current) return
         setError(true)
-        ax.metric('ageAssurance:redirectDialogFail', {})
+        logger.metric('ageAssurance:redirectDialogFail', {})
       })
 
     return () => {
       unmounted.current = true
     }
-  }, [ax, agent])
+  }, [agent])
 
   if (success) {
     return (

src/ageAssurance/useBeginAgeAssurance.ts

@@ -12,7 +12,6 @@ import {isNetworkError} from '#/lib/hooks/useCleanError'
 import {useAgent} from '#/state/session'
 import {usePatchAgeAssuranceServerState} from '#/ageAssurance'
 import {logger} from '#/ageAssurance/logger'
-import {useAnalytics} from '#/analytics'
 import {BLUESKY_PROXY_DID} from '#/env'
 import {useGeolocation} from '#/geolocation'
 
@@ -20,7 +19,6 @@ const IS_DEV_ENV = BLUESKY_PROXY_DID !== PUBLIC_APPVIEW_DID
 const APPVIEW = IS_DEV_ENV ? DEV_ENV_APPVIEW : PUBLIC_APPVIEW
 
 export function useBeginAgeAssurance() {
-  const ax = useAnalytics()
   const agent = useAgent()
   const geolocation = useGeolocation()
   const patchAgeAssuranceStateResponse = usePatchAgeAssuranceServerState()
@@ -50,11 +48,15 @@ export function useBeginAgeAssurance() {
       appView.sessionManager.session.accessJwt = token
       appView.sessionManager.session.refreshJwt = ''
 
-      ax.metric('ageAssurance:api:begin', {
-        platform: Platform.OS,
-        countryCode,
-        regionCode,
-      })
+      logger.metric(
+        'ageAssurance:api:begin',
+        {
+          platform: Platform.OS,
+          countryCode,
+          regionCode,
+        },
+        {statsig: false},
+      )
 
       /*
        * 2s wait is good actually. Email sending takes a hot sec and this helps

src/alf/atoms.ts

@@ -5,8 +5,6 @@ import {CARD_ASPECT_RATIO} from '#/lib/constants'
 import {native, platform, web} from '#/alf/util/platform'
 import * as Layout from '#/components/Layout'
 
-const EXP_CURVE = 'cubic-bezier(0.16, 1, 0.3, 1)'
-
 export const atoms = {
   ...baseAtoms,
 
@@ -105,7 +103,7 @@ export const atoms = {
   }),
   // special composite animation for dialogs
   zoom_fade_in: web({
-    animation: `zoomIn ${EXP_CURVE} 0.3s, fadeIn ${EXP_CURVE} 0.3s`,
+    animation: 'zoomIn ease-out 0.1s, fadeIn ease-out 0.1s',
   }),
 
   /**

src/alf/fonts.ts

@@ -1,6 +1,6 @@
 import {type TextStyle} from 'react-native'
 
-import {IS_ANDROID, IS_WEB} from '#/env'
+import {isAndroid, isWeb} from '#/platform/detection'
 import {type Device, device} from '#/storage'
 
 const WEB_FONT_FAMILIES = `system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"`
@@ -39,7 +39,7 @@ export function setFontFamily(fontFamily: Device['fontFamily']) {
  */
 export function applyFonts(style: TextStyle, fontFamily: 'system' | 'theme') {
   if (fontFamily === 'theme') {
-    if (IS_ANDROID) {
+    if (isAndroid) {
       style.fontFamily =
         {
           400: 'Inter-Regular',
@@ -71,7 +71,7 @@ export function applyFonts(style: TextStyle, fontFamily: 'system' | 'theme') {
       }
     }
 
-    if (IS_WEB) {
+    if (isWeb) {
       // fallback families only supported on web
       style.fontFamily += `, ${WEB_FONT_FAMILIES}`
     }
@@ -83,7 +83,7 @@ export function applyFonts(style: TextStyle, fontFamily: 'system' | 'theme') {
     style.fontVariant = (style.fontVariant || []).concat('no-contextual')
   } else {
     // fallback families only supported on web
-    if (IS_WEB) {
+    if (isWeb) {
       style.fontFamily = style.fontFamily || WEB_FONT_FAMILIES
     }
 

src/alf/typography.tsx

@@ -4,9 +4,9 @@ import {type StyleProp, type TextStyle} from 'react-native'
 import {UITextView} from 'react-native-uitextview'
 import createEmojiRegex from 'emoji-regex'
 
+import {isNative} from '#/platform/detection'
+import {isIOS} from '#/platform/detection'
 import {type Alf, applyFonts, atoms, flatten} from '#/alf'
-import {IS_NATIVE} from '#/env'
-import {IS_IOS} from '#/env'
 
 /**
  * Ensures that `lineHeight` defaults to a relative value of `1`, or applies
@@ -34,7 +34,7 @@ export function normalizeTextStyles(
     if (s.lineHeight !== 0 && s.lineHeight <= 2) {
       s.lineHeight = Math.round(s.fontSize * s.lineHeight)
     }
-  } else if (!IS_NATIVE) {
+  } else if (!isNative) {
     s.lineHeight = s.fontSize
   }
 
@@ -81,7 +81,7 @@ export function renderChildrenWithEmoji(
   props: Omit<TextProps, 'children'> = {},
   emoji: boolean,
 ) {
-  if (!IS_IOS || !emoji) {
+  if (!isIOS || !emoji) {
     return children
   }
   return Children.map(children, child => {

src/alf/util/systemUI.ts

@@ -2,10 +2,10 @@ import * as SystemUI from 'expo-system-ui'
 import {type Theme} from '@bsky.app/alf'
 
 import {logger} from '#/logger'
-import {IS_ANDROID} from '#/env'
+import {isAndroid} from '#/platform/detection'
 
 export function setSystemUITheme(themeType: 'theme' | 'lightbox', t: Theme) {
-  if (IS_ANDROID) {
+  if (isAndroid) {
     try {
       if (themeType === 'theme') {
         SystemUI.setBackgroundColorAsync(t.atoms.bg.backgroundColor)

src/alf/util/useColorModeTheme.ts

@@ -2,9 +2,9 @@ import React from 'react'
 import {type ColorSchemeName, useColorScheme} from 'react-native'
 import {type ThemeName} from '@bsky.app/alf'
 
+import {isWeb} from '#/platform/detection'
 import {useThemePrefs} from '#/state/shell'
 import {dark, dim, light} from '#/alf/themes'
-import {IS_WEB} from '#/env'
 
 export function useColorModeTheme(): ThemeName {
   const theme = useThemeName()
@@ -40,7 +40,7 @@ function getThemeName(
 
 function updateDocument(theme: ThemeName) {
   // @ts-ignore web only
-  if (IS_WEB && typeof window !== 'undefined') {
+  if (isWeb && typeof window !== 'undefined') {
     // @ts-ignore web only
     const html = window.document.documentElement
     // @ts-ignore web only

src/analytics/PassiveAnalytics.tsx

@@ -1,32 +0,0 @@
-import {useEffect, useRef} from 'react'
-
-import {getCurrentState, onAppStateChange} from '#/lib/appState'
-import {useAnalytics} from '#/analytics'
-
-/**
- * Tracks passive analytics like app foreground/background time.
- */
-export function PassiveAnalytics() {
-  const ax = useAnalytics()
-  const lastActive = useRef(
-    getCurrentState() === 'active' ? performance.now() : null,
-  )
-
-  useEffect(() => {
-    const sub = onAppStateChange(state => {
-      if (state === 'active') {
-        lastActive.current = performance.now()
-        ax.metric('state:foreground', {})
-      } else if (lastActive.current !== null) {
-        ax.metric('state:background', {
-          secondsActive: Math.round(
-            (performance.now() - lastActive.current) / 1e3,
-          ),
-        })
-      }
-    })
-    return () => sub.remove()
-  }, [ax])
-
-  return null
-}

src/analytics/features/index.ts

@@ -1,89 +0,0 @@
-import {MMKV} from '@bsky.app/react-native-mmkv'
-import {setPolyfills} from '@growthbook/growthbook'
-import {GrowthBook} from '@growthbook/growthbook-react'
-
-import {getNavigationMetadata, type Metadata} from '#/analytics/metadata'
-import * as env from '#/env'
-
-export {Features} from '#/analytics/features/types'
-
-const CACHE = new MMKV({id: 'bsky_features_cache'})
-
-setPolyfills({
-  localStorage: {
-    getItem: key => {
-      const value = CACHE.getString(key)
-      return value != null ? JSON.parse(value) : null
-    },
-    setItem: async (key, value) => {
-      CACHE.set(key, value)
-    },
-  },
-})
-
-/**
- * We vary the amount of time we wait for GrowthBook to fetch feature
- * gates based on the strategy specified.
- */
-export type FeatureFetchStrategy = 'prefer-low-latency' | 'prefer-fresh-gates'
-
-const TIMEOUT_INIT = 500 // TODO should base on p99 or something
-const TIMEOUT_PREFER_LOW_LATENCY = 250
-const TIMEOUT_PREFER_FRESH_GATES = 1500
-
-export const features = new GrowthBook({
-  apiHost: env.GROWTHBOOK_API_HOST,
-  clientKey: env.GROWTHBOOK_CLIENT_KEY,
-})
-
-/**
- * Initializer promise that must be awaited before using the GrowthBook
- * instance or rendering the `AnalyticsFeaturesContext`. Note: this may not be
- * fully initialized if it takes longer than `TIMEOUT_INIT` to initialize. In
- * that case, we may see a flash of uncustomized content until the
- * initialization completes.
- */
-export const init = new Promise<void>(async y => {
-  await features.init({timeout: TIMEOUT_INIT})
-  y()
-})
-
-/**
- * Refresh feature gates from GrowthBook. Updates attributes based on the
- * provided account, if any.
- */
-export async function refresh({strategy}: {strategy: FeatureFetchStrategy}) {
-  await features.refreshFeatures({
-    timeout:
-      strategy === 'prefer-low-latency'
-        ? TIMEOUT_PREFER_LOW_LATENCY
-        : TIMEOUT_PREFER_FRESH_GATES,
-  })
-}
-
-/**
- * Converts our metadata into GrowthBook attributes and sets them. GrowthBook
- * attributes are manually configured in the GrowthBook dashboard. So these
- * values need to match exactly. Therefore, let's add them here manually to and
- * not spread them to avoid mistakes.
- */
-export function setAttributes({
-  base,
-  geolocation,
-  session,
-  preferences,
-}: Metadata) {
-  features.setAttributes({
-    deviceId: base.deviceId,
-    sessionId: base.sessionId,
-    platform: base.platform,
-    appVersion: base.appVersion,
-    countryCode: geolocation.countryCode,
-    regionCode: geolocation.regionCode,
-    did: session?.did,
-    isBskyPds: session?.isBskyPds,
-    appLanguage: preferences?.appLanguage,
-    contentLanguages: preferences?.contentLanguages,
-    currentScreen: getNavigationMetadata()?.currentScreen,
-  })
-}

src/analytics/features/types.ts

@@ -1,12 +0,0 @@
-export enum Features {
-  // core flags
-  IsBskyTeam = 'is_bsky_team',
-
-  // debug flags
-  DebugFeedContext = 'debug_feed_context',
-
-  // feature flags
-  ImportContactsOnboardingDisable = 'import_contacts:onboarding:disable',
-  ImportContactsSettingsDisable = 'import_contacts:settings:disable',
-  LiveNowBetaDisable = 'live_now_beta:disable',
-}

src/analytics/identifiers/device.ts

@@ -1,26 +0,0 @@
-import uuid from 'react-native-uuid'
-import AsyncStorage from '@react-native-async-storage/async-storage'
-
-import {device} from '#/storage'
-
-const LEGACY_STABLE_ID = 'STATSIG_LOCAL_STORAGE_STABLE_ID'
-
-export async function getAndMigrateDeviceId() {
-  const migrated = getDeviceId()
-  if (migrated) return migrated
-  const id = (await AsyncStorage.getItem(LEGACY_STABLE_ID)) || uuid.v4()
-  device.set(['deviceId'], id)
-  return id
-}
-
-export function getDeviceId() {
-  return device.get(['deviceId'])
-}
-
-export function getDeviceIdOrThrow() {
-  const id = device.get(['deviceId'])
-  if (!id) {
-    throw new Error(`deviceId is not set, call getAndMigrateDeviceId first`)
-  }
-  return id
-}

src/analytics/identifiers/index.ts

@@ -1,2 +0,0 @@
-export * from '#/analytics/identifiers/device'
-export * from '#/analytics/identifiers/session'

src/analytics/identifiers/session.test.ts

@@ -1,79 +0,0 @@
-jest.mock('#/storage', () => ({
-  device: {
-    get: jest.fn(),
-    set: jest.fn(),
-  },
-}))
-
-jest.mock('#/analytics/identifiers/util', () => ({
-  isSessionIdExpired: jest.fn(),
-}))
-
-jest.mock('#/lib/appState', () => ({
-  onAppStateChange: jest.fn(() => ({remove: jest.fn()})),
-}))
-
-beforeEach(() => {
-  jest.resetModules()
-  jest.clearAllMocks()
-})
-
-function getMocks() {
-  const {device} = require('#/storage')
-  const {isSessionIdExpired} = require('#/analytics/identifiers/util')
-  return {
-    device: jest.mocked(device),
-    isSessionIdExpired: jest.mocked(isSessionIdExpired),
-  }
-}
-
-describe('session initialization', () => {
-  it('creates new session and sets timestamp when none exists', () => {
-    const {device, isSessionIdExpired} = getMocks()
-    device.get.mockReturnValue(undefined)
-    isSessionIdExpired.mockReturnValue(false)
-
-    const {getInitialSessionId} = require('./session')
-    const id = getInitialSessionId()
-
-    expect(id).toBeDefined()
-    expect(typeof id).toBe('string')
-    expect(device.set).toHaveBeenCalledWith(['nativeSessionId'], id)
-    expect(device.set).toHaveBeenCalledWith(
-      ['nativeSessionIdLastEventAt'],
-      expect.any(Number),
-    )
-  })
-
-  it('reuses existing session when not expired', () => {
-    const {device, isSessionIdExpired} = getMocks()
-    const existingId = 'existing-session-id'
-    device.get.mockImplementation((key: string[]) => {
-      if (key[0] === 'nativeSessionId') return existingId
-      if (key[0] === 'nativeSessionIdLastEventAt') return Date.now()
-      return undefined
-    })
-    isSessionIdExpired.mockReturnValue(false)
-
-    const {getInitialSessionId} = require('./session')
-
-    expect(getInitialSessionId()).toBe(existingId)
-  })
-
-  it('creates new session when existing is expired', () => {
-    const {device, isSessionIdExpired} = getMocks()
-    const existingId = 'existing-session-id'
-    device.get.mockImplementation((key: string[]) => {
-      if (key[0] === 'nativeSessionId') return existingId
-      if (key[0] === 'nativeSessionIdLastEventAt') return Date.now() - 999999
-      return undefined
-    })
-    isSessionIdExpired.mockReturnValue(true)
-
-    const {getInitialSessionId} = require('./session')
-    const id = getInitialSessionId()
-
-    expect(id).not.toBe(existingId)
-    expect(device.set).toHaveBeenCalledWith(['nativeSessionId'], id)
-  })
-})

src/analytics/identifiers/session.ts

@@ -1,40 +0,0 @@
-import {useEffect, useState} from 'react'
-import uuid from 'react-native-uuid'
-
-import {onAppStateChange} from '#/lib/appState'
-import {isSessionIdExpired} from '#/analytics/identifiers/util'
-import {device} from '#/storage'
-
-let sessionId = (() => {
-  const existing = device.get(['nativeSessionId'])
-  const lastEvent = device.get(['nativeSessionIdLastEventAt'])
-  const id = existing && !isSessionIdExpired(lastEvent) ? existing : uuid.v4()
-  device.set(['nativeSessionId'], id)
-  device.set(['nativeSessionIdLastEventAt'], Date.now())
-  return id
-})()
-
-export function getInitialSessionId() {
-  return sessionId
-}
-
-export function useSessionId() {
-  const [id, setId] = useState(() => sessionId)
-
-  useEffect(() => {
-    const sub = onAppStateChange(state => {
-      if (state === 'active') {
-        const lastEvent = device.get(['nativeSessionIdLastEventAt'])
-        if (isSessionIdExpired(lastEvent)) {
-          sessionId = uuid.v4()
-          device.set(['nativeSessionId'], sessionId)
-          setId(sessionId)
-        }
-      }
-      device.set(['nativeSessionIdLastEventAt'], Date.now())
-    })
-    return () => sub.remove()
-  }, [])
-
-  return id
-}

src/analytics/identifiers/session.web.ts

@@ -1,44 +0,0 @@
-import {useEffect, useState} from 'react'
-import uuid from 'react-native-uuid'
-
-import {onAppStateChange} from '#/lib/appState'
-import {isSessionIdExpired} from '#/analytics/identifiers/util'
-
-const SESSION_ID_KEY = 'bsky_session_id'
-const LAST_EVENT_KEY = 'bsky_session_id_last_event_at'
-
-let sessionId = (() => {
-  const existing = window.sessionStorage.getItem(SESSION_ID_KEY)
-  const lastEventStr = window.sessionStorage.getItem(LAST_EVENT_KEY)
-  const lastEvent = lastEventStr ? Number(lastEventStr) : undefined
-  const id = existing && !isSessionIdExpired(lastEvent) ? existing : uuid.v4()
-  window.sessionStorage.setItem(SESSION_ID_KEY, id)
-  window.sessionStorage.setItem(LAST_EVENT_KEY, String(Date.now()))
-  return id
-})()
-
-export function getInitialSessionId() {
-  return sessionId
-}
-
-export function useSessionId() {
-  const [id, setId] = useState(() => sessionId)
-
-  useEffect(() => {
-    const sub = onAppStateChange(state => {
-      if (state === 'active') {
-        const lastEventStr = window.sessionStorage.getItem(LAST_EVENT_KEY)
-        const lastEvent = lastEventStr ? Number(lastEventStr) : undefined
-        if (isSessionIdExpired(lastEvent)) {
-          sessionId = uuid.v4()
-          window.sessionStorage.setItem(SESSION_ID_KEY, sessionId)
-          setId(sessionId)
-        }
-      }
-      window.sessionStorage.setItem(LAST_EVENT_KEY, String(Date.now()))
-    })
-    return () => sub.remove()
-  }, [])
-
-  return id
-}

src/analytics/identifiers/util.ts

@@ -1,9 +0,0 @@
-import * as env from '#/env'
-
-const ONE_MIN = 60 * 1e3
-const TTL = (env.IS_NATIVE ? 5 : 30) * ONE_MIN // 5 min on native
-
-export function isSessionIdExpired(since: number | undefined) {
-  if (since === undefined) return false
-  return Date.now() - since >= TTL
-}

src/analytics/index.tsx

@@ -1,232 +0,0 @@
-import {createContext, useContext, useEffect, useMemo} from 'react'
-import {Platform} from 'react-native'
-
-import {Logger} from '#/logger'
-import {
-  Features,
-  features as feats,
-  init,
-  refresh,
-  setAttributes,
-} from '#/analytics/features'
-import {
-  getAndMigrateDeviceId,
-  getDeviceId,
-  getInitialSessionId,
-  useSessionId,
-} from '#/analytics/identifiers'
-import {
-  getMetadataForLogger,
-  getNavigationMetadata,
-  type MergeableMetadata,
-  type Metadata,
-} from '#/analytics/metadata'
-import {type Metrics, metrics} from '#/analytics/metrics'
-import * as refParams from '#/analytics/misc/refParams'
-import * as env from '#/env'
-import {useGeolocation} from '#/geolocation'
-import {device} from '#/storage'
-
-export * as utils from '#/analytics/utils'
-export const features = {init, refresh}
-export {Features} from '#/analytics/features'
-export {type Metrics} from '#/analytics/metrics'
-
-type LoggerType = {
-  debug: Logger['debug']
-  info: Logger['info']
-  log: Logger['log']
-  warn: Logger['warn']
-  error: Logger['error']
-  /**
-   * Clones the existing logger and overrides the `context` value. Existing
-   * metadata is inherited.
-   *
-   * ```ts
-   * const ax = useAnalytics()
-   * const logger = ax.logger.useChild(ax.logger.Context.Notifications)
-   * ```
-   */
-  useChild: (context: Exclude<Logger['context'], undefined>) => LoggerType
-  Context: typeof Logger.Context
-}
-export type AnalyticsContextType = {
-  metadata: Metadata
-  logger: LoggerType
-  metric: <E extends keyof Metrics>(
-    event: E,
-    payload: Metrics[E],
-    metadata?: MergeableMetadata,
-  ) => void
-  features: typeof Features & {
-    enabled(feature: Features): boolean
-  }
-}
-export type AnalyticsBaseContextType = Omit<AnalyticsContextType, 'features'>
-
-function createLogger(
-  context: Logger['context'],
-  metadata: Partial<Metadata>,
-): LoggerType {
-  const logger = Logger.create(context, metadata)
-  return {
-    debug: logger.debug.bind(logger),
-    info: logger.info.bind(logger),
-    log: logger.log.bind(logger),
-    warn: logger.warn.bind(logger),
-    error: logger.error.bind(logger),
-    useChild: (context: Exclude<Logger['context'], undefined>) => {
-      return useMemo(() => createLogger(context, metadata), [context, metadata])
-    },
-    Context: Logger.Context,
-  }
-}
-
-const Context = createContext<AnalyticsBaseContextType>({
-  logger: createLogger(Logger.Context.Default, {}),
-  metric: (event, payload, metadata) => {
-    if (metadata && '__meta' in metadata) {
-      delete metadata.__meta
-    }
-    metrics.track(event, payload, {
-      ...metadata,
-      navigation: getNavigationMetadata(),
-    })
-  },
-  metadata: {
-    base: {
-      deviceId: getDeviceId() ?? 'unknown',
-      sessionId: getInitialSessionId(),
-      platform: Platform.OS,
-      appVersion: env.APP_VERSION,
-      bundleIdentifier: env.BUNDLE_IDENTIFIER,
-      bundleDate: env.BUNDLE_DATE,
-      referrerSrc: refParams.src,
-      referrerUrl: refParams.url,
-    },
-    geolocation: device.get(['mergedGeolocation']) || {
-      countryCode: '',
-      regionCode: '',
-    },
-  },
-})
-
-/**
- * Ensures that deviceId is set and migrated from legacy storage. Handled on
- * startup in `App.<platform>.tsx`. This must be awaited prior to the app
- * booting up.
- */
-export const setupDeviceId = getAndMigrateDeviceId()
-
-/**
- * Analytics context provider. Decorates the parent analytics context with
- * additional metadata. Nesting should be done carefully and sparingly.
- */
-export function AnalyticsContext({
-  children,
-  metadata,
-}: {
-  children: React.ReactNode
-  metadata?: MergeableMetadata
-}) {
-  if (metadata) {
-    if (!('__meta' in metadata)) {
-      throw new Error(
-        'Use the useMeta() helper when passing metadata to AnalyticsContext',
-      )
-    }
-  }
-  const sessionId = useSessionId()
-  const geolocation = useGeolocation()
-  const parentContext = useContext(Context)
-  const childContext = useMemo(() => {
-    const combinedMetadata = {
-      ...parentContext.metadata,
-      ...metadata,
-      base: {
-        ...parentContext.metadata.base,
-        sessionId,
-      },
-      geolocation,
-    }
-    const context: AnalyticsBaseContextType = {
-      ...parentContext,
-      logger: createLogger(
-        Logger.Context.Default,
-        getMetadataForLogger(combinedMetadata),
-      ),
-      metadata: combinedMetadata,
-      metric: (event, payload, extraMetadata) => {
-        parentContext.metric(event, payload, {
-          ...combinedMetadata,
-          ...extraMetadata,
-        })
-      },
-    }
-    return context
-  }, [sessionId, geolocation, parentContext, metadata])
-  return <Context.Provider value={childContext}>{children}</Context.Provider>
-}
-
-/**
- * Feature gates provider. Decorates the parent analytics context with
- * feature gate capabilities. Should be mounted within `AnalyticsContext`,
- * and below the `<Fragment key={did} />` breaker in `App.<platform>.tsx`.
- */
-export function AnalyticsFeaturesContext({
-  children,
-}: {
-  children: React.ReactNode
-}) {
-  const parentContext = useContext(Context)
-
-  /**
-   * Side-effect: we need to synchronously set this during the
-   * same render cycle. It does not trigger a re-render, it just
-   * sets properties on the singleton GrowthBook instance.
-   */
-  setAttributes(parentContext.metadata)
-
-  useEffect(() => {
-    feats.setTrackingCallback((experiment, result) => {
-      parentContext.metric('experiment:viewed', {
-        experimentId: experiment.key,
-        variationId: result.key,
-      })
-    })
-  }, [parentContext.metric])
-
-  const childContext = useMemo<AnalyticsContextType>(() => {
-    return {
-      ...parentContext,
-      features: {
-        enabled: feats.isOn.bind(feats),
-        ...Features,
-      },
-    }
-  }, [parentContext])
-
-  return <Context.Provider value={childContext}>{children}</Context.Provider>
-}
-
-/**
- * Basic analytics context without feature gates. Should really only be used
- * above the `AnalyticsFeaturesContext` provider.
- */
-export function useAnalyticsBase() {
-  return useContext(Context)
-}
-
-/**
- * The main analytics context, including feature gates. Use this everywhere you
- * need metrics, features, or logging within the React tree.
- */
-export function useAnalytics() {
-  const ctx = useContext(Context)
-  if (!('features' in ctx)) {
-    throw new Error(
-      'useAnalytics must be used within an AnalyticsFeaturesContext',
-    )
-  }
-  return ctx as AnalyticsContextType
-}

src/analytics/metadata.ts

@@ -1,79 +0,0 @@
-import {type Geolocation} from '#/geolocation'
-
-export type BaseMetadata = {
-  deviceId: string
-  sessionId: string
-  platform: string
-  appVersion: string
-  bundleIdentifier: string
-  bundleDate: number
-  referrerSrc: string
-  referrerUrl: string
-}
-
-export type GeolocationMetadata = Geolocation
-
-export type SessionMetadata = {
-  did: string
-  isBskyPds: boolean
-}
-
-export type PreferencesMetadata = {
-  appLanguage: string
-  contentLanguages: string[]
-}
-
-export type MergeableMetadata = {
-  session?: SessionMetadata
-  preferences?: PreferencesMetadata
-  /**
-   * Navigation metadata is not actually available on this object, instead it's
-   * merged in at time-of-log/metric. See `#/analytics/metadata.ts` for details.
-   */
-  navigation?: NavigationMetadata
-}
-
-export type Metadata = {
-  base: BaseMetadata
-  geolocation: GeolocationMetadata
-} & MergeableMetadata
-
-/*
- * Navigation metadata is handle out-of-band from React, since we don't want to
- * slow down screen transitions in any way, and there doesn't seem to be a nice
- * way to get current navigation state without an additional re-render between
- * navigations.
- *
- * So instead of this data being available on the Metadata object, it's stored
- * here and merged in at time-of-log/metric.
- */
-export type NavigationMetadata = {
-  previousScreen?: string
-  currentScreen?: string
-}
-let navigationMetadata: NavigationMetadata | undefined
-export function getNavigationMetadata() {
-  return navigationMetadata
-}
-export function setNavigationMetadata(meta: NavigationMetadata | undefined) {
-  navigationMetadata = meta
-}
-
-/**
- * We don't want or need to send all data to the logger
- */
-export function getMetadataForLogger({
-  base,
-  geolocation,
-  session,
-}: Metadata): Record<string, any> {
-  return {
-    deviceId: base.deviceId,
-    sessionId: base.sessionId,
-    platform: base.platform,
-    appVersion: base.appVersion,
-    countryCode: geolocation.countryCode,
-    regionCode: geolocation.regionCode,
-    isBskyPds: session?.isBskyPds || 'anonymous',
-  }
-}

src/analytics/metrics/client.test.ts

@@ -1,176 +0,0 @@
-import {MetricsClient} from './client'
-
-let appStateCallback: (state: string) => void
-
-jest.mock('#/lib/appState', () => ({
-  onAppStateChange: jest.fn(cb => {
-    appStateCallback = cb
-    return {remove: jest.fn()}
-  }),
-}))
-
-jest.mock('#/logger', () => ({
-  Logger: {
-    create: () => ({
-      info: jest.fn(),
-      debug: jest.fn(),
-      error: jest.fn(),
-    }),
-    Context: {Metric: 'metric'},
-  },
-}))
-
-jest.mock('#/env', () => ({
-  METRICS_API_HOST: 'https://test.metrics.api',
-  IS_WEB: false,
-}))
-
-type TestEvents = {
-  click: {button: string}
-  view: {screen: string}
-}
-
-describe('MetricsClient', () => {
-  let fetchMock: jest.Mock
-  let fetchRequests: {body: any}[]
-
-  beforeEach(() => {
-    jest.useFakeTimers({advanceTimers: true})
-    fetchRequests = []
-    fetchMock = jest.fn().mockImplementation(async (_url, options) => {
-      const body = JSON.parse(options.body)
-      fetchRequests.push({body})
-      return {ok: true, status: 200}
-    })
-    global.fetch = fetchMock
-  })
-
-  afterEach(() => {
-    jest.useRealTimers()
-    jest.clearAllMocks()
-  })
-
-  it('flushes events on interval', async () => {
-    const client = new MetricsClient<TestEvents>()
-    client.track('click', {button: 'submit'})
-    client.track('view', {screen: 'home'})
-
-    expect(fetchRequests).toHaveLength(0)
-
-    // Advance past the 10 second interval
-    await jest.advanceTimersByTimeAsync(10_000)
-
-    expect(fetchRequests).toHaveLength(1)
-    expect(fetchRequests[0].body.events).toHaveLength(2)
-    expect(fetchRequests[0].body.events[0].event).toBe('click')
-    expect(fetchRequests[0].body.events[1].event).toBe('view')
-  })
-
-  it('flushes when maxBatchSize is exceeded', async () => {
-    const client = new MetricsClient<TestEvents>()
-    client.maxBatchSize = 5
-
-    // Add events up to maxBatchSize (should not flush yet)
-    for (let i = 0; i < 5; i++) {
-      client.track('click', {button: `btn-${i}`})
-    }
-
-    expect(fetchRequests).toHaveLength(0)
-
-    // One more event should trigger flush (> maxBatchSize)
-    client.track('click', {button: 'btn-trigger'})
-
-    // Allow microtasks to run
-    await jest.advanceTimersByTimeAsync(0)
-
-    expect(fetchRequests).toHaveLength(1)
-    expect(fetchRequests[0].body.events).toHaveLength(6)
-  })
-
-  it('retries failed events once on 500 response', async () => {
-    let requestCount = 0
-
-    fetchMock.mockImplementation(async (_url, options) => {
-      requestCount++
-      const body = JSON.parse(options.body)
-
-      if (requestCount === 1) {
-        // First request fails with 500 - "Failed to fetch" triggers isNetworkError
-        return {
-          ok: false,
-          status: 500,
-          text: async () => 'Internal Server Error',
-        }
-      }
-
-      // Retry succeeds
-      fetchRequests.push({body})
-      return {ok: true, status: 200}
-    })
-
-    const client = new MetricsClient<TestEvents>()
-    client.track('click', {button: 'submit'})
-
-    // Trigger flush via interval
-    await jest.advanceTimersByTimeAsync(10_000)
-
-    expect(requestCount).toBe(1)
-    expect(fetchRequests).toHaveLength(0)
-
-    // Simulate app coming to foreground to trigger retry
-    appStateCallback('active')
-    await jest.advanceTimersByTimeAsync(0)
-
-    expect(requestCount).toBe(2)
-    expect(fetchRequests).toHaveLength(1)
-    expect(fetchRequests[0].body.events).toHaveLength(1)
-    expect(fetchRequests[0].body.events[0].event).toBe('click')
-  })
-
-  it('does not retry more than once', async () => {
-    let requestCount = 0
-
-    fetchMock.mockImplementation(async () => {
-      requestCount++
-      // Always fail with network-like error
-      return {
-        ok: false,
-        status: 500,
-        text: async () => 'Internal Server Error',
-      }
-    })
-
-    const client = new MetricsClient<TestEvents>()
-    client.track('click', {button: 'submit'})
-
-    // First flush fails
-    await jest.advanceTimersByTimeAsync(10_000)
-
-    expect(requestCount).toBe(1)
-
-    // Retry also fails
-    appStateCallback('active')
-    await jest.advanceTimersByTimeAsync(0)
-
-    expect(requestCount).toBe(2)
-
-    // Another foreground event should not retry again (events are dropped)
-    appStateCallback('active')
-    await jest.advanceTimersByTimeAsync(0)
-
-    expect(requestCount).toBe(2) // No additional requests
-  })
-
-  it('flushes when app goes to background', async () => {
-    const client = new MetricsClient<TestEvents>()
-    client.track('click', {button: 'submit'})
-
-    expect(fetchRequests).toHaveLength(0)
-
-    // Simulate app going to background
-    appStateCallback('background')
-    await jest.advanceTimersByTimeAsync(0)
-
-    expect(fetchRequests).toHaveLength(1)
-  })
-})

src/analytics/metrics/client.ts

@@ -1,116 +0,0 @@
-import {onAppStateChange} from '#/lib/appState'
-import {isNetworkError} from '#/lib/strings/errors'
-import {Logger} from '#/logger'
-import * as env from '#/env'
-
-type Event<M extends Record<string, any>> = {
-  time: number
-  event: keyof M
-  payload: M[keyof M]
-  metadata: Record<string, any>
-}
-
-const TRACKING_ENDPOINT = env.METRICS_API_HOST + '/t'
-const logger = Logger.create(Logger.Context.Metric, {})
-
-export class MetricsClient<M extends Record<string, any>> {
-  maxBatchSize = 100
-
-  private started: boolean = false
-  private queue: Event<M>[] = []
-  private failedQueue: Event<M>[] = []
-  private flushInterval: NodeJS.Timeout | null = null
-
-  start() {
-    if (this.started) return
-    this.started = true
-    this.flushInterval = setInterval(() => {
-      this.flush()
-    }, 10_000)
-    onAppStateChange(state => {
-      if (state === 'active') {
-        this.retryFailedLogs()
-      } else {
-        this.flush()
-      }
-    })
-  }
-
-  track<E extends keyof M>(
-    event: E,
-    payload: M[E],
-    metadata: Record<string, any> = {},
-  ) {
-    this.start()
-
-    const e = {
-      time: Date.now(),
-      event,
-      payload,
-      metadata,
-    }
-    this.queue.push(e)
-
-    logger.debug(`event: ${e.event as string}`, e)
-
-    if (this.queue.length > this.maxBatchSize) {
-      this.flush()
-    }
-  }
-
-  flush() {
-    if (!this.queue.length) return
-    const events = this.queue.splice(0, this.queue.length)
-    this.sendBatch(events)
-  }
-
-  private async sendBatch(events: Event<M>[], isRetry: boolean = false) {
-    logger.debug(`sendBatch: ${events.length}`, {
-      isRetry,
-    })
-
-    try {
-      const body = JSON.stringify({events})
-      if (env.IS_WEB && 'navigator' in globalThis && navigator.sendBeacon) {
-        const success = navigator.sendBeacon(
-          TRACKING_ENDPOINT,
-          new Blob([body], {type: 'application/json'}),
-        )
-        if (!success) {
-          // construct a "network error" for `isNetworkError` to work
-          throw new Error(`Failed to fetch: sendBeacon returned false`)
-        }
-      } else {
-        const res = await fetch(TRACKING_ENDPOINT, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({events}),
-          keepalive: true,
-        })
-
-        if (!res.ok) {
-          const error = await res.text().catch(() => 'Unknown error')
-          // construct a "network error" for `isNetworkError` to work
-          throw new Error(`${res.status} Failed to fetch — ${error}`)
-        }
-      }
-    } catch (e: any) {
-      if (isNetworkError(e)) {
-        if (isRetry) return // retry once
-        this.failedQueue.push(...events)
-        return
-      }
-      logger.error(`Failed to send metrics`, {
-        safeMessage: e.toString(),
-      })
-    }
-  }
-
-  private retryFailedLogs() {
-    if (!this.failedQueue.length) return
-    const events = this.failedQueue.splice(0, this.failedQueue.length)
-    this.sendBatch(events, true)
-  }
-}

src/analytics/metrics/index.ts

@@ -1,6 +0,0 @@
-import {MetricsClient} from '#/analytics/metrics/client'
-import {type Events} from '#/analytics/metrics/types'
-
-export type {Events as Metrics} from '#/analytics/metrics/types'
-export * from '#/analytics/metrics/utils'
-export const metrics = new MetricsClient<Events>()

src/analytics/metrics/utils.ts

@@ -1,7 +0,0 @@
-export function toClout(n: number | null | undefined): number | undefined {
-  if (n == null) {
-    return undefined
-  } else {
-    return Math.max(0, Math.round(Math.log(n)))
-  }
-}

src/analytics/misc/refParams.ts

@@ -1,18 +0,0 @@
-/**
- * This is used for our own Bluesky post embeds, and maybe other things.
- *
- * In the case of our embeds, `ref_src=embed`. Not sure if `ref_url` is used.
- */
-
-import * as env from '#/env'
-
-let refSrc = ''
-let refUrl = ''
-if (env.IS_WEB) {
-  const params = new URLSearchParams(window.location.search)
-  refSrc = params.get('ref_src') ?? ''
-  refUrl = decodeURIComponent(params.get('ref_url') ?? '')
-}
-
-export const src = refSrc
-export const url = refUrl

src/analytics/utils.ts

@@ -1,33 +0,0 @@
-import {useMemo} from 'react'
-
-import {BSKY_SERVICE} from '#/lib/constants'
-import {type SessionAccount} from '#/state/session'
-import {
-  type MergeableMetadata,
-  type SessionMetadata,
-} from '#/analytics/metadata'
-
-/**
- * Thin `useMemo` wrapper that marks the metadata as memoized and provides a
- * type guard.
- */
-export function useMeta(metadata?: MergeableMetadata) {
-  const m = useMemo(() => metadata, [metadata])
-  if (!m) return
-  // @ts-ignore
-  m.__meta = true
-  return m
-}
-
-export function accountToSessionMetadata(
-  account: SessionAccount | undefined,
-): SessionMetadata | undefined {
-  if (!account) {
-    return
-  } else {
-    return {
-      did: account.did,
-      isBskyPds: account.service.startsWith(BSKY_SERVICE),
-    }
-  }
-}

src/components/ContextMenu/index.tsx

@@ -49,6 +49,7 @@ import {HITSLOP_10} from '#/lib/constants'
 import {useHaptics} from '#/lib/haptics'
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {logger} from '#/logger'
+import {isAndroid, isIOS} from '#/platform/detection'
 import {atoms as a, platform, tokens, useTheme} from '#/alf'
 import {
   Context,
@@ -70,7 +71,6 @@ import {
 import {useInteractionState} from '#/components/hooks/useInteractionState'
 import {createPortalGroup} from '#/components/Portal'
 import {Text} from '#/components/Typography'
-import {IS_ANDROID, IS_IOS} from '#/env'
 import {Backdrop} from './Backdrop'
 
 export {
@@ -81,14 +81,14 @@ export {
 const {Provider: PortalProvider, Outlet, Portal} = createPortalGroup()
 
 const SPRING_IN: WithSpringConfig = {
-  mass: IS_IOS ? 1.25 : 0.75,
+  mass: isIOS ? 1.25 : 0.75,
   damping: 50,
   stiffness: 1100,
   restDisplacementThreshold: 0.01,
 }
 
 const SPRING_OUT: WithSpringConfig = {
-  mass: IS_IOS ? 1.25 : 0.75,
+  mass: isIOS ? 1.25 : 0.75,
   damping: 150,
   stiffness: 1000,
   restDisplacementThreshold: 0.01,
@@ -209,7 +209,7 @@ export function Root({children}: {children: React.ReactNode}) {
   )
 
   useEffect(() => {
-    if (IS_ANDROID && context.isOpen) {
+    if (isAndroid && context.isOpen) {
       const listener = BackHandler.addEventListener('hardwareBackPress', () => {
         context.close()
         return true
@@ -331,7 +331,7 @@ export function Trigger({children, label, contentLabel, style}: TriggerProps) {
       <GestureDetector gesture={composedGestures}>
         <View ref={ref} style={[{opacity: context.isOpen ? 0 : 1}, style]}>
           {children({
-            IS_NATIVE: true,
+            isNative: true,
             control: {isOpen: context.isOpen, open},
             state: {
               pressed: false,

src/components/ContextMenu/types.ts

@@ -85,7 +85,7 @@ export type TriggerProps = {
 }
 export type TriggerChildProps =
   | {
-      IS_NATIVE: true
+      isNative: true
       control: {
         isOpen: boolean
         open: (mode: 'full' | 'auxiliary-only') => void
@@ -115,7 +115,7 @@ export type TriggerChildProps =
       }
     }
   | {
-      IS_NATIVE: false
+      isNative: false
       control: Dialog.DialogOuterProps['control']
       state: {
         hovered: false

src/components/Dialog/context.ts

@@ -18,7 +18,7 @@ import {BottomSheetSnapPoint} from '../../../modules/bottom-sheet/src/BottomShee
 
 export const Context = createContext<DialogContextProps>({
   close: () => {},
-  IS_NATIVEDialog: false,
+  isNativeDialog: false,
   nativeSnapPoint: BottomSheetSnapPoint.Hidden,
   disableDrag: false,
   setDisableDrag: () => {},

src/components/Dialog/index.tsx

@@ -26,6 +26,7 @@ import {useLingui} from '@lingui/react'
 import {useEnableKeyboardController} from '#/lib/hooks/useEnableKeyboardController'
 import {ScrollProvider} from '#/lib/ScrollContext'
 import {logger} from '#/logger'
+import {isAndroid, isIOS} from '#/platform/detection'
 import {useA11y} from '#/state/a11y'
 import {useDialogStateControlContext} from '#/state/dialogs'
 import {List, type ListMethods, type ListProps} from '#/view/com/util/List'
@@ -38,7 +39,6 @@ import {
   type DialogOuterProps,
 } from '#/components/Dialog/types'
 import {createInput} from '#/components/forms/TextField'
-import {IS_ANDROID, IS_IOS} from '#/env'
 import {BottomSheet, BottomSheetSnapPoint} from '../../../modules/bottom-sheet'
 import {
   type BottomSheetSnapPointChangeEvent,
@@ -154,7 +154,7 @@ export function Outer({
   const context = React.useMemo(
     () => ({
       close,
-      IS_NATIVEDialog: true,
+      isNativeDialog: true,
       nativeSnapPoint: snapPoint,
       disableDrag,
       setDisableDrag,
@@ -209,7 +209,7 @@ export const ScrollableInner = React.forwardRef<ScrollView, DialogInnerProps>(
     const {nativeSnapPoint, disableDrag, setDisableDrag} = useDialogContext()
     const insets = useSafeAreaInsets()
 
-    useEnableKeyboardController(IS_IOS)
+    useEnableKeyboardController(isIOS)
 
     const [keyboardHeight, setKeyboardHeight] = React.useState(0)
 
@@ -224,7 +224,7 @@ export const ScrollableInner = React.forwardRef<ScrollView, DialogInnerProps>(
     )
 
     let paddingBottom = 0
-    if (IS_IOS) {
+    if (isIOS) {
       paddingBottom += keyboardHeight / 4
       if (nativeSnapPoint === BottomSheetSnapPoint.Full) {
         paddingBottom += insets.bottom + tokens.space.md
@@ -240,7 +240,7 @@ export const ScrollableInner = React.forwardRef<ScrollView, DialogInnerProps>(
     }
 
     const onScroll = (e: NativeSyntheticEvent<NativeScrollEvent>) => {
-      if (!IS_ANDROID) {
+      if (!isAndroid) {
         return
       }
       const {contentOffset} = e.nativeEvent
@@ -260,12 +260,12 @@ export const ScrollableInner = React.forwardRef<ScrollView, DialogInnerProps>(
           contentContainerStyle,
         ]}
         ref={ref}
-        showsVerticalScrollIndicator={IS_ANDROID ? false : undefined}
+        showsVerticalScrollIndicator={isAndroid ? false : undefined}
         {...props}
         bounces={nativeSnapPoint === BottomSheetSnapPoint.Full}
         bottomOffset={30}
         scrollEventThrottle={50}
-        onScroll={IS_ANDROID ? onScroll : undefined}
+        onScroll={isAndroid ? onScroll : undefined}
         keyboardShouldPersistTaps="handled"
         // TODO: figure out why this positions the header absolutely (rather than stickily)
         // on Android. fine to disable for now, because we don't have any
@@ -289,11 +289,11 @@ export const InnerFlatList = React.forwardRef<
   const insets = useSafeAreaInsets()
   const {nativeSnapPoint, disableDrag, setDisableDrag} = useDialogContext()
 
-  useEnableKeyboardController(IS_IOS)
+  useEnableKeyboardController(isIOS)
 
   const onScroll = (e: ScrollEvent) => {
     'worklet'
-    if (!IS_ANDROID) {
+    if (!isAndroid) {
       return
     }
     const {contentOffset} = e
@@ -311,7 +311,7 @@ export const InnerFlatList = React.forwardRef<
         bounces={nativeSnapPoint === BottomSheetSnapPoint.Full}
         ListFooterComponent={<View style={{height: insets.bottom + 100}} />}
         ref={ref}
-        showsVerticalScrollIndicator={IS_ANDROID ? false : undefined}
+        showsVerticalScrollIndicator={isAndroid ? false : undefined}
         {...props}
         style={[a.h_full, style]}
       />
@@ -326,7 +326,7 @@ export function FlatListFooter({children}: {children: React.ReactNode}) {
   const {height} = useReanimatedKeyboardAnimation()
 
   const animatedStyle = useAnimatedStyle(() => {
-    if (!IS_IOS) return {}
+    if (!isIOS) return {}
     return {
       transform: [{translateY: Math.min(0, height.get() + bottom - 10)}],
     }
@@ -409,7 +409,3 @@ export function Handle({
 export function Close() {
   return null
 }
-
-export function Backdrop() {
-  return null
-}

src/components/Dialog/index.web.tsx

@@ -3,8 +3,8 @@ import {
   FlatList,
   type FlatListProps,
   type GestureResponderEvent,
-  Pressable,
   type StyleProp,
+  TouchableWithoutFeedback,
   View,
   type ViewStyle,
 } from 'react-native'
@@ -98,7 +98,7 @@ export function Outer({
   const context = React.useMemo(
     () => ({
       close,
-      IS_NATIVEDialog: false,
+      isNativeDialog: false,
       nativeSnapPoint: 0,
       disableDrag: false,
       setDisableDrag: () => {},
@@ -113,7 +113,7 @@ export function Outer({
         <Portal>
           <Context.Provider value={context}>
             <RemoveScrollBar />
-            <Pressable
+            <TouchableWithoutFeedback
               accessibilityHint={undefined}
               accessibilityLabel={_(msg`Close active dialog`)}
               onPress={handleBackgroundPress}>
@@ -146,7 +146,7 @@ export function Outer({
                   {children}
                 </View>
               </View>
-            </Pressable>
+            </TouchableWithoutFeedback>
           </Context.Provider>
         </Portal>
       )}
@@ -304,7 +304,7 @@ export function Handle() {
   return null
 }
 
-export function Backdrop() {
+function Backdrop() {
   const t = useTheme()
   const {reduceMotionEnabled} = useA11y()
   return (

src/components/Dialog/sheet-wrapper.ts

@@ -1,7 +1,7 @@
 import {useCallback} from 'react'
 import {SystemBars} from 'react-native-edge-to-edge'
 
-import {IS_IOS} from '#/env'
+import {isIOS} from '#/platform/detection'
 
 /**
  * If we're calling a system API like the image picker that opens a sheet
@@ -9,7 +9,7 @@ import {IS_IOS} from '#/env'
  */
 export function useSheetWrapper() {
   return useCallback(async <T>(promise: Promise<T>): Promise<T> => {
-    if (IS_IOS) {
+    if (isIOS) {
       const entry = SystemBars.pushStackEntry({
         style: {
           statusBar: 'light',

src/components/Dialog/types.ts

@@ -39,7 +39,7 @@ export type DialogControlProps = DialogControlRefProps & {
 
 export type DialogContextProps = {
   close: DialogControlProps['close']
-  IS_NATIVEDialog: boolean
+  isNativeDialog: boolean
   nativeSnapPoint: BottomSheetSnapPoint
   disableDrag: boolean
   setDisableDrag: React.Dispatch<React.SetStateAction<boolean>>

src/components/FeedInterstitials.tsx

@@ -7,6 +7,10 @@ import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
 
 import {type NavigationProp} from '#/lib/routes/types'
+import {logEvent, useGate} from '#/lib/statsig/statsig'
+import {logger} from '#/logger'
+import {type MetricEvents} from '#/logger/metrics'
+import {isIOS} from '#/platform/detection'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useGetPopularFeedsQuery} from '#/state/queries/feed'
 import {type FeedDescriptor} from '#/state/queries/post-feed'
@@ -35,8 +39,6 @@ import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
 import {InlineLinkText} from '#/components/Link'
 import * as ProfileCard from '#/components/ProfileCard'
 import {Text} from '#/components/Typography'
-import {type Metrics, useAnalytics} from '#/analytics'
-import {IS_IOS} from '#/env'
 import type * as bsky from '#/types/bsky'
 import {FollowDialogWithoutGuide} from './ProgressGuide/FollowDialog'
 import {ProgressGuideList} from './ProgressGuide/List'
@@ -432,8 +434,8 @@ export function ProfileGrid({
   isVisible?: boolean
 }) {
   const t = useTheme()
-  const ax = useAnalytics()
   const {_} = useLingui()
+  const gate = useGate()
   const moderationOpts = useModerationOpts()
   const {gtMobile} = useBreakpoints()
   const followDialogControl = useDialogControl()
@@ -441,6 +443,7 @@ export function ProfileGrid({
   const isLoading = isSuggestionsLoading || !moderationOpts
   const isProfileHeaderContext = viewContext === 'profileHeader'
   const isFeedContext = viewContext === 'feed'
+  const showDismissButton = onDismiss && gate('suggested_users_dismiss')
 
   const maxLength = gtMobile ? 3 : isProfileHeaderContext ? 12 : 6
   const minLength = gtMobile ? 3 : 4
@@ -449,11 +452,12 @@ export function ProfileGrid({
   const seenProfilesRef = useRef<Set<string>>(new Set())
   const containerRef = useRef<View>(null)
   const hasTrackedRef = useRef(false)
-  const logContext: Metrics['suggestedUser:seen']['logContext'] = isFeedContext
-    ? 'InterstitialDiscover'
-    : isProfileHeaderContext
-      ? 'Profile'
-      : 'InterstitialProfile'
+  const logContext: MetricEvents['suggestedUser:seen']['logContext'] =
+    isFeedContext
+      ? 'InterstitialDiscover'
+      : isProfileHeaderContext
+        ? 'Profile'
+        : 'InterstitialProfile'
 
   // Callback to fire seen events
   const fireSeen = useCallback(() => {
@@ -465,16 +469,20 @@ export function ProfileGrid({
     profilesToShow.forEach((profile, index) => {
       if (!seenProfilesRef.current.has(profile.did)) {
         seenProfilesRef.current.add(profile.did)
-        ax.metric('suggestedUser:seen', {
-          logContext,
-          recId,
-          position: index,
-          suggestedDid: profile.did,
-          category: null,
-        })
+        logger.metric(
+          'suggestedUser:seen',
+          {
+            logContext,
+            recId,
+            position: index,
+            suggestedDid: profile.did,
+            category: null,
+          },
+          {statsig: true},
+        )
       }
     })
-  }, [ax, isLoading, error, profiles, maxLength, logContext, recId])
+  }, [isLoading, error, profiles, maxLength, logContext, recId])
 
   // For profile header, fire when isVisible becomes true
   useEffect(() => {
@@ -559,7 +567,7 @@ export function ProfileGrid({
             <ProfileCard.Link
               profile={profile}
               onPress={() => {
-                ax.metric('suggestedUser:press', {
+                logEvent('suggestedUser:press', {
                   logContext: isFeedContext
                     ? 'InterstitialDiscover'
                     : 'InterstitialProfile',
@@ -576,13 +584,13 @@ export function ProfileGrid({
                     (hovered || pressed) && t.atoms.border_contrast_high,
                   ]}>
                   <ProfileCard.Outer>
-                    {onDismiss && (
+                    {showDismissButton && (
                       <Button
                         label={_(msg`Dismiss this suggestion`)}
                         onPress={e => {
                           e.preventDefault()
-                          onDismiss(profile.did)
-                          ax.metric('suggestedUser:dismiss', {
+                          onDismiss!(profile.did)
+                          logEvent('suggestedUser:dismiss', {
                             logContext: isFeedContext
                               ? 'InterstitialDiscover'
                               : 'InterstitialProfile',
@@ -650,7 +658,7 @@ export function ProfileGrid({
                       withIcon={false}
                       style={[a.rounded_sm]}
                       onFollow={() => {
-                        ax.metric('suggestedUser:follow', {
+                        logEvent('suggestedUser:follow', {
                           logContext: isFeedContext
                             ? 'InterstitialDiscover'
                             : 'InterstitialProfile',
@@ -672,7 +680,7 @@ export function ProfileGrid({
   // Use totalProfileCount (before dismissals) for minLength check on initial render.
   const profileCountForMinCheck = totalProfileCount ?? profiles.length
   if (error || (!isLoading && profileCountForMinCheck < minLength)) {
-    ax.logger.debug(`Not enough profiles to show suggested follows`)
+    logger.debug(`Not enough profiles to show suggested follows`)
     return null
   }
 
@@ -684,7 +692,7 @@ export function ProfileGrid({
         t.atoms.border_contrast_low,
         t.atoms.bg_contrast_25,
       ]}
-      pointerEvents={IS_IOS ? 'auto' : 'box-none'}>
+      pointerEvents={isIOS ? 'auto' : 'box-none'}>
       <View
         style={[
           a.px_lg,
@@ -693,16 +701,20 @@ export function ProfileGrid({
           a.align_center,
           a.justify_between,
         ]}
-        pointerEvents={IS_IOS ? 'auto' : 'box-none'}>
+        pointerEvents={isIOS ? 'auto' : 'box-none'}>
         <Text style={[a.text_sm, a.font_semi_bold, t.atoms.text]}>
-          <Trans>Suggested for you</Trans>
+          {isFeedContext ? (
+            <Trans>Suggested for you</Trans>
+          ) : (
+            <Trans>Similar accounts</Trans>
+          )}
         </Text>
         {!isProfileHeaderContext && (
           <Button
             label={_(msg`See more suggested profiles`)}
             onPress={() => {
               followDialogControl.open()
-              ax.metric('suggestedUser:seeMore', {
+              logEvent('suggestedUser:seeMore', {
                 logContext: isFeedContext ? 'Explore' : 'Profile',
               })
             }}>
@@ -746,7 +758,7 @@ export function ProfileGrid({
               <SeeMoreSuggestedProfilesCard
                 onPress={() => {
                   followDialogControl.open()
-                  ax.metric('suggestedUser:seeMore', {
+                  logger.metric('suggestedUser:seeMore', {
                     logContext: 'Explore',
                   })
                 }}
@@ -784,10 +796,9 @@ function SeeMoreSuggestedProfilesCard({onPress}: {onPress: () => void}) {
   )
 }
 
-const numFeedsToDisplay = 3
 export function SuggestedFeeds() {
+  const numFeedsToDisplay = 3
   const t = useTheme()
-  const ax = useAnalytics()
   const {_} = useLingui()
   const {data, isLoading, error} = useGetPopularFeedsQuery({
     limit: numFeedsToDisplay,
@@ -820,7 +831,7 @@ export function SuggestedFeeds() {
           key={feed.uri}
           view={feed}
           onPress={() => {
-            ax.metric('feed:interstitial:feedCard:press', {})
+            logEvent('feed:interstitial:feedCard:press', {})
           }}>
           {({hovered, pressed}) => (
             <CardOuter

src/components/InterestTabs.tsx

@@ -9,6 +9,7 @@ import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
+import {isWeb} from '#/platform/detection'
 import {DraggableScrollView} from '#/view/com/pager/DraggableScrollView'
 import {atoms as a, tokens, useTheme, web} from '#/alf'
 import {transparentifyColor} from '#/alf/util/colorGeneration'
@@ -18,7 +19,6 @@ import {
   ArrowRight_Stroke2_Corner0_Rounded as ArrowRight,
 } from '#/components/icons/Arrow'
 import {Text} from '#/components/Typography'
-import {IS_WEB} from '#/env'
 
 /**
  * Tab component that automatically scrolls the selected tab into view - used for interests
@@ -236,7 +236,7 @@ export function InterestTabs({
           )
         })}
       </DraggableScrollView>
-      {IS_WEB && canScrollLeft && (
+      {isWeb && canScrollLeft && (
         <View
           style={[
             a.absolute,
@@ -270,7 +270,7 @@ export function InterestTabs({
           </Button>
         </View>
       )}
-      {IS_WEB && canScrollRight && (
+      {isWeb && canScrollRight && (
         <View
           style={[
             a.absolute,

src/components/InternationalPhoneCodeSelect.tsx

@@ -10,9 +10,9 @@ import {
   INTERNATIONAL_TELEPHONE_CODES,
 } from '#/lib/international-telephone-codes'
 import {regionName} from '#/locale/helpers'
+import {isWeb} from '#/platform/detection'
 import {atoms as a, web} from '#/alf'
 import * as Select from '#/components/Select'
-import {IS_WEB} from '#/env'
 import {useGeolocation} from '#/geolocation'
 
 /**
@@ -84,7 +84,7 @@ export function InternationalPhoneCodeSelect({
             <Select.Item value={item.value} label={item.label}>
               <Select.ItemIndicator />
               <Select.ItemText style={[a.flex_1]} emoji>
-                {IS_WEB ? <Flag {...item} /> : item.unicodeFlag + ' '}
+                {isWeb ? <Flag {...item} /> : item.unicodeFlag + ' '}
                 {item.name}
               </Select.ItemText>
               <Select.ItemText style={[a.text_right]}>
@@ -101,7 +101,7 @@ export function InternationalPhoneCodeSelect({
 }
 
 function Flag({unicodeFlag, svgFlag}: {unicodeFlag: string; svgFlag: any}) {
-  if (IS_WEB) {
+  if (isWeb) {
     return (
       <Image
         source={svgFlag}

src/components/LabelingServiceCard/index.tsx

@@ -157,7 +157,7 @@ export function Link({
       to={{
         screen: 'Profile',
         params: {
-          name: labeler.creator.did,
+          name: labeler.creator.handle,
         },
       }}
       label={_(

src/components/Layout/Header/index.tsx

@@ -6,6 +6,7 @@ import {useNavigation} from '@react-navigation/native'
 
 import {HITSLOP_30} from '#/lib/constants'
 import {type NavigationProp} from '#/lib/routes/types'
+import {isIOS} from '#/platform/detection'
 import {useSetDrawerOpen} from '#/state/shell'
 import {
   atoms as a,
@@ -28,7 +29,6 @@ import {
 } from '#/components/Layout/const'
 import {ScrollbarOffsetContext} from '#/components/Layout/context'
 import {Text} from '#/components/Typography'
-import {IS_IOS} from '#/env'
 
 export function Outer({
   children,
@@ -91,7 +91,7 @@ export function Content({
       style={[
         a.flex_1,
         a.justify_center,
-        IS_IOS && align === 'platform' && a.align_center,
+        isIOS && align === 'platform' && a.align_center,
         {minHeight: HEADER_SLOT_SIZE},
       ]}>
       <AlignmentContext.Provider value={align}>
@@ -186,7 +186,7 @@ export function TitleText({
         a.text_lg,
         a.font_semi_bold,
         a.leading_tight,
-        IS_IOS && align === 'platform' && a.text_center,
+        isIOS && align === 'platform' && a.text_center,
         gtMobile && a.text_xl,
         style,
       ]}
@@ -205,7 +205,7 @@ export function SubtitleText({children}: {children: React.ReactNode}) {
       style={[
         a.text_sm,
         a.leading_snug,
-        IS_IOS && align === 'platform' && a.text_center,
+        isIOS && align === 'platform' && a.text_center,
         t.atoms.text_contrast_medium,
       ]}
       numberOfLines={2}>

src/components/Layout/index.tsx

@@ -11,6 +11,7 @@ import Animated, {
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 
+import {isWeb} from '#/platform/detection'
 import {useShellLayout} from '#/state/shell/shell-layout'
 import {
   atoms as a,
@@ -22,7 +23,6 @@ import {
 import {useDialogContext} from '#/components/Dialog'
 import {CENTER_COLUMN_OFFSET, SCROLLBAR_OFFSET} from '#/components/Layout/const'
 import {ScrollbarOffsetContext} from '#/components/Layout/context'
-import {IS_WEB} from '#/env'
 
 export * from '#/components/Layout/const'
 export * as Header from '#/components/Layout/Header'
@@ -43,7 +43,7 @@ export const Screen = memo(function Screen({
   const {top} = useSafeAreaInsets()
   return (
     <>
-      {IS_WEB && <WebCenterBorders />}
+      {isWeb && <WebCenterBorders />}
       <View
         style={[a.util_screen_outer, {paddingTop: noInsetTop ? 0 : top}, style]}
         {...props}
@@ -98,7 +98,7 @@ export const Content = memo(
           contentContainerStyle,
         ]}
         {...props}>
-        {IS_WEB ? (
+        {isWeb ? (
           <Center ignoreTabletLayoutOffset={ignoreTabletLayoutOffset}>
             {/* @ts-expect-error web only -esb */}
             {children}
@@ -145,7 +145,7 @@ export const KeyboardAwareContent = memo(function LayoutKeyboardAwareContent({
       ]}
       keyboardShouldPersistTaps="handled"
       {...props}>
-      {IS_WEB ? <Center>{children}</Center> : children}
+      {isWeb ? <Center>{children}</Center> : children}
     </KeyboardAwareScrollView>
   )
 })

src/components/Link.tsx

@@ -18,12 +18,12 @@ import {
   isExternalUrl,
   linkRequiresWarning,
 } from '#/lib/strings/url-helpers'
+import {isNative, isWeb} from '#/platform/detection'
 import {useModalControls} from '#/state/modals'
 import {atoms as a, flatten, type TextStyleProp, useTheme, web} from '#/alf'
 import {Button, type ButtonProps} from '#/components/Button'
 import {useInteractionState} from '#/components/hooks/useInteractionState'
 import {Text, type TextProps} from '#/components/Typography'
-import {IS_NATIVE, IS_WEB} from '#/env'
 import {router} from '#/routes'
 import {useGlobalDialogsControlContext} from './dialogs/Context'
 
@@ -130,7 +130,7 @@ export function useLink({
           linkRequiresWarning(href, displayText),
       )
 
-      if (IS_WEB) {
+      if (isWeb) {
         e.preventDefault()
       }
 
@@ -162,7 +162,7 @@ export function useLink({
             ]
 
             // does not apply to web's flat navigator
-            if (IS_NATIVE && screen !== 'NotFound') {
+            if (isNative && screen !== 'NotFound') {
               const state = navigation.getState()
               // if screen is not in the current navigator, it means it's
               // most likely a tab screen. note: state can be undefined
@@ -246,7 +246,7 @@ export function useLink({
     (e: GestureResponderEvent) => {
       const exitEarlyIfFalse = outerOnLongPress?.(e)
       if (exitEarlyIfFalse === false) return
-      return IS_NATIVE && shareOnLongPress ? handleLongPress() : undefined
+      return isNative && shareOnLongPress ? handleLongPress() : undefined
     },
     [outerOnLongPress, handleLongPress, shareOnLongPress],
   )
@@ -501,7 +501,7 @@ export function WebOnlyInlineLinkText({
   onPress,
   ...props
 }: Omit<InlineLinkProps, 'onLongPress'>) {
-  return IS_WEB ? (
+  return isWeb ? (
     <InlineLinkText {...props} to={to} onPress={onPress}>
       {children}
     </InlineLinkText>
@@ -547,7 +547,7 @@ export function createStaticClickIfUnmodified(
 ): {onPress: Exclude<BaseLinkProps['onPress'], undefined>} {
   return {
     onPress(e: GestureResponderEvent) {
-      if (!IS_WEB || !isModifiedClickEvent(e)) {
+      if (!isWeb || !isModifiedClickEvent(e)) {
         e.preventDefault()
         onPressHandler(e)
         return false
@@ -561,7 +561,7 @@ export function createStaticClickIfUnmodified(
  * intends to deviate from default behavior.
  */
 export function isClickEventWithMetaKey(e: GestureResponderEvent) {
-  if (!IS_WEB) return false
+  if (!isWeb) return false
   const event = e as unknown as MouseEvent
   return event.metaKey || event.altKey || event.ctrlKey || event.shiftKey
 }
@@ -570,7 +570,7 @@ export function isClickEventWithMetaKey(e: GestureResponderEvent) {
  * Determines if the web click target is anything other than `_self`
  */
 export function isClickTargetExternal(e: GestureResponderEvent) {
-  if (!IS_WEB) return false
+  if (!isWeb) return false
   const event = e as unknown as MouseEvent
   const el = event.currentTarget as HTMLAnchorElement
   return el && el.target && el.target !== '_self'
@@ -582,7 +582,7 @@ export function isClickTargetExternal(e: GestureResponderEvent) {
  * {@link https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button}
  */
 export function isModifiedClickEvent(e: GestureResponderEvent): boolean {
-  if (!IS_WEB) return false
+  if (!isWeb) return false
   const event = e as unknown as MouseEvent
   const isPrimaryButton = event.button === 0
   return (
@@ -596,8 +596,8 @@ export function isModifiedClickEvent(e: GestureResponderEvent): boolean {
  * {@link https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button}
  */
 export function shouldClickOpenNewTab(e: GestureResponderEvent) {
-  if (!IS_WEB) return false
+  if (!isWeb) return false
   const event = e as unknown as MouseEvent
-  const isMiddleClick = IS_WEB && event.button === 1
+  const isMiddleClick = isWeb && event.button === 1
   return isClickEventWithMetaKey(e) || isClickTargetExternal(e) || isMiddleClick
 }

src/components/MediaInsetBorder.tsx

@@ -1,9 +1,9 @@
 import {StyleSheet} from 'react-native'
 import type React from 'react'
 
+import {isHighDPI} from '#/lib/browser'
 import {atoms as a, platform, useTheme, type ViewStyleProp} from '#/alf'
 import {Fill} from '#/components/Fill'
-import {IS_HIGH_DPI} from '#/env'
 
 /**
  * Applies and thin border within a bounding box. Used to contrast media from
@@ -33,7 +33,7 @@ export function MediaInsetBorder({
             // while we generally use hairlineWidth (aka 1px),
             // we make an exception here for high DPI screens
             // as the 1px border is very noticeable -sfn
-            web: IS_HIGH_DPI ? 0.5 : StyleSheet.hairlineWidth,
+            web: isHighDPI ? 0.5 : StyleSheet.hairlineWidth,
           }),
         },
         opaque

src/components/MediaPreview.tsx

@@ -135,7 +135,6 @@ export function VideoItem({
           {maxWidth: 100},
           a.justify_center,
           a.align_center,
-          a.rounded_xs,
         ]}>
         <PlayButtonIcon size={24} />
       </View>

src/components/Menu/index.tsx

@@ -10,6 +10,7 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import flattenReactChildren from 'react-keyed-flatten-children'
 
+import {isAndroid, isIOS, isNative} from '#/platform/detection'
 import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
@@ -29,7 +30,6 @@ import {
   type TriggerProps,
 } from '#/components/Menu/types'
 import {Text} from '#/components/Typography'
-import {IS_ANDROID, IS_IOS, IS_NATIVE} from '#/env'
 
 export {
   type DialogControlProps as MenuControlProps,
@@ -70,7 +70,7 @@ export function Trigger({
   } = useInteractionState()
 
   return children({
-    IS_NATIVE: true,
+    isNative: true,
     control: context.control,
     state: {
       hovered: false,
@@ -111,7 +111,7 @@ export function Outer({
         <Dialog.ScrollableInner label={_(msg`Menu`)}>
           <View style={[a.gap_lg]}>
             {children}
-            {IS_NATIVE && showCancel && <Cancel />}
+            {isNative && showCancel && <Cancel />}
           </View>
         </Dialog.ScrollableInner>
       </Context.Provider>
@@ -137,13 +137,13 @@ export function Item({children, label, style, onPress, ...rest}: ItemProps) {
       onFocus={onFocus}
       onBlur={onBlur}
       onPress={async e => {
-        if (IS_ANDROID) {
+        if (isAndroid) {
           /**
            * Below fix for iOS doesn't work for Android, this does.
            */
           onPress?.(e)
           context.control.close()
-        } else if (IS_IOS) {
+        } else if (isIOS) {
           /**
            * Fixes a subtle bug on iOS
            * {@link https://github.com/bluesky-social/social-app/pull/5849/files#diff-de516ef5e7bd9840cd639213301df38cf03acfcad5bda85a1d63efd249ba79deL124-L127}

src/components/Menu/index.web.tsx

@@ -138,7 +138,7 @@ export function Trigger({
       <RadixTriggerPassThrough>
         {props =>
           children({
-            IS_NATIVE: false,
+            isNative: false,
             control,
             state: {
               hovered,

src/components/Menu/types.ts

@@ -43,7 +43,7 @@ export type TriggerProps = {
 }
 export type TriggerChildProps =
   | {
-      IS_NATIVE: true
+      isNative: true
       control: Dialog.DialogOuterProps['control']
       state: {
         /**
@@ -73,7 +73,7 @@ export type TriggerChildProps =
       }
     }
   | {
-      IS_NATIVE: false
+      isNative: false
       control: Dialog.DialogOuterProps['control']
       state: {
         hovered: boolean

src/components/NewskieDialog.tsx

@@ -8,6 +8,7 @@ import {differenceInSeconds} from 'date-fns'
 import {HITSLOP_10} from '#/lib/constants'
 import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
+import {isNative} from '#/platform/detection'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useSession} from '#/state/session'
 import {atoms as a, useTheme, web} from '#/alf'
@@ -17,7 +18,6 @@ import {useDialogControl} from '#/components/Dialog'
 import {Newskie} from '#/components/icons/Newskie'
 import * as StarterPackCard from '#/components/StarterPack/StarterPackCard'
 import {Text} from '#/components/Typography'
-import {IS_NATIVE} from '#/env'
 
 export function NewskieDialog({
   profile,
@@ -162,7 +162,7 @@ function DialogInner({
           </StarterPackCard.Link>
         ) : null}
 
-        {IS_NATIVE && (
+        {isNative && (
           <Button
             label={_(msg`Close`)}
             color="secondary"

src/components/PolicyUpdateOverlay/Overlay.tsx

@@ -7,11 +7,11 @@ import {
 import {LinearGradient} from 'expo-linear-gradient'
 import {utils} from '@bsky.app/alf'
 
+import {isAndroid, isNative} from '#/platform/detection'
 import {useA11y} from '#/state/a11y'
 import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
 import {FocusScope} from '#/components/FocusScope'
 import {LockScroll} from '#/components/LockScroll'
-import {IS_ANDROID, IS_NATIVE} from '#/env'
 
 const GUTTER = 24
 
@@ -80,7 +80,7 @@ export function Overlay({
             a.z_20,
             a.align_center,
             !gtPhone && [a.justify_end, {minHeight: frame.height}],
-            IS_NATIVE && [
+            isNative && [
               {
                 paddingBottom: Math.max(insets.bottom, a.p_2xl.padding),
               },
@@ -109,7 +109,7 @@ export function Overlay({
 
           <FocusScope>
             <View
-              accessible={IS_ANDROID}
+              accessible={isAndroid}
               role="dialog"
               aria-role="dialog"
               aria-label={label}

src/components/PolicyUpdateOverlay/index.tsx

@@ -1,12 +1,12 @@
 import {useEffect} from 'react'
 import {View} from 'react-native'
 
+import {isIOS} from '#/platform/detection'
 import {atoms as a} from '#/alf'
 import {FullWindowOverlay} from '#/components/FullWindowOverlay'
 import {usePolicyUpdateContext} from '#/components/PolicyUpdateOverlay/context'
 import {Portal} from '#/components/PolicyUpdateOverlay/Portal'
 import {Content} from '#/components/PolicyUpdateOverlay/updates/202508'
-import {IS_IOS} from '#/env'
 
 export {Provider} from '#/components/PolicyUpdateOverlay/context'
 export {usePolicyUpdateContext} from '#/components/PolicyUpdateOverlay/context'
@@ -39,7 +39,7 @@ export function PolicyUpdateOverlay() {
             // setting a zIndex when using FullWindowOverlay on iOS
             // means the taps pass straight through to the underlying content (???)
             // so don't set it on iOS. FullWindowOverlay already does the job.
-            !IS_IOS && {zIndex: 9999},
+            !isIOS && {zIndex: 9999},
           ]}>
           <Content state={state} />
         </View>

src/components/PolicyUpdateOverlay/updates/202508/index.tsx

@@ -3,6 +3,7 @@ import {View} from 'react-native'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {isAndroid} from '#/platform/detection'
 import {useA11y} from '#/state/a11y'
 import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonText} from '#/components/Button'
@@ -11,7 +12,6 @@ import {Badge} from '#/components/PolicyUpdateOverlay/Badge'
 import {Overlay} from '#/components/PolicyUpdateOverlay/Overlay'
 import {type PolicyUpdateState} from '#/components/PolicyUpdateOverlay/usePolicyUpdateState'
 import {Text} from '#/components/Typography'
-import {IS_ANDROID} from '#/env'
 
 export function Content({state}: {state: PolicyUpdateState}) {
   const t = useTheme()
@@ -56,7 +56,7 @@ export function Content({state}: {state: PolicyUpdateState}) {
     size: 'small',
   } as const
 
-  const label = IS_ANDROID
+  const label = isAndroid
     ? _(
         msg`We’re updating our Terms of Service, Privacy Policy, and Copyright Policy, effective September 15th, 2025. We're also updating our Community Guidelines, and we want your input! These new guidelines will take effect on October 15th, 2025. Learn more about these changes and how to share your thoughts with us by reading our blog post.`,
       )

src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx

@@ -10,13 +10,13 @@ import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {type EmbedPlayerParams} from '#/lib/strings/embed-player'
+import {isIOS, isNative, isWeb} from '#/platform/detection'
 import {useExternalEmbedsPrefs} from '#/state/preferences'
 import {atoms as a, useTheme} from '#/alf'
 import {useDialogControl} from '#/components/Dialog'
 import {EmbedConsentDialog} from '#/components/dialogs/EmbedConsent'
 import {Fill} from '#/components/Fill'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
-import {IS_IOS, IS_NATIVE, IS_WEB} from '#/env'
 
 export function ExternalGif({
   link,
@@ -66,12 +66,12 @@ export function ExternalGif({
       // Control animation on native
       setIsAnimating(prev => {
         if (prev) {
-          if (IS_NATIVE) {
+          if (isNative) {
             imageRef.current?.stopAnimating()
           }
           return false
         } else {
-          if (IS_NATIVE) {
+          if (isNative) {
             imageRef.current?.startAnimating()
           }
           return true
@@ -112,7 +112,7 @@ export function ExternalGif({
         <Image
           source={{
             uri:
-              !isPrefetched || (IS_WEB && !isAnimating)
+              !isPrefetched || (isWeb && !isAnimating)
                 ? link.thumb
                 : params.playerUri,
           }} // Web uses the thumb to control playback
@@ -123,7 +123,7 @@ export function ExternalGif({
           accessibilityIgnoresInvertColors
           accessibilityLabel={link.title}
           accessibilityHint={link.title}
-          cachePolicy={IS_IOS ? 'disk' : 'memory-disk'} // cant control playback with memory-disk on ios
+          cachePolicy={isIOS ? 'disk' : 'memory-disk'} // cant control playback with memory-disk on ios
         />
 
         {(!isPrefetched || !isAnimating) && (

src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx

@@ -26,6 +26,7 @@ import {
   type EmbedPlayerParams,
   getPlayerAspect,
 } from '#/lib/strings/embed-player'
+import {isNative} from '#/platform/detection'
 import {useExternalEmbedsPrefs} from '#/state/preferences'
 import {EventStopper} from '#/view/com/util/EventStopper'
 import {atoms as a, useTheme} from '#/alf'
@@ -33,7 +34,6 @@ import {useDialogControl} from '#/components/Dialog'
 import {EmbedConsentDialog} from '#/components/dialogs/EmbedConsent'
 import {Fill} from '#/components/Fill'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
-import {IS_NATIVE} from '#/env'
 
 interface ShouldStartLoadRequest {
   url: string
@@ -148,7 +148,7 @@ export function ExternalPlayer({
     const {height: winHeight, width: winWidth} = windowDims
 
     // Get the proper screen height depending on what is going on
-    const realWinHeight = IS_NATIVE // If it is native, we always want the larger number
+    const realWinHeight = isNative // If it is native, we always want the larger number
       ? winHeight > winWidth
         ? winHeight
         : winWidth

src/components/Post/Embed/ExternalEmbed/Gif.tsx

@@ -1,4 +1,4 @@
-import {useRef, useState} from 'react'
+import React from 'react'
 import {
   Pressable,
   type StyleProp,
@@ -13,6 +13,7 @@ import {useLingui} from '@lingui/react'
 import {HITSLOP_20} from '#/lib/constants'
 import {clamp} from '#/lib/numbers'
 import {type EmbedPlayerParams} from '#/lib/strings/embed-player'
+import {isWeb} from '#/platform/detection'
 import {useAutoplayDisabled} from '#/state/preferences'
 import {useLargeAltBadgeEnabled} from '#/state/preferences/large-alt-badge'
 import {atoms as a, useTheme} from '#/alf'
@@ -21,7 +22,6 @@ import {Loader} from '#/components/Loader'
 import * as Prompt from '#/components/Prompt'
 import {Text} from '#/components/Typography'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
-import {IS_WEB} from '#/env'
 import {GifView} from '../../../../../modules/expo-bluesky-gif-view'
 import {type GifViewStateChangeEvent} from '../../../../../modules/expo-bluesky-gif-view/src/GifView.types'
 
@@ -91,9 +91,9 @@ export function GifEmbed({
   const {_} = useLingui()
   const autoplayDisabled = useAutoplayDisabled()
 
-  const playerRef = useRef<GifView>(null)
+  const playerRef = React.useRef<GifView>(null)
 
-  const [playerState, setPlayerState] = useState<{
+  const [playerState, setPlayerState] = React.useState<{
     isPlaying: boolean
     isLoaded: boolean
   }>({
@@ -101,18 +101,24 @@ export function GifEmbed({
     isLoaded: false,
   })
 
-  const onPlayerStateChange = (e: GifViewStateChangeEvent) => {
-    setPlayerState(e.nativeEvent)
-  }
+  const onPlayerStateChange = React.useCallback(
+    (e: GifViewStateChangeEvent) => {
+      setPlayerState(e.nativeEvent)
+    },
+    [],
+  )
 
-  const onPress = () => {
-    void playerRef.current?.toggleAsync()
-  }
+  const onPress = React.useCallback(() => {
+    playerRef.current?.toggleAsync()
+  }, [])
 
   let aspectRatio = 1
   if (params.dimensions) {
-    const ratio = params.dimensions.width / params.dimensions.height
-    aspectRatio = clamp(ratio, 0.75, 4)
+    aspectRatio = clamp(
+      params.dimensions.width / params.dimensions.height,
+      0.75,
+      4,
+    )
   }
 
   return (
@@ -192,12 +198,10 @@ function AltText({text}: {text: string}) {
         </Text>
       </TouchableOpacity>
       <Prompt.Outer control={control}>
-        <Prompt.Content>
-          <Prompt.TitleText>
-            <Trans>Alt Text</Trans>
-          </Prompt.TitleText>
-          <Prompt.DescriptionText selectable>{text}</Prompt.DescriptionText>
-        </Prompt.Content>
+        <Prompt.TitleText>
+          <Trans>Alt Text</Trans>
+        </Prompt.TitleText>
+        <Prompt.DescriptionText selectable>{text}</Prompt.DescriptionText>
         <Prompt.Actions>
           <Prompt.Action
             onPress={() => control.close()}
@@ -214,18 +218,18 @@ const styles = StyleSheet.create({
   altContainer: {
     backgroundColor: 'rgba(0, 0, 0, 0.75)',
     borderRadius: 6,
-    paddingHorizontal: IS_WEB ? 8 : 6,
-    paddingVertical: IS_WEB ? 6 : 3,
+    paddingHorizontal: isWeb ? 8 : 6,
+    paddingVertical: isWeb ? 6 : 3,
     position: 'absolute',
     // Related to margin/gap hack. This keeps the alt label in the same position
     // on all platforms
-    right: IS_WEB ? 8 : 5,
-    bottom: IS_WEB ? 8 : 5,
+    right: isWeb ? 8 : 5,
+    bottom: isWeb ? 8 : 5,
     zIndex: 2,
   },
   alt: {
     color: 'white',
-    fontSize: IS_WEB ? 10 : 7,
+    fontSize: isWeb ? 10 : 7,
     fontWeight: '600',
   },
 })

src/components/Post/Embed/ExternalEmbed/index.tsx

@@ -10,13 +10,13 @@ import {useHaptics} from '#/lib/haptics'
 import {shareUrl} from '#/lib/sharing'
 import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player'
 import {toNiceDomain} from '#/lib/strings/url-helpers'
+import {isNative} from '#/platform/detection'
 import {useExternalEmbedsPrefs} from '#/state/preferences'
 import {atoms as a, useTheme} from '#/alf'
 import {Divider} from '#/components/Divider'
 import {Earth_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe'
 import {Link} from '#/components/Link'
 import {Text} from '#/components/Typography'
-import {IS_NATIVE} from '#/env'
 import {ExternalGif} from './ExternalGif'
 import {ExternalPlayer} from './ExternalPlayer'
 import {GifEmbed} from './Gif'
@@ -53,7 +53,7 @@ export const ExternalEmbed = ({
   }, [playHaptic, onOpen])
 
   const onShareExternal = useCallback(() => {
-    if (link.uri && IS_NATIVE) {
+    if (link.uri && isNative) {
       playHaptic('Heavy')
       shareUrl(link.uri)
     }

src/components/Post/Embed/VideoEmbed/ActiveVideoWebContext.tsx

@@ -8,7 +8,7 @@ import React, {
 } from 'react'
 import {useWindowDimensions} from 'react-native'
 
-import {IS_NATIVE, IS_WEB} from '#/env'
+import {isNative, isWeb} from '#/platform/detection'
 
 const Context = React.createContext<{
   activeViewId: string | null
@@ -18,7 +18,7 @@ const Context = React.createContext<{
 Context.displayName = 'ActiveVideoWebContext'
 
 export function Provider({children}: {children: React.ReactNode}) {
-  if (!IS_WEB) {
+  if (!isWeb) {
     throw new Error('ActiveVideoWebContext may only be used on web.')
   }
 
@@ -47,7 +47,7 @@ export function Provider({children}: {children: React.ReactNode}) {
 
   const sendViewPosition = useCallback(
     (viewId: string, y: number) => {
-      if (IS_NATIVE) return
+      if (isNative) return
 
       if (viewId === activeViewIdRef.current) {
         activeViewLocationRef.current = y

src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/Scrubber.tsx

@@ -3,10 +3,10 @@ import {View} from 'react-native'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {isFirefox, isTouchDevice} from '#/lib/browser'
 import {clamp} from '#/lib/numbers'
 import {atoms as a, useTheme, web} from '#/alf'
 import {useInteractionState} from '#/components/hooks/useInteractionState'
-import {IS_WEB_FIREFOX, IS_WEB_TOUCH_DEVICE} from '#/env'
 import {formatTime} from './utils'
 
 export function Scrubber({
@@ -100,7 +100,7 @@ export function Scrubber({
     // a pointerUp event is fired outside the element that captured the
     // pointer. Firefox clicks on the element the mouse is over, so we have
     // to make everything unclickable while seeking -sfn
-    if (IS_WEB_FIREFOX && scrubberActive) {
+    if (isFirefox && scrubberActive) {
       document.body.classList.add('force-no-clicks')
 
       return () => {
@@ -151,7 +151,7 @@ export function Scrubber({
     <View
       testID="scrubber"
       style={[
-        {height: IS_WEB_TOUCH_DEVICE ? 32 : 18, width: '100%'},
+        {height: isTouchDevice ? 32 : 18, width: '100%'},
         a.flex_shrink_0,
         a.px_xs,
       ]}

src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx

@@ -4,7 +4,9 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import type Hls from 'hls.js'
 
+import {isTouchDevice} from '#/lib/browser'
 import {clamp} from '#/lib/numbers'
+import {isIPhoneWeb} from '#/platform/detection'
 import {
   useAutoplayDisabled,
   useSetSubtitlesEnabled,
@@ -26,7 +28,6 @@ import {Pause_Filled_Corner0_Rounded as PauseIcon} from '#/components/icons/Paus
 import {Play_Filled_Corner0_Rounded as PlayIcon} from '#/components/icons/Play'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
-import {IS_WEB_MOBILE_IOS, IS_WEB_TOUCH_DEVICE} from '#/env'
 import {TimeIndicator} from '../TimeIndicator'
 import {ControlButton} from './ControlButton'
 import {Scrubber} from './Scrubber'
@@ -214,18 +215,18 @@ export function Controls({
 
   const seekLeft = useCallback(() => {
     if (!videoRef.current) return
-
+    // eslint-disable-next-line @typescript-eslint/no-shadow
     const currentTime = videoRef.current.currentTime
-
+    // eslint-disable-next-line @typescript-eslint/no-shadow
     const duration = videoRef.current.duration || 0
     onSeek(clamp(currentTime - 5, 0, duration))
   }, [onSeek, videoRef])
 
   const seekRight = useCallback(() => {
     if (!videoRef.current) return
-
+    // eslint-disable-next-line @typescript-eslint/no-shadow
     const currentTime = videoRef.current.currentTime
-
+    // eslint-disable-next-line @typescript-eslint/no-shadow
     const duration = videoRef.current.duration || 0
     onSeek(clamp(currentTime + 5, 0, duration))
   }, [onSeek, videoRef])
@@ -312,13 +313,13 @@ export function Controls({
         onPointerEnter={onPointerMoveEmptySpace}
         onPointerMove={onPointerMoveEmptySpace}
         onPointerLeave={onPointerLeaveEmptySpace}
-        accessibilityLabel={
+        accessibilityLabel={_(
           !focused
-            ? _(msg`Unmute video`)
+            ? msg`Unmute video`
             : playing
-              ? _(msg`Pause video`)
-              : _(msg`Play video`)
-        }
+              ? msg`Pause video`
+              : msg`Play video`,
+        )}
         accessibilityHint=""
         style={[
           a.flex_1,
@@ -341,7 +342,7 @@ export function Controls({
           {opacity: showControls ? 1 : 0},
           {transition: 'opacity 0.2s ease-in-out'},
         ]}>
-        {(!volumeHovered || IS_WEB_TOUCH_DEVICE) && (
+        {(!volumeHovered || isTouchDevice) && (
           <Scrubber
             duration={duration}
             currentTime={currentTime}
@@ -399,7 +400,7 @@ export function Controls({
             onEndHover={onVolumeEndHover}
             drawFocus={drawFocus}
           />
-          {!IS_WEB_MOBILE_IOS && (
+          {!isIPhoneWeb && (
             <ControlButton
               active={isFullscreen}
               activeLabel={_(msg`Exit fullscreen`)}

src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx

@@ -4,11 +4,11 @@ import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {isSafari, isTouchDevice} from '#/lib/browser'
 import {atoms as a} from '#/alf'
 import {Mute_Stroke2_Corner0_Rounded as MuteIcon} from '#/components/icons/Mute'
 import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as UnmuteIcon} from '#/components/icons/Speaker'
 import {useVideoVolumeState} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
-import {IS_WEB_SAFARI, IS_WEB_TOUCH_DEVICE} from '#/env'
 import {ControlButton} from './ControlButton'
 
 export function VolumeControl({
@@ -57,7 +57,7 @@ export function VolumeControl({
       onPointerEnter={onHover}
       onPointerLeave={onEndHover}
       style={[a.relative]}>
-      {hovered && !IS_WEB_TOUCH_DEVICE && (
+      {hovered && !isTouchDevice && (
         <Animated.View
           entering={FadeIn.duration(100)}
           exiting={FadeOut.duration(100)}
@@ -80,9 +80,7 @@ export function VolumeControl({
               aria-label={_(msg`Volume`)}
               style={
                 // Ridiculous safari hack for old version of safari. Fixed in sonoma beta -h
-                IS_WEB_SAFARI
-                  ? {height: 92, minHeight: '100%'}
-                  : {height: '100%'}
+                isSafari ? {height: 92, minHeight: '100%'} : {height: '100%'}
               }
               onChange={onVolumeChange}
               // @ts-expect-error for old versions of firefox, and then re-using it for targeting the CSS -sfn

src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/utils.tsx

@@ -1,8 +1,8 @@
 import {type RefObject, useCallback, useEffect, useRef, useState} from 'react'
 
+import {isSafari} from '#/lib/browser'
 import {logger} from '#/logger'
 import {useVideoVolumeState} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
-import {IS_WEB_SAFARI} from '#/env'
 
 export function useVideoElement(ref: RefObject<HTMLVideoElement | null>) {
   const [playing, setPlaying] = useState(false)
@@ -41,7 +41,7 @@ export function useVideoElement(ref: RefObject<HTMLVideoElement | null>) {
       setCurrentTime(round(ref.current.currentTime) || 0)
       // HACK: Safari randomly fires `stalled` events when changing between segments
       // let's just clear the buffering state if the video is still progressing -sfn
-      if (IS_WEB_SAFARI) {
+      if (isSafari) {
         if (bufferingTimeout) clearTimeout(bufferingTimeout)
         setBuffering(false)
       }

src/components/Post/Embed/VideoEmbed/index.web.tsx

@@ -11,6 +11,7 @@ import {type AppBskyEmbedVideo} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {isFirefox} from '#/lib/browser'
 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
 import {atoms as a, useTheme} from '#/alf'
 import {useIsWithinMessage} from '#/components/dms/MessageContext'
@@ -22,7 +23,6 @@ import {
   VideoEmbedInnerWeb,
   VideoNotFoundError,
 } from '#/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb'
-import {IS_WEB_FIREFOX} from '#/env'
 import {useActiveVideoWeb} from './ActiveVideoWebContext'
 import * as VideoFallback from './VideoEmbedInner/VideoFallback'
 
@@ -37,7 +37,7 @@ export function VideoEmbed({embed}: {embed: AppBskyEmbedVideo.View}) {
 
   useEffect(() => {
     if (!ref.current) return
-    if (isFullscreen && !IS_WEB_FIREFOX) return
+    if (isFullscreen && !isFirefox) return
     const observer = new IntersectionObserver(
       entries => {
         const entry = entries[0]
@@ -150,7 +150,7 @@ function ViewportObserver({
   // observing a div of 100vh height
   useEffect(() => {
     if (!ref.current) return
-    if (isFullscreen && !IS_WEB_FIREFOX) return
+    if (isFullscreen && !isFirefox) return
     const observer = new IntersectionObserver(
       entries => {
         const entry = entries[0]

src/components/PostControls/BookmarkButton.tsx

@@ -6,6 +6,7 @@ import {useLingui} from '@lingui/react'
 import type React from 'react'
 
 import {useCleanError} from '#/lib/hooks/useCleanError'
+import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/post-shadow'
 import {useFeedFeedbackContext} from '#/state/feed-feedback'
 import {useBookmarkMutation} from '#/state/queries/bookmarks/useBookmarkMutation'
@@ -14,7 +15,6 @@ import {useTheme} from '#/alf'
 import {Bookmark, BookmarkFilled} from '#/components/icons/Bookmark'
 import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
 import * as toast from '#/components/Toast'
-import {useAnalytics} from '#/analytics'
 import {PostControlButton, PostControlButtonIcon} from './PostControlButton'
 
 export const BookmarkButton = memo(function BookmarkButton({
@@ -29,7 +29,6 @@ export const BookmarkButton = memo(function BookmarkButton({
   hitSlop?: Insets
 }): React.ReactNode {
   const t = useTheme()
-  const ax = useAnalytics()
   const {_} = useLingui()
   const {mutateAsync: bookmark} = useBookmarkMutation()
   const cleanError = useCleanError()
@@ -53,7 +52,7 @@ export const BookmarkButton = memo(function BookmarkButton({
         post,
       })
 
-      ax.metric('post:bookmark', {
+      logger.metric('post:bookmark', {
         uri: post.uri,
         authorDid: post.author.did,
         logContext,
@@ -93,7 +92,7 @@ export const BookmarkButton = memo(function BookmarkButton({
         uri: post.uri,
       })
 
-      ax.metric('post:unbookmark', {
+      logger.metric('post:unbookmark', {
         uri: post.uri,
         authorDid: post.author.did,
         logContext,

src/components/PostControls/DiscoverDebug.tsx

@@ -3,11 +3,11 @@ import * as Clipboard from 'expo-clipboard'
 import {t} from '@lingui/macro'
 
 import {DISCOVER_DEBUG_DIDS} from '#/lib/constants'
+import {useGate} from '#/lib/statsig/statsig'
 import {useSession} from '#/state/session'
 import {atoms as a, useTheme} from '#/alf'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
-import {useAnalytics} from '#/analytics'
 import {IS_INTERNAL} from '#/env'
 
 export function DiscoverDebug({
@@ -15,12 +15,12 @@ export function DiscoverDebug({
 }: {
   feedContext: string | undefined
 }) {
-  const ax = useAnalytics()
   const {currentAccount} = useSession()
+  const gate = useGate()
   const isDiscoverDebugUser =
     IS_INTERNAL ||
     DISCOVER_DEBUG_DIDS[currentAccount?.did || ''] ||
-    ax.features.enabled(ax.features.DebugFeedContext)
+    gate('debug_show_feedcontext')
   const theme = useTheme()
 
   return (

src/components/PostControls/PostMenu/PostMenuItems.tsx

@@ -26,17 +26,15 @@ import {
   type CommonNavigatorParams,
   type NavigationProp,
 } from '#/lib/routes/types'
+import {logEvent, useGate} from '#/lib/statsig/statsig'
 import {richTextToString} from '#/lib/strings/rich-text-helpers'
 import {toShareUrl} from '#/lib/strings/url-helpers'
 import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/post-shadow'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useFeedFeedbackContext} from '#/state/feed-feedback'
-import {
-  useHiddenPosts,
-  useHiddenPostsApi,
-  useLanguagePrefs,
-} from '#/state/preferences'
+import {useLanguagePrefs} from '#/state/preferences'
+import {useHiddenPosts, useHiddenPostsApi} from '#/state/preferences'
 import {usePinnedPostMutation} from '#/state/queries/pinned-post'
 import {
   usePostDeleteMutation,
@@ -73,17 +71,13 @@ import {
 import {Eye_Stroke2_Corner0_Rounded as Eye} from '#/components/icons/Eye'
 import {EyeSlash_Stroke2_Corner0_Rounded as EyeSlash} from '#/components/icons/EyeSlash'
 import {Filter_Stroke2_Corner0_Rounded as Filter} from '#/components/icons/Filter'
-import {
-  Mute_Stroke2_Corner0_Rounded as Mute,
-  Mute_Stroke2_Corner0_Rounded as MuteIcon,
-} from '#/components/icons/Mute'
+import {Mute_Stroke2_Corner0_Rounded as MuteIcon} from '#/components/icons/Mute'
+import {Mute_Stroke2_Corner0_Rounded as Mute} from '#/components/icons/Mute'
 import {PersonX_Stroke2_Corner0_Rounded as PersonX} from '#/components/icons/Person'
 import {Pin_Stroke2_Corner0_Rounded as PinIcon} from '#/components/icons/Pin'
 import {SettingsGear2_Stroke2_Corner0_Rounded as Gear} from '#/components/icons/SettingsGear2'
-import {
-  SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute,
-  SpeakerVolumeFull_Stroke2_Corner0_Rounded as UnmuteIcon,
-} from '#/components/icons/Speaker'
+import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as UnmuteIcon} from '#/components/icons/Speaker'
+import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute} from '#/components/icons/Speaker'
 import {Trash_Stroke2_Corner0_Rounded as Trash} from '#/components/icons/Trash'
 import {Warning_Stroke2_Corner0_Rounded as Warning} from '#/components/icons/Warning'
 import {Loader} from '#/components/Loader'
@@ -93,7 +87,6 @@ import {
   useReportDialogControl,
 } from '#/components/moderation/ReportDialog'
 import * as Prompt from '#/components/Prompt'
-import {useAnalytics} from '#/analytics'
 import {IS_INTERNAL} from '#/env'
 import * as bsky from '#/types/bsky'
 
@@ -123,7 +116,6 @@ let PostMenuItems = ({
 }): React.ReactNode => {
   const {hasSession, currentAccount} = useSession()
   const {_} = useLingui()
-  const ax = useAnalytics()
   const langPrefs = useLanguagePrefs()
   const {mutateAsync: deletePostMutate} = usePostDeleteMutation()
   const {mutateAsync: pinPostMutate, isPending: isPinPending} =
@@ -220,7 +212,7 @@ let PostMenuItems = ({
     try {
       if (isThreadMuted) {
         unmuteThread()
-        ax.metric('post:unmute', {
+        logger.metric('post:unmute', {
           uri: postUri,
           authorDid: postAuthor.did,
           logContext,
@@ -229,7 +221,7 @@ let PostMenuItems = ({
         Toast.show(_(msg`You will now receive notifications for this thread`))
       } else {
         muteThread()
-        ax.metric('post:mute', {
+        logger.metric('post:mute', {
           uri: postUri,
           authorDid: postAuthor.did,
           logContext,
@@ -266,17 +258,21 @@ let PostMenuItems = ({
         AppBskyFeedPost.isRecord,
       )
     ) {
-      ax.metric('translate', {
-        sourceLanguages: post.record.langs ?? [],
-        targetLanguage: langPrefs.primaryLanguage,
-        textLength: post.record.text.length,
-      })
+      logger.metric(
+        'translate',
+        {
+          sourceLanguages: post.record.langs ?? [],
+          targetLanguage: langPrefs.primaryLanguage,
+          textLength: post.record.text.length,
+        },
+        {statsig: false},
+      )
     }
   }
 
   const onHidePost = () => {
     hidePost({uri: postUri})
-    ax.metric('thread:click:hideReplyForMe', {})
+    logEvent('thread:click:hideReplyForMe', {})
   }
 
   const hideInPWI = !!postAuthor.labels?.find(
@@ -290,7 +286,7 @@ let PostMenuItems = ({
       feedContext: postFeedContext,
       reqId: postReqId,
     })
-    ax.metric('post:showMore', {
+    logger.metric('post:showMore', {
       uri: postUri,
       authorDid: postAuthor.did,
       logContext,
@@ -308,7 +304,7 @@ let PostMenuItems = ({
       feedContext: postFeedContext,
       reqId: postReqId,
     })
-    ax.metric('post:showLess', {
+    logger.metric('post:showLess', {
       uri: postUri,
       authorDid: postAuthor.did,
       logContext,
@@ -372,7 +368,7 @@ let PostMenuItems = ({
 
       // Log metric only when hiding (not when showing)
       if (isHide) {
-        ax.metric('thread:click:hideReplyForEveryone', {})
+        logEvent('thread:click:hideReplyForEveryone', {})
       }
 
       Toast.show(
@@ -409,7 +405,7 @@ let PostMenuItems = ({
   }
 
   const onPressPin = () => {
-    ax.metric(isPinned ? 'post:unpin' : 'post:pin', {})
+    logEvent(isPinned ? 'post:unpin' : 'post:pin', {})
     pinPostMutate({
       postUri,
       postCid,
@@ -462,10 +458,11 @@ let PostMenuItems = ({
 
   const onSignIn = () => requireSignIn(() => {})
 
+  const gate = useGate()
   const isDiscoverDebugUser =
     IS_INTERNAL ||
     DISCOVER_DEBUG_DIDS[currentAccount?.did || ''] ||
-    ax.features.enabled(ax.features.DebugFeedContext)
+    gate('debug_show_feedcontext')
 
   return (
     <>

src/components/PostControls/ShareMenu/RecentChats.tsx

@@ -8,6 +8,7 @@ import {isBlockedOrBlocking, isMuted} from '#/lib/moderation/blocked-and-muted'
 import {type NavigationProp} from '#/lib/routes/types'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {sanitizeHandle} from '#/lib/strings/handles'
+import {logger} from '#/logger'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {useListConvosQuery} from '#/state/queries/messages/list-conversations'
@@ -19,11 +20,9 @@ import {useDialogContext} from '#/components/Dialog'
 import {Text} from '#/components/Typography'
 import {useSimpleVerificationState} from '#/components/verification'
 import {VerificationCheck} from '#/components/verification/VerificationCheck'
-import {useAnalytics} from '#/analytics'
 import type * as bsky from '#/types/bsky'
 
 export function RecentChats({postUri}: {postUri: string}) {
-  const ax = useAnalytics()
   const control = useDialogContext()
   const {currentAccount} = useSession()
   const {data} = useListConvosQuery({status: 'accepted'})
@@ -33,7 +32,7 @@ export function RecentChats({postUri}: {postUri: string}) {
 
   const onSelectChat = (convoId: string) => {
     control.close(() => {
-      ax.metric('share:press:recentDm', {})
+      logger.metric('share:press:recentDm', {}, {statsig: true})
       navigation.navigate('MessagesConversation', {
         conversation: convoId,
         embed: postUri,

src/components/PostControls/ShareMenu/ShareMenuItems.tsx

@@ -9,6 +9,8 @@ import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
 import {shareText, shareUrl} from '#/lib/sharing'
 import {toShareUrl} from '#/lib/strings/url-helpers'
+import {logger} from '#/logger'
+import {isIOS} from '#/platform/detection'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useSession} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
@@ -22,8 +24,6 @@ import {Clipboard_Stroke2_Corner2_Rounded as ClipboardIcon} from '#/components/i
 import {PaperPlane_Stroke2_Corner0_Rounded as PaperPlaneIcon} from '#/components/icons/PaperPlane'
 import * as Menu from '#/components/Menu'
 import {useAgeAssurance} from '#/ageAssurance'
-import {useAnalytics} from '#/analytics'
-import {IS_IOS} from '#/env'
 import {useDevMode} from '#/storage/hooks/dev-mode'
 import {RecentChats} from './RecentChats'
 import {type ShareMenuItemsProps} from './ShareMenuItems.types'
@@ -32,7 +32,6 @@ let ShareMenuItems = ({
   post,
   onShare: onShareProp,
 }: ShareMenuItemsProps): React.ReactNode => {
-  const ax = useAnalytics()
   const {hasSession} = useSession()
   const {_} = useLingui()
   const navigation = useNavigation<NavigationProp>()
@@ -55,16 +54,16 @@ let ShareMenuItems = ({
   }, [postAuthor])
 
   const onSharePost = () => {
-    ax.metric('share:press:nativeShare', {})
+    logger.metric('share:press:nativeShare', {}, {statsig: true})
     const url = toShareUrl(href)
     shareUrl(url)
     onShareProp()
   }
 
   const onCopyLink = async () => {
-    ax.metric('share:press:copyLink', {})
+    logger.metric('share:press:copyLink', {}, {statsig: true})
     const url = toShareUrl(href)
-    if (IS_IOS) {
+    if (isIOS) {
       // iOS only
       await ExpoClipboard.setUrlAsync(url)
     } else {
@@ -101,7 +100,7 @@ let ShareMenuItems = ({
               testID="postDropdownSendViaDMBtn"
               label={_(msg`Send via direct message`)}
               onPress={() => {
-                ax.metric('share:press:openDmSearch', {})
+                logger.metric('share:press:openDmSearch', {}, {statsig: true})
                 sendViaChatControl.open()
               }}>
               <Menu.ItemText>

src/components/PostControls/ShareMenu/ShareMenuItems.web.tsx

@@ -8,6 +8,8 @@ import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
 import {shareText, shareUrl} from '#/lib/sharing'
 import {toShareUrl} from '#/lib/strings/url-helpers'
+import {logger} from '#/logger'
+import {isWeb} from '#/platform/detection'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useSession} from '#/state/session'
 import {useBreakpoints} from '#/alf'
@@ -20,8 +22,6 @@ import {CodeBrackets_Stroke2_Corner0_Rounded as CodeBracketsIcon} from '#/compon
 import {PaperPlane_Stroke2_Corner0_Rounded as Send} from '#/components/icons/PaperPlane'
 import * as Menu from '#/components/Menu'
 import {useAgeAssurance} from '#/ageAssurance'
-import {useAnalytics} from '#/analytics'
-import {IS_WEB} from '#/env'
 import {useDevMode} from '#/storage/hooks/dev-mode'
 import {type ShareMenuItemsProps} from './ShareMenuItems.types'
 
@@ -31,7 +31,6 @@ let ShareMenuItems = ({
   timestamp,
   onShare: onShareProp,
 }: ShareMenuItemsProps): React.ReactNode => {
-  const ax = useAnalytics()
   const {hasSession} = useSession()
   const {gtMobile} = useBreakpoints()
   const {_} = useLingui()
@@ -57,21 +56,21 @@ let ShareMenuItems = ({
   }, [postAuthor])
 
   const onCopyLink = () => {
-    ax.metric('share:press:copyLink', {})
+    logger.metric('share:press:copyLink', {}, {statsig: true})
     const url = toShareUrl(href)
     shareUrl(url)
     onShareProp()
   }
 
   const onSelectChatToShareTo = (conversation: string) => {
-    ax.metric('share:press:dmSelected', {})
+    logger.metric('share:press:dmSelected', {}, {statsig: true})
     navigation.navigate('MessagesConversation', {
       conversation,
       embed: postUri,
     })
   }
 
-  const canEmbed = IS_WEB && gtMobile && !hideInPWI
+  const canEmbed = isWeb && gtMobile && !hideInPWI
 
   const onShareATURI = () => {
     shareText(postUri)
@@ -103,7 +102,7 @@ let ShareMenuItems = ({
             testID="postDropdownSendViaDMBtn"
             label={_(msg`Send via direct message`)}
             onPress={() => {
-              ax.metric('share:press:openDmSearch', {})
+              logger.metric('share:press:openDmSearch', {}, {statsig: true})
               sendViaChatControl.open()
             }}>
             <Menu.ItemText>
@@ -118,7 +117,7 @@ let ShareMenuItems = ({
             testID="postDropdownEmbedBtn"
             label={_(msg`Embed post`)}
             onPress={() => {
-              ax.metric('share:press:embed', {})
+              logger.metric('share:press:embed', {}, {statsig: true})
               embedPostControl.open()
             }}>
             <Menu.ItemText>{_(msg`Embed post`)}</Menu.ItemText>

src/components/PostControls/ShareMenu/index.tsx

@@ -12,15 +12,17 @@ import {useLingui} from '@lingui/react'
 
 import {makeProfileLink} from '#/lib/routes/links'
 import {shareUrl} from '#/lib/sharing'
+import {useGate} from '#/lib/statsig/statsig'
 import {toShareUrl} from '#/lib/strings/url-helpers'
+import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/post-shadow'
 import {useFeedFeedbackContext} from '#/state/feed-feedback'
 import {EventStopper} from '#/view/com/util/EventStopper'
 import {native} from '#/alf'
+import {ArrowOutOfBoxModified_Stroke2_Corner2_Rounded as ArrowOutOfBoxIcon} from '#/components/icons/ArrowOutOfBox'
 import {ArrowShareRight_Stroke2_Corner2_Rounded as ArrowShareRightIcon} from '#/components/icons/ArrowShareRight'
 import {useMenuControl} from '#/components/Menu'
 import * as Menu from '#/components/Menu'
-import {useAnalytics} from '#/analytics'
 import {PostControlButton, PostControlButtonIcon} from '../PostControlButton'
 import {ShareMenuItems} from './ShareMenuItems'
 
@@ -47,10 +49,14 @@ let ShareMenuButton = ({
   hitSlop?: Insets
   logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
 }): React.ReactNode => {
-  const ax = useAnalytics()
   const {_} = useLingui()
+  const gate = useGate()
   const {feedDescriptor} = useFeedFeedbackContext()
 
+  const ShareIcon = gate('alt_share_icon')
+    ? ArrowShareRightIcon
+    : ArrowOutOfBoxIcon
+
   const menuControl = useMenuControl()
   const [hasBeenOpen, setHasBeenOpen] = useState(false)
   const lazyMenuControl = useMemo(
@@ -62,17 +68,20 @@ let ShareMenuButton = ({
         // menuControl.open() fires but RN doesn't expose flushSync.
         setTimeout(menuControl.open)
 
-        ax.metric('post:share', {
-          uri: post.uri,
-          authorDid: post.author.did,
-          logContext,
-          feedDescriptor,
-          postContext: big ? 'thread' : 'feed',
-        })
+        logger.metric(
+          'post:share',
+          {
+            uri: post.uri,
+            authorDid: post.author.did,
+            logContext,
+            feedDescriptor,
+            postContext: big ? 'thread' : 'feed',
+          },
+          {statsig: true},
+        )
       },
     }),
     [
-      ax,
       menuControl,
       setHasBeenOpen,
       big,
@@ -84,7 +93,7 @@ let ShareMenuButton = ({
   )
 
   const onNativeLongPress = () => {
-    ax.metric('share:press:nativeShare', {})
+    logger.metric('share:press:nativeShare', {}, {statsig: true})
     const urip = new AtUri(post.uri)
     const href = makeProfileLink(post.author, 'post', urip.rkey)
     const url = toShareUrl(href)
@@ -105,7 +114,7 @@ let ShareMenuButton = ({
                 {...props}
                 onLongPress={native(onNativeLongPress)}
                 hitSlop={hitSlop}>
-                <PostControlButtonIcon icon={ArrowShareRightIcon} />
+                <PostControlButtonIcon icon={ShareIcon} />
               </PostControlButton>
             )
           }}