From 88973290cb525185f7e5475185c5ac51a7b8f96b Mon Sep 17 00:00:00 2001 From: Birgitta B Date: Sun, 13 Jan 2019 12:05:44 +0100 Subject: [PATCH] Only show the hints if minimum not selected --- components/app-text.js | 23 ++++++++++++++--------- components/cycle-day/symptoms/cervix.js | 5 +++-- components/cycle-day/symptoms/mucus.js | 5 +++-- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/components/app-text.js b/components/app-text.js index aaf7098..a7892b9 100644 --- a/components/app-text.js +++ b/components/app-text.js @@ -22,15 +22,20 @@ export function AppTextLight(props) { } export function ActionHint(props) { - return ( - - - {props.children} - - - ) + if(props.isVisible) { + return ( + + + {props.children} + + + ) + } else { + return null + } } export function SymptomSectionHeader(props) { diff --git a/components/cycle-day/symptoms/cervix.js b/components/cycle-day/symptoms/cervix.js index dacf31f..d0e3e07 100644 --- a/components/cycle-day/symptoms/cervix.js +++ b/components/cycle-day/symptoms/cervix.js @@ -36,6 +36,7 @@ export default class Cervix extends Component { { label: labels.position.categories[1], value: 1 }, { label: labels.position.categories[2], value: 2 } ] + const mandatoryNotCompletedYet = typeof this.state.opening != 'number' || typeof this.state.firmness != 'number' return ( @@ -82,7 +83,7 @@ export default class Cervix extends Component { /> - {labels.actionHint} + {labels.actionHint} diff --git a/components/cycle-day/symptoms/mucus.js b/components/cycle-day/symptoms/mucus.js index 7a6f5de..6e2d2ce 100644 --- a/components/cycle-day/symptoms/mucus.js +++ b/components/cycle-day/symptoms/mucus.js @@ -34,6 +34,7 @@ export default class Mucus extends Component { { label: labels.texture.categories[1], value: 1 }, { label: labels.texture.categories[2], value: 2 } ] + const mandatoryNotCompletedYet = typeof this.state.feeling != 'number' || typeof this.state.texture != 'number' return ( @@ -70,7 +71,7 @@ export default class Mucus extends Component { /> - {labels.actionHint} + {labels.actionHint}