Merge branch 'feature/1524-hh-consent-question' of github.com:akvo/rt…

…mis into feature/1524-hh-consent-question
akvo · Jun 26, 2024 · 4238b86 · 4238b86
2 parents 94c7486 + a9fda3e
commit 4238b86
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/app/app.json b/app/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "rtmis-mobile",
     "slug": "rtmis-mobile",
-    "version": "4.0.8",
+    "version": "4.0.9",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -21,7 +21,7 @@
         "backgroundColor": "#ffffff"
       },
       "package": "com.akvo.rtmis",
-      "versionCode": 408
+      "versionCode": 409
     },
     "web": {
       "favicon": "./assets/favicon.png"

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rtmis-mobile",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "start": "expo start --port 19000",

diff --git a/app/src/build.json b/app/src/build.json
@@ -6,7 +6,7 @@
   "dataSyncInterval": 30,
   "errorHandling": true,
   "loggingLevel": "verbose",
-  "appVersion": "4.0.8",
+  "appVersion": "4.0.9",
   "lang": "en",
   "gpsThreshold": 30
 }
diff --git a/app/src/form/fields/TypeAutofield.js b/app/src/form/fields/TypeAutofield.js
@@ -143,10 +143,14 @@ const fixIncompleteMathOperation = (expression) => {
 };
 
 const strToFunction = (fnString, values) => {
-  const fnStr = checkDirty(fnString);
-  const fnBody = fixIncompleteMathOperation(generateFnBody(fnStr, values));
-  // eslint-disable-next-line no-new-func
-  return new Function(`return ${fnBody}`);
+  try {
+    const fnStr = checkDirty(fnString);
+    const fnBody = fixIncompleteMathOperation(generateFnBody(fnStr, values));
+    // eslint-disable-next-line no-new-func
+    return new Function(`return ${fnBody}`);
+  } catch (error) {
+    return null;
+  }
 };
 
 const TypeAutofield = ({