diff --git a/src/view/com/notifications/FeedItem.tsx b/src/view/com/notifications/FeedItem.tsx index 7b07bb30fb..3e0d9f5c3d 100644 --- a/src/view/com/notifications/FeedItem.tsx +++ b/src/view/com/notifications/FeedItem.tsx @@ -122,7 +122,7 @@ export const FeedItem = observer(function ({ } if (item.isReply || item.isMention || item.isQuote) { - if (item.additionalPost?.error) { + if (!item.additionalPost || item.additionalPost?.error) { // hide errors - it doesnt help the user to show them return } @@ -134,8 +134,7 @@ export const FeedItem = observer(function ({ noFeedback accessible={false}> { + post._hasMore = true + }) } } diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx index 86cb24f9be..94dfe6e8ba 100644 --- a/src/view/com/post/Post.tsx +++ b/src/view/com/post/Post.tsx @@ -1,4 +1,4 @@ -import React, {useEffect, useState, useMemo} from 'react' +import React, {useState, useMemo} from 'react' import { ActivityIndicator, Linking, @@ -32,35 +32,19 @@ import {getTranslatorLink, isPostInLanguage} from '../../../locale/helpers' import {makeProfileLink} from 'lib/routes/links' export const Post = observer(function Post({ - uri, - initView, + view, showReplyLine, hideError, style, }: { - uri: string - initView?: PostThreadModel + view: PostThreadModel showReplyLine?: boolean hideError?: boolean style?: StyleProp }) { const pal = usePalette('default') - const store = useStores() - const [view, setView] = useState(initView) const [deleted, setDeleted] = useState(false) - useEffect(() => { - if (initView || view?.params.uri === uri) { - if (initView !== view) { - setView(initView) - } - return - } - const newView = new PostThreadModel(store, {uri, depth: 0}) - setView(newView) - newView.setup().catch(err => store.log.error('Failed to fetch post', err)) - }, [initView, setView, uri, view, view?.params.uri, store]) - // deleted // = if (deleted) { @@ -69,11 +53,7 @@ export const Post = observer(function Post({ // loading // = - if ( - !view || - (!view.hasContent && view.isLoading) || - view.params.uri !== uri - ) { + if (!view.hasContent && view.isLoading) { return ( diff --git a/src/view/com/search/SearchResults.tsx b/src/view/com/search/SearchResults.tsx index bf623d93e9..9842777052 100644 --- a/src/view/com/search/SearchResults.tsx +++ b/src/view/com/search/SearchResults.tsx @@ -72,12 +72,7 @@ const PostResults = observer(({model}: {model: SearchUIModel}) => { return ( {model.posts.map(post => ( - + ))}