From b31043b5eb5c5a46f2b59e557b6527eee7e8dff7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Mon, 19 Jul 2021 10:15:42 -0600
Subject: [PATCH 1/2] Revert order of notification setting radios

Follow-on from https://github.com/matrix-org/matrix-react-sdk/pull/6352
Fixes https://github.com/vector-im/element-web/issues/18048
---
 src/components/views/settings/Notifications.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/Notifications.tsx b/src/components/views/settings/Notifications.tsx
index a488145153..766ba2c9c0 100644
--- a/src/components/views/settings/Notifications.tsx
+++ b/src/components/views/settings/Notifications.tsx
@@ -569,8 +569,8 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
 
         const rows = this.state.vectorPushRules[category].map(r => <tr key={category + r.ruleId}>
             <td>{ r.description }</td>
-            <td>{ makeRadio(r, VectorState.On) }</td>
             <td>{ makeRadio(r, VectorState.Off) }</td>
+            <td>{ makeRadio(r, VectorState.On) }</td>
             <td>{ makeRadio(r, VectorState.Loud) }</td>
         </tr>);
 
@@ -594,8 +594,8 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
                 <thead>
                     <tr>
                         <th>{ sectionName }</th>
-                        <th>{ _t("On") }</th>
                         <th>{ _t("Off") }</th>
+                        <th>{ _t("On") }</th>
                         <th>{ _t("Noisy") }</th>
                     </tr>
                 </thead>

From 6862d9796101bd4f97cf650d690ac924063acdc0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Mon, 19 Jul 2021 10:18:15 -0600
Subject: [PATCH 2/2] APPEASE THY JSON

---
 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 ee8dda1ee4..2ec48f5d43 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1146,8 +1146,8 @@
     "New keyword": "New keyword",
     "Global": "Global",
     "Mentions & keywords": "Mentions & keywords",
-    "On": "On",
     "Off": "Off",
+    "On": "On",
     "Noisy": "Noisy",
     "Notification targets": "Notification targets",
     "There was an error loading your notification settings.": "There was an error loading your notification settings.",