6 files changed, 33 insertions, 38 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a917ba6f2..68a35f746 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## [5.3.2](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.2) (2019-09-12)
+
+
+### Features
+
+* **Todos:** Move todos toggle to sidebar ([7ffcf8c](https://github.com/meetfranz/franz/commit/7ffcf8c))
+* **Workspaces:** Add setting to keep all services in workspaces in background (avoid reload) ([@Wouter0100](https://github.com/Wouter0100)) ([ddab3a8](https://github.com/meetfranz/franz/commit/ddab3a8))
+
+
+### Bug Fixes
+
+* **Settings:** Don't toggle Todos on general settings changes ([@vantezzen](https://github.com/vantezzen)) ([a99371b](https://github.com/meetfranz/franz/commit/a99371b))
+
+
+### General
+
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+
+
 # [5.3.1](https://github.com/meetfranz/franz/compare/v5.3.0...v5.3.1) (2019-09-06)
 
 ### Features
diff --git a/package.json b/package.json
index 980242e5f..f1283ee9c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index bac57d4dc..918298011 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -112,7 +112,7 @@ export default @observer class Sidebar extends Component {
               this.updateToolTip();
               gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'sidebar');
             }}
-            className="sidebar__button sidebar__button--workspaces"
+            className={`sidebar__button sidebar__button--todos  ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`}
             data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
           >
             <i className="mdi mdi-check-all" />
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
index a07f9f63a..fd8bc738a 100644
--- a/src/features/spellchecker/index.js
+++ b/src/features/spellchecker/index.js
@@ -16,7 +16,7 @@ export default function init(stores) {
 
     config.isIncludedInCurrentPlan = isSpellcheckerIncludedInCurrentPlan !== undefined ? isSpellcheckerIncludedInCurrentPlan : DEFAULT_FEATURES_CONFIG.isSpellcheckerIncludedInCurrentPlan;
 
-    if (!stores.user.data.isPremium && config.isIncludedInCurrentPlan && stores.settings.app.enableSpellchecking) {
+    if (!stores.user.data.isPremium && !config.isIncludedInCurrentPlan && stores.settings.app.enableSpellchecking) {
       debug('Override settings.spellcheckerEnabled flag to false');
 
       Object.assign(stores.settings.app, {
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 4aa2edaba..b72f0df96 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -548,6 +548,11 @@ const _titleBarTemplateFactory = intl => [
     visible: workspaceStore.isFeatureEnabled,
   },
   {
+    label: intl.formatMessage(menuItems.todos),
+    submenu: [],
+    visible: todosStore.isFeatureEnabled,
+  },
+  {
     label: intl.formatMessage(menuItems.window),
     submenu: [
       {
@@ -943,12 +948,12 @@ export default class FranzMenu {
         gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu');
       },
       enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser,
-    }, {
-      type: 'separator',
     });
 
     if (!isFeatureEnabledByUser) {
       menu.push({
+        type: 'separator',
+      }, {
         label: intl.formatMessage(menuItems.enableTodos),
         click: () => {
           todoActions.toggleTodosFeatureVisibility();
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index a456195bf..75bb38fe0 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,12 +1,11 @@
 import { ipcRenderer } from 'electron';
 import {
-  action, computed, observable, set,
+  action, computed, observable,
 } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
-import CachedRequest from './lib/CachedRequest';
 import { getLocale } from '../helpers/i18n-helpers';
 
 import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
@@ -15,12 +14,8 @@ import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 const debug = require('debug')('Franz:SettingsStore');
 
 export default class SettingsStore extends Store {
-  @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
-
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
 
-  fileSystemSettingsRequests = [];
-
   fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
 
   @observable _fileSystemSettingsCache = {
@@ -35,14 +30,10 @@ export default class SettingsStore extends Store {
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
 
-    this.fileSystemSettingsTypes.forEach((type) => {
-      this.fileSystemSettingsRequests[type] = new CachedRequest(this.api.local, 'getAppSettings');
-    });
-
     ipcRenderer.on('appSettings', (event, resp) => {
       debug('Get appSettings resolves', resp.type, resp.data);
 
-      this._fileSystemSettingsCache[resp.type] = resp.data;
+      Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
     });
 
     this.fileSystemSettingsTypes.forEach((type) => {
@@ -51,8 +42,6 @@ export default class SettingsStore extends Store {
   }
 
   async setup() {
-    // We need to wait until `appSettingsRequest` has been executed once, otherwise we can't patch the result. If we don't wait we'd run into an issue with mobx not reacting to changes of previously not existing keys
-    await this.appSettingsRequest._promise;
     await this._migrate();
   }
 
@@ -61,21 +50,6 @@ export default class SettingsStore extends Store {
   }
 
   @computed get proxy() {
-    // // We need to provide the final data structure as mobx autoruns won't work
-    // const proxySettings = observable({});
-    // this.stores.services.all.forEach((service) => {
-    //   proxySettings[service.id] = {
-    //     isEnabled: false,
-    //     host: null,
-    //     user: null,
-    //     password: null,
-    //   };
-    // });
-
-    // debug('this._fileSystemSettingsCache.proxy', this._fileSystemSettingsCache.proxy, proxySettings);
-
-    // return Object.assign(proxySettings, this._fileSystemSettingsCache.proxy);
-
     return this._fileSystemSettingsCache.proxy || {};
   }
 
@@ -117,7 +91,7 @@ export default class SettingsStore extends Store {
         data,
       });
 
-      set(this._fileSystemSettingsCache[type], data);
+      Object.assign(this._fileSystemSettingsCache[type], data);
     }
   }
 
@@ -197,8 +171,4 @@ export default class SettingsStore extends Store {
       });
     }
   }
-
-  _getFileBasedSettings(type) {
-    ipcRenderer.send('getAppSettings', type);
-  }
 }