12 files changed, 212 insertions, 120 deletions

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.jsx
index 502f87225..835c5125e 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.jsx
@@ -1,7 +1,7 @@
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { makeObservable, observable, reaction } from 'mobx';
+import { action, makeObservable, observable, reaction } from 'mobx';
 import ElectronWebView from 'react-electron-web-view';
 import { join } from 'path';
 
@@ -69,6 +69,10 @@ class ServiceWebview extends Component {
     }
   };
 
+  @action _setWebview(webview) {
+    this.webview = webview;
+  }
+
   render() {
     const { service, setWebviewReference, isSpellcheckerEnabled } = this.props;
 
@@ -84,7 +88,7 @@ class ServiceWebview extends Component {
     return (
       <ElectronWebView
         ref={webview => {
-          this.webview = webview;
+          this._setWebview(webview);
           if (webview && webview.view) {
             webview.view.addEventListener(
               'did-stop-loading',
diff --git a/src/features/serviceProxy/index.ts b/src/features/serviceProxy/index.ts
index 51e67feca..eb3b89ece 100644
--- a/src/features/serviceProxy/index.ts
+++ b/src/features/serviceProxy/index.ts
@@ -1,4 +1,4 @@
-import { autorun, observable } from 'mobx';
+import { autorun, action, observable } from 'mobx';
 import { session } from '@electron/remote';
 
 const debug = require('../../preload-safe-debug')(
@@ -15,8 +15,12 @@ export default function init(stores: {
 }) {
   debug('Initializing `serviceProxy` feature');
 
+  const setIsEnabled = action((value: boolean) => {
+    config.isEnabled = value;
+  });
+
   autorun(() => {
-    config.isEnabled = true;
+    setIsEnabled(true);
 
     const services = stores.services.enabled;
     const proxySettings = stores.settings.proxy;
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.jsx
index e5567eec5..25e14060d 100644
--- a/src/features/webControls/containers/WebControlsScreen.js
+++ b/src/features/webControls/containers/WebControlsScreen.jsx
@@ -2,7 +2,7 @@ import { Component } from 'react';
 import { observer, inject } from 'mobx-react';
 import PropTypes from 'prop-types';
 
-import { autorun, makeObservable, observable } from 'mobx';
+import { autorun, action, makeObservable, observable } from 'mobx';
 import WebControls from '../components/WebControls';
 import ServicesStore from '../../../stores/ServicesStore';
 import Service from '../../../models/Service';
@@ -27,6 +27,16 @@ class WebControlsScreen extends Component {
 
   autorunDisposer = null;
 
+  @action _setUrl(value) {
+    this.url = value;
+  }
+
+  @action _setUrlAndHistory(value) {
+    this._setUrl(value);
+    this.canGoBack = this.webview.canGoBack();
+    this.canGoForward = this.webview.canGoForward();
+  }
+
   constructor(props) {
     super(props);
 
@@ -39,15 +49,13 @@ class WebControlsScreen extends Component {
     this.autorunDisposer = autorun(() => {
       if (service.isAttached) {
         this.webview = service.webview;
-        this.url = this.webview.getURL();
+        this._setUrl(this.webview.getURL());
 
         for (const event of URL_EVENTS) {
           this.webview.addEventListener(event, e => {
             if (!e.isMainFrame) return;
 
-            this.url = e.url;
-            this.canGoBack = this.webview.canGoBack();
-            this.canGoForward = this.webview.canGoForward();
+            this._setUrlAndHistory(e.url);
           });
         }
       }
@@ -101,7 +109,7 @@ class WebControlsScreen extends Component {
     }
 
     this.webview.loadURL(url);
-    this.url = url;
+    this._setUrl(url);
   }
 
   openInBrowser() {
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index a8fb493df..2323019fe 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -90,7 +90,7 @@ export default class WorkspacesStore extends FeatureStore {
       [workspaceActions.create, this._create],
       [workspaceActions.delete, this._delete],
       [workspaceActions.update, this._update],
-      [workspaceActions.activate, this._setActiveWorkspace],
+      [workspaceActions.activate, this._setActivateWorkspace],
       [workspaceActions.deactivate, this._deactivateActiveWorkspace],
       [
         workspaceActions.toggleKeepAllWorkspacesLoadedSetting,
@@ -114,10 +114,10 @@ export default class WorkspacesStore extends FeatureStore {
   }
 
   @action reset() {
-    this.activeWorkspace = null;
-    this.nextWorkspace = null;
+    this._setActiveWorkspace(null);
+    this._setNextWorkspace(null);
     this.workspaceBeingEdited = null;
-    this.isSwitchingWorkspace = false;
+    this._setIsSwitchingWorkspace(false);
     this.isWorkspaceDrawerOpen = false;
   }
 
@@ -181,19 +181,31 @@ export default class WorkspacesStore extends FeatureStore {
     this.stores.router.push('/settings/workspaces');
   };
 
-  @action _setActiveWorkspace = ({ workspace }) => {
-    // Indicate that we are switching to another workspace
-    this.isSwitchingWorkspace = true;
+  @action _setNextWorkspace(workspace) {
     this.nextWorkspace = workspace;
+  }
+
+  @action _setIsSwitchingWorkspace(bool) {
+    this.isSwitchingWorkspace = bool;
+  }
+
+  @action _setActiveWorkspace(workspace) {
+    this.activeWorkspace = workspace;
+  }
+
+  @action _setActivateWorkspace = ({ workspace }) => {
+    // Indicate that we are switching to another workspace
+    this._setIsSwitchingWorkspace(true);
+    this._setNextWorkspace(workspace);
     // Delay switching to next workspace so that the services loading does not drag down UI
     setTimeout(() => {
-      this.activeWorkspace = workspace;
+      this._setActiveWorkspace(workspace);
       this._updateSettings({ lastActiveWorkspace: workspace.id });
     }, 100);
     // Indicate that we are done switching to the next workspace
     setTimeout(() => {
-      this.isSwitchingWorkspace = false;
-      this.nextWorkspace = null;
+      this._setIsSwitchingWorkspace(false);
+      this._setNextWorkspace(null);
       if (this.stores.settings.app.splitMode) {
         const serviceNames = new Set(
           this.getWorkspaceServices(workspace).map(service => service.name),
@@ -211,16 +223,16 @@ export default class WorkspacesStore extends FeatureStore {
 
   @action _deactivateActiveWorkspace = () => {
     // Indicate that we are switching to default workspace
-    this.isSwitchingWorkspace = true;
-    this.nextWorkspace = null;
+    this._setIsSwitchingWorkspace(true);
+    this._setNextWorkspace(null);
     this._updateSettings({ lastActiveWorkspace: null });
     // Delay switching to next workspace so that the services loading does not drag down UI
     setTimeout(() => {
-      this.activeWorkspace = null;
+      this._setActiveWorkspace(null);
     }, 100);
     // Indicate that we are done switching to the default workspace
     setTimeout(() => {
-      this.isSwitchingWorkspace = false;
+      this._setIsSwitchingWorkspace(false);
       if (this.stores.settings.app.splitMode) {
         for (const wrapper of document.querySelectorAll(
           '.services__webview-wrapper',
@@ -247,6 +259,37 @@ export default class WorkspacesStore extends FeatureStore {
     await updateWorkspaceRequest.execute(activeWorkspace);
   };
 
+  @action _setOpenDrawerWithSettings() {
+    const { router } = this.stores;
+    const isWorkspaceSettingsRoute = router.location.pathname.includes(
+      WORKSPACES_ROUTES.ROOT,
+    );
+    const isSwitchingToSettingsRoute =
+      !this.isSettingsRouteActive && isWorkspaceSettingsRoute;
+    const isLeavingSettingsRoute =
+      !isWorkspaceSettingsRoute && this.isSettingsRouteActive;
+
+    if (isSwitchingToSettingsRoute) {
+      this.isSettingsRouteActive = true;
+      this._wasDrawerOpenBeforeSettingsRoute = this.isWorkspaceDrawerOpen;
+      if (!this._wasDrawerOpenBeforeSettingsRoute) {
+        workspaceActions.toggleWorkspaceDrawer();
+      }
+    } else if (isLeavingSettingsRoute) {
+      this.isSettingsRouteActive = false;
+      if (
+        !this._wasDrawerOpenBeforeSettingsRoute &&
+        this.isWorkspaceDrawerOpen
+      ) {
+        workspaceActions.toggleWorkspaceDrawer();
+      }
+    }
+  }
+
+  @action _setWorkspaceBeingEdited(match) {
+    this.workspaceBeingEdited = this._getWorkspaceById(match.id);
+  }
+
   _toggleKeepAllWorkspacesLoadedSetting = async () => {
     this._updateSettings({
       keepAllWorkspacesLoaded: !this.settings.keepAllWorkspacesLoaded,
@@ -259,7 +302,7 @@ export default class WorkspacesStore extends FeatureStore {
     const { pathname } = this.stores.router.location;
     const match = matchRoute('/settings/workspaces/edit/:id', pathname);
     if (match) {
-      this.workspaceBeingEdited = this._getWorkspaceById(match.id);
+      this._setWorkspaceBeingEdited(match);
     }
   };
 
@@ -286,36 +329,13 @@ export default class WorkspacesStore extends FeatureStore {
       const { lastActiveWorkspace } = this.settings;
       if (lastActiveWorkspace) {
         const workspace = this._getWorkspaceById(lastActiveWorkspace);
-        if (workspace) this._setActiveWorkspace({ workspace });
+        if (workspace) this._setActivateWorkspace({ workspace });
       }
     }
   };
 
   _openDrawerWithSettingsReaction = () => {
-    const { router } = this.stores;
-    const isWorkspaceSettingsRoute = router.location.pathname.includes(
-      WORKSPACES_ROUTES.ROOT,
-    );
-    const isSwitchingToSettingsRoute =
-      !this.isSettingsRouteActive && isWorkspaceSettingsRoute;
-    const isLeavingSettingsRoute =
-      !isWorkspaceSettingsRoute && this.isSettingsRouteActive;
-
-    if (isSwitchingToSettingsRoute) {
-      this.isSettingsRouteActive = true;
-      this._wasDrawerOpenBeforeSettingsRoute = this.isWorkspaceDrawerOpen;
-      if (!this._wasDrawerOpenBeforeSettingsRoute) {
-        workspaceActions.toggleWorkspaceDrawer();
-      }
-    } else if (isLeavingSettingsRoute) {
-      this.isSettingsRouteActive = false;
-      if (
-        !this._wasDrawerOpenBeforeSettingsRoute &&
-        this.isWorkspaceDrawerOpen
-      ) {
-        workspaceActions.toggleWorkspaceDrawer();
-      }
-    }
+    this._setOpenDrawerWithSettings();
   };
 
   _cleanupInvalidServiceReferences = () => {
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 41b4aa9f7..b8826f12e 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -7,7 +7,7 @@ import {
   systemPreferences,
   getCurrentWindow,
 } from '@electron/remote';
-import { autorun, makeObservable, observable } from 'mobx';
+import { autorun, action, makeObservable, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
 import osName from 'os-name';
 import { fromJS } from 'immutable';
@@ -635,6 +635,10 @@ class FranzMenu {
     }, 10);
   }
 
+  @action _setCurrentTemplate(tpl) {
+    this.currentTemplate = tpl;
+  }
+
   rebuild() {
     this._build();
   }
@@ -989,7 +993,7 @@ class FranzMenu {
         ...this.debugMenu(),
       );
     }
-    this.currentTemplate = tpl;
+    this._setCurrentTemplate(tpl);
     const menu = Menu.buildFromTemplate(tpl);
     Menu.setApplicationMenu(menu);
   }
diff --git a/src/models/Service.ts b/src/models/Service.ts
index 21fa65f69..fb594a6f4 100644
--- a/src/models/Service.ts
+++ b/src/models/Service.ts
@@ -1,4 +1,4 @@
-import { autorun, computed, makeObservable, observable } from 'mobx';
+import { autorun, action, computed, makeObservable, observable } from 'mobx';
 import { ipcRenderer } from 'electron';
 import { webContents } from '@electron/remote';
 import normalizeUrl from 'normalize-url';
@@ -124,6 +124,19 @@ export default class Service {
 
   @observable proxy: string | null = null;
 
+  @action _setAutoRun() {
+    if (!this.isEnabled) {
+      this.webview = null;
+      this.isAttached = false;
+      this.unreadDirectMessageCount = 0;
+      this.unreadIndirectMessageCount = 0;
+    }
+
+    if (this.recipe.hasCustomUrl && this.customUrl) {
+      this.isUsingCustomUrl = true;
+    }
+  }
+
   constructor(data, recipe: IRecipe) {
     if (!data) {
       throw new Error('Service config not valid');
@@ -212,19 +225,42 @@ export default class Service {
     }
 
     autorun((): void => {
-      if (!this.isEnabled) {
-        this.webview = null;
-        this.isAttached = false;
-        this.unreadDirectMessageCount = 0;
-        this.unreadIndirectMessageCount = 0;
-      }
-
-      if (this.recipe.hasCustomUrl && this.customUrl) {
-        this.isUsingCustomUrl = true;
-      }
+      this._setAutoRun();
     });
   }
 
+  @action _didStartLoading(): void {
+    this.hasCrashed = false;
+    this.isLoading = true;
+    this.isLoadingPage = true;
+    this.isError = false;
+  }
+
+  @action _didStopLoading(): void {
+    this.isLoading = false;
+    this.isLoadingPage = false;
+  }
+
+  @action _didLoad(): void {
+    this.isLoading = false;
+    this.isLoadingPage = false;
+
+    if (!this.isError) {
+      this.isFirstLoad = false;
+    }
+  }
+
+  @action _didFailLoad(event: { errorDescription: string }): void {
+    this.isError = false;
+    this.errorMessage = event.errorDescription;
+    this.isLoading = false;
+    this.isLoadingPage = false;
+  }
+
+  @action _hasCrashed(): void {
+    this.hasCrashed = true;
+  }
+
   @computed get shareWithWebview(): object {
     return {
       id: this.id,
@@ -420,27 +456,18 @@ export default class Service {
     this.webview.addEventListener('did-start-loading', event => {
       debug('Did start load', this.name, event);
 
-      this.hasCrashed = false;
-      this.isLoading = true;
-      this.isLoadingPage = true;
-      this.isError = false;
+      this._didStartLoading();
     });
 
     this.webview.addEventListener('did-stop-loading', event => {
       debug('Did stop load', this.name, event);
 
-      this.isLoading = false;
-      this.isLoadingPage = false;
+      this._didStopLoading();
     });
 
     // eslint-disable-next-line unicorn/consistent-function-scoping
     const didLoad = () => {
-      this.isLoading = false;
-      this.isLoadingPage = false;
-
-      if (!this.isError) {
-        this.isFirstLoad = false;
-      }
+      this._didLoad();
     };
 
     this.webview.addEventListener('did-frame-finish-load', didLoad.bind(this));
@@ -453,16 +480,13 @@ export default class Service {
         event.errorCode !== -21 &&
         event.errorCode !== -3
       ) {
-        this.isError = true;
-        this.errorMessage = event.errorDescription;
-        this.isLoading = false;
-        this.isLoadingPage = false;
+        this._didFailLoad(event);
       }
     });
 
     this.webview.addEventListener('crashed', () => {
       debug('Service crashed', this.name);
-      this.hasCrashed = true;
+      this._hasCrashed();
     });
 
     this.webview.addEventListener('found-in-page', ({ result }) => {
diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index af1a0daae..08d2f718c 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -503,6 +503,17 @@ export default class AppStore extends TypedStore {
     this.isClearingAllCache = false;
   }
 
+  @action _setLocale() {
+    if (this.stores.user?.isLoggedIn && this.stores.user?.data.locale) {
+      this.locale = this.stores.user.data.locale;
+    } else if (!this.locale) {
+      this.locale = this._getDefaultLocale();
+    }
+
+    moment.locale(this.locale);
+    debug(`Set locale to "${this.locale}"`);
+  }
+
   // Reactions
   _offlineCheck() {
     if (!this.isOnline) {
@@ -516,17 +527,6 @@ export default class AppStore extends TypedStore {
     }
   }
 
-  _setLocale() {
-    if (this.stores.user?.isLoggedIn && this.stores.user?.data.locale) {
-      this.locale = this.stores.user.data.locale;
-    } else if (!this.locale) {
-      this.locale = this._getDefaultLocale();
-    }
-
-    moment.locale(this.locale);
-    debug(`Set locale to "${this.locale}"`);
-  }
-
   _getDefaultLocale() {
     return getLocale({
       locale: ferdiumLocale,
diff --git a/src/stores/RequestStore.ts b/src/stores/RequestStore.ts
index 59982c05a..279615e50 100644
--- a/src/stores/RequestStore.ts
+++ b/src/stores/RequestStore.ts
@@ -44,12 +44,7 @@ export default class RequestStore extends TypedStore {
     this.servicesRequest = this.stores.services.allServicesRequest;
 
     ipcRenderer.on('localServerPort', (_, data) => {
-      if (data.port) {
-        this.localServerPort = data.port;
-      }
-      if (data.token) {
-        this.localServerToken = data.token;
-      }
+      this.setData(data);
     });
   }
 
@@ -70,6 +65,15 @@ export default class RequestStore extends TypedStore {
     this.servicesRequest.reload();
   }
 
+  @action setData(data: { port: number; token: string | undefined }): void {
+    if (data.port) {
+      this.localServerPort = data.port;
+    }
+    if (data.token) {
+      this.localServerToken = data.token;
+    }
+  }
+
   // Reactions
   _autoRetry(): void {
     const delay = (this.retries <= 10 ? this.retries : 10) * this.retryDelay;
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index 7812d5aee..83ec7d18e 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -618,6 +618,10 @@ export default class ServicesStore extends TypedStore {
     await request._promise;
   }
 
+  @action _setIsActive(service: Service, state: boolean): void {
+    service.isActive = state;
+  }
+
   @action _setActive({ serviceId, keepActiveRoute = null }) {
     if (!keepActiveRoute) this.stores.router.push('/');
     const service = this.one(serviceId);
@@ -625,10 +629,10 @@ export default class ServicesStore extends TypedStore {
     for (const s of this.all) {
       if (s.isActive) {
         s.lastUsed = Date.now();
-        s.isActive = false;
+        this._setIsActive(s, false);
       }
     }
-    service.isActive = true;
+    this._setIsActive(service, true);
     this._awake({ serviceId: service.id });
 
     if (
@@ -650,7 +654,7 @@ export default class ServicesStore extends TypedStore {
   @action _blurActive() {
     const service = this.active;
     if (service) {
-      service.isActive = false;
+      this._setIsActive(service, false);
     } else {
       debug('No service is active');
     }
@@ -1194,13 +1198,14 @@ export default class ServicesStore extends TypedStore {
   _mapActiveServiceToServiceModelReaction() {
     const { activeService } = this.stores.settings.all.service;
     if (this.allDisplayed.length > 0) {
-      this.allDisplayed.map(service =>
-        Object.assign(service, {
-          isActive: activeService
+      for (const service of this.allDisplayed) {
+        this._setIsActive(
+          service,
+          activeService
             ? activeService === service.id
             : this.allDisplayed[0].id === service.id,
-        }),
-      );
+        );
+      }
     }
   }
 
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index e2903c952..811bc6f76 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -100,8 +100,11 @@ export default class SettingsStore extends TypedStore {
         });
       }
       debug('Get appSettings resolves', resp.type, resp.data);
-      Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
-      this.loaded = true;
+      this.actions.settings.update({
+        type: resp.type,
+        data: resp.data,
+      });
+      this.setLoaded();
       ipcRenderer.send('initialAppSettings', resp);
     });
 
@@ -148,6 +151,10 @@ export default class SettingsStore extends TypedStore {
     };
   }
 
+  @action async setLoaded(): Promise<void> {
+    this.loaded = true;
+  }
+
   @action async _update({ type, data }): Promise<void> {
     const appSettings = this.all;
     if (!this.fileSystemSettingsTypes.includes(type)) {
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index e58341790..60c943a42 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -18,6 +18,18 @@ export default class Request {
 
   @observable wasExecuted = false;
 
+  @action _reset() {
+    this.error = null;
+    this.result = null;
+    this.isExecuting = false;
+    this.isError = false;
+    this.wasExecuted = false;
+    this._isWaitingForResponse = false;
+    this._promise = Promise;
+
+    return this;
+  }
+
   _promise = Promise;
 
   _api = {};
@@ -139,15 +151,5 @@ export default class Request {
     for (const hook of Request._hooks) hook(this);
   }
 
-  reset = () => {
-    this.error = null;
-    this.result = null;
-    this.isExecuting = false;
-    this.isError = false;
-    this.wasExecuted = false;
-    this._isWaitingForResponse = false;
-    this._promise = Promise;
-
-    return this;
-  };
+  reset = () => this._reset();
 }
diff --git a/src/stores/lib/TypedStore.ts b/src/stores/lib/TypedStore.ts
index e44eadd32..0a669e669 100644
--- a/src/stores/lib/TypedStore.ts
+++ b/src/stores/lib/TypedStore.ts
@@ -1,4 +1,10 @@
-import { computed, IReactionPublic, makeObservable, observable } from 'mobx';
+import {
+  action,
+  computed,
+  IReactionPublic,
+  makeObservable,
+  observable,
+} from 'mobx';
 import { Actions } from '../../actions/lib/actions';
 import { ApiInterface } from '../../api';
 import { Stores } from '../../@types/stores.types';
@@ -15,6 +21,10 @@ export default abstract class TypedStore {
 
   actions: Actions;
 
+  @action _setResetStatus() {
+    this._status = null;
+  }
+
   @computed get actionStatus() {
     return this._status || [];
   }
@@ -49,6 +59,6 @@ export default abstract class TypedStore {
   }
 
   resetStatus(): void {
-    this._status = null;
+    this._setResetStatus();
   }
 }