Upgrade npm modules

4 files changed, 35 insertions, 34 deletions

diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index 02d616241..18b38799e 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -529,14 +529,14 @@ export default class AppStore extends TypedStore {
 
   // Reactions
   _offlineCheck() {
-    if (!this.isOnline) {
-      this.timeOfflineStart = moment();
-    } else {
+    if (this.isOnline) {
       const deltaTime = moment().diff(this.timeOfflineStart);
 
       if (deltaTime > ms('30m')) {
         this.actions.service.reloadAll();
       }
+    } else {
+      this.timeOfflineStart = moment();
     }
   }
 
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index 829c64d76..9c15d3a07 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -294,19 +294,20 @@ export default class ServicesStore extends TypedStore {
         service.lastPoll - service.lastPollAnswer > ms('1m')
       ) {
         // If service did not reply for more than 1m try to reload.
-        if (!service.isActive) {
-          if (this.stores.app.isOnline && service.lostRecipeReloadAttempt < 3) {
-            debug(
-              `Reloading service: ${service.name} (${service.id}). Attempt: ${service.lostRecipeReloadAttempt}`,
-            );
-            // service.webview.reload();
-            service.lostRecipeReloadAttempt += 1;
-
-            service.lostRecipeConnection = false;
-          }
-        } else {
+        if (service.isActive) {
           debug(`Service lost connection: ${service.name} (${service.id}).`);
           service.lostRecipeConnection = true;
+        } else if (
+          this.stores.app.isOnline &&
+          service.lostRecipeReloadAttempt < 3
+        ) {
+          debug(
+            `Reloading service: ${service.name} (${service.id}). Attempt: ${service.lostRecipeReloadAttempt}`,
+          );
+          // service.webview.reload();
+          service.lostRecipeReloadAttempt += 1;
+
+          service.lostRecipeConnection = false;
         }
       } else {
         service.lostRecipeConnection = false;
@@ -512,11 +513,11 @@ export default class ServicesStore extends TypedStore {
     }
 
     if (data.team) {
-      if (!data.customURL) {
-        serviceData.team = data.team;
-      } else {
+      if (data.customURL) {
         // TODO: Is this correct?
         serviceData.customUrl = data.team;
+      } else {
+        serviceData.team = data.team;
       }
     }
 
@@ -893,9 +894,7 @@ export default class ServicesStore extends TypedStore {
         break;
       }
       case 'set-service-spellchecker-language': {
-        if (!args) {
-          console.warn('Did not receive locale');
-        } else {
+        if (args) {
           this.actions.service.updateService({
             serviceId,
             serviceData: {
@@ -903,6 +902,8 @@ export default class ServicesStore extends TypedStore {
             },
             redirect: false,
           });
+        } else {
+          console.warn('Did not receive locale');
         }
 
         break;
@@ -1176,13 +1177,13 @@ export default class ServicesStore extends TypedStore {
       service.lastPoll = Date.now();
     };
 
-    if (!serviceId) {
-      for (const service of this.allDisplayed) resetTimer(service);
-    } else {
+    if (serviceId) {
       const service = this.one(serviceId);
       if (service) {
         resetTimer(service);
       }
+    } else {
+      for (const service of this.allDisplayed) resetTimer(service);
     }
   }
 
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index 811bc6f76..5ca499160 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -157,10 +157,7 @@ export default class SettingsStore extends TypedStore {
 
   @action async _update({ type, data }): Promise<void> {
     const appSettings = this.all;
-    if (!this.fileSystemSettingsTypes.includes(type)) {
-      debug('Update settings', type, data, this.all);
-      localStorage.setItem(type, Object.assign(appSettings[type], data));
-    } else {
+    if (this.fileSystemSettingsTypes.includes(type)) {
       debug('Update settings on file system', type, data);
       ipcRenderer.send('updateAppSettings', {
         type,
@@ -168,6 +165,9 @@ export default class SettingsStore extends TypedStore {
       });
 
       Object.assign(this._fileSystemSettingsCache[type], data);
+    } else {
+      debug('Update settings', type, data, this.all);
+      localStorage.setItem(type, Object.assign(appSettings[type], data));
     }
   }
 
diff --git a/src/stores/UIStore.ts b/src/stores/UIStore.ts
index e0589729f..4ed45fc3b 100644
--- a/src/stores/UIStore.ts
+++ b/src/stores/UIStore.ts
@@ -98,7 +98,7 @@ export default class UIStore extends TypedStore {
 
   // Actions
   @action _openSettings({ path = '/settings' }): void {
-    const settingsPath = path !== '/settings' ? `/settings/${path}` : path;
+    const settingsPath = path === '/settings' ? path : `/settings/${path}`;
     this.stores.router.push(settingsPath);
   }
 
@@ -116,19 +116,19 @@ export default class UIStore extends TypedStore {
 
   // Reactions
   _setupThemeInDOM(): void {
-    if (!this.isDarkThemeActive) {
-      document.body.classList.remove('theme__dark');
-    } else {
+    if (this.isDarkThemeActive) {
       document.body.classList.add('theme__dark');
+    } else {
+      document.body.classList.remove('theme__dark');
     }
   }
 
   _setupModeInDOM(): void {
-    if (!this.isSplitModeActive) {
-      document.body.classList.remove('mode__split');
-    } else {
+    if (this.isSplitModeActive) {
       document.body.classList.add('mode__split');
       document.body.dataset.columns = this.splitColumnsNo.toString();
+    } else {
+      document.body.classList.remove('mode__split');
     }
   }