@djb25/digit-ui-module-ekyc 1.0.53 → 1.0.55

package/dist/index.js

@@ -2088,57 +2088,174 @@ const VendorDetailsCard = () => {
   const _useState3 = React.useState(false),
     ekycDownloadLoading = _useState3[0],
     setEkycDownloadLoading = _useState3[1];
-  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 || consumerList.length === 0) {
               alert(t("NO_EKYC_DATA_FOUND") || "No eKYC data found to download.");
               return;
             }
-            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "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",
-              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 "";
+              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", "email", "pincode", "mrkey", "dob", "createdTime", "lastModifiedTime", "meterLatitude", "meterLongitude"];
+            const translatedFields = ["meterMake", "meterLocation"];
             const excelData = consumerList.map(item => {
               const cleanObj = {};
               const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
               if (fullName) {
-                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = fullName;
+                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(fullName);
               }
               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;
-                cleanObj[friendlyHeader] = val;
+                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;
+                }
               });
               return cleanObj;
             });
@@ -2158,6 +2275,34 @@ const VendorDetailsCard = () => {
       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 paginatedSupervisors = React.useMemo(() => {
     const start = currentPage * pageSize;
     const end = start + pageSize;
@@ -2272,19 +2417,35 @@ const VendorDetailsCard = () => {
       console.error("Failed to generate report:", err);
     } finally {
       setReportLoading(false);
+    }
+  };
+  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 handlePresetDownload = filter => {
-    handleDownload();
-  };
-  const handleCustomDownload = () => {
-    if (!customDate.from || !customDate.to) {
-      alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
-      return;
+  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);
     }
-    handleDownload();
   };
   const StatCard = _ref3 => {
     let title = _ref3.title,
@@ -2332,65 +2493,12 @@ const VendorDetailsCard = () => {
   }, vendorName), /*#__PURE__*/React__default.createElement("div", {
     className: "designation"
   }, t("VENDOR_AGENCY") || "Agency / Vendor"))), /*#__PURE__*/React__default.createElement("div", {
-    className: "report-download",
-    ref: reportMenuRef
+    className: "report-download"
   }, /*#__PURE__*/React__default.createElement("button", {
     className: "download-btn",
     disabled: reportLoading,
-    onClick: () => {
-      setShowReportMenu(p => !p);
-      setShowCustomPicker(false);
-    }
-  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"), 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(_ref4 => {
-    let label = _ref4.label,
-      key = _ref4.key;
-    return /*#__PURE__*/React__default.createElement("div", {
-      key: key,
-      className: "menu-item",
-      onClick: () => handlePresetDownload()
-    }, 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-field"
-  }, /*#__PURE__*/React__default.createElement("label", {
-    className: "date-label"
-  }, t("FROM_DATE") || "From"), /*#__PURE__*/React__default.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.from,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      from: e.target.value
-    }))
-  })), /*#__PURE__*/React__default.createElement("div", {
-    className: "date-field"
-  }, /*#__PURE__*/React__default.createElement("label", {
-    className: "date-label"
-  }, t("TO_DATE") || "To"), /*#__PURE__*/React__default.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.to,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      to: e.target.value
-    }))
-  })), /*#__PURE__*/React__default.createElement("button", {
-    className: "download-action-btn",
-    onClick: handleCustomDownload
-  }, t("DOWNLOAD") || "Download"))))), /*#__PURE__*/React__default.createElement("div", {
+    onClick: handleDownload
+  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"))), /*#__PURE__*/React__default.createElement("div", {
     className: "stats-wrapper"
   }, cards.map((card, idx) => /*#__PURE__*/React__default.createElement(StatCard, {
     key: idx,
@@ -2441,10 +2549,16 @@ const VendorDetailsCard = () => {
     className: "details-right"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "download-card"
-  }, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React__default.createElement("button", {
+  }, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__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",
@@ -2463,20 +2577,76 @@ const VendorDetailsCard = () => {
     y1: "15",
     x2: "12",
     y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"))))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
-    className: "dashboard-card"
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
-    t: t,
-    tableTitle: t("CONNECTED_SUPERVISORS") || "Connected Supervisors",
-    tableClass: "ekycTable",
-    data: paginatedSupervisors,
-    columns: supervisorColumns,
-    isLoading: isPageLoading,
-    totalRecords: vendorSupervisors.length,
-    currentPage: currentPage,
-    pageSizeLimit: pageSize,
-    isPaginationRequired: true,
-    onNextPage: () => {
+  })), 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(_ref4 => {
+    let label = _ref4.label,
+      key = _ref4.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(digitUiReactComponents.Card, {
+    className: "dashboard-card"
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
+    t: t,
+    tableTitle: t("CONNECTED_SUPERVISORS") || "Connected Supervisors",
+    tableClass: "ekycTable",
+    data: paginatedSupervisors,
+    columns: supervisorColumns,
+    isLoading: isPageLoading,
+    totalRecords: vendorSupervisors.length,
+    currentPage: currentPage,
+    pageSizeLimit: pageSize,
+    isPaginationRequired: true,
+    onNextPage: () => {
       if (currentPage < Math.ceil(vendorSupervisors.length / pageSize) - 1) {
         setCurrentPage(prev => prev + 1);
       }
@@ -3150,25 +3320,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
     }),
@@ -3230,65 +3385,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,
@@ -3593,7 +3739,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: {
@@ -3606,7 +3753,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",
@@ -3705,6 +3852,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 || {};
@@ -3739,7 +3888,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,
@@ -3752,7 +3901,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,
@@ -3765,12 +3914,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),
@@ -3813,136 +3961,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
+  }, {
+    key: "consentGiven",
+    label: "CONSENT_GIVEN",
+    isBool: true
+  }, {
+    key: "proofOfIdentityType",
+    label: "PROOF_OF_IDENTITY_TYPE"
+  }, {
+    key: "documentNumber",
+    label: "DOCUMENT_NUMBER"
+  }, {
+    key: "noOfPerson",
+    label: "NUMBER_OF_PERSON"
+  }, {
+    key: "latitude",
+    label: "LATITUDE"
+  }, {
+    key: "longitude",
+    label: "LONGITUDE"
+  }, {
+    key: "gpsValid",
+    label: "GPS_VALID",
     isBool: true
   }, {
-    label: "EKYC_METER_NO",
-    key: "meterNumber"
+    key: "meterNumber",
+    label: "METER_NUMBER"
+  }, {
+    key: "meterMake",
+    label: "METER_MAKE"
   }, {
-    label: "EKYC_METER_MAKE",
-    key: "meterMake"
+    key: "meterStatus",
+    label: "METER_STATUS"
   }, {
-    label: "EKYC_METER_LOCATION_ADDRESS",
-    key: "meterLocationAddress"
+    key: "meterCondition",
+    label: "METER_CONDITION"
   }, {
-    label: "EKYC_METER_LATITUDE",
-    key: "meterLatitude"
+    key: "meterLocation",
+    label: "METER_LOCATION"
   }, {
-    label: "EKYC_METER_LONGITUDE",
-    key: "meterLongitude"
+    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
+  }, {
+    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
   }, {
-    label: "EKYC_SYSTEM_METER_ID",
-    key: "systemMeterId"
+    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 () {
@@ -4051,65 +4386,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"
@@ -5572,21 +5857,37 @@ const SupervisorDetailsCard = () => {
       console.error("Failed to generate supervisor report:", err);
     } finally {
       setReportLoading(false);
+    }
+  };
+  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 handlePresetDownload = filter => {
-    handleDownload();
-  };
-  const handleCustomDownload = () => {
-    if (!customDate.from || !customDate.to) {
-      alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
-      return;
+  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);
     }
-    handleDownload();
   };
-  const handleDownloadEkycData = function () {
+  const handleDownloadEkycData = function (fromDate, toDate) {
     try {
       if (!surveyors || surveyors.length === 0) {
         alert(t("NO_SURVEYORS_ASSIGNED") || "No surveyors assigned to this supervisor.");
@@ -5595,69 +5896,175 @@ const SupervisorDetailsCard = () => {
       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 || "dl.djb",
             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"
-            };
-            const toTitleCase = str => {
-              if (!str) return "";
-              const cleanStr = String(str).includes(".") ? String(str).split(".").pop() : String(str);
-              return cleanStr.toLowerCase().replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
-            };
-            const titleCaseFields = ["ekycStatus", "zoneName", "gender", "relationship", "assembly", "ward", "consumerType"];
-            const excelData = consumerList.map(item => {
-              const cleanObj = {};
-              const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
-              if (fullName) {
-                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(fullName);
-              }
-              Object.keys(item).forEach(key => {
-                if (excludedKeys.includes(key)) return;
-                const val = item[key];
-                if (typeof val === "object" && val !== null) {
-                  return;
-                }
-                const friendlyHeader = headerMapping[key] || t(key.toUpperCase()) || key;
-                if (typeof val === "string" && titleCaseFields.includes(key)) {
-                  cleanObj[friendlyHeader] = toTitleCase(val);
-                } else {
-                  cleanObj[friendlyHeader] = val;
-                }
-              });
-              return cleanObj;
-            });
-            const cleanFileName = "eKYC_Data_Supervisor_" + fullName.replace(/[^a-zA-Z0-9]/g, "_");
-            Digit.Download.Excel(excelData, cleanFileName);
-          });
+              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 "";
+              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", "email", "pincode", "mrkey", "dob", "createdTime", "lastModifiedTime", "meterLatitude", "meterLongitude"];
+            const translatedFields = ["meterMake", "meterLocation"];
+            const excelData = consumerList.map(item => {
+              const cleanObj = {};
+              const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
+              if (fullName) {
+                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(fullName);
+              }
+              Object.keys(item).forEach(key => {
+                if (excludedKeys.includes(key)) return;
+                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" && translatedFields.includes(key)) {
+                  cleanObj[friendlyHeader] = t(val);
+                } else if (typeof val === "string" && !skipTitleCase.includes(key)) {
+                  cleanObj[friendlyHeader] = toTitleCase(val);
+                } else {
+                  cleanObj[friendlyHeader] = val;
+                }
+              });
+              return cleanObj;
+            });
+            const cleanFileName = "eKYC_Data_Supervisor_" + fullName.replace(/[^a-zA-Z0-9]/g, "_");
+            Digit.Download.Excel(excelData, cleanFileName);
+          });
         }, function (error) {
           console.error("Error downloading eKYC Excel:", error);
         });
@@ -5670,6 +6077,34 @@ const SupervisorDetailsCard = () => {
       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 StatCard = _ref3 => {
     let title = _ref3.title,
       value = _ref3.value,
@@ -5716,65 +6151,12 @@ const SupervisorDetailsCard = () => {
   }, fullName), /*#__PURE__*/React__default.createElement("div", {
     className: "designation"
   }, t("FIELD_SUPERVISOR") || "Field Supervisor"))), /*#__PURE__*/React__default.createElement("div", {
-    className: "report-download",
-    ref: reportMenuRef
+    className: "report-download"
   }, /*#__PURE__*/React__default.createElement("button", {
     className: "download-btn",
     disabled: reportLoading,
-    onClick: () => {
-      setShowReportMenu(p => !p);
-      setShowCustomPicker(false);
-    }
-  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"), 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(_ref4 => {
-    let label = _ref4.label,
-      key = _ref4.key;
-    return /*#__PURE__*/React__default.createElement("div", {
-      key: key,
-      className: "menu-item",
-      onClick: () => handlePresetDownload()
-    }, 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-field"
-  }, /*#__PURE__*/React__default.createElement("label", {
-    className: "date-label"
-  }, t("FROM_DATE") || "From"), /*#__PURE__*/React__default.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.from,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      from: e.target.value
-    }))
-  })), /*#__PURE__*/React__default.createElement("div", {
-    className: "date-field"
-  }, /*#__PURE__*/React__default.createElement("label", {
-    className: "date-label"
-  }, t("TO_DATE") || "To"), /*#__PURE__*/React__default.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.to,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      to: e.target.value
-    }))
-  })), /*#__PURE__*/React__default.createElement("button", {
-    className: "download-action-btn",
-    onClick: handleCustomDownload
-  }, t("DOWNLOAD") || "Download"))))), /*#__PURE__*/React__default.createElement("div", {
+    onClick: handleDownload
+  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"))), /*#__PURE__*/React__default.createElement("div", {
     className: "stats-wrapper"
   }, cards.map((card, idx) => /*#__PURE__*/React__default.createElement(StatCard, {
     key: idx,
@@ -5838,10 +6220,16 @@ const SupervisorDetailsCard = () => {
     className: "details-right"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "download-card"
-  }, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React__default.createElement("button", {
+  }, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__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",
@@ -5860,7 +6248,63 @@ const SupervisorDetailsCard = () => {
     y1: "15",
     x2: "12",
     y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"))))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
+  })), 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(_ref4 => {
+    let label = _ref4.label,
+      key = _ref4.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(digitUiReactComponents.Card, {
     className: "dashboard-card"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
     t: t,
@@ -6402,7 +6846,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;
+  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$owner7, _surveyor$owner8, _surveyor$owner9, _dashboardData$dashbo5, _dashboardData$dashbo6;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useState = React.useState(null),
     showModal = _useState[0],
@@ -6614,10 +7058,8 @@ const SurveyorDetailsDashboard = () => {
     }
     return null;
   };
-  const handlePresetDownload = function (filter) {
+  const handleDownload = function () {
     try {
-      const range = getDateRange(filter);
-      if (!range) return Promise.resolve();
       setReportLoading(true);
       const _temp = _finallyRethrows(function () {
         return _catch(function () {
@@ -6626,9 +7068,7 @@ const SurveyorDetailsDashboard = () => {
             tenantId: "dl.djb",
             offset: 0,
             limit: 1000,
-            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner5 = surveyor.owner) === null || _surveyor$owner5 === void 0 ? void 0 : _surveyor$owner5.uuid,
-            fromDate: range.from.getTime(),
-            toDate: range.to.getTime()
+            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner5 = surveyor.owner) === null || _surveyor$owner5 === void 0 ? void 0 : _surveyor$owner5.uuid
           })).then(function (response) {
             var _response$dashboardIn;
             const rows = (response === null || response === void 0 ? void 0 : (_response$dashboardIn = response.dashboardInfo) === null || _response$dashboardIn === void 0 ? void 0 : _response$dashboardIn.consumerList) || [];
@@ -6648,8 +7088,6 @@ const SurveyorDetailsDashboard = () => {
         });
       }, function (_wasThrown, _result) {
         setReportLoading(false);
-        setShowReportMenu(false);
-        setShowCustomPicker(false);
         if (_wasThrown) throw _result;
         return _result;
       });
@@ -6658,52 +7096,30 @@ const SurveyorDetailsDashboard = () => {
       return Promise.reject(e);
     }
   };
-  const handleCustomDownload = function () {
+  const handlePresetDownload = function (filter) {
     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);
-      setReportLoading(true);
-      const _temp2 = _finallyRethrows(function () {
-        return _catch(function () {
-          var _surveyor$owner6;
-          return Promise.resolve(Digit.EkycService.dashboard({}, {
-            tenantId: "dl.djb",
-            offset: 0,
-            limit: 1000,
-            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner6 = surveyor.owner) === null || _surveyor$owner6 === void 0 ? void 0 : _surveyor$owner6.uuid,
-            fromDate: from.getTime(),
-            toDate: to.getTime()
-          })).then(function (response) {
-            var _response$dashboardIn2;
-            const rows = (response === null || response === void 0 ? void 0 : (_response$dashboardIn2 = response.dashboardInfo) === null || _response$dashboardIn2 === void 0 ? void 0 : _response$dashboardIn2.consumerList) || [];
-            downloadSurveyorPDF({
-              rows: rows,
-              surveyorName: fullName,
-              vendorName,
-              supervisorName,
-              employeeId,
-              mobileNumber,
-              dashboardInfo: (response === null || response === void 0 ? void 0 : response.dashboardInfo) || {},
-              t
-            });
-          });
-        }, function (err) {
-          console.error("Failed to fetch custom dashboard data for report download:", err);
-        });
-      }, function (_wasThrown2, _result2) {
-        setReportLoading(false);
-        setShowReportMenu(false);
-        setShowCustomPicker(false);
-        if (_wasThrown2) throw _result2;
-        return _result2;
-      });
-      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+      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);
     }
@@ -6737,61 +7153,164 @@ const SurveyorDetailsDashboard = () => {
     setShowOptions(false);
     setShowModal(option.action);
   };
-  const handleDownloadEkycData = function () {
+  const handleDownloadEkycData = function (fromDate, toDate) {
     try {
       setEkycDownloadLoading(true);
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
-          var _surveyor$owner7;
-          return Promise.resolve(Digit.EkycService.application_list({
+          var _surveyor$owner6;
+          return Promise.resolve(Digit.EkycService.application_list(_extends({
             tenantId: tenantId || "dl.djb",
             offset: 0,
             limit: 10000,
-            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner7 = surveyor.owner) === null || _surveyor$owner7 === void 0 ? void 0 : _surveyor$owner7.uuid,
+            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner6 = surveyor.owner) === null || _surveyor$owner6 === void 0 ? void 0 : _surveyor$owner6.uuid,
             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 skipTitleCase = ["kno", "mobileNumber", "emailId", "email", "pincode", "mrkey", "dob", "createdTime", "lastModifiedTime", "meterLatitude", "meterLongitude"];
+            const translatedFields = ["meterMake", "meterLocation"];
             const excelData = consumerList.map(item => {
               const cleanObj = {};
               const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
               if (fullName) {
                 cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(fullName);
               }
-              const titleCaseFields = ["ekycStatus", "zoneName", "gender", "relationship", "assembly", "ward", "consumerType"];
               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" && titleCaseFields.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;
@@ -6805,10 +7324,10 @@ const SurveyorDetailsDashboard = () => {
         }, function (error) {
           console.error("Error downloading eKYC Excel:", error);
         });
-      }, function (_wasThrown3, _result3) {
+      }, function (_wasThrown2, _result2) {
         setEkycDownloadLoading(false);
-        if (_wasThrown3) throw _result3;
-        return _result3;
+        if (_wasThrown2) throw _result2;
+        return _result2;
       }));
     } catch (e) {
       return Promise.reject(e);
@@ -6837,65 +7356,12 @@ const SurveyorDetailsDashboard = () => {
   }, fullName), /*#__PURE__*/React__default.createElement("div", {
     className: "designation"
   }, (surveyor === null || surveyor === void 0 ? void 0 : surveyor.description) || t("FIELD_SURVEYOR")))), /*#__PURE__*/React__default.createElement("div", {
-    className: "report-download",
-    ref: reportMenuRef
+    className: "report-download"
   }, /*#__PURE__*/React__default.createElement("button", {
     className: "download-btn",
     disabled: reportLoading,
-    onClick: () => {
-      setShowReportMenu(p => !p);
-      setShowCustomPicker(false);
-    }
-  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"), 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(_ref5 => {
-    let label = _ref5.label,
-      key = _ref5.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-field"
-  }, /*#__PURE__*/React__default.createElement("label", {
-    className: "date-label"
-  }, t("FROM_DATE") || "From"), /*#__PURE__*/React__default.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.from,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      from: e.target.value
-    }))
-  })), /*#__PURE__*/React__default.createElement("div", {
-    className: "date-field"
-  }, /*#__PURE__*/React__default.createElement("label", {
-    className: "date-label"
-  }, t("TO_DATE") || "To"), /*#__PURE__*/React__default.createElement("input", {
-    type: "date",
-    className: "date-input",
-    value: customDate.to,
-    onChange: e => setCustomDate(d => _extends({}, d, {
-      to: e.target.value
-    }))
-  })), /*#__PURE__*/React__default.createElement("button", {
-    className: "download-action-btn",
-    onClick: handleCustomDownload
-  }, t("DOWNLOAD") || "Download"))))), /*#__PURE__*/React__default.createElement("div", {
+    onClick: handleDownload
+  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"))), /*#__PURE__*/React__default.createElement("div", {
     className: "stats-wrapper"
   }, /*#__PURE__*/React__default.createElement(StatCard, {
     title: t("TOTAL_ASSIGNED"),
@@ -6937,19 +7403,19 @@ const SurveyorDetailsDashboard = () => {
     className: "label"
   }, t("MOBILE")), /*#__PURE__*/React__default.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner8 = surveyor.owner) === null || _surveyor$owner8 === void 0 ? void 0 : _surveyor$owner8.mobileNumber) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.mobileNo) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner7 = surveyor.owner) === null || _surveyor$owner7 === void 0 ? void 0 : _surveyor$owner7.mobileNumber) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.mobileNo) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React__default.createElement("span", {
     className: "label"
   }, t("EMAIL")), /*#__PURE__*/React__default.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner9 = surveyor.owner) === null || _surveyor$owner9 === void 0 ? void 0 : _surveyor$owner9.emailId) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner8 = surveyor.owner) === null || _surveyor$owner8 === void 0 ? void 0 : _surveyor$owner8.emailId) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React__default.createElement("span", {
     className: "label"
   }, t("GENDER")), /*#__PURE__*/React__default.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner0 = surveyor.owner) === null || _surveyor$owner0 === void 0 ? void 0 : _surveyor$owner0.gender) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner9 = surveyor.owner) === null || _surveyor$owner9 === void 0 ? void 0 : _surveyor$owner9.gender) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React__default.createElement("span", {
     className: "label"
@@ -6971,10 +7437,16 @@ const SurveyorDetailsDashboard = () => {
     className: "details-right"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "download-card"
-  }, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React__default.createElement("button", {
+  }, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__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",
@@ -6993,7 +7465,63 @@ const SurveyorDetailsDashboard = () => {
     y1: "15",
     x2: "12",
     y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"))))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
+  })), 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(_ref5 => {
+    let label = _ref5.label,
+      key = _ref5.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(digitUiReactComponents.Card, {
     className: "dashboard-card"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
     t: t,