Skip to content

regression: embedded rooms briefly show "Room not found" while loading #40714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nazabucciarelli wants to merge 4 commits into from
Closed

regression: embedded rooms briefly show "Room not found" while loading #40714

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13bd856
add useRef to track components hydration lifecycle
nazabucciarelli May 27, 2026
c051660
Merge branch 'release-8.5.0' into fix/room-not-found-embedded
nazabucciarelli May 27, 2026
9c3e567
remove ref update from useMemo and use loadedRoomId instead of hasLoa…
nazabucciarelli May 27, 2026
732cf78
Merge branch 'fix/room-not-found-embedded' of github.com:RocketChat/R…
nazabucciarelli May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions apps/meteor/client/views/room/providers/RoomProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IRoom } from '@rocket.chat/core-typings';
import type { ReactNode, ContextType, ReactElement } from 'react';
import { useMemo, memo, useEffect } from 'react';
import { useRef, useMemo, memo, useEffect } from 'react';

import ComposerPopupProvider from './ComposerPopupProvider';
import RoomToolboxProvider from './RoomToolboxProvider';
Expand All @@ -27,9 +27,10 @@ type RoomProviderProps = {

const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
const room = Rooms.use((state) => state.get(rid));

const subscritionFromLocal = Subscriptions.use((state) => state.find((record) => record.rid === rid));

const loadedRoomId = useRef<string | null>(null);

useRedirectOnSettingsChanged(subscritionFromLocal);

useUsersNameChanged();
Expand Down Expand Up @@ -68,6 +69,12 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {

const { mutate: fireRoomOpenedEvent } = useFireGlobalEvent('room-opened', rid);

useEffect(() => {
if (pseudoRoom) {
loadedRoomId.current = rid;
}
}, [pseudoRoom, rid]);

useEffect(() => {
if (room) {
fireRoomOpenedEvent(omit(room, 'usernames'));
Expand All @@ -92,7 +99,11 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
}, [rid, subscribed]);

if (!pseudoRoom) {
return !room ? <RoomNotFound /> : <RoomSkeleton />;
if (loadedRoomId.current !== rid) {
return <RoomSkeleton />;
}

return <RoomNotFound />;
}

return (
Expand Down
Loading