From d088d74069cf282083901fc99fa51c9594a395b0 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Wed, 7 Oct 2020 12:42:25 +0200
Subject: [PATCH] fix: remove public beta flags

---
 .../javascripts/directives/views/accountMenu.ts    | 14 +++-----------
 app/assets/javascripts/views/footer/footer_view.ts |  5 -----
 app/assets/templates/directives/account-menu.pug   |  6 ++----
 webpack.config.js                                  |  1 -
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/directives/views/accountMenu.ts b/app/assets/javascripts/directives/views/accountMenu.ts
index a4ed194b7..b5faec985 100644
--- a/app/assets/javascripts/directives/views/accountMenu.ts
+++ b/app/assets/javascripts/directives/views/accountMenu.ts
@@ -63,11 +63,8 @@ type AccountMenuState = {
   server: string;
   encryptionEnabled: boolean;
   selectedAutoLockInterval: any;
-  strictSigninDisabled: boolean;
 }
 
-declare const __PUBLIC_BETA__: boolean;
-
 class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
 
   public appVersion: string
@@ -94,7 +91,6 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
         mergeLocal: true,
         ephemeral: false,
       },
-      strictSigninDisabled: __PUBLIC_BETA__,
       mutable: {}
     } as AccountMenuState;
   }
@@ -336,13 +332,9 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
   }
 
   showRegister() {
-    if (__PUBLIC_BETA__) {
-      alertDialog({ text: 'Registration is disabled for this beta version.' });
-    } else {
-      this.setFormDataState({
-        showRegister: true
-      });
-    }
+    this.setFormDataState({
+      showRegister: true
+    });
   }
 
   async readFile(file: File): Promise<any> {
diff --git a/app/assets/javascripts/views/footer/footer_view.ts b/app/assets/javascripts/views/footer/footer_view.ts
index b8a529f3b..75c5bd397 100644
--- a/app/assets/javascripts/views/footer/footer_view.ts
+++ b/app/assets/javascripts/views/footer/footer_view.ts
@@ -28,8 +28,6 @@ import {
 import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
 import { confirmDialog } from '@/services/alertService';
 
-declare const __PUBLIC_BETA__: boolean;
-
 /**
  * Disable before production release.
  * Anyone who used the beta will still have access to
@@ -141,9 +139,6 @@ class FooterViewCtrl extends PureViewCtrl<{}, {
 
   reloadUpgradeStatus() {
     this.application.checkForSecurityUpdate().then((available) => {
-      if (__PUBLIC_BETA__) {
-        return;
-      }
       this.setState({
         dataUpgradeAvailable: available
       });
diff --git a/app/assets/templates/directives/account-menu.pug b/app/assets/templates/directives/account-menu.pug
index 324368de8..4e9f08255 100644
--- a/app/assets/templates/directives/account-menu.pug
+++ b/app/assets/templates/directives/account-menu.pug
@@ -84,13 +84,11 @@
                 )
                 .sk-horizontal-group.tight
                   input.sk-input(
-                    ng-disabled="self.state.strictSigninDisabled"
                     ng-model='self.state.formData.strictSignin',
                     type='checkbox'
                     )
-                  p.sk-p(ng-if="!self.state.strictSigninDisabled") Use strict sign in
-                  p.sk-p(ng-if="self.state.strictSigninDisabled") Strict sign is disabled for this beta version
-                  span(ng-if="!self.state.strictSigninDisabled")
+                  p.sk-p Use strict sign in
+                  span
                     a.info(
                       href='https://standardnotes.org/help/security',
                       rel='noopener',
diff --git a/webpack.config.js b/webpack.config.js
index 778b9a4e2..a8765035c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -15,7 +15,6 @@ module.exports = (env = {
       __VERSION__: JSON.stringify(require('./package.json').version),
       __WEB__: JSON.stringify(env.platform === 'web'),
       __DESKTOP__: JSON.stringify(env.platform === 'desktop'),
-      __PUBLIC_BETA__: JSON.stringify(env.public_beta === 'true'),
     }),
     new MiniCssExtractPlugin({
       // Options similar to the same options in webpackOptions.output