diff --git a/components/cycle-day/symptom-edit-view.js b/components/cycle-day/symptom-edit-view.js index 1f92b6e..0603d94 100644 --- a/components/cycle-day/symptom-edit-view.js +++ b/components/cycle-day/symptom-edit-view.js @@ -23,6 +23,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => { const symptomConfig = symptomPage[symptom] const [data, setData] = useState(symptomData ? symptomData : blank[symptom]) const [shouldShowInfo, setShouldShowInfo] = useState(false) + const isBleeding = symptom === 'bleeding' const getParsedData = () => JSON.parse(JSON.stringify(data)) const onPressLearnMore = () => setShouldShowInfo(!shouldShowInfo) const onEditNote = (note) => { @@ -137,10 +138,16 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => { save={(value, field) => onSaveTemperature(value, field)} /> )} + + {/* There should not be a line between the bleeding tab group and the exclude toggle */} {shouldShow(symptomConfig.selectTabGroups) && symptomPage[symptom].selectTabGroups.map((group) => { return ( - + {group.title} { })} {/*for bleeding, we want to move the "exclude" toggle up between the tab and box groups, all other symptoms should still have it at the bottom*/} - {symptom === 'bleeding' && excludeToggle} + {isBleeding && excludeToggle} {shouldShow(symptomConfig.selectBoxGroups) && symptomPage[symptom].selectBoxGroups.map((group) => { @@ -181,7 +188,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => { ) })} - {symptom !== 'bleeding' && excludeToggle} + {!isBleeding && excludeToggle} {shouldShow(symptomConfig.note) && ( diff --git a/i18n/en/cycle-day.js b/i18n/en/cycle-day.js index 459ee5e..aed46bc 100644 --- a/i18n/en/cycle-day.js +++ b/i18n/en/cycle-day.js @@ -47,7 +47,7 @@ export const cervix = { explainer: 'How high up in the vagina is the cervix?', }, excludeExplainer: - "You can exclude this value if you don't want to use it for fertility detection.", + "You can exclude these values if you don't want to use them for fertility detection.", actionHint: 'Choose values for at least "Opening" and "Firmness" to save.', } @@ -66,7 +66,7 @@ export const mucus = { 'Looking at and touching your cervical mucus, which describes it best?', }, excludeExplainer: - "You can exclude this value if you don't want to use it for fertility detection", + "You can exclude these values if you don't want to use them for fertility detection", actionHint: 'Choose values for both "Feeling" and "Texture" to save.', }