Merge branch 'main' into 'feature/prods'

# Conflicts:
#   components/cycle-day/symptom-edit-view.js
#   i18n/en/cycle-day.js

components/helpers/calendar.js

@@ -2,6 +2,7 @@ import { LocalDate } from '@js-joda/core'
 import { verticalScale } from 'react-native-size-matters'
 
 import { Colors, Fonts, Sizes } from '../../styles'
+import { periodPredictionObservable } from '../../local-storage'
 
 const { shades } = Colors.iconColors.bleeding
 
@@ -26,6 +27,7 @@ export const toCalFormat = (bleedingDaysSortedByDate) => {
 }
 
 export const predictionToCalFormat = (predictedDays) => {
+  if (!periodPredictionObservable.value) return {}
   if (!predictedDays.length) return {}
   const todayDateString = LocalDate.now().toString()
   const middleIndex = (predictedDays[0].length - 1) / 2

components/helpers/chart.js

@@ -1,6 +1,10 @@
 import { LocalDate } from '@js-joda/core'
 
-import { scaleObservable, unitObservable } from '../../local-storage'
+import {
+  fertilityTrackingObservable,
+  scaleObservable,
+  unitObservable,
+} from '../../local-storage'
 import { getCycleStatusForDay } from '../../lib/sympto-adapter'
 import { getCycleDay, getAmountOfCycleDays } from '../../db'
 
@@ -270,7 +274,8 @@ export function nfpLines() {
     if (dateString < cycle.startDate) updateCurrentCycle(dateString)
     if (cycle.noMoreCycles) return ret
 
-    const tempShift = cycle.status.temperatureShift
+    const tempShift =
+      fertilityTrackingObservable.value && cycle.status.temperatureShift
 
     if (tempShift) {
       if (tempShift.firstHighMeasurementDay.date === dateString) {

components/helpers/cycle-day.js

@@ -35,6 +35,10 @@ export const formatTemperature = (temperature) =>
     ? temperature
     : Number.parseFloat(temperature.toString()).toFixed(2)
 
+//maximum of precision digits after decimal point, but no x.0
+export const formatDecimal = (num, precision) =>
+  +parseFloat(Number.parseFloat(num).toFixed(precision))
+
 export const getPreviousTemperature = (date) => {
   const previousTemperature = getPreviousTemperatureForDate(date)
   return formatTemperature(previousTemperature)