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

21 files changed, 65 insertions, 154 deletions

diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index 883a6ea60..f99a8a73f 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -7,9 +7,12 @@ import AuthLayout from '../../components/auth/AuthLayout';
 import AppStore from '../../stores/AppStore';
 import UserStore from '../../stores/UserStore';
 import GlobalErrorStore from '../../stores/GlobalErrorStore';
+import UIStore from '../../stores/UIStore';
+import SettingsStore from '../../stores/SettingsStore';
 import AppLoader from '../../components/ui/AppLoader';
 
 import { oneOrManyChildElements } from '../../prop-types';
+import FeaturesStore from '../../stores/FeaturesStore';
 
 export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component {
   static propTypes = {
@@ -71,12 +74,13 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer
 AuthLayoutContainer.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     app: PropTypes.instanceOf(AppStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
     globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired,
     user: PropTypes.instanceOf(UserStore).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      healthCheck: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js
index 5c58087a3..28ecc0198 100644
--- a/src/containers/auth/ChangeServerScreen.js
+++ b/src/containers/auth/ChangeServerScreen.js
@@ -39,9 +39,7 @@ export default @inject('stores', 'actions') @observer class ChangeServerScreen e
 
 ChangeServerScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    settings: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index 4a93891d6..9143ef616 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
+import { RouterStore } from 'mobx-react-router';
 import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
 
@@ -25,11 +26,10 @@ export default @inject('stores', 'actions') @observer class ImportScreen extends
 
 ImportScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      importLegacyServices: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
+    router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index a04107072..4e97c6573 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -5,6 +5,7 @@ import Locked from '../../components/auth/Locked';
 import SettingsStore from '../../stores/SettingsStore';
 
 import { hash } from '../../helpers/password-helpers';
+import UserStore from '../../stores/UserStore';
 
 export default @inject('stores', 'actions') @observer class LockedScreen extends Component {
   state = {
@@ -75,11 +76,10 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends
 
 LockedScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    settings: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index d17820ad6..e636f99e0 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -30,9 +30,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends
 
 LoginScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      login: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index 5b238860e..9c6732f1a 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -22,9 +22,7 @@ export default @inject('stores', 'actions') @observer class PasswordScreen exten
 
 PasswordScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      retrievePassword: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js
index 21c859c12..97bf1f6be 100644
--- a/src/containers/auth/PricingScreen.js
+++ b/src/containers/auth/PricingScreen.js
@@ -7,6 +7,7 @@ import Pricing from '../../components/auth/Pricing';
 import UserStore from '../../stores/UserStore';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
+import FeaturesStore from '../../stores/FeaturesStore';
 
 export default @inject('stores', 'actions') @observer class PricingScreen extends Component {
   static propTypes = {
@@ -72,12 +73,11 @@ export default @inject('stores', 'actions') @observer class PricingScreen extend
 
 PricingScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      activateTrial: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     router: PropTypes.instanceOf(RouterStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index 1c4fa6c22..2a8f2c010 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
+import { RouterStore } from 'mobx-react-router';
 import { DEFAULT_TODO_RECIPE_ID, DEFAULT_TODO_SERVICE_NAME } from '../../config';
 import { sleep } from '../../helpers/async-helpers';
 import SetupAssistant from '../../components/auth/SetupAssistant';
@@ -116,18 +117,13 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen
 SetupAssistantScreen.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     services: PropTypes.instanceOf(ServicesStore),
+    router: PropTypes.instanceOf(RouterStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore),
     user: PropTypes.instanceOf(UserStore),
   }).isRequired,
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      invite: PropTypes.func.isRequired,
-    }).isRequired,
-    service: PropTypes.shape({
-      createService: PropTypes.func.isRequired,
-    }).isRequired,
-    recipe: PropTypes.shape({
-      install: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
+    recipe: PropTypes.instanceOf(RecipesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 803fe1cd9..42ee09f33 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -45,9 +45,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
 
 SignupScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      signup: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index d7e413bb9..7a12aee83 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -182,34 +182,11 @@ AppLayoutContainer.wrappedComponent.propTypes = {
     workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      setActive: PropTypes.func.isRequired,
-      reload: PropTypes.func.isRequired,
-      toggleNotifications: PropTypes.func.isRequired,
-      toggleAudio: PropTypes.func.isRequired,
-      handleIPCMessage: PropTypes.func.isRequired,
-      setWebviewReference: PropTypes.func.isRequired,
-      detachService: PropTypes.func.isRequired,
-      openWindow: PropTypes.func.isRequired,
-      reloadUpdatedServices: PropTypes.func.isRequired,
-      updateService: PropTypes.func.isRequired,
-      deleteService: PropTypes.func.isRequired,
-      reorder: PropTypes.func.isRequired,
-    }).isRequired,
-    news: PropTypes.shape({
-      hide: PropTypes.func.isRequired,
-    }).isRequired,
-    ui: PropTypes.shape({
-      openSettings: PropTypes.func.isRequired,
-      closeSettings: PropTypes.func.isRequired,
-    }).isRequired,
-    app: PropTypes.shape({
-      installUpdate: PropTypes.func.isRequired,
-      toggleMuteApp: PropTypes.func.isRequired,
-    }).isRequired,
-    requests: PropTypes.shape({
-      retryRequiredRequests: PropTypes.func.isRequired,
-    }).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
+    news: PropTypes.instanceOf(NewsStore).isRequired,
+    ui: PropTypes.instanceOf(UIStore).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    requests: PropTypes.instanceOf(RequestStore).isRequired,
   }).isRequired,
   children: oneOrManyChildElements,
 };
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 98e212192..2c9cac084 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -104,16 +104,8 @@ AccountScreen.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.shape({
-      createDashboardUrl: PropTypes.func.isRequired,
-      upgradeAccount: PropTypes.func.isRequired,
-    }).isRequired,
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-      delete: PropTypes.func.isRequired,
-    }).isRequired,
+    payment: PropTypes.instanceOf(PaymentStore).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 77548bdcf..ddf2d2d25 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
+import { RouterStore } from 'mobx-react-router';
 import UserStore from '../../stores/UserStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
@@ -415,20 +416,8 @@ EditServiceScreen.wrappedComponent.propTypes = {
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
-  router: PropTypes.shape({
-    params: PropTypes.shape({
-      action: PropTypes.string.isRequired,
-    }).isRequired,
-  }).isRequired,
+  router: PropTypes.instanceOf(RouterStore).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      createService: PropTypes.func.isRequired,
-      updateService: PropTypes.func.isRequired,
-      deleteService: PropTypes.func.isRequired,
-      openRecipeFile: PropTypes.func.isRequired,
-    }).isRequired,
-    // settings: PropTypes.shape({
-    //   update: PropTypes.func.isRequred,
-    // }).isRequired,
+    service: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 0a8258478..93c5daca2 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -679,23 +679,10 @@ EditSettingsScreen.wrappedComponent.propTypes = {
     workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      launchOnStartup: PropTypes.func.isRequired,
-      checkForUpdates: PropTypes.func.isRequired,
-      installUpdate: PropTypes.func.isRequired,
-      clearAllCache: PropTypes.func.isRequired,
-    }).isRequired,
-    settings: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
-    todos: PropTypes.shape({
-      toggleTodosFeatureVisibility: PropTypes.func.isRequired,
-    }).isRequired,
-    workspaces: PropTypes.shape({
-      toggleKeepAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    todos: PropTypes.instanceOf(TodosStore).isRequired,
+    workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 81f689400..8e93164de 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -153,9 +153,6 @@ EditUserScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-      resetStatus: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index cc36849e8..4fdaef08b 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -4,6 +4,7 @@ import { inject, observer } from 'mobx-react';
 
 import Invite from '../../components/auth/Invite';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import UserStore from '../../stores/UserStore';
 
 export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
   componentWillUnmount() {
@@ -29,13 +30,9 @@ export default @inject('stores', 'actions') @observer class InviteScreen extends
 
 InviteScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    user: PropTypes.shape({
-      invite: PropTypes.func.isRequired,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
-    user: PropTypes.shape({
-      inviteRequest: PropTypes.object,
-    }).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 74abcacee..72d551bc2 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -17,6 +17,7 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { FRANZ_DEV_DOCS, RECIPES_PATH } from '../../config';
 import { communityRecipesStore } from '../../features/communityRecipes';
 import RecipePreview from '../../models/RecipePreview';
+import AppStore from '../../stores/AppStore';
 
 export default @inject('stores', 'actions') @observer class RecipesScreen extends Component {
   static propTypes = {
@@ -76,7 +77,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
     }
   }
 
-
   prepareRecipes(recipes) {
     return recipes
     // Filter out duplicate recipes
@@ -186,12 +186,8 @@ RecipesScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    service: PropTypes.shape({
-      showAddServiceInterface: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    service: PropTypes.instanceOf(ServiceStore).isRequired,
     recipePreview: PropTypes.shape({
       search: PropTypes.func.isRequired,
     }).isRequired,
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index a501bf530..eb2b1bcb5 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -63,13 +63,6 @@ ServicesScreen.wrappedComponent.propTypes = {
     router: PropTypes.instanceOf(RouterStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    service: PropTypes.shape({
-      showAddServiceInterface: PropTypes.func.isRequired,
-      deleteService: PropTypes.func.isRequired,
-      toggleService: PropTypes.func.isRequired,
-      filter: PropTypes.func.isRequired,
-      resetFilter: PropTypes.func.isRequired,
-      resetStatus: PropTypes.func.isRequired,
-    }).isRequired,
+    service: PropTypes.instanceOf(ServiceStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 440d32a46..89c2aaa27 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -9,6 +9,7 @@ import Layout from '../../components/settings/SettingsLayout';
 import Navigation from '../../components/settings/navigation/SettingsNavigation';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
+import UIStore from '../../stores/UIStore';
 
 export default @inject('stores', 'actions') @observer class SettingsContainer extends Component {
   portalRoot = document.querySelector('#portalContainer');
@@ -57,8 +58,6 @@ SettingsContainer.wrappedComponent.propTypes = {
     services: PropTypes.instanceOf(ServicesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    ui: PropTypes.shape({
-      closeSettings: PropTypes.func.isRequired,
-    }),
+    ui: PropTypes.instanceOf(UIStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js
index 34dce1dae..7d3b22f19 100644
--- a/src/containers/settings/SupportScreen.js
+++ b/src/containers/settings/SupportScreen.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 
 import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import AppStore from '../../stores/AppStore';
 
 export default @inject('actions') class SupportScreen extends Component {
   constructor(props) {
@@ -29,8 +30,6 @@ export default @inject('actions') class SupportScreen extends Component {
 
 SupportScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index c1360a666..a627a047a 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -9,6 +9,7 @@ import SettingsStore from '../../stores/SettingsStore';
 import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { DEV_API_FRANZ_WEBSITE } from '../../config';
+import PaymentStore from '../../stores/PaymentStore';
 
 export default @inject('stores', 'actions') @observer class TeamScreen extends Component {
   handleWebsiteLink(route) {
@@ -47,15 +48,8 @@ TeamScreen.wrappedComponent.propTypes = {
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    payment: PropTypes.shape({
-      createDashboardUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-      delete: PropTypes.func.isRequired,
-    }).isRequired,
+    payment: PropTypes.instanceOf(PaymentStore).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
 };
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index 2d1f3d0eb..e5c8207be 100644
--- a/src/containers/subscription/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -7,6 +7,9 @@ import PaymentStore from '../../stores/PaymentStore';
 
 import SubscriptionForm from '../../components/subscription/SubscriptionForm';
 import TrialForm from '../../components/subscription/TrialForm';
+import UserStore from '../../stores/UserStore';
+import FeaturesStore from '../../stores/FeaturesStore';
+import AppStore from '../../stores/AppStore';
 
 export default @inject('stores', 'actions') @observer class SubscriptionFormScreen extends Component {
   static propTypes = {
@@ -84,17 +87,13 @@ export default @inject('stores', 'actions') @observer class SubscriptionFormScre
 
 SubscriptionFormScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
-    app: PropTypes.shape({
-      openExternalUrl: PropTypes.func.isRequired,
-    }).isRequired,
-    payment: PropTypes.shape({
-      createHostedPage: PropTypes.func.isRequired,
-    }).isRequired,
-    user: PropTypes.shape({
-      update: PropTypes.func.isRequired,
-    }).isRequired,
+    app: PropTypes.instanceOf(AppStore).isRequired,
+    payment: PropTypes.instanceOf(PaymentStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   stores: PropTypes.shape({
     payment: PropTypes.instanceOf(PaymentStore).isRequired,
+    user: PropTypes.instanceOf(UserStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
 };