Merge branch 'develop' into feature/features-api

8 files changed, 17 insertions, 23 deletions

diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index f362b1800..b73598f3d 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -9,8 +9,7 @@ import AppLoader from '../../components/ui/AppLoader';
 
 import { oneOrManyChildElements } from '../../prop-types';
 
-@inject('stores', 'actions') @observer
-export default class AuthLayoutContainer extends Component {
+export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
     location: PropTypes.shape({
@@ -20,10 +19,10 @@ export default class AuthLayoutContainer extends Component {
 
   render() {
     const { stores, actions, children, location } = this.props;
-    const { features } = stores;
+    const { app, features, globalError } = stores;
 
-    const isLoadingBaseFeatures = features.baseFeaturesRequest.isExecuting
-      && !features.baseFeaturesRequest.wasExecuted;
+    const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting
+      && !features.defaultFeaturesRequest.wasExecuted;
 
     if (isLoadingBaseFeatures) {
       return (
@@ -33,12 +32,14 @@ export default class AuthLayoutContainer extends Component {
 
     return (
       <AuthLayout
-        error={stores.globalError.response}
+        error={globalError.response}
         pathname={location.pathname}
-        isOnline={stores.app.isOnline}
-        isAPIHealthy={!stores.app.healthCheckRequest.isError}
+        isOnline={app.isOnline}
+        isAPIHealthy={!app.healthCheckRequest.isError}
         retryHealthCheck={actions.app.healthCheck}
-        isHealthCheckLoading={stores.app.healthCheckRequest.isExecuting}
+        isHealthCheckLoading={app.healthCheckRequest.isExecuting}
+        isFullScreen={app.isFullScreen}
+        darkMode={app.isSystemDarkModeEnabled}
       >
         {children}
       </AuthLayout>
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index ddd56ffb6..fc46f8b54 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -5,8 +5,7 @@ import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
 import { gaPage } from '../../lib/analytics';
 
-@inject('stores', 'actions') @observer
-export default class ImportScreen extends Component {
+export default @inject('stores', 'actions') @observer class ImportScreen extends Component {
   componentDidMount() {
     gaPage('Auth/Import');
   }
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index 059888c99..26bf97038 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -4,8 +4,7 @@ import { inject, observer } from 'mobx-react';
 import Invite from '../../components/auth/Invite';
 import { gaPage } from '../../lib/analytics';
 
-@inject('stores', 'actions') @observer
-export default class InviteScreen extends Component {
+export default @inject('stores', 'actions') @observer class InviteScreen extends Component {
   componentDidMount() {
     gaPage('Auth/Invite');
   }
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index 9e22c5141..865bd38f8 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -7,8 +7,7 @@ import { gaPage } from '../../lib/analytics';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-@inject('stores', 'actions') @observer
-export default class LoginScreen extends Component {
+export default @inject('stores', 'actions') @observer class LoginScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index d88cb08e6..236fd2031 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -5,8 +5,7 @@ import Password from '../../components/auth/Password';
 import UserStore from '../../stores/UserStore';
 import { gaPage } from '../../lib/analytics';
 
-@inject('stores', 'actions') @observer
-export default class PasswordScreen extends Component {
+export default @inject('stores', 'actions') @observer class PasswordScreen extends Component {
   componentDidMount() {
     gaPage('Auth/Password Retrieve');
   }
diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js
index 7e1586535..34b512e15 100644
--- a/src/containers/auth/PricingScreen.js
+++ b/src/containers/auth/PricingScreen.js
@@ -10,8 +10,7 @@ import { gaPage } from '../../lib/analytics';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-@inject('stores', 'actions') @observer
-export default class PricingScreen extends Component {
+export default @inject('stores', 'actions') @observer class PricingScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 3b86ab138..caf75de90 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -8,8 +8,7 @@ import { gaPage } from '../../lib/analytics';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
-@inject('stores', 'actions') @observer
-export default class SignupScreen extends Component {
+export default @inject('stores', 'actions') @observer class SignupScreen extends Component {
   static propTypes = {
     error: globalErrorPropType.isRequired,
   };
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index e413264a6..2c120f81c 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -7,8 +7,7 @@ import UserStore from '../../stores/UserStore';
 import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
 import { gaPage } from '../../lib/analytics';
 
-@inject('stores', 'actions') @observer
-export default class LoginScreen extends Component {
+export default @inject('stores', 'actions') @observer class LoginScreen extends Component {
   componentDidMount() {
     gaPage('Auth/Welcome');
   }