fix: Mark as unread not working

.changeset/hot-balloons-travel.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue where when you marked a room as read and you were part of it, sometimes it would mark it as read right after
+Fixed issue where you were redirected to /home even if you don't have the room open

apps/meteor/client/importPackages.ts

@@ -16,7 +16,6 @@ import '../app/iframe-login/client';
 import '../app/license/client';
 import '../app/lib/client';
 import '../app/livechat-enterprise/client';
-import '../app/message-mark-as-unread/client';
 import '../app/nextcloud/client';
 import '../app/notifications/client';
 import '../app/otr/client';

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

@@ -205,7 +205,7 @@ function SideBarItemTemplateWithData({
 						threadUnread={threadUnread}
 						rid={rid}
 						unread={!!unread}
-						roomOpen={false}
+						roomOpen={selected}
 						type={type}
 						cl={cl}
 						name={title}

apps/meteor/client/sidebar/RoomMenu.tsx

@@ -1,6 +1,6 @@
 import type { RoomType } from '@rocket.chat/core-typings';
 import { Option, Menu } from '@rocket.chat/fuselage';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useEffectEvent, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey, Fields } from '@rocket.chat/ui-contexts';
 import {
 	useRouter,
@@ -171,19 +171,24 @@ const RoomMenu = ({
 		);
 	});
 
-	const handleToggleRead = useMutableCallback(async () => {
+	const handleToggleRead = useEffectEvent(async () => {
 		try {
 			if (isUnread) {
 				await readMessages({ rid, readThreads: true });
 				return;
 			}
-			await unreadMessages(undefined, rid);
+
 			if (subscription == null) {
 				return;
 			}
+
 			LegacyRoomManager.close(subscription.t + subscription.name);
 
-			router.navigate('/home');
+			if (roomOpen) {
+				router.navigate('/home');
+			}
+
+			await unreadMessages(undefined, rid);
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}

apps/meteor/client/sidebarv2/RoomList/SideBarItemTemplateWithData.tsx

@@ -205,7 +205,7 @@ const SideBarItemTemplateWithData = ({
 						threadUnread={threadUnread}
 						rid={rid}
 						unread={!!unread}
-						roomOpen={false}
+						roomOpen={selected}
 						type={type}
 						cl={cl}
 						name={title}

apps/meteor/client/sidebarv2/RoomMenu.tsx

@@ -177,13 +177,18 @@ const RoomMenu = ({
 				await readMessages({ rid, readThreads: true });
 				return;
 			}
-			await unreadMessages(undefined, rid);
+
 			if (subscription == null) {
 				return;
 			}
+
 			LegacyRoomManager.close(subscription.t + subscription.name);
 
-			router.navigate('/home');
+			if (roomOpen) {
+				router.navigate('/home');
+			}
+
+			await unreadMessages(undefined, rid);
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}

apps/meteor/tests/e2e/channels-sidebar.spec.ts

@@ -0,0 +1,38 @@
+import { Users } from './fixtures/userStates';
+import { HomeChannel } from './page-objects';
+import { createTargetChannel } from './utils';
+import { test, expect } from './utils/test';
+
+test.use({ storageState: Users.admin.state });
+
+test.describe.serial('Channels - Sidebar Actions', () => {
+	let poHomeChannel: HomeChannel;
+	let targetChannel: string;
+
+	test.beforeEach(async ({ page, api }) => {
+		poHomeChannel = new HomeChannel(page);
+		await page.emulateMedia({ reducedMotion: 'reduce' });
+
+		targetChannel = await createTargetChannel(api);
+
+		await page.goto('/home');
+	});
+
+	test.afterEach(async ({ api }) => {
+		await api.post('/channels.delete', { roomName: targetChannel });
+	});
+
+	test('should not mark empty room as unread', async () => {
+		// focus should be on the next item
+		const sidebarItem = await poHomeChannel.sidenav.selectMarkAsUnread(targetChannel);
+		await expect(sidebarItem.locator('.rcx-badge')).not.toBeVisible();
+	});
+
+	test('should mark a populated room as unread', async () => {
+		// focus should be on the next item
+		await poHomeChannel.sidenav.openChat(targetChannel);
+		await poHomeChannel.content.sendMessage('this is a message for reply');
+		const sidebarItem = await poHomeChannel.sidenav.selectMarkAsUnread(targetChannel);
+		await expect(sidebarItem.locator('.rcx-badge')).toBeVisible();
+	});
+});

apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts

@@ -68,6 +68,14 @@ export class HomeSidenav {
 		return this.page.locator(`[data-qa="sidebar-item"][aria-label="${name}"]`);
 	}
 
+	async selectMarkAsUnread(name: string) {
+		const sidebarItem = this.getSidebarItemByName(name);
+		await sidebarItem.focus();
+		await sidebarItem.locator('.rcx-sidebar-item__menu').click();
+		await this.page.getByRole('option', { name: 'Mark Unread' }).click();
+		return sidebarItem;
+	}
+
 	async selectPriority(name: string, priority: string) {
 		const sidebarItem = this.getSidebarItemByName(name);
 		await sidebarItem.focus();