From c9aa1c9e726f6784689d6f348c0eb7c8d33f893e Mon Sep 17 00:00:00 2001
From: 5Amogh <amoghavarsh@navadhiti.com>
Date: Thu, 18 Dec 2025 14:05:12 +0530
Subject: [PATCH 1/2] fix: amm-1986 & 1990

---
 .../nurse-worklist/nurse-worklist.component.ts                  | 2 ++
 .../create-family-tagging/create-family-tagging.component.html  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts
index 2c36c372..ee0d1305 100644
--- a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts
+++ b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts
@@ -279,6 +279,8 @@ export class NurseWorklistComponent implements OnInit, DoCheck, OnDestroy {
                   .confirm(
                     `info`,
                     this.currentLanguageSet.alerts.info.confirmtoProceedFurther,
+                    this.currentLanguageSet.common.ok,
+                    this.currentLanguageSet.common.cancel,
                   )
                   .subscribe((result) => {
                     if (result) {
diff --git a/src/app/app-modules/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html b/src/app/app-modules/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html
index 95fcea82..742e974a 100644
--- a/src/app/app-modules/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html
+++ b/src/app/app-modules/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html
@@ -114,7 +114,7 @@ <h4>{{ currentLanguageSet?.createFamilyTagging }}</h4>
       </form>
     </mat-dialog-content>
 
-    <mat-dialog-actions class="padding15 margin15 pull-right">
+    <mat-dialog-actions class="padding15 margin15 pull-right" style="display: flex;justify-content: flex-end;gap:12px">
       <button
         class="full-width-login button-reset"
         type="button"

From ddcad7e8406a4b2855aaf67a0580f3dd4286677c Mon Sep 17 00:00:00 2001
From: 5Amogh <amoghavarsh@navadhiti.com>
Date: Thu, 18 Dec 2025 14:12:38 +0530
Subject: [PATCH 2/2] fix: amm-1986, 1990 - common-ui reference update and
 version update

---
 Common-UI | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common-UI b/Common-UI
index 0ada5440..f4536935 160000
--- a/Common-UI
+++ b/Common-UI
@@ -1 +1 @@
-Subproject commit 0ada54409ae7968a1a7b529afb1dd9dd7b6552ee
+Subproject commit f45369358ebf0c9c57deee0a39482022a1007849
diff --git a/pom.xml b/pom.xml
index 4e3972b4..b7ff5d9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.aam-ui</groupId>
 	<artifactId>aam-ui</artifactId>
-	<version>3.6.0</version>
+	<version>3.6.1</version>
 	<name>AAM-UI</name>
 	<description>Piramal - AAM: Module ui</description>
 	<packaging>war</packaging>