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

10 files changed, 27 insertions, 42 deletions

diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index 2f25e7139..659cb4961 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -8,6 +8,7 @@ import { Button } from '@meetfranz/forms';
 
 import { announcementsStore } from '../index';
 import UIStore from '../../../stores/UIStore';
+import AppStore from '../../../stores/AppStore';
 
 const renderer = new marked.Renderer();
 
@@ -193,9 +194,7 @@ class AnnouncementScreen extends Component {
       ui: PropTypes.instanceOf(UIStore).isRequired,
     }).isRequired,
     actions: PropTypes.shape({
-      app: PropTypes.shape({
-        openExternalUrl: PropTypes.func.isRequired,
-      }).isRequired,
+      app: PropTypes.instanceOf(AppStore).isRequired,
     }).isRequired,
   };
 
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index 4ea37f88d..6471240ab 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -9,6 +9,8 @@ import { Button } from '@meetfranz/forms';
 import { config } from './constants';
 import styles from './styles';
 import UserStore from '../../stores/UserStore';
+import UIStore from '../../stores/UIStore';
+import { FeatureStore } from '../utils/FeatureStore';
 
 const messages = defineMessages({
   headline: {
@@ -109,10 +111,10 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class
 DelayApp.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
+    features: PropTypes.instanceOf(FeatureStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js
index 3133672ec..5a809aaf2 100644
--- a/src/features/nightlyBuilds/Component.js
+++ b/src/features/nightlyBuilds/Component.js
@@ -9,6 +9,8 @@ import Modal from '../../components/ui/Modal';
 import Button from '../../components/ui/Button';
 import { state as ModalState } from './store';
 import SettingsStore from '../../stores/SettingsStore';
+import UIStore from '../../stores/UIStore';
+import UserStore from '../../stores/UserStore';
 
 const messages = defineMessages({
   title: {
@@ -127,15 +129,9 @@ nightlyBuildsModal.wrappedComponent.propTypes = {
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    settings: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-    }).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
   classes: PropTypes.object.isRequired,
 };
diff --git a/src/features/planSelection/containers/PlanSelectionScreen.js b/src/features/planSelection/containers/PlanSelectionScreen.js
index fba65506e..594829c01 100644
--- a/src/features/planSelection/containers/PlanSelectionScreen.js
+++ b/src/features/planSelection/containers/PlanSelectionScreen.js
@@ -9,6 +9,7 @@ import UserStore from '../../../stores/UserStore';
 import PlanSelection from '../components/PlanSelection';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import { planSelectionStore } from '..';
+import PaymentStore from '../../../stores/PaymentStore';
 
 const messages = defineMessages({
   dialogTitle: {
@@ -109,15 +110,11 @@ PlanSelectionScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.shape({
-      upgradeAccount: PropTypes.func.isRequired,
-    }),
+    payment: PropTypes.instanceOf(PaymentStore),
     planSelection: PropTypes.shape({
       downgradeAccount: PropTypes.func.isRequired,
       hideOverlay: PropTypes.func.isRequired,
     }),
-    user: PropTypes.shape({
-      activateTrial: PropTypes.func.isRequired,
-    }),
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js
index 63f15fe7b..4308b8f09 100644
--- a/src/features/publishDebugInfo/Component.js
+++ b/src/features/publishDebugInfo/Component.js
@@ -11,6 +11,7 @@ import Input from '../../components/ui/Input';
 import Modal from '../../components/ui/Modal';
 import { DEBUG_API } from '../../config';
 import AppStore from '../../stores/AppStore';
+import ServicesStore from '../../stores/ServicesStore';
 
 
 const messages = defineMessages({
@@ -201,8 +202,6 @@ PublishDebugLogModal.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      setActive: PropTypes.func.isRequired,
-    }).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 01cd3b09b..04822db71 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -349,8 +349,6 @@ QuickSwitchModal.wrappedComponent.propTypes = {
     services: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      setActive: PropTypes.func.isRequired,
-    }).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js b/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
index e15a1204f..715251854 100644
--- a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
+++ b/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
@@ -10,6 +10,7 @@ import TrialStatusBar from '../components/TrialStatusBar';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import { trialStatusBarStore } from '..';
 import { i18nPlanName } from '../../../helpers/plan-helpers';
+import PaymentStore from '../../../stores/PaymentStore';
 
 @inject('stores', 'actions') @observer
 class TrialStatusBarScreen extends Component {
@@ -102,8 +103,6 @@ TrialStatusBarScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.shape({
-      upgradeAccount: PropTypes.func.isRequired,
-    }),
+    payment: PropTypes.instanceOf(PaymentStore),
   }).isRequired,
 };
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js
index 56ba60c37..d638b831c 100644
--- a/src/features/webControls/containers/WebControlsScreen.js
+++ b/src/features/webControls/containers/WebControlsScreen.js
@@ -7,6 +7,7 @@ import WebControls from '../components/WebControls';
 import ServicesStore from '../../../stores/ServicesStore';
 import Service from '../../../models/Service';
 import { SEARCH_ENGINE_URLS } from '../../../config';
+import AppStore from '../../../stores/AppStore';
 
 const URL_EVENTS = [
   'load-commit',
@@ -128,11 +129,7 @@ WebControlsScreen.wrappedComponent.propTypes = {
     services: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    service: PropTypes.shape({
-      reloadActive: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
index 7eaabc1ea..5eca71259 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.js
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -8,14 +8,13 @@ import ServicesStore from '../../../stores/ServicesStore';
 import Workspace from '../models/Workspace';
 import { workspaceStore } from '../index';
 import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api';
+import WorkspacesStore from '../store';
 
 @inject('stores', 'actions') @observer
 class EditWorkspaceScreen extends Component {
   static propTypes = {
     actions: PropTypes.shape({
-      workspace: PropTypes.shape({
-        delete: PropTypes.func.isRequired,
-      }),
+      workspaces: PropTypes.instanceOf(WorkspacesStore),
     }).isRequired,
     stores: PropTypes.shape({
       services: PropTypes.instanceOf(ServicesStore).isRequired,
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js
index affbd230d..c241cd622 100644
--- a/src/features/workspaces/containers/WorkspacesScreen.js
+++ b/src/features/workspaces/containers/WorkspacesScreen.js
@@ -10,14 +10,13 @@ import {
   getUserWorkspacesRequest,
   updateWorkspaceRequest,
 } from '../api';
+import WorkspacesStore from '../store';
 
 @inject('stores', 'actions') @observer
 class WorkspacesScreen extends Component {
   static propTypes = {
     actions: PropTypes.shape({
-      workspace: PropTypes.shape({
-        edit: PropTypes.func.isRequired,
-      }),
+      workspaces: PropTypes.instanceOf(WorkspacesStore),
     }).isRequired,
   };