Root ctrl updates

app/assets/javascripts/controllers/root.js

@@ -51,9 +51,12 @@ class RootCtrl extends PureCtrl {
     super.onAppStart();
     this.overrideComponentManagerFunctions();
     this.application.componentManager.setDesktopManager(this.desktopManager);
-    this.setState({ ready: true });
+    this.setState({
+      ready: true,
+      needsUnlock: this.application.hasPasscode()
+    });
   }
-  
+
   onAppLaunch() {
     super.onAppLaunch();
     this.setState({ needsUnlock: false });
@@ -64,10 +67,11 @@ class RootCtrl extends PureCtrl {
   async watchLockscreenValue() {
     return new Promise((resolve) => {
       const onLockscreenValue = (value) => {
-        resolve(new ChallengeResponse({
+        const response = new ChallengeResponse({
           challenge: Challenges.LocalPasscode,
           value: value
-        }));
+        });
+        resolve([response]);
       };
       this.setState({ onLockscreenValue });
     });

app/assets/templates/root.pug

@@ -1,6 +1,5 @@
 .main-ui-view(
   ng-class='self.platformString'
-  ng-if='self.state.ready'
 )
   lock-screen(
     ng-if='self.state.needsUnlock'
@@ -9,12 +8,12 @@
     )
   #app.app(
     ng-class='self.state.appClass', 
-    ng-if='!self.state.needsUnlock'
+    ng-if='!self.state.needsUnlock && self.state.ready'
     )
     tags-panel
     notes-panel
     editor-panel
 
   footer(
-    ng-if='!self.state.needsUnlock'
+    ng-if='!self.state.needsUnlock && self.state.ready'
     )

package.json

@@ -8,6 +8,7 @@
   },
   "scripts": {
     "start": "webpack-dev-server --progress",
+    "watch": "webpack --mode development -w",
     "bundle": "webpack --mode production",
     "build": "bundle install && npm install && npm run bundle",
     "submodules": "git submodule update --init --force --remote",