7 files changed, 23 insertions, 11 deletions

diff --git a/appveyor.yml b/appveyor.yml
index 11dea16c2..a8e55d25f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,3 +31,4 @@ notifications:
 
 artifacts:
   - path: out\*.exe
+  - path: out\*.yml
diff --git a/electron-builder.yml b/electron-builder.yml
index 3f7ad1e85..adc8f8ae9 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -2,7 +2,7 @@ directories:
   app: ./build
   output: ./out
 
-# forceCodeSigning: true
+appId: "com.meetfranz.franz"
 
 compression: maximum
 
diff --git a/package.json b/package.json
index f9f6ca91c..ac9c96339 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "react-sortable-hoc": "^0.6.7",
     "react-tooltip": "^3.2.7",
     "route-parser": "^0.0.5",
+    "semver": "^5.4.1",
     "smoothscroll-polyfill": "^0.3.4",
     "tar": "^4.0.2",
     "uuid": "^3.0.1"
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index fd4325107..9da1090b7 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -30,6 +30,8 @@ export default class TabBar extends Component {
     reorder({ oldIndex, newIndex });
   };
 
+  shouldPreventSorting = event => event.target.tagName !== 'LI';
+
   toggleService = ({ serviceId, isEnabled }) => {
     const { updateService } = this.props;
 
@@ -71,6 +73,7 @@ export default class TabBar extends Component {
           setActive={setActive}
           onSortEnd={this.onSortEnd}
           onSortStart={disableToolTip}
+          shouldCancelStart={this.shouldPreventSorting}
           reload={reload}
           toggleNotifications={toggleNotifications}
           toggleAudio={toggleAudio}
diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js
index 80ee2d9d2..8bff72095 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/ui/Subscription.js
@@ -7,7 +7,6 @@ import Form from '../../lib/Form';
 import Radio from '../ui/Radio';
 import Button from '../ui/Button';
 import Loader from '../ui/Loader';
-import { isWindows } from '../../environment';
 
 import { required } from '../../helpers/validation-helpers';
 
@@ -154,7 +153,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/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;
 
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 9af5d81da..22c376c06 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -470,8 +470,10 @@ export default class ServicesStore extends Store {
     const service = this.active;
 
     if (service) {
-      this.stores.settings.updateSettingsRequest.execute({
-        activeService: service.id,
+      this.actions.settings.update({
+        settings: {
+          activeService: service.id,
+        },
       });
     }
   }