From 86862c899536f73b5aaaa0e57c294b4b60ee02d4 Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Wed, 29 Nov 2023 20:19:42 +0530 Subject: [PATCH 1/2] use correct storageId and localStorage --- .../client/startup/afterLogoutCleanUp/purgeAllDrafts.ts | 4 ++-- .../client/views/room/composer/messageBox/MessageBox.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/meteor/client/startup/afterLogoutCleanUp/purgeAllDrafts.ts b/apps/meteor/client/startup/afterLogoutCleanUp/purgeAllDrafts.ts index d0c15c93263e7..4a3c0ff928112 100644 --- a/apps/meteor/client/startup/afterLogoutCleanUp/purgeAllDrafts.ts +++ b/apps/meteor/client/startup/afterLogoutCleanUp/purgeAllDrafts.ts @@ -5,9 +5,9 @@ import { afterLogoutCleanUpCallback } from '../../../lib/callbacks/afterLogoutCl Meteor.startup(() => { const purgeAllDrafts = (): void => { - Object.keys(Meteor._localStorage) + Object.keys(localStorage) .filter((key) => key.indexOf('messagebox_') === 0) - .forEach((key) => Meteor._localStorage.removeItem(key)); + .forEach((key) => localStorage.removeItem(key)); }; afterLogoutCleanUpCallback.add(purgeAllDrafts, callbacks.priority.MEDIUM, 'chatMessages-after-logout-cleanup'); diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx index b0ff907ca0648..3df47c2523fb9 100644 --- a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx +++ b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx @@ -128,7 +128,7 @@ const MessageBox = ({ const messageComposerRef = useRef(null); const shadowRef = useRef(null); - const storageID = `${room._id}${tmid ? `-${tmid}` : ''}`; + const storageID = `messagebox_${room._id}${tmid ? `-${tmid}` : ''}`; const callbackRef = useCallback( (node: HTMLTextAreaElement) => { From b0c2f3b526fd4cb432c1509d4d16b02fd526cf4f Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Wed, 29 Nov 2023 20:20:46 +0530 Subject: [PATCH 2/2] add changeset --- .changeset/brown-ads-tell.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/brown-ads-tell.md diff --git a/.changeset/brown-ads-tell.md b/.changeset/brown-ads-tell.md new file mode 100644 index 0000000000000..4659ce4b4057e --- /dev/null +++ b/.changeset/brown-ads-tell.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Clear message box related items from local storage on logout