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

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 60bdf7e47..08ba5f33d 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -8,6 +8,7 @@ import classnames from 'classnames';
 import ServiceModel from '../../../models/Service';
 import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl';
 import WebviewCrashHandler from './WebviewCrashHandler';
+import ServiceDisabled from './ServiceDisabled';
 
 @observer
 export default class ServiceWebview extends Component {
@@ -15,7 +16,11 @@ export default class ServiceWebview extends Component {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
+<<<<<<< HEAD
     isAppMuted: PropTypes.bool.isRequired,
+=======
+    enable: PropTypes.func.isRequired,
+>>>>>>> develop
   };
 
   static defaultProps = {
@@ -58,6 +63,7 @@ export default class ServiceWebview extends Component {
       setWebviewReference,
       reload,
       isAppMuted,
+      enable,
     } = this.props;
 
     const webviewClasses = classnames({
@@ -82,6 +88,13 @@ export default class ServiceWebview extends Component {
             reload={reload}
           />
         )}
+        {!service.isEnabled && (
+          <ServiceDisabled
+            name={service.recipe.name}
+            webview={service.webview}
+            enable={enable}
+          />
+        )}
         <Webview
           ref={(element) => { this.webview = element; }}
           autosize