fix: abstinence route

SocialGouv · Dec 21, 2023 · 36a6efe · 36a6efe
1 parent 991aa4f
commit 36a6efe
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/api/src/controllers/appMilestone.js b/api/src/controllers/appMilestone.js
@@ -53,7 +53,7 @@ router.post(
 
     // USER SURVEY:
     if (req.headers.appversion < 205) return res.status(200).send({ ok: true });
-    if (req.headers.appversion >= 226) {
+    if (req.headers.appversion >= 229) {
       const newUserAbstinenceFeature = await prisma.appMilestone.findUnique({
         where: { id: `${user.id}_@NewUserAbstinenceFeature` },
       });

diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
@@ -99,7 +99,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 228
+        versionCode 229
         versionName "1.23.0"
     }
 

diff --git a/app/app.json b/app/app.json
@@ -2,7 +2,7 @@
   "name": "oz_ensemble",
   "displayName": "Oz Ensemble",
   "version": {
-    "buildNumber": 228,
+    "buildNumber": 229,
 
     "buildName": "1.23.0"
 

diff --git a/app/ios/oz_ensemble.xcodeproj/project.pbxproj b/app/ios/oz_ensemble.xcodeproj/project.pbxproj
@@ -503,7 +503,7 @@
 				CODE_SIGN_ENTITLEMENTS = oz_ensemble/oz_ensemble.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 228;
+				CURRENT_PROJECT_VERSION = 229;
 				DEVELOPMENT_TEAM = 76GBKHVK25;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = oz_ensemble/Info.plist;
@@ -537,7 +537,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 228;
+				CURRENT_PROJECT_VERSION = 229;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 76GBKHVK25;
 				INFOPLIST_FILE = oz_ensemble/Info.plist;

diff --git a/app/src/scenes/Gains/AbstinenceSelection.js b/app/src/scenes/Gains/AbstinenceSelection.js
@@ -4,7 +4,7 @@ import { logEvent } from '../../services/logEventsWithMatomo';
 import { storage } from '../../services/storage';
 
 const AbstinenceSelection = ({ navigation, route }) => {
-  const isFromInfo = route?.name.includes('ABSTINENCE_SELECTION');
+  const isFromInfo = route?.params?.parent === 'Infos';
   const onClose = () => {
     navigation.goBack();
   };

diff --git a/app/src/scenes/Infos/Infos.js b/app/src/scenes/Infos/Infos.js
@@ -169,7 +169,7 @@ const InfosMenu = ({ navigation }) => {
                 action: 'ABSTINENCE_OPEN',
                 name: 'INFOS',
               });
-              navigation.navigate('ABSTINENCE_SELECTION');
+              navigation.navigate('ABSTINENCE_SELECTION', { parent: 'Infos' });
             }}
           />
           <View className="w-full border border-[#E8E8EA] mt-4 mb-4" />