fix: 1740 inaccurate data being shown in review form (#1814)

bcgov · Jan 16, 2025 · 5c3e341 · 5c3e341
1 parent f610f48
commit 5c3e341
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/frontend/src/components/FavouriteActivities/index.tsx b/frontend/src/components/FavouriteActivities/index.tsx
@@ -36,7 +36,7 @@ const FavouriteActivities = ({ isConsep }: FavouriteActivitiesProps) => {
     <Row
       className={
         `favourite-activities ${windowSize.innerWidth < MEDIUM_SCREEN_WIDTH
-          ? 'favourite-activities-sm-padding' : 'favourite-activities-padding'} 
+          ? 'favourite-activities-sm-padding' : 'favourite-activities-padding'}
           ${!isConsep && 'favourite-activities-with-background'}`
       }
     >
@@ -80,13 +80,10 @@ const FavouriteActivities = ({ isConsep }: FavouriteActivitiesProps) => {
                     activities by clicking on the heart icon inside each page"
                   />
                 ) : favActQuery.data.filter((fav) => fav.isConsep === isConsep).map((favObject) => (
-                  <Column>
-                    <FavouriteCard
-                      key={favObject.type}
-                      favObject={favObject}
-                    />
-                  </Column>
-
+                  <FavouriteCard
+                    key={favObject.type}
+                    favObject={favObject}
+                  />
                 ))
             )
           }

diff --git a/frontend/src/components/SeedlotRegistrationSteps/ParentTreeStep/index.tsx b/frontend/src/components/SeedlotRegistrationSteps/ParentTreeStep/index.tsx
@@ -369,7 +369,7 @@ const ParentTreeStep = ({ isReviewDisplay, isReviewRead }: ParentTreeStepProps)
         }
         <Row className="info-section-sub-title">
           <Column>
-            Genetic worth and percent of Tested parent tree contribution
+            Genetic worth and percent of tested parent tree contribution
           </Column>
         </Row>
         {

diff --git a/frontend/src/views/Seedlot/SeedlotReview/SeedlotReviewContent.tsx b/frontend/src/views/Seedlot/SeedlotReview/SeedlotReviewContent.tsx
@@ -145,7 +145,7 @@ const SeedlotReviewContent = () => {
     areaOfUseData,
     isFetchingData,
     seedlotData,
-    calculatedValues,
+    genWorthInfoItems,
     seedlotSpecies,
     popSizeAndDiversityConfig
   } = useContext(ClassAContext);
@@ -282,16 +282,14 @@ const SeedlotReviewContent = () => {
       .forEach((genWorthKey) => {
         if (genWorthVals[genWorthKey].value) {
           const upperCaseCode = genWorthKey.toUpperCase();
-          const traitIndex = calculatedValues.map(
-            (trait) => trait.traitCode
-          ).indexOf(upperCaseCode);
           seedlotReviewGeneticWorth.push({
             traitCode: upperCaseCode,
             calculatedValue: Number(genWorthVals[genWorthKey].value),
-            // Use the same percentage value, since users can't edit it
             testedParentTreePerc:
-              calculatedValues[traitIndex]
-                ? calculatedValues[traitIndex].testedParentTreePerc
+              genWorthInfoItems[genWorthKey]
+                // Dividing by 100 since the current value is in percentage and we need
+                // to submit the real value
+                ? Number(genWorthInfoItems[genWorthKey][1].value) / 100
                 : 0
           });
         }