diff --git a/app/src/scenes/Gains/Goal.js b/app/src/scenes/Gains/Goal.js index 1a9ec2543..3c999a88d 100644 --- a/app/src/scenes/Gains/Goal.js +++ b/app/src/scenes/Gains/Goal.js @@ -25,6 +25,8 @@ import WrapperContainer from '../../components/WrapperContainer'; import GoalSetup from '../../components/illustrations/icons/GoalSetup'; import ModalGoalValidation from '../../components/ModalGoalValidation'; import ModalWrongValue from '../../components/ModalWrongValue'; +import API from '../../services/api'; +import { storage } from '../../services/storage'; const Goal = ({ navigation }) => { const [daysWithGoalNoDrink, setDaysWithGoalNoDrink] = useRecoilState(daysWithGoalNoDrinkState); @@ -119,6 +121,20 @@ const Goal = ({ navigation }) => { action: 'GOAL_DRINKWEEK', value: dosesPerWeek, }); + const matomoId = storage.getString('@UserIdv2'); + API.post({ + path: '/goal', + body: { + matomoId: matomoId, + daysWithGoalNoDrink, + dosesByDrinkingDay, + dosesPerWeek, + }, + }).then((res) => { + if (res.ok) { + setGoals(res.data); + } + }); if (isOnboarded) { navigation.navigate('GAINS_SEVRAGE'); return; diff --git a/app/src/scenes/Gains/Sevrage.js b/app/src/scenes/Gains/Sevrage.js index d51b19ceb..88705fd54 100644 --- a/app/src/scenes/Gains/Sevrage.js +++ b/app/src/scenes/Gains/Sevrage.js @@ -12,8 +12,6 @@ import { maxDrinksPerWeekSelector, totalDrinksByDrinkingDaySelector, } from '../../recoil/gains'; -import { storage } from '../../services/storage'; -import API from '../../services/api'; const Sevrage = ({ navigation, route }) => { const daysWithGoalNoDrink = useRecoilValue(daysWithGoalNoDrinkState); @@ -58,20 +56,6 @@ const Sevrage = ({ navigation, route }) => { { - const matomoId = storage.getString('@UserIdv2'); - API.post({ - path: '/goal', - body: { - matomoId: matomoId, - daysWithGoalNoDrink, - dosesByDrinkingDay, - dosesPerWeek, - }, - }).then((res) => { - if (res.ok) { - setGoals(res.data); - } - }); logEvent({ category: 'GAINS', action: 'GOAL_FINISH', diff --git a/app/src/services/storage.js b/app/src/services/storage.js index 8bc6ffe2d..424080afe 100644 --- a/app/src/services/storage.js +++ b/app/src/services/storage.js @@ -387,20 +387,18 @@ export async function reconciliateDrinksToDB() { const unsyncedDrinks = drinks.filter((drink) => !drink.isSyncedWithDB); - if (unsyncedDrinks.length) { - await API.post({ - path: '/consommation/sync', - body: { - matomoId, - drinks: unsyncedDrinks, - drinksCatalog: [...ownDrinksCatalog, ...drinksCatalog], - }, - }).then((response) => { - if (response?.ok) { - storage.set('@Drinks', JSON.stringify(drinks.map((drink) => ({ ...drink, isSyncedWithDB: true })))); - } - }); - } + await API.post({ + path: '/consommation/sync', + body: { + matomoId, + drinks: unsyncedDrinks, + drinksCatalog: [...ownDrinksCatalog, ...drinksCatalog], + }, + }).then((response) => { + if (response?.ok) { + storage.set('@Drinks', JSON.stringify(drinks.map((drink) => ({ ...drink, isSyncedWithDB: true })))); + } + }); } catch (e) { capture(e, { extra: {