--- a/src/view/com/posts/DiscoverFallbackHeader.tsx +++ b/src/view/com/posts/DiscoverFallbackHeader.tsx @@ -7,37 +7,5 @@ import {Text} from '../util/text/Text' export function DiscoverFallbackHeader() { - const pal = usePalette('default') - return ( - - - - - - - - We ran out of posts from your follows. Here's the latest from{' '} - - . - - - - - ) + return null } --- a/src/view/com/posts/FollowingEmptyState.tsx +++ b/src/view/com/posts/FollowingEmptyState.tsx @@ -1,38 +1,15 @@ import {useCallback} from 'react' import {StyleSheet, View} from 'react-native' -import { - FontAwesomeIcon, - type FontAwesomeIconStyle, -} from '@fortawesome/react-native-fontawesome' import {Trans} from '@lingui/react/macro' -import {useNavigation} from '@react-navigation/native' import {usePalette} from '#/lib/hooks/usePalette' import {MagnifyingGlassIcon} from '#/lib/icons' -import {type NavigationProp} from '#/lib/routes/types' import {s} from '#/lib/styles' -import {IS_WEB} from '#/env' -import {Button} from '../util/forms/Button' import {Text} from '../util/text/Text' export function FollowingEmptyState() { const pal = usePalette('default') - const palInverted = usePalette('inverted') - const navigation = useNavigation() - const onPressFindAccounts = useCallback(() => { - if (IS_WEB) { - navigation.navigate('Search', {}) - } else { - navigation.navigate('SearchTab') - navigation.popToTop() - } - }, [navigation]) - - const onPressDiscoverFeeds = useCallback(() => { - navigation.navigate('Feeds') - }, [navigation]) - return ( @@ -45,36 +22,6 @@ happening. - - - - You can also discover new Custom Feeds to follow. - - ) @@ -98,13 +45,4 @@ marginLeft: 'auto', marginRight: 'auto', }, - emptyBtn: { - marginVertical: 20, - flexDirection: 'row', - alignItems: 'center', - justifyContent: 'space-between', - paddingVertical: 18, - paddingHorizontal: 24, - borderRadius: 30, - }, }) --- a/src/view/com/posts/FollowingEndOfFeed.tsx +++ b/src/view/com/posts/FollowingEndOfFeed.tsx @@ -1,37 +1,14 @@ import {useCallback} from 'react' import {Dimensions, StyleSheet, View} from 'react-native' -import { - FontAwesomeIcon, - type FontAwesomeIconStyle, -} from '@fortawesome/react-native-fontawesome' import {Trans} from '@lingui/react/macro' -import {useNavigation} from '@react-navigation/native' import {usePalette} from '#/lib/hooks/usePalette' -import {type NavigationProp} from '#/lib/routes/types' import {s} from '#/lib/styles' -import {IS_WEB} from '#/env' -import {Button} from '../util/forms/Button' import {Text} from '../util/text/Text' export function FollowingEndOfFeed() { const pal = usePalette('default') - const palInverted = usePalette('inverted') - const navigation = useNavigation() - const onPressFindAccounts = useCallback(() => { - if (IS_WEB) { - navigation.navigate('Search', {}) - } else { - navigation.navigate('SearchTab') - navigation.popToTop() - } - }, [navigation]) - - const onPressDiscoverFeeds = useCallback(() => { - navigation.navigate('Feeds') - }, [navigation]) - return ( - - You've reached the end of your feed! Find some more accounts to - follow. - + You've reached the end of your feed! - - - - You can also discover new Custom Feeds to follow. - - ) @@ -93,13 +37,4 @@ width: '100%', maxWidth: 460, }, - emptyBtn: { - marginVertical: 20, - flexDirection: 'row', - alignItems: 'center', - justifyContent: 'space-between', - paddingVertical: 18, - paddingHorizontal: 24, - borderRadius: 30, - }, }) --- a/src/view/com/posts/PostFeed.tsx +++ b/src/view/com/posts/PostFeed.tsx @@ -520,16 +520,17 @@ key: 'liveEventFeedsAndTrendingBanner-' + sliceIndex, }) // Show composer prompt for Discover and Following feeds - if ( - hasSession && - (feedUriOrActorDid === DISCOVER_FEED_URI || - feed === 'following') - ) { - arr.push({ - type: 'composerPrompt', - key: 'composerPrompt-' + sliceIndex, - }) - } + // Disabled: hide composer prompt + // if ( + // hasSession && + // (feedUriOrActorDid === DISCOVER_FEED_URI || + // feed === 'following') + // ) { + // arr.push({ + // type: 'composerPrompt', + // key: 'composerPrompt-' + sliceIndex, + // }) + // } } else if (sliceIndex === 15) { if (areVideoFeedsEnabled && !trendingVideoDisabled) { arr.push({ @@ -546,12 +547,13 @@ } else if (feedKind === 'following') { if (sliceIndex === 0) { // Show composer prompt for Following feed - if (hasSession) { - arr.push({ - type: 'composerPrompt', - key: 'composerPrompt-' + sliceIndex, - }) - } + // Disabled: hide composer prompt + // if (hasSession) { + // arr.push({ + // type: 'composerPrompt', + // key: 'composerPrompt-' + sliceIndex, + // }) + // } } } else if (feedKind === 'profile') { if (sliceIndex === 5) { @@ -771,7 +773,7 @@ } else if (row.type === 'feedShutdownMsg') { return } else if (row.type === 'interstitialFollows') { - return + return null } else if (row.type === 'interstitialProgressGuide') { return } else if (row.type === 'ageAssuranceBanner') {