Merge branch 'main' into '650-long-text-in-note-hides-behind-keyboard-1.2402.16'

# Conflicts:
#   android/app/build.gradle
#   ios/drip/Info.plist
#   package.json
This commit is contained in:
tina
2024-10-01 15:20:11 +00:00
32 changed files with 877 additions and 306 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ const SymptomBox = ({
editedSymptom,
setEditedSymptom,
}) => {
const { t } = useTranslation(null, { keyPrefix: 'cycleDay.symptomBox' })
const { t } = useTranslation(null, { keyPrefix: 'symptoms' })
const isSymptomEdited = editedSymptom === symptom
const isSymptomDisabled = isDateInFuture(date) && symptom !== 'note'
const isExcluded = symptomData !== null ? symptomData.exclude : false