Address review comments

matrix-org · Jun 28, 2023 · ccd2cbd · t3chguy · Jun 28, 2023 · justjanne
1 parent adb1495
commit ccd2cbd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/res/css/_components.pcss b/res/css/_components.pcss
@@ -322,6 +322,7 @@
 @import "./views/settings/_JoinRuleSettings.pcss";
 @import "./views/settings/_KeyboardShortcut.pcss";
 @import "./views/settings/_LayoutSwitcher.pcss";
+@import "./views/settings/_NotificationPusherSettings.pcss";
 @import "./views/settings/_NotificationSettings2.pcss";
 @import "./views/settings/_Notifications.pcss";
 @import "./views/settings/_PhoneNumbers.pcss";

diff --git a/res/css/views/settings/_NotificationPusherSettings.pcss b/res/css/views/settings/_NotificationPusherSettings.pcss
@@ -0,0 +1,10 @@
+.mx_NotificationPusherSettings {
+    .mx_NotificationPusherSettings_description {
+        color: $primary-content;
+    }
+
+    .mx_NotificationPusherSettings_detail {
+        margin-top: -4px;
+        margin-bottom: 12px;
+    }
+}
diff --git a/res/css/views/settings/_NotificationSettings2.pcss b/res/css/views/settings/_NotificationSettings2.pcss
@@ -83,14 +83,3 @@ limitations under the License.
         }
     }
 }
-
-.mx_NotificationPusherSettings {
-    .mx_NotificationPusherSettings_description {
-        color: $primary-content;
-    }
-
-    .mx_NotificationPusherSettings_detail {
-        margin-top: -4px;
-        margin-bottom: 12px;
-    }
-}
diff --git a/src/models/notificationsettings/toNotificationSettings.ts b/src/models/notificationsettings/toNotificationSettings.ts
@@ -46,9 +46,7 @@ function isMuted(rules: (IPushRule | null | undefined | false)[]): boolean {
             continue;
         }
         const actions = NotificationUtils.decodeActions(rule.actions);
-        if (actions !== null && !actions.notify
-            && actions.highlight !== true
-            && actions.sound === undefined) {
+        if (actions !== null && !actions.notify && actions.highlight !== true && actions.sound === undefined) {
             return true;
         }
     }