From b0632121cb0e6de6494419f213f548a1f8951935 Mon Sep 17 00:00:00 2001
From: davidbgomes <davidbgomes92@gmail.com>
Date: Tue, 2 Apr 2024 18:53:37 -0300
Subject: [PATCH] fix orgUnit name not showing and edit survey bug

---
 src/data/utils/surveyListMappers.ts                     | 2 +-
 src/domain/usecases/ApplyInitialRulesToSurveyUseCase.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/data/utils/surveyListMappers.ts b/src/data/utils/surveyListMappers.ts
index 5ff00d32..15c5bad7 100644
--- a/src/data/utils/surveyListMappers.ts
+++ b/src/data/utils/surveyListMappers.ts
@@ -43,7 +43,7 @@ export const mapTrackedEntityToSurvey = (
             status: "ACTIVE",
             assignedOrgUnit: {
                 id: trackedEntity.orgUnit ?? "",
-                name: "",
+                name: trackedEntity.enrollments?.[0]?.orgUnitName ?? "",
             },
             surveyType: "",
             parentWardRegisterId: undefined,
diff --git a/src/domain/usecases/ApplyInitialRulesToSurveyUseCase.ts b/src/domain/usecases/ApplyInitialRulesToSurveyUseCase.ts
index 74b056e3..d721e673 100644
--- a/src/domain/usecases/ApplyInitialRulesToSurveyUseCase.ts
+++ b/src/domain/usecases/ApplyInitialRulesToSurveyUseCase.ts
@@ -19,7 +19,7 @@ export class ApplyInitialRulesToSurveyUseCase {
         const currentParentId =
             module?.name === "PPS" ? currentPPSSurveyForm : currentPrevalenceSurveyForm;
 
-        const currentSurveyRules = module?.rulesBySurvey.find(
+        const currentSurveyRules = module?.rulesBySurvey?.find(
             rule => rule.surveyId === currentParentId
         )?.surveyRules;