From 88d021e9bd8aceb03cb8384a9604e7514f8ecc86 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <sdomnisoru@dhis2.org>
Date: Thu, 23 Jan 2025 15:42:11 +0100
Subject: [PATCH 1/2] chore: imporve Link button UI

---
 .../RelatedStagesActions.component.js                    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js
index 0c73a5a731..3a7c16cd12 100644
--- a/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js
@@ -174,16 +174,16 @@ const LinkExistingResponse = ({
     );
 };
 
-const LinkButton = withStyles(styles)(({ onLink, label, saveAttempted, errorMessages, classes }) => {
+const LinkButton = withStyles(styles)(({ onLink, label, errorMessages, classes }) => {
     if (!onLink) {
         return null;
     }
 
-    const disabled = saveAttempted && Object.values(errorMessages).filter(Boolean).length !== 0;
+    const disabled = Object.values(errorMessages).some(Boolean);
 
     return (
         <div className={classes.link}>
-            <Button secondary small onClick={onLink} disabled={disabled}>
+            <Button primary small onClick={onLink} disabled={disabled}>
                 {label}
             </Button>
         </div>
@@ -284,7 +284,6 @@ const RelatedStagesActionsPlain = ({
                     <LinkButton
                         onLink={onLink}
                         label={i18n.t('Schedule')}
-                        saveAttempted={saveAttempted}
                         errorMessages={errorMessages}
                     />
                 </>
@@ -302,7 +301,6 @@ const RelatedStagesActionsPlain = ({
                     <LinkButton
                         onLink={onLink}
                         label={i18n.t('Enter details')}
-                        saveAttempted={saveAttempted}
                         errorMessages={errorMessages}
                     />
                 </>
@@ -321,7 +319,6 @@ const RelatedStagesActionsPlain = ({
                     <LinkButton
                         onLink={onLink}
                         label={i18n.t('Link')}
-                        saveAttempted={saveAttempted}
                         errorMessages={errorMessages}
                     />
                 </>

From 91c18938c217a5a9d0ce939092a7255cef5cc0e6 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <sdomnisoru@dhis2.org>
Date: Thu, 23 Jan 2025 15:42:53 +0100
Subject: [PATCH 2/2] chore: fix 409 error for enrolledAt date in the future

---
 .../hooks/useBuildRelatedStageEventPayload.js                  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useBuildRelatedStageEventPayload.js b/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useBuildRelatedStageEventPayload.js
index f235cd07fb..86b359ce25 100644
--- a/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useBuildRelatedStageEventPayload.js
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useBuildRelatedStageEventPayload.js
@@ -11,10 +11,9 @@ export const createServerData = ({
     relationship: ?Object,
     enrollment: Object,
 }) => {
-    const updatedEnrollment = { ...enrollment, events: [...enrollment.events, linkedEvent] };
     if (linkedEvent) {
         return {
-            enrollments: [updatedEnrollment],
+            events: [...enrollment.events, linkedEvent],
             relationships: [relationship],
         };
     }