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

__e2e__/flows/feed-reorder.yml

@@ -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"

__e2e__/flows/home-screen.yml

@@ -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"

__e2e__/flows/profile-screen-edit.yml

@@ -11,9 +11,6 @@ appId: xyz.blueskyweb.app
 
 
 # Navigate to my profile
-- extendedWaitUntil:
-    visible:
-        id: "bottomBarSearchBtn"
 - tapOn:
     id: "bottomBarProfileBtn"
 

__e2e__/flows/profile-screen.yml

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

__e2e__/flows/thread-screen.yml

@@ -11,8 +11,6 @@ appId: xyz.blueskyweb.app
 
 
 # Navigate to thread
-- extendedWaitUntil:
-    visible: "Thread root"
 - tapOn: "Thread root"
 - assertVisible: "Thread reply"
 
@@ -35,10 +33,18 @@ appId: xyz.blueskyweb.app
     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:

assets/icons/download_stroke2_corner0_rounded.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="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>

bskyembed/src/components/embed.tsx

@@ -372,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}

bskyweb/cmd/bskyweb/main.go

@@ -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"},
-				},
 			},
 		},
 	}

bskyweb/cmd/bskyweb/server.go

@@ -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
 	//
@@ -276,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 {
@@ -538,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)
-}

bskyweb/templates/base.html

@@ -259,6 +259,7 @@
       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">

lingui.config.js

@@ -14,7 +14,6 @@ module.exports = {
     'ja',
     'ko',
     'pt-BR',
-    'ru',
     'tr',
     'uk',
     'zh-CN',

package.json

@@ -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",
@@ -139,7 +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-2.tgz",
+    "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",

src/App.native.tsx

@@ -57,9 +57,7 @@ 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'
@@ -107,51 +105,52 @@ function InnerApp() {
   }, [_])
 
   return (
-    <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 />
-                                          <NuxDialogs />
-                                        </GestureHandlerRootView>
-                                      </ProgressGuideProvider>
-                                    </MutedThreadsProvider>
-                                  </BackgroundNotificationPreferencesProvider>
-                                </UnreadNotifsProvider>
-                              </HiddenRepliesProvider>
-                            </SelectedFeedProvider>
-                          </LoggedOutViewProvider>
-                        </ModerationOptsProvider>
-                      </LabelDefsProvider>
-                    </MessagesProvider>
-                  </StatsigProvider>
-                </QueryProvider>
-              </React.Fragment>
-            </RootSiblingParent>
-          </ActiveVideoProvider>
-        </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>
   )
 }
 
@@ -185,12 +184,7 @@ function App() {
                       <LightboxStateProvider>
                         <PortalProvider>
                           <StarterPackProvider>
-                            <SafeAreaProvider
-                              initialMetrics={initialWindowMetrics}>
-                              <IntentDialogProvider>
-                                <InnerApp />
-                              </IntentDialogProvider>
-                            </SafeAreaProvider>
+                            <InnerApp />
                           </StarterPackProvider>
                         </PortalProvider>
                       </LightboxStateProvider>

src/App.web.tsx

@@ -46,9 +46,7 @@ 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'
 
@@ -114,7 +112,6 @@ function InnerApp() {
                                       <SafeAreaProvider>
                                         <ProgressGuideProvider>
                                           <Shell />
-                                          <NuxDialogs />
                                         </ProgressGuideProvider>
                                       </SafeAreaProvider>
                                     </MutedThreadsProvider>
@@ -165,9 +162,7 @@ function App() {
                     <LightboxStateProvider>
                       <PortalProvider>
                         <StarterPackProvider>
-                          <IntentDialogProvider>
-                            <InnerApp />
-                          </IntentDialogProvider>
+                          <InnerApp />
                         </StarterPackProvider>
                       </PortalProvider>
                     </LightboxStateProvider>

src/Navigation.tsx

@@ -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>

src/alf/index.tsx

@@ -18,17 +18,9 @@ export * from '#/alf/util/themeSelector'
 export const Context = React.createContext<{
   themeName: ThemeName
   theme: Theme
-  themes: ReturnType<typeof createThemes>
 }>({
   themeName: 'light',
   theme: defaultTheme,
-  themes: createThemes({
-    hues: {
-      primary: BLUE_HUE,
-      negative: RED_HUE,
-      positive: GREEN_HUE,
-    },
-  }),
 })
 
 export function ThemeProvider({
@@ -50,22 +42,18 @@ export function ThemeProvider({
     <Context.Provider
       value={React.useMemo(
         () => ({
-          themes,
           themeName: themeName,
           theme: theme,
         }),
-        [theme, themeName, themes],
+        [theme, themeName],
       )}>
       {children}
     </Context.Provider>
   )
 }
 
-export function useTheme(theme?: ThemeName) {
-  const ctx = React.useContext(Context)
-  return React.useMemo(() => {
-    return theme ? ctx.themes[theme] : ctx.theme
-  }, [theme, ctx])
+export function useTheme() {
+  return React.useContext(Context).theme
 }
 
 export function useBreakpoints() {

src/components/Dialog/index.tsx

@@ -256,7 +256,7 @@ export const ScrollableInner = React.forwardRef<
           borderTopLeftRadius: 40,
           borderTopRightRadius: 40,
         },
-        style,
+        flatten(style),
       ]}
       contentContainerStyle={a.pb_4xl}
       ref={ref}>

src/components/FeedInterstitials.tsx

@@ -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

src/components/MediaPreview.tsx

@@ -10,7 +10,7 @@ import {
 import {Trans} from '@lingui/macro'
 
 import {parseTenorGif} from '#/lib/strings/embed-player'
-import {atoms as a, useTheme} from '#/alf'
+import {atoms as a} from '#/alf'
 import {Text} from '#/components/Typography'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
 
@@ -43,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)
@@ -54,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>
     )
   }
@@ -91,13 +91,12 @@ 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

src/components/ProfileCard.tsx

@@ -220,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
@@ -246,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>
   )
 }
@@ -281,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) {

src/components/StarterPack/Main/ProfilesList.tsx

@@ -40,7 +40,7 @@ export const ProfilesList = React.forwardRef<SectionRef, ProfilesListProps>(
     ref,
   ) {
     const t = useTheme()
-    const bottomBarOffset = useBottomBarOffset(300)
+    const bottomBarOffset = useBottomBarOffset(200)
     const initialNumToRender = useInitialNumToRender()
     const {currentAccount} = useSession()
     const {data, refetch, isError} = useAllListMembersQuery(listUri)

src/components/dialogs/nuxs/TenMillion/index.tsx

@@ -1,655 +0,0 @@
-import React from 'react'
-import {View} from 'react-native'
-import Animated, {FadeIn} from 'react-native-reanimated'
-import ViewShot from 'react-native-view-shot'
-import {Image} from 'expo-image'
-import {requestMediaLibraryPermissionsAsync} from 'expo-image-picker'
-import * as MediaLibrary from 'expo-media-library'
-import {moderateProfile} from '@atproto/api'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {networkRetry} from '#/lib/async/retry'
-import {getCanvas} from '#/lib/canvas'
-import {shareUrl} from '#/lib/sharing'
-import {logEvent} from '#/lib/statsig/statsig'
-import {sanitizeDisplayName} from '#/lib/strings/display-names'
-import {sanitizeHandle} from '#/lib/strings/handles'
-import {isIOS, isNative} from '#/platform/detection'
-import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {useProfileQuery} from '#/state/queries/profile'
-import {useAgent, useSession} from '#/state/session'
-import {useComposerControls} from 'state/shell'
-import {formatCount} from '#/view/com/util/numeric/format'
-import {Logomark} from '#/view/icons/Logomark'
-import * as Toast from 'view/com/util/Toast'
-import {
-  atoms as a,
-  ThemeProvider,
-  tokens,
-  useBreakpoints,
-  useTheme,
-} from '#/alf'
-import {Button, ButtonIcon, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
-import {useNuxDialogContext} from '#/components/dialogs/nuxs'
-import {OnePercent} from '#/components/dialogs/nuxs/TenMillion/icons/OnePercent'
-import {PointOnePercent} from '#/components/dialogs/nuxs/TenMillion/icons/PointOnePercent'
-import {TenPercent} from '#/components/dialogs/nuxs/TenMillion/icons/TenPercent'
-import {Divider} from '#/components/Divider'
-import {GradientFill} from '#/components/GradientFill'
-import {ArrowOutOfBox_Stroke2_Corner0_Rounded as Share} from '#/components/icons/ArrowOutOfBox'
-import {Download_Stroke2_Corner0_Rounded as Download} from '#/components/icons/Download'
-import {Image_Stroke2_Corner0_Rounded as ImageIcon} from '#/components/icons/Image'
-import {Loader} from '#/components/Loader'
-import {Text} from '#/components/Typography'
-
-const DEBUG = false
-const RATIO = 8 / 10
-const WIDTH = 2000
-const HEIGHT = WIDTH * RATIO
-
-function getFontSize(count: number) {
-  const length = count.toString().length
-  if (length < 7) {
-    return 80
-  } else if (length < 5) {
-    return 100
-  } else {
-    return 70
-  }
-}
-
-function getPercentBadge(percent: number) {
-  if (percent <= 0.001) {
-    return PointOnePercent
-  } else if (percent <= 0.01) {
-    return OnePercent
-  } else if (percent <= 0.1) {
-    return TenPercent
-  }
-  return null
-}
-
-function Frame({children}: {children: React.ReactNode}) {
-  return (
-    <View
-      style={[
-        a.relative,
-        a.w_full,
-        a.overflow_hidden,
-        {
-          paddingTop: '80%',
-        },
-      ]}>
-      {children}
-    </View>
-  )
-}
-
-export function TenMillion() {
-  const agent = useAgent()
-  const nuxDialogs = useNuxDialogContext()
-  const [userNumber, setUserNumber] = React.useState<number>(0)
-  const fetching = React.useRef(false)
-
-  React.useEffect(() => {
-    async function fetchUserNumber() {
-      const isBlueskyHosted = agent.sessionManager.pdsUrl
-        ?.toString()
-        .includes('bsky.network')
-
-      if (isBlueskyHosted && agent.session?.accessJwt) {
-        const res = await fetch(
-          `https://bsky.social/xrpc/com.atproto.temp.getSignupNumber`,
-          {
-            headers: {
-              Authorization: `Bearer ${agent.session.accessJwt}`,
-            },
-          },
-        )
-
-        if (!res.ok) {
-          throw new Error('Network request failed')
-        }
-
-        const data = await res.json()
-
-        if (data.number) {
-          setUserNumber(data.number)
-        } else {
-          // should be rare
-          nuxDialogs.dismissActiveNux()
-        }
-      }
-    }
-
-    if (!fetching.current) {
-      fetching.current = true
-      networkRetry(3, fetchUserNumber).catch(() => {
-        nuxDialogs.dismissActiveNux()
-      })
-    }
-  }, [
-    agent.sessionManager.pdsUrl,
-    agent.session?.accessJwt,
-    setUserNumber,
-    nuxDialogs.dismissActiveNux,
-    nuxDialogs,
-  ])
-
-  return userNumber ? <TenMillionInner userNumber={userNumber} /> : null
-}
-
-export function TenMillionInner({userNumber}: {userNumber: number}) {
-  const t = useTheme()
-  const lightTheme = useTheme('light')
-  const {_, i18n} = useLingui()
-  const control = Dialog.useDialogControl()
-  const {gtMobile} = useBreakpoints()
-  const {openComposer} = useComposerControls()
-  const {currentAccount} = useSession()
-  const {
-    isLoading: isProfileLoading,
-    data: profile,
-    error: profileError,
-  } = useProfileQuery({
-    did: currentAccount!.did,
-  })
-  const moderationOpts = useModerationOpts()
-  const nuxDialogs = useNuxDialogContext()
-  const moderation = React.useMemo(() => {
-    return profile && moderationOpts
-      ? moderateProfile(profile, moderationOpts)
-      : undefined
-  }, [profile, moderationOpts])
-  const [uri, setUri] = React.useState<string | null>(null)
-  const percent = userNumber / 10_000_000
-  const Badge = getPercentBadge(percent)
-  const isLoadingData = isProfileLoading || !moderation || !profile
-  const isLoadingImage = !uri
-
-  const error: string = React.useMemo(() => {
-    if (profileError) {
-      return _(
-        msg`Oh no! We weren't able to generate an image for you to share. Rest assured, we're glad you're here 🦋`,
-      )
-    }
-    return ''
-  }, [_, profileError])
-
-  /*
-   * Opening and closing
-   */
-  React.useEffect(() => {
-    const timeout = setTimeout(() => {
-      control.open()
-    }, 3e3)
-    return () => {
-      clearTimeout(timeout)
-    }
-  }, [control])
-  const onClose = React.useCallback(() => {
-    nuxDialogs.dismissActiveNux()
-  }, [nuxDialogs])
-
-  /*
-   * Actions
-   */
-  const sharePost = React.useCallback(() => {
-    if (uri) {
-      control.close(() => {
-        setTimeout(() => {
-          logEvent('tmd:post', {})
-          openComposer({
-            text: _(
-              msg`Bluesky now has over 10 million users, and I was #${i18n.number(
-                userNumber,
-              )}!`,
-            ), // TODO
-            imageUris: [
-              {
-                uri,
-                width: WIDTH,
-                height: HEIGHT,
-              },
-            ],
-          })
-        }, 1e3)
-      })
-    }
-  }, [_, i18n, control, openComposer, uri, userNumber])
-  const onNativeShare = React.useCallback(() => {
-    if (uri) {
-      control.close(() => {
-        logEvent('tmd:share', {})
-        shareUrl(uri)
-      })
-    }
-  }, [uri, control])
-  const onNativeDownload = React.useCallback(async () => {
-    if (uri) {
-      const res = await requestMediaLibraryPermissionsAsync()
-
-      if (!res) {
-        Toast.show(
-          _(
-            msg`You must grant access to your photo library to save the image.`,
-          ),
-          'xmark',
-        )
-        return
-      }
-
-      try {
-        await MediaLibrary.createAssetAsync(uri)
-        logEvent('tmd:download', {})
-        Toast.show(_(msg`Image saved to your camera roll!`))
-      } catch (e: unknown) {
-        console.log(e)
-        Toast.show(_(msg`An error occurred while saving the image!`), 'xmark')
-        return
-      }
-    }
-  }, [_, uri])
-  const onWebDownload = React.useCallback(async () => {
-    if (uri) {
-      const canvas = await getCanvas(uri)
-      const imgHref = canvas
-        .toDataURL('image/png')
-        .replace('image/png', 'image/octet-stream')
-      const link = document.createElement('a')
-      link.setAttribute('download', `Bluesky 10M Users.png`)
-      link.setAttribute('href', imgHref)
-      link.click()
-      logEvent('tmd:download', {})
-    }
-  }, [uri])
-
-  /*
-   * Canvas stuff
-   */
-  const imageRef = React.useRef<ViewShot>(null)
-  const captureInProgress = React.useRef(false)
-  const onCanvasReady = React.useCallback(async () => {
-    if (
-      imageRef.current &&
-      imageRef.current.capture &&
-      !captureInProgress.current
-    ) {
-      captureInProgress.current = true
-      const uri = await imageRef.current.capture()
-      setUri(uri)
-    }
-  }, [setUri])
-  const canvas = isLoadingData ? null : (
-    <View
-      style={[
-        a.absolute,
-        a.overflow_hidden,
-        DEBUG
-          ? {
-              width: 600,
-              height: 600 * RATIO,
-            }
-          : {
-              width: 1,
-              height: 1,
-            },
-      ]}>
-      <View style={{width: 600}}>
-        <ThemeProvider theme="light">
-          <Frame>
-            <ViewShot
-              ref={imageRef}
-              options={{width: WIDTH, height: HEIGHT}}
-              style={[a.absolute, a.inset_0]}>
-              <View
-                onLayout={onCanvasReady}
-                style={[
-                  a.absolute,
-                  a.inset_0,
-                  a.align_center,
-                  a.justify_center,
-                  {
-                    top: -1,
-                    bottom: -1,
-                    left: -1,
-                    right: -1,
-                    paddingVertical: 48,
-                    paddingHorizontal: 48,
-                  },
-                ]}>
-                <GradientFill gradient={tokens.gradients.bonfire} />
-
-                <View
-                  style={[
-                    a.flex_1,
-                    a.w_full,
-                    a.align_center,
-                    a.justify_center,
-                    a.rounded_md,
-                    {
-                      backgroundColor: 'white',
-                      shadowRadius: 32,
-                      shadowOpacity: 0.1,
-                      elevation: 24,
-                      shadowColor: tokens.gradients.bonfire.values[0][1],
-                    },
-                  ]}>
-                  <View
-                    style={[
-                      a.absolute,
-                      a.px_xl,
-                      a.py_xl,
-                      {
-                        top: 0,
-                        left: 0,
-                      },
-                    ]}>
-                    <Logomark fill={t.palette.primary_500} width={36} />
-                  </View>
-
-                  {/* Centered content */}
-                  <View
-                    style={[
-                      {
-                        paddingBottom: isNative ? 0 : 24,
-                      },
-                    ]}>
-                    <Text
-                      style={[
-                        a.text_md,
-                        a.font_bold,
-                        a.text_center,
-                        a.pb_sm,
-                        lightTheme.atoms.text_contrast_medium,
-                      ]}>
-                      <Trans>
-                        Celebrating {formatCount(i18n, 10000000)} users
-                      </Trans>{' '}
-                      🎉
-                    </Text>
-                    <View style={[a.flex_row, a.align_start]}>
-                      <Text
-                        style={[
-                          a.absolute,
-                          {
-                            color: t.palette.primary_500,
-                            fontSize: 32,
-                            fontWeight: '900',
-                            width: 32,
-                            top: isNative ? -10 : 0,
-                            left: 0,
-                            transform: [
-                              {
-                                translateX: -16,
-                              },
-                            ],
-                          },
-                        ]}>
-                        #
-                      </Text>
-                      <Text
-                        style={[
-                          a.relative,
-                          a.text_center,
-                          {
-                            fontStyle: 'italic',
-                            fontSize: getFontSize(userNumber),
-                            lineHeight: getFontSize(userNumber),
-                            fontWeight: '900',
-                            letterSpacing: -2,
-                          },
-                        ]}>
-                        {i18n.number(userNumber)}
-                      </Text>
-                    </View>
-
-                    {Badge && (
-                      <View
-                        style={[
-                          a.absolute,
-                          {
-                            width: 64,
-                            height: 64,
-                            top: isNative ? 75 : 85,
-                            right: '5%',
-                            transform: [
-                              {
-                                rotate: '8deg',
-                              },
-                            ],
-                          },
-                        ]}>
-                        <Badge fill={t.palette.primary_500} />
-                      </View>
-                    )}
-                  </View>
-                  {/* End centered content */}
-
-                  <View
-                    style={[
-                      a.absolute,
-                      a.px_xl,
-                      a.py_xl,
-                      {
-                        bottom: 0,
-                        left: 0,
-                        right: 0,
-                      },
-                    ]}>
-                    <View style={[a.flex_row, a.align_center, a.gap_sm]}>
-                      {/*
-                      <UserAvatar
-                        size={36}
-                        avatar={profile.avatar}
-                        moderation={moderation.ui('avatar')}
-                        onLoad={onCanvasReady}
-                      />
-                        */}
-                      <View style={[a.gap_2xs, a.flex_1]}>
-                        <Text
-                          style={[
-                            a.flex_1,
-                            a.text_sm,
-                            a.font_bold,
-                            a.leading_tight,
-                            {maxWidth: '60%'},
-                          ]}>
-                          {sanitizeDisplayName(
-                            profile.displayName ||
-                              sanitizeHandle(profile.handle),
-                            moderation.ui('displayName'),
-                          )}
-                        </Text>
-                        <View
-                          style={[a.flex_row, a.justify_between, a.gap_4xl]}>
-                          <Text
-                            numberOfLines={1}
-                            style={[
-                              a.flex_1,
-                              a.text_sm,
-                              a.font_semibold,
-                              a.leading_snug,
-                              lightTheme.atoms.text_contrast_medium,
-                            ]}>
-                            {sanitizeHandle(profile.handle, '@')}
-                          </Text>
-
-                          {profile.createdAt && (
-                            <Text
-                              numberOfLines={1}
-                              ellipsizeMode="head"
-                              style={[
-                                a.flex_1,
-                                a.text_sm,
-                                a.font_semibold,
-                                a.leading_snug,
-                                a.text_right,
-                                lightTheme.atoms.text_contrast_low,
-                              ]}>
-                              <Trans>
-                                Joined{' '}
-                                {i18n.date(profile.createdAt, {
-                                  month: 'short',
-                                  day: 'numeric',
-                                  year: 'numeric',
-                                })}
-                              </Trans>
-                            </Text>
-                          )}
-                        </View>
-                      </View>
-                    </View>
-                  </View>
-                </View>
-              </View>
-            </ViewShot>
-          </Frame>
-        </ThemeProvider>
-      </View>
-    </View>
-  )
-
-  return (
-    <Dialog.Outer control={control} onClose={onClose}>
-      <Dialog.ScrollableInner
-        label={_(msg`Ten Million`)}
-        style={[
-          {
-            padding: 0,
-            paddingTop: 0,
-          },
-        ]}>
-        <View
-          style={[
-            a.rounded_md,
-            a.overflow_hidden,
-            isNative && {
-              borderTopLeftRadius: 40,
-              borderTopRightRadius: 40,
-            },
-          ]}>
-          <Frame>
-            <View
-              style={[a.absolute, a.inset_0, a.align_center, a.justify_center]}>
-              <GradientFill gradient={tokens.gradients.bonfire} />
-              {error ? (
-                <View>
-                  <Text
-                    style={[
-                      a.text_md,
-                      a.leading_snug,
-                      a.text_center,
-                      a.pb_md,
-                      {
-                        maxWidth: 300,
-                      },
-                    ]}>
-                    (╯°□°)╯︵ ┻━┻
-                  </Text>
-                  <Text
-                    style={[
-                      a.text_xl,
-                      a.font_bold,
-                      a.leading_snug,
-                      a.text_center,
-                      {
-                        maxWidth: 300,
-                      },
-                    ]}>
-                    {error}
-                  </Text>
-                </View>
-              ) : isLoadingData || isLoadingImage ? (
-                <Loader size="xl" fill="white" />
-              ) : (
-                <Animated.View
-                  entering={FadeIn.duration(150)}
-                  style={[a.w_full, a.h_full]}>
-                  <Image
-                    accessibilityIgnoresInvertColors
-                    source={{uri}}
-                    style={[a.w_full, a.h_full]}
-                  />
-                </Animated.View>
-              )}
-            </View>
-          </Frame>
-
-          {canvas}
-
-          <View style={[gtMobile ? a.p_2xl : a.p_xl]}>
-            <Text
-              style={[
-                a.text_5xl,
-                a.leading_tight,
-                a.pb_lg,
-                {
-                  fontWeight: '900',
-                },
-              ]}>
-              <Trans>Thanks for being one of our first 10 million users.</Trans>
-            </Text>
-
-            <Text style={[a.leading_snug, a.text_lg, a.pb_xl]}>
-              <Trans>
-                Together, we're rebuilding the social internet. We're glad
-                you're here.
-              </Trans>
-            </Text>
-
-            <Divider />
-
-            <View
-              style={[
-                a.flex_row,
-                a.align_center,
-                a.justify_end,
-                a.gap_md,
-                a.pt_xl,
-              ]}>
-              <Text style={[a.text_md, a.italic, t.atoms.text_contrast_medium]}>
-                <Trans>Brag a little!</Trans>
-              </Text>
-
-              <Button
-                disabled={isLoadingImage}
-                label={
-                  isNative && isIOS
-                    ? _(msg`Share image externally`)
-                    : _(msg`Download image`)
-                }
-                size="large"
-                variant="solid"
-                color="secondary"
-                shape="square"
-                onPress={
-                  isNative
-                    ? isIOS
-                      ? onNativeShare
-                      : onNativeDownload
-                    : onWebDownload
-                }>
-                <ButtonIcon icon={isNative && isIOS ? Share : Download} />
-              </Button>
-              <Button
-                disabled={isLoadingImage}
-                label={_(msg`Share image in post`)}
-                size="large"
-                variant="solid"
-                color="primary"
-                onPress={sharePost}>
-                <ButtonText>{_(msg`Share`)}</ButtonText>
-                <ButtonIcon position="right" icon={ImageIcon} />
-              </Button>
-            </View>
-          </View>
-        </View>
-
-        <Dialog.Close />
-      </Dialog.ScrollableInner>
-    </Dialog.Outer>
-  )
-}

src/components/dialogs/nuxs/index.tsx

@@ -1,151 +0,0 @@
-import React from 'react'
-
-import {useGate} from '#/lib/statsig/statsig'
-import {logger} from '#/logger'
-import {
-  Nux,
-  useNuxs,
-  useRemoveNuxsMutation,
-  useUpsertNuxMutation,
-} from '#/state/queries/nuxs'
-import {useSession} from '#/state/session'
-import {isSnoozed, snooze, unsnooze} from '#/components/dialogs/nuxs/snoozing'
-import {TenMillion} from '#/components/dialogs/nuxs/TenMillion'
-import {IS_DEV} from '#/env'
-
-type Context = {
-  activeNux: Nux | undefined
-  dismissActiveNux: () => void
-}
-
-/**
- * If we fail to complete a NUX here, it may show again on next reload,
- * or if prefs state updates. If `true`, this fallback ensures that the last
- * shown NUX won't show again, at least for this session.
- *
- * This is temporary, and only needed for the 10Milly dialog rn, since we
- * aren't snoozing that one in device storage.
- */
-let __isSnoozedFallback = false
-
-const queuedNuxs: {
-  id: Nux
-  enabled(props: {gate: ReturnType<typeof useGate>}): boolean
-  /**
-   * TEMP only intended for use with the 10Milly dialog rn, since there are no
-   * other NUX dialogs configured
-   */
-  unsafe_disableSnooze: boolean
-}[] = [
-  {
-    id: Nux.TenMillionDialog,
-    enabled({gate}) {
-      return gate('ten_million_dialog')
-    },
-    unsafe_disableSnooze: true,
-  },
-]
-
-const Context = React.createContext<Context>({
-  activeNux: undefined,
-  dismissActiveNux: () => {},
-})
-
-export function useNuxDialogContext() {
-  return React.useContext(Context)
-}
-
-export function NuxDialogs() {
-  const {hasSession} = useSession()
-  return hasSession ? <Inner /> : null
-}
-
-function Inner() {
-  const gate = useGate()
-  const {nuxs} = useNuxs()
-  const [snoozed, setSnoozed] = React.useState(() => {
-    return isSnoozed()
-  })
-  const [activeNux, setActiveNux] = React.useState<Nux | undefined>()
-  const {mutateAsync: upsertNux} = useUpsertNuxMutation()
-  const {mutate: removeNuxs} = useRemoveNuxsMutation()
-
-  const snoozeNuxDialog = React.useCallback(() => {
-    snooze()
-    setSnoozed(true)
-  }, [setSnoozed])
-
-  const dismissActiveNux = React.useCallback(() => {
-    if (!activeNux) return
-    setActiveNux(undefined)
-  }, [activeNux, setActiveNux])
-
-  if (IS_DEV && typeof window !== 'undefined') {
-    // @ts-ignore
-    window.clearNuxDialog = (id: Nux) => {
-      if (!IS_DEV || !id) return
-      removeNuxs([id])
-      unsnooze()
-    }
-  }
-
-  React.useEffect(() => {
-    if (__isSnoozedFallback) return
-    if (snoozed) return
-    if (!nuxs) return
-
-    for (const {id, enabled, unsafe_disableSnooze} of queuedNuxs) {
-      const nux = nuxs.find(nux => nux.id === id)
-
-      // check if completed first
-      if (nux && nux.completed) continue
-
-      // then check gate (track exposure)
-      if (!enabled({gate})) continue
-
-      // we have a winner
-      setActiveNux(id)
-
-      /**
-       * TEMP only intended for use with the 10Milly dialog rn, since there are no
-       * other NUX dialogs configured
-       */
-      if (!unsafe_disableSnooze) {
-        // immediately snooze for a day
-        snoozeNuxDialog()
-      }
-
-      // immediately update remote data (affects next reload)
-      upsertNux({
-        id,
-        completed: true,
-        data: undefined,
-      }).catch(e => {
-        logger.error(`NUX dialogs: failed to upsert '${id}' NUX`, {
-          safeMessage: e.message,
-        })
-        /*
-         * TEMP only intended for use with the 10Milly dialog rn
-         */
-        if (unsafe_disableSnooze) {
-          __isSnoozedFallback = true
-        }
-      })
-
-      break
-    }
-  }, [nuxs, snoozed, snoozeNuxDialog, upsertNux, gate])
-
-  const ctx = React.useMemo(() => {
-    return {
-      activeNux,
-      dismissActiveNux,
-    }
-  }, [activeNux, dismissActiveNux])
-
-  return (
-    <Context.Provider value={ctx}>
-      {activeNux === Nux.TenMillionDialog && <TenMillion />}
-    </Context.Provider>
-  )
-}

src/components/dialogs/nuxs/snoozing.ts

@@ -1,22 +0,0 @@
-import {simpleAreDatesEqual} from '#/lib/strings/time'
-import {device} from '#/storage'
-
-export function snooze() {
-  device.set(['lastNuxDialog'], new Date().toISOString())
-}
-
-export function unsnooze() {
-  device.set(['lastNuxDialog'], undefined)
-}
-
-export function isSnoozed() {
-  const lastNuxDialog = device.get(['lastNuxDialog'])
-  if (!lastNuxDialog) return false
-  const last = new Date(lastNuxDialog)
-  const now = new Date()
-  // already snoozed today
-  if (simpleAreDatesEqual(last, now)) {
-    return true
-  }
-  return false
-}

src/components/dms/MessageContext.tsx

@@ -1,17 +0,0 @@
-import React from 'react'
-
-const MessageContext = React.createContext(false)
-
-export function MessageContextProvider({
-  children,
-}: {
-  children: React.ReactNode
-}) {
-  return (
-    <MessageContext.Provider value={true}>{children}</MessageContext.Provider>
-  )
-}
-
-export function useIsWithinMessage() {
-  return React.useContext(MessageContext)
-}

src/components/dms/MessageItemEmbed.tsx

@@ -4,7 +4,6 @@ import {AppBskyEmbedRecord} from '@atproto/api'
 
 import {PostEmbeds, PostEmbedViewContext} from '#/view/com/util/post-embeds'
 import {atoms as a, native, useTheme} from '#/alf'
-import {MessageContextProvider} from './MessageContext'
 
 let MessageItemEmbed = ({
   embed,
@@ -14,15 +13,13 @@ let MessageItemEmbed = ({
   const t = useTheme()
 
   return (
-    <MessageContextProvider>
-      <View style={[a.my_xs, t.atoms.bg, native({flexBasis: 0})]}>
-        <PostEmbeds
-          embed={embed}
-          allowNestedQuotes
-          viewContext={PostEmbedViewContext.Feed}
-        />
-      </View>
-    </MessageContextProvider>
+    <View style={[a.my_xs, t.atoms.bg, native({flexBasis: 0})]}>
+      <PostEmbeds
+        embed={embed}
+        allowNestedQuotes
+        viewContext={PostEmbedViewContext.Feed}
+      />
+    </View>
   )
 }
 MessageItemEmbed = React.memo(MessageItemEmbed)

src/components/hooks/dates.ts

@@ -21,7 +21,6 @@ import {
   ja,
   ko,
   ptBR,
-  ru,
   tr,
   uk,
   zhCN,
@@ -48,7 +47,6 @@ const locales: Record<AppLanguage, Locale | undefined> = {
   ja,
   ko,
   ['pt-BR']: ptBR,
-  ru,
   tr,
   uk,
   ['zh-CN']: zhCN,

src/components/hooks/useFollowMethods.ts

@@ -15,8 +15,8 @@ export function useFollowMethods({
   logContext,
 }: {
   profile: Shadow<AppBskyActorDefs.ProfileViewBasic>
-  logContext: LogEvents['profile:follow:sampled']['logContext'] &
-    LogEvents['profile:unfollow:sampled']['logContext']
+  logContext: LogEvents['profile:follow']['logContext'] &
+    LogEvents['profile:unfollow']['logContext']
 }) {
   const {_} = useLingui()
   const requireAuth = useRequireAuth()

src/components/hooks/useFullscreen.ts

@@ -1,53 +0,0 @@
-import {
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-  useSyncExternalStore,
-} from 'react'
-
-import {isFirefox, isSafari} from '#/lib/browser'
-import {isWeb} from '#/platform/detection'
-
-function fullscreenSubscribe(onChange: () => void) {
-  document.addEventListener('fullscreenchange', onChange)
-  return () => document.removeEventListener('fullscreenchange', onChange)
-}
-
-export function useFullscreen(ref?: React.RefObject<HTMLElement>) {
-  if (!isWeb) throw new Error("'useFullscreen' is a web-only hook")
-  const isFullscreen = useSyncExternalStore(fullscreenSubscribe, () =>
-    Boolean(document.fullscreenElement),
-  )
-  const scrollYRef = useRef<null | number>(null)
-  const [prevIsFullscreen, setPrevIsFullscreen] = useState(isFullscreen)
-
-  const toggleFullscreen = useCallback(() => {
-    if (isFullscreen) {
-      document.exitFullscreen()
-    } else {
-      if (!ref) throw new Error('No ref provided')
-      if (!ref.current) return
-      scrollYRef.current = window.scrollY
-      ref.current.requestFullscreen()
-    }
-  }, [isFullscreen, ref])
-
-  useEffect(() => {
-    if (prevIsFullscreen === isFullscreen) return
-    setPrevIsFullscreen(isFullscreen)
-
-    // Chrome has an issue where it doesn't scroll back to the top after exiting fullscreen
-    // Let's play it safe and do it if not FF or Safari, since anything else will probably be chromium
-    if (prevIsFullscreen && !isFirefox && !isSafari) {
-      setTimeout(() => {
-        if (scrollYRef.current !== null) {
-          window.scrollTo(0, scrollYRef.current)
-          scrollYRef.current = null
-        }
-      }, 100)
-    }
-  }, [isFullscreen, prevIsFullscreen])
-
-  return [isFullscreen, toggleFullscreen] as const
-}

src/components/icons/Download.tsx

@@ -1,5 +0,0 @@
-import {createSinglePathSVG} from './TEMPLATE'
-
-export const Download_Stroke2_Corner0_Rounded = createSinglePathSVG({
-  path: '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',
-})

src/components/intents/IntentDialogs.tsx

@@ -1,37 +0,0 @@
-import React from 'react'
-
-import * as Dialog from '#/components/Dialog'
-import {DialogControlProps} from '#/components/Dialog'
-import {VerifyEmailIntentDialog} from '#/components/intents/VerifyEmailIntentDialog'
-
-interface Context {
-  verifyEmailDialogControl: DialogControlProps
-  verifyEmailState: {code: string} | undefined
-  setVerifyEmailState: (state: {code: string} | undefined) => void
-}
-
-const Context = React.createContext({} as Context)
-export const useIntentDialogs = () => React.useContext(Context)
-
-export function Provider({children}: {children: React.ReactNode}) {
-  const verifyEmailDialogControl = Dialog.useDialogControl()
-  const [verifyEmailState, setVerifyEmailState] = React.useState<
-    {code: string} | undefined
-  >()
-
-  const value = React.useMemo(
-    () => ({
-      verifyEmailDialogControl,
-      verifyEmailState,
-      setVerifyEmailState,
-    }),
-    [verifyEmailDialogControl, verifyEmailState, setVerifyEmailState],
-  )
-
-  return (
-    <Context.Provider value={value}>
-      {children}
-      <VerifyEmailIntentDialog />
-    </Context.Provider>
-  )
-}

src/components/intents/VerifyEmailIntentDialog.tsx

@@ -1,140 +0,0 @@
-import React from 'react'
-import {View} from 'react-native'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {useAgent, useSession} from 'state/session'
-import {atoms as a} from '#/alf'
-import {Button, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
-import {DialogControlProps} from '#/components/Dialog'
-import {useIntentDialogs} from '#/components/intents/IntentDialogs'
-import {Loader} from '#/components/Loader'
-import {Text} from '#/components/Typography'
-
-export function VerifyEmailIntentDialog() {
-  const {verifyEmailDialogControl: control} = useIntentDialogs()
-
-  return (
-    <Dialog.Outer control={control}>
-      <Dialog.Handle />
-      <Inner control={control} />
-    </Dialog.Outer>
-  )
-}
-
-function Inner({control}: {control: DialogControlProps}) {
-  const {_} = useLingui()
-  const {verifyEmailState: state} = useIntentDialogs()
-  const [status, setStatus] = React.useState<
-    'loading' | 'success' | 'failure' | 'resent'
-  >('loading')
-  const [sending, setSending] = React.useState(false)
-  const agent = useAgent()
-  const {currentAccount} = useSession()
-
-  React.useEffect(() => {
-    ;(async () => {
-      if (!state?.code) {
-        return
-      }
-      try {
-        await agent.com.atproto.server.confirmEmail({
-          email: (currentAccount?.email || '').trim(),
-          token: state.code.trim(),
-        })
-        setStatus('success')
-      } catch (e) {
-        setStatus('failure')
-      }
-    })()
-  }, [agent.com.atproto.server, currentAccount?.email, state?.code])
-
-  const onPressResendEmail = async () => {
-    setSending(true)
-    await agent.com.atproto.server.requestEmailConfirmation()
-    setSending(false)
-    setStatus('resent')
-  }
-
-  return (
-    <Dialog.ScrollableInner label={_(msg`Verify email dialog`)}>
-      <Dialog.Close />
-      <View style={[a.gap_xl]}>
-        {status === 'loading' ? (
-          <View style={[a.py_2xl, a.align_center, a.justify_center]}>
-            <Loader size="xl" />
-          </View>
-        ) : status === 'success' ? (
-          <>
-            <Text style={[a.font_bold, a.text_2xl]}>
-              <Trans>Email Verified</Trans>
-            </Text>
-            <Text style={[a.text_md, a.leading_tight]}>
-              <Trans>
-                Thanks, you have successfully verified your email address.
-              </Trans>
-            </Text>
-          </>
-        ) : status === 'failure' ? (
-          <>
-            <Text style={[a.font_bold, a.text_2xl]}>
-              <Trans>Invalid Verification Code</Trans>
-            </Text>
-            <Text style={[a.text_md, a.leading_tight]}>
-              <Trans>
-                The verification code you have provided is invalid. Please make
-                sure that you have used the correct verification link or request
-                a new one.
-              </Trans>
-            </Text>
-          </>
-        ) : (
-          <>
-            <Text style={[a.font_bold, a.text_2xl]}>
-              <Trans>Email Resent</Trans>
-            </Text>
-            <Text style={[a.text_md, a.leading_tight]}>
-              <Trans>
-                We have sent another verification email to{' '}
-                <Text style={[a.text_md, a.font_bold]}>
-                  {currentAccount?.email}
-                </Text>
-                .
-              </Trans>
-            </Text>
-          </>
-        )}
-        {status !== 'loading' ? (
-          <View style={[a.w_full, a.flex_row, a.gap_sm, {marginLeft: 'auto'}]}>
-            <Button
-              label={_(msg`Close`)}
-              onPress={() => control.close()}
-              variant="solid"
-              color={status === 'failure' ? 'secondary' : 'primary'}
-              size="medium"
-              style={{marginLeft: 'auto'}}>
-              <ButtonText>
-                <Trans>Close</Trans>
-              </ButtonText>
-            </Button>
-            {status === 'failure' ? (
-              <Button
-                label={_(msg`Resend Verification Email`)}
-                onPress={onPressResendEmail}
-                variant="solid"
-                color="primary"
-                size="medium"
-                disabled={sending}>
-                <ButtonText>
-                  <Trans>Resend Email</Trans>
-                </ButtonText>
-                {sending ? <Loader size="sm" style={{color: 'white'}} /> : null}
-              </Button>
-            ) : null}
-          </View>
-        ) : null}
-      </View>
-    </Dialog.ScrollableInner>
-  )
-}

src/components/video/PlayButtonIcon.tsx

@@ -2,47 +2,24 @@ import React from 'react'
 import {View} from 'react-native'
 
 import {atoms as a, useTheme} from '#/alf'
-import {Play_Filled_Corner0_Rounded as PlayIcon} from '#/components/icons/Play'
+import {Play_Filled_Corner2_Rounded as PlayIcon} from '#/components/icons/Play'
 
-export function PlayButtonIcon({size = 36}: {size?: number}) {
+export function PlayButtonIcon({size = 44}: {size?: number}) {
   const t = useTheme()
-  const bg = t.name === 'light' ? t.palette.contrast_25 : t.palette.contrast_975
-  const fg = t.name === 'light' ? t.palette.contrast_975 : t.palette.contrast_25
 
   return (
     <View
       style={[
         a.rounded_full,
-        a.overflow_hidden,
         a.align_center,
         a.justify_center,
-        t.atoms.shadow_lg,
         {
-          width: size + size / 1.5,
-          height: size + size / 1.5,
+          backgroundColor: t.palette.primary_500,
+          width: size + 16,
+          height: size + 16,
         },
       ]}>
-      <View
-        style={[
-          a.absolute,
-          a.inset_0,
-          {
-            backgroundColor: bg,
-            opacity: 0.7,
-          },
-        ]}
-      />
-      <PlayIcon
-        width={size}
-        fill={fg}
-        style={[
-          a.relative,
-          a.z_10,
-          {
-            left: size / 50,
-          },
-        ]}
-      />
+      <PlayIcon height={size} width={size} style={{color: 'white'}} />
     </View>
   )
 }

src/lib/api/feed-manip.ts

@@ -379,11 +379,7 @@ export class FeedTuner {
     ): FeedViewPostsSlice[] => {
       for (let i = 0; i < slices.length; i++) {
         const slice = slices[i]
-        if (
-          slice.isReply &&
-          !slice.isRepost &&
-          !shouldDisplayReplyInFollowing(slice.getAuthors(), userDid)
-        ) {
+        if (slice.isReply && !shouldDisplayReplyInFollowing(slice, userDid)) {
           slices.splice(i, 1)
           i--
         }
@@ -447,9 +443,13 @@ function areSameAuthor(authors: AuthorContext): boolean {
 }
 
 function shouldDisplayReplyInFollowing(
-  authors: AuthorContext,
+  slice: FeedViewPostsSlice,
   userDid: string,
 ): boolean {
+  if (slice.isRepost) {
+    return true
+  }
+  const authors = slice.getAuthors()
   const {author, parentAuthor, grandparentAuthor, rootAuthor} = authors
   if (!isSelfOrFollowing(author, userDid)) {
     // Only show replies from self or people you follow.
@@ -463,6 +463,21 @@ function shouldDisplayReplyInFollowing(
     // Always show self-threads.
     return true
   }
+  if (
+    parentAuthor &&
+    parentAuthor.did !== author.did &&
+    rootAuthor &&
+    rootAuthor.did === author.did &&
+    slice.items.length > 2
+  ) {
+    // If you follow A, show A -> someone[>0 likes] -> A chains too.
+    // This is different from cases below because you only know one person.
+    const parentPost = slice.items[1].post
+    const parentLikeCount = parentPost.likeCount ?? 0
+    if (parentLikeCount > 0) {
+      return true
+    }
+  }
   // From this point on we need at least one more reason to show it.
   if (
     parentAuthor &&

src/lib/canvas.ts

@@ -1,15 +0,0 @@
-export const getCanvas = (base64: string): Promise<HTMLCanvasElement> => {
-  return new Promise(resolve => {
-    const image = new Image()
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-
-      const ctx = canvas.getContext('2d')
-      ctx?.drawImage(image, 0, 0)
-      resolve(canvas)
-    }
-    image.src = base64
-  })
-}

src/lib/constants.ts

@@ -21,7 +21,7 @@ export const STARTER_PACK_MAX_SIZE = 150
 // code and update this number with each release until we can get the
 // server route done.
 // -prf
-export const JOINED_THIS_WEEK = 3060000 // estimate as of 9/6/24
+export const JOINED_THIS_WEEK = 50676 // as of Aug 17, 2024
 
 const BASE_FEEDBACK_FORM_URL = `${HELP_DESK_URL}/requests/new`
 export function FEEDBACK_FORM_URL({
@@ -137,9 +137,6 @@ export const GIF_FEATURED = (params: string) =>
 
 export const MAX_LABELERS = 20
 
-export const VIDEO_SERVICE = 'https://video.bsky.app'
-export const VIDEO_SERVICE_DID = 'did:web:video.bsky.app'
-
 export const SUPPORTED_MIME_TYPES = [
   'video/mp4',
   'video/mpeg',

src/lib/hooks/useDedupe.ts

@@ -1,20 +1,17 @@
 import React from 'react'
 
-export const useDedupe = (timeout = 250) => {
+export const useDedupe = () => {
   const canDo = React.useRef(true)
 
-  return React.useCallback(
-    (cb: () => unknown) => {
-      if (canDo.current) {
-        canDo.current = false
-        setTimeout(() => {
-          canDo.current = true
-        }, timeout)
-        cb()
-        return true
-      }
-      return false
-    },
-    [timeout],
-  )
+  return React.useCallback((cb: () => unknown) => {
+    if (canDo.current) {
+      canDo.current = false
+      setTimeout(() => {
+        canDo.current = true
+      }, 250)
+      cb()
+      return true
+    }
+    return false
+  }, [])
 }

src/lib/hooks/useIntentHandler.ts

@@ -6,17 +6,15 @@ import {isNative} from 'platform/detection'
 import {useSession} from 'state/session'
 import {useComposerControls} from 'state/shell'
 import {useCloseAllActiveElements} from 'state/util'
-import {useIntentDialogs} from '#/components/intents/IntentDialogs'
 import {Referrer} from '../../../modules/expo-bluesky-swiss-army'
 
-type IntentType = 'compose' | 'verify-email'
+type IntentType = 'compose'
 
 const VALID_IMAGE_REGEX = /^[\w.:\-_/]+\|\d+(\.\d+)?\|\d+(\.\d+)?$/
 
 export function useIntentHandler() {
   const incomingUrl = Linking.useURL()
   const composeIntent = useComposeIntent()
-  const verifyEmailIntent = useVerifyEmailIntent()
 
   React.useEffect(() => {
     const handleIncomingURL = (url: string) => {
@@ -53,25 +51,15 @@ export function useIntentHandler() {
             text: params.get('text'),
             imageUrisStr: params.get('imageUris'),
           })
-          return
-        }
-        case 'verify-email': {
-          const code = params.get('code')
-          if (!code) return
-          verifyEmailIntent(code)
-          return
-        }
-        default: {
-          return
         }
       }
     }
 
     if (incomingUrl) handleIncomingURL(incomingUrl)
-  }, [incomingUrl, composeIntent, verifyEmailIntent])
+  }, [incomingUrl, composeIntent])
 }
 
-export function useComposeIntent() {
+function useComposeIntent() {
   const closeAllActiveElements = useCloseAllActiveElements()
   const {openComposer} = useComposerControls()
   const {hasSession} = useSession()
@@ -97,10 +85,6 @@ export function useComposeIntent() {
           if (part.includes('https://') || part.includes('http://')) {
             return false
           }
-          console.log({
-            part,
-            text: VALID_IMAGE_REGEX.test(part),
-          })
           // We also should just filter out cases that don't have all the info we need
           return VALID_IMAGE_REGEX.test(part)
         })
@@ -119,21 +103,3 @@ export function useComposeIntent() {
     [hasSession, closeAllActiveElements, openComposer],
   )
 }
-
-function useVerifyEmailIntent() {
-  const closeAllActiveElements = useCloseAllActiveElements()
-  const {verifyEmailDialogControl: control, setVerifyEmailState: setState} =
-    useIntentDialogs()
-  return React.useCallback(
-    (code: string) => {
-      closeAllActiveElements()
-      setState({
-        code,
-      })
-      setTimeout(() => {
-        control.open()
-      }, 1000)
-    },
-    [closeAllActiveElements, control, setState],
-  )
-}

src/lib/media/video/compress.ts

@@ -1,14 +1,9 @@
 import {getVideoMetaData, Video} from 'react-native-compressor'
-import {ImagePickerAsset} from 'expo-image-picker'
 
-import {SUPPORTED_MIME_TYPES, SupportedMimeTypes} from '#/lib/constants'
-import {extToMime} from '#/state/queries/video/util'
 import {CompressedVideo} from './types'
 
-const MIN_SIZE_FOR_COMPRESSION = 25 // 25mb
-
 export async function compressVideo(
-  file: ImagePickerAsset,
+  file: string,
   opts?: {
     signal?: AbortSignal
     onProgress?: (progress: number) => void
@@ -16,22 +11,12 @@ export async function compressVideo(
 ): Promise<CompressedVideo> {
   const {onProgress, signal} = opts || {}
 
-  const isAcceptableFormat = SUPPORTED_MIME_TYPES.includes(
-    file.mimeType as SupportedMimeTypes,
-  )
-
-  const minimumFileSizeForCompress = isAcceptableFormat
-    ? MIN_SIZE_FOR_COMPRESSION
-    : 0
-
   const compressed = await Video.compress(
-    file.uri,
+    file,
     {
       compressionMethod: 'manual',
       bitrate: 3_000_000, // 3mbps
       maxSize: 1920,
-      // WARNING: this ONE SPECIFIC ARG is in MB -sfn
-      minimumFileSizeForCompress,
       getCancellationId: id => {
         if (signal) {
           signal.addEventListener('abort', () => {
@@ -45,5 +30,5 @@ export async function compressVideo(
 
   const info = await getVideoMetaData(compressed)
 
-  return {uri: compressed, size: info.size, mimeType: extToMime(info.extension)}
+  return {uri: compressed, size: info.size, mimeType: `video/mp4`}
 }

src/lib/media/video/compress.web.ts

@@ -1,19 +1,17 @@
-import {ImagePickerAsset} from 'expo-image-picker'
-
 import {VideoTooLargeError} from 'lib/media/video/errors'
 import {CompressedVideo} from './types'
 
-const MAX_VIDEO_SIZE = 1024 * 1024 * 50 // 50mb
+const MAX_VIDEO_SIZE = 1024 * 1024 * 100 // 100MB
 
-// doesn't actually compress, converts to ArrayBuffer
+// doesn't actually compress, but throws if >100MB
 export async function compressVideo(
-  asset: ImagePickerAsset,
+  file: string,
   _opts?: {
     signal?: AbortSignal
     onProgress?: (progress: number) => void
   },
 ): Promise<CompressedVideo> {
-  const {mimeType, base64} = parseDataUrl(asset.uri)
+  const {mimeType, base64} = parseDataUrl(file)
   const blob = base64ToBlob(base64, mimeType)
   const uri = URL.createObjectURL(blob)
 

src/lib/media/video/errors.ts

@@ -1,6 +1,6 @@
 export class VideoTooLargeError extends Error {
   constructor() {
-    super('Videos cannot be larger than 50mb')
+    super('Videos cannot be larger than 100MB')
     this.name = 'VideoTooLargeError'
   }
 }
@@ -11,10 +11,3 @@ export class ServerError extends Error {
     this.name = 'ServerError'
   }
 }
-
-export class UploadLimitError extends Error {
-  constructor(message: string) {
-    super(message)
-    this.name = 'UploadLimitError'
-  }
-}

src/lib/statsig/events.ts

@@ -25,7 +25,7 @@ export type LogEvents = {
     secondsActive: number
   }
   'state:foreground:sampled': {}
-  'router:navigate:notifications:sampled': {}
+  'router:navigate:sampled': {}
   'deepLink:referrerReceived': {
     to: string
     referrer: string
@@ -127,25 +127,25 @@ export type LogEvents = {
     langs: string
     logContext: 'Composer'
   }
-  'post:like:sampled': {
+  'post:like': {
     doesLikerFollowPoster: boolean | undefined
     doesPosterFollowLiker: boolean | undefined
     likerClout: number | undefined
     postClout: number | undefined
     logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
   }
-  'post:repost:sampled': {
+  'post:repost': {
     logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
   }
-  'post:unlike:sampled': {
+  'post:unlike': {
     logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
   }
-  'post:unrepost:sampled': {
+  'post:unrepost': {
     logContext: 'FeedItem' | 'PostThreadItem' | 'Post'
   }
   'post:mute': {}
   'post:unmute': {}
-  'profile:follow:sampled': {
+  'profile:follow': {
     didBecomeMutual: boolean | undefined
     followeeClout: number | undefined
     followerClout: number | undefined
@@ -162,7 +162,7 @@ export type LogEvents = {
       | 'FeedInterstitial'
       | 'ProfileHeaderSuggestedFollows'
   }
-  'profile:unfollow:sampled': {
+  'profile:unfollow': {
     logContext:
       | 'RecommendedFollowsItem'
       | 'PostThreadItem'
@@ -225,8 +225,4 @@ export type LogEvents = {
   'test:gate1:sometimes': {}
   'test:gate2:always': {}
   'test:gate2:sometimes': {}
-
-  'tmd:share': {}
-  'tmd:download': {}
-  'tmd:post': {}
 }

src/lib/statsig/gates.ts

@@ -1,5 +1,10 @@
 export type Gate =
   // Keep this alphabetic please.
   | 'debug_show_feedcontext'
+  | 'fixed_bottom_bar'
+  | 'onboarding_minimum_interests'
   | 'suggested_feeds_interstitial'
-  | 'ten_million_dialog'
+  | 'show_follow_suggestions_in_profile'
+  | 'video_debug' // not recommended
+  | 'video_upload' // upload videos
+  | 'video_view_on_posts' // see posted videos

src/lib/statsig/statsig.tsx

@@ -89,9 +89,8 @@ export function toClout(n: number | null | undefined): number | undefined {
   }
 }
 
-const DOWNSAMPLE_RATE = 0.95 // 95% likely
 const DOWNSAMPLED_EVENTS: Set<keyof LogEvents> = new Set([
-  'router:navigate:notifications:sampled',
+  'router:navigate:sampled',
   'state:background:sampled',
   'state:foreground:sampled',
   'home:feedDisplayed:sampled',
@@ -100,14 +99,8 @@ const DOWNSAMPLED_EVENTS: Set<keyof LogEvents> = new Set([
   'discover:clickthrough:sampled',
   'discover:engaged:sampled',
   'discover:seen:sampled',
-  'post:like:sampled',
-  'post:unlike:sampled',
-  'post:repost:sampled',
-  'post:unrepost:sampled',
-  'profile:follow:sampled',
-  'profile:unfollow:sampled',
 ])
-const isDownsampledSession = Math.random() < DOWNSAMPLE_RATE
+const isDownsampledSession = Math.random() < 0.9 // 90% likely
 
 export function logEvent<E extends keyof LogEvents>(
   eventName: E & string,
@@ -124,16 +117,12 @@ export function logEvent<E extends keyof LogEvents>(
       )
     }
 
-    const isDownsampledEvent = DOWNSAMPLED_EVENTS.has(eventName)
-    if (isDownsampledSession && isDownsampledEvent) {
+    if (isDownsampledSession && DOWNSAMPLED_EVENTS.has(eventName)) {
       return
     }
     const fullMetadata = {
       ...rawMetadata,
     } as Record<string, string> // Statsig typings are unnecessarily strict here.
-    if (isDownsampledEvent) {
-      fullMetadata.downsampleRate = DOWNSAMPLE_RATE.toString()
-    }
     fullMetadata.routeName = getCurrentRouteName() ?? '(Uninitialized)'
     if (Statsig.initializeCalled()) {
       Statsig.logEvent(eventName, null, fullMetadata)

src/locale/helpers.ts

@@ -143,8 +143,6 @@ export function sanitizeAppLanguageSetting(appLanguage: string): AppLanguage {
         return AppLanguage.ko
       case 'pt-BR':
         return AppLanguage.pt_BR
-      case 'ru':
-        return AppLanguage.ru
       case 'tr':
         return AppLanguage.tr
       case 'uk':

src/locale/i18n.ts

@@ -24,7 +24,6 @@ import {messages as messagesIt} from '#/locale/locales/it/messages'
 import {messages as messagesJa} from '#/locale/locales/ja/messages'
 import {messages as messagesKo} from '#/locale/locales/ko/messages'
 import {messages as messagesPt_BR} from '#/locale/locales/pt-BR/messages'
-import {messages as messagesRu} from '#/locale/locales/ru/messages'
 import {messages as messagesTr} from '#/locale/locales/tr/messages'
 import {messages as messagesUk} from '#/locale/locales/uk/messages'
 import {messages as messagesZh_CN} from '#/locale/locales/zh-CN/messages'
@@ -132,14 +131,6 @@ export async function dynamicActivate(locale: AppLanguage) {
       ])
       break
     }
-    case AppLanguage.ru: {
-      i18n.loadAndActivate({locale, messages: messagesRu})
-      await Promise.all([
-        import('@formatjs/intl-pluralrules/locale-data/ru'),
-        import('@formatjs/intl-numberformat/locale-data/ru'),
-      ])
-      break
-    }
     case AppLanguage.tr: {
       i18n.loadAndActivate({locale, messages: messagesTr})
       await Promise.all([

src/locale/i18n.web.ts

@@ -60,10 +60,6 @@ export async function dynamicActivate(locale: AppLanguage) {
       mod = await import(`./locales/pt-BR/messages`)
       break
     }
-    case AppLanguage.ru: {
-      mod = await import(`./locales/ru/messages`)
-      break
-    }
     case AppLanguage.tr: {
       mod = await import(`./locales/tr/messages`)
       break

src/locale/languages.ts

@@ -18,7 +18,6 @@ export enum AppLanguage {
   ja = 'ja',
   ko = 'ko',
   pt_BR = 'pt-BR',
-  ru = 'ru',
   tr = 'tr',
   uk = 'uk',
   zh_CN = 'zh-CN',
@@ -44,7 +43,6 @@ export const APP_LANGUAGES: AppLanguageConfig[] = [
   {code2: AppLanguage.ja, name: '日本語 – Japanese'},
   {code2: AppLanguage.ko, name: '한국어 – Korean'},
   {code2: AppLanguage.pt_BR, name: 'Português (BR) – Portuguese (BR)'},
-  {code2: AppLanguage.ru, name: 'Русский – Russian'},
   {code2: AppLanguage.tr, name: 'Türkçe – Turkish'},
   {code2: AppLanguage.uk, name: 'Українська – Ukrainian'},
   {code2: AppLanguage.zh_CN, name: '简体中文（中国）– Chinese (Simplified)'},

src/screens/Messages/Conversation/MessageInput.tsx

@@ -23,7 +23,6 @@ import {
   useSaveMessageDraft,
 } from '#/state/messages/message-drafts'
 import {isIOS} from 'platform/detection'
-import {EmojiPickerPosition} from '#/view/com/composer/text-input/web/EmojiPicker.web'
 import * as Toast from '#/view/com/util/Toast'
 import {atoms as a, useTheme} from '#/alf'
 import {useSharedInputStyles} from '#/components/forms/TextField'
@@ -42,7 +41,6 @@ export function MessageInput({
   hasEmbed: boolean
   setEmbed: (embedUrl: string | undefined) => void
   children?: React.ReactNode
-  openEmojiPicker?: (pos: EmojiPickerPosition) => void
 }) {
   const {_} = useLingui()
   const t = useTheme()

src/screens/Messages/Conversation/MessageInput.web.tsx

@@ -12,16 +12,9 @@ import {
 } from '#/state/messages/message-drafts'
 import {isSafari, isTouchDevice} from 'lib/browser'
 import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
-import {textInputWebEmitter} from '#/view/com/composer/text-input/textInputWebEmitter'
-import {
-  Emoji,
-  EmojiPickerPosition,
-} from '#/view/com/composer/text-input/web/EmojiPicker.web'
 import * as Toast from '#/view/com/util/Toast'
 import {atoms as a, useTheme} from '#/alf'
-import {Button} from '#/components/Button'
 import {useSharedInputStyles} from '#/components/forms/TextField'
-import {EmojiArc_Stroke2_Corner0_Rounded as EmojiSmile} from '#/components/icons/Emoji'
 import {PaperPlane_Stroke2_Corner0_Rounded as PaperPlane} from '#/components/icons/PaperPlane'
 import {useExtractEmbedFromFacets} from './MessageInputEmbed'
 
@@ -30,13 +23,11 @@ export function MessageInput({
   hasEmbed,
   setEmbed,
   children,
-  openEmojiPicker,
 }: {
   onSendMessage: (message: string) => void
   hasEmbed: boolean
   setEmbed: (embedUrl: string | undefined) => void
   children?: React.ReactNode
-  openEmojiPicker?: (pos: EmojiPickerPosition) => void
 }) {
   const {isTabletOrDesktop} = useWebMediaQueries()
   const {_} = useLingui()
@@ -49,7 +40,6 @@ export function MessageInput({
   const [isFocused, setIsFocused] = React.useState(false)
   const [isHovered, setIsHovered] = React.useState(false)
   const [textAreaHeight, setTextAreaHeight] = React.useState(38)
-  const textAreaRef = React.useRef<HTMLTextAreaElement>(null)
 
   const onSubmit = React.useCallback(() => {
     if (!hasEmbed && message.trim() === '') {
@@ -104,23 +94,6 @@ export function MessageInput({
     [],
   )
 
-  const onEmojiInserted = React.useCallback(
-    (emoji: Emoji) => {
-      const position = textAreaRef.current?.selectionStart ?? 0
-      setMessage(
-        message =>
-          message.slice(0, position) + emoji.native + message.slice(position),
-      )
-    },
-    [setMessage],
-  )
-  React.useEffect(() => {
-    textInputWebEmitter.addListener('emoji-inserted', onEmojiInserted)
-    return () => {
-      textInputWebEmitter.removeListener('emoji-inserted', onEmojiInserted)
-    }
-  }, [onEmojiInserted])
-
   useSaveMessageDraft(message)
   useExtractEmbedFromFacets(message, setEmbed)
 
@@ -133,7 +106,7 @@ export function MessageInput({
           t.atoms.bg_contrast_25,
           {
             paddingRight: a.p_sm.padding - 2,
-            paddingLeft: a.p_sm.padding - 2,
+            paddingLeft: a.p_md.padding - 2,
             borderWidth: 1,
             borderRadius: 23,
             borderColor: 'transparent',
@@ -145,44 +118,7 @@ export function MessageInput({
         // @ts-expect-error web only
         onMouseEnter={() => setIsHovered(true)}
         onMouseLeave={() => setIsHovered(false)}>
-        <Button
-          onPress={e => {
-            e.currentTarget.measure((_fx, _fy, _width, _height, px, py) => {
-              openEmojiPicker?.({top: py, left: px, right: px, bottom: py})
-            })
-          }}
-          style={[
-            a.rounded_full,
-            a.overflow_hidden,
-            a.align_center,
-            a.justify_center,
-            {
-              marginTop: 5,
-              height: 30,
-              width: 30,
-            },
-          ]}
-          label={_(msg`Open emoji picker`)}>
-          {state => (
-            <View
-              style={[
-                a.absolute,
-                a.inset_0,
-                a.align_center,
-                a.justify_center,
-                {
-                  backgroundColor:
-                    state.hovered || state.focused || state.pressed
-                      ? t.atoms.bg.backgroundColor
-                      : undefined,
-                },
-              ]}>
-              <EmojiSmile size="lg" />
-            </View>
-          )}
-        </Button>
         <TextareaAutosize
-          ref={textAreaRef}
           style={StyleSheet.flatten([
             a.flex_1,
             a.px_sm,

src/screens/Messages/Conversation/MessagesList.tsx

@@ -29,10 +29,6 @@ import {useAgent} from '#/state/session'
 import {clamp} from 'lib/numbers'
 import {ScrollProvider} from 'lib/ScrollContext'
 import {isWeb} from 'platform/detection'
-import {
-  EmojiPicker,
-  EmojiPickerState,
-} from '#/view/com/composer/text-input/web/EmojiPicker.web'
 import {List} from 'view/com/util/List'
 import {ChatDisabled} from '#/screens/Messages/Conversation/ChatDisabled'
 import {MessageInput} from '#/screens/Messages/Conversation/MessageInput'
@@ -101,12 +97,6 @@ export function MessagesList({
     startContentOffset: 0,
   })
 
-  const [emojiPickerState, setEmojiPickerState] =
-    React.useState<EmojiPickerState>({
-      isOpen: false,
-      pos: {top: 0, left: 0, right: 0, bottom: 0},
-    })
-
   // We need to keep track of when the scroll offset is at the bottom of the list to know when to scroll as new items
   // are added to the list. For example, if the user is scrolled up to 1iew older messages, we don't want to scroll to
   // the bottom.
@@ -432,22 +422,13 @@ export function MessagesList({
             <MessageInput
               onSendMessage={onSendMessage}
               hasEmbed={!!embedUri}
-              setEmbed={setEmbed}
-              openEmojiPicker={pos => setEmojiPickerState({isOpen: true, pos})}>
+              setEmbed={setEmbed}>
               <MessageInputEmbed embedUri={embedUri} setEmbed={setEmbed} />
             </MessageInput>
           </>
         )}
       </KeyboardStickyView>
 
-      {isWeb && (
-        <EmojiPicker
-          pinToTop
-          state={emojiPickerState}
-          close={() => setEmojiPickerState(prev => ({...prev, isOpen: false}))}
-        />
-      )}
-
       {newMessagesPill.show && <NewMessagesPill onPress={scrollToEndOnPress} />}
     </>
   )

src/screens/Onboarding/StepInterests/index.tsx

@@ -6,8 +6,10 @@ import {useQuery} from '@tanstack/react-query'
 
 import {useAnalytics} from '#/lib/analytics/analytics'
 import {logEvent} from '#/lib/statsig/statsig'
+import {useGate} from '#/lib/statsig/statsig'
 import {capitalize} from '#/lib/strings/capitalize'
 import {logger} from '#/logger'
+import {isWeb} from '#/platform/detection'
 import {useAgent} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {
@@ -27,16 +29,23 @@ import * as Toggle from '#/components/forms/Toggle'
 import {IconCircle} from '#/components/IconCircle'
 import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as ArrowRotateCounterClockwise} from '#/components/icons/ArrowRotateCounterClockwise'
 import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components/icons/Chevron'
+import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo'
 import {EmojiSad_Stroke2_Corner0_Rounded as EmojiSad} from '#/components/icons/Emoji'
 import {Hashtag_Stroke2_Corner0_Rounded as Hashtag} from '#/components/icons/Hashtag'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 
+const PROMPT_HEIGHT = isWeb ? 42 : 36
+// matches the padding of the OnboardingControls.Portal
+const PROMPT_OFFSET = isWeb ? a.pb_2xl.paddingBottom : a.pb_lg.paddingBottom
+const MIN_INTERESTS = 3
+
 export function StepInterests() {
   const {_} = useLingui()
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
   const {track} = useAnalytics()
+  const gate = useGate()
   const interestsDisplayNames = useInterestsDisplayNames()
 
   const {state, dispatch} = React.useContext(Context)
@@ -134,6 +143,12 @@ export function StepInterests() {
     track('OnboardingV2:StepInterests:Start')
   }, [track])
 
+  const isMinimumInterestsEnabled =
+    gate('onboarding_minimum_interests') && data?.interests.length !== 0
+  const meetsMinimumRequirement = isMinimumInterestsEnabled
+    ? interests.length >= MIN_INTERESTS
+    : true
+
   const title = isError ? (
     <Trans>Oh no! Something went wrong.</Trans>
   ) : (
@@ -171,8 +186,13 @@ export function StepInterests() {
 
       <TitleText>{title}</TitleText>
       <DescriptionText>{description}</DescriptionText>
+      {isMinimumInterestsEnabled && (
+        <DescriptionText style={[a.pt_sm]}>
+          <Trans>Choose 3 or more:</Trans>
+        </DescriptionText>
+      )}
 
-      <View style={[a.w_full, a.pt_2xl]}>
+      <View style={[a.w_full, isMinimumInterestsEnabled ? a.pt_md : a.pt_2xl]}>
         {isLoading ? (
           <Loader size="xl" />
         ) : isError || !data ? (
@@ -248,7 +268,7 @@ export function StepInterests() {
           </View>
         ) : (
           <Button
-            disabled={saving || !data}
+            disabled={saving || !data || !meetsMinimumRequirement}
             variant="gradient"
             color="gradient_sky"
             size="large"
@@ -263,6 +283,53 @@ export function StepInterests() {
             />
           </Button>
         )}
+
+        {!meetsMinimumRequirement && (
+          <View
+            style={[
+              a.align_center,
+              a.absolute,
+              {
+                top: 0,
+                left: 0,
+                right: 0,
+                margin: 'auto',
+                transform: [
+                  {
+                    translateY:
+                      -1 *
+                      (PROMPT_OFFSET + PROMPT_HEIGHT + a.pb_lg.paddingBottom),
+                  },
+                ],
+              },
+            ]}>
+            <View
+              style={[
+                a.flex_row,
+                a.align_center,
+                a.gap_sm,
+                a.rounded_full,
+                a.border,
+                t.atoms.bg_contrast_25,
+                t.atoms.border_contrast_medium,
+                {
+                  height: PROMPT_HEIGHT,
+                  ...t.atoms.shadow_sm,
+                  shadowOpacity: 0.1,
+                },
+                isWeb
+                  ? [a.py_md, a.px_lg, a.pr_xl]
+                  : [a.py_sm, a.px_md, a.pr_lg],
+              ]}>
+              <CircleInfo />
+              <Text>
+                <Trans>
+                  Choose at least {MIN_INTERESTS - interests.length} more
+                </Trans>
+              </Text>
+            </View>
+          </View>
+        )}
       </OnboardingControls.Portal>
     </View>
   )

src/screens/Profile/Header/ProfileHeaderStandard.tsx

@@ -6,9 +6,11 @@ import {
   ModerationOpts,
   RichText as RichTextAPI,
 } from '@atproto/api'
+import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {useGate} from '#/lib/statsig/statsig'
 import {logger} from '#/logger'
 import {isIOS} from '#/platform/detection'
 import {Shadow} from '#/state/cache/types'
@@ -21,9 +23,10 @@ import {useRequireAuth, useSession} from '#/state/session'
 import {useAnalytics} from 'lib/analytics/analytics'
 import {sanitizeDisplayName} from 'lib/strings/display-names'
 import {useProfileShadow} from 'state/cache/profile-shadow'
+import {ProfileHeaderSuggestedFollows} from '#/view/com/profile/ProfileHeaderSuggestedFollows'
 import {ProfileMenu} from '#/view/com/profile/ProfileMenu'
 import * as Toast from '#/view/com/util/Toast'
-import {atoms as a} from '#/alf'
+import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import {MessageProfileButton} from '#/components/dms/MessageProfileButton'
 import {Check_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
@@ -56,6 +59,8 @@ let ProfileHeaderStandard = ({
 }: Props): React.ReactNode => {
   const profile: Shadow<AppBskyActorDefs.ProfileViewDetailed> =
     useProfileShadow(profileUnshadowed)
+  const t = useTheme()
+  const gate = useGate()
   const {currentAccount, hasSession} = useSession()
   const {_} = useLingui()
   const {openModal} = useModalControls()
@@ -64,6 +69,7 @@ let ProfileHeaderStandard = ({
     () => moderateProfile(profile, moderationOpts),
     [profile, moderationOpts],
   )
+  const [showSuggestedFollows, setShowSuggestedFollows] = React.useState(false)
   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue(
     profile,
     'ProfileHeader',
@@ -196,7 +202,34 @@ let ProfileHeaderStandard = ({
             )
           ) : !profile.viewer?.blockedBy ? (
             <>
-              {hasSession && <MessageProfileButton profile={profile} />}
+              {hasSession && (
+                <>
+                  <MessageProfileButton profile={profile} />
+                  {!gate('show_follow_suggestions_in_profile') && (
+                    <Button
+                      testID="suggestedFollowsBtn"
+                      size="small"
+                      color={showSuggestedFollows ? 'primary' : 'secondary'}
+                      variant="solid"
+                      shape="round"
+                      onPress={() =>
+                        setShowSuggestedFollows(!showSuggestedFollows)
+                      }
+                      label={_(msg`Show follows similar to ${profile.handle}`)}
+                      style={{width: 36, height: 36}}>
+                      <FontAwesomeIcon
+                        icon="user-plus"
+                        style={
+                          showSuggestedFollows
+                            ? {color: t.palette.white}
+                            : t.atoms.text
+                        }
+                        size={14}
+                      />
+                    </Button>
+                  )}
+                </>
+              )}
 
               <Button
                 testID={profile.viewer?.following ? 'unfollowBtn' : 'followBtn'}
@@ -219,8 +252,6 @@ let ProfileHeaderStandard = ({
                 <ButtonText>
                   {profile.viewer?.following ? (
                     <Trans>Following</Trans>
-                  ) : profile.viewer?.followedBy ? (
-                    <Trans>Follow Back</Trans>
                   ) : (
                     <Trans>Follow</Trans>
                   )}
@@ -263,6 +294,19 @@ let ProfileHeaderStandard = ({
           </>
         )}
       </View>
+      {showSuggestedFollows && (
+        <ProfileHeaderSuggestedFollows
+          actorDid={profile.did}
+          requestDismiss={() => {
+            if (showSuggestedFollows) {
+              setShowSuggestedFollows(false)
+            } else {
+              track('ProfileHeader:SuggestedFollowsOpened')
+              setShowSuggestedFollows(true)
+            }
+          }}
+        />
+      )}
       <Prompt.Basic
         control={unblockPromptControl}
         title={_(msg`Unblock Account?`)}

src/screens/Signup/StepInfo/index.tsx

@@ -172,7 +172,6 @@ export function StepInfo({
                   defaultValue={state.password}
                   secureTextEntry
                   autoComplete="new-password"
-                  autoCapitalize="none"
                 />
               </TextField.Root>
             </View>

src/state/queries/nuxs/definitions.ts

@@ -1,18 +0,0 @@
-import zod from 'zod'
-
-import {BaseNux} from '#/state/queries/nuxs/types'
-
-export enum Nux {
-  TenMillionDialog = 'TenMillionDialog',
-}
-
-export const nuxNames = new Set(Object.values(Nux))
-
-export type AppNux = BaseNux<{
-  id: Nux.TenMillionDialog
-  data: undefined
-}>
-
-export const NuxSchemas: Record<Nux, zod.ZodObject<any> | undefined> = {
-  [Nux.TenMillionDialog]: undefined,
-}

src/state/queries/nuxs/index.ts

@@ -1,85 +0,0 @@
-import {useMutation, useQueryClient} from '@tanstack/react-query'
-
-import {AppNux, Nux} from '#/state/queries/nuxs/definitions'
-import {parseAppNux, serializeAppNux} from '#/state/queries/nuxs/util'
-import {
-  preferencesQueryKey,
-  usePreferencesQuery,
-} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
-
-export {Nux} from '#/state/queries/nuxs/definitions'
-
-export function useNuxs() {
-  const {data, ...rest} = usePreferencesQuery()
-
-  if (data && rest.isSuccess) {
-    const nuxs = data.bskyAppState.nuxs
-      ?.map(parseAppNux)
-      ?.filter(Boolean) as AppNux[]
-
-    if (nuxs) {
-      return {
-        nuxs,
-        ...rest,
-      }
-    }
-  }
-
-  return {
-    nuxs: undefined,
-    ...rest,
-  }
-}
-
-export function useNux<T extends Nux>(id: T) {
-  const {nuxs, ...rest} = useNuxs()
-
-  if (nuxs && rest.isSuccess) {
-    const nux = nuxs.find(nux => nux.id === id)
-
-    if (nux) {
-      return {
-        nux: nux as Extract<AppNux, {id: T}>,
-        ...rest,
-      }
-    }
-  }
-
-  return {
-    nux: undefined,
-    ...rest,
-  }
-}
-
-export function useUpsertNuxMutation() {
-  const queryClient = useQueryClient()
-  const agent = useAgent()
-
-  return useMutation({
-    retry: 3,
-    mutationFn: async (nux: AppNux) => {
-      await agent.bskyAppUpsertNux(serializeAppNux(nux))
-      // triggers a refetch
-      await queryClient.invalidateQueries({
-        queryKey: preferencesQueryKey,
-      })
-    },
-  })
-}
-
-export function useRemoveNuxsMutation() {
-  const queryClient = useQueryClient()
-  const agent = useAgent()
-
-  return useMutation({
-    retry: 3,
-    mutationFn: async (ids: string[]) => {
-      await agent.bskyAppRemoveNuxs(ids)
-      // triggers a refetch
-      await queryClient.invalidateQueries({
-        queryKey: preferencesQueryKey,
-      })
-    },
-  })
-}

src/state/queries/nuxs/types.ts

@@ -1,7 +0,0 @@
-import {AppBskyActorDefs} from '@atproto/api'
-
-export type Data = Record<string, unknown> | undefined
-
-export type BaseNux<
-  T extends Pick<AppBskyActorDefs.Nux, 'id' | 'expiresAt'> & {data: Data},
-> = Pick<AppBskyActorDefs.Nux, 'id' | 'completed' | 'expiresAt'> & T

src/state/queries/nuxs/util.ts

@@ -1,52 +0,0 @@
-import {AppBskyActorDefs, nuxSchema} from '@atproto/api'
-
-import {
-  AppNux,
-  Nux,
-  nuxNames,
-  NuxSchemas,
-} from '#/state/queries/nuxs/definitions'
-
-export function parseAppNux(nux: AppBskyActorDefs.Nux): AppNux | undefined {
-  if (!nuxNames.has(nux.id as Nux)) return
-  if (!nuxSchema.safeParse(nux).success) return
-
-  const {data, ...rest} = nux
-
-  const schema = NuxSchemas[nux.id as Nux]
-
-  if (schema && data) {
-    const parsedData = JSON.parse(data)
-
-    if (!schema.safeParse(parsedData).success) return
-
-    return {
-      ...rest,
-      data: parsedData,
-    } as AppNux
-  }
-
-  return {
-    ...rest,
-    data: undefined,
-  } as AppNux
-}
-
-export function serializeAppNux(nux: AppNux): AppBskyActorDefs.Nux {
-  const {data, ...rest} = nux
-  const schema = NuxSchemas[nux.id as Nux]
-
-  const result: AppBskyActorDefs.Nux = {
-    ...rest,
-    data: undefined,
-  }
-
-  if (schema) {
-    schema.parse(data)
-    result.data = JSON.stringify(data)
-  }
-
-  nuxSchema.parse(result)
-
-  return result
-}

src/state/queries/post-thread.ts

@@ -408,14 +408,10 @@ export function* findAllPostsInQueryData(
       }
     }
   }
-  for (let post of findAllPostsInNotifsQueryData(queryClient, uri)) {
-    // Check notifications first. If you have a post in notifications,
-    // it's often due to a like or a repost, and we want to prioritize
-    // a post object with >0 likes/reposts over a stale version with no
-    // metrics in order to avoid a notification->post scroll jump.
+  for (let post of findAllPostsInFeedQueryData(queryClient, uri)) {
     yield postViewToPlaceholderThread(post)
   }
-  for (let post of findAllPostsInFeedQueryData(queryClient, uri)) {
+  for (let post of findAllPostsInNotifsQueryData(queryClient, uri)) {
     yield postViewToPlaceholderThread(post)
   }
   for (let post of findAllPostsInQuoteQueryData(queryClient, uri)) {

src/state/queries/post.ts

@@ -99,8 +99,8 @@ export function useGetPosts() {
 
 export function usePostLikeMutationQueue(
   post: Shadow<AppBskyFeedDefs.PostView>,
-  logContext: LogEvents['post:like:sampled']['logContext'] &
-    LogEvents['post:unlike:sampled']['logContext'],
+  logContext: LogEvents['post:like']['logContext'] &
+    LogEvents['post:unlike']['logContext'],
 ) {
   const queryClient = useQueryClient()
   const postUri = post.uri
@@ -158,7 +158,7 @@ export function usePostLikeMutationQueue(
 }
 
 function usePostLikeMutation(
-  logContext: LogEvents['post:like:sampled']['logContext'],
+  logContext: LogEvents['post:like']['logContext'],
   post: Shadow<AppBskyFeedDefs.PostView>,
 ) {
   const {currentAccount} = useSession()
@@ -175,7 +175,7 @@ function usePostLikeMutation(
       if (currentAccount) {
         ownProfile = findProfileQueryData(queryClient, currentAccount.did)
       }
-      logEvent('post:like:sampled', {
+      logEvent('post:like', {
         logContext,
         doesPosterFollowLiker: postAuthor.viewer
           ? Boolean(postAuthor.viewer.followedBy)
@@ -200,12 +200,12 @@ function usePostLikeMutation(
 }
 
 function usePostUnlikeMutation(
-  logContext: LogEvents['post:unlike:sampled']['logContext'],
+  logContext: LogEvents['post:unlike']['logContext'],
 ) {
   const agent = useAgent()
   return useMutation<void, Error, {postUri: string; likeUri: string}>({
     mutationFn: ({likeUri}) => {
-      logEvent('post:unlike:sampled', {logContext})
+      logEvent('post:unlike', {logContext})
       return agent.deleteLike(likeUri)
     },
     onSuccess() {
@@ -216,8 +216,8 @@ function usePostUnlikeMutation(
 
 export function usePostRepostMutationQueue(
   post: Shadow<AppBskyFeedDefs.PostView>,
-  logContext: LogEvents['post:repost:sampled']['logContext'] &
-    LogEvents['post:unrepost:sampled']['logContext'],
+  logContext: LogEvents['post:repost']['logContext'] &
+    LogEvents['post:unrepost']['logContext'],
 ) {
   const queryClient = useQueryClient()
   const postUri = post.uri
@@ -273,7 +273,7 @@ export function usePostRepostMutationQueue(
 }
 
 function usePostRepostMutation(
-  logContext: LogEvents['post:repost:sampled']['logContext'],
+  logContext: LogEvents['post:repost']['logContext'],
 ) {
   const agent = useAgent()
   return useMutation<
@@ -282,7 +282,7 @@ function usePostRepostMutation(
     {uri: string; cid: string} // the post's uri and cid
   >({
     mutationFn: post => {
-      logEvent('post:repost:sampled', {logContext})
+      logEvent('post:repost', {logContext})
       return agent.repost(post.uri, post.cid)
     },
     onSuccess() {
@@ -292,12 +292,12 @@ function usePostRepostMutation(
 }
 
 function usePostUnrepostMutation(
-  logContext: LogEvents['post:unrepost:sampled']['logContext'],
+  logContext: LogEvents['post:unrepost']['logContext'],
 ) {
   const agent = useAgent()
   return useMutation<void, Error, {postUri: string; repostUri: string}>({
     mutationFn: ({repostUri}) => {
-      logEvent('post:unrepost:sampled', {logContext})
+      logEvent('post:unrepost', {logContext})
       return agent.deleteRepost(repostUri)
     },
     onSuccess() {

src/state/queries/preferences/const.ts

@@ -37,6 +37,5 @@ export const DEFAULT_LOGGED_OUT_PREFERENCES: UsePreferencesQueryResponse = {
   bskyAppState: {
     queuedNudges: [],
     activeProgressGuide: undefined,
-    nuxs: [],
   },
 }

src/state/queries/profile.ts

@@ -219,8 +219,8 @@ export function useProfileUpdateMutation() {
 
 export function useProfileFollowMutationQueue(
   profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>,
-  logContext: LogEvents['profile:follow:sampled']['logContext'] &
-    LogEvents['profile:follow:sampled']['logContext'],
+  logContext: LogEvents['profile:follow']['logContext'] &
+    LogEvents['profile:unfollow']['logContext'],
 ) {
   const agent = useAgent()
   const queryClient = useQueryClient()
@@ -291,7 +291,7 @@ export function useProfileFollowMutationQueue(
 }
 
 function useProfileFollowMutation(
-  logContext: LogEvents['profile:follow:sampled']['logContext'],
+  logContext: LogEvents['profile:follow']['logContext'],
   profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>,
 ) {
   const {currentAccount} = useSession()
@@ -306,7 +306,7 @@ function useProfileFollowMutation(
         ownProfile = findProfileQueryData(queryClient, currentAccount.did)
       }
       captureAction(ProgressGuideAction.Follow)
-      logEvent('profile:follow:sampled', {
+      logEvent('profile:follow', {
         logContext,
         didBecomeMutual: profile.viewer
           ? Boolean(profile.viewer.followedBy)
@@ -323,12 +323,12 @@ function useProfileFollowMutation(
 }
 
 function useProfileUnfollowMutation(
-  logContext: LogEvents['profile:unfollow:sampled']['logContext'],
+  logContext: LogEvents['profile:unfollow']['logContext'],
 ) {
   const agent = useAgent()
   return useMutation<void, Error, {did: string; followUri: string}>({
     mutationFn: async ({followUri}) => {
-      logEvent('profile:unfollow:sampled', {logContext})
+      logEvent('profile:unfollow', {logContext})
       track('Profile:Unfollow', {username: followUri})
       return await agent.deleteFollow(followUri)
     },

src/state/queries/suggested-follows.ts

@@ -106,16 +106,13 @@ export function useSuggestedFollowsQuery(options?: SuggestedFollowsOptions) {
 export function useSuggestedFollowsByActorQuery({did}: {did: string}) {
   const agent = useAgent()
   return useQuery<AppBskyGraphGetSuggestedFollowsByActor.OutputSchema, Error>({
+    gcTime: 0,
     queryKey: suggestedFollowsByActorQueryKey(did),
     queryFn: async () => {
       const res = await agent.app.bsky.graph.getSuggestedFollowsByActor({
         actor: did,
       })
-      const data = res.data.isFallback ? {suggestions: []} : res.data
-      data.suggestions = data.suggestions.filter(profile => {
-        return !profile.viewer?.following
-      })
-      return data
+      return res.data
     },
   })
 }

src/state/queries/video/compress-video.ts

@@ -20,7 +20,7 @@ export function useCompressVideoMutation({
     mutationKey: ['video', 'compress'],
     mutationFn: cancelable(
       (asset: ImagePickerAsset) =>
-        compressVideo(asset, {
+        compressVideo(asset.uri, {
           onProgress: num => onProgress(trunc2dp(num)),
           signal,
         }),

src/state/queries/video/util.ts

@@ -1,13 +1,15 @@
 import {useMemo} from 'react'
 import {AtpAgent} from '@atproto/api'
 
-import {SupportedMimeTypes, VIDEO_SERVICE} from '#/lib/constants'
+import {SupportedMimeTypes} from '#/lib/constants'
+
+const UPLOAD_ENDPOINT = 'https://video.bsky.app/'
 
 export const createVideoEndpointUrl = (
   route: string,
   params?: Record<string, string>,
 ) => {
-  const url = new URL(VIDEO_SERVICE)
+  const url = new URL(`${UPLOAD_ENDPOINT}`)
   url.pathname = route
   if (params) {
     for (const key in params) {
@@ -20,7 +22,7 @@ export const createVideoEndpointUrl = (
 export function useVideoAgent() {
   return useMemo(() => {
     return new AtpAgent({
-      service: VIDEO_SERVICE,
+      service: UPLOAD_ENDPOINT,
     })
   }, [])
 }
@@ -39,18 +41,3 @@ export function mimeToExt(mimeType: SupportedMimeTypes | (string & {})) {
       throw new Error(`Unsupported mime type: ${mimeType}`)
   }
 }
-
-export function extToMime(ext: string) {
-  switch (ext) {
-    case 'mp4':
-      return 'video/mp4'
-    case 'webm':
-      return 'video/webm'
-    case 'mpeg':
-      return 'video/mpeg'
-    case 'mov':
-      return 'video/quicktime'
-    default:
-      throw new Error(`Unsupported file extension: ${ext}`)
-  }
-}

src/state/queries/video/video-upload.shared.ts

@@ -1,73 +0,0 @@
-import {useCallback} from 'react'
-import {msg} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {VIDEO_SERVICE_DID} from '#/lib/constants'
-import {UploadLimitError} from '#/lib/media/video/errors'
-import {getServiceAuthAudFromUrl} from '#/lib/strings/url-helpers'
-import {useAgent} from '#/state/session'
-import {useVideoAgent} from './util'
-
-export function useServiceAuthToken({
-  aud,
-  lxm,
-  exp,
-}: {
-  aud?: string
-  lxm: string
-  exp?: number
-}) {
-  const agent = useAgent()
-
-  return useCallback(async () => {
-    const pdsAud = getServiceAuthAudFromUrl(agent.dispatchUrl)
-
-    if (!pdsAud) {
-      throw new Error('Agent does not have a PDS URL')
-    }
-
-    const {data: serviceAuth} = await agent.com.atproto.server.getServiceAuth({
-      aud: aud ?? pdsAud,
-      lxm,
-      exp,
-    })
-
-    return serviceAuth.token
-  }, [agent, aud, lxm, exp])
-}
-
-export function useVideoUploadLimits() {
-  const agent = useVideoAgent()
-  const getToken = useServiceAuthToken({
-    lxm: 'app.bsky.video.getUploadLimits',
-    aud: VIDEO_SERVICE_DID,
-  })
-  const {_} = useLingui()
-
-  return useCallback(async () => {
-    const {data: limits} = await agent.app.bsky.video
-      .getUploadLimits(
-        {},
-        {headers: {Authorization: `Bearer ${await getToken()}`}},
-      )
-      .catch(err => {
-        if (err instanceof Error) {
-          throw new UploadLimitError(err.message)
-        } else {
-          throw err
-        }
-      })
-
-    if (!limits.canUpload) {
-      if (limits.message) {
-        throw new UploadLimitError(limits.message)
-      } else {
-        throw new UploadLimitError(
-          _(
-            msg`You have temporarily reached the limit for video uploads. Please try again later.`,
-          ),
-        )
-      }
-    }
-  }, [agent, _, getToken])
-}

src/state/queries/video/video-upload.ts

@@ -9,8 +9,8 @@ import {cancelable} from '#/lib/async/cancelable'
 import {ServerError} from '#/lib/media/video/errors'
 import {CompressedVideo} from '#/lib/media/video/types'
 import {createVideoEndpointUrl, mimeToExt} from '#/state/queries/video/util'
-import {useSession} from '#/state/session'
-import {useServiceAuthToken, useVideoUploadLimits} from './video-upload.shared'
+import {useAgent, useSession} from '#/state/session'
+import {getServiceAuthAudFromUrl} from 'lib/strings/url-helpers'
 
 export const useUploadVideoMutation = ({
   onSuccess,
@@ -24,30 +24,38 @@ export const useUploadVideoMutation = ({
   signal: AbortSignal
 }) => {
   const {currentAccount} = useSession()
-  const getToken = useServiceAuthToken({
-    lxm: 'com.atproto.repo.uploadBlob',
-    exp: Date.now() / 1000 + 60 * 30, // 30 minutes
-  })
-  const checkLimits = useVideoUploadLimits()
+  const agent = useAgent()
   const {_} = useLingui()
 
   return useMutation({
     mutationKey: ['video', 'upload'],
     mutationFn: cancelable(async (video: CompressedVideo) => {
-      await checkLimits()
-
       const uri = createVideoEndpointUrl('/xrpc/app.bsky.video.uploadVideo', {
         did: currentAccount!.did,
         name: `${nanoid(12)}.${mimeToExt(video.mimeType)}`,
       })
 
+      const serviceAuthAud = getServiceAuthAudFromUrl(agent.dispatchUrl)
+
+      if (!serviceAuthAud) {
+        throw new Error('Agent does not have a PDS URL')
+      }
+
+      const {data: serviceAuth} = await agent.com.atproto.server.getServiceAuth(
+        {
+          aud: serviceAuthAud,
+          lxm: 'com.atproto.repo.uploadBlob',
+          exp: Date.now() / 1000 + 60 * 30, // 30 minutes
+        },
+      )
+
       const uploadTask = createUploadTask(
         uri,
         video.uri,
         {
           headers: {
             'content-type': video.mimeType,
-            Authorization: `Bearer ${await getToken()}`,
+            Authorization: `Bearer ${serviceAuth.token}`,
           },
           httpMethod: 'POST',
           uploadType: FileSystemUploadType.BINARY_CONTENT,

src/state/queries/video/video-upload.web.ts

@@ -8,8 +8,8 @@ import {cancelable} from '#/lib/async/cancelable'
 import {ServerError} from '#/lib/media/video/errors'
 import {CompressedVideo} from '#/lib/media/video/types'
 import {createVideoEndpointUrl, mimeToExt} from '#/state/queries/video/util'
-import {useSession} from '#/state/session'
-import {useServiceAuthToken, useVideoUploadLimits} from './video-upload.shared'
+import {useAgent, useSession} from '#/state/session'
+import {getServiceAuthAudFromUrl} from 'lib/strings/url-helpers'
 
 export const useUploadVideoMutation = ({
   onSuccess,
@@ -23,30 +23,37 @@ export const useUploadVideoMutation = ({
   signal: AbortSignal
 }) => {
   const {currentAccount} = useSession()
-  const getToken = useServiceAuthToken({
-    lxm: 'com.atproto.repo.uploadBlob',
-    exp: Date.now() / 1000 + 60 * 30, // 30 minutes
-  })
-  const checkLimits = useVideoUploadLimits()
+  const agent = useAgent()
   const {_} = useLingui()
 
   return useMutation({
     mutationKey: ['video', 'upload'],
     mutationFn: cancelable(async (video: CompressedVideo) => {
-      await checkLimits()
-
       const uri = createVideoEndpointUrl('/xrpc/app.bsky.video.uploadVideo', {
         did: currentAccount!.did,
         name: `${nanoid(12)}.${mimeToExt(video.mimeType)}`,
       })
 
+      const serviceAuthAud = getServiceAuthAudFromUrl(agent.dispatchUrl)
+
+      if (!serviceAuthAud) {
+        throw new Error('Agent does not have a PDS URL')
+      }
+
+      const {data: serviceAuth} = await agent.com.atproto.server.getServiceAuth(
+        {
+          aud: serviceAuthAud,
+          lxm: 'com.atproto.repo.uploadBlob',
+          exp: Date.now() / 1000 + 60 * 30, // 30 minutes
+        },
+      )
+
       let bytes = video.bytes
+
       if (!bytes) {
         bytes = await fetch(video.uri).then(res => res.arrayBuffer())
       }
 
-      const token = await getToken()
-
       const xhr = new XMLHttpRequest()
       const res = await new Promise<AppBskyVideoDefs.JobStatus>(
         (resolve, reject) => {
@@ -69,7 +76,7 @@ export const useUploadVideoMutation = ({
           }
           xhr.open('POST', uri)
           xhr.setRequestHeader('Content-Type', video.mimeType)
-          xhr.setRequestHeader('Authorization', `Bearer ${token}`)
+          xhr.setRequestHeader('Authorization', `Bearer ${serviceAuth.token}`)
           xhr.send(bytes)
         },
       )

src/state/queries/video/video.ts

@@ -9,11 +9,7 @@ import {AbortError} from '#/lib/async/cancelable'
 import {SUPPORTED_MIME_TYPES, SupportedMimeTypes} from '#/lib/constants'
 import {logger} from '#/logger'
 import {isWeb} from '#/platform/detection'
-import {
-  ServerError,
-  UploadLimitError,
-  VideoTooLargeError,
-} from 'lib/media/video/errors'
+import {ServerError, VideoTooLargeError} from 'lib/media/video/errors'
 import {CompressedVideo} from 'lib/media/video/types'
 import {useCompressVideoMutation} from 'state/queries/video/compress-video'
 import {useVideoAgent} from 'state/queries/video/util'
@@ -153,45 +149,10 @@ export function useUploadVideo({
     onError: e => {
       if (e instanceof AbortError) {
         return
-      } else if (e instanceof ServerError || e instanceof UploadLimitError) {
-        let message
-        // https://github.com/bluesky-social/tango/blob/lumi/lumi/worker/permissions.go#L77
-        switch (e.message) {
-          case 'User is not allowed to upload videos':
-            message = _(msg`You are not allowed to upload videos.`)
-            break
-          case 'Uploading is disabled at the moment':
-            message = _(
-              msg`Hold up! We’re gradually giving access to video, and you’re still waiting in line. Check back soon!`,
-            )
-            break
-          case "Failed to get user's upload stats":
-            message = _(
-              msg`We were unable to determine if you are allowed to upload videos. Please try again.`,
-            )
-            break
-          case 'User has exceeded daily upload bytes limit':
-            message = _(
-              msg`You've reached your daily limit for video uploads (too many bytes)`,
-            )
-            break
-          case 'User has exceeded daily upload videos limit':
-            message = _(
-              msg`You've reached your daily limit for video uploads (too many videos)`,
-            )
-            break
-          case 'Account is not old enough to upload videos':
-            message = _(
-              msg`Your account is not yet old enough to upload videos. Please try again later.`,
-            )
-            break
-          default:
-            message = e.message
-            break
-        }
+      } else if (e instanceof ServerError) {
         dispatch({
           type: 'SetError',
-          error: message,
+          error: e.message,
         })
       } else {
         dispatch({
@@ -224,7 +185,7 @@ export function useUploadVideo({
       } else if (e instanceof VideoTooLargeError) {
         dispatch({
           type: 'SetError',
-          error: _(msg`The selected video is larger than 50MB.`),
+          error: _(msg`The selected video is larger than 100MB.`),
         })
       } else {
         dispatch({

src/state/shell/composer.tsx

@@ -34,7 +34,7 @@ export interface ComposerOpts {
   quote?: ComposerOptsQuote
   quoteCount?: number
   mention?: string // handle of user to mention
-  openEmojiPicker?: (pos: DOMRect | undefined) => void
+  openPicker?: (pos: DOMRect | undefined) => void
   text?: string
   imageUris?: {uri: string; width: number; height: number}[]
 }

src/storage/schema.ts

@@ -1,6 +1,4 @@
 /**
  * Device data that's specific to the device and does not vary based account
  */
-export type Device = {
-  lastNuxDialog: string | undefined
-}
+export type Device = {}

src/view/com/composer/Composer.tsx

@@ -59,7 +59,7 @@ import {useIsKeyboardVisible} from '#/lib/hooks/useIsKeyboardVisible'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {LikelyType} from '#/lib/link-meta/link-meta'
-import {logEvent} from '#/lib/statsig/statsig'
+import {logEvent, useGate} from '#/lib/statsig/statsig'
 import {cleanError} from '#/lib/strings/errors'
 import {insertMentionAt} from '#/lib/strings/mention-manip'
 import {shortenLinks} from '#/lib/strings/rich-text-manip'
@@ -133,13 +133,14 @@ export const ComposePost = observer(function ComposePost({
   quote: initQuote,
   quoteCount,
   mention: initMention,
-  openEmojiPicker,
+  openPicker,
   text: initText,
   imageUris: initImageUris,
   cancelRef,
 }: Props & {
   cancelRef?: React.RefObject<CancelRef>
 }) {
+  const gate = useGate()
   const {currentAccount} = useSession()
   const agent = useAgent()
   const {data: currentProfile} = useProfileQuery({did: currentAccount!.did})
@@ -199,7 +200,6 @@ export const ComposePost = observer(function ComposePost({
       }
     },
   })
-  const hasVideo = Boolean(videoUploadState.asset || videoUploadState.video)
 
   const [publishOnUpload, setPublishOnUpload] = useState(false)
 
@@ -302,13 +302,9 @@ export const ComposePost = observer(function ComposePost({
   const onPhotoPasted = useCallback(
     async (uri: string) => {
       track('Composer:PastedPhotos')
-      if (uri.startsWith('data:video/')) {
-        selectVideo({uri, type: 'video', height: 0, width: 0})
-      } else {
-        await gallery.paste(uri)
-      }
+      await gallery.paste(uri)
     },
-    [gallery, track, selectVideo],
+    [gallery, track],
   )
 
   const isAltTextRequiredAndMissing = useMemo(() => {
@@ -524,8 +520,8 @@ export const ComposePost = observer(function ComposePost({
     gallery.size > 0 || Boolean(extLink) || Boolean(videoUploadState.video)
 
   const onEmojiButtonPress = useCallback(() => {
-    openEmojiPicker?.(textInput.current?.getCursorPosition())
-  }, [openEmojiPicker])
+    openPicker?.(textInput.current?.getCursorPosition())
+  }, [openPicker])
 
   const focusTextInput = useCallback(() => {
     textInput.current?.focus()
@@ -734,37 +730,8 @@ export const ComposePost = observer(function ComposePost({
               />
             </View>
           )}
-          <LayoutAnimationConfig skipExiting>
-            {hasVideo && (
-              <Animated.View
-                style={[a.w_full, a.mt_lg]}
-                entering={native(ZoomIn)}
-                exiting={native(ZoomOut)}>
-                {videoUploadState.asset &&
-                  (videoUploadState.status === 'compressing' ? (
-                    <VideoTranscodeProgress
-                      asset={videoUploadState.asset}
-                      progress={videoUploadState.progress}
-                      clear={clearVideo}
-                    />
-                  ) : videoUploadState.video ? (
-                    <VideoPreview
-                      asset={videoUploadState.asset}
-                      video={videoUploadState.video}
-                      setDimensions={updateVideoDimensions}
-                      clear={clearVideo}
-                    />
-                  ) : null)}
-                <SubtitleDialogBtn
-                  defaultAltText={videoAltText}
-                  saveAltText={setVideoAltText}
-                  captions={captions}
-                  setCaptions={setCaptions}
-                />
-              </Animated.View>
-            )}
-          </LayoutAnimationConfig>
-          <View style={!hasVideo ? [a.mt_md] : []}>
+
+          <View style={[a.mt_md]}>
             {quote ? (
               <View style={[s.mt5, s.mb2, isWeb && s.mb10]}>
                 <View style={{pointerEvents: 'none'}}>
@@ -775,6 +742,36 @@ export const ComposePost = observer(function ComposePost({
                 )}
               </View>
             ) : null}
+            <LayoutAnimationConfig skipExiting>
+              {(videoUploadState.asset || videoUploadState.video) && (
+                <Animated.View
+                  style={[a.w_full, a.mt_xs]}
+                  entering={native(ZoomIn)}
+                  exiting={native(ZoomOut)}>
+                  {videoUploadState.asset &&
+                    (videoUploadState.status === 'compressing' ? (
+                      <VideoTranscodeProgress
+                        asset={videoUploadState.asset}
+                        progress={videoUploadState.progress}
+                        clear={clearVideo}
+                      />
+                    ) : videoUploadState.video ? (
+                      <VideoPreview
+                        asset={videoUploadState.asset}
+                        video={videoUploadState.video}
+                        setDimensions={updateVideoDimensions}
+                        clear={clearVideo}
+                      />
+                    ) : null)}
+                  <SubtitleDialogBtn
+                    defaultAltText={videoAltText}
+                    saveAltText={setVideoAltText}
+                    captions={captions}
+                    setCaptions={setCaptions}
+                  />
+                </Animated.View>
+              )}
+            </LayoutAnimationConfig>
           </View>
         </Animated.ScrollView>
         <SuggestedLanguage text={richtext.text} />
@@ -802,11 +799,13 @@ export const ComposePost = observer(function ComposePost({
           ) : (
             <ToolbarWrapper style={[a.flex_row, a.align_center, a.gap_xs]}>
               <SelectPhotoBtn gallery={gallery} disabled={!canSelectImages} />
-              <SelectVideoBtn
-                onSelectVideo={selectVideo}
-                disabled={!canSelectImages}
-                setError={setError}
-              />
+              {gate('video_upload') && (
+                <SelectVideoBtn
+                  onSelectVideo={selectVideo}
+                  disabled={!canSelectImages}
+                  setError={setError}
+                />
+              )}
               <OpenCameraBtn gallery={gallery} disabled={!canSelectImages} />
               <SelectGifBtn
                 onClose={focusTextInput}
@@ -1155,12 +1154,10 @@ function VideoUploadToolbar({state}: {state: VideoUploadState}) {
   const progress = state.jobStatus?.progress
     ? state.jobStatus.progress / 100
     : state.progress
-  const shouldRotate =
-    state.status === 'processing' && (progress === 0 || progress === 1)
-  let wheelProgress = shouldRotate ? 0.33 : progress
+  let wheelProgress = progress === 0 || progress === 1 ? 0.33 : progress
 
   const rotate = useDerivedValue(() => {
-    if (shouldRotate) {
+    if (progress === 0 || progress >= 0.99) {
       return withRepeat(
         withTiming(360, {
           duration: 2500,

src/view/com/composer/text-input/TextInput.web.tsx

@@ -12,12 +12,12 @@ import {Placeholder} from '@tiptap/extension-placeholder'
 import {Text as TiptapText} from '@tiptap/extension-text'
 import {generateJSON} from '@tiptap/html'
 import {EditorContent, JSONContent, useEditor} from '@tiptap/react'
+import EventEmitter from 'eventemitter3'
 
 import {usePalette} from '#/lib/hooks/usePalette'
 import {useActorAutocompleteFn} from '#/state/queries/actor-autocomplete'
 import {useColorSchemeStyle} from 'lib/hooks/useColorSchemeStyle'
 import {blobToDataUri, isUriImage} from 'lib/media/util'
-import {textInputWebEmitter} from '#/view/com/composer/text-input/textInputWebEmitter'
 import {
   LinkFacetMatch,
   suggestLinkCardUri,
@@ -46,6 +46,8 @@ interface TextInputProps {
   onError: (err: string) => void
 }
 
+export const textInputWebEmitter = new EventEmitter()
+
 export const TextInput = React.forwardRef(function TextInputImpl(
   {
     richtext,
@@ -93,9 +95,9 @@ export const TextInput = React.forwardRef(function TextInputImpl(
     }
   }, [onPressPublish])
   React.useEffect(() => {
-    textInputWebEmitter.addListener('media-pasted', onPhotoPasted)
+    textInputWebEmitter.addListener('photo-pasted', onPhotoPasted)
     return () => {
-      textInputWebEmitter.removeListener('media-pasted', onPhotoPasted)
+      textInputWebEmitter.removeListener('photo-pasted', onPhotoPasted)
     }
   }, [onPhotoPasted])
 
@@ -105,8 +107,8 @@ export const TextInput = React.forwardRef(function TextInputImpl(
       if (transfer) {
         const items = transfer.items
 
-        getImageOrVideoFromUri(items, (uri: string) => {
-          textInputWebEmitter.emit('media-pasted', uri)
+        getImageFromUri(items, (uri: string) => {
+          textInputWebEmitter.emit('photo-pasted', uri)
         })
       }
 
@@ -160,8 +162,8 @@ export const TextInput = React.forwardRef(function TextInputImpl(
               view.pasteText(text)
               preventDefault = true
             }
-            getImageOrVideoFromUri(clipboardData.items, (uri: string) => {
-              textInputWebEmitter.emit('media-pasted', uri)
+            getImageFromUri(clipboardData.items, (uri: string) => {
+              textInputWebEmitter.emit('photo-pasted', uri)
             })
             if (preventDefault) {
               // Return `true` to prevent ProseMirror's default paste behavior.
@@ -346,7 +348,7 @@ const styles = StyleSheet.create({
   },
 })
 
-function getImageOrVideoFromUri(
+function getImageFromUri(
   items: DataTransferItemList,
   callback: (uri: string) => void,
 ) {
@@ -363,21 +365,11 @@ function getImageOrVideoFromUri(
           if (blob.type.startsWith('image/')) {
             blobToDataUri(blob).then(callback, err => console.error(err))
           }
-
-          if (blob.type.startsWith('video/')) {
-            blobToDataUri(blob).then(callback, err => console.error(err))
-          }
         }
       })
     } else if (type.startsWith('image/')) {
       const file = item.getAsFile()
 
-      if (file) {
-        blobToDataUri(file).then(callback, err => console.error(err))
-      }
-    } else if (type.startsWith('video/')) {
-      const file = item.getAsFile()
-
       if (file) {
         blobToDataUri(file).then(callback, err => console.error(err))
       }

src/view/com/composer/text-input/textInputWebEmitter.ts

@@ -1,3 +0,0 @@
-import EventEmitter from 'eventemitter3'
-
-export const textInputWebEmitter = new EventEmitter()

src/view/com/composer/text-input/web/EmojiPicker.web.tsx

@@ -7,8 +7,8 @@ import {
 } from 'react-native'
 import Picker from '@emoji-mart/react'
 
-import {textInputWebEmitter} from '#/view/com/composer/text-input/textInputWebEmitter'
 import {atoms as a} from '#/alf'
+import {textInputWebEmitter} from '../TextInput.web'
 
 const HEIGHT_OFFSET = 40
 const WIDTH_OFFSET = 100
@@ -26,41 +26,22 @@ export type Emoji = {
   unified: string
 }
 
-export interface EmojiPickerPosition {
-  top: number
-  left: number
-  right: number
-  bottom: number
-}
-
 export interface EmojiPickerState {
   isOpen: boolean
-  pos: EmojiPickerPosition
+  pos: {top: number; left: number; right: number; bottom: number}
 }
 
 interface IProps {
   state: EmojiPickerState
   close: () => void
-  /**
-   * If `true`, overrides position and ensures picker is pinned to the top of
-   * the target element.
-   */
-  pinToTop?: boolean
 }
 
-export function EmojiPicker({state, close, pinToTop}: IProps) {
+export function EmojiPicker({state, close}: IProps) {
   const {height, width} = useWindowDimensions()
 
   const isShiftDown = React.useRef(false)
 
   const position = React.useMemo(() => {
-    if (pinToTop) {
-      return {
-        top: state.pos.top - PICKER_HEIGHT + HEIGHT_OFFSET - 10,
-        left: state.pos.left,
-      }
-    }
-
     const fitsBelow = state.pos.top + PICKER_HEIGHT < height
     const fitsAbove = PICKER_HEIGHT < state.pos.top
     const placeOnLeft = PICKER_WIDTH < state.pos.left
@@ -83,7 +64,7 @@ export function EmojiPicker({state, close, pinToTop}: IProps) {
           : undefined,
       }
     }
-  }, [state.pos, height, width, pinToTop])
+  }, [state.pos, height, width])
 
   React.useEffect(() => {
     if (!state.isOpen) return

src/view/com/composer/videos/SelectVideoBtn.tsx

@@ -18,7 +18,7 @@ import {Button} from '#/components/Button'
 import {VideoClip_Stroke2_Corner0_Rounded as VideoClipIcon} from '#/components/icons/VideoClip'
 import * as Prompt from '#/components/Prompt'
 
-const VIDEO_MAX_DURATION = 60 * 1000 // 60s in milliseconds
+const VIDEO_MAX_DURATION = 60
 
 type Props = {
   onSelectVideo: (video: ImagePickerAsset) => void
@@ -45,20 +45,13 @@ export function SelectVideoBtn({onSelectVideo, disabled, setError}: Props) {
       const response = await launchImageLibraryAsync({
         exif: false,
         mediaTypes: MediaTypeOptions.Videos,
+        videoMaxDuration: VIDEO_MAX_DURATION,
         quality: 1,
         legacy: true,
         preferredAssetRepresentationMode:
           UIImagePickerPreferredAssetRepresentationMode.Current,
       })
       if (response.assets && response.assets.length > 0) {
-        if (isNative) {
-          if (typeof response.assets[0].duration !== 'number')
-            throw Error('Asset is not a video')
-          if (response.assets[0].duration > VIDEO_MAX_DURATION) {
-            setError(_(msg`Videos must be less than 60 seconds long`))
-            return
-          }
-        }
         try {
           onSelectVideo(response.assets[0])
         } catch (err) {

src/view/com/composer/videos/SubtitleDialog.tsx

@@ -20,8 +20,6 @@ import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons
 import {Text} from '#/components/Typography'
 import {SubtitleFilePicker} from './SubtitleFilePicker'
 
-const MAX_NUM_CAPTIONS = 1
-
 interface Props {
   defaultAltText: string
   captions: {lang: string; file: File}[]
@@ -136,9 +134,7 @@ function SubtitleDialogInner({
             </Text>
             <SubtitleFilePicker
               onSelectFile={handleSelectFile}
-              disabled={
-                subtitleMissingLanguage || captions.length >= MAX_NUM_CAPTIONS
-              }
+              disabled={subtitleMissingLanguage || captions.length >= 4}
             />
             <View>
               {captions.map((subtitle, i) => (

src/view/com/composer/videos/SubtitleFilePicker.tsx

@@ -3,7 +3,6 @@ import {View} from 'react-native'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {logger} from '#/logger'
 import * as Toast from '#/view/com/util/Toast'
 import {atoms as a} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -26,16 +25,9 @@ export function SubtitleFilePicker({
   const handlePick = (evt: React.ChangeEvent<HTMLInputElement>) => {
     const selectedFile = evt.target.files?.[0]
     if (selectedFile) {
-      if (
-        selectedFile.type === 'text/vtt' ||
-        (selectedFile.type === 'text/plain' &&
-          selectedFile.name.endsWith('.vtt'))
-      ) {
+      if (selectedFile.type === 'text/vtt') {
         onSelectFile(selectedFile)
       } else {
-        logger.error('Invalid subtitle file type', {
-          safeMessage: `File: ${selectedFile.name} (${selectedFile.type})`,
-        })
         Toast.show(_(msg`Only WebVTT (.vtt) files are supported`))
       }
     }