Add support for autofill of one-time-code for email verification

2024-09-06 10:42:40 -05:00
360 changed files with 15538 additions and 31311 deletions
@@ -33,7 +33,6 @@ module.exports = {
    ],
    'bsky-internal/use-exact-imports': 'error',
    'bsky-internal/use-typed-gates': 'error',
-    'bsky-internal/use-prefixed-imports': 'warn',
    'simple-import-sort/imports': [
      'warn',
      {
@@ -21,7 +21,7 @@ jobs:
        with:
          go-version: '1.22'
      - name: Dummy Static Files
-        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
+        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
      - name: Check
        run: cd bskyweb/ && make check
      - name: Build (binary)
@@ -38,6 +38,6 @@ jobs:
        with:
          go-version: '1.22'
      - name: Dummy Static Files
-        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
+        run: touch bskyweb/static/js/blah.js && touch bskyweb/static/media/blah.txt
      - name: Lint
        run: cd bskyweb/ &&  make lint
@@ -1,4 +1,4 @@
-# Ignore everything except JS-ey or CSS code.
+# Ignore everything except JS-ey code.
 # Based on https://stackoverflow.com/a/70715829/458193
 *
 !**/*.js
@@ -7,8 +7,6 @@
 !**/*.tsx
 !*/

-!**/*.css
-
 # More specific ignores go below.
 .expo
 android
@@ -40,7 +40,6 @@ RUN find ./bskyweb/embedr-static && find ./bskyweb/embedr-templates && find ./bs

 # hack around issue with empty directory and go:embed
 RUN touch bskyweb/static/js/empty.txt
-RUN touch bskyweb/static/css/empty.txt
 RUN touch bskyweb/static/media/empty.txt

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

 - tapOn:
    label: "Create a new curatelist"
@@ -160,6 +161,17 @@ appId: xyz.blueskyweb.app
 - assertNotVisible:
    id: "userAddRemoveListsModal"

+- tapOn:
+    label: "Shows the curatelist on my profile"
+    id: "bottomBarProfileBtn"
+- swipe:
+    from:
+        id: "profilePager-selector"
+    direction: LEFT
+- tapOn:
+    id: "profilePager-selector-6"
+- tapOn: "Good Ppl"
+
 - tapOn:
    label: "Adds and removes users on curatelists from the profile"
    id: "bottomBarSearchBtn"
@@ -10,13 +10,8 @@ appId: xyz.blueskyweb.app
    id: "e2eSignInAlice"

 # Pin alice's feed
- extendedWaitUntil:
-    visible:
-        id: "viewHeaderDrawerBtn"
 - tapOn:
-    id: "viewHeaderDrawerBtn"
- tapOn:
-    id: "profileCardButton"
+    id: "bottomBarProfileBtn"
 - swipe:
    from:
        id: "profilePager-selector"
@@ -9,9 +9,6 @@ appId: xyz.blueskyweb.app
 - tapOn:
    id: "e2eSignInAlice"

- extendedWaitUntil:
-    visible:
-        text: "Feeds ✨"
 - tapOn:
    label: "Can go to feeds page using feeds button in tab bar"
    text: "Feeds ✨"
@@ -37,16 +34,26 @@ appId: xyz.blueskyweb.app
 - tapOn:
    label: "Can like posts"
    id: "likeBtn"
+- assertVisible:
+    id: "likeCount"
+    text: "1"
 - tapOn:
    id: "likeBtn"
+- assertNotVisible:
+    id: "likeCount"

 - tapOn:
    label: "Can repost posts"
    id: "repostBtn"
 - tapOn: "Repost"
+- assertVisible:
+    id: "repostCount"
+    text: "1"
 - tapOn:
    id: "repostBtn"
 - tapOn: "Remove repost"
+- assertNotVisible:
+    id: "repostCount"

 - tapOn:
    label: "Can delete posts"
@@ -11,9 +11,6 @@ appId: xyz.blueskyweb.app


 # Navigate to my profile
- extendedWaitUntil:
-    visible:
-        id: "bottomBarSearchBtn"
 - tapOn:
    id: "bottomBarProfileBtn"

@@ -10,9 +10,6 @@ appId: xyz.blueskyweb.app
    id: "e2eSignInAlice"

 # Navigate to another user profile
- extendedWaitUntil:
-    visible:
-        id: "bottomBarSearchBtn"
 - tapOn:
    id: "bottomBarSearchBtn"
 - tapOn:
@@ -11,8 +11,6 @@ appId: xyz.blueskyweb.app


 # Navigate to thread
- extendedWaitUntil:
-    visible: "Thread root"
 - tapOn: "Thread root"
 - assertVisible: "Thread reply"

@@ -21,22 +19,32 @@ appId: xyz.blueskyweb.app
    id: "likeBtn"
    childOf:
        id: "postThreadItem-by-bob.test"
- assertVisible: "1 like"
+- assertVisible:
+    id: "likeCount-expanded"
 - tapOn:
    id: "likeBtn"
    childOf:
        id: "postThreadItem-by-bob.test"
- assertNotVisible: "1 like"
+- assertNotVisible:
+    id: "likeCount-expanded"

 # Can like a reply post
 - tapOn:
    id: "likeBtn"
    childOf:
        id: "postThreadItem-by-carla.test"
+- assertVisible:
+    id: "likeCount"
+    childOf:
+        id: "postThreadItem-by-carla.test"
 - tapOn:
    id: "likeBtn"
    childOf:
        id: "postThreadItem-by-carla.test"
+- assertNotVisible:
+    id: "likeCount"
+    childOf:
+        id: "postThreadItem-by-carla.test"

 # Can repost the root post
 - tapOn:
@@ -55,7 +55,6 @@ module.exports = function (config) {
    : undefined
  const UPDATES_ENABLED = !!UPDATES_CHANNEL

-  const USE_SENTRY = Boolean(process.env.SENTRY_AUTH_TOKEN)
  const SENTRY_DIST = `${PLATFORM}.${VERSION}.${IS_TESTFLIGHT ? 'tf' : ''}${
    IS_DEV ? 'dev' : ''
  }`
@@ -187,15 +186,7 @@ module.exports = function (config) {
      },
      plugins: [
        'expo-localization',
-        USE_SENTRY && [
-          '@sentry/react-native/expo',
-          {
-            organization: 'blueskyweb',
-            project: 'react-native',
-            release: VERSION,
-            dist: SENTRY_DIST,
-          },
-        ],
+        Boolean(process.env.SENTRY_AUTH_TOKEN) && 'sentry-expo',
        [
          'expo-build-properties',
          {
@@ -220,6 +211,7 @@ module.exports = function (config) {
            sounds: PLATFORM === 'ios' ? ['assets/dm.aiff'] : ['assets/dm.mp3'],
          },
        ],
+        'expo-video',
        'react-native-compressor',
        './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
        './plugins/withAndroidManifestPlugin.js',
@@ -230,31 +222,6 @@ module.exports = function (config) {
        './plugins/shareExtension/withShareExtensions.js',
        './plugins/notificationsExtension/withNotificationsExtension.js',
        './plugins/withAppDelegateReferrer.js',
-        [
-          'expo-font',
-          {
-            fonts: [
-              // './assets/fonts/inter/Inter-Thin.otf',
-              // './assets/fonts/inter/Inter-ThinItalic.otf',
-              // './assets/fonts/inter/Inter-ExtraLight.otf',
-              // './assets/fonts/inter/Inter-ExtraLightItalic.otf',
-              // './assets/fonts/inter/Inter-Light.otf',
-              // './assets/fonts/inter/Inter-LightItalic.otf',
-              './assets/fonts/inter/Inter-Regular.otf',
-              './assets/fonts/inter/Inter-Italic.otf',
-              './assets/fonts/inter/Inter-Medium.otf',
-              './assets/fonts/inter/Inter-MediumItalic.otf',
-              './assets/fonts/inter/Inter-SemiBold.otf',
-              './assets/fonts/inter/Inter-SemiBoldItalic.otf',
-              './assets/fonts/inter/Inter-Bold.otf',
-              './assets/fonts/inter/Inter-BoldItalic.otf',
-              './assets/fonts/inter/Inter-ExtraBold.otf',
-              './assets/fonts/inter/Inter-ExtraBoldItalic.otf',
-              './assets/fonts/inter/Inter-Black.otf',
-              './assets/fonts/inter/Inter-BlackItalic.otf',
-            ],
-          },
-        ],
      ].filter(Boolean),
      extra: {
        eas: {
@@ -297,7 +264,7 @@ module.exports = function (config) {
           * @see https://docs.expo.dev/guides/using-sentry/#app-configuration
           */
          {
-            file: './postHooks/uploadSentrySourcemapsPostHook',
+            file: 'sentry-expo/upload-sourcemaps',
            config: {
              organization: 'blueskyweb',
              project: 'react-native',
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3 4a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4Zm2 1v14h14V5H5Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4 2c0-.552.41-1 .917-1h14.666c.507 0 .917.448.917 1v20c0 .552-.41 1-.917 1H4.917C4.41 23 4 22.552 4 22V2Zm1.833 1v18h12.834V3H5.833Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M2 20.5c-.552 0-1-.41-1-.917V4.917C1 4.41 1.448 4 2 4h20c.552 0 1 .41 1 .917v14.666c0 .507-.448.917-1 .917H2Zm1-1.833h18V5.833H3v12.834Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M12 3a1 1 0 0 1 1 1v8.086l1.793-1.793a1 1 0 1 1 1.414 1.414l-3.5 3.5a1 1 0 0 1-1.414 0l-3.5-3.5a1 1 0 1 1 1.414-1.414L11 12.086V4a1 1 0 0 1 1-1ZM4 14a1 1 0 0 1 1 1v4h14v-4a1 1 0 1 1 2 0v5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-5a1 1 0 0 1 1-1Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M4 21a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h5v2H5v14h4v2H4Zm9-20v22h-2V1h2Zm7.707 2.293A1 1 0 0 1 21 4v1h-2V3h1a1 1 0 0 1 .707.293ZM19 7h2v2h-2V7Zm0 4h2v2h-2v-2Zm0 4h2v2h-2v-2Zm0 4h2v1a1 1 0 0 1-1 1h-1v-2Zm-2 0v2h-2v-2h2ZM15 5h2V3h-2v2Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3 4a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v5h-2V5H5v4H3V4Zm20 9H1v-2h22v2Zm-2.293 7.707A1 1 0 0 1 20 21h-1v-2h2v1a1 1 0 0 1-.293.707ZM17 19v2h-2v-2h2Zm-4 0v2h-2v-2h2Zm-4 0v2H7v-2h2Zm-4 0v2H4a1 1 0 0 1-1-1v-1h2Zm0-2H3v-2h2v2Zm14-2v2h2v-2h-2Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M9 5a1 1 0 0 1 1-1h12a1 1 0 1 1 0 2h-5v14a1 1 0 1 1-2 0V6h-5a1 1 0 0 1-1-1Zm-3.073 7v8a1 1 0 1 0 2 0v-8H12a1 1 0 1 0 0-2H6.971a1.015 1.015 0 0 0-.089 0H2a1 1 0 1 0 0 2h3.927Z" clip-rule="evenodd"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3.65 17.247c-.242.832-.632 1.178-1.325 1.178-.814 0-1.325-.476-1.325-1.23 0-.216.06-.51.173-.831L4.586 7.07c.364-1.014.979-1.482 1.966-1.482 1.022 0 1.629.45 2.001 1.473l3.43 9.303c.121.337.165.571.165.831 0 .72-.546 1.23-1.308 1.23-.736 0-1.126-.338-1.36-1.152l-.658-1.975H4.309l-.658 1.95ZM6.5 8.152l-1.62 5.12h3.335l-1.654-5.12H6.5Zm13.005 8.688c-.52.988-1.68 1.568-2.84 1.568-1.768 0-3.11-1.144-3.11-2.815 0-1.69 1.299-2.668 3.62-2.807l2.34-.138v-.615c0-.867-.607-1.369-1.56-1.369-.771 0-1.239.251-1.802.979-.277.312-.597.468-1.004.468-.615 0-1.057-.399-1.057-.97 0-.2.043-.382.13-.572.433-1.109 1.923-1.793 3.845-1.793 2.383 0 3.933 1.23 3.933 3.1v5.293c0 .84-.511 1.273-1.23 1.273-.684 0-1.16-.38-1.213-1.126v-.476h-.052Zm-3.43-1.386c0 .693.572 1.126 1.42 1.126 1.11 0 2.02-.719 2.02-1.723v-.676l-1.959.121c-.944.07-1.48.494-1.48 1.152Z" clip-rule="evenodd"/></svg>
@@ -158,12 +158,6 @@ export function Embed({
        return <Info>The quoted post is blocked.</Info>
      }

-      // Case 3.8: Detached quote post
-      if (AppBskyEmbedRecord.isViewDetached(record)) {
-        // Just don't show anything
-        return null
-      }
-
      // Unknown embed type
      return null
    }
@@ -378,7 +372,7 @@ function VideoEmbed({content}: {content: AppBskyEmbedVideo.View}) {

  return (
    <div
-      className="w-full overflow-hidden rounded-lg aspect-square relative"
+      className="w-full overflow-hidden rounded-lg aspect-square"
      style={{aspectRatio: `${aspectRatio} / 1`}}>
      <img
        src={content.thumbnail}
@@ -4,4 +4,4 @@

 .break-word {
  word-break: break-word;
-}
+}
@@ -10,10 +10,6 @@ static/js/*.js
 static/js/*.map
 static/js/*.js.LICENSE.txt
 static/js/empty.txt
-static/css/*.css
-static/css/*.map
-static/css/*.css.LICENSE.txt
-static/css/empty.txt
 static/media/*.png
 static/media/empty.txt
 templates/scripts.html
@@ -60,12 +60,6 @@ func run(args []string) {
 					Value:    "",
 					EnvVars:  []string{"LINK_HOST"},
 				},
-				&cli.StringFlag{
-					Name:    "ipcc-host",
-					Usage:   "scheme, hostname, and port of ipcc service",
-					Value:   "https://localhost:8730",
-					EnvVars: []string{"IPCC_HOST"},
-				},
 				&cli.BoolFlag{
 					Name:     "debug",
 					Usage:    "Enable debug mode",
@@ -80,13 +74,6 @@ func run(args []string) {
 					Value:    "",
 					EnvVars:  []string{"BASIC_AUTH_PASSWORD"},
 				},
-				&cli.StringSliceFlag{
-					Name:     "cors-allowed-origins",
-					Usage:    "list of allowed origins for CORS requests",
-					Required: false,
-					Value:    cli.NewStringSlice("https://bsky.app", "https://main.bsky.dev", "https://app.staging.bsky.dev"),
-					EnvVars:  []string{"CORS_ALLOWED_ORIGINS"},
-				},
 			},
 		},
 	}
@@ -1,17 +1,12 @@
 package main

 import (
-	"bytes"
 	"context"
 	"crypto/subtle"
-	"crypto/tls"
-	"encoding/base64"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io/fs"
 	"net/http"
-	"net/netip"
 	"net/url"
 	"os"
 	"os/signal"
@@ -46,7 +41,6 @@ type Config struct {
 	appviewHost string
 	ogcardHost  string
 	linkHost    string
-	ipccHost    string
 }

 func serve(cctx *cli.Context) error {
@@ -55,9 +49,7 @@ func serve(cctx *cli.Context) error {
 	appviewHost := cctx.String("appview-host")
 	ogcardHost := cctx.String("ogcard-host")
 	linkHost := cctx.String("link-host")
-	ipccHost := cctx.String("ipcc-host")
 	basicAuthPassword := cctx.String("basic-auth-password")
-	corsOrigins := cctx.StringSlice("cors-allowed-origins")

 	// Echo
 	e := echo.New()
@@ -99,7 +91,6 @@ func serve(cctx *cli.Context) error {
 			appviewHost: appviewHost,
 			ogcardHost:  ogcardHost,
 			linkHost:    linkHost,
-			ipccHost:    ipccHost,
 		},
 	}

@@ -169,12 +160,6 @@ func serve(cctx *cli.Context) error {
 		RedirectCode: http.StatusFound,
 	}))

-	// CORS middleware
-	e.Use(middleware.CORSWithConfig(middleware.CORSConfig{
-		AllowOrigins: corsOrigins,
-		AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodOptions},
-	}))
-
 	//
 	// configure routes
 	//
@@ -210,11 +195,6 @@ func serve(cctx *cli.Context) error {
 				maxAge = 7 * (60 * 60 * 24) // 1 week
 			}

-			// fonts can be cached for a year
-			if strings.HasSuffix(path, ".otf") {
-				maxAge = 365 * (60 * 60 * 24) // 1 year
-			}
-
 			c.Response().Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%d", maxAge))
 			return next(c)
 		}
@@ -281,9 +261,6 @@ func serve(cctx *cli.Context) error {
 	e.GET("/starter-pack/:handleOrDID/:rkey", server.WebStarterPack)
 	e.GET("/start/:handleOrDID/:rkey", server.WebStarterPack)

-	// ipcc
-	e.GET("/ipcc", server.WebIpCC)
-
 	if linkHost != "" {
 		linkUrl, err := url.Parse(linkHost)
 		if err != nil {
@@ -543,61 +520,3 @@ func (srv *Server) WebProfile(c echo.Context) error {
 	data["requestHost"] = req.Host
 	return c.Render(http.StatusOK, "profile.html", data)
 }
-
-type IPCCRequest struct {
-	IP string `json:"ip"`
-}
-type IPCCResponse struct {
-	CC string `json:"countryCode"`
-}
-
-func (srv *Server) WebIpCC(c echo.Context) error {
-	realIP := c.RealIP()
-	addr, err := netip.ParseAddr(realIP)
-	if err != nil {
-		log.Warnf("could not parse IP %q %s", realIP, err)
-		return c.JSON(400, IPCCResponse{})
-	}
-	var request []byte
-	if addr.Is4() {
-		ip4 := addr.As4()
-		var dest [8]byte
-		base64.StdEncoding.Encode(dest[:], ip4[:])
-		request, _ = json.Marshal(IPCCRequest{IP: string(dest[:])})
-	} else if addr.Is6() {
-		ip6 := addr.As16()
-		var dest [24]byte
-		base64.StdEncoding.Encode(dest[:], ip6[:])
-		request, _ = json.Marshal(IPCCRequest{IP: string(dest[:])})
-	}
-
-	ipccUrlBuilder, err := url.Parse(srv.cfg.ipccHost)
-	if err != nil {
-		log.Errorf("ipcc misconfigured bad url %s", err)
-		return c.JSON(500, IPCCResponse{})
-	}
-	ipccUrlBuilder.Path = "ipccdata.IpCcService/Lookup"
-	ipccUrl := ipccUrlBuilder.String()
-	cl := http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
-			},
-		},
-	}
-	postBodyReader := bytes.NewReader(request)
-	response, err := cl.Post(ipccUrl, "application/json", postBodyReader)
-	if err != nil {
-		log.Warnf("ipcc backend error %s", err)
-		return c.JSON(500, IPCCResponse{})
-	}
-	defer response.Body.Close()
-	dec := json.NewDecoder(response.Body)
-	var outResponse IPCCResponse
-	err = dec.Decode(&outResponse)
-	if err != nil {
-		log.Warnf("ipcc bad response %s", err)
-		return c.JSON(500, IPCCResponse{})
-	}
-	return c.JSON(200, outResponse)
-}
@@ -13,72 +13,253 @@

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

-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Regular.1f5ed03b6dd9fd1f9982.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Italic.95778eb0c75dc956257e.otf">
-  <!--
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Medium.296aa2d65964269836b3.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-MediumItalic.0e57e17a6311368e2114.otf">
-  -->
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-SemiBold.2277990330981b8409bb.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-SemiBoldItalic.f62fea3df3a521d6c8a7.otf">
-  <!--
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Bold.8d330503e1d034ad68de.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-BoldItalic.bb17e63f9baa0d861a20.otf">
-  -->
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-ExtraBold.ff2581a193bf6b7e0b06.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-ExtraBoldItalic.0e50b40728d24d40fdf4.otf">
-  <!--
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-Black.66e9a87f1c921e844ed4.otf">
-  <link rel="preload" as="font" type="font/otf" href="/static/media/Inter-BlackItalic.27b9f0ad06fd13a7b9da.otf">
-  -->
-
  <style>
    /**
-     * Minimum styles required to render splash.
-     *
-     * ALL OTHER STYLES BELONG IN `src/style.css`
-     *
-     * THIS NEEDS TO BE DUPLICATED IN `bskyweb/templates/base.html`
+     * Extend the react-native-web reset:
+     * https://github.com/necolas/react-native-web/blob/master/packages/react-native-web/src/exports/StyleSheet/initialRules.js
     */
-    html {
-      background-color: white;
-      scrollbar-gutter: stable both-edges;
-    }
-    @media (prefers-color-scheme: dark) {
-      html {
-        background-color: black;
-      }
-    }
    html,
-    body {
+    body,
+    #root {
+      width: 100%;
+      /* To smooth any scrolling behavior */
+      -webkit-overflow-scrolling: touch;
      margin: 0px;
      padding: 0px;
-      font-family: 'Inter-Regular', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Liberation Sans', Helvetica, Arial, sans-serif;
-      text-rendering: optimizeLegibility;
-      /* Platform-specific reset */
-      -webkit-overflow-scrolling: touch;
+      /* Allows content to fill the viewport and go beyond the bottom */
+      min-height: 100%;
+    }
+    #root {
+      flex-shrink: 0;
+      flex-basis: auto;
+      flex-grow: 1;
+      display: flex;
+      flex: 1;
+    }
+
+    html {
+      /* Prevent text size change on orientation change https://gist.github.com/tfausak/2222823#file-ios-8-web-app-html-L138 */
      -webkit-text-size-adjust: 100%;
+      height: calc(100% + env(safe-area-inset-top));
+      scrollbar-gutter: stable both-edges;
+    }
+    html, body {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Liberation Sans", Helvetica, Arial, sans-serif;
+    }
+
+    #preload {
+      width: 100px;
+      position: fixed;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+    }
+
+    /* Buttons and inputs have a font set by UA, so we'll have to reset that */
+    button, input, textarea {
+      font: inherit;
+      line-height: inherit;
+    }
+
+    /* Color theming */
+    /* Default will always be white */
+    :root {
+        --text: black;
+        --background: white;
+        --backgroundLight: hsl(211, 20%, 95%);
+    }
+    /* This gives us a black background when system is dark and we have not loaded the theme/color scheme values in JS */
+    @media (prefers-color-scheme: dark) {
+        :root {
+            --text: white;
+            --background: black;
+            --backgroundLight: hsl(211, 20%, 20%);
+            color-scheme: dark;
+        }
+    }
+
+    /* Overwrite those preferences with the selected theme */
+    html.theme--light {
+        --text: black;
+        --background: white;
+        --backgroundLight: hsl(211, 20%, 95%);
+    }
+    html.theme--dark {
+        --text: white;
+        --background: black;
+        --backgroundLight: hsl(211, 20%, 20%);
+        color-scheme: dark;
+    }
+    html.theme--dim {
+        --text: white;
+        --background: hsl(211, 20%, 4%);
+        --backgroundLight: hsl(211, 20%, 10%);
+        color-scheme: dark;
+    }
+
+    /* Remove autofill styles on Webkit */
+    input:autofill,
+    input:-webkit-autofill,
+    input:-webkit-autofill:hover,
+    input:-webkit-autofill:focus,
+    input:-webkit-autofill:active{
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: var(--text);
+        transition: background-color 5000s ease-in-out 0s;
+        box-shadow: inset 0 0 20px 20px var(--background);
+        background: var(--background);
+        color: var(--text);
+    }
+    /* Force left-align date/time inputs on iOS mobile */
+    input::-webkit-date-and-time-value {
+      text-align: left;
+    }
+
+    body {
+      display: flex;
+      /* Allows you to scroll below the viewport; default value is visible */
+      overflow-y: auto;
+      overscroll-behavior-y: none;
+      text-rendering: optimizeLegibility;
+      background-color: var(--background);
      -webkit-font-smoothing: antialiased;
      -moz-osx-font-smoothing: grayscale;
      -ms-overflow-style: scrollbar;
      font-synthesis-weight: none;
    }
-    html,
-    body,
-    #root {
-      display: flex;
-      flex: 1 0 auto;
-      min-height: 100%;
+
+    /* Remove default link styling */
+    a {
+      color: inherit;
    }
-    #splash {
-      position: fixed;
-      width: 100px;
+    a[role="link"]:hover {
+      text-decoration: underline;
+    }
+    a[role="link"][data-no-underline="1"]:hover {
+      text-decoration: none;
+    }
+
+    /* Styling hacks */
+    *[data-word-wrap] {
+      word-break: break-word;
+    }
+    *[data-stable-gutters] {
+      scrollbar-gutter: stable both-edges;
+    }
+
+    /* ProseMirror */
+    .ProseMirror {
+      font: 18px -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Liberation Sans", Helvetica, Arial, sans-serif;
+      min-height: 140px;
+    }
+    .ProseMirror-dark {
+      color: white;
+    }
+    .ProseMirror p {
+      margin: 0;
+    }
+    .ProseMirror p.is-editor-empty:first-child::before {
+      color: #8d8e96;
+      content: attr(data-placeholder);
+      float: left;
+      height: 0;
+      pointer-events: none;
+    }
+    .ProseMirror .mention {
+      color: #0085ff;
+    }
+    .ProseMirror a,
+    .ProseMirror .autolink {
+      color: #0085ff;
+    }
+    /* OLLIE: TODO -- this is not accessible */
+    /* Remove focus state on inputs */
+    .ProseMirror-focused {
+      outline: 0;
+    }
+    textarea:focus,
+    input:focus {
+      outline: 0;
+    }
+    .tippy-content .items {
+      width: fit-content;
+    }
+
+    /* Tooltips */
+    [data-tooltip] {
+      position: relative;
+      z-index: 10;
+    }
+    [data-tooltip]::after {
+      content: attr(data-tooltip);
+      display: none;
+      position: absolute;
+      bottom: 0;
      left: 50%;
-      top: 50%;
-      transform: translateX(-50%) translateY(-50%) translateY(-50px);
+      transform: translateY(100%) translateY(8px) translateX(-50%);
+      padding: 4px 10px;
+      border-radius: 10px;
+      background: var(--backgroundLight);
+      color: var(--text);
+      text-align: center;
+      white-space: nowrap;
+      font-size: 12px;
+      z-index: 10;
+    }
+    [data-tooltip]::before {
+      content: '';
+      display: none;
+      position: absolute;
+      border-bottom: 6px solid var(--backgroundLight);
+      border-left: 6px solid transparent;
+      border-right: 6px solid transparent;
+      bottom: 0;
+      left: 50%;
+      transform: translateY(100%) translateY(2px) translateX(-50%);
+      z-index: 10;
+    }
+    [data-tooltip]:hover::after,
+    [data-tooltip]:hover::before {
+      display:block;
+    }
+
+    /* NativeDropdown component */
+    .radix-dropdown-item:focus,
+    .nativeDropdown-item:focus {
+      outline: none;
+    }
+
+    /* Spinner component */
+    @keyframes rotate {
+      0% {
+        transform: rotate(0deg);
+      }
+      100% {
+        transform: rotate(360deg);
+      }
+    }
+    .rotate-500ms {
+      position: absolute;
+      inset:0;
+      animation: rotate 500ms linear infinite;
+    }
+
+    @keyframes avatarHoverFadeIn {
+      from { opacity: 0; }
+      to { opacity: 1; }
+    }
+
+    @keyframes avatarHoverFadeOut {
+      from { opacity: 1; }
+      to { opacity: 0; }
+    }
+
+    .force-no-clicks > *,
+    .force-no-clicks * {
+      pointer-events: none !important;
    }
  </style>
-
+  </style>
  {% include "scripts.html" %}
  <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
  <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
@@ -95,7 +276,7 @@
 <body>
 {%- block body_all %}
  <div id="root">
-    <div id="splash">
+    <div id="preload">
      <!-- Bluesky SVG -->
      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 320"><path fill="#0085ff" d="M180 142c-16.3-31.7-60.7-90.8-102-120C38.5-5.9 23.4-1 13.5 3.4 2.1 8.6 0 26.2 0 36.5c0 10.4 5.7 84.8 9.4 97.2 12.2 41 55.7 55 95.7 50.5-58.7 8.6-110.8 30-42.4 106.1 75.1 77.9 103-16.7 117.3-64.6 14.3 48 30.8 139 116 64.6 64-64.6 17.6-97.5-41.1-106.1 40 4.4 83.5-9.5 95.7-50.5 3.7-12.4 9.4-86.8 9.4-97.2 0-10.3-2-27.9-13.5-33C336.5-1 321.5-6 282 22c-41.3 29.2-85.7 88.3-102 120Z"/></svg>
    </div>
@@ -5,6 +5,5 @@ module.exports = {
    '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'),
  },
 }
@@ -1,3 +1,4 @@
+/* eslint-disable bsky-internal/use-exact-imports */
 const BANNED_IMPORTS = [
  '@fortawesome/free-regular-svg-icons',
  '@fortawesome/free-solid-svg-icons',
@@ -5,12 +6,11 @@ const BANNED_IMPORTS = [

 exports.create = function create(context) {
  return {
-    ImportDeclaration(node) {
-      const source = node.source
-      if (typeof source.value !== 'string') {
+    Literal(node) {
+      if (typeof node.value !== 'string') {
        return
      }
-      if (BANNED_IMPORTS.includes(source.value)) {
+      if (BANNED_IMPORTS.includes(node.value)) {
        context.report({
          node,
          message:
@@ -1,39 +0,0 @@
-const BANNED_IMPORT_PREFIXES = [
-  'alf/',
-  'components/',
-  'lib/',
-  'locale/',
-  'logger/',
-  'platform/',
-  'state/',
-  'storage/',
-  'view/',
-]
-
-module.exports = {
-  meta: {
-    type: 'suggestion',
-    fixable: 'code',
-  },
-  create(context) {
-    return {
-      ImportDeclaration(node) {
-        const source = node.source
-        if (typeof source.value !== 'string') {
-          return
-        }
-        if (
-          BANNED_IMPORT_PREFIXES.some(banned => source.value.startsWith(banned))
-        ) {
-          context.report({
-            node: source,
-            message: `Use '#/${source.value}'`,
-            fix(fixer) {
-              return fixer.replaceText(source, `'#/${source.value}'`)
-            },
-          })
-        }
-      },
-    }
-  },
-}
@@ -14,7 +14,6 @@ module.exports = {
    'ja',
    'ko',
    'pt-BR',
-    'ru',
    'tr',
    'uk',
    'zh-CN',
@@ -1,6 +1,6 @@
 {
  "name": "bsky.app",
-  "version": "1.91.2",
+  "version": "1.91.0",
  "private": true,
  "engines": {
    "node": ">=18"
@@ -15,7 +15,7 @@
    "web": "expo start --web",
    "use-build-number": "./scripts/useBuildNumberEnv.sh",
    "use-build-number-with-bump": "./scripts/useBuildNumberEnvWithBump.sh",
-    "build-web": "expo export:web && node ./scripts/post-web-build.js",
+    "build-web": "expo export:web && node ./scripts/post-web-build.js && cp -v ./web-build/static/js/*.* ./bskyweb/static/js/ && cp -v ./web-build/static/media/*.png ./bskyweb/static/media/",
    "build-all": "yarn intl:build && yarn use-build-number-with-bump eas build --platform all",
    "build-ios": "yarn use-build-number-with-bump eas build -p ios",
    "build-android": "yarn use-build-number-with-bump eas build -p android",
@@ -52,7 +52,7 @@
    "open-analyzer": "EXPO_PUBLIC_OPEN_ANALYZER=1 yarn build-web"
  },
  "dependencies": {
-    "@atproto/api": "^0.13.7",
+    "@atproto/api": "0.13.5",
    "@bam.tech/react-native-image-resizer": "^3.0.4",
    "@braintree/sanitize-url": "^6.0.2",
    "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
@@ -68,7 +68,6 @@
    "@fortawesome/free-regular-svg-icons": "^6.1.1",
    "@fortawesome/free-solid-svg-icons": "^6.1.1",
    "@fortawesome/react-native-fontawesome": "^0.3.2",
-    "@haileyok/bluesky-video": "0.1.10",
    "@lingui/react": "^4.5.0",
    "@mattermost/react-native-paste-input": "^0.7.1",
    "@miblanchard/react-native-slider": "^2.3.1",
@@ -85,7 +84,7 @@
    "@segment/analytics-react": "^1.0.0-rc1",
    "@segment/analytics-react-native": "^2.10.1",
    "@segment/sovran-react-native": "^0.4.5",
-    "@sentry/react-native": "5.32.0",
+    "@sentry/react-native": "5.5.0",
    "@tamagui/focus-scope": "^1.84.1",
    "@tanstack/query-async-storage-persister": "^5.25.0",
    "@tanstack/react-query": "^5.8.1",
@@ -110,13 +109,11 @@
    "await-lock": "^2.2.2",
    "babel-plugin-transform-remove-console": "^6.9.4",
    "base64-js": "^1.5.1",
-    "bcp-47": "^2.1.0",
    "bcp-47-match": "^2.0.3",
    "date-fns": "^2.30.0",
    "deprecated-react-native-prop-types": "^5.0.0",
    "email-validator": "^2.0.4",
    "emoji-mart": "^5.5.2",
-    "emoji-regex": "^10.4.0",
    "eventemitter3": "^5.0.1",
    "expo": "^51.0.8",
    "expo-application": "^5.9.1",
@@ -126,7 +123,6 @@
    "expo-dev-client": "^4.0.14",
    "expo-device": "~6.0.2",
    "expo-file-system": "^17.0.1",
-    "expo-font": "~12.0.10",
    "expo-haptics": "^13.0.1",
    "expo-image": "~1.12.9",
    "expo-image-manipulator": "^12.0.5",
@@ -143,6 +139,7 @@
    "expo-system-ui": "~3.0.4",
    "expo-task-manager": "~11.8.1",
    "expo-updates": "~0.25.14",
+    "expo-video": "https://github.com/bluesky-social/expo/raw/expo-video-1.2.4-patch/packages/expo-video/expo-video-v1.2.4-1.tgz",
    "expo-web-browser": "~13.0.3",
    "fast-text-encoding": "^1.0.6",
    "history": "^5.3.0",
@@ -180,7 +177,7 @@
    "react-native-fs": "^2.20.0",
    "react-native-gesture-handler": "~2.16.2",
    "react-native-get-random-values": "~1.11.0",
-    "react-native-image-crop-picker": "0.41.2",
+    "react-native-image-crop-picker": "0.40.3",
    "react-native-ios-context-menu": "^1.15.3",
    "react-native-keyboard-controller": "^1.12.1",
    "react-native-mmkv": "^2.12.2",
@@ -193,7 +190,7 @@
    "react-native-safe-area-context": "4.10.1",
    "react-native-screens": "~3.31.1",
    "react-native-svg": "^15.3.0",
-    "react-native-uitextview": "^1.3.0",
+    "react-native-uitextview": "^1.1.7",
    "react-native-url-polyfill": "^1.3.0",
    "react-native-uuid": "^2.0.2",
    "react-native-view-shot": "^3.8.0",
@@ -203,10 +200,10 @@
    "react-responsive": "^9.0.2",
    "react-textarea-autosize": "^8.5.3",
    "rn-fetch-blob": "^0.12.0",
+    "sentry-expo": "~7.0.1",
    "statsig-react-native-expo": "^4.6.1",
    "tippy.js": "^6.3.7",
    "tlds": "^1.234.0",
-    "tldts": "^6.1.46",
    "zeego": "^1.6.2",
    "zod": "^3.20.2"
  },
@@ -339,9 +336,7 @@
  },
  "lint-staged": {
    "*{.js,.jsx,.ts,.tsx}": [
-      "eslint --cache --fix"
-    ],
-    "*{.js,.jsx,.ts,.tsx,.css}": [
+      "eslint --cache --fix",
      "prettier --cache --write --ignore-unknown"
    ]
  }
@@ -1,36 +0,0 @@
-diff --git a/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js b/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js
-index 7e0b4cd..177454c 100644
--- a/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js
-+++ b/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js
-@@ -3,6 +3,8 @@ import { LogBox } from 'react-native';
-  * This is a workaround for using fetch on RN, this is a known issue in react-native and only generates a warning.
-  */
- export function ignoreRequireCycleLogs() {
-    LogBox.ignoreLogs(['Require cycle:']);
-+    try {
-+        LogBox.ignoreLogs(['Require cycle:']);
-+    } catch (e) {}
- }
- //# sourceMappingURL=ignorerequirecyclelogs.js.map
-\ No newline at end of file
-diff --git a/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js b/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
-index 0f244f2..ae7dfb3 100755
--- a/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
-+++ b/node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps.js
-@@ -174,6 +174,7 @@ if (!outputDir) {
-   process.exit(1);
- }
-
-+const otherArgs = process.argv.slice(3);
- const files = getAssetPathsSync(outputDir);
- const groupedAssets = groupAssets(files);
-
-@@ -195,7 +196,7 @@ for (const [assetGroupName, assets] of Object.entries(groupedAssets)) {
-
-   const isHermes = assets.find(asset => asset.endsWith('.hbc'));
-   const windowsCallback = process.platform === "win32" ? 'node ' : '';
-  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')}`, {
-+  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')} ${otherArgs.join(' ')}`, {
-     env: {
-       ...process.env,
-       [SENTRY_PROJECT]: sentryProject,
@@ -0,0 +1,15 @@
+diff --git a/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js b/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js
+index 7e0b4cd..177454c 100644
+--- a/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js
+++ b/node_modules/@sentry/react-native/dist/js/utils/ignorerequirecyclelogs.js
+@@ -3,6 +3,8 @@ import { LogBox } from 'react-native';
+  * This is a workaround for using fetch on RN, this is a known issue in react-native and only generates a warning.
+  */
+ export function ignoreRequireCycleLogs() {
+-    LogBox.ignoreLogs(['Require cycle:']);
+    try {
+        LogBox.ignoreLogs(['Require cycle:']);
+    } catch (e) {}
+ }
+ //# sourceMappingURL=ignorerequirecyclelogs.js.map
+\ No newline at end of file
@@ -4,16 +4,16 @@ index bb74e80..0aa0202 100644
 +++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java
@@ -90,8 +90,8 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
     mModuleRegistry.ensureIsInitialized();
- 
+
     KotlinInteropModuleRegistry kotlinModuleRegistry = getKotlinInteropModuleRegistry();
 -    kotlinModuleRegistry.emitOnCreate();
     kotlinModuleRegistry.installJSIInterop();
 +    kotlinModuleRegistry.emitOnCreate();
- 
+
     Map<String, Object> constants = new HashMap<>(3);
     constants.put(MODULES_CONSTANTS_KEY, new HashMap<>());
 diff --git a/node_modules/expo-modules-core/build/uuid/uuid.js b/node_modules/expo-modules-core/build/uuid/uuid.js
-index 109d3fe..c7fce9e 100644
+index 109d3fe..c421931 100644
 --- a/node_modules/expo-modules-core/build/uuid/uuid.js
 +++ b/node_modules/expo-modules-core/build/uuid/uuid.js
@@ -1,5 +1,7 @@
@@ -24,3 +24,16 @@ index 109d3fe..c7fce9e 100644
 const nativeUuidv4 = globalThis?.expo?.uuidv4;
 const nativeUuidv5 = globalThis?.expo?.uuidv5;
 function uuidv4() {
+diff --git a/node_modules/expo-modules-core/ios/Core/SharedObjects/SharedObjectRegistry.swift b/node_modules/expo-modules-core/ios/Core/SharedObjects/SharedObjectRegistry.swift
+index ee2268a..4851b67 100644
+--- a/node_modules/expo-modules-core/ios/Core/SharedObjects/SharedObjectRegistry.swift
+++ b/node_modules/expo-modules-core/ios/Core/SharedObjects/SharedObjectRegistry.swift
+@@ -173,7 +173,7 @@ public final class SharedObjectRegistry {
+   }
+
+   internal func clear() {
+-    Self.lockQueue.async {
+    Self.lockQueue.sync {
+       self.pairs.removeAll()
+     }
+   }
@@ -1,34 +0,0 @@
-const exec = require('child_process').execSync
-
-const SENTRY_AUTH_TOKEN = process.env.SENTRY_AUTH_TOKEN
-
-module.exports = ({config}) => {
-  if (!SENTRY_AUTH_TOKEN) {
-    console.log(
-      'SENTRY_AUTH_TOKEN environment variable must be set to upload sourcemaps. Skipping.',
-    )
-    return
-  }
-
-  const org = config.organization
-  const project = config.project
-  const release = config.release
-  const dist = config.dist
-
-  if (!org || !project || !release || !dist) {
-    console.log(
-      '"organization", "project", "release", and "dist" must be set in the hook config to upload sourcemaps. Skipping.',
-    )
-    return
-  }
-
-  try {
-    console.log('Uploading sourcemaps to Sentry...')
-    exec(
-      `node node_modules/@sentry/react-native/scripts/expo-upload-sourcemaps dist --url https://sentry.io/  -o ${org} -p ${project} -r ${release} -d ${dist}`,
-    )
-    console.log('Sourcemaps uploaded to Sentry.')
-  } catch (e) {
-    console.error('Error uploading sourcemaps to Sentry:', e)
-  }
-}
@@ -20,30 +20,7 @@ console.log(`Writing ${templateFile}`)
 const outputFile = entrypoints
  .map(name => {
    const file = path.basename(name)
-    const ext = path.extname(file)
-
-    if (ext === '.js') {
-      return `<script defer="defer" src="/static/js/${file}"></script>`
-    }
-    if (ext === '.css') {
-      return `<link rel="stylesheet" href="/static/css/${file}">`
-    }
-
-    return ''
+    return `<script defer="defer" src="/static/js/${file}"></script>`
  })
  .join('\n')
 fs.writeFileSync(templateFile, outputFile)
-
-function copyFiles(sourceDir, targetDir) {
-  const files = fs.readdirSync(path.join(projectRoot, sourceDir))
-  files.forEach(file => {
-    const sourcePath = path.join(projectRoot, sourceDir, file)
-    const targetPath = path.join(projectRoot, targetDir, file)
-    fs.copyFileSync(sourcePath, targetPath)
-    console.log(`Copied ${sourcePath} to ${targetPath}`)
-  })
-}
-
-copyFiles('web-build/static/js', 'bskyweb/static/js')
-copyFiles('web-build/static/css', 'bskyweb/static/css')
-copyFiles('web-build/static/media', 'bskyweb/static/media')
@@ -29,11 +29,6 @@ import {Provider as A11yProvider} from '#/state/a11y'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {listenSessionDropped} from '#/state/events'
-import {
-  beginResolveGeolocation,
-  ensureGeolocationResolved,
-  Provider as GeolocationProvider,
-} from '#/state/geolocation'
 import {Provider as InvitesStateProvider} from '#/state/invites'
 import {Provider as LightboxStateProvider} from '#/state/lightbox'
 import {MessagesProvider} from '#/state/messages'
@@ -57,25 +52,19 @@ import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
 import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
 import {Provider as HiddenRepliesProvider} from '#/state/threadgate-hidden-replies'
 import {TestCtrls} from '#/view/com/testing/TestCtrls'
-import {Provider as VideoVolumeProvider} from '#/view/com/util/post-embeds/VideoVolumeContext'
+import {Provider as ActiveVideoProvider} from '#/view/com/util/post-embeds/ActiveVideoNativeContext'
 import * as Toast from '#/view/com/util/Toast'
 import {Shell} from '#/view/shell'
 import {ThemeProvider as Alf} from '#/alf'
 import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
-import {NuxDialogs} from '#/components/dialogs/nuxs'
 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
-import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
 import {Provider as PortalProvider} from '#/components/Portal'
 import {Splash} from '#/Splash'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
+import {AudioCategory, PlatformInfo} from '../modules/expo-bluesky-swiss-army'

 SplashScreen.preventAutoHideAsync()

-/**
- * Begin geolocation ASAP
- */
-beginResolveGeolocation()
-
 function InnerApp() {
  const [isReady, setIsReady] = React.useState(false)
  const {currentAccount} = useSession()
@@ -116,51 +105,52 @@ function InnerApp() {
  }, [_])

  return (
-    <Alf theme={theme}>
-      <ThemeProvider theme={theme}>
-        <Splash isReady={isReady && hasCheckedReferrer}>
-          <RootSiblingParent>
-            <VideoVolumeProvider>
-              <React.Fragment
-                // Resets the entire tree below when it changes:
-                key={currentAccount?.did}>
-                <QueryProvider currentDid={currentAccount?.did}>
-                  <StatsigProvider>
-                    <MessagesProvider>
-                      {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
-                      <LabelDefsProvider>
-                        <ModerationOptsProvider>
-                          <LoggedOutViewProvider>
-                            <SelectedFeedProvider>
-                              <HiddenRepliesProvider>
-                                <UnreadNotifsProvider>
-                                  <BackgroundNotificationPreferencesProvider>
-                                    <MutedThreadsProvider>
-                                      <ProgressGuideProvider>
-                                        <GestureHandlerRootView
-                                          style={s.h100pct}>
-                                          <TestCtrls />
-                                          <Shell />
-                                          <NuxDialogs />
-                                        </GestureHandlerRootView>
-                                      </ProgressGuideProvider>
-                                    </MutedThreadsProvider>
-                                  </BackgroundNotificationPreferencesProvider>
-                                </UnreadNotifsProvider>
-                              </HiddenRepliesProvider>
-                            </SelectedFeedProvider>
-                          </LoggedOutViewProvider>
-                        </ModerationOptsProvider>
-                      </LabelDefsProvider>
-                    </MessagesProvider>
-                  </StatsigProvider>
-                </QueryProvider>
-              </React.Fragment>
-            </VideoVolumeProvider>
-          </RootSiblingParent>
-        </Splash>
-      </ThemeProvider>
-    </Alf>
+    <SafeAreaProvider initialMetrics={initialWindowMetrics}>
+      <Alf theme={theme}>
+        <ThemeProvider theme={theme}>
+          <Splash isReady={isReady && hasCheckedReferrer}>
+            <ActiveVideoProvider>
+              <RootSiblingParent>
+                <React.Fragment
+                  // Resets the entire tree below when it changes:
+                  key={currentAccount?.did}>
+                  <QueryProvider currentDid={currentAccount?.did}>
+                    <StatsigProvider>
+                      <MessagesProvider>
+                        {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
+                        <LabelDefsProvider>
+                          <ModerationOptsProvider>
+                            <LoggedOutViewProvider>
+                              <SelectedFeedProvider>
+                                <HiddenRepliesProvider>
+                                  <UnreadNotifsProvider>
+                                    <BackgroundNotificationPreferencesProvider>
+                                      <MutedThreadsProvider>
+                                        <ProgressGuideProvider>
+                                          <GestureHandlerRootView
+                                            style={s.h100pct}>
+                                            <TestCtrls />
+                                            <Shell />
+                                          </GestureHandlerRootView>
+                                        </ProgressGuideProvider>
+                                      </MutedThreadsProvider>
+                                    </BackgroundNotificationPreferencesProvider>
+                                  </UnreadNotifsProvider>
+                                </HiddenRepliesProvider>
+                              </SelectedFeedProvider>
+                            </LoggedOutViewProvider>
+                          </ModerationOptsProvider>
+                        </LabelDefsProvider>
+                      </MessagesProvider>
+                    </StatsigProvider>
+                  </QueryProvider>
+                </React.Fragment>
+              </RootSiblingParent>
+            </ActiveVideoProvider>
+          </Splash>
+        </ThemeProvider>
+      </Alf>
+    </SafeAreaProvider>
  )
 }

@@ -168,9 +158,9 @@ function App() {
  const [isReady, setReady] = useState(false)

  React.useEffect(() => {
-    Promise.all([initPersistedState(), ensureGeolocationResolved()]).then(() =>
-      setReady(true),
-    )
+    PlatformInfo.setAudioCategory(AudioCategory.Ambient)
+    PlatformInfo.setAudioActive(false)
+    initPersistedState().then(() => setReady(true))
  }, [])

  if (!isReady) {
@@ -182,38 +172,31 @@ function App() {
   * that is set up in the InnerApp component above.
   */
  return (
-    <GeolocationProvider>
-      <A11yProvider>
-        <KeyboardProvider enabled={false} statusBarTranslucent={true}>
-          <SessionProvider>
-            <PrefsStateProvider>
-              <I18nProvider>
-                <ShellStateProvider>
-                  <InvitesStateProvider>
-                    <ModalStateProvider>
-                      <DialogStateProvider>
-                        <LightboxStateProvider>
-                          <PortalProvider>
-                            <StarterPackProvider>
-                              <SafeAreaProvider
-                                initialMetrics={initialWindowMetrics}>
-                                <IntentDialogProvider>
-                                  <InnerApp />
-                                </IntentDialogProvider>
-                              </SafeAreaProvider>
-                            </StarterPackProvider>
-                          </PortalProvider>
-                        </LightboxStateProvider>
-                      </DialogStateProvider>
-                    </ModalStateProvider>
-                  </InvitesStateProvider>
-                </ShellStateProvider>
-              </I18nProvider>
-            </PrefsStateProvider>
-          </SessionProvider>
-        </KeyboardProvider>
-      </A11yProvider>
-    </GeolocationProvider>
+    <A11yProvider>
+      <KeyboardProvider enabled={false} statusBarTranslucent={true}>
+        <SessionProvider>
+          <PrefsStateProvider>
+            <I18nProvider>
+              <ShellStateProvider>
+                <InvitesStateProvider>
+                  <ModalStateProvider>
+                    <DialogStateProvider>
+                      <LightboxStateProvider>
+                        <PortalProvider>
+                          <StarterPackProvider>
+                            <InnerApp />
+                          </StarterPackProvider>
+                        </PortalProvider>
+                      </LightboxStateProvider>
+                    </DialogStateProvider>
+                  </ModalStateProvider>
+                </InvitesStateProvider>
+              </ShellStateProvider>
+            </I18nProvider>
+          </PrefsStateProvider>
+        </SessionProvider>
+      </KeyboardProvider>
+    </A11yProvider>
  )
 }

@@ -1,6 +1,5 @@
 import 'lib/sentry' // must be near top
 import 'view/icons'
-import './style.css'

 import React, {useEffect, useState} from 'react'
 import {KeyboardProvider} from 'react-native-keyboard-controller'
@@ -19,11 +18,6 @@ import {Provider as A11yProvider} from '#/state/a11y'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {listenSessionDropped} from '#/state/events'
-import {
-  beginResolveGeolocation,
-  ensureGeolocationResolved,
-  Provider as GeolocationProvider,
-} from '#/state/geolocation'
 import {Provider as InvitesStateProvider} from '#/state/invites'
 import {Provider as LightboxStateProvider} from '#/state/lightbox'
 import {MessagesProvider} from '#/state/messages'
@@ -41,30 +35,21 @@ import {
 } from '#/state/session'
 import {readLastActiveAccount} from '#/state/session/util'
 import {Provider as ShellStateProvider} from '#/state/shell'
-import {useComposerKeyboardShortcut} from '#/state/shell/composer/useComposerKeyboardShortcut'
 import {Provider as LoggedOutViewProvider} from '#/state/shell/logged-out'
 import {Provider as ProgressGuideProvider} from '#/state/shell/progress-guide'
 import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
 import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
 import {Provider as HiddenRepliesProvider} from '#/state/threadgate-hidden-replies'
 import {Provider as ActiveVideoProvider} from '#/view/com/util/post-embeds/ActiveVideoWebContext'
-import {Provider as VideoVolumeProvider} from '#/view/com/util/post-embeds/VideoVolumeContext'
 import * as Toast from '#/view/com/util/Toast'
 import {ToastContainer} from '#/view/com/util/Toast.web'
 import {Shell} from '#/view/shell/index'
 import {ThemeProvider as Alf} from '#/alf'
 import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
-import {NuxDialogs} from '#/components/dialogs/nuxs'
 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
-import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
 import {Provider as PortalProvider} from '#/components/Portal'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'

-/**
- * Begin geolocation ASAP
- */
-beginResolveGeolocation()
-
 function InnerApp() {
  const [isReady, setIsReady] = React.useState(false)
  const {currentAccount} = useSession()
@@ -74,8 +59,6 @@ function InnerApp() {
  useIntentHandler()
  const hasCheckedReferrer = useStarterPackEntry()

-  useComposerKeyboardShortcut()
-
  // init
  useEffect(() => {
    async function onLaunch(account?: SessionAccount) {
@@ -110,44 +93,41 @@ function InnerApp() {
      <Alf theme={theme}>
        <ThemeProvider theme={theme}>
          <RootSiblingParent>
-            <VideoVolumeProvider>
-              <ActiveVideoProvider>
-                <React.Fragment
-                  // Resets the entire tree below when it changes:
-                  key={currentAccount?.did}>
-                  <QueryProvider currentDid={currentAccount?.did}>
-                    <StatsigProvider>
-                      <MessagesProvider>
-                        {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
-                        <LabelDefsProvider>
-                          <ModerationOptsProvider>
-                            <LoggedOutViewProvider>
-                              <SelectedFeedProvider>
-                                <HiddenRepliesProvider>
-                                  <UnreadNotifsProvider>
-                                    <BackgroundNotificationPreferencesProvider>
-                                      <MutedThreadsProvider>
-                                        <SafeAreaProvider>
-                                          <ProgressGuideProvider>
-                                            <Shell />
-                                            <NuxDialogs />
-                                          </ProgressGuideProvider>
-                                        </SafeAreaProvider>
-                                      </MutedThreadsProvider>
-                                    </BackgroundNotificationPreferencesProvider>
-                                  </UnreadNotifsProvider>
-                                </HiddenRepliesProvider>
-                              </SelectedFeedProvider>
-                            </LoggedOutViewProvider>
-                          </ModerationOptsProvider>
-                        </LabelDefsProvider>
-                      </MessagesProvider>
-                    </StatsigProvider>
-                  </QueryProvider>
-                  <ToastContainer />
-                </React.Fragment>
-              </ActiveVideoProvider>
-            </VideoVolumeProvider>
+            <ActiveVideoProvider>
+              <React.Fragment
+                // Resets the entire tree below when it changes:
+                key={currentAccount?.did}>
+                <QueryProvider currentDid={currentAccount?.did}>
+                  <StatsigProvider>
+                    <MessagesProvider>
+                      {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
+                      <LabelDefsProvider>
+                        <ModerationOptsProvider>
+                          <LoggedOutViewProvider>
+                            <SelectedFeedProvider>
+                              <HiddenRepliesProvider>
+                                <UnreadNotifsProvider>
+                                  <BackgroundNotificationPreferencesProvider>
+                                    <MutedThreadsProvider>
+                                      <SafeAreaProvider>
+                                        <ProgressGuideProvider>
+                                          <Shell />
+                                        </ProgressGuideProvider>
+                                      </SafeAreaProvider>
+                                    </MutedThreadsProvider>
+                                  </BackgroundNotificationPreferencesProvider>
+                                </UnreadNotifsProvider>
+                              </HiddenRepliesProvider>
+                            </SelectedFeedProvider>
+                          </LoggedOutViewProvider>
+                        </ModerationOptsProvider>
+                      </LabelDefsProvider>
+                    </MessagesProvider>
+                  </StatsigProvider>
+                </QueryProvider>
+              </React.Fragment>
+              <ToastContainer />
+            </ActiveVideoProvider>
          </RootSiblingParent>
        </ThemeProvider>
      </Alf>
@@ -159,9 +139,7 @@ function App() {
  const [isReady, setReady] = useState(false)

  React.useEffect(() => {
-    Promise.all([initPersistedState(), ensureGeolocationResolved()]).then(() =>
-      setReady(true),
-    )
+    initPersistedState().then(() => setReady(true))
  }, [])

  if (!isReady) {
@@ -173,33 +151,29 @@ function App() {
   * that is set up in the InnerApp component above.
   */
  return (
-    <GeolocationProvider>
-      <A11yProvider>
-        <SessionProvider>
-          <PrefsStateProvider>
-            <I18nProvider>
-              <ShellStateProvider>
-                <InvitesStateProvider>
-                  <ModalStateProvider>
-                    <DialogStateProvider>
-                      <LightboxStateProvider>
-                        <PortalProvider>
-                          <StarterPackProvider>
-                            <IntentDialogProvider>
-                              <InnerApp />
-                            </IntentDialogProvider>
-                          </StarterPackProvider>
-                        </PortalProvider>
-                      </LightboxStateProvider>
-                    </DialogStateProvider>
-                  </ModalStateProvider>
-                </InvitesStateProvider>
-              </ShellStateProvider>
-            </I18nProvider>
-          </PrefsStateProvider>
-        </SessionProvider>
-      </A11yProvider>
-    </GeolocationProvider>
+    <A11yProvider>
+      <SessionProvider>
+        <PrefsStateProvider>
+          <I18nProvider>
+            <ShellStateProvider>
+              <InvitesStateProvider>
+                <ModalStateProvider>
+                  <DialogStateProvider>
+                    <LightboxStateProvider>
+                      <PortalProvider>
+                        <StarterPackProvider>
+                          <InnerApp />
+                        </StarterPackProvider>
+                      </PortalProvider>
+                    </LightboxStateProvider>
+                  </DialogStateProvider>
+                </ModalStateProvider>
+              </InvitesStateProvider>
+            </ShellStateProvider>
+          </I18nProvider>
+        </PrefsStateProvider>
+      </SessionProvider>
+    </A11yProvider>
  )
 }

@@ -661,15 +661,16 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
      linking={LINKING}
      theme={theme}
      onStateChange={() => {
-        const routeName = getCurrentRouteName()
-        if (routeName === 'Notifications') {
-          logEvent('router:navigate:notifications:sampled', {})
-        }
+        logEvent('router:navigate:sampled', {
+          from: prevLoggedRouteName.current,
+        })
+        prevLoggedRouteName.current = getCurrentRouteName()
      }}
      onReady={() => {
        attachRouteToLogEvents(getCurrentRouteName)
        logModuleInitTime()
        onReady()
+        logEvent('router:navigate:sampled', {})
      }}>
      {children}
    </NavigationContainer>
@@ -225,43 +225,43 @@ export const atoms = {
  },
  text_2xs: {
    fontSize: tokens.fontSize._2xs,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  text_xs: {
    fontSize: tokens.fontSize.xs,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  text_sm: {
    fontSize: tokens.fontSize.sm,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  text_md: {
    fontSize: tokens.fontSize.md,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  text_lg: {
    fontSize: tokens.fontSize.lg,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  text_xl: {
    fontSize: tokens.fontSize.xl,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  text_2xl: {
    fontSize: tokens.fontSize._2xl,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  text_3xl: {
    fontSize: tokens.fontSize._3xl,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  text_4xl: {
    fontSize: tokens.fontSize._4xl,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  text_5xl: {
    fontSize: tokens.fontSize._5xl,
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0.25,
  },
  leading_tight: {
    lineHeight: 1.15,
@@ -273,16 +273,22 @@ export const atoms = {
    lineHeight: 1.5,
  },
  tracking_normal: {
-    letterSpacing: tokens.TRACKING,
+    letterSpacing: 0,
+  },
+  tracking_wide: {
+    letterSpacing: 0.25,
  },
  font_normal: {
-    fontWeight: tokens.fontWeight.regular,
+    fontWeight: tokens.fontWeight.normal,
  },
-  font_bold: {
+  font_semibold: {
    fontWeight: tokens.fontWeight.semibold,
  },
+  font_bold: {
+    fontWeight: tokens.fontWeight.bold,
+  },
  font_heavy: {
-    fontWeight: tokens.fontWeight.extrabold,
+    fontWeight: tokens.fontWeight.heavy,
  },
  italic: {
    fontStyle: 'italic',
@@ -1,83 +0,0 @@
-import {isWeb} from '#/platform/detection'
-import {Device, device} from '#/storage'
-
-const FAMILIES = `-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Liberation Sans", Helvetica, Arial, sans-serif`
-
-const factor = 0.0625 // 1 - (15/16)
-const fontScaleMultipliers: Record<Device['fontScale'], number> = {
-  '-2': 1 - factor * 3,
-  '-1': 1 - factor * 2,
-  '0': 1 - factor * 1, // default
-  '1': 1,
-  '2': 1 + factor * 1,
-}
-
-export function computeFontScaleMultiplier(scale: Device['fontScale']) {
-  return fontScaleMultipliers[scale]
-}
-
-export function getFontScale() {
-  return device.get(['fontScale']) ?? '0'
-}
-
-export function setFontScale(fontScale: Device['fontScale']) {
-  device.set(['fontScale'], fontScale)
-}
-
-export function getFontFamily() {
-  return device.get(['fontFamily']) || 'theme'
-}
-
-export function setFontFamily(fontFamily: Device['fontFamily']) {
-  device.set(['fontFamily'], fontFamily)
-}
-
-/*
- * Unused fonts are commented out, but the files are there if we need them.
- */
-export function applyFonts(
-  style: Record<string, any>,
-  fontFamily: 'system' | 'theme',
-) {
-  if (fontFamily === 'theme') {
-    style.fontFamily =
-      {
-        // '100': 'Inter-Thin',
-        // '200': 'Inter-ExtraLight',
-        // '300': 'Inter-Light',
-        '100': 'Inter-Regular',
-        '200': 'Inter-Regular',
-        '300': 'Inter-Regular',
-        '400': 'Inter-Regular',
-        '500': 'Inter-Medium',
-        '600': 'Inter-SemiBold',
-        '700': 'Inter-Bold',
-        '800': 'Inter-ExtraBold',
-        '900': 'Inter-Black',
-      }[style.fontWeight as string] || 'Inter-Regular'
-
-    if (style.fontStyle === 'italic') {
-      if (style.fontFamily === 'Inter-Regular') {
-        style.fontFamily = 'Inter-Italic'
-      } else {
-        style.fontFamily += 'Italic'
-      }
-    }
-
-    // fallback families only supported on web
-    if (isWeb) {
-      style.fontFamily += `, ${FAMILIES}`
-    }
-  } else {
-    // fallback families only supported on web
-    if (isWeb) {
-      style.fontFamily = style.fontFamily || FAMILIES
-    }
-  }
-
-  /**
-   * Disable contextual ligatures
-   * {@link https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant}
-   */
-  style.fontVariant = ['no-contextual']
-}
@@ -1,98 +1,32 @@
 import React from 'react'
 import {useMediaQuery} from 'react-responsive'

-import {
-  computeFontScaleMultiplier,
-  getFontFamily,
-  getFontScale,
-  setFontFamily as persistFontFamily,
-  setFontScale as persistFontScale,
-} from '#/alf/fonts'
 import {createThemes, defaultTheme} from '#/alf/themes'
 import {Theme, ThemeName} from '#/alf/types'
 import {BLUE_HUE, GREEN_HUE, RED_HUE} from '#/alf/util/colorGeneration'
-import {Device} from '#/storage'

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

-export type Alf = {
-  themeName: ThemeName
-  theme: Theme
-  themes: ReturnType<typeof createThemes>
-  fonts: {
-    scale: Exclude<Device['fontScale'], undefined>
-    scaleMultiplier: number
-    family: Device['fontFamily']
-    setFontScale: (fontScale: Exclude<Device['fontScale'], undefined>) => void
-    setFontFamily: (fontFamily: Device['fontFamily']) => void
-  }
-  /**
-   * Feature flags or other gated options
-   */
-  flags: {}
-}
-
 /*
 * Context
 */
-export const Context = React.createContext<Alf>({
+export const Context = React.createContext<{
+  themeName: ThemeName
+  theme: Theme
+}>({
  themeName: 'light',
  theme: defaultTheme,
-  themes: createThemes({
-    hues: {
-      primary: BLUE_HUE,
-      negative: RED_HUE,
-      positive: GREEN_HUE,
-    },
-  }),
-  fonts: {
-    scale: getFontScale(),
-    scaleMultiplier: computeFontScaleMultiplier(getFontScale()),
-    family: getFontFamily(),
-    setFontScale: () => {},
-    setFontFamily: () => {},
-  },
-  flags: {},
 })

 export function ThemeProvider({
  children,
  theme: themeName,
 }: React.PropsWithChildren<{theme: ThemeName}>) {
-  const [fontScale, setFontScale] = React.useState<Alf['fonts']['scale']>(() =>
-    getFontScale(),
-  )
-  const [fontScaleMultiplier, setFontScaleMultiplier] = React.useState(() =>
-    computeFontScaleMultiplier(fontScale),
-  )
-  const setFontScaleAndPersist = React.useCallback<
-    Alf['fonts']['setFontScale']
-  >(
-    fontScale => {
-      setFontScale(fontScale)
-      persistFontScale(fontScale)
-      setFontScaleMultiplier(computeFontScaleMultiplier(fontScale))
-    },
-    [setFontScale],
-  )
-  const [fontFamily, setFontFamily] = React.useState<Alf['fonts']['family']>(
-    () => getFontFamily(),
-  )
-  const setFontFamilyAndPersist = React.useCallback<
-    Alf['fonts']['setFontFamily']
-  >(
-    fontFamily => {
-      setFontFamily(fontFamily)
-      persistFontFamily(fontFamily)
-    },
-    [setFontFamily],
-  )
  const themes = React.useMemo(() => {
    return createThemes({
      hues: {
@@ -102,47 +36,24 @@ export function ThemeProvider({
      },
    })
  }, [])
+  const theme = themes[themeName]

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

-export function useAlf() {
-  return React.useContext(Context)
-}
-
-export function useTheme(theme?: ThemeName) {
-  const alf = useAlf()
-  return React.useMemo(() => {
-    return theme ? alf.themes[theme] : alf.theme
-  }, [theme, alf])
+export function useTheme() {
+  return React.useContext(Context).theme
 }

 export function useBreakpoints() {
@@ -183,7 +183,7 @@ export function createThemes({
  } as const

  const darkPalette: Palette = {
-    white: color.gray_25,
+    white: color.gray_0,
    black: color.trueBlack,

    contrast_25: color.gray_975,
@@ -1,7 +1,3 @@
-import {Platform} from 'react-native'
-
-export const TRACKING = Platform.OS === 'android' ? 0.1 : 0
-
 export const color = {
  temp_purple: 'rgb(105 0 255)',
  temp_purple_dark: 'rgb(83 0 202)',
@@ -47,16 +43,11 @@ export const borderRadius = {
  full: 999,
 } as const

-/**
- * These correspond to Inter font files we actually load.
- */
 export const fontWeight = {
-  regular: '400',
-  // medium: '500',
-  semibold: '600',
-  // bold: '700',
-  extrabold: '800',
-  // black: '900',
+  normal: '400',
+  semibold: '500',
+  bold: '600',
+  heavy: '700',
 } as const

 export const gradients = {
@@ -24,6 +24,8 @@ export function AppLanguageDropdown() {
      if (sanitizedLang !== value) {
        setLangPrefs.setAppLanguage(sanitizeAppLanguageSetting(value))
      }
+      setLangPrefs.setPrimaryLanguage(value)
+      setLangPrefs.setContentLanguage(value)

      // reset feeds to refetch content
      resetPostsFeedQueries(queryClient)
@@ -27,6 +27,8 @@ export function AppLanguageDropdown() {
      if (sanitizedLang !== value) {
        setLangPrefs.setAppLanguage(sanitizeAppLanguageSetting(value))
      }
+      setLangPrefs.setPrimaryLanguage(value)
+      setLangPrefs.setContentLanguage(value)

      // reset feeds to refetch content
      resetPostsFeedQueries(queryClient)
@@ -7,6 +7,7 @@ import {
  PressableProps,
  StyleProp,
  StyleSheet,
+  Text,
  TextProps,
  TextStyle,
  View,
@@ -14,9 +15,9 @@ import {
 } from 'react-native'
 import {LinearGradient} from 'expo-linear-gradient'

-import {atoms as a, flatten, select, tokens, useTheme, web} from '#/alf'
+import {android, atoms as a, flatten, select, tokens, useTheme} from '#/alf'
 import {Props as SVGIconProps} from '#/components/icons/common'
-import {Text} from '#/components/Typography'
+import {normalizeTextStyles} from '#/components/Typography'

 export type ButtonVariant = 'solid' | 'outline' | 'ghost' | 'gradient'
 export type ButtonColor =
@@ -30,7 +31,7 @@ export type ButtonColor =
  | 'gradient_sunset'
  | 'gradient_nordic'
  | 'gradient_bonfire'
-export type ButtonSize = 'tiny' | 'small' | 'large'
+export type ButtonSize = 'tiny' | 'xsmall' | 'small' | 'medium' | 'large'
 export type ButtonShape = 'round' | 'square' | 'default'
 export type VariantProps = {
  /**
@@ -343,46 +344,39 @@ export const Button = React.forwardRef<View, ButtonProps>(

      if (shape === 'default') {
        if (size === 'large') {
-          baseStyles.push({
-            paddingVertical: 13,
-            paddingHorizontal: 20,
-            borderRadius: 8,
-            gap: 8,
-          })
+          baseStyles.push(
+            {paddingVertical: 15},
+            a.px_2xl,
+            a.rounded_sm,
+            a.gap_md,
+          )
+        } else if (size === 'medium') {
+          baseStyles.push(
+            {paddingVertical: 12},
+            a.px_2xl,
+            a.rounded_sm,
+            a.gap_md,
+          )
        } else if (size === 'small') {
-          baseStyles.push({
-            paddingVertical: 8,
-            paddingHorizontal: 12,
-            borderRadius: 6,
-            gap: 6,
-          })
+          baseStyles.push({paddingVertical: 9}, a.px_lg, a.rounded_sm, a.gap_sm)
+        } else if (size === 'xsmall') {
+          baseStyles.push({paddingVertical: 6}, a.px_sm, a.rounded_sm, a.gap_sm)
        } else if (size === 'tiny') {
-          baseStyles.push({
-            paddingVertical: 4,
-            paddingHorizontal: 8,
-            borderRadius: 4,
-            gap: 4,
-          })
+          baseStyles.push({paddingVertical: 4}, a.px_sm, a.rounded_xs, a.gap_xs)
        }
      } else if (shape === 'round' || shape === 'square') {
        if (size === 'large') {
          if (shape === 'round') {
-            baseStyles.push({height: 46, width: 46})
+            baseStyles.push({height: 54, width: 54})
          } else {
-            baseStyles.push({height: 44, width: 44})
+            baseStyles.push({height: 50, width: 50})
          }
        } else if (size === 'small') {
-          if (shape === 'round') {
-            baseStyles.push({height: 36, width: 36})
-          } else {
-            baseStyles.push({height: 34, width: 34})
-          }
+          baseStyles.push({height: 34, width: 34})
+        } else if (size === 'xsmall') {
+          baseStyles.push({height: 28, width: 28})
        } else if (size === 'tiny') {
-          if (shape === 'round') {
-            baseStyles.push({height: 22, width: 22})
-          } else {
-            baseStyles.push({height: 21, width: 21})
-          }
+          baseStyles.push({height: 20, width: 20})
        }

        if (shape === 'round') {
@@ -626,11 +620,11 @@ export function useSharedButtonTextStyles() {
    }

    if (size === 'large') {
-      baseStyles.push(a.text_md, a.leading_tight, web({paddingTop: 1}))
-    } else if (size === 'small') {
-      baseStyles.push(a.text_sm, a.leading_tight, web({paddingTop: 1}))
+      baseStyles.push(a.text_md, android({paddingBottom: 1}))
    } else if (size === 'tiny') {
-      baseStyles.push(a.text_xs, a.leading_tight)
+      baseStyles.push(a.text_xs, android({paddingBottom: 1}))
+    } else {
+      baseStyles.push(a.text_sm, android({paddingBottom: 1}))
    }

    return StyleSheet.flatten(baseStyles)
@@ -641,7 +635,14 @@ export function ButtonText({children, style, ...rest}: ButtonTextProps) {
  const textStyles = useSharedButtonTextStyles()

  return (
-    <Text {...rest} style={[a.font_bold, a.text_center, textStyles, style]}>
+    <Text
+      {...rest}
+      style={normalizeTextStyles([
+        a.font_bold,
+        a.text_center,
+        textStyles,
+        style,
+      ])}>
      {children}
    </Text>
  )
@@ -650,98 +651,31 @@ export function ButtonText({children, style, ...rest}: ButtonTextProps) {
 export function ButtonIcon({
  icon: Comp,
  position,
-  size,
+  size: iconSize,
 }: {
  icon: React.ComponentType<SVGIconProps>
  position?: 'left' | 'right'
  size?: SVGIconProps['size']
 }) {
-  const {size: buttonSize, disabled} = useButtonContext()
+  const {size, disabled} = useButtonContext()
  const textStyles = useSharedButtonTextStyles()
-  const {iconSize, iconContainerSize} = React.useMemo(() => {
-    /**
-     * Pre-set icon sizes for different button sizes
-     */
-    const iconSizeShorthand =
-      size ??
-      (({
-        large: 'sm',
-        small: 'xs',
-        tiny: 'xs',
-      }[buttonSize || 'small'] || 'sm') as Exclude<
-        SVGIconProps['size'],
-        undefined
-      >)
-
-    /*
-     * Copied here from icons/common.tsx so we can tweak if we need to, but
-     * also so that we can calculate transforms.
-     */
-    const iconSize = {
-      xs: 12,
-      sm: 16,
-      md: 20,
-      lg: 24,
-      xl: 28,
-      '2xl': 32,
-    }[iconSizeShorthand]
-
-    /*
-     * Goal here is to match rendered text size so that different size icons
-     * don't increase button size
-     */
-    const iconContainerSize = {
-      large: 18,
-      small: 16,
-      tiny: 13,
-    }[buttonSize || 'small']
-
-    return {
-      iconSize,
-      iconContainerSize,
-    }
-  }, [buttonSize, size])

  return (
    <View
      style={[
        a.z_20,
        {
-          width: iconContainerSize,
-          height: iconContainerSize,
          opacity: disabled ? 0.7 : 1,
          marginLeft: position === 'left' ? -2 : 0,
          marginRight: position === 'right' ? -2 : 0,
        },
      ]}>
-      <View
-        style={[
-          a.absolute,
-          {
-            width: iconSize,
-            height: iconSize,
-            top: '50%',
-            left: '50%',
-            transform: [
-              {
-                translateX: (iconSize / 2) * -1,
-              },
-              {
-                translateY: (iconSize / 2) * -1,
-              },
-            ],
-          },
-        ]}>
-        <Comp
-          width={iconSize}
-          style={[
-            {
-              color: textStyles.color,
-              pointerEvents: 'none',
-            },
-          ]}
-        />
-      </View>
+      <Comp
+        size={
+          iconSize ?? (size === 'large' ? 'md' : size === 'tiny' ? 'xs' : 'sm')
+        }
+        style={[{color: textStyles.color, pointerEvents: 'none'}]}
+      />
    </View>
  )
 }
@@ -37,7 +37,6 @@ import {Portal} from '#/components/Portal'

 export {useDialogContext, useDialogControl} from '#/components/Dialog/context'
 export * from '#/components/Dialog/types'
-export * from '#/components/Dialog/utils'
 // @ts-ignore
 export const Input = createInput(BottomSheetTextInput)

@@ -257,7 +256,7 @@ export const ScrollableInner = React.forwardRef<
          borderTopLeftRadius: 40,
          borderTopRightRadius: 40,
        },
-        style,
+        flatten(style),
      ]}
      contentContainerStyle={a.pb_4xl}
      ref={ref}>
@@ -27,7 +27,6 @@ import {Portal} from '#/components/Portal'

 export {useDialogContext, useDialogControl} from '#/components/Dialog/context'
 export * from '#/components/Dialog/types'
-export * from '#/components/Dialog/utils'
 export {Input} from '#/components/forms/TextField'

 const stopPropagation = (e: any) => e.stopPropagation()
@@ -1,18 +0,0 @@
-import React from 'react'
-
-import {DialogControlProps} from '#/components/Dialog/types'
-
-export function useAutoOpen(control: DialogControlProps, showTimeout?: number) {
-  React.useEffect(() => {
-    if (showTimeout) {
-      const timeout = setTimeout(() => {
-        control.open()
-      }, showTimeout)
-      return () => {
-        clearTimeout(timeout)
-      }
-    } else {
-      control.open()
-    }
-  }, [control, showTimeout])
-}
@@ -11,17 +11,17 @@ import {msg, plural, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'

-import {sanitizeHandle} from '#/lib/strings/handles'
 import {logger} from '#/logger'
-import {precacheFeedFromGeneratorView} from '#/state/queries/feed'
 import {
  useAddSavedFeedsMutation,
  usePreferencesQuery,
  useRemoveFeedMutation,
 } from '#/state/queries/preferences'
-import {useSession} from '#/state/session'
-import * as Toast from '#/view/com/util/Toast'
+import {sanitizeHandle} from 'lib/strings/handles'
+import {precacheFeedFromGeneratorView} from 'state/queries/feed'
+import {useSession} from 'state/session'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
+import * as Toast from 'view/com/util/Toast'
 import {useTheme} from '#/alf'
 import {atoms as a} from '#/alf'
 import {Button, ButtonIcon} from '#/components/Button'
@@ -121,10 +121,7 @@ export function TitleAndByline({

  return (
    <View style={[a.flex_1]}>
-      <Text
-        emoji
-        style={[a.text_md, a.font_bold, a.leading_snug]}
-        numberOfLines={1}>
+      <Text style={[a.text_md, a.font_bold, a.leading_snug]} numberOfLines={1}>
        {title}
      </Text>
      {creator && (
@@ -8,6 +8,7 @@ import {useNavigation} from '@react-navigation/native'

 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {NavigationProp} from '#/lib/routes/types'
+import {useGate} from '#/lib/statsig/statsig'
 import {logEvent} from '#/lib/statsig/statsig'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -60,13 +61,16 @@ function CardOuter({
 export function SuggestedFollowPlaceholder() {
  const t = useTheme()
  return (
-    <CardOuter style={[a.gap_md, t.atoms.border_contrast_low]}>
+    <CardOuter style={[a.gap_sm, t.atoms.border_contrast_low]}>
      <ProfileCard.Header>
        <ProfileCard.AvatarPlaceholder />
-        <ProfileCard.NameAndHandlePlaceholder />
      </ProfileCard.Header>

-      <ProfileCard.DescriptionPlaceholder numberOfLines={2} />
+      <View style={[a.py_xs]}>
+        <ProfileCard.NameAndHandlePlaceholder />
+      </View>
+
+      <ProfileCard.DescriptionPlaceholder />
    </CardOuter>
  )
 }
@@ -173,13 +177,13 @@ function useExperimentalSuggestedUsersQuery() {
 }

 export function SuggestedFollows({feed}: {feed: FeedDescriptor}) {
-  const {currentAccount} = useSession()
-  const [feedType, feedUriOrDid] = feed.split('|')
+  const gate = useGate()
+  const [feedType, feedUri] = feed.split('|')
  if (feedType === 'author') {
-    if (currentAccount?.did === feedUriOrDid) {
-      return null
+    if (gate('show_follow_suggestions_in_profile')) {
+      return <SuggestedFollowsProfile did={feedUri} />
    } else {
-      return <SuggestedFollowsProfile did={feedUriOrDid} />
+      return null
    }
  } else {
    return <SuggestedFollowsHome />
@@ -199,7 +203,6 @@ export function SuggestedFollowsProfile({did}: {did: string}) {
      isSuggestionsLoading={isSuggestionsLoading}
      profiles={data?.suggestions ?? []}
      error={error}
-      viewContext="profile"
    />
  )
 }
@@ -215,7 +218,6 @@ export function SuggestedFollowsHome() {
      isSuggestionsLoading={isSuggestionsLoading}
      profiles={profiles}
      error={error}
-      viewContext="feed"
    />
  )
 }
@@ -224,12 +226,10 @@ export function ProfileGrid({
  isSuggestionsLoading,
  error,
  profiles,
-  viewContext = 'feed',
 }: {
  isSuggestionsLoading: boolean
  profiles: AppBskyActorDefs.ProfileViewDetailed[]
  error: Error | null
-  viewContext: 'profile' | 'feed'
 }) {
  const t = useTheme()
  const {_} = useLingui()
@@ -286,7 +286,7 @@ export function ProfileGrid({
                    shape="round"
                  />
                </ProfileCard.Header>
-                <ProfileCard.Description profile={profile} numberOfLines={2} />
+                <ProfileCard.Description profile={profile} />
              </ProfileCard.Outer>
            </CardOuter>
          )}
@@ -303,31 +303,33 @@ export function ProfileGrid({
  return (
    <View
      style={[a.border_t, t.atoms.border_contrast_low, t.atoms.bg_contrast_25]}>
-      <View
-        style={[
-          a.p_lg,
-          a.pb_xs,
-          a.flex_row,
-          a.align_center,
-          a.justify_between,
-        ]}>
-        <Text style={[a.text_sm, a.font_bold, t.atoms.text_contrast_medium]}>
-          {viewContext === 'profile' ? (
-            <Trans>Similar accounts</Trans>
-          ) : (
-            <Trans>Suggested for you</Trans>
-          )}
+      <View style={[a.pt_2xl, a.px_lg, a.flex_row, a.pb_xs]}>
+        <Text
+          style={[
+            a.flex_1,
+            a.text_lg,
+            a.font_bold,
+            t.atoms.text_contrast_medium,
+          ]}>
+          <Trans>Suggested for you</Trans>
        </Text>
-        <Person fill={t.atoms.text_contrast_low.color} size="sm" />
+        <Person fill={t.atoms.text_contrast_low.color} />
      </View>

      {gtMobile ? (
-        <View style={[a.flex_1, a.px_lg, a.pt_sm, a.pb_lg, a.gap_md]}>
-          <View style={[a.flex_1, a.flex_row, a.flex_wrap, a.gap_sm]}>
+        <View style={[a.flex_1, a.px_lg, a.pt_md, a.pb_xl, a.gap_md]}>
+          <View style={[a.flex_1, a.flex_row, a.flex_wrap, a.gap_md]}>
            {content}
          </View>

-          <View style={[a.flex_row, a.justify_end, a.align_center, a.gap_md]}>
+          <View
+            style={[
+              a.flex_row,
+              a.justify_end,
+              a.align_center,
+              a.pt_xs,
+              a.gap_md,
+            ]}>
            <InlineLinkText
              label={_(msg`Browse more suggestions`)}
              to="/search"
@@ -343,7 +345,7 @@ export function ProfileGrid({
          showsHorizontalScrollIndicator={false}
          snapToInterval={MOBILE_CARD_WIDTH + a.gap_md.gap}
          decelerationRate="fast">
-          <View style={[a.px_lg, a.pt_sm, a.pb_lg, a.flex_row, a.gap_md]}>
+          <View style={[a.px_lg, a.pt_md, a.pb_xl, a.flex_row, a.gap_md]}>
            {content}

            <Button
@@ -1,11 +0,0 @@
-import React from 'react'
-import {View} from 'react-native'
-
-import {atoms as a, ViewStyleProp} from '#/alf'
-
-export function Fill({
-  children,
-  style,
-}: {children?: React.ReactNode} & ViewStyleProp) {
-  return <View style={[a.absolute, a.inset_0, style]}>{children}</View>
-}
@@ -5,7 +5,7 @@ import {msg, Plural, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'

 import {makeProfileLink} from '#/lib/routes/links'
-import {sanitizeDisplayName} from '#/lib/strings/display-names'
+import {sanitizeDisplayName} from 'lib/strings/display-names'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
 import {atoms as a, useTheme} from '#/alf'
 import {Link, LinkProps} from '#/components/Link'
@@ -185,11 +185,11 @@ function KnownFollowersInner({
              serverCount > 2 ? (
                <Trans>
                  Followed by{' '}
-                  <Text emoji key={slice[0].profile.did} style={textStyle}>
+                  <Text key={slice[0].profile.did} style={textStyle}>
                    {slice[0].profile.displayName}
                  </Text>
                  ,{' '}
-                  <Text emoji key={slice[1].profile.did} style={textStyle}>
+                  <Text key={slice[1].profile.did} style={textStyle}>
                    {slice[1].profile.displayName}
                  </Text>
                  , and{' '}
@@ -203,11 +203,11 @@ function KnownFollowersInner({
                // only 2
                <Trans>
                  Followed by{' '}
-                  <Text emoji key={slice[0].profile.did} style={textStyle}>
+                  <Text key={slice[0].profile.did} style={textStyle}>
                    {slice[0].profile.displayName}
                  </Text>{' '}
                  and{' '}
-                  <Text emoji key={slice[1].profile.did} style={textStyle}>
+                  <Text key={slice[1].profile.did} style={textStyle}>
                    {slice[1].profile.displayName}
                  </Text>
                </Trans>
@@ -216,7 +216,7 @@ function KnownFollowersInner({
              // 1-n followers, including blocks
              <Trans>
                Followed by{' '}
-                <Text emoji key={slice[0].profile.did} style={textStyle}>
+                <Text key={slice[0].profile.did} style={textStyle}>
                  {slice[0].profile.displayName}
                </Text>{' '}
                and{' '}
@@ -230,7 +230,7 @@ function KnownFollowersInner({
              // only 1
              <Trans>
                Followed by{' '}
-                <Text emoji key={slice[0].profile.did} style={textStyle}>
+                <Text key={slice[0].profile.did} style={textStyle}>
                  {slice[0].profile.displayName}
                </Text>
              </Trans>
@@ -9,7 +9,6 @@ import {sanitizeHandle} from '#/lib/strings/handles'
 import {useLabelerInfoQuery} from '#/state/queries/labeler'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
 import {atoms as a, useTheme, ViewStyleProp} from '#/alf'
-import {Flag_Stroke2_Corner0_Rounded as Flag} from '#/components/icons/Flag'
 import {Link as InternalLink, LinkProps} from '#/components/Link'
 import {RichText} from '#/components/RichText'
 import {Text} from '#/components/Typography'
@@ -44,45 +43,21 @@ export function Avatar({avatar}: {avatar?: string}) {
 }

 export function Title({value}: {value: string}) {
-  return (
-    <Text emoji style={[a.text_md, a.font_bold, a.leading_tight]}>
-      {value}
-    </Text>
-  )
+  return <Text style={[a.text_md, a.font_bold]}>{value}</Text>
 }

 export function Description({value, handle}: {value?: string; handle: string}) {
-  const {_} = useLingui()
  return value ? (
    <Text numberOfLines={2}>
-      <RichText value={value} style={[a.leading_snug]} />
+      <RichText value={value} style={[]} />
    </Text>
  ) : (
-    <Text emoji style={[a.leading_snug]}>
-      {_(msg`By ${sanitizeHandle(handle, '@')}`)}
+    <Text>
+      <Trans>By {sanitizeHandle(handle, '@')}</Trans>
    </Text>
  )
 }

-export function RegionalNotice() {
-  const t = useTheme()
-  return (
-    <View
-      style={[
-        a.flex_row,
-        a.align_center,
-        a.gap_xs,
-        a.pt_2xs,
-        {marginLeft: -2},
-      ]}>
-      <Flag fill={t.atoms.text_contrast_low.color} size="sm" />
-      <Text style={[a.italic, a.leading_snug]}>
-        <Trans>Required in your region</Trans>
-      </Text>
-    </View>
-  )
-}
-
 export function LikeCount({count}: {count: number}) {
  const t = useTheme()
  return (
@@ -91,7 +66,7 @@ export function LikeCount({count}: {count: number}) {
        a.mt_sm,
        a.text_sm,
        t.atoms.text_contrast_medium,
-        {fontWeight: '600'},
+        {fontWeight: '500'},
      ]}>
      <Plural value={count} one="Liked by # user" other="Liked by # users" />
    </Text>
@@ -110,7 +85,7 @@ export function Content({children}: React.PropsWithChildren<{}>) {
        a.align_center,
        a.justify_between,
      ]}>
-      <View style={[a.gap_2xs, a.flex_1]}>{children}</View>
+      <View style={[a.gap_xs, a.flex_1]}>{children}</View>

      <ChevronRight size="md" style={[a.z_10, t.atoms.text_contrast_low]} />
    </View>
@@ -75,7 +75,6 @@ export function LikedByList({uri}: {uri: string}) {
        isLoading={isUriLoading || isLikedByLoading}
        isError={isError}
        emptyType="results"
-        emptyTitle={_(msg`No likes yet`)}
        emptyMessage={_(
          msg`Nobody has liked this yet. Maybe you should be the first!`,
        )}
@@ -7,14 +7,13 @@ import {
  moderateUserList,
  ModerationUI,
 } from '@atproto/api'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
+import {Trans} from '@lingui/macro'
 import {useQueryClient} from '@tanstack/react-query'

-import {sanitizeHandle} from '#/lib/strings/handles'
-import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {precacheList} from '#/state/queries/feed'
-import {useSession} from '#/state/session'
+import {sanitizeHandle} from 'lib/strings/handles'
+import {useModerationOpts} from 'state/preferences/moderation-opts'
+import {precacheList} from 'state/queries/feed'
+import {useSession} from 'state/session'
 import {atoms as a, useTheme} from '#/alf'
 import {
  Avatar,
@@ -112,7 +111,6 @@ export function TitleAndByline({
  modUi?: ModerationUI
 }) {
  const t = useTheme()
-  const {_} = useLingui()
  const {currentAccount} = useSession()

  return (
@@ -132,7 +130,6 @@ export function TitleAndByline({
        </Hider.Mask>
        <Hider.Content>
          <Text
-            emoji
            style={[a.text_md, a.font_bold, a.leading_snug]}
            numberOfLines={1}>
            {title}
@@ -142,12 +139,15 @@ export function TitleAndByline({

      {creator && (
        <Text
-          emoji
          style={[a.leading_snug, t.atoms.text_contrast_medium]}
          numberOfLines={1}>
-          {purpose === MODLIST
-            ? _(msg`Moderation list by ${sanitizeHandle(creator.handle, '@')}`)
-            : _(msg`List by ${sanitizeHandle(creator.handle, '@')}`)}
+          {purpose === MODLIST ? (
+            <Trans>
+              Moderation list by {sanitizeHandle(creator.handle, '@')}
+            </Trans>
+          ) : (
+            <Trans>List by {sanitizeHandle(creator.handle, '@')}</Trans>
+          )}
        </Text>
      )}
    </View>
@@ -1,45 +0,0 @@
-import React from 'react'
-
-import {atoms as a, useTheme, ViewStyleProp} from '#/alf'
-import {Fill} from '#/components/Fill'
-
-/**
- * Applies and thin border within a bounding box. Used to contrast media from
- * bg of the container.
- */
-export function MediaInsetBorder({
-  children,
-  style,
-  opaque,
-}: {
-  children?: React.ReactNode
-  /**
-   * Used where this border needs to match adjacent borders, such as in
-   * external link previews
-   */
-  opaque?: boolean
-} & ViewStyleProp) {
-  const t = useTheme()
-  const isLight = t.name === 'light'
-  return (
-    <Fill
-      style={[
-        a.rounded_md,
-        a.border,
-        opaque
-          ? [t.atoms.border_contrast_low]
-          : [
-              isLight
-                ? t.atoms.border_contrast_low
-                : t.atoms.border_contrast_high,
-              {opacity: 0.6},
-            ],
-        {
-          pointerEvents: 'none',
-        },
-        style,
-      ]}>
-      {children}
-    </Fill>
-  )
-}
@@ -10,8 +10,7 @@ import {
 import {Trans} from '@lingui/macro'

 import {parseTenorGif} from '#/lib/strings/embed-player'
-import {atoms as a, useTheme} from '#/alf'
-import {MediaInsetBorder} from '#/components/MediaInsetBorder'
+import {atoms as a} from '#/alf'
 import {Text} from '#/components/Typography'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'

@@ -44,10 +43,10 @@ export function Embed({
        ))}
      </Outer>
    )
-  } else if (AppBskyEmbedExternal.isView(media) && media.external.thumb) {
+  } else if (AppBskyEmbedExternal.isView(embed) && embed.external.thumb) {
    let url: URL | undefined
    try {
-      url = new URL(media.external.uri)
+      url = new URL(embed.external.uri)
    } catch {}
    if (url) {
      const {success} = parseTenorGif(url)
@@ -55,17 +54,17 @@ export function Embed({
        return (
          <Outer style={style}>
            <GifItem
-              thumbnail={media.external.thumb}
-              alt={media.external.title}
+              thumbnail={embed.external.thumb}
+              alt={embed.external.title}
            />
          </Outer>
        )
      }
    }
-  } else if (AppBskyEmbedVideo.isView(media)) {
+  } else if (AppBskyEmbedVideo.isView(embed)) {
    return (
      <Outer style={style}>
-        <VideoItem thumbnail={media.thumbnail} alt={media.alt} />
+        <VideoItem thumbnail={embed.thumbnail} alt={embed.alt} />
      </Outer>
    )
  }
@@ -92,20 +91,18 @@ export function ImageItem({
  alt?: string
  children?: React.ReactNode
 }) {
-  const t = useTheme()
  return (
    <View style={[a.relative, a.flex_1, {aspectRatio: 1, maxWidth: 100}]}>
      <Image
        key={thumbnail}
        source={{uri: thumbnail}}
-        style={[a.flex_1, a.rounded_xs, t.atoms.bg_contrast_25]}
+        style={[a.flex_1, a.rounded_xs]}
        contentFit="cover"
        accessible={true}
        accessibilityIgnoresInvertColors
        accessibilityHint={alt}
        accessibilityLabel=""
      />
-      <MediaInsetBorder style={[a.rounded_xs]} />
      {children}
    </View>
  )
@@ -170,6 +167,6 @@ const styles = StyleSheet.create({
  alt: {
    color: 'white',
    fontSize: 7,
-    fontWeight: '600',
+    fontWeight: 'bold',
  },
 })
@@ -179,10 +179,8 @@ export function Outer({
          style={[
            a.rounded_sm,
            a.p_xs,
-            a.border,
            t.name === 'light' ? t.atoms.bg : t.atoms.bg_contrast_25,
            t.atoms.shadow_md,
-            t.atoms.border_contrast_low,
            style,
          ]}>
          {children}
@@ -130,10 +130,9 @@ export function Label({
            )}

            <Text
-              emoji
              style={[
                text,
-                a.font_bold,
+                a.font_semibold,
                a.leading_tight,
                t.atoms.text_contrast_medium,
                {paddingRight: 3},
@@ -11,13 +11,13 @@ import {useLingui} from '@lingui/react'

 import {LogEvents} from '#/lib/statsig/statsig'
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
-import {sanitizeHandle} from '#/lib/strings/handles'
-import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useProfileFollowMutationQueue} from '#/state/queries/profile'
-import {useSession} from '#/state/session'
-import {ProfileCardPills} from '#/view/com/profile/ProfileCard'
+import {sanitizeHandle} from 'lib/strings/handles'
+import {useProfileShadow} from 'state/cache/profile-shadow'
+import {useSession} from 'state/session'
 import * as Toast from '#/view/com/util/Toast'
-import {UserAvatar} from '#/view/com/util/UserAvatar'
+import {ProfileCardPills} from 'view/com/profile/ProfileCard'
+import {UserAvatar} from 'view/com/util/UserAvatar'
 import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonProps, ButtonText} from '#/components/Button'
 import {Check_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
@@ -175,13 +175,11 @@ export function NameAndHandle({
  return (
    <View style={[a.flex_1]}>
      <Text
-        emoji
        style={[a.text_md, a.font_bold, a.leading_snug, a.self_start]}
        numberOfLines={1}>
        {name}
      </Text>
      <Text
-        emoji
        style={[a.leading_snug, t.atoms.text_contrast_medium]}
        numberOfLines={1}>
        {handle}
@@ -222,10 +220,8 @@ export function NameAndHandlePlaceholder() {

 export function Description({
  profile: profileUnshadowed,
-  numberOfLines = 3,
 }: {
  profile: AppBskyActorDefs.ProfileViewDetailed
-  numberOfLines?: number
 }) {
  const profile = useProfileShadow(profileUnshadowed)
  const {description} = profile
@@ -248,34 +244,31 @@ export function Description({
      <RichText
        value={rt}
        style={[a.leading_snug]}
-        numberOfLines={numberOfLines}
+        numberOfLines={3}
        disableLinks
      />
    </View>
  )
 }

-export function DescriptionPlaceholder({
-  numberOfLines = 3,
-}: {
-  numberOfLines?: number
-}) {
+export function DescriptionPlaceholder() {
  const t = useTheme()
  return (
-    <View style={[{gap: 8}]}>
-      {Array(numberOfLines)
-        .fill(0)
-        .map((_, i) => (
-          <View
-            key={i}
-            style={[
-              a.rounded_xs,
-              a.w_full,
-              t.atoms.bg_contrast_50,
-              {height: 12, width: i + 1 === numberOfLines ? '60%' : '100%'},
-            ]}
-          />
-        ))}
+    <View style={[a.gap_xs]}>
+      <View
+        style={[a.rounded_xs, a.w_full, t.atoms.bg_contrast_50, {height: 12}]}
+      />
+      <View
+        style={[a.rounded_xs, a.w_full, t.atoms.bg_contrast_50, {height: 12}]}
+      />
+      <View
+        style={[
+          a.rounded_xs,
+          a.w_full,
+          t.atoms.bg_contrast_50,
+          {height: 12, width: 100},
+        ]}
+      />
    </View>
  )
 }
@@ -283,8 +276,8 @@ export function DescriptionPlaceholder({
 export type FollowButtonProps = {
  profile: AppBskyActorDefs.ProfileViewBasic
  moderationOpts: ModerationOpts
-  logContext: LogEvents['profile:follow:sampled']['logContext'] &
-    LogEvents['profile:unfollow:sampled']['logContext']
+  logContext: LogEvents['profile:follow']['logContext'] &
+    LogEvents['profile:unfollow']['logContext']
 } & Partial<ButtonProps>

 export function FollowButton(props: FollowButtonProps) {
@@ -411,7 +411,6 @@ function Inner({
    () => currentAccount?.did === profile.did,
    [currentAccount, profile],
  )
-  const isLabeler = profile.associated?.labeler

  return (
    <View>
@@ -420,13 +419,11 @@ function Inner({
          <UserAvatar
            size={64}
            avatar={profile.avatar}
-            type={isLabeler ? 'labeler' : 'user'}
            moderation={moderation.ui('avatar')}
          />
        </Link>

        {!isMe &&
-          !isLabeler &&
          (isBlockedUser ? (
            <Link
              to={profileURL}
@@ -26,7 +26,7 @@ export function ProgressGuideList({style}: {style?: StyleProp<ViewStyle>}) {
          <Text
            style={[
              t.atoms.text_contrast_medium,
-              a.font_bold,
+              a.font_semibold,
              a.text_sm,
              {textTransform: 'uppercase'},
            ]}>
@@ -35,7 +35,9 @@ export function ProgressGuideTask({
      )}

      <View style={[a.flex_col, a.gap_2xs, {marginTop: -2}]}>
-        <Text style={[a.text_sm, a.font_bold, a.leading_tight]}>{title}</Text>
+        <Text style={[a.text_sm, a.font_semibold, a.leading_tight]}>
+          {title}
+        </Text>
        {subtitle && (
          <Text
            style={[a.text_sm, t.atoms.text_contrast_medium, a.leading_tight]}>
@@ -154,7 +154,7 @@ export const ProgressGuideToast = React.forwardRef<
              ref={animatedCheckRef}
            />
            <View>
-              <Text style={[a.text_md, a.font_bold]}>{title}</Text>
+              <Text style={[a.text_md, a.font_semibold]}>{title}</Text>
              {subtitle && (
                <Text style={[a.text_sm, t.atoms.text_contrast_medium]}>
                  {subtitle}
@@ -59,9 +59,7 @@ export function Outer({
 export function TitleText({children}: React.PropsWithChildren<{}>) {
  const {titleId} = React.useContext(Context)
  return (
-    <Text
-      nativeID={titleId}
-      style={[a.text_2xl, a.font_bold, a.pb_sm, a.leading_snug]}>
+    <Text nativeID={titleId} style={[a.text_2xl, a.font_bold, a.pb_sm]}>
      {children}
    </Text>
  )
@@ -120,7 +118,7 @@ export function Cancel({
    <Button
      variant="solid"
      color="secondary"
-      size={gtMobile ? 'small' : 'large'}
+      size={gtMobile ? 'small' : 'medium'}
      label={cta || _(msg`Cancel`)}
      onPress={onPress}>
      <ButtonText>{cta || _(msg`Cancel`)}</ButtonText>
@@ -163,7 +161,7 @@ export function Action({
    <Button
      variant="solid"
      color={color}
-      size={gtMobile ? 'small' : 'large'}
+      size={gtMobile ? 'small' : 'medium'}
      label={cta || _(msg`Confirm`)}
      onPress={handleOnPress}
      testID={testID}>
@@ -77,7 +77,8 @@ function LabelerButton({
            handle: labeler.creator.handle,
          })}
        />
-        <Text style={[t.atoms.text_contrast_medium, a.text_sm, a.font_bold]}>
+        <Text
+          style={[t.atoms.text_contrast_medium, a.text_sm, a.font_semibold]}>
          @{labeler.creator.handle}
        </Text>
      </LabelingServiceCard.Content>
@@ -256,7 +256,6 @@ function LabelerToggle({title}: {title: string}) {
          a.z_10,
        ]}>
        <Text
-          emoji
          style={[
            native({marginTop: 2}),
            t.atoms.text_contrast_medium,
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3 4a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4Zm2 1v14h14V5H5Z" clip-rule="evenodd"/></svg>`
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M3.65 17.247c-.242.832-.632 1.178-1.325 1.178-.814 0-1.325-.476-1.325-1.23 0-.216.06-.51.173-.831L4.586 7.07c.364-1.014.979-1.482 1.966-1.482 1.022 0 1.629.45 2.001 1.473l3.43 9.303c.121.337.165.571.165.831 0 .72-.546 1.23-1.308 1.23-.736 0-1.126-.338-1.36-1.152l-.658-1.975H4.309l-.658 1.95ZM6.5 8.152l-1.62 5.12h3.335l-1.654-5.12H6.5Zm13.005 8.688c-.52.988-1.68 1.568-2.84 1.568-1.768 0-3.11-1.144-3.11-2.815 0-1.69 1.299-2.668 3.62-2.807l2.34-.138v-.615c0-.867-.607-1.369-1.56-1.369-.771 0-1.239.251-1.802.979-.277.312-.597.468-1.004.468-.615 0-1.057-.399-1.057-.97 0-.2.043-.382.13-.572.433-1.109 1.923-1.793 3.845-1.793 2.383 0 3.933 1.23 3.933 3.1v5.293c0 .84-.511 1.273-1.23 1.273-.684 0-1.16-.38-1.213-1.126v-.476h-.052Zm-3.43-1.386c0 .693.572 1.126 1.42 1.126 1.11 0 2.02-.719 2.02-1.723v-.676l-1.959.121c-.944.07-1.48.494-1.48 1.152Z" clip-rule="evenodd"/></svg>