diff --git a/src/components/FeedCard.tsx b/src/components/FeedCard.tsx index 88e323a176..e0104a9e00 100644 --- a/src/components/FeedCard.tsx +++ b/src/components/FeedCard.tsx @@ -80,11 +80,11 @@ export function Link({ } export function Outer({children}: {children: React.ReactNode}) { - return {children} + return {children} } export function Header({children}: {children: React.ReactNode}) { - return {children} + return {children} } export type AvatarProps = {src: string | undefined; size?: number} diff --git a/src/components/ProfileCard.tsx b/src/components/ProfileCard.tsx index 9bf015b8a1..336c92b632 100644 --- a/src/components/ProfileCard.tsx +++ b/src/components/ProfileCard.tsx @@ -138,7 +138,7 @@ export function Avatar({ return ( diff --git a/src/screens/Search/Explore.tsx b/src/screens/Search/Explore.tsx index 43cccd1d37..820a3353d4 100644 --- a/src/screens/Search/Explore.tsx +++ b/src/screens/Search/Explore.tsx @@ -44,42 +44,40 @@ function LoadMore({item}: {item: ExploreScreenItems & {type: 'loadMore'}}) { const {_} = useLingui() return ( - - - + {item.message} + + {item.isLoadingMore ? ( + + ) : ( + + )} + + )} + ) } @@ -262,13 +260,6 @@ export function Explore({ const items = useMemo(() => { const i: ExploreScreenItems[] = [] - const addTopBorder = () => { - i.push({ - type: 'topBorder', - key: `top-border`, - }) - } - const addTrendingTopicsModule = () => { i.push({ type: 'trendingTopics', @@ -440,8 +431,6 @@ export function Explore({ // Dynamic module ordering - addTopBorder() - if (guide?.guide === 'follow-10' && !guide.isComplete) { addSuggestedFollowsModule() addTrendingTopicsModule() @@ -500,14 +489,8 @@ export function Explore({ } case 'tabbedHeader': { return ( - - + + {item.title} {item.searchButton && ( @@ -549,7 +532,7 @@ export function Explore({ return ( + return ( + + + + ) } case 'profilePlaceholder': { return @@ -611,9 +598,7 @@ export function Explore({ () => items.reduce( (acc, curr) => - ['topBorder', 'header', 'tabbedHeader'].includes(curr.type) - ? acc.concat(items.indexOf(curr)) - : acc, + [''].includes(curr.type) ? acc.concat(items.indexOf(curr)) : acc, [] as number[], ), [items], diff --git a/src/screens/Search/components/ModuleHeader.tsx b/src/screens/Search/components/ModuleHeader.tsx index 788e77ade6..d4e8b3017b 100644 --- a/src/screens/Search/components/ModuleHeader.tsx +++ b/src/screens/Search/components/ModuleHeader.tsx @@ -23,15 +23,13 @@ export function Container({ return ( {children} @@ -80,7 +78,12 @@ export function SearchButton({ {statsig: true}, ) onPress?.() - }}> + }} + style={[ + { + right: -4, + }, + ]}> ) diff --git a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx index c2d7944bba..6c772001c8 100644 --- a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx +++ b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx @@ -12,7 +12,7 @@ import { popularInterests, useInterestsDisplayNames, } from '#/screens/Onboarding/state' -import {useTheme} from '#/alf' +import {useGutters,useTheme} from '#/alf' import {atoms as a} from '#/alf' import {Button} from '#/components/Button' import * as ProfileCard from '#/components/ProfileCard' @@ -161,6 +161,7 @@ let SuggestedProfileCard = ({ position: number }): React.ReactNode => { const t = useTheme() + const gutters = useGutters([0, 'base']) return ( @@ -214,7 +215,7 @@ let SuggestedProfileCard = ({ }} /> - +