Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit ccd2cbd

Browse files
committed
Address review comments
1 parent adb1495 commit ccd2cbd

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

res/css/_components.pcss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@
322322
@import "./views/settings/_JoinRuleSettings.pcss";
323323
@import "./views/settings/_KeyboardShortcut.pcss";
324324
@import "./views/settings/_LayoutSwitcher.pcss";
325+
@import "./views/settings/_NotificationPusherSettings.pcss";
325326
@import "./views/settings/_NotificationSettings2.pcss";
326327
@import "./views/settings/_Notifications.pcss";
327328
@import "./views/settings/_PhoneNumbers.pcss";
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.mx_NotificationPusherSettings {
2+
.mx_NotificationPusherSettings_description {
3+
color: $primary-content;
4+
}
5+
6+
.mx_NotificationPusherSettings_detail {
7+
margin-top: -4px;
8+
margin-bottom: 12px;
9+
}
10+
}

res/css/views/settings/_NotificationSettings2.pcss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,3 @@ limitations under the License.
8383
}
8484
}
8585
}
86-
87-
.mx_NotificationPusherSettings {
88-
.mx_NotificationPusherSettings_description {
89-
color: $primary-content;
90-
}
91-
92-
.mx_NotificationPusherSettings_detail {
93-
margin-top: -4px;
94-
margin-bottom: 12px;
95-
}
96-
}

src/models/notificationsettings/toNotificationSettings.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ function isMuted(rules: (IPushRule | null | undefined | false)[]): boolean {
4646
continue;
4747
}
4848
const actions = NotificationUtils.decodeActions(rule.actions);
49-
if (actions !== null && !actions.notify
50-
&& actions.highlight !== true
51-
&& actions.sound === undefined) {
49+
if (actions !== null && !actions.notify && actions.highlight !== true && actions.sound === undefined) {
5250
return true;
5351
}
5452
}

0 commit comments

Comments
 (0)