From b225324c49a505bb14b428ff236a1dda91b6ff5c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 15 Jun 2020 10:53:53 +0100 Subject: [PATCH 1/3] improve Field typescript definition Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/elements/Field.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx index 771d2182ea..0a3aa8ed71 100644 --- a/src/components/views/elements/Field.tsx +++ b/src/components/views/elements/Field.tsx @@ -18,7 +18,7 @@ import React from 'react'; import classNames from 'classnames'; import * as sdk from '../../../index'; import { debounce } from 'lodash'; -import {IFieldState, IValidationResult} from "../elements/Validation"; +import {IFieldState, IValidationResult} from "./Validation"; // Invoke validation from user input (when typing, etc.) at most once every N ms. const VALIDATION_THROTTLE_MS = 200; @@ -29,7 +29,7 @@ function getId() { return `${BASE_ID}_${count++}`; } -interface IProps extends React.InputHTMLAttributes { +interface IProps extends React.InputHTMLAttributes { // The field's ID, which binds the input and label together. Immutable. id?: string, // The element to create. Defaults to "input". From 1628fc668c6b693cf7b75b2de123c0be759541ce Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 16 Jun 2020 19:38:54 +0100 Subject: [PATCH 2/3] Fix LocalEchoWrapper cache on falsey room ids Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/settings/handlers/LocalEchoWrapper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/handlers/LocalEchoWrapper.js b/src/settings/handlers/LocalEchoWrapper.js index 4cbe4891be..fd0510296a 100644 --- a/src/settings/handlers/LocalEchoWrapper.js +++ b/src/settings/handlers/LocalEchoWrapper.js @@ -39,7 +39,7 @@ export default class LocalEchoWrapper extends SettingsHandler { const cacheRoomId = roomId ? roomId : "UNDEFINED"; // avoid weird keys const bySetting = this._cache[settingName]; if (bySetting && bySetting.hasOwnProperty(cacheRoomId)) { - return bySetting[roomId]; + return bySetting[cacheRoomId]; } return this._handler.getValue(settingName, roomId); From 3472fcdec5f5bd70c66acf26fff949a38ea55408 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 16 Jun 2020 19:39:18 +0100 Subject: [PATCH 3/3] Fix NotificationsEnabledController inverse understanding of master push rule Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/settings/controllers/NotificationControllers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js index 395da765a1..f74dc22e84 100644 --- a/src/settings/controllers/NotificationControllers.js +++ b/src/settings/controllers/NotificationControllers.js @@ -45,7 +45,7 @@ export class NotificationsEnabledController extends SettingController { if (!getNotifier().isPossible()) return false; if (calculatedValue === null || calculatedAtLevel === "default") { - return isMasterRuleEnabled(); + return !isMasterRuleEnabled(); } return calculatedValue; @@ -63,7 +63,7 @@ export class NotificationBodyEnabledController extends SettingController { if (!getNotifier().isPossible()) return false; if (calculatedValue === null) { - return isMasterRuleEnabled(); + return !isMasterRuleEnabled(); } return calculatedValue;