10 files changed, 26 insertions, 39 deletions

diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index f7c9b8164..aae230577 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -12,8 +12,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { LIVE_FRANZ_API } from '../../config';
 import { WEBSITE } from '../../environment-remote';
 
-@inject('stores', 'actions')
-@observer
 class AccountScreen extends Component {
   onCloseWindow() {
     const { user, features } = this.props.stores;
@@ -74,7 +72,7 @@ class AccountScreen extends Component {
   }
 }
 
-AccountScreen.wrappedComponent.propTypes = {
+AccountScreen.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
@@ -87,4 +85,4 @@ AccountScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default AccountScreen;
+export default inject('stores', 'actions')(observer(AccountScreen));
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index ddf7fab36..24b827993 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -111,8 +111,6 @@ const messages = defineMessages({
   },
 });
 
-@inject('stores', 'actions')
-@observer
 class EditServiceScreen extends Component {
   onSubmit(data) {
     const { action } = this.props.router.params;
@@ -438,7 +436,7 @@ class EditServiceScreen extends Component {
   }
 }
 
-EditServiceScreen.wrappedComponent.propTypes = {
+EditServiceScreen.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
@@ -451,4 +449,6 @@ EditServiceScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default injectIntl(EditServiceScreen);
+export default injectIntl(
+  inject('stores', 'actions')(observer(EditServiceScreen)),
+);
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 720f2c8a1..ddf6876b9 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -245,8 +245,6 @@ const messages = defineMessages({
   },
 });
 
-@inject('stores', 'actions')
-@observer
 class EditSettingsScreen extends Component {
   constructor(props) {
     super(props);
@@ -753,7 +751,7 @@ class EditSettingsScreen extends Component {
   }
 }
 
-EditSettingsScreen.wrappedComponent.propTypes = {
+EditSettingsScreen.propTypes = {
   stores: PropTypes.shape({
     app: PropTypes.instanceOf(AppStore).isRequired,
     user: PropTypes.instanceOf(UserStore).isRequired,
@@ -771,4 +769,6 @@ EditSettingsScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default injectIntl(EditSettingsScreen);
+export default injectIntl(
+  inject('stores', 'actions')(observer(EditSettingsScreen)),
+);
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 1dc0aa8e6..baa2d7b71 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -49,8 +49,6 @@ const messages = defineMessages({
   },
 });
 
-@inject('stores', 'actions')
-@observer
 class EditUserScreen extends Component {
   componentWillUnmount() {
     this.props.actions.user.resetStatus();
@@ -150,7 +148,7 @@ class EditUserScreen extends Component {
   }
 }
 
-EditUserScreen.wrappedComponent.propTypes = {
+EditUserScreen.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
@@ -159,4 +157,6 @@ EditUserScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default injectIntl(EditUserScreen);
+export default injectIntl(
+  inject('stores', 'actions')(observer(EditUserScreen)),
+);
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index 592b4b11c..86723554c 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -6,8 +6,6 @@ import Invite from '../../components/auth/Invite';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import UserStore from '../../stores/UserStore';
 
-@inject('stores', 'actions')
-@observer
 class InviteScreen extends Component {
   componentWillUnmount() {
     this.props.stores.user.inviteRequest.reset();
@@ -32,7 +30,7 @@ class InviteScreen extends Component {
   }
 }
 
-InviteScreen.wrappedComponent.propTypes = {
+InviteScreen.propTypes = {
   actions: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
@@ -41,4 +39,4 @@ InviteScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default InviteScreen;
+export default inject('stores', 'actions')(observer(InviteScreen));
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 7f55e54c5..6b629d3d8 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -19,8 +19,6 @@ import RecipePreview from '../../models/RecipePreview';
 import AppStore from '../../stores/AppStore';
 import { openPath } from '../../helpers/url-helpers';
 
-@inject('stores', 'actions')
-@observer
 class RecipesScreen extends Component {
   static propTypes = {
     params: PropTypes.shape({
@@ -182,7 +180,7 @@ class RecipesScreen extends Component {
   }
 }
 
-RecipesScreen.wrappedComponent.propTypes = {
+RecipesScreen.propTypes = {
   stores: PropTypes.shape({
     recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired,
     recipes: PropTypes.instanceOf(RecipeStore).isRequired,
@@ -198,4 +196,4 @@ RecipesScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default RecipesScreen;
+export default inject('stores', 'actions')(observer(RecipesScreen));
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js
index a657b6e6c..2970b2a54 100644
--- a/src/containers/settings/ServicesScreen.js
+++ b/src/containers/settings/ServicesScreen.js
@@ -10,8 +10,6 @@ import ServiceStore from '../../stores/ServicesStore';
 import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
-@inject('stores', 'actions')
-@observer
 class ServicesScreen extends Component {
   componentWillUnmount() {
     this.props.actions.service.resetFilter();
@@ -57,7 +55,7 @@ class ServicesScreen extends Component {
   }
 }
 
-ServicesScreen.wrappedComponent.propTypes = {
+ServicesScreen.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     services: PropTypes.instanceOf(ServiceStore).isRequired,
@@ -68,4 +66,4 @@ ServicesScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default ServicesScreen;
+export default inject('stores', 'actions')(observer(ServicesScreen));
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 35db3a434..0e6ce4df3 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -11,8 +11,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
 import UIStore from '../../stores/UIStore';
 
-@inject('stores', 'actions')
-@observer
 class SettingsContainer extends Component {
   portalRoot = document.querySelector('#portalContainer');
 
@@ -48,7 +46,7 @@ class SettingsContainer extends Component {
   }
 }
 
-SettingsContainer.wrappedComponent.propTypes = {
+SettingsContainer.propTypes = {
   children: PropTypes.element.isRequired,
   stores: PropTypes.shape({
     services: PropTypes.instanceOf(ServicesStore).isRequired,
@@ -58,4 +56,4 @@ SettingsContainer.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default SettingsContainer;
+export default inject('stores', 'actions')(observer(SettingsContainer));
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js
index d3600f8ea..b4ad952b2 100644
--- a/src/containers/settings/SupportScreen.js
+++ b/src/containers/settings/SupportScreen.js
@@ -6,7 +6,6 @@ import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDas
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import AppStore from '../../stores/AppStore';
 
-@inject('actions')
 class SupportScreen extends Component {
   constructor(props) {
     super(props);
@@ -27,10 +26,10 @@ class SupportScreen extends Component {
   }
 }
 
-SupportScreen.wrappedComponent.propTypes = {
+SupportScreen.propTypes = {
   actions: PropTypes.shape({
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
 };
 
-export default SupportScreen;
+export default inject('actions')(SupportScreen);
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index 928262a59..0a8b92b47 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -10,8 +10,6 @@ import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { DEV_API_FRANZ_WEBSITE } from '../../config';
 
-@inject('stores', 'actions')
-@observer
 class TeamScreen extends Component {
   handleWebsiteLink(route) {
     const { actions, stores } = this.props;
@@ -44,7 +42,7 @@ class TeamScreen extends Component {
   }
 }
 
-TeamScreen.wrappedComponent.propTypes = {
+TeamScreen.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
@@ -56,4 +54,4 @@ TeamScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default TeamScreen;
+export default inject('stores', 'actions')(observer(TeamScreen));