diff --git a/src/components/AvatarBubbles.tsx b/src/components/AvatarBubbles.tsx index e068bc0ec5..f9494d1805 100644 --- a/src/components/AvatarBubbles.tsx +++ b/src/components/AvatarBubbles.tsx @@ -129,40 +129,46 @@ function AvatarBubble({ includeProfileBorder?: boolean }) { const t = useTheme() - const profile = useProfileShadow(profileUnshadowed) - const moderationOpts = useModerationOpts() - const moderation = moderationOpts - ? moderateProfile(profile, moderationOpts) - : undefined const animatedStyle = useAnimatedStyle(() => ({ transform: [{translateX: x}, {translateY: y}, {scale: scale.get()}], })) - return ( - - {profile ? ( - - ) : ( + const style = [ + a.absolute, + a.rounded_full, + a.flex_grow_0, + includeProfileBorder && { + borderColor: t.atoms.text_inverted.color, + borderWidth: 2, + }, + zIndex != null && {zIndex}, + animatedStyle, + ] + + const profile = useProfileShadow(profileUnshadowed) + const moderationOpts = useModerationOpts() + + if (!moderationOpts) { + return ( + - )} + + ) + } + + const moderation = moderateProfile(profile, moderationOpts) + const avatarModeration = moderation.ui('avatar') + + return ( + + ) } diff --git a/src/components/PostControls/ShareMenu/RecentChats.tsx b/src/components/PostControls/ShareMenu/RecentChats.tsx index 6107fa5755..bab3cbfded 100644 --- a/src/components/PostControls/ShareMenu/RecentChats.tsx +++ b/src/components/PostControls/ShareMenu/RecentChats.tsx @@ -152,11 +152,7 @@ function RecentChatItem({ a.align_center, ]}> {convo.kind === 'group' ? ( - + ) : ( {convo.kind === 'group' ? ( - + ) : ( - + {isOwner ? ( } title={chatName} diff --git a/src/screens/Messages/components/MessagesListGroupInfoPanel.tsx b/src/screens/Messages/components/MessagesListGroupInfoPanel.tsx index 8428b1a4b2..b1bb4ad976 100644 --- a/src/screens/Messages/components/MessagesListGroupInfoPanel.tsx +++ b/src/screens/Messages/components/MessagesListGroupInfoPanel.tsx @@ -87,11 +87,7 @@ export function MessagesListGroupInfoPanel({ return ( <> - + {convo.details.name ? ( { @@ -73,7 +70,6 @@ export function OutgoingRequestListItem({ ).fill(undefined), ]} size={48} - moderationOpts={moderationOpts} />