diff --git a/src/common/__tests__/user-store.test.ts b/src/common/__tests__/user-store.test.ts index 8380c7badb..00a63486c1 100644 --- a/src/common/__tests__/user-store.test.ts +++ b/src/common/__tests__/user-store.test.ts @@ -81,8 +81,6 @@ describe("user store tests", () => { it("correctly resets theme to default value", async () => { const us = UserStore.getInstance(); - us.isLoaded = true; - us.colorTheme = "some other theme"; await us.resetTheme(); expect(us.colorTheme).toBe(UserStore.defaultTheme); diff --git a/src/common/base-store.ts b/src/common/base-store.ts index b85eea1004..d30725d6bb 100644 --- a/src/common/base-store.ts +++ b/src/common/base-store.ts @@ -23,7 +23,7 @@ import path from "path"; import Config from "conf"; import type { Options as ConfOptions } from "conf/dist/source/types"; import { app, ipcMain, ipcRenderer, remote } from "electron"; -import { IReactionOptions, makeObservable, observable, reaction, runInAction, when } from "mobx"; +import { IReactionOptions, makeObservable, reaction, runInAction } from "mobx"; import { getAppVersion, Singleton, toJS, Disposer } from "./utils"; import logger from "../main/logger"; import { broadcastMessage, ipcMainOn, ipcRendererOn } from "./ipc"; @@ -40,12 +40,6 @@ export abstract class BaseStore extends Singleton { protected storeConfig?: Config; protected syncDisposers: Disposer[] = []; - @observable isLoaded = false; - - get whenLoaded() { - return when(() => this.isLoaded); - } - protected constructor(protected params: BaseStoreParams) { super(); makeObservable(this); @@ -64,8 +58,6 @@ export abstract class BaseStore extends Singleton { logger.info(`[STORE]: LOADED from ${this.path}`); this.fromStore(this.storeConfig.store); - this.isLoaded = true; - this.enableSync(); } diff --git a/src/extensions/extension-loader.ts b/src/extensions/extension-loader.ts index 68e54828dc..7c9c4abc5d 100644 --- a/src/extensions/extension-loader.ts +++ b/src/extensions/extension-loader.ts @@ -77,7 +77,7 @@ export class ExtensionLoader extends Singleton { if (this.instancesByName.has(change.newValue.name)) { throw new TypeError("Extension names must be unique"); } - + this.instancesByName.set(change.newValue.name, change.newValue); break; case "delete": @@ -124,7 +124,7 @@ export class ExtensionLoader extends Singleton { await this.initMain(); } - await Promise.all([this.whenLoaded, ExtensionsStore.getInstance().whenLoaded]); + await Promise.all([this.whenLoaded]); // broadcasting extensions between main/renderer processes reaction(() => this.toJSON(), () => this.broadcastExtensions(), {