From f42f7fa0353a45c6b20e65e1a54b64e1c28b0cd5 Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Fri, 17 May 2024 20:46:01 +0100 Subject: [🐴] don't include blocked convos in unread count (#4082) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * don't include blocked convos in unread count * Use moderateProfile * Handle blocked state in chat list * Fix logic formatting, add todo --------- Co-authored-by: Eric Bailey --- src/screens/Messages/List/ChatListItem.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/screens/Messages/List/ChatListItem.tsx') diff --git a/src/screens/Messages/List/ChatListItem.tsx b/src/screens/Messages/List/ChatListItem.tsx index 0a0f8c575..a7b7e0680 100644 --- a/src/screens/Messages/List/ChatListItem.tsx +++ b/src/screens/Messages/List/ChatListItem.tsx @@ -169,7 +169,7 @@ function ChatListItemReady({ )} )} - {convo.muted && ( + {(convo.muted || moderation.blocked) && ( 0 ? a.font_bold : t.atoms.text_contrast_high, - convo.muted && t.atoms.text_contrast_medium, + (convo.muted || moderation.blocked) && + t.atoms.text_contrast_medium, ]}> {lastMessage} @@ -211,9 +212,10 @@ function ChatListItemReady({ a.absolute, a.rounded_full, { - backgroundColor: convo.muted - ? t.palette.contrast_200 - : t.palette.primary_500, + backgroundColor: + convo.muted || moderation.blocked + ? t.palette.contrast_200 + : t.palette.primary_500, height: 7, width: 7, }, -- cgit 1.4.1