Merge pull request #2912 from ChildMindInstitute/fix/M2-499_A/B_Trails

Fix/m2 499 a/b trails
ChildMindInstitute · Feb 17, 2023 · 9733b26 · 9733b26
2 parents 76dbd59 + 69ed3c9
commit 9733b26
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# MindLogger 0.21.80
+# MindLogger 0.21.81
 
 _Note: v0.1 is deprecated as of June 12, 2019._
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -130,8 +130,8 @@ android {
         applicationId "lab.childmindinstitute.data"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 636
-        versionName "0.21.80"
+        versionCode 637
+        versionName "0.21.81"
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true
     }

diff --git a/app/widgets/ABTrails/TrailsBoard.js b/app/widgets/ABTrails/TrailsBoard.js
@@ -420,6 +420,14 @@ export default class TrailsBoard extends Component {
       itemColor = trailsData.colors.passed;
     }
 
+    if (errorPoints.length) {
+      const isLastPassedPoint = errorPoints.find(errorPoint => (
+        errorPoint.start === item.label
+      ))
+
+      itemColor = isLastPassedPoint ? trailsData.colors.passed : itemColor;
+    }
+
     return (
       <>
         <Circle

diff --git a/ios/MDCApp.xcodeproj/project.pbxproj b/ios/MDCApp.xcodeproj/project.pbxproj
@@ -830,7 +830,7 @@
 				CODE_SIGN_ENTITLEMENTS = MDCApp/MDCApp.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 636;
+				CURRENT_PROJECT_VERSION = 637;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 8RHKE85KB6;
 				ENABLE_TESTABILITY = YES;
@@ -863,7 +863,7 @@
 				CODE_SIGN_ENTITLEMENTS = MDCApp/MDCApp.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 636;
+				CURRENT_PROJECT_VERSION = 637;
 				DEVELOPMENT_TEAM = 8RHKE85KB6;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = MDCApp/Info.plist;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MindLogger",
-  "version": "0.21.80",
+  "version": "0.21.81",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",