From 4444ccb0794f77b60937282bbd9f78b8a3b100c9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Tue, 13 Jul 2021 00:02:44 -0600
Subject: [PATCH] Appease the linter

---
 src/components/views/elements/Spinner.tsx       |  2 +-
 src/components/views/settings/Notifications.tsx | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/views/elements/Spinner.tsx b/src/components/views/elements/Spinner.tsx
index 93c8f9e5d4..ee43a5bf0e 100644
--- a/src/components/views/elements/Spinner.tsx
+++ b/src/components/views/elements/Spinner.tsx
@@ -36,7 +36,7 @@ export default class Spinner extends React.PureComponent<IProps> {
                 { message && <React.Fragment><div className="mx_Spinner_Msg">{ message }</div>&nbsp;</React.Fragment> }
                 <div
                     className="mx_Spinner_icon"
-                    style={{width: w, height: h}}
+                    style={{ width: w, height: h }}
                     aria-label={_t("Loading...")}
                 />
             </div>
diff --git a/src/components/views/settings/Notifications.tsx b/src/components/views/settings/Notifications.tsx
index 4a733d7bf5..6d74e19ab1 100644
--- a/src/components/views/settings/Notifications.tsx
+++ b/src/components/views/settings/Notifications.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 import React from "react";
 import Spinner from "../elements/Spinner";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { IAnnotatedPushRule, IPusher, PushRuleKind, RuleId, } from "matrix-js-sdk/src/@types/PushRules";
+import { IAnnotatedPushRule, IPusher, PushRuleKind, RuleId } from "matrix-js-sdk/src/@types/PushRules";
 import {
     ContentRules,
     IContentRules,
@@ -80,7 +80,7 @@ const RULE_DISPLAY_ORDER: string[] = [
     RuleId.IncomingCall,
     RuleId.SuppressNotices,
     RuleId.Tombstone,
-]
+];
 
 interface IVectorPushRule {
     ruleId: RuleId | typeof KEYWORD_RULE_ID | string;
@@ -181,7 +181,7 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
             // noinspection JSUnfilteredForInLoop
             const kind = k as PushRuleKind;
             for (const r of ruleSets.global[kind]) {
-                const rule: IAnnotatedPushRule = Object.assign(r, {kind});
+                const rule: IAnnotatedPushRule = Object.assign(r, { kind });
                 const category = categories[rule.rule_id] ?? RuleClass.Other;
 
                 if (rule.rule_id[0] === '.') {
@@ -356,11 +356,12 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
             } else {
                 const definition = VectorPushRulesDefinitions[rule.ruleId];
                 const actions = definition.vectorStateToActions[checkedState];
+                const cli = MatrixClientPeg.get();
                 if (!actions) {
-                    await MatrixClientPeg.get().setPushRuleEnabled('global', rule.rule.kind, rule.rule.rule_id, false);
+                    await cli.setPushRuleEnabled('global', rule.rule.kind, rule.rule.rule_id, false);
                 } else {
-                    await MatrixClientPeg.get().setPushRuleActions('global', rule.rule.kind, rule.rule.rule_id, actions);
-                    await MatrixClientPeg.get().setPushRuleEnabled('global', rule.rule.kind, rule.rule.rule_id, true);
+                    await cli.setPushRuleActions('global', rule.rule.kind, rule.rule.rule_id, actions);
+                    await cli.setPushRuleEnabled('global', rule.rule.kind, rule.rule.rule_id, true);
                 }
             }