up

api/src/controllers/goal.js

@@ -131,11 +131,15 @@ router.get(
         where: { id: currentGoal.id },
       });
       if (!thisWeekGoal) {
-        thisWeekGoal = await prisma.goal.upsert({
-          where: { id: currentGoal.id },
-          create: currentGoal,
-          data: currentGoal,
-        });
+        try {
+          thisWeekGoal = await prisma.goal.upsert({
+            where: { id: currentGoal.id },
+            create: currentGoal,
+            data: currentGoal,
+          });
+        } catch (e) {
+          console.error("error while creating goal because created somewhere else", e);
+        }
       }
     }
 

app/src/scenes/Gains/Goal.js

@@ -1,5 +1,5 @@
 import React, { useRef, useMemo, useState, useEffect } from 'react';
-import { useRecoilState, useRecoilValue } from 'recoil';
+import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
 import { useIsFocused } from '@react-navigation/native';
 import styled from 'styled-components';
 import { v4 as uuidv4 } from 'uuid';
@@ -31,6 +31,9 @@ import { storage } from '../../services/storage';
 const Goal = ({ navigation }) => {
   const [daysWithGoalNoDrink, setDaysWithGoalNoDrink] = useRecoilState(daysWithGoalNoDrinkState);
   const previousDaysWithGoalNoDrink = useRef(daysWithGoalNoDrink);
+  const dosesByDrinkingDay = useRecoilValue(totalDrinksByDrinkingDaySelector);
+  const setGoals = useSetRecoilState(goalsState);
+
   const toggleDayWithGoalNoDrink = (day) => {
     const newState = daysWithGoalNoDrink.includes(day)
       ? daysWithGoalNoDrink.filter((d) => d !== day)

app/src/scenes/Gains/Sevrage.js

@@ -1,24 +1,12 @@
 import React from 'react';
 import styled from 'styled-components';
-import { useRecoilValue, useSetRecoilState } from 'recoil';
 import { SafeAreaView } from 'react-native';
 import ButtonPrimary from '../../components/ButtonPrimary';
 import { logEvent } from '../../services/logEventsWithMatomo';
 import WrapperContainer from '../../components/WrapperContainer';
 import TextStyled from '../../components/TextStyled';
-import {
-  daysWithGoalNoDrinkState,
-  goalsState,
-  maxDrinksPerWeekSelector,
-  totalDrinksByDrinkingDaySelector,
-} from '../../recoil/gains';
 
 const Sevrage = ({ navigation, route }) => {
-  const daysWithGoalNoDrink = useRecoilValue(daysWithGoalNoDrinkState);
-  const dosesByDrinkingDay = useRecoilValue(totalDrinksByDrinkingDaySelector);
-  const dosesPerWeek = useRecoilValue(maxDrinksPerWeekSelector);
-  const setGoals = useSetRecoilState(goalsState);
-
   return (
     <>
       <SafeAreaView className="bg-[#39CEC0]" />