Enforce null room redirect

RocketChat · Oct 3, 2022 · 06bd852 · 06bd852
1 parent 361c3f4
commit 06bd852
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/apps/meteor/client/hooks/useReactiveQuery.ts b/apps/meteor/client/hooks/useReactiveQuery.ts
@@ -31,7 +31,6 @@ export const useReactiveQuery = <TQueryFnData, TData = TQueryFnData, TQueryKey e
 
 						if (c.firstRun) {
 							if (data === undefined) {
-								console.warn('Reactive query returned undefined:', queryKey);
 								reject(new Error('Reactive query returned undefined'));
 							} else {
 								resolve(data);

diff --git a/apps/meteor/client/views/room/providers/RoomProvider.tsx b/apps/meteor/client/views/room/providers/RoomProvider.tsx
@@ -23,7 +23,7 @@ type RoomProviderProps = {
 const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 	useRoomRolesManagement(rid);
 
-	const roomQuery = useReactiveQuery(['rooms', rid], ({ rooms }) => rooms.findOne({ _id: rid }));
+	const roomQuery = useReactiveQuery(['rooms', rid], ({ rooms }) => rooms.findOne({ _id: rid }) ?? null);
 
 	// TODO: the following effect is a workaround while we don't have a general and definitive solution for it
 	const homeRoute = useRoute('home');