diff --git a/apps/web/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts b/apps/web/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts index 1dedbe17f0..2a84ea8280 100644 --- a/apps/web/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts +++ b/apps/web/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts @@ -532,7 +532,7 @@ test.describe("Room list", () => { await app.viewRoomById(roomId); await app.settings.openRoomSettings("Notifications"); - await page.getByText("Off").click(); + await page.getByText("Mute").click(); await app.settings.closeDialog(); const room = roomListView.getByRole("option", { name: "silent" }); diff --git a/apps/web/playwright/snapshots/settings/notifications/notifications-settings-tab.spec.ts/standard-notification-settings-linux.png b/apps/web/playwright/snapshots/settings/notifications/notifications-settings-tab.spec.ts/standard-notification-settings-linux.png index 8c2dd6e91b..28c92d246b 100644 Binary files a/apps/web/playwright/snapshots/settings/notifications/notifications-settings-tab.spec.ts/standard-notification-settings-linux.png and b/apps/web/playwright/snapshots/settings/notifications/notifications-settings-tab.spec.ts/standard-notification-settings-linux.png differ diff --git a/apps/web/src/components/views/settings/Notifications.tsx b/apps/web/src/components/views/settings/Notifications.tsx index c52753907d..21f5a0d3b3 100644 --- a/apps/web/src/components/views/settings/Notifications.tsx +++ b/apps/web/src/components/views/settings/Notifications.tsx @@ -89,9 +89,9 @@ const RULE_DISPLAY_ORDER: string[] = [ RuleId.EncryptedMessage, // Mentions - RuleId.ContainsDisplayName, RuleId.ContainsUserName, RuleId.AtRoomNotification, + RuleId.ContainsDisplayName, // Other RuleId.InviteToSelf, diff --git a/apps/web/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx b/apps/web/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx index b510597766..68528852c0 100644 --- a/apps/web/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx +++ b/apps/web/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx @@ -231,7 +231,7 @@ export default class NotificationsSettingsTab extends React.Component - {_t("common|off")} + {_t("common|mute")}
{_t("notifications|mute_description")}