Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-master

1 files changed, 6 insertions, 1 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index b026222c3..835fd394b 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -111,6 +111,7 @@ export default @observer class EditSettingsForm extends Component {
     cacheSize: PropTypes.string.isRequired,
     isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
     isTodosEnabled: PropTypes.bool.isRequired,
+    isWorkspaceEnabled: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -142,6 +143,7 @@ export default @observer class EditSettingsForm extends Component {
       cacheSize,
       isSpellcheckerIncludedInCurrentPlan,
       isTodosEnabled,
+      isWorkspaceEnabled,
     } = this.props;
     const { intl } = this.context;
 
@@ -182,9 +184,12 @@ export default @observer class EditSettingsForm extends Component {
               field={form.$('server')}
               autoFocus
             />
-            { isLoggedIn && (
+            {isLoggedIn && (
               <p>{ intl.formatMessage(messages.serverInfo) }</p>
             )}
+            {isWorkspaceEnabled && (
+              <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+            )}
             {isTodosEnabled && (
               <>
                 <Toggle field={form.$('enableTodos')} />