Move LockedScreen to AppLayout

4 files changed, 20 insertions, 13 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index b47a6040d..eb36ea431 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -22,6 +22,8 @@ import AppUpdateInfoBar from '../AppUpdateInfoBar';
 import Todos from '../../features/todos/containers/TodosScreen';
 import { Icon } from '../ui/icon';
 
+import LockedScreen from '../../containers/auth/LockedScreen';
+
 const messages = defineMessages({
   servicesUpdated: {
     id: 'infobar.servicesUpdated',
@@ -76,6 +78,7 @@ const toggleFullScreen = () => {
 class AppLayout extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
+    settings: PropTypes.object.isRequired,
     isFullScreen: PropTypes.bool.isRequired,
     sidebar: PropTypes.element.isRequired,
     workspacesDrawer: PropTypes.element.isRequired,
@@ -114,6 +117,7 @@ class AppLayout extends Component {
       authRequestFailed,
       reloadServicesAfterUpdate,
       installAppUpdate,
+      settings,
       showRequiredRequestsError,
       areRequiredRequestsSuccessful,
       retryRequiredRequests,
@@ -122,6 +126,11 @@ class AppLayout extends Component {
 
     const { intl } = this.props;
 
+    const { locked } = settings.app;
+    if (locked) {
+      return <LockedScreen />;
+    }
+
     return (
       <ErrorBoundary>
         <div className="app">
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 9b0edc85e..536083c4f 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -144,6 +144,7 @@ class AppLayoutContainer extends Component {
     return (
       <ThemeProvider theme={ui.theme}>
         <AppLayout
+          settings={settings}
           isFullScreen={app.isFullScreen}
           isOnline={app.isOnline}
           showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 8e529d859..38302b40b 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -591,7 +591,10 @@ class FranzMenu {
     }
 
     const { intl } = window['ferdi'];
-    const tpl = _titleBarTemplateFactory(intl, this.stores.settings.app.locked);
+    const locked = this.stores.settings.app.locked
+      && this.stores.settings.app.lockingFeatureEnabled
+      && this.stores.user.isLoggedIn;
+    const tpl = _titleBarTemplateFactory(intl, locked);
     const { actions } = this;
 
     if (!isMac) {
@@ -611,7 +614,7 @@ class FranzMenu {
       });
     }
 
-    if (!this.stores.settings.app.locked) {
+    if (!locked) {
       tpl[1].submenu.push(
         {
           type: 'separator',
@@ -755,18 +758,18 @@ class FranzMenu {
             this.actions.ui.openSettings({ path: 'app' });
           },
           enabled: this.stores.user.isLoggedIn,
-          visible: !this.stores.settings.app.locked,
+          visible: !locked,
         },
         {
           label: intl.formatMessage(menuItems.checkForUpdates),
-          visible: !this.stores.settings.app.locked,
+          visible: !locked,
           click: () => {
             this.actions.app.checkForUpdates();
           },
         },
         {
           type: 'separator',
-          visible: !this.stores.settings.app.locked,
+          visible: !locked,
         },
         {
           label: intl.formatMessage(menuItems.services),
@@ -846,7 +849,7 @@ class FranzMenu {
             this.actions.ui.openSettings({ path: 'app' });
           },
           enabled: this.stores.user.isLoggedIn,
-          visible: !this.stores.settings.locked,
+          visible: !locked,
         },
         {
           type: 'separator',
@@ -868,7 +871,7 @@ class FranzMenu {
       );
     }
 
-    if (!this.stores.settings.app.locked) {
+    if (!locked) {
       if (serviceTpl.length > 0) {
         tpl[3].submenu = serviceTpl;
       }
diff --git a/src/routes.tsx b/src/routes.tsx
index 192090737..62e6f5066 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -15,7 +15,6 @@ import InviteSettingsScreen from './containers/settings/InviteScreen';
 import SupportFerdiScreen from './containers/settings/SupportScreen';
 import WelcomeScreen from './containers/auth/WelcomeScreen';
 import LoginScreen from './containers/auth/LoginScreen';
-import LockedScreen from './containers/auth/LockedScreen';
 import PasswordScreen from './containers/auth/PasswordScreen';
 import ChangeServerScreen from './containers/auth/ChangeServerScreen';
 import SignupScreen from './containers/auth/SignupScreen';
@@ -38,14 +37,9 @@ type Props = {
 
 class Routes extends Component<Props> {
   render() {
-    const { locked } = this.props.stores.settings.app;
 
     const { history } = this.props;
 
-    if (locked) {
-      return <LockedScreen />;
-    }
-
     return (
       <Router history={history}>
         <Route path="/" component={AppLayoutContainer}>