Remove line in bleeding and change wording

This commit is contained in:
Liv
2024-01-17 15:45:10 +01:00
committed by bl00dymarie
parent 3b34ce7134
commit e6134b4592
2 changed files with 12 additions and 5 deletions
+10 -3
View File
@@ -24,6 +24,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 isFertilityTrackingEnabled = fertilityTrackingObservable.value
@@ -139,10 +140,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 (
<Segment key={group.key} style={styles.segmentBorder}>
<Segment
key={group.key}
style={styles.segmentBorder}
last={isBleeding}
>
<AppText style={styles.title}>{group.title}</AppText>
<SelectTabGroup
activeButton={data[group.key]}
@@ -154,7 +161,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
})}
{/*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) => {
@@ -195,7 +202,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
</Segment>
)}
{symptom !== 'bleeding' && excludeToggle}
{!isBleeding && excludeToggle}
{shouldShow(symptomConfig.note) && (
<Segment style={styles.segmentBorder}>
+2 -2
View File
@@ -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.",
}
export const mucus = {
@@ -65,7 +65,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",
}
export const desire = {