fix ios patch refact
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
--- a/src/view/com/posts/FollowingEmptyState.tsx
|
||||
+++ b/src/view/com/posts/FollowingEmptyState.tsx
|
||||
@@ -1,38 +1,15 @@
|
||||
import React from 'react'
|
||||
import {useCallback} from 'react'
|
||||
import {StyleSheet, View} from 'react-native'
|
||||
-import {
|
||||
- FontAwesomeIcon,
|
||||
@@ -64,7 +64,7 @@
|
||||
- const palInverted = usePalette('inverted')
|
||||
- const navigation = useNavigation<NavigationProp>()
|
||||
|
||||
- const onPressFindAccounts = React.useCallback(() => {
|
||||
- const onPressFindAccounts = useCallback(() => {
|
||||
- if (IS_WEB) {
|
||||
- navigation.navigate('Search', {})
|
||||
- } else {
|
||||
@@ -73,7 +73,7 @@
|
||||
- }
|
||||
- }, [navigation])
|
||||
-
|
||||
- const onPressDiscoverFeeds = React.useCallback(() => {
|
||||
- const onPressDiscoverFeeds = useCallback(() => {
|
||||
- navigation.navigate('Feeds')
|
||||
- }, [navigation])
|
||||
-
|
||||
@@ -134,7 +134,7 @@
|
||||
--- a/src/view/com/posts/FollowingEndOfFeed.tsx
|
||||
+++ b/src/view/com/posts/FollowingEndOfFeed.tsx
|
||||
@@ -1,37 +1,14 @@
|
||||
import React from 'react'
|
||||
import {useCallback} from 'react'
|
||||
import {Dimensions, StyleSheet, View} from 'react-native'
|
||||
-import {
|
||||
- FontAwesomeIcon,
|
||||
@@ -155,7 +155,7 @@
|
||||
- const palInverted = usePalette('inverted')
|
||||
- const navigation = useNavigation<NavigationProp>()
|
||||
|
||||
- const onPressFindAccounts = React.useCallback(() => {
|
||||
- const onPressFindAccounts = useCallback(() => {
|
||||
- if (IS_WEB) {
|
||||
- navigation.navigate('Search', {})
|
||||
- } else {
|
||||
@@ -164,7 +164,7 @@
|
||||
- }
|
||||
- }, [navigation])
|
||||
-
|
||||
- const onPressDiscoverFeeds = React.useCallback(() => {
|
||||
- const onPressDiscoverFeeds = useCallback(() => {
|
||||
- navigation.navigate('Feeds')
|
||||
- }, [navigation])
|
||||
-
|
||||
@@ -230,7 +230,55 @@
|
||||
})
|
||||
--- a/src/view/com/posts/PostFeed.tsx
|
||||
+++ b/src/view/com/posts/PostFeed.tsx
|
||||
@@ -765,7 +765,7 @@
|
||||
@@ -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 <FeedShutdownMsg feedUri={feedUriOrActorDid} />
|
||||
} else if (row.type === 'interstitialFollows') {
|
||||
|
||||
Reference in New Issue
Block a user