Update onboarding user suggestions with new endpoint (#9872)

src/screens/Onboarding/StepSuggestedAccounts/index.tsx

@@ -20,7 +20,7 @@ import {
   OnboardingTitleText,
 } from '#/screens/Onboarding/Layout'
 import {useOnboardingInternalState} from '#/screens/Onboarding/state'
-import {useSuggestedUsers} from '#/screens/Search/util/useSuggestedUsers'
+import {useSuggestedOnboardingUsers} from '#/screens/Search/util/useSuggestedOnboardingUsers'
 import {atoms as a, tokens, useBreakpoints, useTheme, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -64,13 +64,14 @@ export function StepSuggestedAccounts() {
   const interests = Object.keys(interestsDisplayNames)
     .sort(boostInterests(popularInterests))
     .sort(boostInterests(state.interestsStepResults.selectedInterests))
+
   const {
     data: suggestedUsers,
     isLoading,
     error,
     isRefetching,
     refetch,
-  } = useSuggestedUsers({
+  } = useSuggestedOnboardingUsers({
     category: selectedInterest || (useFullExperience ? null : interests[0]),
     search: !useFullExperience,
     overrideInterests: state.interestsStepResults.selectedInterests,

src/screens/Search/util/useSuggestedOnboardingUsers.ts

@@ -0,0 +1,66 @@
+import {useMemo} from 'react'
+
+import {useInterestsDisplayNames} from '#/lib/interests'
+import {useActorSearch} from '#/state/queries/actor-search'
+import {useGetSuggestedOnboardingUsersQuery} from '#/state/queries/trending/useGetSuggestedOnboardingUsersQuery'
+
+/**
+ * Conditional hook, used in case a user is a non-english speaker, in which
+ * case we fall back to searching for users instead of our more curated set.
+ */
+export function useSuggestedOnboardingUsers({
+  category = null,
+  search = false,
+  overrideInterests,
+}: {
+  category?: string | null
+  /**
+   * If true, we'll search for users using the translated value of `category`,
+   * based on the user's app language setting
+   */
+  search?: boolean
+  /**
+   * In onboarding, interests haven't been saved to prefs yet, so we need to
+   * pass them down through here
+   */
+  overrideInterests: string[]
+}) {
+  const interestsDisplayNames = useInterestsDisplayNames()
+  const curated = useGetSuggestedOnboardingUsersQuery({
+    enabled: !search,
+    category,
+    overrideInterests,
+  })
+  const searched = useActorSearch({
+    enabled: !!search,
+    // use user's app language translation for this value
+    query: category ? interestsDisplayNames[category] : '',
+    limit: 10,
+  })
+
+  return useMemo(() => {
+    if (search) {
+      return {
+        // we're not paginating right now
+        data: searched?.data
+          ? {
+              actors: searched.data.pages.flatMap(p => p.actors) ?? [],
+              recId: undefined,
+            }
+          : undefined,
+        isLoading: searched.isLoading,
+        error: searched.error,
+        isRefetching: searched.isRefetching,
+        refetch: searched.refetch,
+      }
+    } else {
+      return {
+        data: curated.data,
+        isLoading: curated.isLoading,
+        error: curated.error,
+        isRefetching: curated.isRefetching,
+        refetch: curated.refetch,
+      }
+    }
+  }, [curated, searched, search])
+}

src/screens/Search/util/useSuggestedUsers.ts

@@ -11,25 +11,18 @@ import {useGetSuggestedUsersQuery} from '#/state/queries/trending/useGetSuggeste
 export function useSuggestedUsers({
   category = null,
   search = false,
-  overrideInterests,
 }: {
   category?: string | null
   /**
    * If true, we'll search for users using the translated value of `category`,
-   * based on the user's "app language setting
+   * based on the user's app language setting
    */
   search?: boolean
-  /**
-   * In onboarding, interests haven't been saved to prefs yet, so we need to
-   * pass them down through here
-   */
-  overrideInterests?: string[]
 }) {
   const interestsDisplayNames = useInterestsDisplayNames()
   const curated = useGetSuggestedUsersQuery({
     enabled: !search,
     category,
-    overrideInterests,
   })
   const searched = useActorSearch({
     enabled: !!search,