diff --git a/src/view/com/notifications/FeedItem.tsx b/src/view/com/notifications/FeedItem.tsx index c3ad51a8df..73938a76e2 100644 --- a/src/view/com/notifications/FeedItem.tsx +++ b/src/view/com/notifications/FeedItem.tsx @@ -22,6 +22,7 @@ import {msg, Plural, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useQueryClient} from '@tanstack/react-query' +import {useGate} from '#/lib/statsig/statsig' import {FeedNotification} from '#/state/queries/notifications/feed' import {useAnimatedValue} from 'lib/hooks/useAnimatedValue' import {usePalette} from 'lib/hooks/usePalette' @@ -86,6 +87,7 @@ let FeedItem = ({ const pal = usePalette('default') const {_} = useLingui() const t = useTheme() + const gate = useGate() const [isAuthorsExpanded, setAuthorsExpanded] = useState(false) const itemHref = useMemo(() => { if (item.type === 'post-like' || item.type === 'repost') { @@ -168,6 +170,7 @@ let FeedItem = ({ ) } + let isFollowBack = false let formattedCount = authors.length > 1 ? formatCount(authors.length - 1) : '' let author = ( @@ -229,22 +232,45 @@ let FeedItem = ({ ) icon = } else if (item.type === 'follow') { - action = - authors.length > 1 ? ( - - {author} and{' '} - - - {' '} - followed you - - ) : ( - {author} followed you - ) + if ( + item.notification.author.viewer?.following && + gate('ungroup_follow_backs') + ) { + isFollowBack = true + action = + authors.length > 1 ? ( + + {author} and{' '} + + + {' '} + followed you back + + ) : ( + {author} followed you back + ) + } else { + action = + authors.length > 1 ? ( + + {author} and{' '} + + + {' '} + followed you + + ) : ( + {author} followed you + ) + } icon = } else if (item.type === 'feedgen-like') { action = @@ -349,7 +375,7 @@ let FeedItem = ({ visible={!isAuthorsExpanded} authors={authors} onToggleAuthorsExpanded={onToggleAuthorsExpanded} - showDmButton={item.type === 'starterpack-joined'} + showDmButton={item.type === 'starterpack-joined' || isFollowBack} />