10 files changed, 20 insertions, 40 deletions

diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index aa36e3969..e6d6dcf8a 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -14,8 +14,6 @@ import AppLoader from '../../components/ui/AppLoader';
 import { oneOrManyChildElements } from '../../prop-types';
 import FeaturesStore from '../../stores/FeaturesStore';
 
-@inject('stores', 'actions')
-@observer
 class AuthLayoutContainer extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
@@ -71,7 +69,7 @@ class AuthLayoutContainer extends Component {
   }
 }
 
-AuthLayoutContainer.wrappedComponent.propTypes = {
+AuthLayoutContainer.propTypes = {
   stores: PropTypes.shape({
     app: PropTypes.instanceOf(AppStore).isRequired,
     features: PropTypes.instanceOf(FeaturesStore).isRequired,
@@ -85,4 +83,4 @@ AuthLayoutContainer.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default AuthLayoutContainer;
+export default inject('stores', 'actions')(observer(AuthLayoutContainer));
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js
index dcc913c39..60bfde088 100644
--- a/src/containers/auth/ChangeServerScreen.js
+++ b/src/containers/auth/ChangeServerScreen.js
@@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router';
 import ChangeServer from '../../components/auth/ChangeServer';
 import SettingsStore from '../../stores/SettingsStore';
 
-@inject('stores', 'actions')
-@observer
 class ChangeServerScreen extends Component {
   constructor(props) {
     super(props);
@@ -34,7 +32,7 @@ class ChangeServerScreen extends Component {
   }
 }
 
-ChangeServerScreen.wrappedComponent.propTypes = {
+ChangeServerScreen.propTypes = {
   actions: PropTypes.shape({
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
@@ -44,4 +42,4 @@ ChangeServerScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default ChangeServerScreen;
+export default inject('stores', 'actions')(observer(ChangeServerScreen));
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index 46e2d41f0..c01c3d355 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router';
 import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
 
-@inject('stores', 'actions')
-@observer
 class ImportScreen extends Component {
   render() {
     const { actions, stores } = this.props;
@@ -26,7 +24,7 @@ class ImportScreen extends Component {
   }
 }
 
-ImportScreen.wrappedComponent.propTypes = {
+ImportScreen.propTypes = {
   actions: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
@@ -36,4 +34,4 @@ ImportScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default ImportScreen;
+export default inject('stores', 'actions')(observer(ImportScreen));
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index e252242ae..fc66227cc 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
 
-@inject('stores', 'actions')
-@observer
 class InviteScreen extends Component {
   render() {
     const { actions } = this.props;
@@ -13,7 +11,7 @@ class InviteScreen extends Component {
   }
 }
 
-InviteScreen.wrappedComponent.propTypes = {
+InviteScreen.propTypes = {
   actions: PropTypes.shape({
     user: PropTypes.shape({
       invite: PropTypes.func.isRequired,
@@ -21,4 +19,4 @@ InviteScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default InviteScreen;
+export default inject('stores', 'actions')(observer(InviteScreen));
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index 945e41284..87a00800f 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -7,8 +7,6 @@ import SettingsStore from '../../stores/SettingsStore';
 import { hash } from '../../helpers/password-helpers';
 import UserStore from '../../stores/UserStore';
 
-@inject('stores', 'actions')
-@observer
 class LockedScreen extends Component {
   state = {
     error: false,
@@ -76,7 +74,7 @@ class LockedScreen extends Component {
   }
 }
 
-LockedScreen.wrappedComponent.propTypes = {
+LockedScreen.propTypes = {
   actions: PropTypes.shape({
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
@@ -86,4 +84,4 @@ LockedScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default LockedScreen;
+export default inject('stores', 'actions')(observer(LockedScreen));
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index 3f8c67fa8..572a38ea1 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -6,8 +6,6 @@ import UserStore from '../../stores/UserStore';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-@inject('stores', 'actions')
-@observer
 class LoginScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
@@ -32,7 +30,7 @@ class LoginScreen extends Component {
   }
 }
 
-LoginScreen.wrappedComponent.propTypes = {
+LoginScreen.propTypes = {
   actions: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
@@ -41,4 +39,4 @@ LoginScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default LoginScreen;
+export default inject('stores', 'actions')(observer(LoginScreen));
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index 836d4cc88..4b2c1b4a2 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -4,8 +4,6 @@ import { inject, observer } from 'mobx-react';
 import Password from '../../components/auth/Password';
 import UserStore from '../../stores/UserStore';
 
-@inject('stores', 'actions')
-@observer
 class PasswordScreen extends Component {
   render() {
     const { actions, stores } = this.props;
@@ -22,7 +20,7 @@ class PasswordScreen extends Component {
   }
 }
 
-PasswordScreen.wrappedComponent.propTypes = {
+PasswordScreen.propTypes = {
   actions: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
@@ -31,4 +29,4 @@ PasswordScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default PasswordScreen;
+export default inject('stores', 'actions')(observer(PasswordScreen));
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index 8cdd95a88..f6392712d 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -14,8 +14,6 @@ import ServicesStore from '../../stores/ServicesStore';
 import RecipesStore from '../../stores/RecipesStore';
 import UserStore from '../../stores/UserStore';
 
-@inject('stores', 'actions')
-@observer
 class SetupAssistantScreen extends Component {
   constructor(props) {
     super(props);
@@ -120,7 +118,7 @@ class SetupAssistantScreen extends Component {
   }
 }
 
-SetupAssistantScreen.wrappedComponent.propTypes = {
+SetupAssistantScreen.propTypes = {
   stores: PropTypes.shape({
     services: PropTypes.instanceOf(ServicesStore),
     router: PropTypes.instanceOf(RouterStore).isRequired,
@@ -134,4 +132,4 @@ SetupAssistantScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default SetupAssistantScreen;
+export default inject('stores', 'actions')(observer(SetupAssistantScreen));
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 3b19f3c50..1dd8d0772 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -8,8 +8,6 @@ import FeaturesStore from '../../stores/FeaturesStore';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-@inject('stores', 'actions')
-@observer
 class SignupScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
@@ -36,7 +34,7 @@ class SignupScreen extends Component {
   }
 }
 
-SignupScreen.wrappedComponent.propTypes = {
+SignupScreen.propTypes = {
   actions: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
@@ -46,4 +44,4 @@ SignupScreen.wrappedComponent.propTypes = {
   }).isRequired,
 };
 
-export default SignupScreen;
+export default inject('stores', 'actions')(observer(SignupScreen));
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index 7a23d9ba9..18b6b2eda 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -6,8 +6,6 @@ import Welcome from '../../components/auth/Welcome';
 import UserStore from '../../stores/UserStore';
 import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
 
-@inject('stores', 'actions')
-@observer
 class LoginScreen extends Component {
   render() {
     const { user, recipePreviews } = this.props.stores;
@@ -23,11 +21,11 @@ class LoginScreen extends Component {
   }
 }
 
-LoginScreen.wrappedComponent.propTypes = {
+LoginScreen.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired,
   }).isRequired,
 };
 
-export default LoginScreen;
+export default inject('stores', 'actions')(observer(LoginScreen));