Merge branch 'CE-1217' of https://github.com/bcgov/nr-compliance-enfo…

…rcement into CE-1217
bcgov · Nov 18, 2024 · ca198af · ca198af
2 parents e50e0ae + 42f265c
commit ca198af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/frontend/src/app/components/containers/complaints/outcomes/hwcr-complaint-assessment.tsx b/frontend/src/app/components/containers/complaints/outcomes/hwcr-complaint-assessment.tsx
@@ -137,6 +137,7 @@ export const HWCRComplaintAssessment: FC<Props> = ({
     if (selected) {
       setSelectedActionRequired(selected);
       setSelectedJustification(null as unknown as Option);
+      setSelectedLinkedComplaint(null);
     } else {
       setSelectedActionRequired(null);
     }

diff --git a/frontend/src/app/components/modal/instances/quick-close-modal.tsx b/frontend/src/app/components/modal/instances/quick-close-modal.tsx
@@ -100,7 +100,7 @@ export const QuickCloseModal: FC<QuickCloseModalProps> = ({
     equipmentData?.length > 0 ||
     preventionData?.date !== undefined ||
     subjectData?.length > 0 ||
-    noteData?.note !== undefined ||
+    noteData?.note ||
     isReviewRequired ||
     reviewComplete;
   const isClosed = complaintData?.status === "CLOSED";