fix: activate themes on desktop

app/assets/javascripts/services/desktopManager.ts

@@ -187,10 +187,6 @@ export class DesktopManager extends ApplicationService {
     });
   }
 
-  onExtensionsReady() {
-    this.webApplication.getAppState().desktopExtensionsReady();
-  }
-
   desktop_requestBackupFile() {
     return this.application!.createBackupFile(
       undefined,

app/assets/javascripts/services/themeManager.ts

@@ -24,8 +24,8 @@ export class ThemeManager extends ApplicationService {
     if (event === ApplicationEvent.SignedOut) {
       this.deactivateAllThemes();
     } else if (event === ApplicationEvent.StorageReady) {
+      await this.activateCachedThemes();
       if (!this.webApplication.getDesktopService().isDesktop) {
-        await this.activateCachedThemes();
       }
     }
   }
@@ -50,13 +50,6 @@ export class ThemeManager extends ApplicationService {
   async onAppStart() {
     super.onAppStart();
     this.registerObservers();
-    this.unsubState = this.webApplication.getAppState().addObserver(
-      async (eventName) => {
-        if (eventName === AppStateEvent.DesktopExtsReady) {
-          this.activateCachedThemes();
-        }
-      }
-    );
   }
 
   private async activateCachedThemes() {

app/assets/javascripts/ui_models/app_state.ts

@@ -21,7 +21,6 @@ export enum AppStateEvent {
   EditorFocused = 5,
   BeganBackupDownload = 6,
   EndedBackupDownload = 7,
-  DesktopExtsReady = 8,
   WindowDidFocus = 9,
   WindowDidBlur = 10,
 };
@@ -309,13 +308,4 @@ export class AppState {
       { success: success }
     );
   }
-
-  /**
-   * When the desktop appplication extension server is ready.
-   */
-  desktopExtensionsReady() {
-    this.notifyEvent(
-      AppStateEvent.DesktopExtsReady
-    );
-  }
 }

app/assets/javascripts/views/application/application_view.ts

@@ -57,6 +57,9 @@ class ApplicationViewCtrl extends PureViewCtrl {
   }
 
   async loadApplication() {
+    this.application!.componentManager!.setDesktopManager(
+      this.application!.getDesktopService()
+    );
     await this.application!.prepareForLaunch({
       receiveChallenge: async (challenge) => {
         this.application!.promptForChallenge(challenge);
@@ -67,9 +70,6 @@ class ApplicationViewCtrl extends PureViewCtrl {
 
   async onAppStart() {
     super.onAppStart();
-    this.application!.componentManager!.setDesktopManager(
-      this.application!.getDesktopService()
-    );
     this.setState({
       ready: true,
       needsUnlock: this.application!.hasPasscode()