Fix room blinking opening a thread

RocketChat · Jun 22, 2020 · c540cbb · c540cbb
1 parent 7c7999d
commit c540cbb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/ui-utils/client/lib/openRoom.js b/app/ui-utils/client/lib/openRoom.js
@@ -89,6 +89,11 @@ export const openRoom = async function(type, name) {
 				return FlowRouter.go('direct', { rid: room._id }, FlowRouter.current().queryParams);
 			}
 
+
+			if (room._id === Session.get('openedRoom')) {
+				return;
+			}
+
 			const [mainNode, roomDom] = await replaceCenterDomBy(() => RoomManager.getDomOfRoom(type + name, room._id, roomTypes.getConfig(type).mainTemplate));
 
 			if (mainNode) {

diff --git a/app/utils/lib/roomExit.js b/app/utils/lib/roomExit.js
@@ -3,7 +3,10 @@ import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
 import { callbacks } from '../../callbacks';
 
-export const roomExit = function() {
+export const roomExit = function({ oldRoute, ...context }) {
+	if (oldRoute && oldRoute._params.keys.name.replace(/"/g, '') === context.params.name) {
+		return;
+	}
 	// 7370 - Close flex-tab when opening a room on mobile UI
 	if (window.matchMedia('(max-width: 500px)').matches) {
 		const flex = document.querySelector('.flex-tab');