diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx index d4a319283b..4c434fea21 100644 --- a/src/view/screens/Search/Search.tsx +++ b/src/view/screens/Search/Search.tsx @@ -57,6 +57,7 @@ import {ProfileCardWithFollowBtn} from '#/view/com/profile/ProfileCard' import {Link} from '#/view/com/util/Link' import {List} from '#/view/com/util/List' import {Text} from '#/view/com/util/text/Text' +import {UserAvatar} from '#/view/com/util/UserAvatar' import {CenteredView, ScrollView} from '#/view/com/util/Views' import {KNOWN_AUTHED_ONLY_FEEDS} from '#/view/screens/Feeds' import {SearchLinkCard, SearchProfileCard} from '#/view/shell/desktop/Search' @@ -66,12 +67,11 @@ import { ProfileCardFeedLoadingPlaceholder, } from 'view/com/util/LoadingPlaceholder' import {atoms as a, useTheme as useThemeNew} from '#/alf' -import {Button, ButtonIcon, ButtonText} from '#/components/Button' +import {Button} from '#/components/Button' import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo' import {Menu_Stroke2_Corner0_Rounded as Menu} from '#/components/icons/Menu' -import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus' import {Loader as LoaderIcon} from '#/components/Loader' -import {Text as TextNew} from '#/components/Typography' +import {Text as TextNewText} from '#/components/Typography' function Loader() { const pal = usePalette('default') @@ -193,6 +193,7 @@ type ExploreScreenItems = key: string isLoadingMore: boolean onLoadMore: () => void + items: ExploreScreenItems[] } | { type: 'profilePlaceholder' @@ -214,6 +215,7 @@ function ExploreScreen() { const t = useThemeNew() const {hasSession} = useSession() const {data: preferences, error: preferencesError} = usePreferencesQuery() + const moderationOpts = useModerationOpts() const { data: profiles, hasNextPage: hasNextProfilesPage, @@ -294,6 +296,7 @@ function ExploreScreen() { key: 'loadMoreProfiles', isLoadingMore: isLoadingMoreProfiles, onLoadMore: onLoadMoreProfiles, + items: i.filter(item => item.type === 'profile').slice(-3), }) } else { if (profilesError) { @@ -368,6 +371,7 @@ function ExploreScreen() { key: 'loadMoreFeeds', isLoadingMore: isLoadingMoreFeeds, onLoadMore: onLoadMoreFeeds, + items: i.filter(item => item.type === 'feed').slice(-3), }) } } else { @@ -433,29 +437,84 @@ function ExploreScreen() { } case 'loadMore': { return ( - + ) @@ -485,17 +544,17 @@ function ExploreScreen() { ]}> - + {item.message} - - + {item.error} - + @@ -503,7 +562,7 @@ function ExploreScreen() { } } }, - [_, t, hasSession], + [_, t, hasSession, moderationOpts], ) return (