From cdcd6946f51200291c8cd75c3fdf745fd5f0c0e3 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Wed, 20 Nov 2024 14:18:49 +0530
Subject: [PATCH 01/19] UCEM-1031 : updated the bankaccount search call

---
 .../packages/libraries/src/services/atoms/urls.js              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
index 984d7158c5..85db1c1beb 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
@@ -264,7 +264,8 @@ const Urls = {
 
   bankaccount: {
     create: "/bankaccount-service/bankaccount/v1/_create",
-    search: "/bankaccount-service/bankaccount/v1/_search",
+    //changed here for privacy
+    search: "/mukta-services/bankaccount/v1/_search",
     update: "/bankaccount-service/bankaccount/v1/_update",
   },
 

From 28a0acad39efc1d06517cc950885a7f25732dc64 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <74046137+Tulika-eGov@users.noreply.github.com>
Date: Tue, 26 Nov 2024 12:11:50 +0530
Subject: [PATCH 02/19] UCEM-1009 : Update publishUIPackages.yml (#802)

Updated the branch name for privacy development
---
 .github/workflows/publishUIPackages.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/publishUIPackages.yml b/.github/workflows/publishUIPackages.yml
index dfea95e621..0245423af2 100644
--- a/.github/workflows/publishUIPackages.yml
+++ b/.github/workflows/publishUIPackages.yml
@@ -7,8 +7,7 @@ on:
       - 'master'
       # Push events to branches matching refs/heads/mona/octocat
       - 'UAT'
-      - 'MUKTA-v2.1-Develop'
-      - 'MUKTA-DEVELOP-v2.1.1'
+      - 'PRIVACY-UAT-UI'
     paths:
       - 'frontend/micro-ui/web/micro-ui-internals/**'
  

From 7c76d68bd33528451da48623e23bb028cae224b1 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Tue, 26 Nov 2024 14:13:48 +0530
Subject: [PATCH 03/19] [UCEM-1009,UCEM-1011,UCEM-1041] : updated the
 individual API call and masking/unmasking in the UI

---
 .../libraries/src/services/atoms/urls.js      |  2 +-
 .../src/services/molecules/Attendance/View.js | 43 ++++++++++++-------
 .../molecules/Expenditure/Bills/View.js       | 38 ++++++++++------
 .../src/services/molecules/WageSeeker/View.js | 24 +++++++----
 .../src/pageComponents/WeekAttendence.js      | 29 +++++++------
 .../configs/mustorRollDetailsTableColumns.js  | 15 ++++---
 .../modules/Masters/src/utils/index.js        |  5 ++-
 .../ApplicationDetails/components/Photos.js   |  2 +-
 .../react-components/src/atoms/Table.js       |  8 ++--
 9 files changed, 101 insertions(+), 65 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
index 85db1c1beb..851261fa92 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
@@ -236,7 +236,7 @@ const Urls = {
 
   wageseeker: {
     create: "/individual/v1/_create",
-    search: "/individual/v1/_search",
+    search: "/mukta-services/individual/v1/_search",
     wmssearch: "/wms/individual/_search",
     update: "/individual/v1/_update",
     delete: "/individual/v1/_delete",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
index 78a50fb4fe..b042143a8f 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
@@ -1,4 +1,5 @@
 import AttendanceService from "../../elements/Attendance";
+import { WageSeekerService } from "../../elements/WageSeeker";
 import { WorksService } from "../../elements/Works";
 
 const attendanceTypes = {
@@ -41,29 +42,31 @@ const getWeekAttendance = (data) => {
   return weekAttendance
 }
 
-const getAttendanceTableData = async(data, skills, t, expenseCalculations) => {
+const getAttendanceTableData = async(data, skills, t, expenseCalculations, indResponse) => {
+  let individuals = indResponse?.Individual;
   let tableData = {}
   if(data?.individualEntries?.length > 0) {
     data?.individualEntries.filter((ob) => ob?.attendanceEntries !== null)?.forEach((item, index) => {
       let tableRow = {}
+      let individualdata = individuals?.filter((ob) => ob?.individualId === item?.additionalDetails?.userId)?.[0]
       tableRow.id = item.id
       tableRow.sno = index + 1
-      tableRow.registerId = item?.additionalDetails?.userId || t("NA")
+      tableRow.registerId = {isLink:true, label:individualdata?.individualId, to:`/works-ui/employee/masters/view-wageseeker?tenantId=${individualdata?.tenantId}&individualId=${individualdata?.individualId}`} || t("NA")
       tableRow.actualWorkingDays = item?.actualTotalAttendance || 0
-      tableRow.nameOfIndividual = item?.additionalDetails?.userName || t("NA")
-      tableRow.guardianName = item?.additionalDetails?.fatherName  || t("NA")
-      const skill = skills[item?.additionalDetails?.skillCode]
+      tableRow.nameOfIndividual = individualdata?.name?.givenName || t("NA")
+      tableRow.guardianName = individualdata?.fatherName  || t("NA")
+      const skill = skills[individualdata?.skills?.[0]?.type]
       tableRow.skill = skill ? `${t(skill.sorSubType)} - ${skill.description}` : t("NA");
-      tableRow.amount = skills[item?.additionalDetails?.skillCode]?.amount * item?.actualTotalAttendance || 0
+      tableRow.amount = skills[individualdata?.skills?.[0]?.type]?.amount * item?.actualTotalAttendance || 0
       tableRow.modifiedAmount = expenseCalculations?.filter(data=>data?.payee?.identifier === item?.individualId)?.[0]?.lineItems?.[0]?.amount || 0;
       tableRow.modifiedWorkingDays = item?.modifiedTotalAttendance ? item?.modifiedTotalAttendance : item?.actualTotalAttendance
-      tableRow.bankAccountDetails = {
-        accountNo : item?.additionalDetails?.bankDetails || t("NA"),
-        ifscCode : null
-      }
-      tableRow.aadharNumber = item?.additionalDetails?.aadharNumber || t("NA")
+      // tableRow.bankAccountDetails = {
+      //   accountNo : item?.additionalDetails?.bankDetails || t("NA"),
+      //   ifscCode : null
+      // }
+      // tableRow.aadharNumber = item?.additionalDetails?.aadharNumber || t("NA")
       tableRow.attendence = getWeekAttendance(item?.attendanceEntries)
-      tableRow.perDayWage = skills[item?.additionalDetails?.skillCode]?.rates?.rate || 0
+      tableRow.perDayWage = skills[individualdata?.skills?.[0]?.type]?.rates?.rate || 0
       tableData[item.id] = tableRow
     });
 
@@ -88,7 +91,7 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations) => {
   return tableData
 }
 
-const transformViewDataToApplicationDetails = async (t, data, skills) => {
+const transformViewDataToApplicationDetails = async (t, data, skills, indResponse) => {
 
   const expenseCalculatorPayload = {
     criteria : {
@@ -103,7 +106,7 @@ const transformViewDataToApplicationDetails = async (t, data, skills) => {
   if(data?.musterRolls?.length === 0) throw new Error('No data found');
   
   const musterRoll = data.musterRolls[0]
-  const attendanceTableData = await getAttendanceTableData(musterRoll, skills, t, expenseCalculations)
+  const attendanceTableData = await getAttendanceTableData(musterRoll, skills, t, expenseCalculations, indResponse)
   
   const totalAmount = expenseCalculationsResponse?.calculation?.totalAmount;
   const weekDates = getWeekDates(musterRoll)
@@ -206,9 +209,19 @@ export const fetchAttendanceDetails = async (t, tenantId, searchParams) => {
   try {
     const response = await AttendanceService.search(tenantId, searchParams);
     // const workflowDetails = await workflowDataDetails(tenantId, searchParams.musterRollNumber);
+    let IndsToSearch = response?.musterRolls?.[0].individualEntries.map((ob) => ob?.individualId)
+
+    let indPayload =IndsToSearch?.length!==0 ? {
+      Individual:{
+        id:IndsToSearch
+      }
+    } : null
+
+    const indResponse = await WageSeekerService.search(tenantId, indPayload, {tenantId,offset:0,limit:100});
+
     const skills = await getWageSeekerSkills(response)
     
-    return transformViewDataToApplicationDetails(t, response, skills)
+    return transformViewDataToApplicationDetails(t, response, skills, indResponse)
   } catch (error) {
       throw new Error(error?.response?.data?.Errors[0].message);
   }
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Bills/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Bills/View.js
index ee6de22ff8..4457a15a09 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Bills/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Bills/View.js
@@ -1,28 +1,30 @@
 import BillingService from "../../../elements/Bill";
 import { ContractService } from "../../../elements/Contracts";
 import AttendanceService from "../../../elements/Attendance";
+import { WageSeekerService } from "../../../elements/WageSeeker";
 
-const getBeneficiaryData = async (wageBillDetails, tenantId, musterRoll, t) => {
+const getBeneficiaryData = async (wageBillDetails, tenantId, musterRoll, t, indResponse) => {
   let tableData = {}
-  const individuals = musterRoll?.individualEntries
+  const individuals = indResponse?.Individual
   if(wageBillDetails?.length > 0) {
     wageBillDetails?.forEach((item, index) => {
       let tableRow = {}
-      const individual = individuals?.find(ind => ind?.individualId === item?.payee?.identifier)
+      const individual = individuals?.find(ind => ind?.id === item?.payee?.identifier)
       tableRow.id = item?.id
       tableRow.sno = index + 1
-      tableRow.registerId = individual?.additionalDetails?.userId || t("NA")
-      tableRow.nameOfIndividual = individual?.additionalDetails?.userName || t("NA")
-      tableRow.guardianName = individual?.additionalDetails?.fatherName || t("NA")
+      //tableRow.registerId = individual?.individualId || t("NA")
+      tableRow.registerId = {to:`/works-ui/employee/masters/view-wageseeker?tenantId=${tenantId}&individualId=${individual?.individualId}`, label:individual?.individualId, isLink:true}
+      tableRow.nameOfIndividual = individual?.name?.givenName || t("NA")
+      tableRow.guardianName = individual?.fatherName || t("NA")
       // tableRow.amount = item?.payableLineItems?.[0]?.amount || 0 //check if correct(add all payable here)
       tableRow.amount = item?.payableLineItems?.reduce((acc,item)=>{
         if(item?.type==="PAYABLE") return acc + item.amount
         return acc 
       },0) || 0 //check if correct(add all payable here)
-      tableRow.bankAccountDetails = {
-        accountNo : individual?.additionalDetails?.bankDetails || t("NA"), 
-        ifscCode : null
-      }
+      // tableRow.bankAccountDetails = {
+      //   accountNo : individual?.additionalDetails?.bankDetails || t("NA"), 
+      //   ifscCode : null
+      // }
       //update this id
       tableData[item.id] = tableRow
     });
@@ -35,7 +37,7 @@ const getBeneficiaryData = async (wageBillDetails, tenantId, musterRoll, t) => {
     totalRow.nameOfIndividual = "DNR"
     totalRow.guardianName = "DNR"
     totalRow.amount = 0
-    totalRow.bankAccountDetails = ""
+    //totalRow.bankAccountDetails = ""
             
     tableData['total'] = totalRow
   }
@@ -70,8 +72,18 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
   //get muster details
   const musterRes = await AttendanceService.search(tenantId, { musterRollNumber: musterRollNum });
   const musterRoll = musterRes?.musterRolls?.[0]
+
+  let IndsToSearch = musterRes?.musterRolls?.[0].individualEntries.map((ob) => ob?.individualId)
+
+  let indPayload =IndsToSearch?.length!==0 ? {
+    Individual:{
+      id:IndsToSearch
+    }
+  } : null
+
+  const indResponse = await WageSeekerService.search(tenantId, indPayload, {tenantId,offset:0,limit:100});
   
-  const beneficiaryData = await getBeneficiaryData(wageBill?.billDetails, tenantId, musterRoll, t)
+  const beneficiaryData = await getBeneficiaryData(wageBill?.billDetails, tenantId, musterRoll, t, indResponse)
 
   const billDetails = {
     title: " ",
@@ -90,7 +102,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
     title: "EXP_BENEFICIARY_DETAILS",
     asSectionHeader: true,
     values: [
-        { title: "ES_COMMON_MUSTER_ROLL_ID", value: musterRollNum || t("ES_COMMON_NA")},
+        { title: "ES_COMMON_MUSTER_ROLL_ID", value: musterRollNum || t("ES_COMMON_NA"), isLink : true, to : '/works-ui/employee/attendencemgmt/view-attendance?tenantId=od.testing&musterRollNumber=MR/2024-25/09/24/000957'},
         { title: "ES_COMMON_MUSTER_ROLL_PERIOD", value: `${Digit.DateUtils.ConvertTimestampToDate(musterRoll?.startDate, 'dd/MM/yyyy')} - ${Digit.DateUtils.ConvertTimestampToDate(musterRoll?.endDate, 'dd/MM/yyyy')}` || t("ES_COMMON_NA") }
     ],
     additionalDetails : {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js
index 4d8c59418f..1e84fa4172 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js
@@ -5,7 +5,7 @@ import { WageSeekerService } from "../../elements/WageSeeker";
 const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
     if(data?.Individual?.length === 0) throw new Error('No data found');
     
-    const individual = data.Individual[0]
+    const individual = data?.Individual?.[0]
     const headerLocale = Digit.Utils.locale.getTransformedLocale(tenantId)
 
     const bankDetailPayload = { bankAccountDetails: { tenantId, serviceCode: "IND", referenceId: [individual?.id] } }
@@ -25,14 +25,14 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
         asSectionHeader: true,
         values: [
             { title: "MASTERS_WAGE_SEEKER_ID", value: individual?.individualId || t("NA")},
-            { title: "ES_COMMON_AADHAR", value: adhaar ? adhaar?.identifierId : t("NA")},
+            { title: "ES_COMMON_AADHAR", value: adhaar ? t(adhaar?.identifierId) : t("NA")},
             { title: "MASTERS_NAME_OF_WAGE_SEEKER", value: individual?.name?.givenName || t("NA")},
             { title: "MASTERS_FATHER_HUSBAND_NAME", value: individual?.fatherName || t("NA")},
-            { title: "ES_COMMON_RELATIONSHIP", value: individual?.relationship ? `COMMON_MASTERS_RELATIONSHIP_${individual?.relationship}` : t("NA")},
+            { title: "ES_COMMON_RELATIONSHIP", value: individual?.relationship ? (individual?.relationship?.includes("UNDISCLOSED")? t(individual?.relationship): `COMMON_MASTERS_RELATIONSHIP_${individual?.relationship}`) : t("NA")},
             { title: "ES_COMMON_BIRTHDATE", value: individual?.dateOfBirth || t("NA")},
-            { title: "CORE_COMMON_PROFILE_GENDER", value: individual?.gender ? `COMMON_MASTERS_GENDER_${individual?.gender}` : t("NA")},
+            { title: "CORE_COMMON_PROFILE_GENDER", value: individual?.gender ?(individual?.gender?.includes("UNDISCLOSED") ? t(individual?.gender) : `COMMON_MASTERS_GENDER_${individual?.gender}`) : t("NA")},
             { title: "CORE_COMMON_PROFILE_MOBILE_NUMBER", value: individual?.mobileNumber || t("NA")},
-            { title: "MASTERS_SOCIAL_CATEGORY", value: socialCategory ? `COMMON_MASTERS_SOCIAL_${socialCategory?.value}` : t("NA")}
+            { title: "MASTERS_SOCIAL_CATEGORY", value: socialCategory ? (socialCategory?.value?.includes("UNDISCLOSED")? t(socialCategory?.value): `COMMON_MASTERS_SOCIAL_${socialCategory?.value}`) : t("NA")}
         ],
         additionalDetails: {
           skills: {
@@ -41,7 +41,8 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
           },
           photo : {
             title: "ES_COMMON_PHOTOGRAPH",
-            thumbnailsToShow: thumbnails          
+            thumbnailsToShow: thumbnails,
+            isMasked : thumbnails && individual?.additionalFields?.isPhotoMasked == true ? "CS_COMMON_UNDISCLOSED" : false         
           }
         }
     }
@@ -49,9 +50,9 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
         title: "ES_COMMON_LOCATION_DETAILS",
         asSectionHeader: true,
         values: [
-            { title: "CORE_COMMON_PROFILE_CITY", value: individual?.address?.[0]?.tenantId ? Digit.Utils.locale.getCityLocale(individual?.address?.[0]?.tenantId) : t("NA")},
-            { title: "COMMON_WARD", value: individual?.address?.[0]?.ward?.code ? Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.ward?.code, tenantId) : t("NA")},
-            { title: "COMMON_LOCALITY", value: individual?.address?.[0]?.locality?.code ? Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.locality?.code, tenantId) : t("NA")},
+            { title: "CORE_COMMON_PROFILE_CITY", value: individual?.address?.[0]?.tenantId ? (individual?.address?.[0]?.city?.includes("*") ? getAddressMasked(Digit.Utils.locale.getCityLocale(individual?.address?.[0]?.tenantId)) : Digit.Utils.locale.getCityLocale(individual?.address?.[0]?.tenantId)) : t("NA")},
+            { title: "COMMON_WARD", value: individual?.address?.[0]?.ward?.code ? (individual?.address?.[0]?.ward?.additionalDetails?.isMasked ? getAddressMasked(Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.ward?.code, tenantId)) : Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.ward?.code, tenantId)) : t("NA")},
+            { title: "COMMON_LOCALITY", value: individual?.address?.[0]?.locality?.code ? (individual?.address?.[0]?.locality?.additionalDetails?.isMasked ? getAddressMasked(Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.locality?.code, tenantId)) : Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.locality?.code, tenantId)) : t("NA")},
             { title: "ES_COMMON_STREET", value: individual?.address?.[0]?.street || t("NA")},
             { title: "ES_COMMON_DOOR_NO", value: individual?.address?.[0]?.doorNo || t("NA")},
         ]
@@ -83,6 +84,11 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
   }
 }
 
+const getAddressMasked = (value) => {
+  return value.replace(/.(?=.{1,}$)/g, '*');
+
+}
+
 const fetchBankDetails = async (data, tenantId) => {
   if(data?.Individual?.length === 0) throw new Error('No data found');
 
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pageComponents/WeekAttendence.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pageComponents/WeekAttendence.js
index 40adfe9d3a..e559dc55fc 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pageComponents/WeekAttendence.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/src/pageComponents/WeekAttendence.js
@@ -326,20 +326,21 @@ const WeekAttendence = ({ state, dispatch, modify, setSaveAttendanceState, weekD
           return Digit.Utils.dss.formatterWithoutRound(value, 'number');
         },
       },
-      {
-        Header: () => <p>{t("ATM_BANK_ACCOUNT_DETAILS")}</p>,
-        accessor: "bankAccountDetails",
-        Cell: ({ value, column, row }) => {
-          return renderBankAccountDetails(value);
-        },
-      },
-      {
-        Header: () => <p>{t("ATM_WAGE_SEEKER_AADHAR")}</p>,
-        accessor: "aadharNumber",
-        Cell: ({ value, column, row }) => {
-          return String(t(value));
-        }
-      }
+      // removed for DPP
+      // {
+      //   Header: () => <p>{t("ATM_BANK_ACCOUNT_DETAILS")}</p>,
+      //   accessor: "bankAccountDetails",
+      //   Cell: ({ value, column, row }) => {
+      //     return renderBankAccountDetails(value);
+      //   },
+      // },
+      // {
+      //   Header: () => <p>{t("ATM_WAGE_SEEKER_AADHAR")}</p>,
+      //   accessor: "aadharNumber",
+      //   Cell: ({ value, column, row }) => {
+      //     return String(t(value));
+      //   }
+      // }
     ]
     let colsToReturn = [];
     // if(showFullTableReadOnly || editable) {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/mustorRollDetailsTableColumns.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/mustorRollDetailsTableColumns.js
index 0099be61dc..53db2f0d99 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/mustorRollDetailsTableColumns.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/configs/mustorRollDetailsTableColumns.js
@@ -59,13 +59,14 @@ export const mustorRollDetailsTableColumns = (t) => [
       return <Amount customStyle={{ textAlign: 'right'}} value={value} t={t}></Amount>
     }
   },
-  {
-    Header: () => <p>{t("EXP_BANK_ACCOUNT_DETAILS")}</p>,
-    accessor: "bankAccountDetails",
-    Cell: ({ value, column, row }) => {
-      return renderBankAccountDetails(value);
-    }
-  },
+  //removed for DPP
+  // {
+  //   Header: () => <p>{t("EXP_BANK_ACCOUNT_DETAILS")}</p>,
+  //   accessor: "bankAccountDetails",
+  //   Cell: ({ value, column, row }) => {
+  //     return renderBankAccountDetails(value);
+  //   }
+  // },
   // {
   //   Header: () => <p>{t("ES_COMMON_PAYMENT_STATUS")}</p>,
   //   accessor: "paymentStatus",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
index 967e02c1f7..0624ce70d7 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
@@ -106,13 +106,14 @@ export const getWageSeekerUpdatePayload = ({formData, wageSeekerDataFromAPI, ten
         givenName: formData?.basicDetails_wageSeekerName
     }
     Individual.dateOfBirth = Digit.DateUtils.ConvertTimestampToDate(new Date(formData?.basicDetails_dateOfBirth), 'dd/MM/yyyy')
-    Individual.gender = formData?.basicDetails_gender?.code
+    if(!(formData?.basicDetails_gender?.code?.includes("UNDISCLOSED"))) Individual.gender = formData?.basicDetails_gender?.code
     Individual.mobileNumber = formData?.basicDetails_mobileNumber
     Individual.fatherName = formData?.basicDetails_fatherHusbandName
-    Individual.relationship = formData?.basicDetails_relationShip?.code
+    if(!(formData?.basicDetails_relationShip?.code?.includes("UNDISCLOSED")))Individual.relationship = formData?.basicDetails_relationShip?.code
     // Individual.skills = formData?.skillDetails_skill?.map(skill => ({ level: skill?.code?.split('.')?.[0], type: skill?.code?.split('.')?.[1]}))
     Individual.photo = formData?.basicDetails_photograph?.[0]?.[1]?.fileStoreId?.fileStoreId
 
+    //DPP update here as well for socialCategory
     if(formData?.basicDetails_socialCategory?.code) {
         Individual.additionalFields = {
             fields: [{
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/Photos.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/Photos.js
index de491dbe98..2b8ec14f6b 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/Photos.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/Photos.js
@@ -10,7 +10,7 @@ const Photos = ({ data, OpenImage }) => {
             <CardLabel style={{fontSize: "16px", fontWeight: "600", marginBottom: "8px", marginTop: "20px"}}>{t(data?.title)}</CardLabel>
             { data?.thumbnailsToShow ? 
                 <DisplayPhotos style={{maxWidth: "850px", paddingTop: 0}} srcs={data?.thumbnailsToShow?.thumbs} onClick={(src, index) => { OpenImage(src, index, data?.thumbnailsToShow) }}/>
-                : <CardLabel >{t('NA')}</CardLabel>
+                : <CardLabel >{data?.isMasked ? t(data?.isMasked) : t('NA')}</CardLabel>
             }
         </React.Fragment>
     )
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Table.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Table.js
index 38d9d8f06c..a989dc5cc2 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Table.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Table.js
@@ -187,6 +187,8 @@ const Table = ({
                 <tr {...row.getRowProps()}>
                   {showAutoSerialNo && <td>{i + 1}</td>}
                   {row.cells.map((cell) => {
+                     const cellValue = cell.value;
+                     const isLinkObject = cellValue && typeof cellValue === "object" && cellValue.isLink;
                     return (
                       <td
                         // style={{ padding: "20px 18px", fontSize: "16px", borderTop: "1px solid grey", textAlign: "left", verticalAlign: "middle" }}
@@ -199,9 +201,9 @@ const Table = ({
                           getCellProps(cell),
                         ])}
                       >
-                        {cell.attachment_link ? (
-                          <a style={{ color: "#1D70B8" }} href={cell.attachment_link}>
-                            {cell.render("Cell")}
+                        {cell.attachment_link || isLinkObject ? (
+                          <a style={{ color: isLinkObject ? "#c84c0e" :"#1D70B8" }}  href={cell.attachment_link || cellValue?.to}>
+                            {isLinkObject? cellValue?.label : cell.render("Cell")}
                           </a>
                         ) : (
                           <React.Fragment> {cell.render("Cell")} </React.Fragment>

From 2d3c175433f15833ca27d534403dd237c24aa8c4 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Tue, 26 Nov 2024 15:24:01 +0530
Subject: [PATCH 04/19] UCEM-1011 : updated the package version for expenditure
 and master

---
 frontend/micro-ui/web/micro-ui-internals/example/package.json | 4 ++--
 .../packages/modules/AttendenceMgmt/package.json              | 2 +-
 .../packages/modules/Expenditure/package.json                 | 2 +-
 frontend/micro-ui/web/package.json                            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
index 1fb4513fd3..06866861fb 100644
--- a/frontend/micro-ui/web/micro-ui-internals/example/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -15,13 +15,13 @@
     "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
-    "@egovernments/digit-ui-module-attendencemgmt": "0.4.15",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.16",
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.20",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
     "@egovernments/digit-ui-module-masters": "0.4.23",
     "@egovernments/digit-ui-module-project": "0.4.17",
-    "@egovernments/digit-ui-module-expenditure": "0.4.27",
+    "@egovernments/digit-ui-module-expenditure": "0.4.28",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",
     "@egovernments/digit-ui-module-rate-analysis": "0.4.16",
     "http-proxy-middleware": "^1.0.5",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json
index af3942b500..c7e5032e35 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/AttendenceMgmt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-attendencemgmt",
-  "version": "0.4.15",
+  "version": "0.4.16",
   "description": "Attendence Management Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json
index cb208bd5df..5fac781260 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-expenditure",
-  "version": "0.4.27",
+  "version": "0.4.28",
   "description": "Expenditure Management Module UI",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
index 65ee8911db..a723f9fc6a 100644
--- a/frontend/micro-ui/web/package.json
+++ b/frontend/micro-ui/web/package.json
@@ -22,13 +22,13 @@
     "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
-    "@egovernments/digit-ui-module-attendencemgmt": "0.4.15",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.16",
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.20",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
     "@egovernments/digit-ui-module-masters": "0.4.23",
     "@egovernments/digit-ui-module-project": "0.4.17",
-    "@egovernments/digit-ui-module-expenditure": "0.4.27",
+    "@egovernments/digit-ui-module-expenditure": "0.4.28",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",
     "@egovernments/digit-ui-module-rate-analysis": "0.4.16",
     "babel-loader": "8.1.0",

From 23eeb4fabbe495327d2f79cb8f78f0bed28b15be Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Tue, 26 Nov 2024 16:15:11 +0530
Subject: [PATCH 05/19] UCEM-1041 : updated the logic for photo and address
 masking

---
 .../libraries/src/services/molecules/WageSeeker/View.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js
index 1e84fa4172..e0f63f2dd8 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js
@@ -41,7 +41,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
           },
           photo : {
             title: "ES_COMMON_PHOTOGRAPH",
-            thumbnailsToShow: thumbnails,
+            thumbnailsToShow: thumbnails && individual?.additionalFields?.isPhotoMasked == true ? '' : thumbnails,
             isMasked : thumbnails && individual?.additionalFields?.isPhotoMasked == true ? "CS_COMMON_UNDISCLOSED" : false         
           }
         }
@@ -50,9 +50,9 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
         title: "ES_COMMON_LOCATION_DETAILS",
         asSectionHeader: true,
         values: [
-            { title: "CORE_COMMON_PROFILE_CITY", value: individual?.address?.[0]?.tenantId ? (individual?.address?.[0]?.city?.includes("*") ? getAddressMasked(Digit.Utils.locale.getCityLocale(individual?.address?.[0]?.tenantId)) : Digit.Utils.locale.getCityLocale(individual?.address?.[0]?.tenantId)) : t("NA")},
-            { title: "COMMON_WARD", value: individual?.address?.[0]?.ward?.code ? (individual?.address?.[0]?.ward?.additionalDetails?.isMasked ? getAddressMasked(Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.ward?.code, tenantId)) : Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.ward?.code, tenantId)) : t("NA")},
-            { title: "COMMON_LOCALITY", value: individual?.address?.[0]?.locality?.code ? (individual?.address?.[0]?.locality?.additionalDetails?.isMasked ? getAddressMasked(Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.locality?.code, tenantId)) : Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.locality?.code, tenantId)) : t("NA")},
+            { title: "CORE_COMMON_PROFILE_CITY", value: individual?.address?.[0]?.tenantId ? (individual?.address?.[0]?.city?.includes("*") ? getAddressMasked(t(Digit.Utils.locale.getCityLocale(individual?.address?.[0]?.tenantId))) : Digit.Utils.locale.getCityLocale(individual?.address?.[0]?.tenantId)) : t("NA")},
+            { title: "COMMON_WARD", value: individual?.address?.[0]?.ward?.code ? (individual?.address?.[0]?.ward?.additionalDetails?.isMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.ward?.code, tenantId))) : Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.ward?.code, tenantId)) : t("NA")},
+            { title: "COMMON_LOCALITY", value: individual?.address?.[0]?.locality?.code ? (individual?.address?.[0]?.locality?.additionalDetails?.isMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.locality?.code, tenantId))) : Digit.Utils.locale.getMohallaLocale(individual?.address?.[0]?.locality?.code, tenantId)) : t("NA")},
             { title: "ES_COMMON_STREET", value: individual?.address?.[0]?.street || t("NA")},
             { title: "ES_COMMON_DOOR_NO", value: individual?.address?.[0]?.doorNo || t("NA")},
         ]

From 32e4511f7705dcd787bd1e06441197ede0744899 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Wed, 27 Nov 2024 11:33:52 +0530
Subject: [PATCH 06/19] UCEM-1009 : updated the redirection url made dynamic

---
 .../libraries/src/services/molecules/Expenditure/Bills/View.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Bills/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Bills/View.js
index 4457a15a09..071ed041a4 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Bills/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Expenditure/Bills/View.js
@@ -102,7 +102,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
     title: "EXP_BENEFICIARY_DETAILS",
     asSectionHeader: true,
     values: [
-        { title: "ES_COMMON_MUSTER_ROLL_ID", value: musterRollNum || t("ES_COMMON_NA"), isLink : true, to : '/works-ui/employee/attendencemgmt/view-attendance?tenantId=od.testing&musterRollNumber=MR/2024-25/09/24/000957'},
+        { title: "ES_COMMON_MUSTER_ROLL_ID", value: musterRollNum || t("ES_COMMON_NA"), isLink : true, to : `/works-ui/employee/attendencemgmt/view-attendance?tenantId=${tenantId}&musterRollNumber=${musterRollNum}`},
         { title: "ES_COMMON_MUSTER_ROLL_PERIOD", value: `${Digit.DateUtils.ConvertTimestampToDate(musterRoll?.startDate, 'dd/MM/yyyy')} - ${Digit.DateUtils.ConvertTimestampToDate(musterRoll?.endDate, 'dd/MM/yyyy')}` || t("ES_COMMON_NA") }
     ],
     additionalDetails : {

From 76f70316e9fc6c9a3cec70a3014c5e2941446df4 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Wed, 27 Nov 2024 15:39:25 +0530
Subject: [PATCH 07/19] UCEM-1047 : Added the logic for organisation view

---
 .../micro-ui/web/micro-ui-internals/example/package.json     | 2 +-
 .../packages/css/src/pages/employee/index.scss               | 4 ++++
 .../packages/libraries/src/services/atoms/urls.js            | 2 +-
 .../libraries/src/services/molecules/Organisation/View.js    | 5 ++++-
 .../micro-ui-internals/packages/modules/Masters/package.json | 2 +-
 .../packages/modules/Masters/src/utils/index.js              | 2 +-
 frontend/micro-ui/web/package.json                           | 2 +-
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
index 06866861fb..18cac11aa3 100644
--- a/frontend/micro-ui/web/micro-ui-internals/example/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -19,7 +19,7 @@
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.20",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
-    "@egovernments/digit-ui-module-masters": "0.4.23",
+    "@egovernments/digit-ui-module-masters": "0.4.24",
     "@egovernments/digit-ui-module-project": "0.4.17",
     "@egovernments/digit-ui-module-expenditure": "0.4.28",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
index a4dca368f8..eb485cbd60 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -587,6 +587,10 @@
   }
 }
 
+.loginFormStyleEmployee .loginCardClassName div:nth-child(7) {
+  margin-top: 0 !important;
+}
+
 .topbar .left .employee-select-wrap .options-card {
   right: -3rem !important
 }
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
index 851261fa92..ece80ea5db 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
@@ -257,7 +257,7 @@ const Urls = {
   },
 
   organisation: {
-    search: "/org-services/organisation/v1/_search",
+    search: "/mukta-services/org-services/organisation/v1/_search",
     create: "/org-services/organisation/v1/_create",
     update: "/org-services/organisation/v1/_update",
   },
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
index 95eb9fd4e4..79a218714e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
@@ -13,6 +13,9 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
   const PAN = organisation?.identifiers?.find(item => item?.isActive && item?.type === 'PAN' )
   const GSTIN = organisation?.identifiers?.find(item => item?.isActive && item?.type === 'GSTIN')
 
+  const getAddressMasked = (value) => {
+    return value.replace(/.(?=.{1,}$)/g, '*');
+  }
   const orgDetails = [
     {
       title: '',
@@ -44,7 +47,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
     values: [
         { title: "CORE_COMMON_PROFILE_CITY", value: organisation?.orgAddress?.[0]?.tenantId ? Digit.Utils.locale.getCityLocale(organisation?.orgAddress?.[0]?.tenantId) : t("NA")},
         { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId) : t("NA")},
-        { title: "COMMON_LOCALITY", value: organisation?.additionalDetails?.locality ? Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId) : t("NA")},
+        { title: "COMMON_LOCALITY", value: organisation?.additionalDetails?.locality ? ( organisation?.additionalDetails?.isLocalityMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId)) : t("NA")},
         { title: "ES_COMMON_STREET", value: organisation?.orgAddress?.[0]?.street || t("NA")},
         { title: "ES_COMMON_DOOR_NO", value: organisation?.orgAddress?.[0]?.doorNo || t("NA")},
     ]
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
index ec7572b5b3..886dc9bbe0 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-masters",
-    "version": "0.4.23",
+    "version": "0.4.24",
     "description": "Masters Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
index 0624ce70d7..ff27ca6c62 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
@@ -116,7 +116,7 @@ export const getWageSeekerUpdatePayload = ({formData, wageSeekerDataFromAPI, ten
     //DPP update here as well for socialCategory
     if(formData?.basicDetails_socialCategory?.code) {
         Individual.additionalFields = {
-            fields: [{
+            fields: [...Individual.additionalFields.fields.filter((ob) => ob?.key !== "SOCIAL_CATEGORY"),{
                 key: "SOCIAL_CATEGORY",
                 value: formData?.basicDetails_socialCategory?.code
             }]
diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
index a723f9fc6a..d1f4c7da01 100644
--- a/frontend/micro-ui/web/package.json
+++ b/frontend/micro-ui/web/package.json
@@ -26,7 +26,7 @@
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.20",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
-    "@egovernments/digit-ui-module-masters": "0.4.23",
+    "@egovernments/digit-ui-module-masters": "0.4.24",
     "@egovernments/digit-ui-module-project": "0.4.17",
     "@egovernments/digit-ui-module-expenditure": "0.4.28",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",

From 4ec5ff645ebfd3a447de7f0f72ace7508e1dba1e Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Wed, 4 Dec 2024 12:30:33 +0530
Subject: [PATCH 08/19] UCEM-1052 : updated few fixes for the wageseeker and
 organisation

---
 .../micro-ui-internals/example/package.json   |  2 +-
 .../Mukta/src/configs/UICustomizations.js     |  2 +-
 .../src/pages/works/inboxSearchComposer.scss  |  5 ++
 .../packages/modules/Masters/package.json     |  2 +-
 .../src/configs/searchWMSWageSeekerConfig.js  | 57 ++++++-------------
 .../employee/Organisation/ViewOrganisation.js |  5 +-
 .../employee/WageSeeker/ViewWageSeeker.js     |  5 +-
 frontend/micro-ui/web/package.json            |  2 +-
 8 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
index 18cac11aa3..56c0a25929 100644
--- a/frontend/micro-ui/web/micro-ui-internals/example/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -19,7 +19,7 @@
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.20",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
-    "@egovernments/digit-ui-module-masters": "0.4.24",
+    "@egovernments/digit-ui-module-masters": "0.4.25",
     "@egovernments/digit-ui-module-project": "0.4.17",
     "@egovernments/digit-ui-module-expenditure": "0.4.28",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js
index 013e3eed44..4bfb081118 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/configs/UICustomizations.js
@@ -1545,7 +1545,7 @@ export const UICustomizations = {
         case "MASTERS_ADDRESS":
           return value ? (
             <span style={{ whiteSpace: "break-spaces" }}>
-              {String(`${t(Digit.Utils.locale.getCityLocale(row?.tenantId))} ${t(Digit.Utils.locale.getMohallaLocale(value, row?.tenantId))}`)}
+              {String(`${t(Digit.Utils.locale.getCityLocale(row?.tenantId))}, ${t(Digit.Utils.locale.getMohallaLocale(value, row?.tenantId))}`)}
             </span>
           ) : (
             t("ES_COMMON_NA")
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearchComposer.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearchComposer.scss
index e3a3f09a72..d4b0d71892 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearchComposer.scss
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/works/inboxSearchComposer.scss
@@ -34,6 +34,11 @@
                     .search-field-wrapper.search.custom-both-clear-search{
                         .search-button-wrapper.search {
                             grid-column: initial;
+                            
+                        }
+                        .search-button-wrapper.search.customIndSearchButton {
+                            grid-column: 4;
+                            
                         }
                     .search-button-wrapper{
                         .link-label{
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
index 886dc9bbe0..638116d4ca 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-masters",
-    "version": "0.4.24",
+    "version": "0.4.25",
     "description": "Masters Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js
index 7b93700c4e..0956cc3f6a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/searchWMSWageSeekerConfig.js
@@ -27,12 +27,12 @@ const searchWMSWageSeekerConfig = () => {
             "formClassName": "custom-both-clear-search",
             "primaryLabel": "ES_COMMON_SEARCH",
             "secondaryLabel": "ES_COMMON_CLEAR_SEARCH",
+            "type":"customIndSearchButton",
             "minReqFields": 1,
             "defaultValues": {
               "ward": "",
               "individualId": "",
               "name": "",
-              "socialCategoryValue": "",
               "mobileNumber": "",
               "createdFrom": "",
               "createdTo": ""
@@ -44,9 +44,6 @@ const searchWMSWageSeekerConfig = () => {
                 "isMandatory": false,
                 "disable": false,
                 "populators": {
-                  // "optionsCustomStyle": {
-                  //   "top": "2.3rem"
-                  // },
                   "name": "ward",
                   "type": "ward",
                   "optionsKey": "i18nKey",
@@ -76,33 +73,21 @@ const searchWMSWageSeekerConfig = () => {
                   "validation": { "minlength": 2 }
                 }
               },
-              {
-                "label": "CORE_COMMON_PROFILE_MOBILE_NUMBER",
-                "type": "mobileNumber",
-                "isMandatory": false,
-                "disable": false,
-                "populators": {
-                  "name": "mobileNumber",
-                  "error": "PROJECT_PATTERN_ERR_MSG",
-                  "validation": { "pattern": {}, "minlength": 2 }
-                }
-              },
-              {
-                "label": "MASTERS_SOCIAL_CATEGORY",
-                "type": "dropdown",
-                "isMandatory": false,
-                "disable": false,
-                "populators": {
-                  "name": "socialCategoryValue",
-                  "optionsKey": "code",
-                  // "optionsCustomStyle": { "top": "2.3rem" },
-                  "mdmsConfig": {
-                    "masterName": "SocialCategory",
-                    "moduleName": "common-masters",
-                    "localePrefix": "MASTERS"
-                  }
-                }
-              },
+              // {
+              //   "label": "MASTERS_SOCIAL_CATEGORY",
+              //   "type": "dropdown",
+              //   "isMandatory": false,
+              //   "disable": false,
+              //   "populators": {
+              //     "name": "socialCategoryValue",
+              //     "optionsKey": "code",
+              //     "mdmsConfig": {
+              //       "masterName": "SocialCategory",
+              //       "moduleName": "common-masters",
+              //       "localePrefix": "MASTERS"
+              //     }
+              //   }
+              // },
               {
                 "label": "CREATED_FROM_DATE",
                 "type": "date",
@@ -152,11 +137,6 @@ const searchWMSWageSeekerConfig = () => {
                 "label": "MASTERS_WAGESEEKER_NAME",
                 "jsonPath": "businessObject.name.givenName"
               },
-              { "label": "MASTERS_FATHER_NAME", "jsonPath": "businessObject.fatherName" },
-              {
-                "label": "MASTERS_SOCIAL_CATEGORY",
-                "jsonPath": "businessObject.additionalFields.fields[0].value"
-              },
               {
                 "label": "CORE_COMMON_PROFILE_CITY",
                 "jsonPath": "businessObject.address[0].tenantId",
@@ -166,11 +146,6 @@ const searchWMSWageSeekerConfig = () => {
                 "label": "MASTERS_WARD",
                 "jsonPath": "businessObject.address[0].ward.code",
                 "additionalCustomization": true
-              },
-              {
-                "label": "MASTERS_LOCALITY",
-                "jsonPath": "businessObject.address[0].locality.code",
-                "additionalCustomization": true
               }
             ],
             "enableGlobalSearch": false,
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/ViewOrganisation.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/ViewOrganisation.js
index 5950f70bfe..d3478a18cc 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/ViewOrganisation.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/ViewOrganisation.js
@@ -16,6 +16,7 @@ const ViewOrganisation = () => {
   const [activeLink, setActiveLink] = useState("Location_Details");
   const orgSession = Digit.Hooks.useSessionStorage("ORG_CREATE", {});
   const [sessionFormData, clearSessionFormData] = orgSession;
+  const loggedInUserRoles = Digit.Utils.getLoggedInUserDetails("roles");
 
   const configNavItems = [
     {
@@ -121,11 +122,11 @@ const ViewOrganisation = () => {
               )}
             </Tab>
           )}
-          <ActionBar
+          {loggedInUserRoles?.includes("VIEW_ORG_UNMASKED") && loggedInUserRoles?.includes("VIEW_DED_UNMASKED") && <ActionBar
             actionFields={[<Button type={"submit"} label={t("ES_COMMON_MODIFY")} variation={"primary"} onClick={handleModify}></Button>]}
             setactionFieldsToRight={true}
             className={"new-actionbar"}
-          />
+          />}
         </React.Fragment>
       )}
       {showDataError && (
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js
index 61434c3fc0..fb6228e7af 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ViewWageSeeker.js
@@ -13,6 +13,7 @@ const ViewWageSeeker = () => {
 
   const wageSeekerSession = Digit.Hooks.useSessionStorage("WAGE_SEEKER_CREATE", {});
   const [sesionFormData, clearSessionFormData] = wageSeekerSession;
+  const loggedInUserRoles = Digit.Utils.getLoggedInUserDetails("roles");
 
   // const tenantId = Digit.ULBService.getCurrentTenantId()
   const {individualId,tenantId } = Digit.Hooks.useQueryParams()
@@ -60,11 +61,11 @@ const ViewWageSeeker = () => {
             mutate={()=>{}}
             tenantId={tenantId}
           />
-           <ActionBar
+          {loggedInUserRoles?.includes("VIEW_WS_UNMASKED") && loggedInUserRoles?.includes("VIEW_DED_UNMASKED") && <ActionBar
             actionFields={[<Button type={"submit"} label={t("ES_COMMON_MODIFY")} variation={"primary"} onClick={handleModify}></Button>]}
             setactionFieldsToRight={true}
             className={"new-actionbar"}
-          />
+          />}
           </React.Fragment>
       }
       {
diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
index d1f4c7da01..c1e87d77fa 100644
--- a/frontend/micro-ui/web/package.json
+++ b/frontend/micro-ui/web/package.json
@@ -26,7 +26,7 @@
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.20",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
-    "@egovernments/digit-ui-module-masters": "0.4.24",
+    "@egovernments/digit-ui-module-masters": "0.4.25",
     "@egovernments/digit-ui-module-project": "0.4.17",
     "@egovernments/digit-ui-module-expenditure": "0.4.28",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",

From 202a8f649c9cb8bd4ccf2e17e169ea3b52d7f2c0 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Wed, 4 Dec 2024 14:17:16 +0530
Subject: [PATCH 09/19] UCEM-1052 : Updated the logic for payload create for
 wageseeker update

---
 frontend/micro-ui/web/micro-ui-internals/example/package.json   | 2 +-
 .../micro-ui-internals/packages/modules/Masters/package.json    | 2 +-
 .../packages/modules/Masters/src/utils/index.js                 | 2 +-
 frontend/micro-ui/web/package.json                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
index 56c0a25929..39bc596763 100644
--- a/frontend/micro-ui/web/micro-ui-internals/example/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -19,7 +19,7 @@
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.20",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
-    "@egovernments/digit-ui-module-masters": "0.4.25",
+    "@egovernments/digit-ui-module-masters": "0.4.26",
     "@egovernments/digit-ui-module-project": "0.4.17",
     "@egovernments/digit-ui-module-expenditure": "0.4.28",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
index 638116d4ca..f76a78bc42 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-masters",
-    "version": "0.4.25",
+    "version": "0.4.26",
     "description": "Masters Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
index ff27ca6c62..3361152bfb 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/utils/index.js
@@ -116,7 +116,7 @@ export const getWageSeekerUpdatePayload = ({formData, wageSeekerDataFromAPI, ten
     //DPP update here as well for socialCategory
     if(formData?.basicDetails_socialCategory?.code) {
         Individual.additionalFields = {
-            fields: [...Individual.additionalFields.fields.filter((ob) => ob?.key !== "SOCIAL_CATEGORY"),{
+            fields: [...wageSeekerDataFromAPI?.individual?.additionalFields.fields.filter((ob) => ob?.key !== "SOCIAL_CATEGORY"),{
                 key: "SOCIAL_CATEGORY",
                 value: formData?.basicDetails_socialCategory?.code
             }]
diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
index c1e87d77fa..3afca352e1 100644
--- a/frontend/micro-ui/web/package.json
+++ b/frontend/micro-ui/web/package.json
@@ -26,7 +26,7 @@
     "@egovernments/digit-ui-module-contracts": "0.4.15",
     "@egovernments/digit-ui-module-measurement":"0.2.20",
     "@egovernments/digit-ui-module-estimate": "0.4.22",
-    "@egovernments/digit-ui-module-masters": "0.4.25",
+    "@egovernments/digit-ui-module-masters": "0.4.26",
     "@egovernments/digit-ui-module-project": "0.4.17",
     "@egovernments/digit-ui-module-expenditure": "0.4.28",
     "@egovernments/digit-ui-customisation-mukta": "0.2.14",

From 902bc77313c1247a34136e6a146f18330be55328 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Wed, 4 Dec 2024 14:24:01 +0530
Subject: [PATCH 10/19] UCEM-1052 : updated for the css version

---
 .../micro-ui/web/micro-ui-internals/packages/css/package.json   | 2 +-
 frontend/micro-ui/web/public/index.html                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json
index 36eeb27885..d144bb5327 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-works-css",
-  "version": "0.2.57",
+  "version": "0.2.58",
   "license": "MIT",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",
   "main": "dist/index.css",
diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html
index 9a60539d1b..d05bc15103 100644
--- a/frontend/micro-ui/web/public/index.html
+++ b/frontend/micro-ui/web/public/index.html
@@ -9,7 +9,7 @@
     rel='stylesheet' type='text/css'>
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.25/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.38/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-works-css@0.2.57/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-works-css@0.2.58/dist/index.css" />
   <link rel="stylesheet" href="https://mukta-uat-bucket-s3.s3.ap-south-1.amazonaws.com/mukta-login.css" />
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-works-css/dist/index.css" /> -->
   <meta name="viewport" content="width=device-width, initial-scale=1" />

From 0f46fb6f6729c88dea446952445ccf706531efca Mon Sep 17 00:00:00 2001
From: kams <kamalesh.m@egovernments.org>
Date: Wed, 4 Dec 2024 16:05:24 +0530
Subject: [PATCH 11/19] masked ward in org details

---
 .../libraries/src/services/molecules/Organisation/View.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
index 79a218714e..fac3fafcf1 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
@@ -14,7 +14,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
   const GSTIN = organisation?.identifiers?.find(item => item?.isActive && item?.type === 'GSTIN')
 
   const getAddressMasked = (value) => {
-    return value.replace(/.(?=.{1,}$)/g, '*');
+    return value.replace(/(?<=.{1}).(?=.{1})/g, '*');
   }
   const orgDetails = [
     {
@@ -46,7 +46,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
     asSectionHeader: true,
     values: [
         { title: "CORE_COMMON_PROFILE_CITY", value: organisation?.orgAddress?.[0]?.tenantId ? Digit.Utils.locale.getCityLocale(organisation?.orgAddress?.[0]?.tenantId) : t("NA")},
-        { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId) : t("NA")},
+        { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? ( organisation?.orgAddress?.[0]?.geoLocation?.additionalDetails?.isWardMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId)) : t("NA")},
         { title: "COMMON_LOCALITY", value: organisation?.additionalDetails?.locality ? ( organisation?.additionalDetails?.isLocalityMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId)) : t("NA")},
         { title: "ES_COMMON_STREET", value: organisation?.orgAddress?.[0]?.street || t("NA")},
         { title: "ES_COMMON_DOOR_NO", value: organisation?.orgAddress?.[0]?.doorNo || t("NA")},

From 0b4cb16983c2863684f8e3bc6aab170b314fd320 Mon Sep 17 00:00:00 2001
From: kams <kamalesh.m@egovernments.org>
Date: Wed, 4 Dec 2024 18:42:21 +0530
Subject: [PATCH 12/19] taking skillCode from muster roll api instead of
 individual api

---
 .../libraries/src/services/molecules/Attendance/View.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
index b042143a8f..56d71f4912 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
@@ -55,9 +55,9 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations, indRe
       tableRow.actualWorkingDays = item?.actualTotalAttendance || 0
       tableRow.nameOfIndividual = individualdata?.name?.givenName || t("NA")
       tableRow.guardianName = individualdata?.fatherName  || t("NA")
-      const skill = skills[individualdata?.skills?.[0]?.type]
+      const skill = skills[item?.additionalDetails?.skillCode]
       tableRow.skill = skill ? `${t(skill.sorSubType)} - ${skill.description}` : t("NA");
-      tableRow.amount = skills[individualdata?.skills?.[0]?.type]?.amount * item?.actualTotalAttendance || 0
+      tableRow.amount = skills[item?.additionalDetails?.skillCode]?.amount * item?.actualTotalAttendance || 0
       tableRow.modifiedAmount = expenseCalculations?.filter(data=>data?.payee?.identifier === item?.individualId)?.[0]?.lineItems?.[0]?.amount || 0;
       tableRow.modifiedWorkingDays = item?.modifiedTotalAttendance ? item?.modifiedTotalAttendance : item?.actualTotalAttendance
       // tableRow.bankAccountDetails = {
@@ -66,7 +66,7 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations, indRe
       // }
       // tableRow.aadharNumber = item?.additionalDetails?.aadharNumber || t("NA")
       tableRow.attendence = getWeekAttendance(item?.attendanceEntries)
-      tableRow.perDayWage = skills[individualdata?.skills?.[0]?.type]?.rates?.rate || 0
+      tableRow.perDayWage = skills[item?.additionalDetails?.skillCode]?.rates?.rate || 0
       tableData[item.id] = tableRow
     });
 

From 62be5487580878e147cdf75e2a393544c7dd06eb Mon Sep 17 00:00:00 2001
From: Tulika-eGov <74046137+Tulika-eGov@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:19:19 +0530
Subject: [PATCH 13/19] Revert "masked ward in org details"

---
 .../libraries/src/services/molecules/Attendance/View.js     | 6 +++---
 .../libraries/src/services/molecules/Organisation/View.js   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
index 56d71f4912..b042143a8f 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
@@ -55,9 +55,9 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations, indRe
       tableRow.actualWorkingDays = item?.actualTotalAttendance || 0
       tableRow.nameOfIndividual = individualdata?.name?.givenName || t("NA")
       tableRow.guardianName = individualdata?.fatherName  || t("NA")
-      const skill = skills[item?.additionalDetails?.skillCode]
+      const skill = skills[individualdata?.skills?.[0]?.type]
       tableRow.skill = skill ? `${t(skill.sorSubType)} - ${skill.description}` : t("NA");
-      tableRow.amount = skills[item?.additionalDetails?.skillCode]?.amount * item?.actualTotalAttendance || 0
+      tableRow.amount = skills[individualdata?.skills?.[0]?.type]?.amount * item?.actualTotalAttendance || 0
       tableRow.modifiedAmount = expenseCalculations?.filter(data=>data?.payee?.identifier === item?.individualId)?.[0]?.lineItems?.[0]?.amount || 0;
       tableRow.modifiedWorkingDays = item?.modifiedTotalAttendance ? item?.modifiedTotalAttendance : item?.actualTotalAttendance
       // tableRow.bankAccountDetails = {
@@ -66,7 +66,7 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations, indRe
       // }
       // tableRow.aadharNumber = item?.additionalDetails?.aadharNumber || t("NA")
       tableRow.attendence = getWeekAttendance(item?.attendanceEntries)
-      tableRow.perDayWage = skills[item?.additionalDetails?.skillCode]?.rates?.rate || 0
+      tableRow.perDayWage = skills[individualdata?.skills?.[0]?.type]?.rates?.rate || 0
       tableData[item.id] = tableRow
     });
 
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
index fac3fafcf1..79a218714e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
@@ -14,7 +14,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
   const GSTIN = organisation?.identifiers?.find(item => item?.isActive && item?.type === 'GSTIN')
 
   const getAddressMasked = (value) => {
-    return value.replace(/(?<=.{1}).(?=.{1})/g, '*');
+    return value.replace(/.(?=.{1,}$)/g, '*');
   }
   const orgDetails = [
     {
@@ -46,7 +46,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
     asSectionHeader: true,
     values: [
         { title: "CORE_COMMON_PROFILE_CITY", value: organisation?.orgAddress?.[0]?.tenantId ? Digit.Utils.locale.getCityLocale(organisation?.orgAddress?.[0]?.tenantId) : t("NA")},
-        { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? ( organisation?.orgAddress?.[0]?.geoLocation?.additionalDetails?.isWardMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId)) : t("NA")},
+        { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId) : t("NA")},
         { title: "COMMON_LOCALITY", value: organisation?.additionalDetails?.locality ? ( organisation?.additionalDetails?.isLocalityMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId)) : t("NA")},
         { title: "ES_COMMON_STREET", value: organisation?.orgAddress?.[0]?.street || t("NA")},
         { title: "ES_COMMON_DOOR_NO", value: organisation?.orgAddress?.[0]?.doorNo || t("NA")},

From eb966161f595ebb280b68e5e19b478c85ce6f338 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Thu, 5 Dec 2024 16:23:42 +0530
Subject: [PATCH 14/19] Added buils issue resolution

---
 frontend/micro-ui/web/micro-ui-internals/example/package.json | 3 +++
 frontend/micro-ui/web/package.json                            | 3 +++
 frontend/micro-ui/web/works/inter-package.json                | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
index 39bc596763..e68ef46bf5 100644
--- a/frontend/micro-ui/web/micro-ui-internals/example/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -8,6 +8,9 @@
   "scripts": {
     "start": "react-scripts start"
   },
+  "resolutions": {
+    "**/@babel/traverse":"7.25.9"
+  },
   "devDependencies": {
     "@egovernments/digit-ui-react-components": "1.5.12",
     "@egovernments/digit-ui-components": "0.0.2-beta.47",
diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
index 3afca352e1..edf152776a 100644
--- a/frontend/micro-ui/web/package.json
+++ b/frontend/micro-ui/web/package.json
@@ -47,6 +47,9 @@
     "@babel/plugin-proposal-private-property-in-object": "7.21.0",
     "http-proxy-middleware": "1.3.1"
   },
+  "resolutions":  {
+    "**/@babel/traverse":"7.25.9"
+  },
   "scripts": {
     "start": "react-scripts start",
     "build": "GENERATE_SOURCEMAP=false SKIP_PREFLIGHT_CHECK=true react-scripts build",
diff --git a/frontend/micro-ui/web/works/inter-package.json b/frontend/micro-ui/web/works/inter-package.json
index 9284b8581c..03ae7fa601 100644
--- a/frontend/micro-ui/web/works/inter-package.json
+++ b/frontend/micro-ui/web/works/inter-package.json
@@ -48,6 +48,9 @@
     "deploy:jenkins": "./scripts/jenkins.sh",
     "clean": "rm -rf node_modules"
   },
+  "resolutions": {
+    "**/@babel/traverse":"7.25.9"
+  },
   "devDependencies": {
     "husky": "7.0.4",
     "lint-staged": "12.3.7",

From fea16d74e7cfdfb85a5e5861d437b7ceec912298 Mon Sep 17 00:00:00 2001
From: Tulika-eGov <tulika.kundu@egovernments.org>
Date: Thu, 5 Dec 2024 16:40:30 +0530
Subject: [PATCH 15/19] Added resolution to pacakge.json

---
 frontend/micro-ui/web/micro-ui-internals/package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json
index cdf78b5bc8..6c2035fd52 100644
--- a/frontend/micro-ui/web/micro-ui-internals/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/package.json
@@ -63,6 +63,9 @@
   "lint-staged": {
     "*.{js,css,md}": "prettier --write"
   },
+  "resolutions": {
+    "**/@babel/traverse":"7.25.9"
+  },
   "dependencies": {
     "react-google-recaptcha": "^3.1.0",
     "lodash": "^4.17.21",

From 670069bda90119956a3002b932c3e92ad8d18c7a Mon Sep 17 00:00:00 2001
From: Tulika-eGov <74046137+Tulika-eGov@users.noreply.github.com>
Date: Thu, 5 Dec 2024 16:50:42 +0530
Subject: [PATCH 16/19] Revert "Revert "masked ward in org details""

---
 .../libraries/src/services/molecules/Attendance/View.js     | 6 +++---
 .../libraries/src/services/molecules/Organisation/View.js   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
index b042143a8f..56d71f4912 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Attendance/View.js
@@ -55,9 +55,9 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations, indRe
       tableRow.actualWorkingDays = item?.actualTotalAttendance || 0
       tableRow.nameOfIndividual = individualdata?.name?.givenName || t("NA")
       tableRow.guardianName = individualdata?.fatherName  || t("NA")
-      const skill = skills[individualdata?.skills?.[0]?.type]
+      const skill = skills[item?.additionalDetails?.skillCode]
       tableRow.skill = skill ? `${t(skill.sorSubType)} - ${skill.description}` : t("NA");
-      tableRow.amount = skills[individualdata?.skills?.[0]?.type]?.amount * item?.actualTotalAttendance || 0
+      tableRow.amount = skills[item?.additionalDetails?.skillCode]?.amount * item?.actualTotalAttendance || 0
       tableRow.modifiedAmount = expenseCalculations?.filter(data=>data?.payee?.identifier === item?.individualId)?.[0]?.lineItems?.[0]?.amount || 0;
       tableRow.modifiedWorkingDays = item?.modifiedTotalAttendance ? item?.modifiedTotalAttendance : item?.actualTotalAttendance
       // tableRow.bankAccountDetails = {
@@ -66,7 +66,7 @@ const getAttendanceTableData = async(data, skills, t, expenseCalculations, indRe
       // }
       // tableRow.aadharNumber = item?.additionalDetails?.aadharNumber || t("NA")
       tableRow.attendence = getWeekAttendance(item?.attendanceEntries)
-      tableRow.perDayWage = skills[individualdata?.skills?.[0]?.type]?.rates?.rate || 0
+      tableRow.perDayWage = skills[item?.additionalDetails?.skillCode]?.rates?.rate || 0
       tableData[item.id] = tableRow
     });
 
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
index 79a218714e..fac3fafcf1 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
@@ -14,7 +14,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
   const GSTIN = organisation?.identifiers?.find(item => item?.isActive && item?.type === 'GSTIN')
 
   const getAddressMasked = (value) => {
-    return value.replace(/.(?=.{1,}$)/g, '*');
+    return value.replace(/(?<=.{1}).(?=.{1})/g, '*');
   }
   const orgDetails = [
     {
@@ -46,7 +46,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
     asSectionHeader: true,
     values: [
         { title: "CORE_COMMON_PROFILE_CITY", value: organisation?.orgAddress?.[0]?.tenantId ? Digit.Utils.locale.getCityLocale(organisation?.orgAddress?.[0]?.tenantId) : t("NA")},
-        { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId) : t("NA")},
+        { title: "COMMON_WARD", value: organisation?.orgAddress?.[0]?.boundaryCode ? ( organisation?.orgAddress?.[0]?.geoLocation?.additionalDetails?.isWardMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.orgAddress?.[0]?.boundaryCode, tenantId)) : t("NA")},
         { title: "COMMON_LOCALITY", value: organisation?.additionalDetails?.locality ? ( organisation?.additionalDetails?.isLocalityMasked ? getAddressMasked(t(Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId))) : Digit.Utils.locale.getMohallaLocale(organisation?.additionalDetails?.locality, tenantId)) : t("NA")},
         { title: "ES_COMMON_STREET", value: organisation?.orgAddress?.[0]?.street || t("NA")},
         { title: "ES_COMMON_DOOR_NO", value: organisation?.orgAddress?.[0]?.doorNo || t("NA")},

From 65e7b9b28e9d5c779750fb60b6ff69629a406fa8 Mon Sep 17 00:00:00 2001
From: kams <kamalesh.m@egovernments.org>
Date: Thu, 5 Dec 2024 17:23:32 +0530
Subject: [PATCH 17/19] changed the masking pattern

---
 .../libraries/src/services/molecules/Organisation/View.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
index fac3fafcf1..e8561022cf 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Organisation/View.js
@@ -14,7 +14,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
   const GSTIN = organisation?.identifiers?.find(item => item?.isActive && item?.type === 'GSTIN')
 
   const getAddressMasked = (value) => {
-    return value.replace(/(?<=.{1}).(?=.{1})/g, '*');
+    return value.replace(/(?<=.{1})./g, '*');
   }
   const orgDetails = [
     {

From 8be8eb7cc03651ac9e912508ab19912ffe5c6f42 Mon Sep 17 00:00:00 2001
From: kams <kamalesh.m@egovernments.org>
Date: Fri, 6 Dec 2024 11:26:46 +0530
Subject: [PATCH 18/19] Added additional validations for individual object

---
 .../libraries/src/services/molecules/WageSeeker/View.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js
index e0f63f2dd8..85acccbf98 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/WageSeeker/View.js
@@ -17,8 +17,8 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
       thumbnails = individual?.photo && await getThumbnails([individual?.photo], tenantId)
     } catch (error) {}
     
-    const socialCategory = individual?.additionalFields?.fields?.find(item => item?.key === "SOCIAL_CATEGORY")
-    const adhaar = individual?.identifiers?.find(item => item?.identifierType === 'AADHAAR')
+    const socialCategory = (individual?.additionalFields?.fields && Array.isArray(individual?.additionalFields?.fields)) ? individual?.additionalFields?.fields?.find(item => item?.key === "SOCIAL_CATEGORY") : undefined;
+    const adhaar = (individual?.identifiers && Array.isArray(individual.identifiers)) ? individual?.identifiers?.find(item => item?.identifierType === 'AADHAAR') : undefined;
 
     const headerDetails = {
         title: " ",
@@ -32,7 +32,7 @@ const transformViewDataToApplicationDetails = async (t, data, tenantId) => {
             { title: "ES_COMMON_BIRTHDATE", value: individual?.dateOfBirth || t("NA")},
             { title: "CORE_COMMON_PROFILE_GENDER", value: individual?.gender ?(individual?.gender?.includes("UNDISCLOSED") ? t(individual?.gender) : `COMMON_MASTERS_GENDER_${individual?.gender}`) : t("NA")},
             { title: "CORE_COMMON_PROFILE_MOBILE_NUMBER", value: individual?.mobileNumber || t("NA")},
-            { title: "MASTERS_SOCIAL_CATEGORY", value: socialCategory ? (socialCategory?.value?.includes("UNDISCLOSED")? t(socialCategory?.value): `COMMON_MASTERS_SOCIAL_${socialCategory?.value}`) : t("NA")}
+            { title: "MASTERS_SOCIAL_CATEGORY", value: socialCategory ? (socialCategory?.value?.includes("UNDISCLOSED")? t(socialCategory?.value): `COMMON_MASTERS_SOCIAL_${socialCategory?.value}`) : t("CS_COMMON_UNDISCLOSED")}
         ],
         additionalDetails: {
           skills: {

From 337d3cabf06bc3f668af793826bf3c93df6d6eda Mon Sep 17 00:00:00 2001
From: Tulika-eGov <74046137+Tulika-eGov@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:50:07 +0530
Subject: [PATCH 19/19] Update publishUIPackages.yml

---
 .github/workflows/publishUIPackages.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publishUIPackages.yml b/.github/workflows/publishUIPackages.yml
index 0245423af2..dfea95e621 100644
--- a/.github/workflows/publishUIPackages.yml
+++ b/.github/workflows/publishUIPackages.yml
@@ -7,7 +7,8 @@ on:
       - 'master'
       # Push events to branches matching refs/heads/mona/octocat
       - 'UAT'
-      - 'PRIVACY-UAT-UI'
+      - 'MUKTA-v2.1-Develop'
+      - 'MUKTA-DEVELOP-v2.1.1'
     paths:
       - 'frontend/micro-ui/web/micro-ui-internals/**'