Merge branch '711-chore-testing-feedback-for-v1-2403-11' into 'main'

Resolve "Chore: Testing Feedback for v1.2403.11"

Closes #711

See merge request bloodyhealth/drip!673

components/Home.js

@@ -51,6 +51,7 @@ const Home = ({ navigate, setDate }) => {
     >
       <AppText style={styles.title}>{moment().format('MMM Do YYYY')}</AppText>
 
+      {/* display if at least 1 bleeding day has been entered */}
       {cycleDayNumber && (
         <View style={styles.line}>
           <AppText style={styles.whiteSubtitle}>{cycleDayText}</AppText>
@@ -59,6 +60,8 @@ const Home = ({ navigate, setDate }) => {
           </AppText>
         </View>
       )}
+
+      {/* display if fertility tracking enabled and if phase 1, 2 or 3 has been identified  */}
       {isFertilityTrackingEnabled && phase && (
         <View style={styles.line}>
           <AppText style={styles.whiteSubtitle}>
@@ -71,11 +74,14 @@ const Home = ({ navigate, setDate }) => {
           <Asterisk />
         </View>
       )}
+
       {isPeriodPredictionEnabled && (
         <View style={styles.line}>
           <AppText style={styles.turquoiseText}>{prediction}</AppText>
         </View>
       )}
+
+      {!isFertilityTrackingEnabled && <View style={styles.largePadding}></View>}
       <Button isCTA isSmall={false} onPress={navigateToCycleDayView}>
         {t('labels.home.addDataForToday')}
       </Button>
@@ -114,6 +120,9 @@ const styles = StyleSheet.create({
     color: 'white',
     fontSize: Sizes.subtitle,
   },
+  largePadding: {
+    padding: Spacing.large,
+  },
 })
 
 Home.propTypes = {

components/cycle-day/select-tab-group.js

@@ -21,7 +21,10 @@ export default function SelectTabGroup({
 
   // Disable is only used for secondarySymptom in customization, if more come up maybe consider more tidy solution
   const showDisabledAlert = (label) => {
-    if (label === 'cervix' || label === 'mucus') {
+    if (
+      label === labels.secondarySymptom.cervix ||
+      label === labels.secondarySymptom.mucus
+    ) {
       Alert.alert(
         labels.secondarySymptom.disabled.title,
         labels.secondarySymptom.disabled.message

i18n/en/settings.js

@@ -73,7 +73,7 @@ export default {
     title: 'Fertility phases calculation',
     disabledTitle: 'Disabled',
     disabled:
-      'To use fertility phases calculation please enable temperature tracking and cervical mucus or cervix tracking above.',
+      'To use fertility phases calculation please enable both temperature tracking and either cervical mucus or cervix tracking above.',
     message:
       'If you enter menstrual bleeding, temperature and cervical mucus or cervix data according to the sympto-thermal method, drip will calculate cycle phases with the provided data.',
     on: 'If you switch this off, drip will not show fertility related information.',
@@ -98,7 +98,7 @@ export default {
   periodPrediction: {
     title: 'Period predictions',
     on: 'drip predicts your 3 next menstrual bleedings based on statistics if you previously tracked at least 3 complete cycles.',
-    off: 'There are no predictions for menstrual cycles displayed. If turned on the calendar and the home screen will display period predictions.',
+    off: 'There are no predictions for menstrual cycles displayed. If turned on, the calendar and the home screen will display period predictions.',
   },
   passwordSettings: {
     title: 'App password',

i18n/en/symptom-info.js

@@ -25,7 +25,7 @@ export default {
 After tracking at least 3 menstrual cycles, drip. will give you an overview of
 · how long your cycles last on average (in "stats"),
 · whether the length of your cycles varied significantly (in "stats" and in bleeding predictions)
-· and predict your next 3 cycles with a range of 3 or 5 days (on home screen and "calendar").
+· and predict your next 3 cycles with a range of 3 or 5 days (on home screen and "calendar") if this functionality is enabled in the customization settings.
 
 The app allows you to track different intensities of bleeding. On the chart and on the calendar, bleeding values are colored in different shades of red. The darker, the more intense your bleeding. Every bleeding value that is not excluded is taken into account for fertility calculation and period predictions.
 
@@ -74,7 +74,7 @@ ${generalInfo.curiousNfp}`,
     title: 'Tracking cervical mucus',
     text: `Cervical mucus can help determine in which phase of the menstrual cycle you are.
 
-By default the secondary symptom the app uses for the sympto-thermal method is cervical mucus.
+By default the secondary symptom the app uses for the sympto-thermal method is cervical mucus. You can change this in the customization settings.
 
 · How to identify fertile cervical mucus?
 Tracking the feeling and the texture of your cervical mucus on a daily basis helps you identify changes of the quality of the cervical mucus. The values you enter for both feeling and texture of your cervical mucus are combined by drip. into one of five values following the sympto-thermal method.