From 0cb1fa4932842a9c8b56370d77de205dee8e490d Mon Sep 17 00:00:00 2001
From: Bhavya-egov <bhavya.mangal@egovernments.org>
Date: Mon, 4 Aug 2025 10:49:54 +0530
Subject: [PATCH 01/14] Added complaint changes

---
 .../modules/campaign-manager/src/components/AppPreview.js       | 2 +-
 .../appConfigurationRedesign/AppConfigurationWrapper.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AppPreview.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AppPreview.js
index a87d726fc39..a4a08981fc9 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AppPreview.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AppPreview.js
@@ -137,7 +137,7 @@ const getFieldType = (field) => {
       return "text";
     case "number":
       return "number";
-    case "textarea":
+    case "textArea":
       return "textarea";
     case "time":
       return "time";
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationWrapper.js
index fa26458f268..00216d3e0c2 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationWrapper.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationWrapper.js
@@ -395,7 +395,7 @@ function AppConfigurationWrapper({ screenConfig, localeModule, pageTag }) {
     for (let i = 0; i < headerFields.length; i++) {
       if (headerFields[i]?.jsonPath === "ScreenHeading") {
         const fieldItem = headerFields[i];
-        const value = locS?.find((i) => i?.code === fieldItem?.value)?.[cL] || null;
+        const value = (locS ||[])?.find((i) => i?.code === fieldItem?.value)?.[cL] || null;
         if (!value || value.trim() === "") {
           return { type: "error", value: `${t("HEADER_FIELD_EMPTY_ERROR")}` };
         }

From 3cd151ace38db3a817b1709fad0f83382e8e0a50 Mon Sep 17 00:00:00 2001
From: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com>
Date: Wed, 6 Aug 2025 10:57:07 +0530
Subject: [PATCH 02/14] FEATURE/HCMPRE-2947 : Cancel Campign UI Integration
 (#2964)

---
 .../ViewDetailComponent.js                    |  4 +-
 .../src/components/HCMMyCampaignRowCard.js    |  2 +-
 .../SelectingBoundariesDuplicate.js           | 44 ++++++++++++++++++-
 .../NewCampaignCreate/CampaignDetails.js      |  4 ++
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateCampaignComponents/ViewDetailComponent.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateCampaignComponents/ViewDetailComponent.js
index 4f157280edb..f6172f407f6 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateCampaignComponents/ViewDetailComponent.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateCampaignComponents/ViewDetailComponent.js
@@ -3,7 +3,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
 
-const ViewDetailComponent = ({ headingName, desc, buttonLabel, navLink , type , icon , disabled }) => {
+const ViewDetailComponent = ({ headingName, desc, buttonLabel, navLink , type , icon , disabled ,isDraftCampaign}) => {
   const { t } = useTranslation();
   const history = useHistory();
 
@@ -19,7 +19,7 @@ const ViewDetailComponent = ({ headingName, desc, buttonLabel, navLink , type ,
         <Button
           label={buttonLabel}
           onClick={() => {
-            history.push(`/${window.contextPath}/employee/campaign/${navLink}`);
+            history.push(`/${window.contextPath}/employee/campaign/${navLink}`,{isDraftCampaign : isDraftCampaign});
           }}
           variation={type}
           style={{ width: '19rem' }}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/HCMMyCampaignRowCard.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/HCMMyCampaignRowCard.js
index d3886031321..ba41348f88c 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/HCMMyCampaignRowCard.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/HCMMyCampaignRowCard.js
@@ -178,7 +178,7 @@ const getActionButtons = (rowData, tabData, history, setShowErrorPopUp, setShowC
         history.push(
           `/${window?.contextPath}/employee/campaign/view-details?campaignNumber=${
             rowData?.campaignNumber
-          }&tenantId=${Digit.ULBService.getCurrentTenantId()}`
+          }&tenantId=${Digit.ULBService.getCurrentTenantId()}`, { isDraft: rowData?.status === "drafted" }
         ),
       icon: "Edit",
       variation: "primary",
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
index 19ae2fd396c..209e0314a2a 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
@@ -2,12 +2,16 @@ import React, { useState, useMemo, Fragment, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation, useHistory } from "react-router-dom";
 import { Wrapper } from "./SelectingBoundaryComponent";
-import { AlertCard, Stepper, TextBlock, Tag, Card, HeaderComponent, Loader } from "@egovernments/digit-ui-components";
+import { AlertCard, Stepper, TextBlock, Tag, Card, HeaderComponent, Loader,Chip } from "@egovernments/digit-ui-components";
 import { CONSOLE_MDMS_MODULENAME } from "../Module";
 import TagComponent from "./TagComponent";
 
 const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
   const { t } = useTranslation();
+  const location = useLocation();
+  const history = useHistory();
+  const isDraftCampaign = location.state?.isDraftCampaign;
+  const queryParams = Digit.Hooks.useQueryParams();
   const tenantId = Digit.ULBService.getStateId();
   const searchParams = new URLSearchParams(location.search);
   const hierarchyType = props?.props?.dataParams?.hierarchyType;
@@ -132,6 +136,33 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
   //   window.dispatchEvent(new Event("checking"));
   // }, [key]);
 
+
+  const Template = {
+    url: "/project-factory/v1/project-type/cancel-campaign",
+    body: {
+      CampaignDetails: {
+        tenantId: tenantId,
+        campaignId: queryParams?.id,
+      }
+    },
+  };
+  const mutation = Digit.Hooks.useCustomAPIMutationHook(Template);
+
+  const handleCancelClick = async () => {
+    await mutation.mutate(
+      {},
+      {
+        onSuccess: async (result) => {
+          history.push(`/${window?.contextPath}/employee/campaign/my-campaign-new`)
+        },
+        onError: (error, result) => {
+          const errorCode = error?.response?.data?.Errors?.[0]?.code;
+          console.error(errorCode);
+        },
+      }
+    );
+  };
+
   if (draft && isLoading) {
     return <Loader page={true} variant={"PageLoader"} />;
   }
@@ -142,7 +173,16 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
 
         <div className="card-container-delivery">
           <Card>
-             <TagComponent campaignName={campaignName} />
+            <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between" }}>
+              <TagComponent campaignName={campaignName} />
+              {
+                isDraftCampaign ? (
+                  <div className="digit-tag-container" style={{margin:"0rem"}}>
+                    <Chip text={`${t(`CANCEL_CAMPAIGN`)}`} onClick={handleCancelClick} hideClose={false} />
+                  </div>
+                ) : null
+              }
+            </div>
             <HeaderComponent className = "select-boundary">{t(`CAMPAIGN_SELECT_BOUNDARY`)}</HeaderComponent>
             <p className="dates-description">{t(`CAMPAIGN_SELECT_BOUNDARIES_DESCRIPTION`)}</p>
             <Wrapper
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/NewCampaignCreate/CampaignDetails.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/NewCampaignCreate/CampaignDetails.js
index 795640ad1d4..c54d06ffa84 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/NewCampaignCreate/CampaignDetails.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/NewCampaignCreate/CampaignDetails.js
@@ -2,6 +2,7 @@ import { Button, HeaderComponent, Footer, Loader, Tag, Toast, PopUp } from "@ego
 import { useTranslation } from "react-i18next";
 import React, { Fragment, useState, useEffect, useMemo } from "react";
 import { useHistory } from "react-router-dom";
+import { useLocation } from "react-router-dom";
 import { ViewComposer } from "@egovernments/digit-ui-react-components";
 import { OutpatientMed, AdUnits, GlobeLocationPin, Groups, ListAltCheck, UploadCloud, Edit } from "@egovernments/digit-ui-svg-components";
 import { transformUpdateCreateData } from "../../../utils/transformUpdateCreateData";
@@ -143,6 +144,8 @@ function formatIsoDate(dateStr) {
 const CampaignDetails = () => {
   const { t } = useTranslation();
   const history = useHistory();
+  const location = useLocation();
+  const isDraftCampaign = location.state?.isDraft;
   const searchParams = new URLSearchParams(location.search);
   const campaignNumber = searchParams.get("campaignNumber");
   const AppConfigSchema = HCMCONSOLE_APPCONFIG_MODULENAME;
@@ -322,6 +325,7 @@ const CampaignDetails = () => {
                   : `setup-campaign?key=5&summary=false&submit=true&campaignNumber=${campaignData?.campaignNumber}&id=${campaignData?.id}&draft=${isDraft}&isDraft=true`,
               type: campaignData?.boundaries?.length > 0 || campaignData?.parentId ? "secondary" : "primary",
               icon: <GlobeLocationPin fill={"#c84c0e"} />,
+              isDraftCampaign:isDraftCampaign ? isDraftCampaign : false
             },
           },
         ],

From 230df89827e54a453cac7b1f23447d3ecf925664 Mon Sep 17 00:00:00 2001
From: Swathi-eGov <swathi.chatrathi@egovernments.org>
Date: Wed, 6 Aug 2025 11:02:37 +0530
Subject: [PATCH 03/14] Fixed Syntax Issue

---
 .../src/components/SelectingBoundariesDuplicate.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
index e3a3ee07010..4f2d39b8720 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
@@ -2,7 +2,7 @@ import React, { useState, useMemo, Fragment, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation, useHistory } from "react-router-dom";
 import { Wrapper } from "./SelectingBoundaryComponent";
-import { AlertCard, Stepper, TextBlock, Tag, Card, HeaderComponent, Loader,PopUp,Button,Chip } from "@egovernments/digit-ui-components";
+import { AlertCard, Stepper, TextBlock, Tag, Card, HeaderComponent, Loader, PopUp, Button, Chip } from "@egovernments/digit-ui-components";
 import { CONSOLE_MDMS_MODULENAME } from "../Module";
 import TagComponent from "./TagComponent";
 
@@ -78,7 +78,7 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
     },
   };
 
-  const {  data: campaignData, isFetching } = Digit.Hooks.useCustomAPIHook(reqCriteria);
+  const { data: campaignData, isFetching } = Digit.Hooks.useCustomAPIHook(reqCriteria);
 
   useEffect(() => {
     onSelect("boundaryType", { selectedData: selectedData, boundaryData: boundaryOptions, updateBoundary: !restrictSelection });
@@ -107,9 +107,9 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
       setBoundaryOptions(sessionData?.boundaryData || {});
     }
     setTimeout(() => setIsLoading(false), 10);
-  }, [props?.props?.sessionData?.HCM_CAMPAIGN_SELECTING_BOUNDARY_DATA?.boundaryType , campaignData]);
+  }, [props?.props?.sessionData?.HCM_CAMPAIGN_SELECTING_BOUNDARY_DATA?.boundaryType, campaignData]);
 
- useEffect(() => {
+  useEffect(() => {
     if (
       props?.props?.sessionData?.HCM_CAMPAIGN_UPLOAD_BOUNDARY_DATA?.uploadBoundary?.uploadedFile?.length > 0 ||
       props?.props?.sessionData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.uploadedFile?.length > 0 ||
@@ -162,6 +162,8 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
         },
       }
     );
+  };
+
   const checkDataPresent = ({ action }) => {
     if (action === false) {
       setShowPopUp(false);
@@ -189,13 +191,13 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
               <TagComponent campaignName={campaignName} />
               {
                 isDraftCampaign ? (
-                  <div className="digit-tag-container" style={{margin:"0rem"}}>
+                  <div className="digit-tag-container" style={{ margin: "0rem" }}>
                     <Chip text={`${t(`CANCEL_CAMPAIGN`)}`} onClick={handleCancelClick} hideClose={false} />
                   </div>
                 ) : null
               }
             </div>
-            <HeaderComponent className = "select-boundary">{t(`CAMPAIGN_SELECT_BOUNDARY`)}</HeaderComponent>
+            <HeaderComponent className="select-boundary">{t(`CAMPAIGN_SELECT_BOUNDARY`)}</HeaderComponent>
             <p className="dates-description">{t(`CAMPAIGN_SELECT_BOUNDARIES_DESCRIPTION`)}</p>
             <Wrapper
               hierarchyType={hierarchyType}

From 3f516d6fac7d33e39cd83cd24c168085f83368b6 Mon Sep 17 00:00:00 2001
From: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com>
Date: Fri, 8 Aug 2025 16:01:52 +0530
Subject: [PATCH 04/14] FEATURE/HCMPRE-2958 : Added dependency field changes
 (#2980)

* Added template screen for referral flow

* FEATURE/HCMPRE-2958 : Added dependency field wrapper
---
 .../AppConfigurationParentLayer.js            |   1 +
 .../AppConfigurationWrapper.js                |   4 +-
 .../AppLocalisationWrapper.js                 |   4 +-
 .../DependentFieldsWrapper.js                 | 167 ++++++++++++++++++
 .../DrawerFieldComposer.js                    |  25 ++-
 .../ImpelComponentWrapper.js                  |   4 +-
 .../RenderConditionalField.js                 |  16 ++
 .../src/utils/appConfigHelpers.js             |  47 ++++-
 .../RegistrationComponents.js                 |   4 +
 9 files changed, 257 insertions(+), 15 deletions(-)
 create mode 100644 health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DependentFieldsWrapper.js

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationParentLayer.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationParentLayer.js
index feb69b21809..bdf2e989cb3 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationParentLayer.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationParentLayer.js
@@ -479,6 +479,7 @@ const AppConfigurationParentRedesign = ({
               parentDispatch={parentDispatch}
               AppConfigMdmsData={AppConfigMdmsData}
               localeModule={localeModule}
+              parentState={parentState}
               pageTag={`${t("CMN_PAGE")} ${currentStep} / ${stepper?.length}`}
             />
           </div>
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationWrapper.js
index 00216d3e0c2..7a734d8f4f2 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationWrapper.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppConfigurationWrapper.js
@@ -287,7 +287,7 @@ const reducer = (state = initialState, action, updateLocalization) => {
 
 const MODULE_CONSTANTS = "HCM-ADMIN-CONSOLE";
 
-function AppConfigurationWrapper({ screenConfig, localeModule, pageTag }) {
+function AppConfigurationWrapper({ screenConfig, localeModule, pageTag,parentState }) {
     const queryClient = useQueryClient();
   const { locState, addMissingKey, updateLocalization, onSubmit, back, showBack, parentDispatch } = useAppLocalisationContext();
   const [state, dispatch] = useReducer((state, action) => reducer(state, action, updateLocalization), initialState);
@@ -633,7 +633,7 @@ function AppConfigurationWrapper({ screenConfig, localeModule, pageTag }) {
                   })
                 }
               />
-              <DrawerFieldComposer />
+              <DrawerFieldComposer parentState={parentState} screenConfig={screenConfig} selectedField={state?.drawerField}/>
             </>
           ) : (
             <DndProvider backend={HTML5Backend}>
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppLocalisationWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppLocalisationWrapper.js
index 7c96d2b1d4a..4397410e59b 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppLocalisationWrapper.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppLocalisationWrapper.js
@@ -38,7 +38,7 @@ const locReducer = (state = initialState, action) => {
 
 const MODULE_CONSTANTS = "HCM-ADMIN-CONSOLE";
 //TODO @nabeel @jagan move this component to ui-component repo & clean up
-function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back, showBack, parentDispatch, ...props }) {
+function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back, showBack, parentDispatch, parentState,...props }) {
   if (!localeModule) {
     return <Loader />;
   }
@@ -129,7 +129,7 @@ function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back,
         localeModule,
       }}
     >
-      <AppConfigurationWrapper pageTag={props?.pageTag} screenConfig={screenConfig} localeModule={localeModule} />
+      <AppConfigurationWrapper pageTag={props?.pageTag} screenConfig={screenConfig} localeModule={localeModule} parentState={parentState}/>
     </AppLocalisationContext.Provider>
   );
 }
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DependentFieldsWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DependentFieldsWrapper.js
new file mode 100644
index 00000000000..a5b3c2a0832
--- /dev/null
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DependentFieldsWrapper.js
@@ -0,0 +1,167 @@
+import React, { useEffect, useState, Fragment, useMemo } from "react";
+import { Dropdown, Card, FieldV1, LabelFieldPair, TextInput } from "@egovernments/digit-ui-components";
+
+function DependentFieldsWrapper({ t, parentState, onExpressionChange, screenConfig, selectedFieldItem }) {
+
+    // List of possible operators
+    const OPERATORS = ['!==', '>=', '<=', '==', '>', '<']
+        .sort((a, b) => b.length - a.length);
+    /**
+     * Parses an expression like "A.B==C" and extracts A, B, operator, C
+     */
+    function parseExpression(expression = "") {
+        for (const operator of OPERATORS) {
+            const idx = expression.indexOf(operator);
+            if (idx !== -1) {
+                const [field, value] = [
+                    expression.slice(0, idx),
+                    expression.slice(idx + operator.length)
+                ];
+                const [selectedPage, selectedField] = field.split(".");
+                return {
+                    selectedPage: { code: selectedPage, name: selectedPage } || "",
+                    selectedField: { code: selectedField, name: selectedField } || "",
+                    comparisonType: { code: operator, name: operator },
+                    fieldValue: value || ""
+                };
+            }
+        }
+        // Fallback: if no operator found
+        return {
+            selectedPage: {},
+            selectedField: {},
+            comparisonType: {},
+            fieldValue: ""
+        };
+    }
+
+    const currentExpressionFromConfig = selectedFieldItem?.visibilityCondition?.expression;
+
+    const parsed = parseExpression(currentExpressionFromConfig);
+
+    // State initialization
+    const [selectedPage, setSelectedPage] = useState(parsed.selectedPage);
+    const [selectedField, setSelectedField] = useState(parsed.selectedField);
+    const [comparisonType, setComparisonType] = useState(parsed.comparisonType);
+    const [fieldValue, setFieldValue] = useState(parsed.fieldValue);
+    const currentPage = screenConfig?.[0]?.name;
+    const currentTemplate = parentState?.currentTemplate;
+
+    const pageOptions = useMemo(() => {
+        const currentIndex = currentTemplate.findIndex((p) => p.name === currentPage);
+        return currentTemplate.slice(0, currentIndex + 1).map((p) => ({
+            code: p.name,
+            name: p.name,
+        }));
+    }, [currentTemplate, currentPage]);
+
+    const fieldOptions = useMemo(() => {
+        const pageObj = currentTemplate.find((p) => p.name === selectedPage?.code)?.cards?.[0];
+        if (!pageObj) return [];
+        return pageObj.fields.map((f) => ({
+            code: f.jsonPath,
+            name: f.jsonPath,
+            format: f.format,
+            enums: f.dropDownOptions || [],
+        }));
+    }, [parentState?.currentTemplate, selectedPage?.code]);
+
+    const selectedFieldObj = fieldOptions.find((f) => f.code === selectedField);
+
+    useEffect(() => {
+        if (selectedPage?.code && selectedField?.code && comparisonType?.code && fieldValue !== "") {
+            const expression = `${selectedPage?.code}.${selectedField?.code}${comparisonType?.code}${fieldValue}`;
+            onExpressionChange?.(expression);
+        }
+    }, [selectedPage?.code, selectedField?.code, comparisonType?.code, fieldValue, onExpressionChange]);
+
+    return (
+        <Card type="secondary">
+            <LabelFieldPair vertical={true} removeMargin={true}>
+                <p style={{ margin: "0px" }}>{t("HCM_SELECT_PAGE")}</p>
+                <div className="digit-field" style={{ width: "100%" }}>
+                    <Dropdown
+                        option={pageOptions}
+                        optionKey="code"
+                        name="pageSelect"
+                        t={t}
+                        select={(e) => {
+                            setSelectedPage(e);
+                            setSelectedField({});
+                        }}
+                        selected={selectedPage}
+                    />
+                </div>
+            </LabelFieldPair>
+            <LabelFieldPair vertical={true} removeMargin={true}>
+                <p style={{ margin: "0px" }}>{t("HCM_SELECT_FIELD")}</p>
+                <div className="digit-field" style={{ width: "100%" }}>
+                    <Dropdown
+                        option={fieldOptions}
+                        optionKey="code"
+                        name="fieldSelect"
+                        t={t}
+                        select={(e) => {
+                            setSelectedField(e);
+                            setFieldValue("");
+                        }}
+                        selected={selectedField}
+                        disabled={!selectedPage?.code}
+                    />
+                </div>
+            </LabelFieldPair>
+            <LabelFieldPair vertical={true} removeMargin={true}>
+                <p style={{ margin: "0px" }}>{t("HCM_COMPARISION_TYPE")}</p>
+                <div className="digit-field" style={{ width: "100%" }}>
+                    <Dropdown
+                        option={[
+                            { code: "==", name: "equals to" },
+                            { code: "!==", name: "not equals to" },
+                            { code: ">=", name: "greater than or equals to" },
+                            { code: "<=", name: "less than or equals to" },
+                            { code: ">", name: "greater than" },
+                            { code: "<", name: "less than" },
+                        ]}
+                        optionKey="code"
+                        name="comparisonSelect"
+                        t={t}
+                        select={(e) => setComparisonType(e)}
+                        disabled={!selectedField?.code}
+                        selected={comparisonType}
+                    />
+                </div>
+            </LabelFieldPair>
+            <LabelFieldPair vertical={true} removeMargin={true}>
+                <p style={{ margin: "0px" }}>{t("HCM_SELECT_VALUE")}</p>
+                <div className="digit-field" style={{ width: "100%" }}>
+                    {selectedFieldObj && selectedFieldObj.format === "dropdown" ? (
+                        <Dropdown
+                            label={t("Select Value")}
+                            option={selectedFieldObj.enums.map((en) => ({
+                                code: en.code,
+                                name: en.name,
+                            }))}
+                            optionKey="code"
+                            name="valueSelect"
+                            t={t}
+                            select={(e) => setFieldValue(e.code)}
+                            disabled={!selectedField?.code}
+                            selected={fieldValue}
+                        />
+                    ) : (
+                        <TextInput
+                            type="text"
+                            populators={{ name: "fieldValue" }}
+                            placeholder={t("Enter value")}
+                            value={fieldValue}
+                            onChange={(event) => setFieldValue(event.target.value)}
+                            disabled={!selectedField?.code}
+                        />
+                    )}
+                </div>
+            </LabelFieldPair>
+        </Card>
+    );
+}
+
+export default React.memo(DependentFieldsWrapper);
\ No newline at end of file
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js
index 85ae3497f3d..6fee47b2b0a 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js
@@ -75,7 +75,7 @@ const whenToShow = (panelItem, drawerState) => {
   }
 };
 
-const RenderField = ({ state, panelItem, drawerState, setDrawerState, updateLocalization, AppScreenLocalisationConfig }) => {
+const RenderField = ({ state, panelItem, drawerState, setDrawerState, updateLocalization, AppScreenLocalisationConfig,parentState,handleExpressionChange,screenConfig ,selectedField}) => {
   const { t } = useTranslation();
   const isLocalisable = AppScreenLocalisationConfig?.fields
     ?.find((i) => i.fieldType === drawerState?.appType)
@@ -166,6 +166,10 @@ const RenderField = ({ state, panelItem, drawerState, setDrawerState, updateLoca
                     drawerState={drawerState}
                     AppScreenLocalisationConfig={AppScreenLocalisationConfig}
                     disabled={drawerState?.hidden}
+                    parentState={parentState}
+                    handleExpressionChange={handleExpressionChange}
+                    screenConfig={screenConfig}
+                    selectedField={selectedField}
                   />
                 ))
             : null}
@@ -381,7 +385,7 @@ const RenderField = ({ state, panelItem, drawerState, setDrawerState, updateLoca
   }
 };
 
-function DrawerFieldComposer() {
+function DrawerFieldComposer({parentState,screenConfig,selectedField}) {
   const { t } = useTranslation();
   const { locState, updateLocalization, AppScreenLocalisationConfig } = useAppLocalisationContext();
   const { state, dispatch } = useAppConfigContext();
@@ -404,6 +408,19 @@ function DrawerFieldComposer() {
     return state?.MASTER_DATA?.DrawerPanelConfig?.filter((i) => i.tab === activeTab).sort((a, b) => a.order - b.order);
   }, [state?.MASTER_DATA?.drawerField, tabs]);
 
+  const handleExpressionChange = (expressionString) => {
+    if (drawerState.visibilityCondition?.expression !== expressionString) {
+      setDrawerState(prev => ({
+        ...prev,
+        visibilityCondition: {
+          ...prev.visibilityCondition,
+          expression: expressionString
+        }
+      }));
+    }
+  };
+
+
   useEffect(() => {
     if (state?.drawerField) {
       setDrawerState(state?.drawerField);
@@ -476,6 +493,10 @@ function DrawerFieldComposer() {
                   state={state}
                   updateLocalization={updateLocalization}
                   AppScreenLocalisationConfig={AppScreenLocalisationConfig}
+                  parentState={parentState}
+                  handleExpressionChange={handleExpressionChange}
+                  screenConfig={screenConfig}
+                  selectedField={selectedField}
                 />
               </div>
             );
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/ImpelComponentWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/ImpelComponentWrapper.js
index 8eec884d392..097c3c50505 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/ImpelComponentWrapper.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/ImpelComponentWrapper.js
@@ -6,7 +6,7 @@ import { AppLocalisationWrapper, Loader, useCustomT } from "@egovernments/digit-
 //development mode
 import AppPreview from "../../../components/AppPreview";
 
-function ImpelComponentWrapper({ variant, screenConfig, submit, back, showBack, parentDispatch, localeModule, pageTag, ...props }) {
+function ImpelComponentWrapper({ variant, screenConfig, submit, back, showBack, parentDispatch, localeModule, pageTag, parentState,...props }) {
   const MODULE_CONSTANTS = "HCM-ADMIN-CONSOLE";
   const searchParams = new URLSearchParams(location.search);
   const fieldMasterName = searchParams.get("fieldType");
@@ -186,6 +186,7 @@ function ImpelComponentWrapper({ variant, screenConfig, submit, back, showBack,
   //       parentDispatch={parentDispatch}
   //       localeModule={localeModule}
   //       pageTag={pageTag}
+  //       parentState={parentState}
   //     />
   //   );
   // }
@@ -199,6 +200,7 @@ function ImpelComponentWrapper({ variant, screenConfig, submit, back, showBack,
       parentDispatch={parentDispatch}
       localeModule={localeModule}
       pageTag={pageTag}
+      parentState={parentState}
     >
       <AppPreview />
     </AppLocalisationWrapper>
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js
index 78445a86968..6bb5cca7a80 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js
@@ -3,6 +3,7 @@ import { TextInput, Dropdown, RadioButtons, Button, FieldV1 } from "@egovernment
 import { useTranslation } from "react-i18next";
 import { useCustomT } from "./useCustomT";
 import { DustbinIcon } from "../../../components/icons/DustbinIcon";
+import DependentFieldsWrapper from "./DependentFieldsWrapper";
 
 export const RenderConditionalField = ({
   cField,
@@ -14,6 +15,10 @@ export const RenderConditionalField = ({
   drawerState,
   AppScreenLocalisationConfig,
   disabled,
+  parentState,
+  handleExpressionChange,
+  screenConfig,
+  selectedField
 }) => {
   const { t } = useTranslation();
   const isLocalisable = AppScreenLocalisationConfig?.fields
@@ -214,6 +219,17 @@ export const RenderConditionalField = ({
           optionsKey="code"
         />
       );
+    case "dependencyFieldWrapper":
+      return (
+        <DependentFieldsWrapper
+          currentPage="beneficiaryLocation"
+          t={t}
+          parentState={parentState}
+          onExpressionChange={handleExpressionChange}
+          screenConfig={screenConfig}
+          selectedFieldItem={selectedField}
+        />
+      )
     default:
       return null;
   }
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
index 47c81607a0f..ff468f96a41 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
@@ -112,25 +112,55 @@ export const getTypeAndFormatFromAppType = (field, fieldTypeMasterData = []) =>
 //   return result;
 // };
 
-function flattenValidationsToField(validationsArray) {
-  const result = {};
+// function flattenValidationsToField(validationsArray) {
+//   const result = {};
+
+//   if (!Array.isArray(validationsArray)) return {};
+
+//   for (const rule of validationsArray) {
+//     if (!rule || typeof rule !== "object") continue;
+//     const { type, value, message } = rule;
+
+//     if (!type || value === undefined || value === null) continue;
 
-  if (!Array.isArray(validationsArray)) return {};
+//     result[`toArray.${type}`] = value;
+//     if (message !== undefined && message !== null) {
+//       result[`toArray.${type}.message`] = message;
+//     }
+//   }
+
+//   return result;
+// }
 
+// / new function for scale up
+function flattenValidationsToField2(validationsArray, groupKey = "validation") {
+  const result = {};
+  if (!Array.isArray(validationsArray)) return result;
   for (const rule of validationsArray) {
     if (!rule || typeof rule !== "object") continue;
     const { type, value, message } = rule;
-
     if (!type || value === undefined || value === null) continue;
-
-    result[`toArray.${type}`] = value;
+    if (!result[groupKey]) result[groupKey] = {};
+    result[groupKey][type] = value;
     if (message !== undefined && message !== null) {
-      result[`toArray.${type}.message`] = message;
+      result[groupKey][`${type}.message`] = message;
     }
   }
 
   return result;
 }
+function flattenConfigArrays(configObj) {
+  const result = {};
+  for (const key in configObj) {
+    const value = configObj[key];
+    // Handle array of {type, value} objects (like validations)
+    if (Array.isArray(value) && value.every((v) => typeof v === "object" && v.type)) {
+      const flattened = flattenValidationsToField2(value, key);
+      Object.assign(result, flattened); // Only merged part (e.g., { validations: { ... } })
+    }
+  }
+  return result; // :white_check_mark: Only changed keys
+}
 
 const addValidationArrayToConfig = (field, fieldTypeMasterData = []) => {
   const validationArray = [];
@@ -151,7 +181,8 @@ export const restructure = (data1, fieldTypeMasterData = [], parent) => {
       ?.sort((a, b) => a.order - b.order)
       ?.map((field, index) => ({
         ...getTypeAndMetaData(field, fieldTypeMasterData),
-        ...flattenValidationsToField(field?.validations || []),
+        ...flattenConfigArrays(field),
+        // ...flattenValidationsToField(field?.validations || []),
         label: field?.label || "",
         value: field?.value || "",
         defaultValue: field?.value ? true : false,
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
index 2421de05dac..708087a0810 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
@@ -297,6 +297,10 @@ const styles = {
 
 export const getTemplateRenderer = (templateName) => {
 
+  if (templateName?.includes('Acknowledgement')) {
+    return responsePanelComponent;
+  }
+
   switch (templateName) {
     case "BeneficiaryAcknowledgement":
     case "HouseholdAcknowledgement":

From c671b13bf41ff03a45cea3854c3a59577efaab7e Mon Sep 17 00:00:00 2001
From: Ramkrishna-egov <ramkrishna.sahoo@egovernments.org>
Date: Mon, 11 Aug 2025 12:27:44 +0530
Subject: [PATCH 05/14] Fixed Compile issues

---
 .../SelectingBoundariesDuplicate.js           | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
index bad39fc4f91..a9d5a9c799e 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
@@ -138,32 +138,6 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
   //   window.dispatchEvent(new Event("checking"));
   // }, [key]);
 
-  const Template = {
-    url: "/project-factory/v1/project-type/cancel-campaign",
-    body: {
-      CampaignDetails: {
-        tenantId: tenantId,
-        campaignId: queryParams?.id,
-      }
-    },
-  };
-  const mutation = Digit.Hooks.useCustomAPIMutationHook(Template);
-
-  const handleCancelClick = async () => {
-    await mutation.mutate(
-      {},
-      {
-        onSuccess: async (result) => {
-          history.push(`/${window?.contextPath}/employee/campaign/my-campaign-new`)
-        },
-        onError: (error, result) => {
-          const errorCode = error?.response?.data?.Errors?.[0]?.code;
-          console.error(errorCode);
-        },
-      }
-    );
-  };
-
   const checkDataPresent = ({ action }) => {
     if (action === false) {
       setShowPopUp(false);

From d3672b517c0e13f1eaf19fdeb4e9f50da428b4f0 Mon Sep 17 00:00:00 2001
From: Ramkrishna-egov <85437265+Ramkrishna-egov@users.noreply.github.com>
Date: Mon, 11 Aug 2025 12:40:08 +0530
Subject: [PATCH 06/14] GIT-2888:: Fetaures/Properties changes and HRMS Fixes
 (#2959)

* GIT-2888:: Features/ Prperties Config

* Added filter component to support Enums

* Removed console logs

* GIT-2888 :: Features/properties Config

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org>
---
 .../src/components/FiltersRenderer.js         | 97 +++++++++++++++++++
 .../src/components/GenericTemplateScreen.js   |  7 +-
 .../DrawerFieldComposer.js                    |  5 +-
 .../RenderConditionalField.js                 | 46 +++++----
 .../RegistrationComponents.js                 | 53 ++++++++--
 .../src/pages/employee/createEmployee.js      |  1 +
 6 files changed, 176 insertions(+), 33 deletions(-)
 create mode 100644 health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/FiltersRenderer.js

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/FiltersRenderer.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/FiltersRenderer.js
new file mode 100644
index 00000000000..f99e5497436
--- /dev/null
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/FiltersRenderer.js
@@ -0,0 +1,97 @@
+import React, { useState, Fragment, useEffect } from "react";
+import { TextInput, Dropdown, RadioButtons, Button, FieldV1, Switch, Loader } from "@egovernments/digit-ui-components";
+import { useTranslation } from "react-i18next";
+const FiltersRenderer = ({ cField, drawerState, setDrawerState, t, disabled }) => {
+  const [localSelectedSchema, setLocalSelectedSchema] = useState(null);
+  const [localActiveOptions, setLocalActiveOptions] = useState([]); // store codes
+
+  // Fetch MDMS data based on selected schema
+  const { isLoading, data: mdmsOptions = [] } = Digit.Hooks.useCustomMDMS(
+    Digit.ULBService.getCurrentTenantId(),
+    localSelectedSchema?.moduleName,
+    localSelectedSchema?.masterName ? [{ name: localSelectedSchema.masterName }] : [],
+    {
+      enabled: !!localSelectedSchema?.moduleName && !!localSelectedSchema?.masterName,
+      select: (data) => data?.[localSelectedSchema?.moduleName]?.[localSelectedSchema.masterName] || [],
+    },
+    { schemaCode: "FILTERSDROPDOWNLIST" }
+  );
+
+  // When MDMS options load, set default active
+  useEffect(() => {
+    if (mdmsOptions.length > 0) {
+      const defaultActive = mdmsOptions.filter((opt) => opt.active).map((opt) => opt.code);
+      setLocalActiveOptions(defaultActive);
+      // Also initialize enums in drawerState with these active objects
+      const activeObjects = mdmsOptions.filter((item) => defaultActive.includes(item.code));
+      setDrawerState((prev) => ({
+        ...prev,
+        enums: activeObjects,
+      }));
+    }
+  }, [mdmsOptions]);
+
+  // Handle toggle
+  const handleToggle = (code, checked) => {
+    setLocalActiveOptions((prev) => {
+      let updated = [...prev];
+      if (checked) {
+        if (!updated.includes(code)) updated.push(code);
+      } else {
+        updated = updated.filter((c) => c !== code);
+      }
+
+      // Map updated codes to full objects
+      const activeObjects = mdmsOptions.filter((item) => updated.includes(item.code));
+
+      // Update drawerState.enums directly
+      setDrawerState((prev) => ({
+        ...prev,
+        enums: activeObjects,
+      }));
+
+      return updated;
+    });
+  };
+
+  return (
+    <>
+      {/* Dropdown for selecting schema */}
+      <Dropdown
+        variant={""}
+        t={t}
+        disabled={disabled}
+        option={cField?.mdmsOptions || []}
+        optionKey={"schemaCode"}
+        selected={localSelectedSchema || {}}
+        select={(value) => {
+          setLocalSelectedSchema(value);
+          setLocalActiveOptions([]); // reset active when schema changes
+          setDrawerState((prev) => ({ ...prev, enums: [] })); // reset enums
+        }}
+      />
+
+      {isLoading && <Loader/>}
+
+      {!isLoading && mdmsOptions.length > 0 && (
+        <div style={{ marginTop: "1rem", display: "flex", flexDirection: "column", gap: "0.5rem" }}>
+          {mdmsOptions.map((opt) => {
+            const isActive = localActiveOptions.includes(opt.code);
+            return (
+              <Switch
+                key={opt.code}
+                label={t(opt.name)}
+                isCheckedInitially={isActive}
+                onToggle={(checked) => handleToggle(opt.code, checked)}
+                disable={false}
+                shapeOnOff
+              />
+            );
+          })}
+        </div>
+      )}
+    </>
+  );
+};
+
+export default FiltersRenderer;
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/GenericTemplateScreen.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/GenericTemplateScreen.js
index a6ed2aefcc7..98f5952071d 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/GenericTemplateScreen.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/GenericTemplateScreen.js
@@ -22,10 +22,11 @@ const GenericTemplateScreen = ({ components = [], t, selectedField, templateName
     .filter(
       (field) =>
         !field.hidden &&
-        (field.jsonPath === "PrimaryButton" || field.jsonPath === "SecondaryButton" || field.jsonPath === "qrscanner")
+        (field.jsonPath === "PrimaryButton" || field.jsonPath === "SecondaryButton" || field.jsonPath === "scanner")
     )
     .sort((a, b) => (a.order || 0) - (b.order || 0));
 
+
   return (
     <div
       style={{
@@ -94,11 +95,11 @@ const GenericTemplateScreen = ({ components = [], t, selectedField, templateName
             <div className={`${selectedField?.jsonPath === field.jsonPath ? "app-preview-field-pair app-preview-selected" : ""}`}>
             <Button
               key={index}
-              variation={field.jsonPath === "SecondaryButton" ? "secondary" : "primary"}
+              variation={field.jsonPath === "SecondaryButton" || field.jsonPath === "scanner" ? "secondary" : "primary"}
               label={t(field?.label)}
               onClick={() => { }}
               style={{ minWidth: "100%" }}
-              icon={field.icon || null}
+              icon={field.jsonPath === "scanner"  ? "QrCodeScanner" : null}
             />
             </div>
           ))}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js
index 6fee47b2b0a..10632c2c893 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js
@@ -123,7 +123,7 @@ const RenderField = ({ state, panelItem, drawerState, setDrawerState, updateLoca
       const switchRef = useRef(null);
       const [showTooltip, setShowTooltip] = useState(false);
       const isDisabled = disableFieldForMandatory(drawerState, panelItem, resourceData);
-
+//TODO:: Filter households popup should be acustom selection componenet
       return (
         <div
           ref={switchRef}
@@ -176,7 +176,8 @@ const RenderField = ({ state, panelItem, drawerState, setDrawerState, updateLoca
         </div>
       );
     }
-    case "text": {
+    case "text":
+    case "number": {
       const switchRef = useRef(null);
       const [showTooltip, setShowTooltip] = useState(false);
       const isDisabled = disableFieldForMandatory(drawerState, panelItem, resourceData);
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js
index 6bb5cca7a80..5908fb3da9a 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js
@@ -1,8 +1,9 @@
-import React from "react";
+import React, { Fragment } from "react";
 import { TextInput, Dropdown, RadioButtons, Button, FieldV1 } from "@egovernments/digit-ui-components";
 import { useTranslation } from "react-i18next";
 import { useCustomT } from "./useCustomT";
 import { DustbinIcon } from "../../../components/icons/DustbinIcon";
+import FiltersRenderer from "../../../components/FiltersRenderer";
 import DependentFieldsWrapper from "./DependentFieldsWrapper";
 
 export const RenderConditionalField = ({
@@ -27,6 +28,7 @@ export const RenderConditionalField = ({
   const searchParams = new URLSearchParams(location.search);
   const projectType = searchParams.get("prefix");
 
+
   switch (cField?.type) {
     case "text":
     case "number":
@@ -49,9 +51,8 @@ export const RenderConditionalField = ({
               updateLocalization(
                 drawerState?.[cField.bindTo] && drawerState?.[cField.bindTo] !== true
                   ? drawerState?.[cField.bindTo]
-                  : `${projectType}_${state?.currentScreen?.parent}_${state?.currentScreen?.name}_${cField.bindTo}_${
-                      drawerState?.jsonPath || drawerState?.id
-                    }`,
+                  : `${projectType}_${state?.currentScreen?.parent}_${state?.currentScreen?.name}_${cField.bindTo}_${drawerState?.jsonPath || drawerState?.id
+                  }`,
                 Digit?.SessionStorage.get("locale") || Digit?.SessionStorage.get("initData")?.selectedLanguage,
                 value
               );
@@ -60,9 +61,8 @@ export const RenderConditionalField = ({
                 [cField?.bindTo]:
                   drawerState?.[cField.bindTo] && drawerState?.[cField.bindTo] !== true
                     ? drawerState?.[cField.bindTo]
-                    : `${projectType}_${state?.currentScreen?.parent}_${state?.currentScreen?.name}_${cField.bindTo}_${
-                        drawerState?.jsonPath || drawerState?.id
-                      }`,
+                    : `${projectType}_${state?.currentScreen?.parent}_${state?.currentScreen?.name}_${cField.bindTo}_${drawerState?.jsonPath || drawerState?.id
+                    }`,
               }));
               return;
             } else {
@@ -152,18 +152,18 @@ export const RenderConditionalField = ({
                 ...prev,
                 [cField?.bindTo]: prev?.[cField?.bindTo]
                   ? [
-                      ...prev?.[cField?.bindTo],
-                      {
-                        code: crypto.randomUUID(),
-                        name: "",
-                      },
-                    ]
+                    ...prev?.[cField?.bindTo],
+                    {
+                      code: crypto.randomUUID(),
+                      name: "",
+                    },
+                  ]
                   : [
-                      {
-                        code: crypto.randomUUID(),
-                        name: "",
-                      },
-                    ],
+                    {
+                      code: crypto.randomUUID(),
+                      name: "",
+                    },
+                  ],
               }))
             }
           />
@@ -219,6 +219,16 @@ export const RenderConditionalField = ({
           optionsKey="code"
         />
       );
+    case "filters":
+      return (
+        <FiltersRenderer
+          cField={cField}
+          drawerState={drawerState}
+          setDrawerState={setDrawerState}
+          t={t}
+          disabled={disabled}
+        />
+      );
     case "dependencyFieldWrapper":
       return (
         <DependentFieldsWrapper
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
index 708087a0810..9e48347d15a 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
@@ -1,6 +1,7 @@
-import { ResultsDataTable, TableMolecule, Button, Switch, FieldV1, RoundedLabel, CustomSVG, SummaryCardFieldPair, PanelCard, Header } from "@egovernments/digit-ui-components";
-import React, { useEffect, useMemo } from "react";
+import { ResultsDataTable, TableMolecule, Button, Switch, FieldV1, RoundedLabel, CustomSVG, SummaryCardFieldPair, PanelCard, Header, PopUp } from "@egovernments/digit-ui-components";
+import React, { useEffect, useMemo, useState, } from "react";
 import { registerComponent } from "./RegistrationRegistry";
+import RenderSelectionField from "../../components/RenderSelectionField";
 
 
 
@@ -38,18 +39,50 @@ const SearchBar = (props) => (
 );
 
 
-const FilterIcon = () => (
-  <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+const FilterIcon = (props) => (
+  <svg onClick={props?.onClick} width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M0.250666 1.61C2.27067 4.2 6.00067 9 6.00067 9V15C6.00067 15.55 6.45067 16 7.00067 16H9.00067C9.55067 16 10.0007 15.55 10.0007 15V9C10.0007 9 13.7207 4.2 15.7407 1.61C16.2507 0.95 15.7807 0 14.9507 0H1.04067C0.210666 0 -0.259334 0.95 0.250666 1.61Z" fill="#C84C0E" />
   </svg>
 
 );
-const Filter = (props) => (
-  <div className="digit-search-action">
-    {/* <RoundedLabel count={props.filterCount}></RoundedLabel> */}
-    <FilterIcon /> <span className="digit-search-text">{props.t(props.field.label) || "LABEL"}</span>
-  </div>
-);
+const Filter = (props) => {
+  const [showPopUp, setShowPopUp] = useState(false);
+
+  return (
+    <div className="digit-search-action">
+      <FilterIcon onClick={() => setShowPopUp(true)} />
+      <span className="digit-search-text">{props.t(props.field.label) || "LABEL"}</span>
+
+      {showPopUp && (
+        <PopUp
+          className={"custom-popup-filter"}
+          type={"default"}
+          heading={props.t("SELECT_FILTER")}
+          onClose={() => setShowPopUp(false)}
+          style={{
+            width: "100%",          // Full width popup
+            maxWidth: "100%",       // Prevents shrinking
+            height: "auto",
+            margin: 0,
+            padding: 0
+          }}
+          footerChildren={[
+          ]}
+          sortFooterChildren={true}
+        >
+          <div style={{   width: "100%",            // Take full popup width
+              padding: "1rem",
+              boxSizing: "border-box" }}>
+            <RenderSelectionField
+              field={props.field}
+              t={props.t}
+            />
+          </div>
+        </PopUp>
+      )}
+    </div>
+  );
+};
 
 
 const Toggle = (props) => (
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/health-hrms/src/pages/employee/createEmployee.js b/health/micro-ui/web/micro-ui-internals/packages/modules/health-hrms/src/pages/employee/createEmployee.js
index 482993db266..8be67eeb8ee 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/health-hrms/src/pages/employee/createEmployee.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/health-hrms/src/pages/employee/createEmployee.js
@@ -385,6 +385,7 @@ const CreateEmployee = ({ editUser = false }) => {
 
         {showToast && (
           <Toast
+            type={showToast?.key ? "error" : "success"}
             error={showToast.key}
             isDleteBtn="true"
             label={t(showToast.label)}

From 5272fefe181b123bb0763b178cd5808e83ff8426 Mon Sep 17 00:00:00 2001
From: Ramkrishna-egov <ramkrishna.sahoo@egovernments.org>
Date: Tue, 12 Aug 2025 13:50:26 +0530
Subject: [PATCH 07/14] Fixed Acxknowledgement page rendering and Accept
 visibilityCondition in reverse restructuring of form config

---
 .../modules/campaign-manager/src/utils/appConfigHelpers.js  | 1 +
 .../src/utils/template_components/RegistrationComponents.js | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
index ff468f96a41..fa180bb8d0a 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
@@ -312,6 +312,7 @@ export const reverseRestructure = (updatedData, fieldTypeMasterData = []) => {
         enums: field?.dropDownOptions,
         validations: toArrayFields,
         helpText: typeof field?.helpText === "string" ? field.helpText : "",
+        visibilityCondition: field?.visibilityCondition || {},
       };
     });
 
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
index 9e48347d15a..9509a7a8b85 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
@@ -329,20 +329,14 @@ const styles = {
 
 
 export const getTemplateRenderer = (templateName) => {
-
   if (templateName?.includes('Acknowledgement')) {
     return responsePanelComponent;
   }
 
   switch (templateName) {
-    case "BeneficiaryAcknowledgement":
-    case "HouseholdAcknowledgement":
-      return responsePanelComponent;
-
     case "HouseholdOverview":
       return HouseHoldOverviewSection;
 
-
     // case "AnotherTemplate": return anotherRenderer;
 
     default:

From 4ffc60e941dd87f1e4bd9acfd9bf724cf77c71c1 Mon Sep 17 00:00:00 2001
From: Ramkrishna-egov <ramkrishna.sahoo@egovernments.org>
Date: Wed, 13 Aug 2025 14:14:39 +0530
Subject: [PATCH 08/14] Added complaint components

---
 .../src/utils/appConfigHelpers.js             |   1 +
 .../RegistrationComponents.js                 | 100 ++++++++++++++++--
 2 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
index fa180bb8d0a..6965c4a9173 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
@@ -209,6 +209,7 @@ export const restructure = (data1, fieldTypeMasterData = [], parent) => {
         includeInForm: field?.includeInForm === false ? false : true,
         includeInSummary: field?.includeInSummary === false ? false : true,
         helpText: typeof field?.helpText === "string" ? field.helpText : "",
+        visibilityCondition: field?.visibilityCondition || null,
       }));
 
     return {
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
index 9509a7a8b85..7bc7e788fe1 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
@@ -1,4 +1,4 @@
-import { ResultsDataTable, TableMolecule, Button, Switch, FieldV1, RoundedLabel, CustomSVG, SummaryCardFieldPair, PanelCard, Header, PopUp } from "@egovernments/digit-ui-components";
+import { ResultsDataTable, TableMolecule, Button, Switch, FieldV1, RoundedLabel, CustomSVG, SummaryCardFieldPair, PanelCard, Header, PopUp, SVG } from "@egovernments/digit-ui-components";
 import React, { useEffect, useMemo, useState, } from "react";
 import { registerComponent } from "./RegistrationRegistry";
 import RenderSelectionField from "../../components/RenderSelectionField";
@@ -51,7 +51,7 @@ const Filter = (props) => {
   return (
     <div className="digit-search-action">
       <FilterIcon onClick={() => setShowPopUp(true)} />
-      <span className="digit-search-text">{props.t(props.field.label) || "LABEL"}</span>
+      <span className="digit-search-text" style={{color: "#C84C0E"}}>{props.t(props.field.label) || "LABEL"}</span>
 
       {showPopUp && (
         <PopUp
@@ -70,9 +70,11 @@ const Filter = (props) => {
           ]}
           sortFooterChildren={true}
         >
-          <div style={{   width: "100%",            // Take full popup width
-              padding: "1rem",
-              boxSizing: "border-box" }}>
+          <div style={{
+            width: "100%",            // Take full popup width
+            padding: "1rem",
+            boxSizing: "border-box"
+          }}>
             <RenderSelectionField
               field={props.field}
               t={props.t}
@@ -187,7 +189,7 @@ const HouseHoldDetailsCard = (props) => {
           <SummaryCardFieldPair
             style={{
               overflowX: "hidden",
-              display: "flex", alignItems: "center", minWidth: "100vh" , paddingBottom: "1rem"
+              display: "flex", alignItems: "center", minWidth: "100vh", paddingBottom: "1rem"
             }}
             key={index}
             inline={true}
@@ -267,7 +269,7 @@ const styles = {
     flexDirection: "column",
     alignItems: "center", // horizontally center the buttons
     gap: "8px",
-    marginTop: "10px",  
+    marginTop: "10px",
   },
   card: {
     overflowX: "hidden",
@@ -336,6 +338,8 @@ export const getTemplateRenderer = (templateName) => {
   switch (templateName) {
     case "HouseholdOverview":
       return HouseHoldOverviewSection;
+    case "complaintInbox":
+      return SimpleSearchFilterRow;
 
     // case "AnotherTemplate": return anotherRenderer;
 
@@ -389,7 +393,7 @@ export const HouseHoldOverviewSection = ({ components = [], t }) => {
           alignment="flex-end"
         />
 
-        {detailsCard?.hidden != true && <DetailsCardSection t={t} field={detailsCard}/>}
+        {detailsCard?.hidden != true && <DetailsCardSection t={t} field={detailsCard} />}
 
         <HouseholdOverViewMemberCard
           name="Joseph Sergio"
@@ -602,6 +606,86 @@ const Table = ({ field, t }) => {
   );
 };
 
+
+/**
+ * SimpleSearchFilterRow
+ * A minimal row with: [ Search icon + label ] | [ Filter ] | [ Sort icon ]
+ *
+ * Uses your existing <Filter />, <SVG.Search />, and <SVG.Sort /> components.
+ */
+const SimpleSearchFilterRow = ({
+  components = [], t
+  // t,
+  // label = "Search",
+  // primaryColor = "currentColor",
+  // size = "20px",
+  // onSearchClick,
+  // onSortClick,
+  // // Pass anything your <Filter /> needs via this prop
+  // filterProps = {},
+}) => {
+  const formatMap = {};
+  components.forEach((item) => {
+    formatMap[item.jsonPath] = item;
+  });
+
+  const searchIcon = formatMap["searchComplaints"] || { label: "", hidden: true };
+  const filter = formatMap["filter"] || {};
+  const sortIcon = formatMap["sortComplaints"] || {};
+
+  const cellStyle = {
+    minWidth: 0,
+    display: "flex",
+    alignItems: "center",
+    gap: "0.375rem", // tighter gap between icon and label
+    color: "inherit",
+  };
+
+  return (
+    <div
+      style={{
+        display: "grid",
+        gridTemplateColumns: "repeat(3, minmax(0, 1fr))", // equal widths
+        columnGap: "0.5rem", // smaller overall gap
+        rowGap: "0.5rem",
+        alignItems: "center",
+        width: "100%" //allow responsive wrap
+      }}
+    >
+      {/* Left: Search icon + label */}
+      <div
+        style={cellStyle}
+      >
+        {/* Use currentColor so it won't disappear on white backgrounds */}
+        <SVG.Search width={"20px"} height={"20px"} fill={"#C84C0E"} />
+        <span style={{ whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis", color: "#C84C0E" }}>
+          {t?.(searchIcon?.label || "")}
+        </span>
+      </div>
+
+      {/* Middle: Filter (full-width inside its cell) */}
+      <div style={{ minWidth: 0 }}>
+        <div style={{ width: "100%" }}>
+          <Filter field={filter} t={t} />
+        </div>
+      </div>
+
+      {/* Right: Sort icon + label (optional) */}
+      <div
+        style={cellStyle}
+      >
+        <SVG.ArrowDownward width={"20px"} height={"20px"} fill={"#C84C0E"} />
+        {sortIcon?.label ? (
+          <span style={{ whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" , color: "#C84C0E"}}>
+            {t?.(sortIcon?.label || "")}
+          </span>
+        ) : null}
+      </div>
+    </div>
+  );
+}
+
+
 // Register all components
 registerComponent("searchBar", SearchBar);
 registerComponent("filter", Filter);

From 4bdcd7bc46558850e75e2e30941c319db0a9af66 Mon Sep 17 00:00:00 2001
From: Ramkrishna-egov <ramkrishna.sahoo@egovernments.org>
Date: Wed, 13 Aug 2025 14:30:09 +0530
Subject: [PATCH 09/14] Added autro fill condition to field properties

---
 .../modules/campaign-manager/src/utils/appConfigHelpers.js    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
index 6965c4a9173..d4a93a9ae1e 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
@@ -209,7 +209,8 @@ export const restructure = (data1, fieldTypeMasterData = [], parent) => {
         includeInForm: field?.includeInForm === false ? false : true,
         includeInSummary: field?.includeInSummary === false ? false : true,
         helpText: typeof field?.helpText === "string" ? field.helpText : "",
-        visibilityCondition: field?.visibilityCondition || null,
+        visibilityCondition: field?.visibilityCondition || {},
+        autoFillCondition: field?.autoFillCondition || {},
       }));
 
     return {
@@ -314,6 +315,7 @@ export const reverseRestructure = (updatedData, fieldTypeMasterData = []) => {
         validations: toArrayFields,
         helpText: typeof field?.helpText === "string" ? field.helpText : "",
         visibilityCondition: field?.visibilityCondition || {},
+        autoFillCondition: field?.autoFillCondition || {},
       };
     });
 

From 218abb26b196839acb097b14c13f391048e6d552 Mon Sep 17 00:00:00 2001
From: Ramkrishna-egov <ramkrishna.sahoo@egovernments.org>
Date: Mon, 18 Aug 2025 12:30:39 +0530
Subject: [PATCH 10/14] Updated Complaint Inbox Template name

---
 .../src/utils/template_components/RegistrationComponents.js    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
index 7bc7e788fe1..e50f53b97e0 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
@@ -338,7 +338,7 @@ export const getTemplateRenderer = (templateName) => {
   switch (templateName) {
     case "HouseholdOverview":
       return HouseHoldOverviewSection;
-    case "complaintInbox":
+    case "ComplaintsInbox":
       return SimpleSearchFilterRow;
 
     // case "AnotherTemplate": return anotherRenderer;
@@ -633,6 +633,7 @@ const SimpleSearchFilterRow = ({
   const filter = formatMap["filter"] || {};
   const sortIcon = formatMap["sortComplaints"] || {};
 
+
   const cellStyle = {
     minWidth: 0,
     display: "flex",

From 468c4e9b3698093f473884ec27b6a4679bf36411 Mon Sep 17 00:00:00 2001
From: Ramkrishna-egov <ramkrishna.sahoo@egovernments.org>
Date: Mon, 18 Aug 2025 14:51:33 +0530
Subject: [PATCH 11/14] Fixed FormConfig update issue

---
 .../modules/campaign-manager/src/utils/appConfigHelpers.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
index d4a93a9ae1e..dc9c135bd10 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
@@ -210,7 +210,7 @@ export const restructure = (data1, fieldTypeMasterData = [], parent) => {
         includeInSummary: field?.includeInSummary === false ? false : true,
         helpText: typeof field?.helpText === "string" ? field.helpText : "",
         visibilityCondition: field?.visibilityCondition || {},
-        autoFillCondition: field?.autoFillCondition || {},
+        autoFillCondition: field?.autoFillCondition || [],
       }));
 
     return {
@@ -254,6 +254,7 @@ export const restructure = (data1, fieldTypeMasterData = [], parent) => {
         allowCommentsAdditionAt: ["body"],
       },
       navigateTo: page?.navigateTo || {},
+      conditionalNavigateTo: page?.conditionalNavigateTo,
       parent: parent?.name || "",
     };
   });
@@ -315,7 +316,7 @@ export const reverseRestructure = (updatedData, fieldTypeMasterData = []) => {
         validations: toArrayFields,
         helpText: typeof field?.helpText === "string" ? field.helpText : "",
         visibilityCondition: field?.visibilityCondition || {},
-        autoFillCondition: field?.autoFillCondition || {},
+        autoFillCondition: field?.autoFillCondition || [],
       };
     });
 
@@ -328,6 +329,8 @@ export const reverseRestructure = (updatedData, fieldTypeMasterData = []) => {
       order: index + 1,
       properties,
       navigateTo: section?.navigateTo || {},
+      conditionalNavigateTo: section?.conditionalNavigateTo || {},
+
     };
   });
 };

From f42593c657ff62d02b7b3fb06b34aa27d2fb3a1c Mon Sep 17 00:00:00 2001
From: Ramkrishna-egov <ramkrishna.sahoo@egovernments.org>
Date: Mon, 18 Aug 2025 16:20:37 +0530
Subject: [PATCH 12/14] Updated conditionalNavigationKey in Form Config to
 acept empty array instead of object

---
 .../modules/campaign-manager/src/utils/appConfigHelpers.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
index dc9c135bd10..f10611aa4d1 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
@@ -329,7 +329,7 @@ export const reverseRestructure = (updatedData, fieldTypeMasterData = []) => {
       order: index + 1,
       properties,
       navigateTo: section?.navigateTo || {},
-      conditionalNavigateTo: section?.conditionalNavigateTo || {},
+      conditionalNavigateTo: section?.conditionalNavigateTo || [],
 
     };
   });

From 218a4aefd03a2f98e8ee8f4dbfb342c8bd825bb4 Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <nabeel.md@egovernments.org>
Date: Fri, 22 Aug 2025 14:57:49 +0530
Subject: [PATCH 13/14] migrating 0.4 fixes (#3024)

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
---
 .../packages/css/package.json                 |  2 +-
 .../css/src/components/microplanning.scss     |  1 +
 .../css/src/pages/employee/healthdss.scss     |  3 ++
 .../src/components/AppPreview.js              |  2 +-
 .../ViewDetailComponent.js                    | 22 +++++----
 .../SelectingBoundariesDuplicate.js           | 19 ++++----
 .../AppLocalisationWrapper.js                 |  4 +-
 .../DrawerFieldComposer.js                    | 24 +++++++---
 .../ImpelComponentWrapper.js                  |  2 +-
 .../RenderConditionalField.js                 | 47 ++++++++-----------
 .../src/utils/appConfigHelpers.js             |  5 +-
 .../src/pages/employee/createEmployee.js      |  1 -
 12 files changed, 69 insertions(+), 63 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/package.json b/health/micro-ui/web/micro-ui-internals/packages/css/package.json
index 0939a66e3e2..50551086222 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/css/package.json
+++ b/health/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-health-css",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",
diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss
index c9a113d3c5c..3fc2facf2a3 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss
+++ b/health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss
@@ -173,6 +173,7 @@ $border-color: rgba(214, 213, 212, 1);
     margin-left: 0.3rem;
     display: flex;
     align-items: flex-start;
+    flex-direction: row;
 
     .number {
       min-width: 1.2rem !important;
diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/healthdss.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/healthdss.scss
index fbf3c14b804..7154259e89c 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/healthdss.scss
+++ b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/healthdss.scss
@@ -728,6 +728,9 @@
 
 .digit-dss-card-item-border {
   border-bottom: 0.063rem solid theme(digitv2.lightTheme.divider);
+  .digit-dss-insight-card {
+    margin-bottom: 2rem !important;
+  }
 }
 
 .digit-dss-insight-card {
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AppPreview.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AppPreview.js
index a4a08981fc9..a87d726fc39 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AppPreview.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AppPreview.js
@@ -137,7 +137,7 @@ const getFieldType = (field) => {
       return "text";
     case "number":
       return "number";
-    case "textArea":
+    case "textarea":
       return "textarea";
     case "time":
       return "time";
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateCampaignComponents/ViewDetailComponent.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateCampaignComponents/ViewDetailComponent.js
index 37e36e1921e..6dc1e2bb3bf 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateCampaignComponents/ViewDetailComponent.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateCampaignComponents/ViewDetailComponent.js
@@ -3,8 +3,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
 
-
-const ViewDetailComponent = ({ headingName, desc, buttonLabel, navLink , type , icon , disabled,isDraftCampaign }) => {
+const ViewDetailComponent = ({ headingName, desc, buttonLabel, navLink, type, icon, disabled, isDraftCampaign }) => {
   const { t } = useTranslation();
   const history = useHistory();
 
@@ -13,19 +12,24 @@ const ViewDetailComponent = ({ headingName, desc, buttonLabel, navLink , type ,
       <div className="details-heading">
         <div className="icon-heading">
           {icon}
-          <HeaderComponent className={"detail-header"} styles={{
-          color: disabled ? "#C5C5C5" : "#004b5e", // same gray for disabled header
-        }}>{headingName}</HeaderComponent>
+          <HeaderComponent
+            className={"detail-header"}
+            styles={{
+              color: disabled ? "#C5C5C5" : "#004b5e", // same gray for disabled header
+            }}
+          >
+            {headingName}
+          </HeaderComponent>
         </div>
         <Button
           label={buttonLabel}
           onClick={() => {
-            history.push(`/${window.contextPath}/employee/campaign/${navLink}`,{isDraftCampaign : isDraftCampaign});
+            history.push(`/${window.contextPath}/employee/campaign/${navLink}`, { isDraftCampaign: isDraftCampaign });
           }}
           variation={type}
-          style={{ width: '19rem' }}
-          isDisabled = {disabled}
-          title = {buttonLabel}
+          style={{ width: "19rem" }}
+          isDisabled={disabled}
+          title={buttonLabel}
         />
       </div>
       <div className="details-desc">{desc}</div>
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
index a9d5a9c799e..b16e15e70d8 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
@@ -157,7 +157,7 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
       CampaignDetails: {
         tenantId: tenantId,
         campaignId: queryParams?.id,
-      }
+      },
     },
   };
   const mutation = Digit.Hooks.useCustomAPIMutationHook(Template);
@@ -167,7 +167,7 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
       {},
       {
         onSuccess: async (result) => {
-          history.push(`/${window?.contextPath}/employee/campaign/my-campaign-new`)
+          history.push(`/${window?.contextPath}/employee/campaign/my-campaign-new`);
         },
         onError: (error, result) => {
           const errorCode = error?.response?.data?.Errors?.[0]?.code;
@@ -184,20 +184,17 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
   return (
     <>
       <div className="container-full">
-
         <div className="card-container-delivery">
           <Card>
             <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between" }}>
               <TagComponent campaignName={campaignName} />
-              {
-                isDraftCampaign ? (
-                  <div className="digit-tag-container" style={{ margin: "0rem" }}>
-                    <Chip text={`${t(`CANCEL_CAMPAIGN`)}`} onClick={handleCancelClick} hideClose={false} />
-                  </div>
-                ) : null
-              }
+              {isDraftCampaign ? (
+                <div className="digit-tag-container" style={{ margin: "0rem" }}>
+                  <Chip text={`${t(`CANCEL_CAMPAIGN`)}`} onClick={handleCancelClick} hideClose={false} />
+                </div>
+              ) : null}
             </div>
-            <HeaderComponent className = "select-boundary">{t(`CAMPAIGN_SELECT_BOUNDARY`)}</HeaderComponent>
+            <HeaderComponent className="select-boundary">{t(`CAMPAIGN_SELECT_BOUNDARY`)}</HeaderComponent>
             <p className="dates-description">{t(`CAMPAIGN_SELECT_BOUNDARIES_DESCRIPTION`)}</p>
             <Wrapper
               hierarchyType={hierarchyType}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppLocalisationWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppLocalisationWrapper.js
index 4397410e59b..79c9a3ca4c6 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppLocalisationWrapper.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/AppLocalisationWrapper.js
@@ -38,7 +38,7 @@ const locReducer = (state = initialState, action) => {
 
 const MODULE_CONSTANTS = "HCM-ADMIN-CONSOLE";
 //TODO @nabeel @jagan move this component to ui-component repo & clean up
-function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back, showBack, parentDispatch, parentState,...props }) {
+function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back, showBack, parentDispatch, parentState, ...props }) {
   if (!localeModule) {
     return <Loader />;
   }
@@ -129,7 +129,7 @@ function AppLocalisationWrapperDev({ onSubmit, localeModule, screenConfig, back,
         localeModule,
       }}
     >
-      <AppConfigurationWrapper pageTag={props?.pageTag} screenConfig={screenConfig} localeModule={localeModule} parentState={parentState}/>
+      <AppConfigurationWrapper pageTag={props?.pageTag} screenConfig={screenConfig} localeModule={localeModule} parentState={parentState} />
     </AppLocalisationContext.Provider>
   );
 }
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js
index 10632c2c893..e49cfdc182a 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/DrawerFieldComposer.js
@@ -75,7 +75,18 @@ const whenToShow = (panelItem, drawerState) => {
   }
 };
 
-const RenderField = ({ state, panelItem, drawerState, setDrawerState, updateLocalization, AppScreenLocalisationConfig,parentState,handleExpressionChange,screenConfig ,selectedField}) => {
+const RenderField = ({
+  state,
+  panelItem,
+  drawerState,
+  setDrawerState,
+  updateLocalization,
+  AppScreenLocalisationConfig,
+  parentState,
+  handleExpressionChange,
+  screenConfig,
+  selectedField,
+}) => {
   const { t } = useTranslation();
   const isLocalisable = AppScreenLocalisationConfig?.fields
     ?.find((i) => i.fieldType === drawerState?.appType)
@@ -123,7 +134,7 @@ const RenderField = ({ state, panelItem, drawerState, setDrawerState, updateLoca
       const switchRef = useRef(null);
       const [showTooltip, setShowTooltip] = useState(false);
       const isDisabled = disableFieldForMandatory(drawerState, panelItem, resourceData);
-//TODO:: Filter households popup should be acustom selection componenet
+      //TODO:: Filter households popup should be acustom selection componenet
       return (
         <div
           ref={switchRef}
@@ -386,7 +397,7 @@ const RenderField = ({ state, panelItem, drawerState, setDrawerState, updateLoca
   }
 };
 
-function DrawerFieldComposer({parentState,screenConfig,selectedField}) {
+function DrawerFieldComposer({ parentState, screenConfig, selectedField }) {
   const { t } = useTranslation();
   const { locState, updateLocalization, AppScreenLocalisationConfig } = useAppLocalisationContext();
   const { state, dispatch } = useAppConfigContext();
@@ -411,17 +422,16 @@ function DrawerFieldComposer({parentState,screenConfig,selectedField}) {
 
   const handleExpressionChange = (expressionString) => {
     if (drawerState.visibilityCondition?.expression !== expressionString) {
-      setDrawerState(prev => ({
+      setDrawerState((prev) => ({
         ...prev,
         visibilityCondition: {
           ...prev.visibilityCondition,
-          expression: expressionString
-        }
+          expression: expressionString,
+        },
       }));
     }
   };
 
-
   useEffect(() => {
     if (state?.drawerField) {
       setDrawerState(state?.drawerField);
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/ImpelComponentWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/ImpelComponentWrapper.js
index 097c3c50505..2a917741638 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/ImpelComponentWrapper.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/ImpelComponentWrapper.js
@@ -6,7 +6,7 @@ import { AppLocalisationWrapper, Loader, useCustomT } from "@egovernments/digit-
 //development mode
 import AppPreview from "../../../components/AppPreview";
 
-function ImpelComponentWrapper({ variant, screenConfig, submit, back, showBack, parentDispatch, localeModule, pageTag, parentState,...props }) {
+function ImpelComponentWrapper({ variant, screenConfig, submit, back, showBack, parentDispatch, localeModule, pageTag, parentState, ...props }) {
   const MODULE_CONSTANTS = "HCM-ADMIN-CONSOLE";
   const searchParams = new URLSearchParams(location.search);
   const fieldMasterName = searchParams.get("fieldType");
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js
index 5908fb3da9a..354f268108f 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/appConfigurationRedesign/RenderConditionalField.js
@@ -19,7 +19,7 @@ export const RenderConditionalField = ({
   parentState,
   handleExpressionChange,
   screenConfig,
-  selectedField
+  selectedField,
 }) => {
   const { t } = useTranslation();
   const isLocalisable = AppScreenLocalisationConfig?.fields
@@ -28,7 +28,6 @@ export const RenderConditionalField = ({
   const searchParams = new URLSearchParams(location.search);
   const projectType = searchParams.get("prefix");
 
-
   switch (cField?.type) {
     case "text":
     case "number":
@@ -51,8 +50,9 @@ export const RenderConditionalField = ({
               updateLocalization(
                 drawerState?.[cField.bindTo] && drawerState?.[cField.bindTo] !== true
                   ? drawerState?.[cField.bindTo]
-                  : `${projectType}_${state?.currentScreen?.parent}_${state?.currentScreen?.name}_${cField.bindTo}_${drawerState?.jsonPath || drawerState?.id
-                  }`,
+                  : `${projectType}_${state?.currentScreen?.parent}_${state?.currentScreen?.name}_${cField.bindTo}_${
+                      drawerState?.jsonPath || drawerState?.id
+                    }`,
                 Digit?.SessionStorage.get("locale") || Digit?.SessionStorage.get("initData")?.selectedLanguage,
                 value
               );
@@ -61,8 +61,9 @@ export const RenderConditionalField = ({
                 [cField?.bindTo]:
                   drawerState?.[cField.bindTo] && drawerState?.[cField.bindTo] !== true
                     ? drawerState?.[cField.bindTo]
-                    : `${projectType}_${state?.currentScreen?.parent}_${state?.currentScreen?.name}_${cField.bindTo}_${drawerState?.jsonPath || drawerState?.id
-                    }`,
+                    : `${projectType}_${state?.currentScreen?.parent}_${state?.currentScreen?.name}_${cField.bindTo}_${
+                        drawerState?.jsonPath || drawerState?.id
+                      }`,
               }));
               return;
             } else {
@@ -152,18 +153,18 @@ export const RenderConditionalField = ({
                 ...prev,
                 [cField?.bindTo]: prev?.[cField?.bindTo]
                   ? [
-                    ...prev?.[cField?.bindTo],
-                    {
-                      code: crypto.randomUUID(),
-                      name: "",
-                    },
-                  ]
+                      ...prev?.[cField?.bindTo],
+                      {
+                        code: crypto.randomUUID(),
+                        name: "",
+                      },
+                    ]
                   : [
-                    {
-                      code: crypto.randomUUID(),
-                      name: "",
-                    },
-                  ],
+                      {
+                        code: crypto.randomUUID(),
+                        name: "",
+                      },
+                    ],
               }))
             }
           />
@@ -220,15 +221,7 @@ export const RenderConditionalField = ({
         />
       );
     case "filters":
-      return (
-        <FiltersRenderer
-          cField={cField}
-          drawerState={drawerState}
-          setDrawerState={setDrawerState}
-          t={t}
-          disabled={disabled}
-        />
-      );
+      return <FiltersRenderer cField={cField} drawerState={drawerState} setDrawerState={setDrawerState} t={t} disabled={disabled} />;
     case "dependencyFieldWrapper":
       return (
         <DependentFieldsWrapper
@@ -239,7 +232,7 @@ export const RenderConditionalField = ({
           screenConfig={screenConfig}
           selectedFieldItem={selectedField}
         />
-      )
+      );
     default:
       return null;
   }
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
index f10611aa4d1..130e2b84069 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/appConfigHelpers.js
@@ -6,8 +6,8 @@ const getTypeAndMetaData = (field, fieldTypeMasterData = []) => {
   // Try to find a matching field type from master data
   const matched = fieldTypeMasterData.find((item) => {
     // Match type and format from metadata and fieldName in case of type : dynamic and format : custom
-    if(item?.metadata?.type === "dynamic" && item?.metadata?.format === "custom"){
-      return item?.metadata?.type === field.type && item?.metadata?.format === field.format  && item?.type === field?.fieldName
+    if (item?.metadata?.type === "dynamic" && item?.metadata?.format === "custom") {
+      return item?.metadata?.type === field.type && item?.metadata?.format === field.format && item?.type === field?.fieldName;
     }
     // Match both type and format from metadata
     return item?.metadata?.type === field.type && item?.metadata?.format === field.format;
@@ -330,7 +330,6 @@ export const reverseRestructure = (updatedData, fieldTypeMasterData = []) => {
       properties,
       navigateTo: section?.navigateTo || {},
       conditionalNavigateTo: section?.conditionalNavigateTo || [],
-
     };
   });
 };
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/health-hrms/src/pages/employee/createEmployee.js b/health/micro-ui/web/micro-ui-internals/packages/modules/health-hrms/src/pages/employee/createEmployee.js
index 8be67eeb8ee..482993db266 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/health-hrms/src/pages/employee/createEmployee.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/health-hrms/src/pages/employee/createEmployee.js
@@ -385,7 +385,6 @@ const CreateEmployee = ({ editUser = false }) => {
 
         {showToast && (
           <Toast
-            type={showToast?.key ? "error" : "success"}
             error={showToast.key}
             isDleteBtn="true"
             label={t(showToast.label)}

From 046c25ab114fd2b1bd13c48c02289dc590bd1ee6 Mon Sep 17 00:00:00 2001
From: Ramkrishna-egov <ramkrishna.sahoo@egovernments.org>
Date: Mon, 25 Aug 2025 14:24:45 +0530
Subject: [PATCH 14/14] Updated Template renderer Case mismatch for template
 name

---
 .../template_components/RegistrationComponents.js    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
index e50f53b97e0..e0af38290fa 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/utils/template_components/RegistrationComponents.js
@@ -51,7 +51,7 @@ const Filter = (props) => {
   return (
     <div className="digit-search-action">
       <FilterIcon onClick={() => setShowPopUp(true)} />
-      <span className="digit-search-text" style={{color: "#C84C0E"}}>{props.t(props.field.label) || "LABEL"}</span>
+      <span className="digit-search-text" style={{ color: "#C84C0E" }}>{props.t(props.field.label) || "LABEL"}</span>
 
       {showPopUp && (
         <PopUp
@@ -331,14 +331,14 @@ const styles = {
 
 
 export const getTemplateRenderer = (templateName) => {
-  if (templateName?.includes('Acknowledgement')) {
+  if (templateName?.toUpperCase()?.includes("ACKNOWLEDGEMENT")) {
     return responsePanelComponent;
   }
 
-  switch (templateName) {
-    case "HouseholdOverview":
+  switch (templateName?.toUpperCase()) {
+    case "HOUSEHOLDOVERVIEW":
       return HouseHoldOverviewSection;
-    case "ComplaintsInbox":
+    case "COMPLAINTSINBOX":
       return SimpleSearchFilterRow;
 
     // case "AnotherTemplate": return anotherRenderer;
@@ -677,7 +677,7 @@ const SimpleSearchFilterRow = ({
       >
         <SVG.ArrowDownward width={"20px"} height={"20px"} fill={"#C84C0E"} />
         {sortIcon?.label ? (
-          <span style={{ whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" , color: "#C84C0E"}}>
+          <span style={{ whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis", color: "#C84C0E" }}>
             {t?.(sortIcon?.label || "")}
           </span>
         ) : null}