Merges master

2020-03-14 12:05:38 -05:00
parent 8fcfef08a6 be9287c70a
commit 2e0528b754
18 changed files with 1453 additions and 89822 deletions
--- a/app/assets/javascripts/directives/views/accountMenu.js
+++ b/app/assets/javascripts/directives/views/accountMenu.js
@@ -199,6 +199,7 @@ class AccountMenuCtrl extends PureCtrl {
    }
    await this.setFormDataState({
      status: null,
+      user_password: null
    });
    const error = response
      ? response.error
@@ -462,6 +463,19 @@ class AccountMenuCtrl extends PureCtrl {
    }
  }

+  hidePasswordForm() {
+    this.setFormDataState({
+      showLogin: false,
+      showRegister: false,
+      user_password: null,
+      password_conf: null
+    });
+  }
+
+  hasPasscode() {
+    return this.passcodeManager.hasPasscode();
+  }
+
  addPasscodeClicked() {
    this.setFormDataState({
      showPasscodeForm: true