diff --git a/src/settings/controllers/NotificationControllers.ts b/src/settings/controllers/NotificationControllers.ts index 15e5b85733..520748ea35 100644 --- a/src/settings/controllers/NotificationControllers.ts +++ b/src/settings/controllers/NotificationControllers.ts @@ -15,16 +15,15 @@ See the License for the specific language governing permissions and limitations under the License. */ +import { logger } from "matrix-js-sdk/src/logger"; +// XXX: This feels wrong. import { PushProcessor } from "matrix-js-sdk/src/pushprocessor"; import { PushRuleActionName } from "matrix-js-sdk/src/@types/PushRules"; -import { logger } from "matrix-js-sdk/src/logger"; import SettingController from "./SettingController"; import { MatrixClientPeg } from '../../MatrixClientPeg'; import { SettingLevel } from "../SettingLevel"; -// XXX: This feels wrong. - // .m.rule.master being enabled means all events match that push rule // default action on this rule is dont_notify, but it could be something else export function isPushNotifyDisabled(): boolean { diff --git a/src/utils/createMatrixClient.ts b/src/utils/createMatrixClient.ts index 3fed5363d7..a57b2e8c4c 100644 --- a/src/utils/createMatrixClient.ts +++ b/src/utils/createMatrixClient.ts @@ -13,14 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - -// @ts-ignore - `.ts` is needed here to make TS happy import { createClient, ICreateClientOpts } from "matrix-js-sdk/src/matrix"; import { IndexedDBCryptoStore } from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store"; import { WebStorageSessionStore } from "matrix-js-sdk/src/store/session/webstorage"; import { IndexedDBStore } from "matrix-js-sdk/src/store/indexeddb"; -import IndexedDBWorker from "../workers/indexeddb.worker.ts"; +import IndexedDBWorker from "../workers/indexeddb.worker.ts"; // @ts-ignore - `.ts` is needed here to make TS happy const localStorage = window.localStorage;