@djb25/digit-ui-module-ekyc 1.0.74 → 1.0.76

package/dist/index.modern.js

@@ -1,7 +1,7 @@
-import React, { useState, useRef, useEffect, useMemo, createContext, useContext, isValidElement, cloneElement, createElement, useCallback, useReducer, Fragment } from 'react';
+import React, { useState, useRef, useEffect, useMemo, Fragment, createContext, useContext, isValidElement, cloneElement, createElement, useCallback, useReducer } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, Link, useParams, useLocation, useRouteMatch, Switch, Route, Redirect } from 'react-router-dom';
-import { PersonIcon, EmployeeModuleCard, FaChartBar, MdDownloadIcon, Loader, InboxLinks, Card, Table, HomeIcon, TextInput, Header, SubmitBar, DetailsCard, FilterForm, FilterFormField, Dropdown, FaDatabase, FaFileAlt, Label, CustomTooltip, CardLabelError, SearchField, RadioButtons, InboxComposer, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, ActionBar, Menu, LinkButton, Toast, EditIcon, UploadFile, FormComposer, VerticalTimeline, Modal, Close, CollapsibleCardPage, DatePicker, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, CardHeader, CardText, CitizenHomeCard, DocumentIcon } from '@djb25/digit-ui-react-components';
+import { PersonIcon, EmployeeModuleCard, FaChartBar, MdDownloadIcon, Loader, InboxLinks, Card, Table, HomeIcon, TextInput, Header, SubmitBar, DetailsCard, FilterForm, FilterFormField, Dropdown, Modal, CloseSvg, DateRange, FaDatabase, FaFileAlt, Label, CustomTooltip, CardLabelError, SearchField, RadioButtons, InboxComposer, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, ActionBar, Menu, LinkButton, Toast, EditIcon, UploadFile, FormComposer, VerticalTimeline, Close, CollapsibleCardPage, DatePicker, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, CardHeader, CardText, CitizenHomeCard, DocumentIcon } from '@djb25/digit-ui-react-components';
 import * as Chartjs from 'chart.js/auto';
 import Chartjs__default, { Chart } from 'chart.js/auto';
 import { FaBuilding, FaUser, FaClock, FaChartLine, FaUsers, FaCheckCircle } from 'react-icons/fa';
@@ -101,39 +101,32 @@ const EKYCCard = () => {
   return /*#__PURE__*/React.createElement(EmployeeModuleCard, propsForModuleCard);
 };
 
-// A type of promise-like that resolves synchronously and supports only one observer
-
-const _iteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator"))) : "@@iterator";
-
-const _asyncIteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator"))) : "@@asyncIterator";
-
-// Asynchronously call a function and send errors to recovery continuation
+const _iteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator")) : "@@iterator";
+const _asyncIteratorSymbol = /*#__PURE__*/typeof Symbol !== "undefined" ? Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator")) : "@@asyncIterator";
 function _catch(body, recover) {
-	try {
-		var result = body();
-	} catch(e) {
-		return recover(e);
-	}
-	if (result && result.then) {
-		return result.then(void 0, recover);
-	}
-	return result;
+  try {
+    var result = body();
+  } catch (e) {
+    return recover(e);
+  }
+  if (result && result.then) {
+    return result.then(void 0, recover);
+  }
+  return result;
 }
-
-// Asynchronously await a promise and pass the result to a finally continuation
 function _finallyRethrows(body, finalizer) {
-	try {
-		var result = body();
-	} catch (e) {
-		return finalizer(true, e);
-	}
-	if (result && result.then) {
-		return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
-	}
-	return finalizer(false, result);
+  try {
+    var result = body();
+  } catch (e) {
+    return finalizer(true, e);
+  }
+  if (result && result.then) {
+    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
+  }
+  return finalizer(false, result);
 }
 
-const excludedKeys = ["status", "source", "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 excludedKeys = ["status", "source", "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", "firstName", "middleName", "lastName", "assembly", "ward", "pincode", "addressRaw", "mobileNo", "revisitCount", "consumerType", "occupantType", "knoCategory", "gender", "parentSpouse", "whatsappNo", "email", "landlineNo", "noOfPerson", "proofOfIdentityType", "documentNumber", "informantName", "informantRelation", "informantIsConsumer", "contactPerson", "relation", "entityName", "designation", "department", "employeeId", "ownerMobile", "ownerVerificationDone", "consentGiven", "flatHouseNumber", "streetName", "locality", "subLocality", "landmark", "latitude", "longitude", "gpsValid", "meterNumber", "meterMake", "meterStatus", "meterCondition", "meterLocation", "meterLocationAddress", "workingStatus", "sewerConnection", "septicTank", "lastBillRaised", "lastBillReceivedDate", "accessToMeter", "systemMeterId", "lastBillNotRaisedReason", "waterConnectionYears", "sewerConnectionYears", "pidNumber", "noOfFloor", "noOfRooms", "noOfBeds", "numberOfDwellingUnits", "floorNo", "userType", "tenantName", "tenantMobile", "houseBuiltDuration", "meterLatitude", "meterLongitude"];
 const createHeaderMapping = t => ({
   kno: t("KNO"),
   firstName: t("FIRST_NAME"),
@@ -178,15 +171,9 @@ const createHeaderMapping = t => ({
   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"),
@@ -1125,302 +1112,88 @@ function _extends() {
   }, _extends.apply(null, arguments);
 }
 
-const downloadSurveyorPDF = function (_ref) {
+const EkycFilterModal = _ref => {
   let {
-    rows,
-    surveyorName,
-    employeeId,
-    mobileNumber,
-    vendorName,
-    supervisorName,
-    dashboardInfo,
-    t
+    t,
+    onApply,
+    onClose,
+    customDate,
+    setCustomDate,
+    ekycStatus,
+    setEkycStatus
   } = _ref;
-  try {
-    const tenantId = Digit.ULBService.getCurrentTenantId();
-    const name = "Delhi Jal Board";
-    const email = "contact@delhijalboard.nic.in";
-    const phoneNumber = "+91-11-23538416";
-    const currentDate = new Date();
-    const formattedDate = currentDate.toLocaleDateString("en-IN", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric"
-    });
-    const formattedTime = currentDate.toLocaleTimeString("en-IN", {
-      hour: "2-digit",
-      minute: "2-digit",
-      second: "2-digit",
-      hour12: false
-    });
-    const downloadDateTime = `${formattedDate} ${formattedTime}`;
-    const isValDefined = val => val !== undefined && val !== null && val !== "";
-    const details = [{
-      title: t("SURVEYOR_DETAILS"),
-      asSectionHeader: true,
-      values: [{
-        title: t("SURVEYOR_NAME"),
-        value: surveyorName
-      }, {
-        title: t("MOBILE_NUMBER"),
-        value: mobileNumber
-      }, {
-        title: t("VENDOR_NAME"),
-        value: vendorName
-      }, {
-        title: t("SUPERVISOR_NAME"),
-        value: supervisorName
-      }].filter(item => isValDefined(item.value))
-    }, {
-      title: t("SUMMARY_STATISTICS"),
-      asSectionHeader: true,
-      values: [{
-        title: t("TOTAL_ASSIGNED"),
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.total) || 0
-      }, {
-        title: t("COMPLETED"),
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.completed) || 0
-      }, {
-        title: t("PENDING"),
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.pending) || 0
-      }, {
-        title: t("SUBMITTED"),
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.submittedCount) || 0
-      }].filter(item => isValDefined(item.value))
-    }];
-    if (window.Digit && window.Digit.Utils && window.Digit.Utils.pdf && window.Digit.Utils.pdf.generateSurveyorReport) {
-      window.Digit.Utils.pdf.generateSurveyorReport({
-        tenantId,
-        logo: null,
-        name,
-        email,
-        phoneNumber,
-        heading: t("EKYC_SURVEYOR_REPORT"),
-        details,
-        applicationNumber: employeeId,
-        rows,
-        t,
-        hideApplicationNumber: true,
-        downloadTime: downloadDateTime
-      });
-    } else {
-      console.error("Digit.Utils.pdf.generateSurveyorReport is not available");
-    }
-    return Promise.resolve();
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-const downloadSupervisorPDF = function (_ref2) {
-  let {
-    rows,
-    supervisorName,
-    mobileNumber,
-    vendorName,
-    dashboardInfo,
-    t
-  } = _ref2;
-  try {
-    const tenantId = Digit.ULBService.getCurrentTenantId();
-    const name = "Delhi Jal Board";
-    const email = "contact@delhijalboard.nic.in";
-    const phoneNumber = "+91-11-23538416";
-    const currentDate = new Date();
-    const formattedDate = currentDate.toLocaleDateString("en-IN", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric"
-    });
-    const formattedTime = currentDate.toLocaleTimeString("en-IN", {
-      hour: "2-digit",
-      minute: "2-digit",
-      second: "2-digit",
-      hour12: false
-    });
-    const downloadDateTime = `${formattedDate} ${formattedTime}`;
-    const isValDefined = val => val !== undefined && val !== null && val !== "";
-    const details = [{
-      title: t("SUPERVISOR_DETAILS") || "Supervisor Details",
-      asSectionHeader: true,
-      values: [{
-        title: t("SUPERVISOR_NAME") || "Supervisor Name",
-        value: supervisorName
-      }, {
-        title: t("MOBILE_NUMBER") || "Mobile Number",
-        value: mobileNumber
-      }, {
-        title: t("VENDOR_NAME") || "Vendor Name",
-        value: vendorName
-      }].filter(item => isValDefined(item.value))
-    }, {
-      title: t("SUMMARY_STATISTICS") || "Summary Statistics",
-      asSectionHeader: true,
-      values: [{
-        title: t("TOTAL_ASSIGNED") || "Total Assigned",
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.total) || 0
-      }, {
-        title: t("COMPLETED") || "Completed",
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.completed) || 0
-      }, {
-        title: t("PENDING") || "Pending",
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.pending) || 0
-      }, {
-        title: t("SUBMITTED") || "Submitted",
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.submittedCount) || 0
-      }].filter(item => isValDefined(item.value))
-    }];
-    const mappedRows = rows.map(row => {
-      var _row$owner, _row$owner2;
-      return {
-        kno: row.name || ((_row$owner = row.owner) === null || _row$owner === void 0 ? void 0 : _row$owner.name) || "N/A",
-        firstName: ((_row$owner2 = row.owner) === null || _row$owner2 === void 0 ? void 0 : _row$owner2.mobileNumber) || row.mobileNo || "N/A",
-        lastName: "",
-        mobileNo: row.status || "N/A",
-        zoneName: String(row.total || 0),
-        ekycStatus: `${row.completed || 0} / ${row.pending || 0}`,
-        progress: row.progress || "0%",
-        submittedAt: null
-      };
-    });
-    const customT = key => {
-      if (key === "KNO") return t("SURVEYOR_NAME") || "Surveyor Name";
-      if (key === "CONSUMER") return t("MOBILE_NUMBER") || "Mobile Number";
-      if (key === "MOBILE") return t("STATUS") || "Status";
-      if (key === "ZONE") return t("TOTAL_EKYC_APPLICATIONS") || "Total eKYC Applications";
-      if (key === "EKYC_STATUS") return t("COMPLETED_PENDING") || "Completed / Pending";
-      if (key === "SUBMITTED_DATE") return t("OVERALL_PROGRESS") || "Overall Progress";
-      if (key === "CONSUMER_LIST") return t("CONNECTED_SURVEYORS") || "Connected Surveyors";
-      return t(key);
-    };
-    try {
-      if (window.Digit && window.Digit.Utils && window.Digit.Utils.pdf && window.Digit.Utils.pdf.generateSurveyorReport) {
-        window.Digit.Utils.pdf.generateSurveyorReport({
-          tenantId,
-          logo: null,
-          name,
-          email,
-          phoneNumber,
-          heading: t("EKYC_SUPERVISOR_REPORT") || "eKYC Supervisor Report",
-          details,
-          applicationNumber: mobileNumber,
-          rows: mappedRows,
-          t: customT,
-          hideApplicationNumber: true,
-          downloadTime: downloadDateTime
-        });
-      } else {
-        console.error("Digit.Utils.pdf.generateSurveyorReport is not available");
-      }
-    } catch {}
-    return Promise.resolve();
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-const downloadVendorPDF = function (_ref3) {
-  let {
-    rows,
-    vendorName,
-    mobileNumber,
-    email,
-    dashboardInfo,
-    t
-  } = _ref3;
-  try {
-    const tenantId = Digit.ULBService.getCurrentTenantId();
-    const name = "Delhi Jal Board";
-    const emailContact = "contact@delhijalboard.nic.in";
-    const phoneNumber = "+91-11-23538416";
-    const currentDate = new Date();
-    const formattedDate = currentDate.toLocaleDateString("en-IN", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric"
-    });
-    const formattedTime = currentDate.toLocaleTimeString("en-IN", {
-      hour: "2-digit",
-      minute: "2-digit",
-      second: "2-digit",
-      hour12: false
-    });
-    const downloadDateTime = `${formattedDate} ${formattedTime}`;
-    const isValDefined = val => val !== undefined && val !== null && val !== "";
-    const details = [{
-      title: t("VENDOR_DETAILS") || "Vendor Details",
-      asSectionHeader: true,
-      values: [{
-        title: t("VENDOR_NAME") || "Vendor Name",
-        value: vendorName
-      }, {
-        title: t("MOBILE_NUMBER") || "Mobile Number",
-        value: mobileNumber
-      }, {
-        title: t("EMAIL") || "Email",
-        value: email
-      }].filter(item => isValDefined(item.value))
-    }, {
-      title: t("SUMMARY_STATISTICS") || "Summary Statistics",
-      asSectionHeader: true,
-      values: [{
-        title: t("TOTAL_ASSIGNED") || "Total Assigned",
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.total) || 0
-      }, {
-        title: t("TOTAL_EKYC_APPLICATIONS") || "Completed",
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.completed) || 0
-      }, {
-        title: t("PENDING") || "Pending",
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.pending) || 0
-      }, {
-        title: t("SUBMITTED") || "Submitted",
-        value: (dashboardInfo === null || dashboardInfo === void 0 ? void 0 : dashboardInfo.submittedCount) || 0
-      }].filter(item => isValDefined(item.value))
-    }];
-    const mappedRows = rows.map(row => ({
-      kno: row.name || "N/A",
-      firstName: row.mobileNo || "N/A",
-      lastName: "",
-      mobileNo: row.status || "N/A",
-      zoneName: String(row.total || 0),
-      ekycStatus: `${row.completed || 0} / ${row.pending || 0}`,
-      progress: row.progress || "0%"
-    }));
-    const customT = key => {
-      if (key === "KNO") return t("SUPERVISOR_NAME") || "Supervisor Name";
-      if (key === "CONSUMER") return t("MOBILE_NUMBER") || "Mobile Number";
-      if (key === "MOBILE") return t("STATUS") || "Status";
-      if (key === "ZONE") return t("TOTAL_EKYC_APPLICATIONS") || "Total eKYC Applications";
-      if (key === "SUBMITTED_DATE") return t("OVERALL_PROGRESS") || "Overall Progress";
-      if (key === "CONSUMER_LIST") return t("CONNECTED_SUPERVISORS") || "Connected Supervisors";
-      return t(key);
-    };
-    try {
-      if (window.Digit && window.Digit.Utils && window.Digit.Utils.pdf && window.Digit.Utils.pdf.generateSurveyorReport) {
-        window.Digit.Utils.pdf.generateSurveyorReport({
-          tenantId,
-          logo: null,
-          name,
-          email: emailContact,
-          phoneNumber,
-          heading: t("EKYC_VENDOR_REPORT") || "eKYC Vendor Report",
-          details,
-          applicationNumber: mobileNumber,
-          rows: mappedRows,
-          t: customT,
-          hideApplicationNumber: true,
-          downloadTime: downloadDateTime
-        });
-      } else {
-        console.error("Digit.Utils.pdf.generateSurveyorReport is not available");
-      }
-    } catch {}
-    return Promise.resolve();
-  } catch (e) {
-    return Promise.reject(e);
-  }
+  const [isDatePickerOpen, setIsDatePickerOpen] = useState(false);
+  const ekycStatusOptions = [{
+    label: "All",
+    value: "ALL"
+  }, {
+    label: "Submitted",
+    value: "SUBMITTED"
+  }, {
+    label: "In Progress",
+    value: "IN_PROGRESS"
+  }, {
+    label: "Revisit",
+    value: "REVISIT"
+  }];
+  return /*#__PURE__*/React.createElement("div", {
+    className: `ekyc-report-filter ${isDatePickerOpen ? "ekyc-report-filter--date-open" : ""}`
+  }, /*#__PURE__*/React.createElement(Modal, {
+    headerBarMain: "Download eKYC Report",
+    headerBarEnd: /*#__PURE__*/React.createElement("button", {
+      type: "button",
+      onClick: onClose,
+      "aria-label": "Close",
+      className: "ekyc-filter-modal-close"
+    }, /*#__PURE__*/React.createElement(CloseSvg, {
+      height: "24",
+      width: "24"
+    })),
+    actionSaveLabel: t("DOWNLOAD_REPORT"),
+    actionSaveOnSubmit: onApply,
+    actionCancelLabel: "Cancel",
+    actionCancelOnSubmit: onClose,
+    width: "fitContent"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "ekyc-filter-modal"
+  }, /*#__PURE__*/React.createElement("section", {
+    className: "ekyc-filter-modal-section"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "ekyc-filter-modal-section-header"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "ekyc-filter-modal-label"
+  }, "eKYC Status"), /*#__PURE__*/React.createElement("span", {
+    className: "ekyc-filter-modal-hint"
+  }, "Select one")), /*#__PURE__*/React.createElement("div", {
+    className: "ekyc-filter-modal-options"
+  }, ekycStatusOptions.map(option => {
+    const selected = ekycStatus === option.value;
+    return /*#__PURE__*/React.createElement("button", {
+      key: option.value,
+      type: "button",
+      onClick: () => setEkycStatus(option.value),
+      className: selected ? "ekyc-filter-modal-option ekyc-filter-modal-option-selected" : "ekyc-filter-modal-option",
+      "aria-pressed": selected
+    }, option.label);
+  }))), /*#__PURE__*/React.createElement("div", {
+    className: "ekyc-filter-modal-divider"
+  }), /*#__PURE__*/React.createElement("section", {
+    className: "ekyc-filter-modal-section"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "ekyc-filter-modal-label"
+  }, "Date Range"), /*#__PURE__*/React.createElement(DateRange, {
+    values: customDate,
+    t: t,
+    hideLabel: true,
+    onFilterChange: data => {
+      setCustomDate(data.range);
+    },
+    onOpenChange: setIsDatePickerOpen
+  })))));
 };
 
 const VendorDetailsCard = () => {
-  var _vendor$owner, _vendor$owner2, _vendorName$charAt, _progressData$supervi;
+  var _Digit$SessionStorage, _vendor$owner, _vendor$owner2, _vendor$owner3, _vendor$owner4, _progressData$supervi;
   const {
     t
   } = useTranslation();
@@ -1429,6 +1202,10 @@ const VendorDetailsCard = () => {
   const {
     vendorId
   } = useParams();
+  const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
+  const targetVendorId = vendorId || (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.uuid);
+  const [showFilterModal, setShowFilterModal] = useState(false);
+  const [ekycStatus, setEkycStatus] = useState("ALL");
   const {
     data: {
       vendor: [vendor] = []
@@ -1438,26 +1215,27 @@ const VendorDetailsCard = () => {
     tenantId,
     filters: {
       status: "ACTIVE",
-      ids: vendorId
+      ids: targetVendorId
     },
     config: {
       enabled: !!tenantId,
       staleTime: 300000
     }
   });
-  const targetVendorId = vendorId || (vendor === null || vendor === void 0 ? void 0 : vendor.id) || (vendor === null || vendor === void 0 ? void 0 : vendor.vendorId);
   const {
     isLoading: isProgressLoading,
     data: progressData
-  } = Digit.Hooks.ekyc.useEkycAssignmentProgress(targetVendorId ? {
+  } = Digit.Hooks.ekyc.useEkycAssignmentProgress({
     vendorId: targetVendorId
-  } : {}, {
+  }, {
     enabled: !!tenantId,
     keepPreviousData: true
   });
   const vendorName = (vendor === null || vendor === void 0 ? void 0 : vendor.name) || "N/A";
   const mobileNumber = (vendor === null || vendor === void 0 ? void 0 : vendor.mobileNumber) || (vendor === null || vendor === void 0 ? void 0 : (_vendor$owner = vendor.owner) === null || _vendor$owner === void 0 ? void 0 : _vendor$owner.mobileNumber) || "N/A";
   const email = (vendor === null || vendor === void 0 ? void 0 : (_vendor$owner2 = vendor.owner) === null || _vendor$owner2 === void 0 ? void 0 : _vendor$owner2.emailId) || "N/A";
+  const gender = (vendor === null || vendor === void 0 ? void 0 : (_vendor$owner3 = vendor.owner) === null || _vendor$owner3 === void 0 ? void 0 : _vendor$owner3.gender) || "N/A";
+  const ownerName = (vendor === null || vendor === void 0 ? void 0 : (_vendor$owner4 = vendor.owner) === null || _vendor$owner4 === void 0 ? void 0 : _vendor$owner4.name) || "N/A";
   const zoneIds = useMemo(() => {
     var _vendor$zoneIds;
     return vendor !== null && vendor !== void 0 && (_vendor$zoneIds = vendor.zoneIds) !== null && _vendor$zoneIds !== void 0 && _vendor$zoneIds.length ? vendor.zoneIds.filter(Boolean).map(zone => String(zone).trim().toUpperCase()) : [];
@@ -1504,6 +1282,7 @@ const VendorDetailsCard = () => {
   const [ekycDownloadLoading, setEkycDownloadLoading] = useState(false);
   const handleDownloadEkycData = function (fromDate, toDate) {
     try {
+      console.log(ekycStatus, fromDate, toDate);
       setEkycDownloadLoading(true);
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
@@ -1512,6 +1291,7 @@ const VendorDetailsCard = () => {
             offset: 0,
             limit: 10000,
             vendorId: targetVendorId,
+            ekycStatus: ekycStatus,
             reportDownload: true,
             ...(fromDate && {
               fromDate
@@ -1525,6 +1305,14 @@ const VendorDetailsCard = () => {
               alert(t("NO_EKYC_DATA_FOUND") || "No eKYC data found to download.");
               return;
             }
+            consumerList.forEach(item => {
+              if (item.assignedTime) {
+                item.assignedTime = new Date(item.assignedTime).toLocaleDateString("en-GB");
+              }
+              if (item.submittedAt) {
+                item.submittedAt = new Date(item.submittedAt).toLocaleDateString("en-GB");
+              }
+            });
             const excelData = getEkycExcelData(consumerList, t);
             const cleanFileName = `eKYC_Data_${vendorName.replace(/[^a-zA-Z0-9]/g, "_")}`;
             Digit.Download.Excel(excelData, cleanFileName);
@@ -1542,47 +1330,28 @@ 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
-      };
+  const handleApplyFilters = function () {
+    try {
+      setShowFilterModal(false);
+      return Promise.resolve(handleDownloadEkycData(customDate.startDate.getTime(), customDate.endDate.getTime())).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
     }
-    return null;
   };
-  const supervisorColumns = useMemo(() => [{
+  const supervisorColumns = [{
     Header: t("SUPERVISOR_NAME") || "Supervisor Name",
     accessor: row => {
       var _row$original;
       return (row === null || row === void 0 ? void 0 : (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.supervisorName) || "N/A";
     },
     Cell: _ref => {
-      var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _row$original2, _row$original3;
+      var _Digit$SessionStorage2, _Digit$SessionStorage3, _Digit$SessionStorage4, _row$original2, _row$original3, _row$original4;
       let {
         row
       } = _ref;
-      const userType = ((_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : (_Digit$SessionStorage2 = _Digit$SessionStorage.info) === null || _Digit$SessionStorage2 === void 0 ? void 0 : (_Digit$SessionStorage3 = _Digit$SessionStorage2.type) === null || _Digit$SessionStorage3 === void 0 ? void 0 : _Digit$SessionStorage3.toLowerCase()) || "citizen";
-      const targetPath = `/digit-ui/${userType}/ekyc/supervisor-dashboard/${row === null || row === void 0 ? void 0 : (_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.supervisorId}`;
+      console.log(row);
+      const userType = ((_Digit$SessionStorage2 = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage2 === void 0 ? void 0 : (_Digit$SessionStorage3 = _Digit$SessionStorage2.info) === null || _Digit$SessionStorage3 === void 0 ? void 0 : (_Digit$SessionStorage4 = _Digit$SessionStorage3.type) === null || _Digit$SessionStorage4 === void 0 ? void 0 : _Digit$SessionStorage4.toLowerCase()) || "citizen";
+      const targetPath = `/digit-ui/${userType}/ekyc/supervisor-dashboard/${row === null || row === void 0 ? void 0 : (_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.supervisorId}/${row === null || row === void 0 ? void 0 : (_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.vendorId}`;
       return /*#__PURE__*/React.createElement("a", {
         href: targetPath,
         style: {
@@ -1594,7 +1363,7 @@ const VendorDetailsCard = () => {
           e.preventDefault();
           history.push(targetPath);
         }
-      }, (row === null || row === void 0 ? void 0 : (_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.supervisorName) || "N/A");
+      }, (row === null || row === void 0 ? void 0 : (_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.supervisorName) || "N/A");
     }
   }, {
     Header: t("MOBILE_NUMBER") || "Mobile Number",
@@ -1612,6 +1381,16 @@ const VendorDetailsCard = () => {
         className: `status-badge verified`
       }, t(value) || value);
     }
+  }, {
+    Header: t("ASSIGNED_ZONE") || "Assigned Zone",
+    accessor: row => (row === null || row === void 0 ? void 0 : row.assignedZoneId) || "",
+    id: "zone",
+    Cell: _ref3 => {
+      let {
+        value
+      } = _ref3;
+      return t(value) || value;
+    }
   }, {
     Header: t("TOTAL_EKYC_APPLICATIONS") || "Total eKYC Applications",
     accessor: row => (row === null || row === void 0 ? void 0 : row.totalKnos) || 0,
@@ -1628,91 +1407,24 @@ const VendorDetailsCard = () => {
     Header: t("OVERALL_PROGRESS") || "Overall Progress",
     accessor: row => `${(row === null || row === void 0 ? void 0 : row.progressPercent) || 0}%`,
     id: "overallProgress"
-  }], [t, history]);
-  const [showReportMenu, setShowReportMenu] = useState(false);
-  const [customDate, setCustomDate] = useState({
-    from: "",
-    to: ""
-  });
-  const [showCustomPicker, setShowCustomPicker] = useState(false);
-  const [reportLoading, setReportLoading] = useState(false);
+  }];
+  const [customDate, setCustomDate] = useState("");
   const reportMenuRef = useRef(null);
   useEffect(() => {
     const handler = e => {
-      if (reportMenuRef.current && !reportMenuRef.current.contains(e.target)) {
-        setShowReportMenu(false);
-        setShowCustomPicker(false);
-      }
+      if (reportMenuRef.current && !reportMenuRef.current.contains(e.target)) ;
     };
     document.addEventListener("mousedown", handler);
     return () => document.removeEventListener("mousedown", handler);
   }, []);
-  const handleDownload = () => {
-    setReportLoading(true);
-    try {
-      const rowsWithStats = progressData === null || progressData === void 0 ? void 0 : progressData.supervisorReport.map(s => ({
-        name: s.supervisorName,
-        mobileNo: s.mobileNo,
-        total: s.totalKnos,
-        completed: s.submittedKnos,
-        pending: s.pendingKnos,
-        progress: `${s.progressPercent || 0}%`
-      }));
-      downloadVendorPDF({
-        rows: rowsWithStats,
-        vendorName,
-        mobileNumber,
-        email,
-        dashboardInfo: {
-          total: progressData === null || progressData === void 0 ? void 0 : progressData.totalKnosInZones,
-          completed: (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnosInZones) + (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCountInZones),
-          pending: progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnosInZones,
-          submittedCount: progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnosInZones
-        },
-        t
-      });
-    } catch (err) {
-      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 handleCustomDownload = function () {
-    try {
-      if (!customDate.from || !customDate.to) {
-        alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
-        return Promise.resolve();
-      }
-      const from = new Date(customDate.from);
-      from.setHours(0, 0, 0, 0);
-      const to = new Date(customDate.to);
-      to.setHours(23, 59, 59, 999);
-      setShowReportMenu(false);
-      setShowCustomPicker(false);
-      return Promise.resolve(handleDownloadEkycData(from.getTime(), to.getTime())).then(function () {});
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  const StatCard = _ref3 => {
+  const StatCard = _ref4 => {
     let {
       title,
       value,
       type,
       isLoading,
       icon
-    } = _ref3;
+    } = _ref4;
     return /*#__PURE__*/React.createElement("div", {
       className: `stat-card ${type}`
     }, isLoading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -1738,45 +1450,48 @@ const VendorDetailsCard = () => {
       }
     }, t("NO_VENDOR_FOUND") || "No Vendor Found"));
   }
-  return /*#__PURE__*/React.createElement(Card, {
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Card, {
     className: "surveyor-dashboard"
   }, /*#__PURE__*/React.createElement("div", {
     className: "ekyc-dashboard-section"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "ekyc-details-wrapper"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "details-top-row"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "detail-item first-row"
   }, /*#__PURE__*/React.createElement("div", {
     className: "ekyc-dashboard-header"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "avatar"
-  }, vendorName === null || vendorName === void 0 ? void 0 : (_vendorName$charAt = vendorName.charAt(0)) === null || _vendorName$charAt === void 0 ? void 0 : _vendorName$charAt.toUpperCase()), /*#__PURE__*/React.createElement("div", {
     className: "header-content"
   }, /*#__PURE__*/React.createElement("h2", {
     className: "name"
   }, vendorName), /*#__PURE__*/React.createElement("div", {
     className: "designation"
-  }, t("VENDOR_AGENCY") || "Agency / Vendor"))), /*#__PURE__*/React.createElement("div", {
-    className: "report-download"
+  }, "(", t("VENDOR_AGENCY") || "Agency / Vendor", ")"))), /*#__PURE__*/React.createElement("div", {
+    className: "report-download relative"
   }, /*#__PURE__*/React.createElement("button", {
-    className: "download-btn",
-    disabled: reportLoading,
-    onClick: handleDownload
-  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"))), /*#__PURE__*/React.createElement("div", {
-    className: "stats-wrapper"
-  }, cards.map((card, idx) => /*#__PURE__*/React.createElement(StatCard, {
-    key: idx,
-    title: t(card.label),
-    value: card.count,
-    type: card.type,
-    isLoading: isPageLoading,
-    icon: card.icon
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: "ekyc-dashboard-section"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ekyc-details-wrapper"
-  }, /*#__PURE__*/React.createElement("div", {
+    disabled: ekycDownloadLoading,
+    className: `download-btn relative ${ekycDownloadLoading ? "disabled" : ""}`,
+    onClick: () => setShowFilterModal(true)
+  }, /*#__PURE__*/React.createElement(MdDownloadIcon, null), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading" : t("DOWNLOAD_REPORT") || "Download Report")))), /*#__PURE__*/React.createElement("div", {
     className: "details-top-row"
   }, /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
+  }, t("NAME")), /*#__PURE__*/React.createElement("span", {
+    className: "value"
+  }, ownerName)), /*#__PURE__*/React.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "label"
+  }, t("GENDER")), /*#__PURE__*/React.createElement("span", {
+    className: "value"
+  }, gender)), /*#__PURE__*/React.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "label"
   }, t("MOBILE")), /*#__PURE__*/React.createElement("span", {
     className: "value"
   }, mobileNumber)), /*#__PURE__*/React.createElement("div", {
@@ -1785,97 +1500,34 @@ const VendorDetailsCard = () => {
     className: "label"
   }, t("EMAIL")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, email)), /*#__PURE__*/React.createElement("div", {
-    className: "download-card"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format.")), /*#__PURE__*/React.createElement("div", {
-    className: "report-download",
-    ref: reportMenuRef
-  }, /*#__PURE__*/React.createElement("button", {
-    className: "download-excel-btn",
-    disabled: ekycDownloadLoading,
-    onClick: () => {
-      setShowReportMenu(p => !p);
-      setShowCustomPicker(false);
-    }
-  }, /*#__PURE__*/React.createElement(MdDownloadIcon, null), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React.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,
-      key
-    } = _ref4;
-    return /*#__PURE__*/React.createElement("div", {
-      key: key,
-      className: "menu-item",
-      onClick: () => handlePresetDownload(key)
-    }, label);
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "custom-date-trigger",
-    onClick: () => setShowCustomPicker(p => !p)
-  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
-    className: "custom-picker"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "date-inputs"
-  }, /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "From"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    value: customDate.from,
-    onChange: e => setCustomDate({
-      ...customDate,
-      from: e.target.value
-    })
-  })), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "To"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    value: customDate.to,
-    onChange: e => setCustomDate({
-      ...customDate,
-      to: e.target.value
-    })
-  }))), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      gap: "10px",
-      marginTop: "10px"
-    }
-  }, /*#__PURE__*/React.createElement("button", {
-    className: "picker-cancel-btn",
-    onClick: () => {
-      setShowCustomPicker(false);
-      setCustomDate({
-        from: "",
-        to: ""
-      });
-    }
-  }, t("CANCEL") || "Cancel"), /*#__PURE__*/React.createElement("button", {
-    className: "picker-apply-btn",
-    onClick: handleCustomDownload
-  }, t("APPLY") || "Apply"))))))), /*#__PURE__*/React.createElement("div", {
-    className: "full-width-item"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "label"
-  }, t("ASSIGNED_ZONES") || "Assigned Zones"), /*#__PURE__*/React.createElement("span", {
-    className: "value"
-  }, zoneIds.length > 0 ? /*#__PURE__*/React.createElement("div", {
-    className: "selected-zones",
-    style: {
-      marginTop: "4px",
-      width: "100%",
-      display: "flex",
-      flexWrap: "wrap",
-      gap: "8px"
+  }, email))), /*#__PURE__*/React.createElement("div", {
+    className: "full-width-item"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "label"
+  }, t("ASSIGNED_ZONES") || "Assigned Zones"), /*#__PURE__*/React.createElement("span", {
+    className: "value"
+  }, zoneIds.length > 0 ? /*#__PURE__*/React.createElement("div", {
+    className: "selected-zones",
+    style: {
+      marginTop: "4px",
+      width: "100%",
+      display: "flex",
+      flexWrap: "wrap",
+      gap: "8px"
     }
   }, zoneIds.map(zone => /*#__PURE__*/React.createElement("span", {
     key: zone,
     className: "selected-zone-chip"
-  }, t(zone) || zone))) : "N/A")))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, {
+  }, t(zone) || zone))) : "N/A")))), /*#__PURE__*/React.createElement("div", {
+    className: "stats-wrapper"
+  }, cards.map((card, idx) => /*#__PURE__*/React.createElement(StatCard, {
+    key: idx,
+    title: t(card.label),
+    value: card.count,
+    type: card.type,
+    isLoading: isPageLoading,
+    icon: card.icon
+  }))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, {
     t: t,
     tableTitle: t("CONNECTED_SUPERVISORS") || "Connected Supervisors",
     tableClass: "ekycTable",
@@ -1907,7 +1559,15 @@ const VendorDetailsCard = () => {
       setPageSize(Number(e.target.value));
       setCurrentPage(0);
     }
-  })));
+  }))), showFilterModal && /*#__PURE__*/React.createElement(EkycFilterModal, {
+    t: t,
+    onClose: () => setShowFilterModal(false),
+    onApply: handleApplyFilters,
+    customDate: customDate,
+    setCustomDate: setCustomDate,
+    ekycStatus: ekycStatus,
+    setEkycStatus: setEkycStatus
+  }));
 };
 
 const useInboxTableConfig = _ref => {
@@ -2086,263 +1746,249 @@ const useInboxTableConfig = _ref => {
   };
 };
 
-var isNullOrUndefined = (value) => value == null;
-
-const isObjectType = (value) => typeof value === 'object';
-var isObject = (value) => !isNullOrUndefined(value) &&
-    !Array.isArray(value) &&
-    isObjectType(value) &&
-    !(value instanceof Date);
-
-var isKey = (value) => /^\w*$/.test(value);
-
-var compact = (value) => value.filter(Boolean);
-
-var stringToPath = (input) => compact(input
-    .replace(/["|']/g, '')
-    .replace(/\[/g, '.')
-    .replace(/\]/g, '')
-    .split('.'));
-
-function set(object, path, value) {
-    let index = -1;
-    const tempPath = isKey(path) ? [path] : stringToPath(path);
-    const length = tempPath.length;
-    const lastIndex = length - 1;
-    while (++index < length) {
-        const key = tempPath[index];
-        let newValue = value;
-        if (index !== lastIndex) {
-            const objValue = object[key];
-            newValue =
-                isObject(objValue) || Array.isArray(objValue)
-                    ? objValue
-                    : !isNaN(+tempPath[index + 1])
-                        ? []
-                        : {};
-        }
-        object[key] = newValue;
-        object = object[key];
-    }
-    return object;
+var isNullOrUndefined = value => value == null;
+const isObjectType = value => typeof value === 'object';
+var isObject = value => !isNullOrUndefined(value) && !Array.isArray(value) && isObjectType(value) && !(value instanceof Date);
+var isKey = value => /^\w*$/.test(value);
+var compact = value => value.filter(Boolean);
+var stringToPath = input => compact(input.replace(/["|']/g, '').replace(/\[/g, '.').replace(/\]/g, '').split('.'));
+function set(object, path, value) {
+  let index = -1;
+  const tempPath = isKey(path) ? [path] : stringToPath(path);
+  const length = tempPath.length;
+  const lastIndex = length - 1;
+  while (++index < length) {
+    const key = tempPath[index];
+    let newValue = value;
+    if (index !== lastIndex) {
+      const objValue = object[key];
+      newValue = isObject(objValue) || Array.isArray(objValue) ? objValue : !isNaN(+tempPath[index + 1]) ? [] : {};
+    }
+    object[key] = newValue;
+    object = object[key];
+  }
+  return object;
 }
-
-var isUndefined = (val) => val === undefined;
-
-var get = (obj = {}, path, defaultValue) => {
-    const result = compact(path.split(/[,[\].]+?/)).reduce((result, key) => (isNullOrUndefined(result) ? result : result[key]), obj);
-    return isUndefined(result) || result === obj
-        ? isUndefined(obj[path])
-            ? defaultValue
-            : obj[path]
-        : result;
+var isUndefined = val => val === undefined;
+var get = function (obj, path, defaultValue) {
+  if (obj === void 0) {
+    obj = {};
+  }
+  const result = compact(path.split(/[,[\].]+?/)).reduce((result, key) => isNullOrUndefined(result) ? result : result[key], obj);
+  return isUndefined(result) || result === obj ? isUndefined(obj[path]) ? defaultValue : obj[path] : result;
 };
-
-var isPrimitive = (value) => isNullOrUndefined(value) || !isObjectType(value);
-
-var isFunction = (value) => typeof value === 'function';
-
-var skipValidation = ({ isOnBlur, isOnChange, isOnTouch, isTouched, isReValidateOnBlur, isReValidateOnChange, isBlurEvent, isSubmitted, isOnAll, }) => {
-    if (isOnAll) {
-        return false;
-    }
-    else if (!isSubmitted && isOnTouch) {
-        return !(isTouched || isBlurEvent);
-    }
-    else if (isSubmitted ? isReValidateOnBlur : isOnBlur) {
-        return !isBlurEvent;
-    }
-    else if (isSubmitted ? isReValidateOnChange : isOnChange) {
-        return isBlurEvent;
-    }
-    return true;
+var isPrimitive = value => isNullOrUndefined(value) || !isObjectType(value);
+var isFunction = value => typeof value === 'function';
+var skipValidation = _ref8 => {
+  let {
+    isOnBlur,
+    isOnChange,
+    isOnTouch,
+    isTouched,
+    isReValidateOnBlur,
+    isReValidateOnChange,
+    isBlurEvent,
+    isSubmitted,
+    isOnAll
+  } = _ref8;
+  if (isOnAll) {
+    return false;
+  } else if (!isSubmitted && isOnTouch) {
+    return !(isTouched || isBlurEvent);
+  } else if (isSubmitted ? isReValidateOnBlur : isOnBlur) {
+    return !isBlurEvent;
+  } else if (isSubmitted ? isReValidateOnChange : isOnChange) {
+    return isBlurEvent;
+  }
+  return true;
 };
-
-const isMatchFieldArrayName = (name, searchName) => RegExp(`^${searchName}([|.)\\d+`.replace(/\[/g, '\\[').replace(/\]/g, '\\]')).test(name);
-var isNameInFieldArray = (names, name) => [...names].some((current) => isMatchFieldArrayName(name, current));
-
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
+const isMatchFieldArrayName = (name, searchName) => RegExp(`^${searchName}([|.)\\d+`.replace(/\[/g, '\\[').replace(/\]/g, '\\]')).test(name);
+var isNameInFieldArray = (names, name) => [...names].some(current => isMatchFieldArrayName(name, current));
+function __rest(s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
 }
-
-const FormContext = createContext(null);
-FormContext.displayName = 'RHFContext';
-const useFormContext = () => useContext(FormContext);
-
-var getInputValue = (event) => isPrimitive(event) ||
-    !isObject(event.target) ||
-    (isObject(event.target) && !event.type)
-    ? event
-    : isUndefined(event.target.value)
-        ? event.target.checked
-        : event.target.value;
-
-function useController({ name, rules, defaultValue, control, onFocus, }) {
-    const methods = useFormContext();
-    if (process.env.NODE_ENV !== 'production') {
-        if (!control && !methods) {
-            throw new Error('📋 Controller is missing `control` prop. https://react-hook-form.com/api#Controller');
-        }
-    }
-    const { defaultValuesRef, setValue, register, unregister, trigger, mode, reValidateMode: { isReValidateOnBlur, isReValidateOnChange }, formState, formStateRef: { current: { isSubmitted, touched, errors }, }, updateFormState, readFormStateRef, fieldsRef, fieldArrayNamesRef, shallowFieldsStateRef, } = control || methods.control;
-    const isNotFieldArray = !isNameInFieldArray(fieldArrayNamesRef.current, name);
-    const getInitialValue = () => !isUndefined(get(shallowFieldsStateRef.current, name)) && isNotFieldArray
-        ? get(shallowFieldsStateRef.current, name)
-        : isUndefined(defaultValue)
-            ? get(defaultValuesRef.current, name)
-            : defaultValue;
-    const [value, setInputStateValue] = useState(getInitialValue());
-    const valueRef = useRef(value);
-    const ref = useRef({
-        focus: () => null,
-    });
-    const onFocusRef = useRef(onFocus ||
-        (() => {
-            if (isFunction(ref.current.focus)) {
-                ref.current.focus();
-            }
-            if (process.env.NODE_ENV !== 'production') {
-                if (!isFunction(ref.current.focus)) {
-                    console.warn(`📋 'ref' from Controller render prop must be attached to a React component or a DOM Element whose ref provides a 'focus()' method`);
-                }
-            }
-        }));
-    const shouldValidate = useCallback((isBlurEvent) => !skipValidation(Object.assign({ isBlurEvent,
-        isReValidateOnBlur,
-        isReValidateOnChange,
-        isSubmitted, isTouched: !!get(touched, name) }, mode)), [
-        isReValidateOnBlur,
-        isReValidateOnChange,
-        isSubmitted,
-        touched,
-        name,
-        mode,
-    ]);
-    const commonTask = useCallback(([event]) => {
-        const data = getInputValue(event);
-        setInputStateValue(data);
-        valueRef.current = data;
-        return data;
-    }, []);
-    const registerField = useCallback((shouldUpdateValue) => {
-        if (process.env.NODE_ENV !== 'production') {
-            if (!name) {
-                return console.warn('📋 Field is missing `name` prop. https://react-hook-form.com/api#Controller');
-            }
-        }
-        if (fieldsRef.current[name]) {
-            fieldsRef.current[name] = Object.assign({ ref: fieldsRef.current[name].ref }, rules);
-        }
-        else {
-            register(Object.defineProperties({
-                name,
-                focus: onFocusRef.current,
-            }, {
-                value: {
-                    set(data) {
-                        setInputStateValue(data);
-                        valueRef.current = data;
-                    },
-                    get() {
-                        return valueRef.current;
-                    },
-                },
-            }), rules);
-            shouldUpdateValue = isUndefined(get(defaultValuesRef.current, name));
-        }
-        shouldUpdateValue &&
-            isNotFieldArray &&
-            setInputStateValue(getInitialValue());
-    }, [rules, name, register]);
-    useEffect(() => () => unregister(name), [name]);
-    useEffect(() => {
-        if (process.env.NODE_ENV !== 'production') {
-            if (isUndefined(value)) {
-                console.warn(`📋 ${name} is missing in the 'defaultValue' prop of either its Controller (https://react-hook-form.com/api#Controller) or useForm (https://react-hook-form.com/api#useForm)`);
-            }
-            if (!isNotFieldArray && isUndefined(defaultValue)) {
-                console.warn('📋 Controller is missing `defaultValue` prop when using `useFieldArray`. https://react-hook-form.com/api#Controller');
-            }
-        }
-        registerField();
-    }, [registerField]);
-    useEffect(() => {
-        !fieldsRef.current[name] && registerField(true);
-    });
-    const onBlur = useCallback(() => {
-        if (readFormStateRef.current.touched && !get(touched, name)) {
-            set(touched, name, true);
-            updateFormState({
-                touched,
-            });
-        }
-        shouldValidate(true) && trigger(name);
-    }, [name, updateFormState, shouldValidate, trigger, readFormStateRef]);
-    const onChange = useCallback((...event) => setValue(name, commonTask(event), {
-        shouldValidate: shouldValidate(),
-        shouldDirty: true,
-    }), [setValue, name, shouldValidate]);
-    return {
-        field: {
-            onChange,
-            onBlur,
-            name,
-            value,
-            ref,
-        },
-        meta: Object.defineProperties({
-            invalid: !!get(errors, name),
-        }, {
-            isDirty: {
-                get() {
-                    return !!get(formState.dirtyFields, name);
-                },
-            },
-            isTouched: {
-                get() {
-                    return !!get(formState.touched, name);
-                },
-            },
-        }),
-    };
+const FormContext = createContext(null);
+FormContext.displayName = 'RHFContext';
+const useFormContext = () => useContext(FormContext);
+var getInputValue = event => isPrimitive(event) || !isObject(event.target) || isObject(event.target) && !event.type ? event : isUndefined(event.target.value) ? event.target.checked : event.target.value;
+function useController(_ref17) {
+  let {
+    name,
+    rules,
+    defaultValue,
+    control,
+    onFocus
+  } = _ref17;
+  const methods = useFormContext();
+  if (process.env.NODE_ENV !== 'production') {
+    if (!control && !methods) {
+      throw new Error('📋 Controller is missing `control` prop. https://react-hook-form.com/api#Controller');
+    }
+  }
+  const {
+    defaultValuesRef,
+    setValue,
+    register,
+    unregister,
+    trigger,
+    mode,
+    reValidateMode: {
+      isReValidateOnBlur,
+      isReValidateOnChange
+    },
+    formState,
+    formStateRef: {
+      current: {
+        isSubmitted,
+        touched,
+        errors
+      }
+    },
+    updateFormState,
+    readFormStateRef,
+    fieldsRef,
+    fieldArrayNamesRef,
+    shallowFieldsStateRef
+  } = control || methods.control;
+  const isNotFieldArray = !isNameInFieldArray(fieldArrayNamesRef.current, name);
+  const getInitialValue = () => !isUndefined(get(shallowFieldsStateRef.current, name)) && isNotFieldArray ? get(shallowFieldsStateRef.current, name) : isUndefined(defaultValue) ? get(defaultValuesRef.current, name) : defaultValue;
+  const [value, setInputStateValue] = useState(getInitialValue());
+  const valueRef = useRef(value);
+  const ref = useRef({
+    focus: () => null
+  });
+  const onFocusRef = useRef(onFocus || (() => {
+    if (isFunction(ref.current.focus)) {
+      ref.current.focus();
+    }
+    if (process.env.NODE_ENV !== 'production') {
+      if (!isFunction(ref.current.focus)) {
+        console.warn(`📋 'ref' from Controller render prop must be attached to a React component or a DOM Element whose ref provides a 'focus()' method`);
+      }
+    }
+  }));
+  const shouldValidate = useCallback(isBlurEvent => !skipValidation(Object.assign({
+    isBlurEvent,
+    isReValidateOnBlur,
+    isReValidateOnChange,
+    isSubmitted,
+    isTouched: !!get(touched, name)
+  }, mode)), [isReValidateOnBlur, isReValidateOnChange, isSubmitted, touched, name, mode]);
+  const commonTask = useCallback(_ref18 => {
+    let [event] = _ref18;
+    const data = getInputValue(event);
+    setInputStateValue(data);
+    valueRef.current = data;
+    return data;
+  }, []);
+  const registerField = useCallback(shouldUpdateValue => {
+    if (process.env.NODE_ENV !== 'production') {
+      if (!name) {
+        return console.warn('📋 Field is missing `name` prop. https://react-hook-form.com/api#Controller');
+      }
+    }
+    if (fieldsRef.current[name]) {
+      fieldsRef.current[name] = Object.assign({
+        ref: fieldsRef.current[name].ref
+      }, rules);
+    } else {
+      register(Object.defineProperties({
+        name,
+        focus: onFocusRef.current
+      }, {
+        value: {
+          set(data) {
+            setInputStateValue(data);
+            valueRef.current = data;
+          },
+          get() {
+            return valueRef.current;
+          }
+        }
+      }), rules);
+      shouldUpdateValue = isUndefined(get(defaultValuesRef.current, name));
+    }
+    shouldUpdateValue && isNotFieldArray && setInputStateValue(getInitialValue());
+  }, [rules, name, register]);
+  useEffect(() => () => unregister(name), [name]);
+  useEffect(() => {
+    if (process.env.NODE_ENV !== 'production') {
+      if (isUndefined(value)) {
+        console.warn(`📋 ${name} is missing in the 'defaultValue' prop of either its Controller (https://react-hook-form.com/api#Controller) or useForm (https://react-hook-form.com/api#useForm)`);
+      }
+      if (!isNotFieldArray && isUndefined(defaultValue)) {
+        console.warn('📋 Controller is missing `defaultValue` prop when using `useFieldArray`. https://react-hook-form.com/api#Controller');
+      }
+    }
+    registerField();
+  }, [registerField]);
+  useEffect(() => {
+    !fieldsRef.current[name] && registerField(true);
+  });
+  const onBlur = useCallback(() => {
+    if (readFormStateRef.current.touched && !get(touched, name)) {
+      set(touched, name, true);
+      updateFormState({
+        touched
+      });
+    }
+    shouldValidate(true) && trigger(name);
+  }, [name, updateFormState, shouldValidate, trigger, readFormStateRef]);
+  const onChange = useCallback(function () {
+    for (var _len = arguments.length, event = new Array(_len), _key = 0; _key < _len; _key++) {
+      event[_key] = arguments[_key];
+    }
+    return setValue(name, commonTask(event), {
+      shouldValidate: shouldValidate(),
+      shouldDirty: true
+    });
+  }, [setValue, name, shouldValidate]);
+  return {
+    field: {
+      onChange,
+      onBlur,
+      name,
+      value,
+      ref
+    },
+    meta: Object.defineProperties({
+      invalid: !!get(errors, name)
+    }, {
+      isDirty: {
+        get() {
+          return !!get(formState.dirtyFields, name);
+        }
+      },
+      isTouched: {
+        get() {
+          return !!get(formState.touched, name);
+        }
+      }
+    })
+  };
 }
-
-const Controller = (props) => {
-    const { rules, as, render, defaultValue, control, onFocus } = props, rest = __rest(props, ["rules", "as", "render", "defaultValue", "control", "onFocus"]);
-    const { field, meta } = useController(props);
-    const componentProps = Object.assign(Object.assign({}, rest), field);
-    return as
-        ? isValidElement(as)
-            ? cloneElement(as, componentProps)
-            : createElement(as, componentProps)
-        : render
-            ? render(field, meta)
-            : null;
+const Controller = props => {
+  const {
+      rules,
+      as,
+      render,
+      defaultValue,
+      control,
+      onFocus
+    } = props,
+    rest = __rest(props, ["rules", "as", "render", "defaultValue", "control", "onFocus"]);
+  const {
+    field,
+    meta
+  } = useController(props);
+  const componentProps = Object.assign(Object.assign({}, rest), field);
+  return as ? isValidElement(as) ? cloneElement(as, componentProps) : createElement(as, componentProps) : render ? render(field, meta) : null;
 };
-//# sourceMappingURL=index.esm.js.map
 
 const SearchFormFieldsComponents = _ref => {
   let {
@@ -4716,9 +4362,7 @@ const VendorCardSkeleton = () => {
     className: "skeleton skeleton-subtitle"
   }))), /*#__PURE__*/React.createElement("div", {
     className: "skeleton skeleton-kno-badge"
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "progress-section"
-  }, /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "skeleton skeleton-progress-bar"
   }), /*#__PURE__*/React.createElement("div", {
     className: "progress-label"
@@ -4779,87 +4423,83 @@ const AdminDashboard = () => {
     className: "section-title"
   }, t("EKYC_VENDORS_PERFORMANCE") || "eKYC Vendors Performance"), isProgressLoading ? /*#__PURE__*/React.createElement(VendorPerformanceSkeleton, null) : /*#__PURE__*/React.createElement("div", {
     className: "vendors-grid"
-  }, Array.isArray(progressData === null || progressData === void 0 ? void 0 : progressData.vendorReports) && (progressData === null || progressData === void 0 ? void 0 : progressData.vendorReports.length) && (progressData === null || progressData === void 0 ? void 0 : progressData.vendorReports.map(vendor => {
-    var _vendor$vendorName, _vendor$vendorName$;
-    return /*#__PURE__*/React.createElement("div", {
-      key: vendor.vendorId,
-      className: "vendor-perf-card",
-      onClick: () => history.push(`/digit-ui/employee/ekyc/vendors/${vendor.vendorId}`)
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "vendor-card-header"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "vendor-title"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "vendor-icon"
-    }, /*#__PURE__*/React.createElement("span", null, (_vendor$vendorName = vendor.vendorName) === null || _vendor$vendorName === void 0 ? void 0 : (_vendor$vendorName$ = _vendor$vendorName[0]) === null || _vendor$vendorName$ === void 0 ? void 0 : _vendor$vendorName$.toUpperCase())), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h4", null, vendor.vendorName), /*#__PURE__*/React.createElement("span", {
-      className: "vendor-subtitle"
-    }, t("EKYC_VENDOR") || "eKYC Vendor"))), /*#__PURE__*/React.createElement("div", {
-      className: "kno-count-badge"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "kno-count-label"
-    }, t("TOTAL_KNOS") || "Total KNOs", " -"), /*#__PURE__*/React.createElement("span", {
-      className: "kno-count-value"
-    }, vendor.totalKnosInZones))), /*#__PURE__*/React.createElement("div", {
-      className: "progress-section"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "progress-bar-container"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "progress-bar-fill",
-      style: {
-        width: `${vendor.progressPercent}%`
-      }
-    })), /*#__PURE__*/React.createElement("div", {
-      className: "progress-label"
-    }, /*#__PURE__*/React.createElement("span", null, t("PROGRESS") || "Progress"), /*#__PURE__*/React.createElement("span", null, vendor.progressPercent, "%"))), /*#__PURE__*/React.createElement("div", {
-      className: "stats-grid"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "stat-item"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "stat-value"
-    }, vendor.totalSupervisors), /*#__PURE__*/React.createElement("span", {
-      className: "stat-label"
-    }, t("SUPERVISORS") || "Supervisors")), /*#__PURE__*/React.createElement("div", {
-      className: "stat-item"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "stat-value"
-    }, vendor.totalSurveyors), /*#__PURE__*/React.createElement("span", {
-      className: "stat-label"
-    }, t("SURVEYORS") || "Surveyors")), /*#__PURE__*/React.createElement("div", {
-      className: "stat-item"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "stat-value"
-    }, vendor.totalAssignments), /*#__PURE__*/React.createElement("span", {
-      className: "stat-label"
-    }, t("TOTAL_EKYC_APPLICATIONS") || "Total KNOs"))), /*#__PURE__*/React.createElement("div", {
-      className: "knos-summary"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "kno-stat"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "kno-label"
-    }, t("SUBMITTED") || "Submitted"), /*#__PURE__*/React.createElement("strong", null, vendor.submittedKnosInZones)), /*#__PURE__*/React.createElement("div", {
-      className: "kno-stat pending"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "kno-label"
-    }, t("PENDING") || "Pending"), /*#__PURE__*/React.createElement("strong", null, vendor.pendingKnosInZones)), /*#__PURE__*/React.createElement("div", {
-      className: "kno-stat rejected"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "kno-label"
-    }, t("EKYC_SUBMITTED_BY_CITIZENS").toLowerCase() || "Submitted by citizen"), /*#__PURE__*/React.createElement("strong", null, vendor.selfEkycCountInZones))));
-  })))));
+  }, Array.isArray(progressData === null || progressData === void 0 ? void 0 : progressData.vendorReports) && (progressData === null || progressData === void 0 ? void 0 : progressData.vendorReports.length) && (progressData === null || progressData === void 0 ? void 0 : progressData.vendorReports.map(vendor => /*#__PURE__*/React.createElement("div", {
+    key: vendor.vendorId,
+    className: "vendor-perf-card",
+    onClick: () => history.push(`/digit-ui/employee/ekyc/vendors/${vendor.vendorId}`)
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "vendor-card-header"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "vendor-title"
+  }, /*#__PURE__*/React.createElement("h4", null, vendor.vendorName)), /*#__PURE__*/React.createElement("div", {
+    className: "kno-count-badge"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "kno-count-label"
+  }, t("TOTAL_KNOS") || "Total KNOs", " -"), /*#__PURE__*/React.createElement("span", {
+    className: "kno-count-value"
+  }, vendor.totalKnosInZones))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    className: "progress-bar-container"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "progress-bar-fill",
+    style: {
+      width: `${vendor.progressPercent}%`
+    }
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "progress-label"
+  }, /*#__PURE__*/React.createElement("span", null, t("PROGRESS") || "Progress"), /*#__PURE__*/React.createElement("span", null, vendor.progressPercent, "%"))), /*#__PURE__*/React.createElement("div", {
+    className: "stats-grid"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "stat-item"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "stat-value"
+  }, vendor.totalSupervisors), /*#__PURE__*/React.createElement("span", {
+    className: "stat-label"
+  }, t("SUPERVISORS") || "Supervisors")), /*#__PURE__*/React.createElement("div", {
+    className: "stat-item"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "stat-value"
+  }, vendor.totalSurveyors), /*#__PURE__*/React.createElement("span", {
+    className: "stat-label"
+  }, t("SURVEYORS") || "Surveyors")), /*#__PURE__*/React.createElement("div", {
+    className: "stat-item"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "stat-value"
+  }, vendor.totalAssignments), /*#__PURE__*/React.createElement("span", {
+    className: "stat-label"
+  }, t("TOTAL_EKYC_APPLICATIONS") || "Total KNOs"))), /*#__PURE__*/React.createElement("div", {
+    className: "knos-summary"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "kno-stat"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "kno-label"
+  }, t("SUBMITTED") || "Submitted"), /*#__PURE__*/React.createElement("strong", null, vendor.submittedKnosInZones)), /*#__PURE__*/React.createElement("div", {
+    className: "kno-stat pending"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "kno-label"
+  }, t("PENDING") || "Pending"), /*#__PURE__*/React.createElement("strong", null, vendor.pendingKnosInZones)), /*#__PURE__*/React.createElement("div", {
+    className: "kno-stat rejected"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "kno-label"
+  }, t("EKYC_SUBMITTED_BY_CITIZENS").toLowerCase() || "Submitted by citizen"), /*#__PURE__*/React.createElement("strong", null, vendor.selfEkycCountInZones)))))))));
 };
 
 const SupervisorDetailsCard = () => {
-  var _Digit$SessionStorage, _progressData$supervi, _fullName$charAt;
+  var _Digit$SessionStorage, _Digit$UserService$ge, _Digit$UserService$ge2, _progressData$supervi;
   const {
     t
   } = useTranslation();
   const history = useHistory();
   const tenantId = Digit.ULBService.getCurrentTenantId() || "dl.djb";
   const {
-    id: supervisorId
+    id: supervisorId,
+    vendorId
   } = useParams();
   const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
   const [ekycDownloadLoading, setEkycDownloadLoading] = useState(false);
+  const [showFilterModal, setShowFilterModal] = useState(false);
+  const [currentPage, setCurrentPage] = useState(0);
+  const [pageSize, setPageSize] = useState(20);
+  const [ekycStatus, setEkycStatus] = useState("ALL");
   const {
     data: supervisorSearchResponse,
     isLoading: isSupervisorSearchLoading
@@ -4881,13 +4521,16 @@ const SupervisorDetailsCard = () => {
   const {
     isLoading: isProgressLoading,
     data: progressData
-  } = Digit.Hooks.ekyc.useEkycAssignmentProgress(targetVendorId ? {
-    vendorId: targetVendorId,
-    vendorIds: [targetVendorId]
-  } : {}, {
+  } = Digit.Hooks.ekyc.useEkycAssignmentProgress({
+    vendorId: vendorId || targetVendorId
+  }, {
     enabled: !!tenantId,
     keepPreviousData: true
   });
+  const userRoles = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : (_Digit$UserService$ge2 = _Digit$UserService$ge.info) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.roles;
+  const isSupervisor = userRoles === null || userRoles === void 0 ? void 0 : userRoles.some(role => role.code === "EKYC_SUPERVISOR");
+  const currentSupervisor = isSupervisor ? (progressData === null || progressData === void 0 ? void 0 : progressData.supervisorReport[0]) || [] : progressData === null || progressData === void 0 ? void 0 : (_progressData$supervi = progressData.supervisorReport) === null || _progressData$supervi === void 0 ? void 0 : _progressData$supervi.find(ele => ele.supervisorId === supervisorId);
+  const surveyorsData = (currentSupervisor === null || currentSupervisor === void 0 ? void 0 : currentSupervisor.surveyors) || [];
   const {
     data: surveyorSearchResponse,
     isLoading: isSurveyorSearchLoading
@@ -5035,12 +4678,12 @@ const SupervisorDetailsCard = () => {
     }
     return null;
   }, [progressData, supervisorSearchResponse, surveyorSearchResponse, supervisorId, loggedInUser]);
-  const fullName = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.supervisorName) || "N/A";
-  const mobileNumber = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.mobileNo) || "N/A";
+  const fullName = (currentSupervisor === null || currentSupervisor === void 0 ? void 0 : currentSupervisor.supervisorName) || "N/A";
+  const mobileNumber = (currentSupervisor === null || currentSupervisor === void 0 ? void 0 : currentSupervisor.mobileNo) || "N/A";
   const email = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.email) || ((supervisor === null || supervisor === void 0 ? void 0 : supervisor.supervisorId) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.uuid) ? loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.emailId : null) || "N/A";
   const gender = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.gender) || ((supervisor === null || supervisor === void 0 ? void 0 : supervisor.supervisorId) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.uuid) ? loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.gender : null) || "N/A";
   const status = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.status) || "N/A";
-  const assignedZone = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.assignedZoneId) || "N/A";
+  const assignedZone = t(currentSupervisor === null || currentSupervisor === void 0 ? void 0 : currentSupervisor.assignedZoneId) || "N/A";
   const vendorName = useMemo(() => {
     var _matchedVendor$dsoDet;
     if (!vendorSearchResponse || !supervisor) return "N/A";
@@ -5055,10 +4698,6 @@ const SupervisorDetailsCard = () => {
   const surveyors = useMemo(() => {
     return (supervisor === null || supervisor === void 0 ? void 0 : supervisor.surveyors) || [];
   }, [supervisor]);
-  const [currentPage, setCurrentPage] = useState(0);
-  const [pageSize, setPageSize] = useState(20);
-  const currentSupervisor = progressData === null || progressData === void 0 ? void 0 : (_progressData$supervi = progressData.supervisorReport) === null || _progressData$supervi === void 0 ? void 0 : _progressData$supervi.find(ele => ele.supervisorId === supervisorId);
-  const surveyorsData = (currentSupervisor === null || currentSupervisor === void 0 ? void 0 : currentSupervisor.surveyors) || [];
   const cards = useMemo(() => [{
     label: "TOTAL_EKYC_APPLICATIONS",
     count: (supervisor === null || supervisor === void 0 ? void 0 : supervisor.totalKnos) || 0,
@@ -5140,100 +4779,54 @@ const SupervisorDetailsCard = () => {
     accessor: row => `${(row === null || row === void 0 ? void 0 : row.progressPercent) || 0}%`,
     id: "overallProgress"
   }], [t, history]);
-  const [showReportMenu, setShowReportMenu] = useState(false);
   const [customDate, setCustomDate] = useState({
     from: "",
     to: ""
   });
-  const [showCustomPicker, setShowCustomPicker] = useState(false);
-  const [reportLoading, setReportLoading] = useState(false);
-  const reportMenuRef = useRef(null);
-  useEffect(() => {
-    const handler = e => {
-      if (reportMenuRef.current && !reportMenuRef.current.contains(e.target)) {
-        setShowReportMenu(false);
-        setShowCustomPicker(false);
-      }
-    };
-    document.addEventListener("mousedown", handler);
-    return () => document.removeEventListener("mousedown", handler);
-  }, []);
-  const handleDownload = () => {
-    setReportLoading(true);
-    try {
-      const rowsWithStats = surveyors.map(s => ({
-        name: s.surveyorName,
-        mobileNo: s.mobileNo,
-        status: s.status,
-        total: s.totalKnos,
-        completed: s.submittedKnos,
-        pending: s.pendingKnos,
-        progress: `${s.progressPercent}%`
-      }));
-      const totalKnos = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.totalKnos) || 0;
-      const completedKnos = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.submittedKnos) || 0;
-      downloadSupervisorPDF({
-        rows: rowsWithStats,
-        supervisorName: fullName,
-        vendorName,
-        mobileNumber,
-        email,
-        dashboardInfo: {
-          total: totalKnos,
-          completed: completedKnos,
-          pending: totalKnos - completedKnos,
-          submittedCount: completedKnos
-        },
-        t
-      });
-    } catch (err) {
-      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 StatCard = _ref5 => {
+    let {
+      title,
+      value,
+      type,
+      isLoading,
+      icon
+    } = _ref5;
+    return /*#__PURE__*/React.createElement("div", {
+      className: `stat-card ${type}`
+    }, isLoading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: "stat-title skeleton skeleton-text"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "stat-value skeleton skeleton-number"
+    })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: "stat-title"
+    }, title), /*#__PURE__*/React.createElement("div", {
+      className: "stat-value"
+    }, value), icon && /*#__PURE__*/React.createElement("div", {
+      className: "stat-icon"
+    }, icon)));
   };
-  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 isPageLoading = isProgressLoading || isSupervisorSearchLoading || isSurveyorSearchLoading || isVendorSearchLoading;
+  if (isPageLoading && !supervisor) {
+    return /*#__PURE__*/React.createElement(Loader, null);
+  }
+  if (!supervisor) {
+    return /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
+      style: {
+        padding: "24px"
       }
-      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);
-    }
-  };
+    }, t("NO_SUPERVISOR_FOUND")));
+  }
   const handleDownloadEkycData = function (fromDate, toDate) {
     try {
-      if (!surveyors || surveyors.length === 0) {
-        alert(t("NO_SURVEYORS_ASSIGNED") || "No surveyors assigned to this supervisor.");
-        return Promise.resolve();
-      }
       setEkycDownloadLoading(true);
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
           return Promise.resolve(Digit.EkycService.application_list({
-            tenantId: tenantId || "dl.djb",
+            tenantId: tenantId,
             offset: 0,
             limit: 10000,
-            supervisorId: (supervisor === null || supervisor === void 0 ? void 0 : supervisor.supervisorId) || supervisorId,
+            vendorId: targetVendorId,
+            ekycStatus: ekycStatus,
             reportDownload: true,
             ...(fromDate && {
               fromDate
@@ -5243,16 +4836,25 @@ const SupervisorDetailsCard = () => {
             })
           })).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.");
+            if (!consumerList || consumerList.length === 0) {
+              alert(t("NO_EKYC_DATA_FOUND") || "No eKYC data found to download.");
               return;
             }
+            consumerList.forEach(item => {
+              if (item.assignedTime) {
+                item.assignedTime = new Date(item.assignedTime).toLocaleDateString("en-GB");
+              }
+              if (item.submittedAt) {
+                item.submittedAt = new Date(item.submittedAt).toLocaleDateString("en-GB");
+              }
+            });
             const excelData = getEkycExcelData(consumerList, t);
-            const cleanFileName = `eKYC_Data_Supervisor_${fullName.replace(/[^a-zA-Z0-9]/g, "_")}`;
+            const cleanFileName = `eKYC_Data_${vendorName.replace(/[^a-zA-Z0-9]/g, "_")}`;
             Digit.Download.Excel(excelData, cleanFileName);
           });
         }, function (error) {
-          console.error("Error downloading eKYC Excel:", error);
+          console.error("Failed to download eKYC data:", error);
+          alert(t("EKYC_DOWNLOAD_FAILED") || "Failed to download eKYC data. Please try again.");
         });
       }, function (_wasThrown, _result) {
         setEkycDownloadLoading(false);
@@ -5263,106 +4865,50 @@ 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
-      };
+  const handleApplyFilters = function () {
+    try {
+      setShowFilterModal(false);
+      return Promise.resolve(handleDownloadEkycData(customDate.startDate.getTime(), customDate.endDate.getTime())).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
     }
-    return null;
   };
-  const StatCard = _ref5 => {
-    let {
-      title,
-      value,
-      type,
-      isLoading,
-      icon
-    } = _ref5;
-    return /*#__PURE__*/React.createElement("div", {
-      className: `stat-card ${type}`
-    }, isLoading ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-      className: "stat-title skeleton skeleton-text"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "stat-value skeleton skeleton-number"
-    })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-      className: "stat-title"
-    }, title), /*#__PURE__*/React.createElement("div", {
-      className: "stat-value"
-    }, value), icon && /*#__PURE__*/React.createElement("div", {
-      className: "stat-icon"
-    }, icon)));
-  };
-  const isPageLoading = isProgressLoading || isSupervisorSearchLoading || isSurveyorSearchLoading || isVendorSearchLoading;
-  if (isPageLoading && !supervisor) {
-    return /*#__PURE__*/React.createElement(Loader, null);
-  }
-  if (!supervisor) {
-    return /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
-      style: {
-        padding: "24px"
-      }
-    }, t("NO_SUPERVISOR_FOUND")));
-  }
-  return /*#__PURE__*/React.createElement(Card, {
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Card, {
     className: "surveyor-dashboard"
   }, /*#__PURE__*/React.createElement("div", {
     className: "ekyc-dashboard-section"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "ekyc-details-wrapper"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "details-top-row"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "detail-item first-row"
   }, /*#__PURE__*/React.createElement("div", {
     className: "ekyc-dashboard-header"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "avatar"
-  }, fullName === null || fullName === void 0 ? void 0 : (_fullName$charAt = fullName.charAt(0)) === null || _fullName$charAt === void 0 ? void 0 : _fullName$charAt.toUpperCase()), /*#__PURE__*/React.createElement("div", {
     className: "header-content"
   }, /*#__PURE__*/React.createElement("h2", {
     className: "name"
   }, fullName), /*#__PURE__*/React.createElement("div", {
     className: "designation"
-  }, t("FIELD_SUPERVISOR") || "Field Supervisor"))), /*#__PURE__*/React.createElement("div", {
-    className: "report-download"
+  }, "(", t("FIELD_SUPERVISOR") || "Field Supervisor", ")"))), /*#__PURE__*/React.createElement("div", {
+    className: "report-download relative"
   }, /*#__PURE__*/React.createElement("button", {
-    className: "download-btn",
-    disabled: reportLoading,
-    onClick: handleDownload
-  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report"))), /*#__PURE__*/React.createElement("div", {
-    className: "stats-wrapper"
-  }, cards.map((card, idx) => /*#__PURE__*/React.createElement(StatCard, {
-    key: idx,
-    title: t(card.label),
-    value: card.count,
-    type: card.type,
-    isLoading: isProgressLoading,
-    icon: card.icon
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: "ekyc-dashboard-section"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ekyc-details-wrapper"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "details-top-row"
+    disabled: ekycDownloadLoading,
+    className: `download-btn relative ${ekycDownloadLoading ? "disabled" : ""}`,
+    onClick: () => setShowFilterModal(true)
+  }, /*#__PURE__*/React.createElement(MdDownloadIcon, null), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading" : t("DOWNLOAD_REPORT") || "Download Report")))), /*#__PURE__*/React.createElement("div", {
+    className: "details-grid-row"
   }, /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
+  }, t("VENDOR_NAME") || "Vendor Name"), /*#__PURE__*/React.createElement("span", {
+    className: "value"
+  }, vendorName)), /*#__PURE__*/React.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "label"
   }, t("MOBILE")), /*#__PURE__*/React.createElement("span", {
     className: "value"
   }, mobileNumber)), /*#__PURE__*/React.createElement("div", {
@@ -5371,130 +4917,36 @@ const SupervisorDetailsCard = () => {
     className: "label"
   }, t("EMAIL")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, email)), /*#__PURE__*/React.createElement("div", {
-    className: "download-card"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format.")), /*#__PURE__*/React.createElement("div", {
-    className: "report-download",
-    ref: reportMenuRef
-  }, /*#__PURE__*/React.createElement("button", {
-    className: "download-excel-btn",
-    disabled: ekycDownloadLoading,
-    onClick: () => {
-      setShowReportMenu(p => !p);
-      setShowCustomPicker(false);
-    }
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "16",
-    height: "16",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "currentColor",
-    strokeWidth: "2.5",
-    strokeLinecap: "round",
-    strokeLinejoin: "round"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"
-  }), /*#__PURE__*/React.createElement("polyline", {
-    points: "7 10 12 15 17 10"
-  }), /*#__PURE__*/React.createElement("line", {
-    x1: "12",
-    y1: "15",
-    x2: "12",
-    y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React.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(_ref6 => {
-    let {
-      label,
-      key
-    } = _ref6;
-    return /*#__PURE__*/React.createElement("div", {
-      key: key,
-      className: "menu-item",
-      onClick: () => handlePresetDownload(key)
-    }, label);
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "custom-date-trigger",
-    onClick: () => setShowCustomPicker(p => !p)
-  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
-    className: "custom-picker"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "date-inputs"
-  }, /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "From"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    value: customDate.from,
-    onChange: e => setCustomDate({
-      ...customDate,
-      from: e.target.value
-    })
-  })), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "To"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    value: customDate.to,
-    onChange: e => setCustomDate({
-      ...customDate,
-      to: e.target.value
-    })
-  }))), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      gap: "10px",
-      marginTop: "10px"
-    }
-  }, /*#__PURE__*/React.createElement("button", {
-    className: "picker-cancel-btn",
-    onClick: () => {
-      setShowCustomPicker(false);
-      setCustomDate({
-        from: "",
-        to: ""
-      });
-    }
-  }, t("CANCEL") || "Cancel"), /*#__PURE__*/React.createElement("button", {
-    className: "picker-apply-btn",
-    onClick: handleCustomDownload
-  }, t("APPLY") || "Apply"))))))), /*#__PURE__*/React.createElement("div", {
+  }, email))), /*#__PURE__*/React.createElement("div", {
     className: "details-grid-row"
   }, /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("GENDER")), /*#__PURE__*/React.createElement("span", {
-    className: "value"
-  }, t(gender) || gender)), /*#__PURE__*/React.createElement("div", {
-    className: "detail-item"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "label"
-  }, t("STATUS")), /*#__PURE__*/React.createElement("span", {
+  }, t("ASSIGNED_ZONE") || "Assigned Zone"), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, status)), /*#__PURE__*/React.createElement("div", {
+  }, assignedZone && assignedZone !== "N/A" ? t(assignedZone.trim().toUpperCase()) || assignedZone : assignedZone)), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("ASSIGNED_ZONE") || "Assigned Zone"), /*#__PURE__*/React.createElement("span", {
+  }, t("GENDER")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, assignedZone && assignedZone !== "N/A" ? /*#__PURE__*/React.createElement("div", {
-    className: "selected-zones",
-    style: {
-      marginTop: "4px"
-    }
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "selected-zone-chip"
-  }, t(assignedZone.trim().toUpperCase()) || assignedZone)) : assignedZone)), /*#__PURE__*/React.createElement("div", {
+  }, t(gender) || gender)), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("VENDOR_NAME") || "Vendor Name"), /*#__PURE__*/React.createElement("span", {
+  }, t("STATUS")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, vendorName))))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, {
+  }, status))))), /*#__PURE__*/React.createElement("div", {
+    className: "stats-wrapper"
+  }, cards.map((card, idx) => /*#__PURE__*/React.createElement(StatCard, {
+    key: idx,
+    title: t(card.label),
+    value: card.count,
+    type: card.type,
+    isLoading: isProgressLoading,
+    icon: card.icon
+  }))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, {
     t: t,
     tableTitle: t("CONNECTED_SURVEYORS") || "Connected Surveyors",
     tableClass: "ekycTable",
@@ -5526,7 +4978,15 @@ const SupervisorDetailsCard = () => {
       setPageSize(Number(e.target.value));
       setCurrentPage(0);
     }
-  })));
+  }))), showFilterModal && /*#__PURE__*/React.createElement(EkycFilterModal, {
+    t: t,
+    onClose: () => setShowFilterModal(false),
+    onApply: handleApplyFilters,
+    customDate: customDate,
+    setCustomDate: setCustomDate,
+    ekycStatus: ekycStatus,
+    setEkycStatus: setEkycStatus
+  }));
 };
 
 const AssignEkycModal = _ref => {
@@ -5973,11 +5433,13 @@ const AssignEkycModal = _ref => {
 };
 
 const SurveyorDetailsCard = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2, _surveyorSearchById$s, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _surveyor$owner4, _surveyor$owner7, _surveyor$owner8, _surveyor$owner9, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _dashboardData$dashbo5, _dashboardData$dashbo6;
+  var _Digit$SessionStorage, _Digit$SessionStorage2, _surveyorSearchById$s, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner4, _surveyor$owner5, _surveyor$owner6, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _dashboardData$dashbo5, _dashboardData$dashbo6;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const [showModal, setShowModal] = useState(null);
   const [showOptions, setShowOptions] = useState(false);
   const [ekycDownloadLoading, setEkycDownloadLoading] = useState(false);
+  const [showFilterModal, setShowFilterModal] = useState(false);
+  const [ekycStatus, setEkycStatus] = useState("ALL");
   const {
     id: surveyorId
   } = useParams();
@@ -6057,15 +5519,13 @@ const SurveyorDetailsCard = () => {
     return (mappedSupervisor === null || mappedSupervisor === void 0 ? void 0 : mappedSupervisor.name) || (mappedSupervisor === null || mappedSupervisor === void 0 ? void 0 : (_mappedSupervisor$own = mappedSupervisor.owner) === null || _mappedSupervisor$own === void 0 ? void 0 : _mappedSupervisor$own.name) || surveyor.supervisorId || "N/A";
   }, [supervisorSearchResponse, surveyor === null || surveyor === void 0 ? void 0 : surveyor.supervisorId, surveyor === null || surveyor === void 0 ? void 0 : surveyor.supervisorName]);
   const fullName = (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner = surveyor.owner) === null || _surveyor$owner === void 0 ? void 0 : _surveyor$owner.name) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.name) || "N/A";
-  const employeeId = (surveyor === null || surveyor === void 0 ? void 0 : surveyor.employeeId) || (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner2 = surveyor.owner) === null || _surveyor$owner2 === void 0 ? void 0 : _surveyor$owner2.uuid) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.id);
-  const mobileNumber = (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner3 = surveyor.owner) === null || _surveyor$owner3 === void 0 ? void 0 : _surveyor$owner3.mobileNumber) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.mobileNo) || "N/A";
   const [currentPage, setCurrentPage] = useState(0);
   const [pageSize, setPageSize] = useState(20);
   const queryParams = {
     tenantId: "dl.djb",
     offset: currentPage * pageSize,
     limit: pageSize,
-    surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner4 = surveyor.owner) === null || _surveyor$owner4 === void 0 ? void 0 : _surveyor$owner4.uuid
+    surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner2 = surveyor.owner) === null || _surveyor$owner2 === void 0 ? void 0 : _surveyor$owner2.uuid
   };
   const {
     isFetching: isDashboardLoading,
@@ -6122,24 +5582,10 @@ const SurveyorDetailsCard = () => {
       return value ? Digit.DateUtils.ConvertEpochToDate(value) : "-";
     }
   }], [t]);
-  const [showReportMenu, setShowReportMenu] = useState(false);
   const [customDate, setCustomDate] = useState({
     from: "",
     to: ""
   });
-  const [showCustomPicker, setShowCustomPicker] = useState(false);
-  const [reportLoading, setReportLoading] = useState(false);
-  const reportMenuRef = useRef(null);
-  useEffect(() => {
-    const handler = e => {
-      if (reportMenuRef.current && !reportMenuRef.current.contains(e.target)) {
-        setShowReportMenu(false);
-        setShowCustomPicker(false);
-      }
-    };
-    document.addEventListener("mousedown", handler);
-    return () => document.removeEventListener("mousedown", handler);
-  }, []);
   const isPageLoading = isLoading || isVendorLoading || isSupervisorSearchLoading;
   if (isPageLoading && !surveyor) {
     return /*#__PURE__*/React.createElement(Loader, null);
@@ -6151,100 +5597,6 @@ const SurveyorDetailsCard = () => {
       }
     }, t("NO_SURVEYOR_FOUND")));
   }
-  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 handleDownload = function () {
-    try {
-      setReportLoading(true);
-      const _temp = _finallyRethrows(function () {
-        return _catch(function () {
-          var _surveyor$owner5;
-          return Promise.resolve(Digit.EkycService.dashboard({}, {
-            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
-          })).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) || [];
-            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 dashboard data for report download:", err);
-        });
-      }, function (_wasThrown, _result) {
-        setReportLoading(false);
-        if (_wasThrown) throw _result;
-        return _result;
-      });
-      return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  const handlePresetDownload = function (filter) {
-    try {
-      const range = getDateRange(filter);
-      if (!range) return Promise.resolve();
-      setShowReportMenu(false);
-      setShowCustomPicker(false);
-      return Promise.resolve(handleDownloadEkycData(range.from.getTime(), range.to.getTime())).then(function () {});
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  const handleCustomDownload = function () {
-    try {
-      if (!customDate.from || !customDate.to) {
-        alert(t("SELECT_DATE_RANGE") || "Please select both From and To dates.");
-        return Promise.resolve();
-      }
-      const from = new Date(customDate.from);
-      from.setHours(0, 0, 0, 0);
-      const to = new Date(customDate.to);
-      to.setHours(23, 59, 59, 999);
-      setShowReportMenu(false);
-      setShowCustomPicker(false);
-      return Promise.resolve(handleDownloadEkycData(from.getTime(), to.getTime())).then(function () {});
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
   const StatCard = _ref4 => {
     let {
       title,
@@ -6276,17 +5628,26 @@ const SurveyorDetailsCard = () => {
     setShowOptions(false);
     setShowModal(option.action);
   };
+  const closeModal = function () {
+    try {
+      setShowModal(null);
+      return Promise.resolve();
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   const handleDownloadEkycData = function (fromDate, toDate) {
     try {
       setEkycDownloadLoading(true);
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
-          var _surveyor$owner6;
+          var _surveyor$owner3;
           return Promise.resolve(Digit.EkycService.application_list({
-            tenantId: tenantId || "dl.djb",
+            tenantId: tenantId,
             offset: 0,
             limit: 10000,
-            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner6 = surveyor.owner) === null || _surveyor$owner6 === void 0 ? void 0 : _surveyor$owner6.uuid,
+            surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner3 = surveyor.owner) === null || _surveyor$owner3 === void 0 ? void 0 : _surveyor$owner3.uuid,
+            ekycStatus: ekycStatus,
             reportDownload: true,
             ...(fromDate && {
               fromDate
@@ -6296,35 +5657,44 @@ const SurveyorDetailsCard = () => {
             })
           })).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.");
+            if (!consumerList || consumerList.length === 0) {
+              alert(t("NO_EKYC_DATA_FOUND") || "No eKYC data found to download.");
               return;
             }
+            consumerList.forEach(item => {
+              if (item.assignedTime) {
+                item.assignedTime = new Date(item.assignedTime).toLocaleDateString("en-GB");
+              }
+              if (item.submittedAt) {
+                item.submittedAt = new Date(item.submittedAt).toLocaleDateString("en-GB");
+              }
+            });
             const excelData = getEkycExcelData(consumerList, t);
-            const cleanFileName = `eKYC_Data_${fullName.replace(/[^a-zA-Z0-9]/g, "_")}`;
+            const cleanFileName = `eKYC_Data_${vendorName.replace(/[^a-zA-Z0-9]/g, "_")}`;
             Digit.Download.Excel(excelData, cleanFileName);
           });
         }, function (error) {
-          console.error("Error downloading eKYC Excel:", error);
+          console.error("Failed to download eKYC data:", error);
+          alert(t("EKYC_DOWNLOAD_FAILED") || "Failed to download eKYC data. Please try again.");
         });
-      }, function (_wasThrown2, _result2) {
+      }, function (_wasThrown, _result) {
         setEkycDownloadLoading(false);
-        if (_wasThrown2) throw _result2;
-        return _result2;
+        if (_wasThrown) throw _result;
+        return _result;
       }));
     } catch (e) {
       return Promise.reject(e);
     }
   };
-  const closeModal = function () {
+  const handleApplyFilters = function () {
     try {
-      setShowModal(null);
-      return Promise.resolve();
+      setShowFilterModal(false);
+      return Promise.resolve(handleDownloadEkycData(customDate.startDate.getTime(), customDate.endDate.getTime())).then(function () {});
     } catch (e) {
       return Promise.reject(e);
     }
   };
-  return /*#__PURE__*/React.createElement(Card, {
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Card, {
     className: "surveyor-dashboard"
   }, /*#__PURE__*/React.createElement("div", {
     className: "ekyc-dashboard-section"
@@ -6343,142 +5713,52 @@ const SurveyorDetailsCard = () => {
   }, fullName), /*#__PURE__*/React.createElement("div", {
     className: "designation"
   }, "(", (surveyor === null || surveyor === void 0 ? void 0 : surveyor.description) || t("FIELD_SURVEYOR"), ")"))), /*#__PURE__*/React.createElement("div", {
-    className: "report-download"
+    className: "report-download relative"
   }, /*#__PURE__*/React.createElement("button", {
-    className: "download-btn",
-    disabled: reportLoading,
-    onClick: handleDownload
-  }, reportLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_REPORT") || "Download Report")))), /*#__PURE__*/React.createElement("div", {
-    className: "details-top-row"
+    disabled: ekycDownloadLoading,
+    className: `download-btn relative ${ekycDownloadLoading ? "disabled" : ""}`,
+    onClick: () => setShowFilterModal(true)
+  }, /*#__PURE__*/React.createElement(MdDownloadIcon, null), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading" : t("DOWNLOAD_REPORT") || "Download Report")))), /*#__PURE__*/React.createElement("div", {
+    className: "details-grid-row"
   }, /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("MOBILE")), /*#__PURE__*/React.createElement("span", {
+  }, t("VENDOR_NAME") || "Vendor Name"), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (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.createElement("div", {
+  }, vendorName)), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("EMAIL")), /*#__PURE__*/React.createElement("span", {
+  }, t("SUPERVISOR_NAME") || "Supervisor Name"), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (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.createElement("div", {
-    className: "download-card"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format.")), /*#__PURE__*/React.createElement("div", {
-    className: "report-download",
-    ref: reportMenuRef
-  }, /*#__PURE__*/React.createElement("button", {
-    className: "download-excel-btn",
-    disabled: ekycDownloadLoading,
-    onClick: () => {
-      setShowReportMenu(p => !p);
-      setShowCustomPicker(false);
-    }
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "16",
-    height: "16",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "currentColor",
-    strokeWidth: "2.5",
-    strokeLinecap: "round",
-    strokeLinejoin: "round"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"
-  }), /*#__PURE__*/React.createElement("polyline", {
-    points: "7 10 12 15 17 10"
-  }), /*#__PURE__*/React.createElement("line", {
-    x1: "12",
-    y1: "15",
-    x2: "12",
-    y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React.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,
-      key
-    } = _ref5;
-    return /*#__PURE__*/React.createElement("div", {
-      key: key,
-      className: "menu-item",
-      onClick: () => handlePresetDownload(key)
-    }, label);
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "custom-date-trigger",
-    onClick: () => setShowCustomPicker(p => !p)
-  }, t("CUSTOM_DATE") || "Custom Date"), showCustomPicker && /*#__PURE__*/React.createElement("div", {
-    className: "custom-picker"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "date-inputs"
-  }, /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "From"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    value: customDate.from,
-    onChange: e => setCustomDate({
-      ...customDate,
-      from: e.target.value
-    })
-  })), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("span", null, "To"), /*#__PURE__*/React.createElement("input", {
-    type: "date",
-    value: customDate.to,
-    onChange: e => setCustomDate({
-      ...customDate,
-      to: e.target.value
-    })
-  }))), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      gap: "10px",
-      marginTop: "10px"
-    }
-  }, /*#__PURE__*/React.createElement("button", {
-    className: "picker-cancel-btn",
-    onClick: () => {
-      setShowCustomPicker(false);
-      setCustomDate({
-        from: "",
-        to: ""
-      });
-    }
-  }, t("CANCEL") || "Cancel"), /*#__PURE__*/React.createElement("button", {
-    className: "picker-apply-btn",
-    onClick: handleCustomDownload
-  }, t("APPLY") || "Apply"))))))), /*#__PURE__*/React.createElement("div", {
-    className: "details-grid-row"
-  }, /*#__PURE__*/React.createElement("div", {
+  }, supervisorName)), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("GENDER")), /*#__PURE__*/React.createElement("span", {
+  }, t("MOBILE")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (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.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner4 = surveyor.owner) === null || _surveyor$owner4 === void 0 ? void 0 : _surveyor$owner4.mobileNumber) || (surveyor === null || surveyor === void 0 ? void 0 : surveyor.mobileNo) || "N/A"))), /*#__PURE__*/React.createElement("div", {
+    className: "details-grid-row"
+  }, /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("STATUS")), /*#__PURE__*/React.createElement("span", {
+  }, t("EMAIL")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : surveyor.status) || "N/A")), /*#__PURE__*/React.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner5 = surveyor.owner) === null || _surveyor$owner5 === void 0 ? void 0 : _surveyor$owner5.emailId) || "N/A")), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("VENDOR_NAME") || "Vendor Name"), /*#__PURE__*/React.createElement("span", {
+  }, t("GENDER")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, vendorName)), /*#__PURE__*/React.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner6 = surveyor.owner) === null || _surveyor$owner6 === void 0 ? void 0 : _surveyor$owner6.gender) || "N/A")), /*#__PURE__*/React.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("SUPERVISOR_NAME") || "Supervisor Name"), /*#__PURE__*/React.createElement("span", {
+  }, t("STATUS")), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, supervisorName))))), /*#__PURE__*/React.createElement("div", {
+  }, (surveyor === null || surveyor === void 0 ? void 0 : surveyor.status) || "N/A"))))), /*#__PURE__*/React.createElement("div", {
     className: "stats-wrapper"
   }, /*#__PURE__*/React.createElement(StatCard, {
     title: t("TOTAL_ASSIGNED"),
@@ -6558,6 +5838,14 @@ const SurveyorDetailsCard = () => {
     isReassign: showModal === "EKYC_REASSIGN",
     closeModal: closeModal,
     refetchDashboard: refetchDashboard
+  })), showFilterModal && /*#__PURE__*/React.createElement(EkycFilterModal, {
+    t: t,
+    onClose: () => setShowFilterModal(false),
+    onApply: handleApplyFilters,
+    customDate: customDate,
+    setCustomDate: setCustomDate,
+    ekycStatus: ekycStatus,
+    setEkycStatus: setEkycStatus
   }));
 };
 
@@ -7315,12 +6603,12 @@ const EmployeeApp = _ref => {
       layoutClass: "normal"
     }, /*#__PURE__*/React.createElement(VendorDetailsCard, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: [`${path}/supervisor-dashboard/:id`, `${path}/supervisor-dashboard`],
+    path: `${path}/supervisor-dashboard/:id/:vendorId?`,
     component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
       layoutClass: "normal"
     }, /*#__PURE__*/React.createElement(SupervisorDetailsCard, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: [`${path}/surveyor-dashboard/:id`, `${path}/surveyor-dashboard`],
+    path: `${path}/surveyor-dashboard/:id?`,
     component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
       layoutClass: "normal"
     }, /*#__PURE__*/React.createElement(SurveyorDetailsCard, null))
@@ -9027,7 +8315,7 @@ const CitizenApp = () => {
       layoutClass: "normal"
     }, /*#__PURE__*/React.createElement(Review, null))
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: [`${path}/vendor-dashboard/:vendorId`, `${path}/vendor-dashboard`],
+    path: `${path}/vendor-dashboard/:vendorId?`,
     component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
       layoutClass: "normal"
     }, /*#__PURE__*/React.createElement(VendorDetailsCard, null))