WIP

app/assets/javascripts/directives/views/accountMenu.js

@@ -40,10 +40,8 @@ class AccountMenuCtrl extends PureCtrl {
     godService,
     lockManager,
   ) {
-    super($timeout);
-    this.$scope = $scope;
+    super($scope, $timeout, application, appState);
     this.$rootScope = $rootScope;
-    this.$timeout = $timeout;
     this.appState = appState;
     this.application = application;
     this.archiveManager = archiveManager;
@@ -59,7 +57,7 @@ class AccountMenuCtrl extends PureCtrl {
       },
       mutable: {}
     };
-    application.onReady(async () => {
+    application.onUnlock(async () => {
       this.setState(await this.refreshedCredentialState());
       this.loadHost();
       this.checkForSecurityUpdate();

app/assets/javascripts/directives/views/actionsMenu.js

@@ -4,13 +4,13 @@ import { PureCtrl } from '@Controllers';
 class ActionsMenuCtrl extends PureCtrl {
   /* @ngInject */
   constructor(
+    $scope,
     $timeout,
     application,
+    appState,
     godService
   ) {
-    super($timeout);
-    this.$timeout = $timeout;
-    this.application = application;
+    super($scope, $timeout, application, appState);
     this.godService = godService;
   }
 

app/assets/javascripts/directives/views/editorMenu.js

@@ -5,11 +5,12 @@ import { PureCtrl } from '@Controllers';
 class EditorMenuCtrl extends PureCtrl {
   /* @ngInject */
   constructor(
+    $scope,
     $timeout,
-    application
+    application,
+    appState
   ) {
-    super($timeout);
-    this.application = application;
+    super($scope, $timeout, application, appState);
     this.state = {
       isDesktop: isDesktopApplication()
     };

app/assets/javascripts/directives/views/privilegesManagementModal.js

@@ -11,7 +11,7 @@ class PrivilegesManagementModalCtrl {
     this.$element = $element;
     this.$timeout = $timeout;
     this.application = application;
-    application.onReady(() => {
+    application.onUnlock(() => {
       this.hasPasscode = application.hasPasscode();
       this.hasAccount = !application.noAccount();
       this.reloadPrivileges();