Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/body/RoomTopic.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const RoomTopic = ({ room }: RoomTopicProps) => {
const topic = isDirectMessageRoom(room) && (room.uids?.length ?? 0) < 3 ? directUserData?.statusText : room.topic;
const canEditTopic = canEdit && (isPublicRoom(room) || isPrivateRoom(room));

if (!topic && !canEdit) {
if (!topic && !canEditTopic) {
return null;
}

Expand Down
7 changes: 7 additions & 0 deletions apps/meteor/tests/e2e/feature-preview.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,13 @@ test.describe.serial('feature preview', () => {
await expect(poHomeChannel.sidebar.sidebar.getByRole('heading', { name: 'Recent' })).toBeVisible();
});

test('should not display room topic in direct message', async ({ page }) => {
await page.goto('/direct/user2');

// Not creating a PO because this will be removed very soon
await expect(page.locator('main').getByRole('note')).not.toBeVisible();
});

test('should expand/collapse sidebar groups', async ({ page }) => {
await page.goto('/home');
const collapser = poHomeChannel.sidebar.firstCollapser;
Expand Down
Loading