From 4fb0078aba2a5739cff2cd11421f31c041fb9ec7 Mon Sep 17 00:00:00 2001 From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com> Date: Fri, 23 Jun 2023 01:41:51 +0530 Subject: [PATCH] fix: Show badge for threads direct mentions (#29587) --- .changeset/little-crews-end.md | 5 +++++ .../client/sidebar/RoomList/SideBarItemTemplateWithData.tsx | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/little-crews-end.md diff --git a/.changeset/little-crews-end.md b/.changeset/little-crews-end.md new file mode 100644 index 000000000000..62f6cb87032e --- /dev/null +++ b/.changeset/little-crews-end.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +fix show badge for thread direct mentions diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx index a901e91bde35..29dc2f5b4c45 100644 --- a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx +++ b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx @@ -136,7 +136,7 @@ function SideBarItemTemplateWithData({ ((userMentions || tunreadUser.length) && 'danger') || (threadUnread && 'primary') || (groupMentions && 'warning') || 'secondary'; const isUnread = unread > 0 || threadUnread; - const showBadge = !hideUnreadStatus || (!hideMentionStatus && Boolean(userMentions)); + const showBadge = !hideUnreadStatus || (!hideMentionStatus && (Boolean(userMentions) || tunreadUser.length > 0)); const badges = (