Merge branch 'develop' into feature/mute-service

# Conflicts:
#	src/components/services/content/ServiceWebview.js
#	src/components/services/content/Services.js
#	src/components/services/tabs/TabItem.js
#	src/containers/layout/AppLayoutContainer.js

1 files changed, 3 insertions, 3 deletions

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 28b6a105f..1b0f4d495 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -63,7 +63,6 @@ export default class AppLayoutContainer extends Component {
     } = this.props.actions.ui;
 
     const { children } = this.props;
-    const allServices = services.enabled;
 
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
@@ -79,7 +78,7 @@ export default class AppLayoutContainer extends Component {
 
     const sidebar = (
       <Sidebar
-        services={allServices}
+        services={services.allDisplayed}
         setActive={setActive}
         isAppMuted={app.isSystemMuted || settings.all.isMuted}
         openSettings={openSettings}
@@ -96,12 +95,13 @@ export default class AppLayoutContainer extends Component {
 
     const servicesContainer = (
       <Services
-        services={allServices}
+        services={services.allDisplayed}
         handleIPCMessage={handleIPCMessage}
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
         reload={reload}
         isAppMuted={settings.all.isMuted}
+        update={updateService}
       />
     );