1 files changed, 22 insertions, 1 deletions

diff --git a/src/models/Service.js b/src/models/Service.js
index 93061c2cf..958e4b11e 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -1,4 +1,4 @@
-import { computed, observable } from 'mobx';
+import { computed, observable, autorun } from 'mobx';
 import path from 'path';
 import normalizeUrl from 'normalize-url';
 
@@ -18,11 +18,13 @@ export default class Service {
 
   @observable order = 99;
   @observable isEnabled = true;
+  @observable isMuted = false;
   @observable team = '';
   @observable customUrl = '';
   @observable isNotificationEnabled = true;
   @observable isIndirectMessageBadgeEnabled = true;
   @observable customIconUrl = '';
+  @observable hasCrashed = false;
 
   constructor(data, recipe) {
     if (!data) {
@@ -53,7 +55,18 @@ export default class Service {
     this.isIndirectMessageBadgeEnabled = data.isIndirectMessageBadgeEnabled !== undefined
       ? data.isIndirectMessageBadgeEnabled : this.isIndirectMessageBadgeEnabled;
 
+    this.isMuted = data.isMuted !== undefined ? data.isMuted : this.isMuted;
+
     this.recipe = recipe;
+
+    autorun(() => {
+      if (!this.isEnabled) {
+        this.webview = null;
+        this.isAttached = false;
+        this.unreadDirectMessageCount = 0;
+        this.unreadIndirectMessageCount = 0;
+      }
+    });
   }
 
   @computed get url() {
@@ -117,6 +130,14 @@ export default class Service {
       frameName,
       options,
     }));
+
+    this.webview.addEventListener('did-start-loading', () => {
+      this.hasCrashed = false;
+    });
+
+    this.webview.addEventListener('crashed', () => {
+      this.hasCrashed = true;
+    });
   }
 
   initializeWebViewListener() {