From eb9412c2d96f650c3e738e85e630bfd6d3212880 Mon Sep 17 00:00:00 2001 From: mxandreas Date: Fri, 3 Jul 2026 08:39:27 +0100 Subject: [PATCH] Make notification settings copy/layout more user-friendly and closer to EX. --- apps/web/src/components/views/settings/Notifications.tsx | 2 +- .../views/settings/tabs/room/NotificationSettingsTab.tsx | 2 +- apps/web/src/i18n/strings/en_EN.json | 8 ++++---- .../settings/tabs/room/NotificationSettingsTab-test.tsx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/web/src/components/views/settings/Notifications.tsx b/apps/web/src/components/views/settings/Notifications.tsx index c52753907df..21f5a0d3b33 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 a66c75d65c4..032bb47a930 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")}
diff --git a/apps/web/src/i18n/strings/en_EN.json b/apps/web/src/i18n/strings/en_EN.json index f5ec7e5f674..37caf8a844b 100644 --- a/apps/web/src/i18n/strings/en_EN.json +++ b/apps/web/src/i18n/strings/en_EN.json @@ -1722,8 +1722,8 @@ "level_notification": "Notification", "level_unsent": "Unsent", "mark_all_read": "Mark all as read", - "mentions_and_keywords": "@mentions & keywords", - "mentions_and_keywords_description": "Get notified only with mentions and keywords as set up in your settings", + "mentions_and_keywords": "@mentions and replies only", + "mentions_and_keywords_description": "Get notified only with mentions, replies and keywords as set up in your settings", "mentions_keywords": "Mentions and keywords", "message_didnt_send": "Message didn't send. Click for info.", "mute_description": "You won't get any notifications" @@ -2764,13 +2764,13 @@ "room_activity": "New room activity, upgrades and status messages occur", "rule_call": "Call invitation", "rule_contains_display_name": "Messages containing my display name", - "rule_contains_user_name": "Messages containing my username", + "rule_contains_user_name": "@mentions and replies", "rule_encrypted": "Encrypted messages in group chats", "rule_encrypted_room_one_to_one": "Encrypted messages in one-to-one chats", "rule_invite_for_me": "When I'm invited to a room", "rule_message": "Messages in group chats", "rule_room_one_to_one": "Messages in one-to-one chats", - "rule_roomnotif": "Messages containing @room", + "rule_roomnotif": "@room mentions", "rule_suppress_notices": "Messages sent by bot", "rule_tombstone": "When rooms are upgraded", "show_message_desktop_notification": "Show message in desktop notification", diff --git a/apps/web/test/unit-tests/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx b/apps/web/test/unit-tests/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx index 3d0cc39a2eb..9716be768a3 100644 --- a/apps/web/test/unit-tests/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx +++ b/apps/web/test/unit-tests/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx @@ -45,7 +45,7 @@ describe("NotificationSettingsTab", () => { const tab = renderTab(); // settings link of mentions_only volume - const settingsLink = within(tab.getByText("@mentions & keywords")).getByRole("button", { name: "settings" }); + const settingsLink = within(tab.getByText("@mentions and replies only")).getByRole("button", { name: "settings" }); if (!settingsLink) throw new Error("settings link does not exist."); await userEvent.click(settingsLink);