Upgraded eslint and fixed all the reported errors. (#1549)

7 files changed, 17 insertions, 20 deletions

diff --git a/src/components/ui/ActivateTrialButton/index.js b/src/components/ui/ActivateTrialButton/index.js
index 340123c2f..8f4d21f64 100644
--- a/src/components/ui/ActivateTrialButton/index.js
+++ b/src/components/ui/ActivateTrialButton/index.js
@@ -7,6 +7,7 @@ import classnames from 'classnames';
 import { Button } from '@meetfranz/forms';
 
 import UserStore from '../../../stores/UserStore';
+import UIStore from '../../../stores/UIStore';
 
 const messages = defineMessages({
   action: {
@@ -101,8 +102,6 @@ ActivateTrialButton.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
diff --git a/src/components/ui/FAB.js b/src/components/ui/FAB.js
index 9359a3c6c..633edbe2c 100644
--- a/src/components/ui/FAB.js
+++ b/src/components/ui/FAB.js
@@ -3,23 +3,19 @@
  */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { observer, inject } from 'mobx-react';
+import { observer } from 'mobx-react';
 import classnames from 'classnames';
 
-export default @inject('stores') @observer class Button extends Component {
+import { oneOrManyChildElements } from '../../prop-types';
+
+export default @observer class Button extends Component {
   static propTypes = {
     className: PropTypes.string,
     disabled: PropTypes.bool,
     onClick: PropTypes.func,
     type: PropTypes.string,
+    children: oneOrManyChildElements.isRequired,
     htmlForm: PropTypes.string,
-    stores: PropTypes.shape({
-      settings: PropTypes.shape({
-        app: PropTypes.shape({
-          accentColor: PropTypes.string.isRequired,
-        }).isRequired,
-      }).isRequired,
-    }).isRequired,
   };
 
   static defaultProps = {
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index d8cdc2e8a..97ab93dcf 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -17,6 +17,9 @@ export default @inject('stores') @withTheme @injectSheet(styles) @observer class
     spinnerColor: PropTypes.string,
     children: PropTypes.node,
     stores: PropTypes.shape({
+      app: PropTypes.shape({
+        accentColor: PropTypes.string.isRequired,
+      }).isRequired,
       settings: PropTypes.shape({
         app: PropTypes.shape({
           accentColor: PropTypes.string.isRequired,
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
index 36bf38c98..1e100f9d8 100644
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -10,6 +10,7 @@ import UserStore from '../../../stores/UserStore';
 
 import styles from './styles';
 import FeaturesStore from '../../../stores/FeaturesStore';
+import UIStore from '../../../stores/UIStore';
 
 const messages = defineMessages({
   action: {
@@ -93,9 +94,7 @@ PremiumFeatureContainer.wrappedComponent.propTypes = {
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
 
diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js
index 12f650ffd..196cddc66 100644
--- a/src/components/ui/Tabs/Tabs.js
+++ b/src/components/ui/Tabs/Tabs.js
@@ -36,7 +36,7 @@ export default @observer class Tab extends Component {
         <div className="content-tabs__tabs">
           {React.Children.map(children, (child, i) => (
             <button
-              key={i}
+              key="{i}"
               className={classnames({
                 'content-tabs__item': true,
                 'is-active': this.state.active === i,
@@ -51,7 +51,7 @@ export default @observer class Tab extends Component {
         <div className="content-tabs__content">
           {React.Children.map(children, (child, i) => (
             <div
-              key={i}
+              key="{i}"
               className={classnames({
                 'content-tabs__item': true,
                 'is-active': this.state.active === i,
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js
index ee817356b..dcaf664e1 100644
--- a/src/components/ui/ToggleRaw.js
+++ b/src/components/ui/ToggleRaw.js
@@ -14,6 +14,7 @@ export default @observer class ToggleRaw extends Component {
       id: PropTypes.string,
       name: PropTypes.string,
       label: PropTypes.string,
+      error: PropTypes.string,
     }).isRequired,
     className: PropTypes.string,
     showLabel: PropTypes.bool,
diff --git a/src/components/ui/UpgradeButton/index.js b/src/components/ui/UpgradeButton/index.js
index 1b764bd90..eade46cfd 100644
--- a/src/components/ui/UpgradeButton/index.js
+++ b/src/components/ui/UpgradeButton/index.js
@@ -7,6 +7,7 @@ import { Button } from '@meetfranz/forms';
 
 import UserStore from '../../../stores/UserStore';
 import ActivateTrialButton from '../ActivateTrialButton';
+import UIStore from '../../../stores/UIStore';
 
 const messages = defineMessages({
   upgradeToPro: {
@@ -77,8 +78,6 @@ UpgradeButton.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };