From 450aca4d7cd8226cf928746ee052da534c5bcab0 Mon Sep 17 00:00:00 2001
From: Gung Wah <41157464+kresnaputra@users.noreply.github.com>
Date: Wed, 24 Feb 2021 00:57:18 +0800
Subject: [PATCH] [FIX] DM rooms show typing status from last group room
 (#2878)

* [FIX] DM rooms show typing status from last group room

* Undo changes

* Check if current typing is from focused room before dispatching to redux

Co-authored-by: Diego Mello <diegolmello@gmail.com>
---
 app/lib/methods/subscriptions/room.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/lib/methods/subscriptions/room.js b/app/lib/methods/subscriptions/room.js
index 71ac3dfee..a6e4e34ad 100644
--- a/app/lib/methods/subscriptions/room.js
+++ b/app/lib/methods/subscriptions/room.js
@@ -90,6 +90,10 @@ export default class RoomSubscription {
 		if (ev === 'typing') {
 			const { user } = reduxStore.getState().login;
 			const { UI_Use_Real_Name } = reduxStore.getState().settings;
+			const { rooms } = reduxStore.getState().room;
+			if (rooms[0] !== _rid) {
+				return;
+			}
 			const [name, typing] = ddpMessage.fields.args;
 			const key = UI_Use_Real_Name ? 'name' : 'username';
 			if (name !== user[key]) {