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, 9 insertions, 0 deletions

diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 55a47cdd3..b1322afc2 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -27,6 +27,7 @@ export default class Services extends Component {
     openWindow: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
     isAppMuted: PropTypes.bool.isRequired,
+    update: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -46,6 +47,7 @@ export default class Services extends Component {
       openWindow,
       reload,
       isAppMuted,
+      update,
     } = this.props;
     const { intl } = this.context;
 
@@ -79,6 +81,13 @@ export default class Services extends Component {
             openWindow={openWindow}
             reload={() => reload({ serviceId: service.id })}
             isAppMuted={isAppMuted}
+            enable={() => update({
+              serviceId: service.id,
+              serviceData: {
+                isEnabled: true,
+              },
+              redirect: false,
+            })}
           />
         ))}
       </div>