7 files changed, 35 insertions, 32 deletions

diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index 732b6c003..b5af3743d 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -35,7 +35,7 @@ export default class ServiceDisabled extends Component {
     const { intl } = this.context;
 
     return (
-      <div className="services__crash-handler">
+      <div className="services__info-layer">
         <h1>{intl.formatMessage(messages.headline, { name })}</h1>
         <Button
           label={intl.formatMessage(messages.action, { name })}
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index d48152c18..d3e6951f3 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -62,7 +62,7 @@ export default class WebviewCrashHandler extends Component {
     const { intl } = this.context;
 
     return (
-      <div className="services__crash-handler">
+      <div className="services__info-layer">
         <h1>{intl.formatMessage(messages.headline)}</h1>
         <p>{intl.formatMessage(messages.text, { name })}</p>
         <Button
diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js
index 80ee2d9d2..7f4c53d64 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/ui/Subscription.js
@@ -154,7 +154,7 @@ export default class SubscriptionForm extends Component {
       },
     };
 
-    if (!isWindows) {
+    if (this.props.plan.miner) {
       form.fields.paymentTier.options.push({
         value: 'mining',
         label: intl.formatMessage(messages.typeMining),
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 8f0a92c3d..6624ab75e 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -214,30 +214,6 @@ export default class FranzMenu {
           ],
         },
       );
-      // Window menu.
-      tpl[3].submenu = [
-        {
-          // label: 'Close',
-          accelerator: 'CmdOrCtrl+W',
-          role: 'close',
-        },
-        {
-          // label: 'Minimize',
-          accelerator: 'CmdOrCtrl+M',
-          role: 'minimize',
-        },
-        {
-          // label: 'Zoom',
-          role: 'zoom',
-        },
-        {
-          type: 'separator',
-        },
-        {
-          // label: 'Bring All to Front',
-          role: 'front',
-        },
-      ];
     } else {
       tpl[4].submenu.unshift({
         role: 'about',
@@ -277,7 +253,7 @@ export default class FranzMenu {
 
     if (this.stores.user.isLoggedIn) {
       return services.map((service, i) => ({
-        label: service.name,
+        label: this._getServiceName(service),
         accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
@@ -289,4 +265,20 @@ export default class FranzMenu {
 
     return [];
   }
+
+  _getServiceName(service) {
+    if (service.name) {
+      return service.name;
+    }
+
+    let name = service.recipe.name;
+
+    if (service.team) {
+      name = `${name} (${service.team})`;
+    } else if (service.customUrl) {
+      name = `${name} (${service.customUrl})`;
+    }
+
+    return name;
+  }
 }
diff --git a/src/models/Service.js b/src/models/Service.js
index eb68493fe..d0985969b 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';
 
@@ -58,6 +58,15 @@ export default class Service {
     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() {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 3936ea036..22c376c06 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -549,6 +549,8 @@ export default class ServicesStore extends Store {
 
     if (service) {
       const loop = () => {
+        if (!service.webview) return;
+
         service.webview.send('poll');
 
         setTimeout(loop, delay);
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 2a6540e0b..282c15121 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -13,7 +13,7 @@
   }
 
   .services__webview, 
-  .services__crash-handler {
+  .services__info-layer {
     position: absolute;
     width: 100%;
     top: 0;
@@ -44,7 +44,7 @@
   }
 
   .services__no-service, 
-  .services__crash-handler {
+  .services__info-layer {
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -63,7 +63,7 @@
     }
   }
 
-  .services__crash-handler {
+  .services__info-layer {
     position: absolut;
     z-index: 110;
   }