From 3407136a1a0e261aa50cc484dae835ade558ce72 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Mon, 10 Jul 2023 12:42:21 +0200 Subject: [PATCH 1/5] Update help text --- .../notifications/NotificationSettings2.tsx | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/components/views/settings/notifications/NotificationSettings2.tsx b/src/components/views/settings/notifications/NotificationSettings2.tsx index c3ba045602b..94a44c13a3e 100644 --- a/src/components/views/settings/notifications/NotificationSettings2.tsx +++ b/src/components/views/settings/notifications/NotificationSettings2.tsx @@ -31,6 +31,7 @@ import SettingsStore from "../../../../settings/SettingsStore"; import { NotificationColor } from "../../../../stores/notifications/NotificationColor"; import { clearAllNotifications } from "../../../../utils/notifications"; import AccessibleButton from "../../elements/AccessibleButton"; +import ExternalLink from "../../elements/ExternalLink"; import LabelledCheckbox from "../../elements/LabelledCheckbox"; import LabelledToggleSwitch from "../../elements/LabelledToggleSwitch"; import StyledRadioGroup from "../../elements/StyledRadioGroup"; @@ -73,7 +74,17 @@ const NotificationOptions = [ ]; function boldText(text: string): JSX.Element { - return {text}; + return ( + {text} + ); +} + +function helpLink(sub: string): JSX.Element { + return ( + + {sub} + + ); } function useHasUnreadNotifications(): boolean { @@ -105,9 +116,16 @@ export default function NotificationSettings2(): JSX.Element { onAction={() => reconcile(model!)} > {_t( - "Update: We have updated our notification settings. This won’t affect your previously selected settings.", + "Update:" + + "We’ve simplified Notifications Settings to make options easier to find. " + + "Some custom settings you’ve chosen in the past are not shown here, but they’re still active. " + + "If you proceed, some of your settings may change. " + + "Learn more", {}, - { strong: boldText }, + { + strong: boldText, + a: helpLink, + }, )} )} From 986f55096f9486fc9c04eafa8d0a25ec9102a276 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Mon, 10 Jul 2023 13:24:37 +0200 Subject: [PATCH 2/5] chore: fixed lint issues --- .../notifications/NotificationSettings2.tsx | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/components/views/settings/notifications/NotificationSettings2.tsx b/src/components/views/settings/notifications/NotificationSettings2.tsx index 94a44c13a3e..223bc7807e4 100644 --- a/src/components/views/settings/notifications/NotificationSettings2.tsx +++ b/src/components/views/settings/notifications/NotificationSettings2.tsx @@ -74,17 +74,11 @@ const NotificationOptions = [ ]; function boldText(text: string): JSX.Element { - return ( - {text} - ); + return {text}; } function helpLink(sub: string): JSX.Element { - return ( - - {sub} - - ); + return {sub}; } function useHasUnreadNotifications(): boolean { @@ -117,10 +111,10 @@ export default function NotificationSettings2(): JSX.Element { > {_t( "Update:" + - "We’ve simplified Notifications Settings to make options easier to find. " + - "Some custom settings you’ve chosen in the past are not shown here, but they’re still active. " + - "If you proceed, some of your settings may change. " + - "Learn more", + "We’ve simplified Notifications Settings to make options easier to find. " + + "Some custom settings you’ve chosen in the past are not shown here, but they’re still active. " + + "If you proceed, some of your settings may change. " + + "Learn more", {}, { strong: boldText, From 2b4e2a201aa84496768415442dd5f74e94baf97d Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Mon, 10 Jul 2023 13:34:35 +0200 Subject: [PATCH 3/5] update i18n --- src/i18n/strings/en_EN.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index b545df98923..dbe39b25b40 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1783,7 +1783,7 @@ "People, Mentions and Keywords": "People, Mentions and Keywords", "Mentions and Keywords only": "Mentions and Keywords only", "Switch now": "Switch now", - "Update: We have updated our notification settings. This won’t affect your previously selected settings.": "Update: We have updated our notification settings. This won’t affect your previously selected settings.", + "Update:We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active. If you proceed, some of your settings may change. Learn more": "Update:We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active. If you proceed, some of your settings may change. Learn more", "Show message preview in desktop notification": "Show message preview in desktop notification", "I want to be notified for (Default Setting)": "I want to be notified for (Default Setting)", "This setting will be applied by default to all your rooms.": "This setting will be applied by default to all your rooms.", From 8bae202a917484c34609b99512ddaa4cad3b25b3 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Mon, 10 Jul 2023 14:05:42 +0200 Subject: [PATCH 4/5] Update button text --- .../views/settings/notifications/NotificationSettings2.tsx | 2 +- src/i18n/strings/en_EN.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/settings/notifications/NotificationSettings2.tsx b/src/components/views/settings/notifications/NotificationSettings2.tsx index 223bc7807e4..56b4d7acd7e 100644 --- a/src/components/views/settings/notifications/NotificationSettings2.tsx +++ b/src/components/views/settings/notifications/NotificationSettings2.tsx @@ -106,7 +106,7 @@ export default function NotificationSettings2(): JSX.Element { {hasPendingChanges && model !== null && ( } - action={_t("Switch now")} + action={_t("Proceed")} onAction={() => reconcile(model!)} > {_t( diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index dbe39b25b40..63c29e9f65e 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1782,7 +1782,7 @@ "Select which emails you want to send summaries to. Manage your emails in .": "Select which emails you want to send summaries to. Manage your emails in .", "People, Mentions and Keywords": "People, Mentions and Keywords", "Mentions and Keywords only": "Mentions and Keywords only", - "Switch now": "Switch now", + "Proceed": "Proceed", "Update:We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active. If you proceed, some of your settings may change. Learn more": "Update:We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active. If you proceed, some of your settings may change. Learn more", "Show message preview in desktop notification": "Show message preview in desktop notification", "I want to be notified for (Default Setting)": "I want to be notified for (Default Setting)", From dd443e58237e12fefe2cbe291bca8d3d7fa1d2cd Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Tue, 11 Jul 2023 11:18:02 +0200 Subject: [PATCH 5/5] Correct css for settings banners --- res/css/views/settings/tabs/_SettingsBanner.pcss | 2 -- 1 file changed, 2 deletions(-) diff --git a/res/css/views/settings/tabs/_SettingsBanner.pcss b/res/css/views/settings/tabs/_SettingsBanner.pcss index f0b9e7106bb..a6a0de63459 100644 --- a/res/css/views/settings/tabs/_SettingsBanner.pcss +++ b/res/css/views/settings/tabs/_SettingsBanner.pcss @@ -16,7 +16,6 @@ limitations under the License. .mx_SettingsBanner { background: $system; - line-height: 2.25rem; border-radius: 8px; padding: 12px 16px; gap: 12px; @@ -29,7 +28,6 @@ limitations under the License. } .mx_AccessibleButton { - align-self: initial; white-space: nowrap; } }