[NEW] Add option to show mentions badge when show counter is disabled

apps/meteor/app/models/server/models/Subscriptions.js

@@ -227,6 +227,27 @@ export class Subscriptions extends Base {
 		return this.update(query, update);
 	}
 
+	updateHideMentionStatusById(_id, hideMentionStatus) {
+		const query = {
+			_id,
+		};
+
+		const update =
+			hideMentionStatus === true
+				? {
+						$set: {
+							hideMentionStatus,
+						},
+				  }
+				: {
+						$unset: {
+							hideMentionStatus: 1,
+						},
+				  };
+
+		return this.update(query, update);
+	}
+
 	updateMuteGroupMentions(_id, muteGroupMentions) {
 		const query = {
 			_id,

apps/meteor/app/push-notifications/server/methods/saveNotificationSettings.js

@@ -63,6 +63,9 @@ Meteor.methods({
 			hideUnreadStatus: {
 				updateMethod: (subscription, value) => Subscriptions.updateHideUnreadStatusById(subscription._id, value === '1'),
 			},
+			hideMentionStatus: {
+				updateMethod: (subscription, value) => Subscriptions.updateHideMentionStatusById(subscription._id, value === '1'),
+			},
 			muteGroupMentions: {
 				updateMethod: (subscription, value) => Subscriptions.updateMuteGroupMentions(subscription._id, value === '1'),
 			},

apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.js

@@ -43,6 +43,7 @@ function SideBarItemTemplateWithData({
 	const {
 		lastMessage,
 		hideUnreadStatus,
+		hideMentionStatus,
 		unread = 0,
 		alert,
 		userMentions,
@@ -70,8 +71,9 @@ function SideBarItemTemplateWithData({
 	const variant =
 		((userMentions || tunreadUser.length) && 'danger') || (threadUnread && 'primary') || (groupMentions && 'warning') || 'ghost';
 	const isUnread = unread > 0 || threadUnread;
+	const showBadge = !hideUnreadStatus || (!hideMentionStatus && userMentions);
 	const badges =
-		!hideUnreadStatus && isUnread ? (
+		showBadge && isUnread ? (
 			<Badge style={{ flexShrink: 0 }} variant={variant}>
 				{unread + tunread?.length}
 			</Badge>

apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.js

@@ -43,6 +43,14 @@ const NotificationPreferences = ({
 					onChange={formHandlers?.handleShowCounter}
 					defaultChecked={formValues?.showCounter}
 				/>
+				{!formValues?.showCounter && (
+					<NotificationToogle
+						label={t('Show_mentions')}
+						description={t('Display_mentions_counter')}
+						onChange={formHandlers?.handleShowMentions}
+						defaultChecked={formValues?.showMentions}
+					/>
+				)}
 				<FieldGroup>
 					<NotificationByDevice device={t('Desktop')} icon={'computer'}>
 						<Preferences

apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx

@@ -21,6 +21,7 @@ Default.args = {
 		turnOn: true,
 		muteGroupMentions: false,
 		showCounter: true,
+		showMentions: true,
 		desktopAlert: 'default',
 		desktopSound: 'chime',
 		mobileAlert: 'mentions',
@@ -29,6 +30,7 @@ Default.args = {
 	formHandlers: {
 		handleTurnOn: action('formHandlers.handleTurnOn'),
 		handleMuteGroupMentions: action('formHandlers.handleMuteGroupMentions'),
+		handleShowMentions: action('formHandlers.handleShowMentions'),
 		handleShowCounter: action('formHandlers.handleShowCounter'),
 		handleDesktopAlert: action('formHandlers.handleDesktopAlert'),
 		handleDesktopSound: action('formHandlers.handleDesktopSound'),

apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.js

@@ -22,6 +22,7 @@ const NotificationPreferencesWithData = ({ rid }) => {
 		turnOn: !subscription?.disableNotifications,
 		muteGroupMentions: subscription?.muteGroupMentions,
 		showCounter: !subscription?.hideUnreadStatus,
+		showMentions: !subscription?.hideMentionStatus,
 		desktopAlert: (subscription?.desktopPrefOrigin === 'subscription' && subscription.desktopNotifications) || 'default',
 		desktopSound: subscription?.audioNotificationValue || 'default',
 		mobileAlert: (subscription?.mobilePrefOrigin === 'subscription' && subscription.mobilePushNotifications) || 'default',
@@ -51,6 +52,7 @@ const NotificationPreferencesWithData = ({ rid }) => {
 		notifications.disableNotifications = values.turnOn ? '0' : '1';
 		notifications.muteGroupMentions = values.muteGroupMentions ? '1' : '0';
 		notifications.hideUnreadStatus = values.showCounter ? '0' : '1';
+		notifications.hideMentionStatus = values.showMentions ? '0' : '1';
 		notifications.desktopNotifications = values.desktopAlert;
 		notifications.audioNotificationValue = values.desktopSound;
 		notifications.mobilePushNotifications = values.mobileAlert;

apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json

@@ -1492,9 +1492,10 @@
   "Display_avatars": "Display Avatars",
   "Display_Avatars_Sidebar": "Display Avatars in Sidebar",
   "Display_chat_permissions": "Display chat permissions",
+  "Display_mentions_counter": "Display badge for direct mentions only",
   "Display_offline_form": "Display Offline Form",
   "Display_setting_permissions": "Display permissions to change settings",
-  "Display_unread_counter": "Display number of unread messages",
+  "Display_unread_counter": "Display room as unread when there are unread messages",
   "Displays_action_text": "Displays action text",
   "Do_It_Later": "Do It Later",
   "Do_not_display_unread_counter": "Do not display any counter of this channel",
@@ -4001,8 +4002,9 @@
   "Show_agent_info": "Show agent information",
   "Show_all": "Show All",
   "Show_Avatars": "Show Avatars",
-  "Show_counter": "Show counter",
+  "Show_counter": "Mark as unread",
   "Show_email_field": "Show email field",
+  "Show_mentions": "Show badge for mentions",
   "Show_Message_In_Main_Thread": "Show thread messages in the main thread",
   "Show_more": "Show more",
   "Show_name_field": "Show name field",

apps/meteor/server/modules/watchers/publishFields.ts

@@ -29,6 +29,7 @@ export const subscriptionFields = {
 	autoTranslateLanguage: 1,
 	disableNotifications: 1,
 	hideUnreadStatus: 1,
+	hideMentionStatus: 1,
 	muteGroupMentions: 1,
 	ignored: 1,
 	E2EKey: 1,

packages/core-typings/src/IRoom.ts

@@ -69,6 +69,7 @@ export interface IRoom extends IRocketChatRecord {
 	unread?: number;
 	alert?: boolean;
 	hideUnreadStatus?: boolean;
+	hideMentionStatus?: boolean;
 
 	muted?: string[];
 	unmuted?: string[];

packages/core-typings/src/ISubscription.ts

@@ -21,6 +21,7 @@ export interface ISubscription extends IRocketChatRecord {
 	f?: true;
 	lr: Date;
 	hideUnreadStatus?: true;
+	hideMentionStatus?: true;
 	teamMain?: boolean;
 	teamId?: string;