diff --git a/.changeset/plenty-ravens-grab.md b/.changeset/plenty-ravens-grab.md new file mode 100644 index 0000000000000000000000000000000000000000..a11dba0b02fa492a842b4d69012438c19481b1ab --- /dev/null +++ b/.changeset/plenty-ravens-grab.md @@ -0,0 +1,5 @@ +--- +"@rocket.chat/meteor": patch +--- + +fixed an issue where the room history is lost when jumping to an older message that is not already loaded diff --git a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts index c9adbad5cbb57a5505893ba3de007b3919bd6770..98da715f17e4d4d267cb0b6c7e784f9aa016aa76 100644 --- a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts +++ b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts @@ -276,15 +276,14 @@ class RoomHistoryManagerClass extends Emitter { return; } - const surroundingMessage = ChatMessage.findOne({ _id: message._id, _hidden: { $ne: true } }); + const messageAlreadyLoaded = Boolean(ChatMessage.findOne({ _id: message._id, _hidden: { $ne: true } })); - if (surroundingMessage) { + if (messageAlreadyLoaded) { return; } const room = this.getRoom(message.rid); - room.isLoading.set(true); - room.hasMore.set(false); + void this.clear(message.rid); const subscription = ChatSubscription.findOne({ rid: message.rid });