@djb25/digit-ui-module-ekyc 1.0.52 → 1.0.54

package/dist/index.js

@@ -99,6 +99,25 @@ const EKYCCard = () => {
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.EmployeeModuleCard, propsForModuleCard);
 };
 
+function _extends() {
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
+    for (var e = 1; e < arguments.length; e++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+    }
+    return n;
+  }, _extends.apply(null, arguments);
+}
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (-1 !== e.indexOf(n)) continue;
+    t[n] = r[n];
+  }
+  return t;
+}
+
 const _iteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator")) : "@@iterator";
 const _asyncIteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator")) : "@@asyncIterator";
 function _catch(body, recover) {
@@ -136,6 +155,29 @@ const StatusCards = _ref => {
   const _useState = React.useState(false),
     ekycDownloadLoading = _useState[0],
     setEkycDownloadLoading = _useState[1];
+  const _useState2 = React.useState(false),
+    showReportMenu = _useState2[0],
+    setShowReportMenu = _useState2[1];
+  const _useState3 = React.useState({
+      from: "",
+      to: ""
+    }),
+    customDate = _useState3[0],
+    setCustomDate = _useState3[1];
+  const _useState4 = React.useState(false),
+    showCustomPicker = _useState4[0],
+    setShowCustomPicker = _useState4[1];
+  const reportMenuRef = React.useRef(null);
+  React.useEffect(() => {
+    const handler = e => {
+      if (reportMenuRef.current && !reportMenuRef.current.contains(e.target)) {
+        setShowReportMenu(false);
+        setShowCustomPicker(false);
+      }
+    };
+    document.addEventListener("mousedown", handler);
+    return () => document.removeEventListener("mousedown", handler);
+  }, []);
   let tenantId = Digit.ULBService.getCurrentTenantId();
   if (!tenantId || tenantId === "dl") {
     tenantId = "dl.djb";
@@ -164,50 +206,149 @@ const StatusCards = _ref => {
       active: info.active || 0
     };
   }, [dashboardData]);
-  const handleDownloadEkycData = function () {
+  const handleDownloadEkycData = function (fromDate, toDate) {
     try {
       setEkycDownloadLoading(true);
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
-          return Promise.resolve(Digit.EkycService.application_list({
+          return Promise.resolve(Digit.EkycService.application_list(_extends({
             tenantId: tenantId,
             offset: 0,
             limit: 10000,
             reportDownload: true
-          })).then(function (response) {
+          }, fromDate && {
+            fromDate
+          }, toDate && {
+            toDate
+          }))).then(function (response) {
             const consumerList = (response === null || response === void 0 ? void 0 : response.consumerList) || [];
             if (consumerList.length === 0) {
               alert(t("NO_DATA_FOUND") || "No data found for download.");
               return;
             }
-            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile"];
+            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile", "doorPhotoFilestoreId", "panFilestoreId", "documentProofFilestoreId", "buildingImageFileStoreId", "propertyDocumentFileStoreId", "meterPhotoFileStoreId", "modifiedBy", "zoneCode", "propertyType", "subPropertyCategory"];
             const headerMapping = {
-              kno: t("KNO") || "KNO",
-              firstName: t("FIRST_NAME") || "First Name",
-              middleName: t("MIDDLE_NAME") || "Middle Name",
-              lastName: t("LAST_NAME") || "Last Name",
-              gender: t("GENDER") || "Gender",
-              mobileNumber: t("MOBILE_NUMBER") || "Mobile Number",
-              emailId: t("EMAIL_ID") || "Email ID",
-              fatherOrHusbandName: t("FATHER_HUSBUND_NAME") || "Father/Husband Name",
-              relationship: t("RELATIONSHIP") || "Relationship",
-              dob: t("DOB") || "Date of Birth",
-              ekycStatus: t("EKYC_STATUS") || "eKYC Status",
-              zoneName: t("ZONE") || "Zone",
-              assembly: t("ASSEMBLY") || "Assembly",
-              ward: t("WARD") || "Ward",
-              pincode: t("PINCODE") || "Pincode",
-              mrkey: t("MR_KEY") || "MR Key",
-              consumerType: t("CONSUMER_TYPE") || "Consumer Type",
-              createdTime: t("CREATED_TIME") || "Created Time",
-              lastModifiedTime: t("LAST_MODIFIED_TIME") || "Last Modified Time"
+              kno: t("KNO"),
+              firstName: t("FIRST_NAME"),
+              middleName: t("MIDDLE_NAME"),
+              lastName: t("LAST_NAME"),
+              status: t("STATUS"),
+              ekycStatus: t("EKYC_STATUS"),
+              zoneName: t("ZONE"),
+              zoneCode: t("ZONE_CODE"),
+              assembly: t("EKYC_ASSEMBLY"),
+              ward: t("WARD"),
+              pincode: t("EKYC_PINCODE"),
+              addressRaw: t("ADDRESS_RAW"),
+              locality: t("EKYC_LOCALITY"),
+              subLocality: t("SUB_LOCALITY"),
+              flatHouseNumber: t("FLAT_HOUSE_NUMBER"),
+              streetName: t("STREET_NAME"),
+              landmark: t("EKYC_LANDMARK"),
+              city: t("CITY"),
+              state: t("STATE"),
+              addressType: t("ADDRESS_TYPE"),
+              addressProofType: t("ADDRESS_PROOF_TYPE"),
+              mobileNo: t("MOBILE_NUMBER"),
+              alternateMobileNo: t("ALTERNATE_MOBILE_NUMBER"),
+              whatsappNo: t("WHATSAPP_NO"),
+              email: t("EMAIL"),
+              landlineNo: t("LANDLINE_NO"),
+              mrkey: t("MR_KEY"),
+              mrcode: t("MR_CODE"),
+              areacode: t("AREA_CODE"),
+              source: t("SOURCE"),
+              submittedAt: t("SUBMITTED_AT"),
+              assignedAt: t("ASSIGNED_AT"),
+              connectionType: t("CONNECTION_TYPE"),
+              Type: t("CONSUMER_TYPE"),
+              occupantType: t("OCCUPANT_TYPE"),
+              knoCategory: t("KNO_CATEGORY"),
+              approvedAt: t("APPROVED_AT"),
+              gender: t("GENDER"),
+              parentSpouse: t("PARENT_SPOUSE"),
+              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
+              relationship: t("RELATIONSHIP"),
+              informantName: t("INFORMANT_NAME"),
+              informantRelation: t("INFORMANT_RELATION"),
+              informantIs: t("INFORMANT_IS"),
+              contactPerson: t("CONTACT_PERSON"),
+              relation: t("RELATION"),
+              entityName: t("ENTITY_NAME"),
+              designation: t("DESIGNATION"),
+              department: t("DEPARTMENT"),
+              employeeId: t("EMPLOYEE_ID"),
+              ownerMobile: t("OWNER_MOBILE"),
+              ownerVerificationDone: t("OWNER_VERIFICATION_DONE"),
+              consentGiven: t("CONSENT_GIVEN"),
+              proofOfIdentityType: t("PROOF_OF_IDENTITY_TYPE"),
+              documentNumber: t("DOCUMENT_NUMBER"),
+              noOfPerson: t("NUMBER_OF_PERSON"),
+              latitude: t("LATITUDE"),
+              longitude: t("LONGITUDE"),
+              gpsValid: t("GPS_VALID"),
+              meterNumber: t("METER_NUMBER"),
+              meterMake: t("METER_MAKE"),
+              meterStatus: t("METER_STATUS"),
+              meterCondition: t("METER_CONDITION"),
+              meterLocation: t("METER_LOCATION"),
+              meterLocationAddress: t("METER_LOCATION_ADDRESS"),
+              workingStatus: t("WORKING_STATUS"),
+              sewerConnection: t("SEWER_CONNECTION"),
+              septicTank: t("SEPTIC_TANK"),
+              lastBillRaised: t("LAST_BILL_RAISED"),
+              lastBillReceivedDate: t("LAST_BILL_RECEIVED_DATE"),
+              accessToMeter: t("ACCESS_TO_METER"),
+              systemMeterId: t("SYSTEM_METER_ID"),
+              lastBillNotRaisedReason: t("LAST_BILL_NOT_RAISED_REASON"),
+              waterConnectionYears: t("WATER_CONNECTION_YEARS"),
+              sewerConnectionYears: t("SEWER_CONNECTION_YEARS"),
+              pidNumber: t("PID_NUMBER"),
+              propertyType: t("PROPERTY_TYPE"),
+              subPropertyCategory: t("SUB_PROPERTY_CATEGORY"),
+              noOfFloor: t("NO_OF_FLOOR"),
+              noOfRooms: t("NO_OF_ROOMS"),
+              noOfBeds: t("NO_OF_BEDS"),
+              numberOfDwellingUnits: t("NUMBER_OF_DWELLING_UNITS"),
+              floorNo: t("FLOOR_NO"),
+              userType: t("USER_TYPE"),
+              tenantName: t("TENANT_NAME"),
+              tenantMobile: t("TENANT_MOBILE"),
+              verificationStatus: t("VERIFICATION_STATUS"),
+              houseBuiltDuration: t("HOUSE_BUILT_DURATION"),
+              surveyorId: t("SURVEYOR_ID"),
+              supervisorId: t("SUPERVISOR_ID"),
+              vendorId: t("VENDOR_ID"),
+              assignmentType: t("ASSIGNMENT_TYPE"),
+              assignmentValue: t("ASSIGNMENT_VALUE"),
+              assignedTime: t("ASSIGNED_TIME"),
+              isSelfAssigned: t("IS_SELF_ASSIGNED"),
+              doorPhotoFilestoreId: t("DOOR_PHOTO_FILESTORE_ID"),
+              panFilestoreId: t("PAN_FILESTORE_ID"),
+              documentProofFilestoreId: t("DOCUMENT_PROOF_FILESTORE_ID"),
+              buildingImageFileStoreId: t("BUILDING_IMAGE_FILESTORE_ID"),
+              propertyDocumentFileStoreId: t("PROPERTY_DOCUMENT_FILESTORE_ID"),
+              meterPhotoFileStoreId: t("METER_PHOTO_FILESTORE_ID"),
+              modifiedBy: t("MODIFIED_BY"),
+              emailId: t("EMAIL_ID"),
+              fatherOrHusbandName: t("FATHER_HUSBUND_NAME"),
+              dob: t("DOB"),
+              consumerType: t("CONSUMER_TYPE"),
+              createdTime: t("CREATED_TIME"),
+              lastModifiedTime: t("LAST_MODIFIED_TIME"),
+              meterLatitude: t("EKYC_METER_LATITUDE1"),
+              meterLongitude: t("EKYC_METER_LONGITUDE1")
             };
             const toTitleCase = str => {
               if (!str) return "";
-              const cleanStr = String(str).includes(".") ? String(str).split(".").pop() : String(str);
+              let cleanStr = String(str);
+              if (cleanStr.includes(".") && !cleanStr.includes("@") && isNaN(Number(cleanStr))) {
+                cleanStr = cleanStr.split(".").pop();
+              }
               return cleanStr.toLowerCase().replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
             };
-            const skipTitleCase = ["kno", "mobileNumber", "emailId", "pincode", "mrkey", "dob", "createdTime", "lastModifiedTime"];
+            const skipTitleCase = ["kno", "mobileNumber", "emailId", "email", "pincode", "mrkey", "dob", "createdTime", "lastModifiedTime", "meterLatitude", "meterLongitude"];
+            const translatedFields = ["meterMake", "meterLocation"];
             const excelData = consumerList.map(item => {
               const cleanObj = {};
               const name = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
@@ -216,12 +357,19 @@ const StatusCards = _ref => {
               }
               Object.keys(item).forEach(key => {
                 if (excludedKeys.includes(key)) return;
-                const val = item[key];
+                let val = item[key];
                 if (typeof val === "object" && val !== null) {
                   return;
                 }
+                if (String(val).toLowerCase() === "true") {
+                  val = t("CS_YES");
+                } else if (String(val).toLowerCase() === "false") {
+                  val = t("CS_NO");
+                }
                 const friendlyHeader = headerMapping[key] || t(key.toUpperCase()) || key;
-                if (typeof val === "string" && !skipTitleCase.includes(key)) {
+                if (typeof val === "string" && translatedFields.includes(key)) {
+                  cleanObj[friendlyHeader] = t(val);
+                } else if (typeof val === "string" && !skipTitleCase.includes(key)) {
                   cleanObj[friendlyHeader] = toTitleCase(val);
                 } else {
                   cleanObj[friendlyHeader] = val;
@@ -244,6 +392,62 @@ const StatusCards = _ref => {
       return Promise.reject(e);
     }
   };
+  const getDateRange = filter => {
+    const now = new Date();
+    const start = new Date(now);
+    if (filter === "today") {
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    if (filter === "week") {
+      start.setDate(now.getDate() - now.getDay());
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    if (filter === "month") {
+      start.setDate(1);
+      start.setHours(0, 0, 0, 0);
+      return {
+        from: start,
+        to: now
+      };
+    }
+    return null;
+  };
+  const handlePresetDownload = function (filter) {
+    try {
+      const range = getDateRange(filter);
+      if (!range) return Promise.resolve();
+      setShowReportMenu(false);
+      setShowCustomPicker(false);
+      return Promise.resolve(handleDownloadEkycData(range.from.getTime(), range.to.getTime())).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  const handleCustomDownload = function () {
+    try {
+      if (!customDate.from || !customDate.to) {
+        alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
+        return Promise.resolve();
+      }
+      const from = new Date(customDate.from);
+      from.setHours(0, 0, 0, 0);
+      const to = new Date(customDate.to);
+      to.setHours(23, 59, 59, 999);
+      setShowReportMenu(false);
+      setShowCustomPicker(false);
+      return Promise.resolve(handleDownloadEkycData(from.getTime(), to.getTime())).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   const chartRef1 = React.useRef(null);
   const chartInstance1 = React.useRef(null);
   const total = hasExternalData ? countData.total : (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.total) || (countData === null || countData === void 0 ? void 0 : countData.total) || (countData === null || countData === void 0 ? void 0 : countData.totalCount) || 0;
@@ -327,10 +531,16 @@ const StatusCards = _ref => {
     className: "total-label"
   }, t("EKYC_TOTAL_APPLICATIONS") || "Total Applications Processed"), /*#__PURE__*/React__default.createElement("div", {
     className: "total-number"
-  }, formatNumber(total)), /*#__PURE__*/React__default.createElement("button", {
+  }, formatNumber(total)), /*#__PURE__*/React__default.createElement("div", {
+    className: "report-download",
+    ref: reportMenuRef
+  }, /*#__PURE__*/React__default.createElement("button", {
     className: "download-excel-btn",
     disabled: ekycDownloadLoading,
-    onClick: handleDownloadEkycData
+    onClick: () => {
+      setShowReportMenu(p => !p);
+      setShowCustomPicker(false);
+    }
   }, /*#__PURE__*/React__default.createElement("svg", {
     width: "16",
     height: "16",
@@ -349,7 +559,63 @@ const StatusCards = _ref => {
     y1: "15",
     x2: "12",
     y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"))), /*#__PURE__*/React__default.createElement("div", {
+  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React__default.createElement("div", {
+    className: "report-menu"
+  }, [{
+    label: t("TODAY") || "Today",
+    key: "today"
+  }, {
+    label: t("THIS_WEEK") || "This Week",
+    key: "week"
+  }, {
+    label: t("THIS_MONTH") || "This Month",
+    key: "month"
+  }].map(_ref2 => {
+    let label = _ref2.label,
+      key = _ref2.key;
+    return /*#__PURE__*/React__default.createElement("div", {
+      key: key,
+      className: "menu-item",
+      onClick: () => handlePresetDownload(key)
+    }, label);
+  }), /*#__PURE__*/React__default.createElement("div", {
+    className: "custom-date-trigger",
+    onClick: () => setShowCustomPicker(p => !p)
+  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React__default.createElement("div", {
+    className: "custom-picker"
+  }, /*#__PURE__*/React__default.createElement("div", {
+    className: "date-inputs"
+  }, /*#__PURE__*/React__default.createElement("label", null, /*#__PURE__*/React__default.createElement("span", null, "From"), /*#__PURE__*/React__default.createElement("input", {
+    type: "date",
+    value: customDate.from,
+    onChange: e => setCustomDate(_extends({}, customDate, {
+      from: e.target.value
+    }))
+  })), /*#__PURE__*/React__default.createElement("label", null, /*#__PURE__*/React__default.createElement("span", null, "To"), /*#__PURE__*/React__default.createElement("input", {
+    type: "date",
+    value: customDate.to,
+    onChange: e => setCustomDate(_extends({}, customDate, {
+      to: e.target.value
+    }))
+  }))), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "10px",
+      marginTop: "10px"
+    }
+  }, /*#__PURE__*/React__default.createElement("button", {
+    className: "picker-cancel-btn",
+    onClick: () => {
+      setShowCustomPicker(false);
+      setCustomDate({
+        from: "",
+        to: ""
+      });
+    }
+  }, t("CANCEL") || "Cancel"), /*#__PURE__*/React__default.createElement("button", {
+    className: "picker-apply-btn",
+    onClick: handleCustomDownload
+  }, t("APPLY") || "Apply"))))))), /*#__PURE__*/React__default.createElement("div", {
     className: "status-panels-grid"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "status-panel"
@@ -451,25 +717,6 @@ const Dashboard = () => {
   }));
 };
 
-function _extends() {
-  return _extends = Object.assign ? Object.assign.bind() : function (n) {
-    for (var e = 1; e < arguments.length; e++) {
-      var t = arguments[e];
-      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
-    }
-    return n;
-  }, _extends.apply(null, arguments);
-}
-function _objectWithoutPropertiesLoose(r, e) {
-  if (null == r) return {};
-  var t = {};
-  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (-1 !== e.indexOf(n)) continue;
-    t[n] = r[n];
-  }
-  return t;
-}
-
 const _excluded = ["tableConfig", "filterComponent"];
 const DesktopInbox = _ref => {
   var _Digit$ComponentRegis;
@@ -2903,25 +3150,10 @@ const Inbox = _ref2 => {
         targetVendorId: matchedId,
         allVendorIds: allIds
       };
-    }, [vendorSearchResponse]),
-    targetVendorId = _useMemo.targetVendorId,
-    allVendorIds = _useMemo.allVendorIds;
-  const progressParams = React.useMemo(() => {
-    if (targetVendorId) {
-      return {
-        vendorId: targetVendorId,
-        vendorIds: [targetVendorId]
-      };
-    }
-    if (allVendorIds && allVendorIds.length > 0) {
-      return {
-        vendorId: allVendorIds[0],
-        vendorIds: allVendorIds
-      };
-    }
-    return {};
-  }, [targetVendorId, allVendorIds]);
-  const _Digit$Hooks$ekyc$use3 = Digit.Hooks.ekyc.useEkycAssignmentProgress(progressParams, {
+    }, [vendorSearchResponse]);
+  const _Digit$Hooks$ekyc$use3 = Digit.Hooks.ekyc.useEkycAssignmentProgress({
+      tenantId
+    }, {
       enabled: !!tenantId,
       keepPreviousData: true
     }),
@@ -2983,65 +3215,56 @@ const Inbox = _ref2 => {
   }, [sourceData]);
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  const supervisor = React.useMemo(() => {
-    var _Digit$SessionStorage2, _loggedInUser$roles;
-    const loggedInUser = (_Digit$SessionStorage2 = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage2 === void 0 ? void 0 : _Digit$SessionStorage2.info;
-    const roles = (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$roles = loggedInUser.roles) === null || _loggedInUser$roles === void 0 ? void 0 : _loggedInUser$roles.map(ele => ele.code)) || [];
-    if (roles.includes("EKYC_SUPERVISOR")) {
-      const targetId = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.uuid;
-      if (progressData !== null && progressData !== void 0 && progressData.supervisorReport && targetId) {
-        const report = progressData.supervisorReport.find(s => {
-          var _s$supervisorId, _s$id;
-          return ((_s$supervisorId = s.supervisorId) === null || _s$supervisorId === void 0 ? void 0 : _s$supervisorId.toLowerCase()) === (targetId === null || targetId === void 0 ? void 0 : targetId.toLowerCase()) || ((_s$id = s.id) === null || _s$id === void 0 ? void 0 : _s$id.toLowerCase()) === (targetId === null || targetId === void 0 ? void 0 : targetId.toLowerCase());
-        });
-        if (report) return report;
-      }
-    }
-    if (progressData !== null && progressData !== void 0 && progressData.supervisorReport) {
-      const totalKnos = progressData.supervisorReport.reduce((acc, r) => acc + (r.totalKnos || 0), 0);
-      const submittedKnos = progressData.supervisorReport.reduce((acc, r) => acc + (r.submittedKnos || 0), 0);
-      const pendingKnos = progressData.supervisorReport.reduce((acc, r) => acc + (r.pendingKnos || 0), 0);
-      const progressPercent = totalKnos > 0 ? Math.round(submittedKnos / totalKnos * 100) : 0;
-      return {
-        totalKnos,
-        submittedKnos,
-        pendingKnos,
-        progressPercent
-      };
-    }
-    return null;
+  const progressMetrics = React.useMemo(() => {
+    var _ref3, _progressData$totalKn, _ref4, _progressData$complet, _progressData$pending, _ref5, _progressData$overall;
+    if (!progressData) return {
+      totalKnos: 0,
+      submittedKnos: 0,
+      pendingKnos: 0,
+      progressPercent: 0
+    };
+    const totalKnos = (_ref3 = (_progressData$totalKn = progressData === null || progressData === void 0 ? void 0 : progressData.totalKnos) != null ? _progressData$totalKn : progressData === null || progressData === void 0 ? void 0 : progressData.totalAssignments) != null ? _ref3 : 0;
+    const submittedKnos = (_ref4 = (_progressData$complet = progressData === null || progressData === void 0 ? void 0 : progressData.completedKnos) != null ? _progressData$complet : progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) != null ? _ref4 : 0;
+    const pendingKnos = (_progressData$pending = progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnos) != null ? _progressData$pending : totalKnos >= submittedKnos ? totalKnos - submittedKnos : 0;
+    const progressPercent = (_ref5 = (_progressData$overall = progressData === null || progressData === void 0 ? void 0 : progressData.overallProgressPercent) != null ? _progressData$overall : progressData === null || progressData === void 0 ? void 0 : progressData.progressPercent) != null ? _ref5 : totalKnos > 0 ? (submittedKnos / totalKnos * 100).toFixed(1) : 0;
+    return {
+      totalKnos,
+      submittedKnos,
+      pendingKnos,
+      progressPercent
+    };
   }, [progressData]);
   const cards = React.useMemo(() => [{
     label: t("TOTAL_EKYC_APPLICATIONS"),
-    count: (supervisor === null || supervisor === void 0 ? void 0 : supervisor.totalKnos) || 0,
+    count: (progressMetrics === null || progressMetrics === void 0 ? void 0 : progressMetrics.totalKnos) || 0,
     color: "#0B2559",
     type: "today",
     icon: /*#__PURE__*/React__default.createElement(fa.FaUsers, null)
   }, {
     label: t("EKYC_COMPLETED"),
-    count: (supervisor === null || supervisor === void 0 ? void 0 : supervisor.submittedKnos) || 0,
+    count: (progressMetrics === null || progressMetrics === void 0 ? void 0 : progressMetrics.submittedKnos) || 0,
     color: "#10B981",
     type: "month",
     icon: /*#__PURE__*/React__default.createElement(fa.FaCheckCircle, null)
   }, {
     label: t("PENDING_APPLICATIONS"),
-    count: (supervisor === null || supervisor === void 0 ? void 0 : supervisor.pendingKnos) || 0,
+    count: (progressMetrics === null || progressMetrics === void 0 ? void 0 : progressMetrics.pendingKnos) || 0,
     color: "#F59E0B",
     type: "pending",
     icon: /*#__PURE__*/React__default.createElement(fa.FaClock, null)
   }, {
     label: t("OVERALL_PROGRESS"),
-    count: ((supervisor === null || supervisor === void 0 ? void 0 : supervisor.progressPercent) || 0) + "%",
+    count: ((progressMetrics === null || progressMetrics === void 0 ? void 0 : progressMetrics.progressPercent) || 0) + "%",
     color: "#A855F7",
     type: "progress",
     icon: /*#__PURE__*/React__default.createElement(fa.FaChartLine, null)
-  }], [supervisor]);
+  }], [progressMetrics, t]);
   const totalRecords = (listData === null || listData === void 0 ? void 0 : listData.totalCount) || 0;
   const checkPathName = location.pathname.includes("ekyc/inbox");
-  const SearchFormFields = React.useCallback(_ref3 => {
-    let registerRef = _ref3.registerRef,
-      searchFormState = _ref3.searchFormState,
-      controlSearchForm = _ref3.controlSearchForm;
+  const SearchFormFields = React.useCallback(_ref6 => {
+    let registerRef = _ref6.registerRef,
+      searchFormState = _ref6.searchFormState,
+      controlSearchForm = _ref6.controlSearchForm;
     return /*#__PURE__*/React__default.createElement(SearchFormFieldsComponents, {
       registerRef,
       searchFormState,
@@ -3346,7 +3569,8 @@ const ReviewSection = _ref2 => {
   }, t("EKYC_PROPOSED_UPDATES")))), /*#__PURE__*/React__default.createElement("tbody", null, fields.map((field, idx) => {
     const valNew = newData === null || newData === void 0 ? void 0 : newData[field.key];
     const valOld = oldData === null || oldData === void 0 ? void 0 : oldData[field.key];
-    const isChanged = oldData && String(valNew) !== String(valOld) && valOld !== undefined && valOld !== null;
+    const normalizeVal = v => v === null || v === undefined || v === "" ? "" : String(v);
+    const isChanged = oldData && valOld !== undefined && normalizeVal(valNew) !== normalizeVal(valOld);
     return /*#__PURE__*/React__default.createElement("tr", {
       key: idx,
       style: {
@@ -3359,7 +3583,7 @@ const ReviewSection = _ref2 => {
         color: "#344054",
         fontWeight: "500"
       }
-    }, t(field.label)), /*#__PURE__*/React__default.createElement("td", {
+    }, field.preTranslated ? field.label : t(field.label)), /*#__PURE__*/React__default.createElement("td", {
       style: {
         padding: "16px 0",
         fontSize: "14px",
@@ -3458,6 +3682,8 @@ const Review = () => {
   const _extractReviewData = extractReviewData(searchData, flowState),
     apiNewData = _extractReviewData.newData,
     apiOldData = _extractReviewData.oldData;
+  const flatNewData = apiNewData ? _extends({}, apiNewData || {}, (apiNewData === null || apiNewData === void 0 ? void 0 : apiNewData.connectionDetails) || {}, (apiNewData === null || apiNewData === void 0 ? void 0 : apiNewData.addressDetails) || {}, (apiNewData === null || apiNewData === void 0 ? void 0 : apiNewData.propertyInfo) || {}, (apiNewData === null || apiNewData === void 0 ? void 0 : apiNewData.meterDetails) || {}) : null;
+  const flatOldData = apiOldData ? _extends({}, apiOldData || {}, (apiOldData === null || apiOldData === void 0 ? void 0 : apiOldData.connectionDetails) || {}, (apiOldData === null || apiOldData === void 0 ? void 0 : apiOldData.addressDetails) || {}, (apiOldData === null || apiOldData === void 0 ? void 0 : apiOldData.propertyInfo) || {}, (apiOldData === null || apiOldData === void 0 ? void 0 : apiOldData.meterDetails) || {}) : null;
   const prepareConsolidatedData = data => {
     if (!data) return null;
     const apiConn = (data === null || data === void 0 ? void 0 : data.connectionDetails) || data || {};
@@ -3492,7 +3718,7 @@ const Review = () => {
         email: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.email,
         noOfPerson: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.noOfPerson) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.noOfPersons),
         knumber: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.knumber) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.kno),
-        doorPhotoFilestoreId: apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.doorPhotoFilestoreId
+        doorPhotoFilestoreId: (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.doorPhotoFileStoreId) || (apiAddr === null || apiAddr === void 0 ? void 0 : apiAddr.doorPhotoFilestoreId)
       },
       property: {
         kno: apiProp === null || apiProp === void 0 ? void 0 : apiProp.kno,
@@ -3505,7 +3731,7 @@ const Review = () => {
         tenantMobile: apiProp === null || apiProp === void 0 ? void 0 : apiProp.tenantMobile,
         ekycStatus: apiProp === null || apiProp === void 0 ? void 0 : apiProp.ekycStatus,
         propertyDocumentFileStoreId: apiProp === null || apiProp === void 0 ? void 0 : apiProp.propertyDocumentFileStoreId,
-        buildingImageFileStoreId: apiProp === null || apiProp === void 0 ? void 0 : apiProp.buildingImageFileStoreId
+        buildingImageFileStoreId: (apiProp === null || apiProp === void 0 ? void 0 : apiProp.buildingImageFileStoreId) || (apiProp === null || apiProp === void 0 ? void 0 : apiProp.buildingImageFilestoreId)
       },
       meter: {
         kno: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.kno,
@@ -3518,12 +3744,11 @@ const Review = () => {
         workingStatus: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.workingStatus,
         lastBillRaised: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.lastBillRaised,
         systemMeterId: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.systemMeterId,
-        meterPhotoFileStoreId: apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterPhotoFileStoreId
+        meterPhotoFileStoreId: (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterPhotoFileStoreId) || (apiMeter === null || apiMeter === void 0 ? void 0 : apiMeter.meterPhotoFilestoreId)
       }
     };
   };
   const newDataRaw = prepareConsolidatedData(apiNewData);
-  const oldDataRaw = prepareConsolidatedData(apiOldData);
   const connectionData = _extends({}, newDataRaw === null || newDataRaw === void 0 ? void 0 : newDataRaw.connection, {
     consumerName: (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.name) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$connectio = newDataRaw.connection) === null || _newDataRaw$connectio === void 0 ? void 0 : _newDataRaw$connectio.consumerName),
     phoneNumber: (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.mobileNumber) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$connectio2 = newDataRaw.connection) === null || _newDataRaw$connectio2 === void 0 ? void 0 : _newDataRaw$connectio2.phoneNumber),
@@ -3545,7 +3770,7 @@ const Review = () => {
     email: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.email) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address11 = newDataRaw.address) === null || _newDataRaw$address11 === void 0 ? void 0 : _newDataRaw$address11.email),
     noOfPerson: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.noOfPerson) || (aadhaarData === null || aadhaarData === void 0 ? void 0 : aadhaarData.noOfPersons) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address12 = newDataRaw.address) === null || _newDataRaw$address12 === void 0 ? void 0 : _newDataRaw$address12.noOfPerson),
     knumber: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.knumber) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address13 = newDataRaw.address) === null || _newDataRaw$address13 === void 0 ? void 0 : _newDataRaw$address13.knumber) || activeKno,
-    doorPhotoFilestoreId: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.doorPhotoFileStoreId) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address14 = newDataRaw.address) === null || _newDataRaw$address14 === void 0 ? void 0 : _newDataRaw$address14.doorPhotoFilestoreId)
+    doorPhotoFilestoreId: (editedAddress === null || editedAddress === void 0 ? void 0 : editedAddress.doorPhotoFilestoreId) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$address14 = newDataRaw.address) === null || _newDataRaw$address14 === void 0 ? void 0 : _newDataRaw$address14.doorPhotoFilestoreId)
   });
   const propertyData = _extends({}, newDataRaw === null || newDataRaw === void 0 ? void 0 : newDataRaw.property, {
     kno: (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$property = newDataRaw.property) === null || _newDataRaw$property === void 0 ? void 0 : _newDataRaw$property.kno) || activeKno,
@@ -3566,136 +3791,323 @@ const Review = () => {
     lastBillRaised: (editedMeter === null || editedMeter === void 0 ? void 0 : (_editedMeter$lastBill = editedMeter.lastBillRaisedData) === null || _editedMeter$lastBill === void 0 ? void 0 : _editedMeter$lastBill.value) === "Yes" || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter7 = newDataRaw.meter) === null || _newDataRaw$meter7 === void 0 ? void 0 : _newDataRaw$meter7.lastBillRaised),
     meterPhotoFileStoreId: (editedMeter === null || editedMeter === void 0 ? void 0 : editedMeter.meterPhotoFileStoreId) || (newDataRaw === null || newDataRaw === void 0 ? void 0 : (_newDataRaw$meter8 = newDataRaw.meter) === null || _newDataRaw$meter8 === void 0 ? void 0 : _newDataRaw$meter8.meterPhotoFileStoreId)
   });
-  const connectionFields = [{
-    label: "EKYC_K_NUMBER",
-    key: "knumber"
+  const headerMapping = [{
+    key: "kno",
+    label: "KNO"
   }, {
-    label: "EKYC_CONSUMER_NAME",
-    key: "consumerName"
+    key: "firstName",
+    label: "FIRST_NAME"
   }, {
-    label: "EKYC_ADDRESS",
-    key: "address"
+    key: "middleName",
+    label: "MIDDLE_NAME"
   }, {
-    label: "EKYC_CONNECTION_TYPE",
-    key: "connectionType"
+    key: "lastName",
+    label: "LAST_NAME"
   }, {
-    label: "EKYC_METER_NO",
-    key: "meterNumber"
+    key: "status",
+    label: "STATUS"
   }, {
-    label: "EKYC_MOBILE_NO",
-    key: "phoneNumber"
+    key: "ekycStatus",
+    label: "EKYC_STATUS"
   }, {
-    label: "EKYC_EMAIL",
-    key: "email"
+    key: "zoneName",
+    label: "ZONE"
   }, {
-    label: "EKYC_STATUS_FLAG",
-    key: "statusflag"
+    key: "zoneCode",
+    label: "ZONE_CODE"
   }, {
-    label: "EKYC_STATUS",
-    key: "ekycStatus"
-  }];
-  const addressFields = [{
-    label: "EKYC_FULL_ADDRESS",
-    key: "fullAddress"
+    key: "assembly",
+    label: "EKYC_ASSEMBLY"
   }, {
-    label: "EKYC_FLAT_HOUSE_NO",
-    key: "flatHouseNumber"
+    key: "ward",
+    label: "WARD"
   }, {
-    label: "EKYC_BUILDING_TOWER",
-    key: "buildingTower"
+    key: "pincode",
+    label: "EKYC_PINCODE"
   }, {
-    label: "EKYC_LANDMARK",
-    key: "landmark"
+    key: "addressRaw",
+    label: "ADDRESS_RAW"
   }, {
-    label: "EKYC_PINCODE",
-    key: "pinCode"
+    key: "locality",
+    label: "EKYC_LOCALITY"
   }, {
-    label: "EKYC_LOCALITY",
-    key: "ward"
+    key: "subLocality",
+    label: "SUB_LOCALITY"
   }, {
-    label: "EKYC_ASSEMBLY",
-    key: "assembly"
+    key: "flatHouseNumber",
+    label: "FLAT_HOUSE_NUMBER"
   }, {
-    label: "EKYC_GPS_VALID",
-    key: "gpsValid",
-    isBool: true
+    key: "streetName",
+    label: "STREET_NAME"
   }, {
-    label: "EKYC_LATITUDE",
-    key: "latitude"
+    key: "landmark",
+    label: "EKYC_LANDMARK"
   }, {
-    label: "EKYC_LONGITUDE",
-    key: "longitude"
+    key: "city",
+    label: "CITY"
   }, {
-    label: "EKYC_MOBILE_NO",
-    key: "mobileNo"
+    key: "state",
+    label: "STATE"
   }, {
-    label: "EKYC_WHATSAPP_NO",
-    key: "whatsappNo"
+    key: "addressType",
+    label: "ADDRESS_TYPE"
   }, {
-    label: "EKYC_EMAIL",
-    key: "email"
+    key: "addressProofType",
+    label: "ADDRESS_PROOF_TYPE"
   }, {
-    label: "EKYC_NO_OF_PERSONS",
-    key: "noOfPerson"
+    key: "mobileNo",
+    label: "MOBILE_NUMBER"
   }, {
-    label: "EKYC_K_NUMBER",
-    key: "knumber"
-  }];
-  const propertyFields = [{
-    label: "EKYC_CONNECTION_CATEGORY",
-    key: "connectionCategory"
+    key: "alternateMobileNo",
+    label: "ALTERNATE_MOBILE_NUMBER"
   }, {
-    label: "EKYC_PID_NUMBER",
-    key: "pidNumber"
+    key: "whatsappNo",
+    label: "WHATSAPP_NO"
   }, {
-    label: "EKYC_TYPE_OF_CONNECTION",
-    key: "typeOfConnection"
+    key: "email",
+    label: "EMAIL"
   }, {
-    label: "EKYC_USER_TYPE",
-    key: "userType"
+    key: "landlineNo",
+    label: "LANDLINE_NO"
   }, {
-    label: "EKYC_FLOOR_COUNT",
-    key: "numberOfFloors"
+    key: "mrkey",
+    label: "MR_KEY"
   }, {
-    label: "EKYC_TENANT_NAME",
-    key: "tenantName"
+    key: "mrcode",
+    label: "MR_CODE"
   }, {
-    label: "EKYC_TENANT_MOBILE",
-    key: "tenantMobile"
+    key: "areacode",
+    label: "AREA_CODE"
   }, {
-    label: "EKYC_STATUS",
-    key: "ekycStatus"
-  }];
-  const meterFields = [{
-    label: "EKYC_METERED",
-    key: "metered",
+    key: "source",
+    label: "SOURCE"
+  }, {
+    key: "submittedAt",
+    label: "SUBMITTED_AT"
+  }, {
+    key: "assignedAt",
+    label: "ASSIGNED_AT"
+  }, {
+    key: "connectionType",
+    label: "CONNECTION_TYPE"
+  }, {
+    key: "Type",
+    label: "CONSUMER_TYPE"
+  }, {
+    key: "occupantType",
+    label: "OCCUPANT_TYPE"
+  }, {
+    key: "knoCategory",
+    label: "KNO_CATEGORY"
+  }, {
+    key: "approvedAt",
+    label: "APPROVED_AT"
+  }, {
+    key: "gender",
+    label: "GENDER"
+  }, {
+    key: "parentSpouse",
+    label: "PARENT_SPOUSE"
+  }, {
+    key: "fatherOrHusbandName",
+    label: "FATHER_HUSBUND_NAME"
+  }, {
+    key: "relationship",
+    label: "RELATIONSHIP"
+  }, {
+    key: "informantName",
+    label: "INFORMANT_NAME"
+  }, {
+    key: "informantRelation",
+    label: "INFORMANT_RELATION"
+  }, {
+    key: "informantIs",
+    label: "INFORMANT_IS"
+  }, {
+    key: "contactPerson",
+    label: "CONTACT_PERSON"
+  }, {
+    key: "relation",
+    label: "RELATION"
+  }, {
+    key: "entityName",
+    label: "ENTITY_NAME"
+  }, {
+    key: "designation",
+    label: "DESIGNATION"
+  }, {
+    key: "department",
+    label: "DEPARTMENT"
+  }, {
+    key: "employeeId",
+    label: "EMPLOYEE_ID"
+  }, {
+    key: "ownerMobile",
+    label: "OWNER_MOBILE"
+  }, {
+    key: "ownerVerificationDone",
+    label: "OWNER_VERIFICATION_DONE",
     isBool: true
   }, {
-    label: "EKYC_METER_NO",
-    key: "meterNumber"
+    key: "consentGiven",
+    label: "CONSENT_GIVEN",
+    isBool: true
+  }, {
+    key: "proofOfIdentityType",
+    label: "PROOF_OF_IDENTITY_TYPE"
+  }, {
+    key: "documentNumber",
+    label: "DOCUMENT_NUMBER"
   }, {
-    label: "EKYC_METER_MAKE",
-    key: "meterMake"
+    key: "noOfPerson",
+    label: "NUMBER_OF_PERSON"
   }, {
-    label: "EKYC_METER_LOCATION_ADDRESS",
-    key: "meterLocationAddress"
+    key: "latitude",
+    label: "LATITUDE"
   }, {
-    label: "EKYC_METER_LATITUDE",
-    key: "meterLatitude"
+    key: "longitude",
+    label: "LONGITUDE"
+  }, {
+    key: "gpsValid",
+    label: "GPS_VALID",
+    isBool: true
   }, {
-    label: "EKYC_METER_LONGITUDE",
-    key: "meterLongitude"
+    key: "meterNumber",
+    label: "METER_NUMBER"
+  }, {
+    key: "meterMake",
+    label: "METER_MAKE"
+  }, {
+    key: "meterStatus",
+    label: "METER_STATUS"
+  }, {
+    key: "meterCondition",
+    label: "METER_CONDITION"
+  }, {
+    key: "meterLocation",
+    label: "METER_LOCATION"
+  }, {
+    key: "meterLocationAddress",
+    label: "METER_LOCATION_ADDRESS"
   }, {
-    label: "EKYC_WORKING_STATUS",
     key: "workingStatus",
+    label: "WORKING_STATUS"
+  }, {
+    key: "sewerConnection",
+    label: "SEWER_CONNECTION",
+    isBool: true
+  }, {
+    key: "septicTank",
+    label: "SEPTIC_TANK",
     isBool: true
   }, {
-    label: "EKYC_LAST_BILL_RAISED",
     key: "lastBillRaised",
+    label: "LAST_BILL_RAISED",
     isBool: true
   }, {
-    label: "EKYC_SYSTEM_METER_ID",
-    key: "systemMeterId"
+    key: "lastBillReceivedDate",
+    label: "LAST_BILL_RECEIVED_DATE"
+  }, {
+    key: "accessToMeter",
+    label: "ACCESS_TO_METER",
+    isBool: true
+  }, {
+    key: "systemMeterId",
+    label: "SYSTEM_METER_ID"
+  }, {
+    key: "lastBillNotRaisedReason",
+    label: "LAST_BILL_NOT_RAISED_REASON"
+  }, {
+    key: "waterConnectionYears",
+    label: "WATER_CONNECTION_YEARS"
+  }, {
+    key: "sewerConnectionYears",
+    label: "SEWER_CONNECTION_YEARS"
+  }, {
+    key: "pidNumber",
+    label: "PID_NUMBER"
+  }, {
+    key: "propertyType",
+    label: "PROPERTY_TYPE"
+  }, {
+    key: "subPropertyCategory",
+    label: "SUB_PROPERTY_CATEGORY"
+  }, {
+    key: "noOfFloor",
+    label: "NO_OF_FLOOR"
+  }, {
+    key: "noOfRooms",
+    label: "NO_OF_ROOMS"
+  }, {
+    key: "noOfBeds",
+    label: "NO_OF_BEDS"
+  }, {
+    key: "numberOfDwellingUnits",
+    label: "NUMBER_OF_DWELLING_UNITS"
+  }, {
+    key: "floorNo",
+    label: "FLOOR_NO"
+  }, {
+    key: "userType",
+    label: "USER_TYPE"
+  }, {
+    key: "tenantName",
+    label: "TENANT_NAME"
+  }, {
+    key: "tenantMobile",
+    label: "TENANT_MOBILE"
+  }, {
+    key: "verificationStatus",
+    label: "VERIFICATION_STATUS"
+  }, {
+    key: "houseBuiltDuration",
+    label: "HOUSE_BUILT_DURATION"
+  }, {
+    key: "surveyorId",
+    label: "SURVEYOR_ID"
+  }, {
+    key: "supervisorId",
+    label: "SUPERVISOR_ID"
+  }, {
+    key: "vendorId",
+    label: "VENDOR_ID"
+  }, {
+    key: "assignmentType",
+    label: "ASSIGNMENT_TYPE"
+  }, {
+    key: "assignmentValue",
+    label: "ASSIGNMENT_VALUE"
+  }, {
+    key: "assignedTime",
+    label: "ASSIGNED_TIME"
+  }, {
+    key: "isSelfAssigned",
+    label: "IS_SELF_ASSIGNED",
+    isBool: true
+  }, {
+    key: "modifiedBy",
+    label: "MODIFIED_BY"
+  }, {
+    key: "emailId",
+    label: "EMAIL_ID"
+  }, {
+    key: "dob",
+    label: "DOB"
+  }, {
+    key: "consumerType",
+    label: "CONSUMER_TYPE"
+  }, {
+    key: "createdTime",
+    label: "CREATED_TIME"
+  }, {
+    key: "lastModifiedTime",
+    label: "LAST_MODIFIED_TIME"
+  }, {
+    key: "meterLatitude",
+    label: "EKYC_METER_LATITUDE1"
+  }, {
+    key: "meterLongitude",
+    label: "EKYC_METER_LONGITUDE1"
   }];
   const handleDeclaration = () => setAgree(!agree);
   const handleReject = function () {
@@ -3776,11 +4188,24 @@ const Review = () => {
       return Promise.reject(e);
     }
   };
-  const handleViewDocument = fileStoreId => {
-    if (!fileStoreId) return;
-    const documentUrl = "https://dev-djberp.nitcon.in/filestore/v1/files/id?tenantId=dl.djb&fileStoreId=" + fileStoreId;
-    setPreviewUrl(documentUrl);
-    setShowPreview(true);
+  const handleViewDocument = function (fileStoreId) {
+    try {
+      if (!fileStoreId) return Promise.resolve();
+      const _temp4 = _catch(function () {
+        return Promise.resolve(Digit.UploadServices.FileFetchbyid(fileStoreId, tenantId)).then(function (response) {
+          if (response !== null && response !== void 0 && response.data) {
+            const blobUrl = URL.createObjectURL(response.data);
+            setPreviewUrl(blobUrl);
+            setShowPreview(true);
+          }
+        });
+      }, function (error) {
+        console.error("Error fetching document:", error);
+      });
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
   };
   const handleMenuSelect = option => {
     setShowOptions(false);
@@ -3791,65 +4216,15 @@ const Review = () => {
     }
   };
   if (isSearchLoading || isSubmitting) return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
-  const baseUrl = "/digit-ui/employee/ekyc";
   return /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
     className: "overflow-y-scroll"
   }, /*#__PURE__*/React__default.createElement(ReviewSection, {
-    title: t("EKYC_CONNECTION_DETAILS"),
-    fields: connectionFields,
-    newData: connectionData,
-    oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.connection,
-    t: t,
-    jumpTo: baseUrl + "/consumer-details?kno=" + activeKno,
-    state: _extends({}, flowState, {
-      kNumber: activeKno,
-      kno: activeKno,
-      reviewData: searchData,
-      edits
-    }),
-    hideEditButton: hideEditButton
-  }), /*#__PURE__*/React__default.createElement(ReviewSection, {
-    title: t("EKYC_ADDRESS_DETAILS"),
-    fields: addressFields,
-    newData: addressData,
-    oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.address,
-    t: t,
-    jumpTo: baseUrl + "/address-details?kno=" + activeKno,
-    state: _extends({}, flowState, {
-      kNumber: activeKno,
-      kno: activeKno,
-      reviewData: searchData,
-      edits
-    }),
-    hideEditButton: hideEditButton
-  }), /*#__PURE__*/React__default.createElement(ReviewSection, {
-    title: t("EKYC_PROPERTY_INFO"),
-    fields: propertyFields,
-    newData: propertyData,
-    oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.property,
-    t: t,
-    jumpTo: baseUrl + "/property-info?kno=" + activeKno,
-    state: _extends({}, flowState, {
-      kNumber: activeKno,
-      kno: activeKno,
-      reviewData: searchData,
-      edits
-    }),
-    hideEditButton: hideEditButton
-  }), /*#__PURE__*/React__default.createElement(ReviewSection, {
-    title: t("EKYC_METER_DETAILS"),
-    fields: meterFields,
-    newData: meterData,
-    oldData: oldDataRaw === null || oldDataRaw === void 0 ? void 0 : oldDataRaw.meter,
+    title: t("EKYC_ALL_DETAILS") || "All Details",
+    fields: headerMapping,
+    newData: flatNewData,
+    oldData: flatOldData,
     t: t,
-    jumpTo: baseUrl + "/meter-details?kno=" + activeKno,
-    state: _extends({}, flowState, {
-      kNumber: activeKno,
-      kno: activeKno,
-      reviewData: searchData,
-      edits
-    }),
-    hideEditButton: hideEditButton
+    hideEditButton: true
   }), /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginTop: "40px"
@@ -5638,6 +6013,7 @@ const SupervisorDetailsCard = () => {
 
 const AssignEkycModal = _ref => {
   let surveyor = _ref.surveyor,
+    isReassign = _ref.isReassign,
     closeModal = _ref.closeModal,
     refetchDashboard = _ref.refetchDashboard,
     propsTenantId = _ref.tenantId;
@@ -5731,9 +6107,7 @@ const AssignEkycModal = _ref => {
         assemblyOptions: Array.from(assemblies.values()).sort((a, b) => a.name.localeCompare(b.name)),
         wardOptions: Array.from(wards.values()).sort((a, b) => a.name.localeCompare(b.name))
       };
-    }, [boundaryData]),
-    assemblyOptions = _useMemo.assemblyOptions,
-    wardOptions = _useMemo.wardOptions;
+    }, [boundaryData]);
   const structuredLocalityData = React.useMemo(() => {
     let localities = [];
     const boundaries = Array.isArray(boundaryData) ? boundaryData : boundaryData ? [boundaryData] : [];
@@ -5767,7 +6141,7 @@ const AssignEkycModal = _ref => {
     return Array.from(pinSet).sort();
   }, [structuredLocalityData]);
   const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycApplicationList({
-      unassignedOnly: true,
+      unassignedOnly: !isReassign,
       fetchFilterOptions: true
     }, {
       tenantId: tenantId,
@@ -5797,7 +6171,7 @@ const AssignEkycModal = _ref => {
     setCurrentPage(0);
   }, [debouncedFilters, filters.kno]);
   const _Digit$Hooks$ekyc$use2 = Digit.Hooks.ekyc.useEkycApplicationList(_extends({
-      unassignedOnly: true
+      unassignedOnly: !isReassign
     }, filters.kno && {
       kno: filters.kno
     }, debouncedFilters.ekycStatus && {
@@ -5894,6 +6268,56 @@ const AssignEkycModal = _ref => {
       handleAssignmentError(errMsg, variables);
     }
   });
+  const reassignMutation = Digit.Hooks.ekyc.useEkycAssignmentReassign({
+    onSuccess: (response, variables) => {
+      if (response !== null && response !== void 0 && response.error) {
+        var _response$data2;
+        const errMsg = (response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.message) || "";
+        handleAssignmentError(errMsg, variables);
+        return;
+      }
+      if (response !== null && response !== void 0 && response.skipped && response.skipped.length > 0) {
+        var _response$skipped$2;
+        const reason = ((_response$skipped$2 = response.skipped[0]) === null || _response$skipped$2 === void 0 ? void 0 : _response$skipped$2.reason) || "";
+        handleAssignmentError(reason, variables);
+        return;
+      }
+      setToastData({
+        error: false,
+        label: t("EKYC_REASSIGNMENT_SUCCESSFUL") || "Reassignment successful"
+      });
+      setShowToast(true);
+      setTimeout(function () {
+        try {
+          function _temp8() {
+            function _temp6() {
+              closeModal();
+            }
+            const _temp5 = function () {
+              if (refetchApplicationList) {
+                return Promise.resolve(refetchApplicationList()).then(function () {});
+              }
+            }();
+            return _temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5);
+          }
+          const _temp7 = function () {
+            if (refetchDashboard) {
+              return Promise.resolve(refetchDashboard()).then(function () {});
+            }
+          }();
+          return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7));
+        } catch (e) {
+          return Promise.reject(e);
+        }
+      }, 1000);
+    },
+    onError: (error, variables) => {
+      var _error$data2, _error$response2, _error$response2$data;
+      const errMsg = (error === null || error === void 0 ? void 0 : (_error$data2 = error.data) === null || _error$data2 === void 0 ? void 0 : _error$data2.message) || (error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.message) || "";
+      handleAssignmentError(errMsg, variables);
+    }
+  });
+  const activeMutation = isReassign ? reassignMutation : assignmentMutation;
   const tableData = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.consumerList) || [];
   const getAssignmentPayload = () => {
     if (isBulkSelection) {
@@ -5933,16 +6357,22 @@ const AssignEkycModal = _ref => {
     };
   };
   const handleAssign = () => {
-    var _surveyor$owner;
     const _getAssignmentPayload = getAssignmentPayload(),
       assignmentType = _getAssignmentPayload.assignmentType,
       assignmentValue = _getAssignmentPayload.assignmentValue;
-    assignmentMutation.mutate({
+    const payload = {
       tenantId: tenantId,
-      surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner = surveyor.owner) === null || _surveyor$owner === void 0 ? void 0 : _surveyor$owner.uuid,
       assignmentType,
       assignmentValue
-    });
+    };
+    if (isReassign) {
+      var _surveyor$owner;
+      payload.newSurveyorId = surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner = surveyor.owner) === null || _surveyor$owner === void 0 ? void 0 : _surveyor$owner.uuid;
+    } else {
+      var _surveyor$owner2;
+      payload.surveyorId = surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner2 = surveyor.owner) === null || _surveyor$owner2 === void 0 ? void 0 : _surveyor$owner2.uuid;
+    }
+    activeMutation.mutate(payload);
   };
   const handleSelectAll = () => {
     setIsBulkSelection(true);
@@ -6008,13 +6438,13 @@ const AssignEkycModal = _ref => {
     setSelectedKnos(prev => prev.includes(kno) ? prev.filter(item => item !== kno) : [...prev, kno]);
   };
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
-    headerBarMain: "Assign KNOs to " + (surveyor === null || surveyor === void 0 ? void 0 : surveyor.name),
+    headerBarMain: isReassign ? "Reassign KNOs to " + (surveyor === null || surveyor === void 0 ? void 0 : surveyor.name) : "Assign KNOs to " + (surveyor === null || surveyor === void 0 ? void 0 : surveyor.name),
     headerBarEnd: /*#__PURE__*/React__default.createElement(digitUiReactComponents.Close, {
       onClick: closeModal
     }),
     actionCancelLabel: "Cancel",
     actionCancelOnSubmit: closeModal,
-    actionSaveLabel: t("EKYC_ASSIGN_KNOS") || "Assign KNOs",
+    actionSaveLabel: isReassign ? t("EKYC_REASSIGN_KNOS") || "Reassign KNOs" : t("EKYC_ASSIGN_KNOS") || "Assign KNOs",
     actionSaveOnSubmit: handleAssign,
     isDisabled: !(selectedKnos !== null && selectedKnos !== void 0 && selectedKnos.length)
   }, /*#__PURE__*/React__default.createElement("div", {
@@ -6036,30 +6466,6 @@ const AssignEkycModal = _ref => {
     key: pin,
     value: pin
   }, pin))), /*#__PURE__*/React__default.createElement("select", {
-    className: "form-control",
-    value: filters.ward,
-    onChange: e => handleFilterChange("ward", e.target.value)
-  }, /*#__PURE__*/React__default.createElement("option", {
-    value: ""
-  }, "Select Ward"), wardOptions.filter(ward => {
-    const stripped = ward.name.replace(/[0-9]/g, "").replace(/^[-\s]+|[-\s]+$/g, "");
-    return stripped.trim().length > 0;
-  }).map(ward => {
-    const displayName = ward.name.replace(/[0-9]/g, "").replace(/^[-\s]+|[-\s]+$/g, "");
-    return /*#__PURE__*/React__default.createElement("option", {
-      key: ward.code,
-      value: ward.name
-    }, displayName);
-  })), /*#__PURE__*/React__default.createElement("select", {
-    className: "form-control",
-    value: filters.assembly,
-    onChange: e => handleFilterChange("assembly", e.target.value)
-  }, /*#__PURE__*/React__default.createElement("option", {
-    value: ""
-  }, "Select Assembly"), assemblyOptions.map(assembly => /*#__PURE__*/React__default.createElement("option", {
-    key: assembly.code,
-    value: assembly.name
-  }, assembly.name))), /*#__PURE__*/React__default.createElement("select", {
     className: "form-control",
     value: filters.mrkey,
     onChange: e => handleFilterChange("mrkey", e.target.value)
@@ -6113,7 +6519,7 @@ const AssignEkycModal = _ref => {
 const SurveyorDetailsDashboard = () => {
   var _Digit$SessionStorage, _Digit$SessionStorage2, _surveyorSearchById$s, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _surveyor$owner4, _fullName$charAt, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _surveyor$owner8, _surveyor$owner9, _surveyor$owner0, _dashboardData$dashbo5, _dashboardData$dashbo6;
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const _useState = React.useState(false),
+  const _useState = React.useState(null),
     showModal = _useState[0],
     setShowModal = _useState[1];
   const _useState2 = React.useState(false),
@@ -6439,10 +6845,12 @@ const SurveyorDetailsDashboard = () => {
   };
   const options = [{
     action: "Assign"
+  }, {
+    action: "EKYC_REASSIGN"
   }];
   const handleMenuSelect = option => {
     setShowOptions(false);
-    setShowModal(true);
+    setShowModal(option.action);
   };
   const handleDownloadEkycData = function () {
     try {
@@ -6523,7 +6931,7 @@ const SurveyorDetailsDashboard = () => {
   };
   const closeModal = function () {
     try {
-      setShowModal(false);
+      setShowModal(null);
       return Promise.resolve();
     } catch (e) {
       return Promise.reject(e);
@@ -6750,6 +7158,7 @@ const SurveyorDetailsDashboard = () => {
     }
   })), showModal && /*#__PURE__*/React__default.createElement(AssignEkycModal, {
     surveyor: surveyor,
+    isReassign: showModal === "EKYC_REASSIGN",
     closeModal: closeModal,
     refetchDashboard: refetchDashboard
   }));