diff --git a/src/view/screens/Search/Explore.tsx b/src/view/screens/Search/Explore.tsx index f6e99883..c7f5f939 100644 --- a/src/view/screens/Search/Explore.tsx +++ b/src/view/screens/Search/Explore.tsx @@ -16,18 +16,17 @@ import {useModerationOpts} from '#/state/preferences/moderation-opts' import {useGetPopularFeedsQuery} from '#/state/queries/feed' import {usePreferencesQuery} from '#/state/queries/preferences' import {useSuggestedFollowsQuery} from '#/state/queries/suggested-follows' -import {useSession} from '#/state/session' import {cleanError} from 'lib/strings/errors' import {ProfileCardWithFollowBtn} from '#/view/com/profile/ProfileCard' import {List} from '#/view/com/util/List' import {UserAvatar} from '#/view/com/util/UserAvatar' -import {FeedSourceCard} from 'view/com/feeds/FeedSourceCard' import { FeedFeedLoadingPlaceholder, ProfileCardFeedLoadingPlaceholder, } from 'view/com/util/LoadingPlaceholder' import {atoms as a, useTheme, ViewStyleProp} from '#/alf' import {Button} from '#/components/Button' +import * as FeedCard from '#/components/FeedCard' import {ArrowBottom_Stroke2_Corner0_Rounded as ArrowBottom} from '#/components/icons/Arrow' import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfo} from '#/components/icons/CircleInfo' import {Props as SVGIconProps} from '#/components/icons/common' @@ -271,7 +270,6 @@ type ExploreScreenItems = export function Explore() { const {_} = useLingui() const t = useTheme() - const {hasSession} = useSession() const {data: preferences, error: preferencesError} = usePreferencesQuery() const moderationOpts = useModerationOpts() const { @@ -480,15 +478,14 @@ export function Explore() { } case 'feed': { return ( - - + + ) } @@ -538,7 +535,7 @@ export function Explore() { } } }, - [t, hasSession, moderationOpts], + [t, moderationOpts], ) return ( diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx index 53bd17e6..0b1fe37a 100644 --- a/src/view/screens/Search/Search.tsx +++ b/src/view/screens/Search/Search.tsx @@ -57,8 +57,8 @@ import {Text} from '#/view/com/util/text/Text' import {CenteredView, ScrollView} from '#/view/com/util/Views' import {Explore} from '#/view/screens/Search/Explore' import {SearchLinkCard, SearchProfileCard} from '#/view/shell/desktop/Search' -import {FeedSourceCard} from 'view/com/feeds/FeedSourceCard' -import {atoms as a} from '#/alf' +import {atoms as a, useTheme as useThemeNew} from '#/alf' +import * as FeedCard from '#/components/FeedCard' import {Menu_Stroke2_Corner0_Rounded as Menu} from '#/components/icons/Menu' function Loader() { @@ -285,8 +285,8 @@ let SearchScreenFeedsResults = ({ query: string active: boolean }): React.ReactNode => { + const t = useThemeNew() const {_} = useLingui() - const {hasSession} = useSession() const {data: results, isFetched} = usePopularFeedsSearch({ query, @@ -299,13 +299,15 @@ let SearchScreenFeedsResults = ({ ( - + + + )} keyExtractor={item => item.uri} // @ts-ignore web only -prf