From b1899be9856e6c42a35214ebfc041eb55b1ff50c Mon Sep 17 00:00:00 2001
From: jescobar <jose.escobar@mavrix.es>
Date: Sat, 18 Nov 2017 01:49:19 +0100
Subject: Fix setting active service not updating cached value in the store

---
 src/stores/ServicesStore.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 87d31c0c5..3936ea036 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,
+        },
       });
     }
   }
-- 
cgit v1.2.3-54-g00ecf


From 86413ba213c9a457ee42a51f2ad29bd66f84d288 Mon Sep 17 00:00:00 2001
From: jescobar <jose.escobar@mavrix.es>
Date: Sat, 18 Nov 2017 09:56:44 +0100
Subject: Prevent sorting services by clicking in the tab bar background

---
 src/components/services/tabs/Tabbar.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

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}
-- 
cgit v1.2.3-54-g00ecf