Fix undefined block (#4471)
* Fix undefined block (#4378) * Fix undefined block * Changing text and handling all blocks. * Tweaks * Hide follow button in hover card if user blocked --------- Co-authored-by: Josh <hi@oracularhades.com>zio/stable
parent
212f5750e3
commit
7cac413f3b
|
@ -370,7 +370,10 @@ function Inner({
|
|||
profile: profileShadow,
|
||||
logContext: 'ProfileHoverCard',
|
||||
})
|
||||
const blockHide = profile.viewer?.blocking || profile.viewer?.blockedBy
|
||||
const isProfileBlocked =
|
||||
profile.viewer?.blocking ||
|
||||
profile.viewer?.blockedBy ||
|
||||
profile.viewer?.blockingByList
|
||||
const following = formatCount(profile.followsCount || 0)
|
||||
const followers = formatCount(profile.followersCount || 0)
|
||||
const pluralizedFollowers = plural(profile.followersCount || 0, {
|
||||
|
@ -401,7 +404,7 @@ function Inner({
|
|||
/>
|
||||
</Link>
|
||||
|
||||
{!isMe && (
|
||||
{!isMe && !isProfileBlocked && (
|
||||
<Button
|
||||
size="small"
|
||||
color={profileShadow.viewer?.following ? 'secondary' : 'primary'}
|
||||
|
@ -439,7 +442,7 @@ function Inner({
|
|||
</View>
|
||||
</Link>
|
||||
|
||||
{!blockHide && (
|
||||
{!isProfileBlocked && (
|
||||
<>
|
||||
<View style={[a.flex_row, a.flex_wrap, a.gap_md, a.pt_xs]}>
|
||||
<InlineLinkText
|
||||
|
|
|
@ -196,6 +196,12 @@ let FeedItemInner = ({
|
|||
},
|
||||
]
|
||||
|
||||
const isParentBlocked = Boolean(
|
||||
parentAuthor?.viewer?.blockedBy ||
|
||||
parentAuthor?.viewer?.blocking ||
|
||||
parentAuthor?.viewer?.blockingByList,
|
||||
)
|
||||
|
||||
return (
|
||||
<Link
|
||||
testID={`feedItem-by-${post.author.handle}`}
|
||||
|
@ -320,7 +326,16 @@ let FeedItemInner = ({
|
|||
onOpenAuthor={onOpenAuthor}
|
||||
/>
|
||||
{!isThreadChild && showReplyTo && parentAuthor && (
|
||||
<ReplyToLabel profile={parentAuthor} />
|
||||
<ReplyToLabel
|
||||
profile={
|
||||
isParentBlocked
|
||||
? {
|
||||
...parentAuthor,
|
||||
displayName: _(msg`a blocked user`),
|
||||
}
|
||||
: parentAuthor
|
||||
}
|
||||
/>
|
||||
)}
|
||||
<LabelsOnMyPost post={post} />
|
||||
<PostContent
|
||||
|
|
Loading…
Reference in New Issue