fix: ferdi locking with lock feature disabled (#1866)

Set run the inactivity timeout only if lock feature is enabled, and use same condition between lock
screen and locked menu

fix #1862

1 files changed, 2 insertions, 2 deletions

diff --git a/src/routes.js b/src/routes.js
index 5af0c4db9..4d32a59e0 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -35,11 +35,11 @@ export default
 @observer
 class Routes extends Component {
   render() {
-    const { locked, lockingFeatureEnabled } = this.props.stores.settings.app;
+    const { locked } = this.props.stores.settings.app;
 
     const { history } = this.props;
 
-    if (lockingFeatureEnabled && locked) {
+    if (locked) {
       return <LockedScreen />;
     }