strict fixes

src/components/views/settings/Notifications.tsx

@@ -494,6 +494,10 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
             } else {
                 const definition: VectorPushRuleDefinition = VectorPushRulesDefinitions[rule.ruleId];
                 const actions = definition.vectorStateToActions[checkedState];
+                // we should not encounter this
+                if (!rule.rule) {
+                    throw new Error("Unable to update rule without rule_id");
+                }
                 await updatePushRuleActions(cli, rule.rule.rule_id, rule.rule.kind, actions);
                 await updateExistingPushRulesWithActions(cli, definition.syncedRuleIds, actions);
             }

src/utils/pushRules/monitorSyncedPushRules.ts

@@ -44,9 +44,9 @@ const monitorSyncedRule = async (
     if (!primaryRule) {
         return;
     }
-    const syncedRules: IAnnotatedPushRule[] = definition.syncedRuleIds
+    const syncedRules: IAnnotatedPushRule[] | undefined = definition.syncedRuleIds
         ?.map((ruleId) => pushRuleAndKindToAnnotated(pushProcessor.getPushRuleAndKindById(ruleId)))
-        .filter(Boolean);
+        .filter((n?: IAnnotatedPushRule): n is IAnnotatedPushRule => Boolean(n));
 
     // no synced rules to manage
     if (!syncedRules?.length) {
@@ -70,7 +70,7 @@ const monitorSyncedRule = async (
 };
 
 export const monitorSyncedPushRules = async (
-    accountDataEvent: MatrixEvent,
+    accountDataEvent: MatrixEvent | undefined,
     matrixClient: MatrixClient,
 ): Promise<void> => {
     if (accountDataEvent?.getType() !== EventType.PushRules) {

src/utils/pushRules/updatePushRuleActions.ts

@@ -40,6 +40,11 @@ export const updatePushRuleActions = async (
     }
 };
 
+interface PushRuleAndKind {
+    rule: IPushRule;
+    kind: PushRuleKind;
+}
+
 /**
  * Update push rules with given actions
  * Where they already exist for current user
@@ -50,14 +55,14 @@ export const updatePushRuleActions = async (
  */
 export const updateExistingPushRulesWithActions = async (
     matrixClient: MatrixClient,
-    ruleIds: IPushRule["rule_id"][],
+    ruleIds?: IPushRule["rule_id"][],
     actions?: PushRuleAction[],
 ): Promise<void> => {
     const pushProcessor = new PushProcessor(matrixClient);
 
-    const rules: ReturnType<PushProcessor["getPushRuleAndKindById"]>[] = ruleIds
+    const rules: PushRuleAndKind[] | undefined = ruleIds
         ?.map((ruleId) => pushProcessor.getPushRuleAndKindById(ruleId))
-        .filter(Boolean);
+        .filter((n: PushRuleAndKind | null): n is PushRuleAndKind => Boolean(n));
 
     if (!rules?.length) {
         return;

test/components/structures/LoggedInView-test.tsx

@@ -318,7 +318,7 @@ describe("<LoggedInView />", () => {
 
                 mockClient.emit(ClientEvent.AccountData, pushRulesEvent);
 
-                // set to match primary rule
+                // not called
                 expect(mockClient.setPushRuleActions).not.toHaveBeenCalled();
             });
         });