From 7b6567d3d9f53eabfbdad519075e898d84a8f94c Mon Sep 17 00:00:00 2001
From: gabriellsh <gabriel.henriques@rocket.chat>
Date: Fri, 26 Jan 2024 11:09:05 -0300
Subject: [PATCH 1/2] Fix UI crash when deleting room

---
 .../MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
index dd4b93edd0ee..90216f159069 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
@@ -2,7 +2,7 @@ import type { IRoom, IMessage } from '@rocket.chat/core-typings';
 import type { Icon } from '@rocket.chat/fuselage';
 import { MessageComposerAction, MessageComposerActionsDivider } from '@rocket.chat/ui-composer';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useUserRoom, useTranslation, useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
+import { useTranslation, useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, MouseEvent } from 'react';
 import React, { memo } from 'react';
 
@@ -12,6 +12,7 @@ import GenericMenu from '../../../../../components/GenericMenu/GenericMenu';
 import type { GenericMenuItemProps } from '../../../../../components/GenericMenu/GenericMenuItem';
 import { useMessageboxAppsActionButtons } from '../../../../../hooks/useAppActionButtons';
 import { useChat } from '../../../contexts/ChatContext';
+import { useRoom } from '../../../contexts/RoomContext';
 import { useAudioMessageAction } from './hooks/useAudioMessageAction';
 import { useCreateDiscussionAction } from './hooks/useCreateDiscussionAction';
 import { useFileUploadAction } from './hooks/useFileUploadAction';
@@ -52,7 +53,7 @@ const MessageBoxActionsToolbar = ({
 		throw new Error('useChat must be used within a ChatProvider');
 	}
 
-	const room = useUserRoom(rid);
+	const room = useRoom();
 
 	const audioMessageAction = useAudioMessageAction(!canSend || typing || isRecording || isMicrophoneDenied, isMicrophoneDenied);
 	const videoMessageAction = useVideoMessageAction(!canSend || typing || isRecording);

From 5fd31bc0ebac1f11c3eb67f51d9e85dfeec79949 Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Fri, 26 Jan 2024 11:17:02 -0300
Subject: [PATCH 2/2] Create empty-tables-deliver.md

---
 .changeset/empty-tables-deliver.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/empty-tables-deliver.md

diff --git a/.changeset/empty-tables-deliver.md b/.changeset/empty-tables-deliver.md
new file mode 100644
index 000000000000..2edf518cdf2c
--- /dev/null
+++ b/.changeset/empty-tables-deliver.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed UI crashing for users reading a room when it's deleted.