Skip to content

regression: Sidepanel being empty when no subscription #36752

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

Merged
ggazzo merged 1 commit into from
Aug 19, 2025
Merged

regression: Sidepanel being empty when no subscription #36752

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelRooms.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useUserSubscription } from '@rocket.chat/ui-contexts';

import SidePanelAll from './SidePanelAll';
import SidePanelChannels from './SidePanelChannels';
import SidePanelTeams from './SidePanelTeams';
import { withErrorBoundary } from '../../../../components/withErrorBoundary';
Expand All @@ -10,7 +11,7 @@ const SidePanelRooms = ({ parentRid }: { parentRid: string }) => {
const subscription = useUserSubscription(parentRid);

if (!subscription) {
return null;
return <SidePanelAll />;
}

switch (currentTab) {
Expand All @@ -19,8 +20,6 @@ const SidePanelRooms = ({ parentRid }: { parentRid: string }) => {
case 'channels':
case 'directMessages':
return <SidePanelChannels parentRid={parentRid} subscription={subscription} />;
default:
return null;
}
};

Expand Down
Loading