From 5d6164973e92fa8a3e3c18a0eb2e29494aea4f48 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Sun, 9 Dec 2018 20:48:25 +0100
Subject: Fix linting issues

---
 .../content/ErrorHandlers/WebviewErrorHandler.js   |  9 +++++++-
 src/components/services/content/ServiceDisabled.js |  1 +
 src/components/services/content/ServiceWebview.js  |  9 ++++----
 src/components/services/content/Services.js        |  3 +--
 .../services/content/WebviewCrashHandler.js        | 24 +++++++++++++---------
 src/components/services/tabs/Tabbar.js             |  2 +-
 6 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'src/components/services')

diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
index df98bf835..415a8d1b5 100644
--- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -58,7 +58,14 @@ export default @injectSheet(styles) @observer class WebviewCrashHandler extends
       <div className={classes.component}>
         <h1>{intl.formatMessage(messages.headline)}</h1>
         <p>{intl.formatMessage(messages.text, { name })}</p>
-        <p><strong>{intl.formatMessage(messages.errorMessage)}:</strong> {errorMessage}</p>
+        <p>
+          <strong>
+            {intl.formatMessage(messages.errorMessage)}
+:
+          </strong>
+          {' '}
+          {errorMessage}
+        </p>
         <div className={classes.buttonContainer}>
           <Button
             label={intl.formatMessage(messages.editAction, { name })}
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js
index 58fb38d8c..d0f12256e 100644
--- a/src/components/services/content/ServiceDisabled.js
+++ b/src/components/services/content/ServiceDisabled.js
@@ -27,6 +27,7 @@ export default @observer class ServiceDisabled extends Component {
   };
 
   countdownInterval = null;
+
   countdownIntervalTimeout = 1000;
 
   render() {
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 98daf9b9f..a2ae5a562 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -20,6 +20,7 @@ export default @observer class ServiceWebview extends Component {
     edit: PropTypes.func.isRequired,
     isAppMuted: PropTypes.bool.isRequired,
     enable: PropTypes.func.isRequired,
+    isActive: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -32,6 +33,10 @@ export default @observer class ServiceWebview extends Component {
     statusBarVisible: false,
   };
 
+  autorunDisposer = null;
+
+  webview = null;
+
   componentDidMount() {
     this.autorunDisposer = autorun(() => {
       if (this.props.service.isActive) {
@@ -58,10 +63,6 @@ export default @observer class ServiceWebview extends Component {
     });
   }
 
-  autorunDisposer = null;
-
-  webview = null;
-
   render() {
     const {
       service,
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 0d4d778cd..1aeb17e03 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -20,7 +20,7 @@ const messages = defineMessages({
 
 export default @observer class Services extends Component {
   static propTypes = {
-    services: MobxPropTypes.arrayOrObservableArray.isRequired,
+    services: MobxPropTypes.arrayOrObservableArray,
     setWebviewReference: PropTypes.func.isRequired,
     handleIPCMessage: PropTypes.func.isRequired,
     openWindow: PropTypes.func.isRequired,
@@ -32,7 +32,6 @@ export default @observer class Services extends Component {
 
   static defaultProps = {
     services: [],
-    activeService: '',
   };
 
   static contextTypes = {
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js
index 3be1fccf4..42bc3c877 100644
--- a/src/components/services/content/WebviewCrashHandler.js
+++ b/src/components/services/content/WebviewCrashHandler.js
@@ -38,13 +38,18 @@ export default @observer class WebviewCrashHandler extends Component {
     countdown: 10000,
   }
 
+  countdownInterval = null;
+
+  countdownIntervalTimeout = 1000;
+
+
   componentDidMount() {
     const { reload } = this.props;
 
     this.countdownInterval = setInterval(() => {
-      this.setState({
-        countdown: this.state.countdown - this.countdownIntervalTimeout,
-      });
+      this.setState(prevState => ({
+        countdown: prevState.countdown - this.countdownIntervalTimeout,
+      }));
 
       if (this.state.countdown <= 0) {
         reload();
@@ -53,9 +58,6 @@ export default @observer class WebviewCrashHandler extends Component {
     }, this.countdownIntervalTimeout);
   }
 
-  countdownInterval = null;
-  countdownIntervalTimeout = 1000;
-
   render() {
     const { name, reload } = this.props;
     const { intl } = this.context;
@@ -70,10 +72,12 @@ export default @observer class WebviewCrashHandler extends Component {
           buttonType="inverted"
           onClick={() => reload()}
         />
-        <p className="footnote">{intl.formatMessage(messages.autoReload, {
-          name,
-          seconds: this.state.countdown / 1000,
-        })}</p>
+        <p className="footnote">
+          {intl.formatMessage(messages.autoReload, {
+            name,
+            seconds: this.state.countdown / 1000,
+          })}
+        </p>
       </div>
     );
   }
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index 27f555428..dd5c2140f 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 
-- 
cgit v1.2.3-54-g00ecf