From e6134b459281afc138551e78e8ed30751199236b Mon Sep 17 00:00:00 2001
From: Liv <livg@protonmail.com>
Date: Wed, 17 Jan 2024 15:45:10 +0100
Subject: [PATCH] Remove line in bleeding and change wording

---
 components/cycle-day/symptom-edit-view.js | 13 ++++++++++---
 i18n/en/cycle-day.js                      |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/components/cycle-day/symptom-edit-view.js b/components/cycle-day/symptom-edit-view.js
index a962589..15d7a8d 100644
--- a/components/cycle-day/symptom-edit-view.js
+++ b/components/cycle-day/symptom-edit-view.js
@@ -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}>
diff --git a/i18n/en/cycle-day.js b/i18n/en/cycle-day.js
index 2605437..d88652d 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.",
 }
 
 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 = {