Fix isWorkoutDay banner (patch)

vasco3 · Sep 22, 2018 · b9e0ea3 · b9e0ea3
1 parent 48fd234
commit b9e0ea3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Layout.js b/src/Layout.js
@@ -76,13 +76,14 @@ function shouldWorkout({
     workoutOnFriday,
     workoutOnSaturday,
   ];
-  return weekdays[moment().day()];
+  return weekdays[moment().day()] || false;
 }
 class Layout extends Component {
   constructor(props) {
     super(props);
 
     const {
+      isWorkoutDay,
       menu,
       macrosRest,
       macrosWorkout,
@@ -94,7 +95,7 @@ class Layout extends Component {
 
     this.state = {
       drawerIsOpen: false,
-      isWorkoutDay: shouldWorkout(settings),
+      isWorkoutDay,
       macrosRest,
       macrosWorkout,
       menu,
@@ -115,6 +116,7 @@ class Layout extends Component {
 
   componentDidMount() {
     const {
+      isWorkoutDay,
       macrosRest,
       macrosWorkout,
       menu,
@@ -125,7 +127,7 @@ class Layout extends Component {
     } = loadLocalValues();
 
     this.setState({
-      isWorkoutDay: shouldWorkout(settings),
+      isWorkoutDay,
       macrosRest,
       macrosWorkout,
       menu,

diff --git a/src/plan/Plan.js b/src/plan/Plan.js
@@ -38,7 +38,7 @@ class Plan extends React.Component {
 
     const hasRecipesMinimum = recipes.size < RECIPES_MINIMUM;
 
-    const styleBanner = isWorkoutDay ? { style: { display: 'none' } } : {};
+    const styleBanner = isWorkoutDay ? {} : { style: { display: 'none' } };
     return (
       <div className="plan">
         <div className="banner text-center" {...styleBanner}>