Merge branch 'main' into '676-feature-customisation-not-display-mucus-cervix'

# Conflicts:
#   components/settings/customization/index.js

components/common/app-switch.js

@@ -4,9 +4,10 @@ import PropTypes from 'prop-types'
 
 import AppText from './app-text'
 
-import { Containers } from '../../styles'
+import { Colors, Containers } from '../../styles'
 
-const AppSwitch = ({ onToggle, text, value, trackColor, disabled }) => {
+const AppSwitch = ({ onToggle, text, value, disabled }) => {
+  const trackColor = { true: Colors.turquoiseDark }
   return (
     <View style={styles.container}>
       <View style={styles.textContainer}>
@@ -27,7 +28,6 @@ AppSwitch.propTypes = {
   onToggle: PropTypes.func.isRequired,
   text: PropTypes.string,
   value: PropTypes.bool,
-  trackColor: PropTypes.string,
   disabled: PropTypes.bool,
 }
 

components/settings/customization/index.js

@@ -30,7 +30,6 @@ import {
   periodPredictionObservable,
   useCervixAsSecondarySymptomObservable,
 } from '../../../local-storage'
-import { Colors } from '../../../styles'
 import labels from '../../../i18n/en/settings'
 import { SYMPTOMS } from '../../../config'
 
@@ -217,31 +216,26 @@ const Settings = () => {
           onToggle={sexTrackingCategoryToggle}
           text={SYMPTOMS[4]}
           value={isSexTrackingCategoryEnabled}
-          trackColor={{ true: Colors.turquoiseDark }}
         />
         <AppSwitch
           onToggle={desireTrackingCategoryToggle}
           text={SYMPTOMS[5]}
           value={isDesireTrackingCategoryEnabled}
-          trackColor={{ true: Colors.turquoiseDark }}
         />
         <AppSwitch
           onToggle={painTrackingCategoryToggle}
           text={SYMPTOMS[6]}
           value={isPainTrackingCategoryEnabled}
-          trackColor={{ true: Colors.turquoiseDark }}
         />
         <AppSwitch
           onToggle={moodTrackingCategoryToggle}
           text={SYMPTOMS[7]}
           value={isMoodTrackingCategoryEnabled}
-          trackColor={{ true: Colors.turquoiseDark }}
         />
         <AppSwitch
           onToggle={noteTrackingCategoryToggle}
           text={SYMPTOMS[8]}
           value={isNoteTrackingCategoryEnabled}
-          trackColor={{ true: Colors.turquoiseDark }}
         />
       </Segment>
 
@@ -250,7 +244,6 @@ const Settings = () => {
           onToggle={toggleSwitch}
           text={'If turned on ...'}
           value={isEnabled}
-          trackColor={{ true: Colors.turquoiseDark }}
         />
       </Segment>
 
@@ -292,7 +285,6 @@ const Settings = () => {
           onToggle={onPeriodPredictionToggle}
           text={periodPredictionText}
           value={isPeriodPredictionEnabled}
-          trackColor={{ true: Colors.turquoiseDark }}
         />
       </Segment>
     </AppPage>