[FIX] Delete messages while searching bug (#16568)

RocketChat · Feb 21, 2020 · 7227b2e · 7227b2e
1 parent d1d124f
commit 7227b2e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/app/ui-utils/client/lib/RoomHistoryManager.js b/app/ui-utils/client/lib/RoomHistoryManager.js
@@ -255,8 +255,6 @@ export const RoomHistoryManager = new class {
 		}
 		const room = this.getRoom(message.rid);
 		room.isLoading.set(true);
-		ChatMessage.remove({ rid: message.rid });
-
 		let typeName = undefined;
 
 		const subscription = ChatSubscription.findOne({ rid: message.rid });
@@ -272,6 +270,7 @@ export const RoomHistoryManager = new class {
 			if (!result || !result.messages) {
 				return;
 			}
+			ChatMessage.remove({ rid: message.rid });
 			for (const msg of Array.from(result.messages)) {
 				if (msg.t !== 'command') {
 					upsertMessage({ msg, subscription });