npm - @djb25/digit-ui-module-ekyc - Versions diffs - 1.0.43 → 1.0.45 - Mend

@djb25/digit-ui-module-ekyc 1.0.43 → 1.0.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.modern.js CHANGED Viewed

@@ -1,18 +1,20 @@
-import React, { useRef, useEffect, useMemo, useState, createContext, useContext, isValidElement, cloneElement, createElement, useCallback, useReducer, Fragment } from 'react';
+import React, { useState, useRef, useEffect, useMemo, createContext, useContext, isValidElement, cloneElement, createElement, useCallback, useReducer, Fragment } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory, Link, useLocation, useParams, useRouteMatch, Switch, Route, Redirect } from 'react-router-dom';
-import { PersonIcon, EmployeeModuleCard, Loader, Card, InboxLinks, Table, HomeIcon, TextInput, Header, SubmitBar, DetailsCard, FilterForm, FilterFormField, Dropdown, Label, CustomTooltip, CardLabelError, SearchField, RadioButtons, InboxComposer, EditIcon, DeleteIcon, CardHeader, CardText, LabelFieldPair, CardLabel, ActionBar, Modal, Toast, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, Menu, LinkButton, UploadFile, FormComposer, VerticalTimeline, Close, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, CitizenHomeCard, DocumentIcon, BackButton } from '@djb25/digit-ui-react-components';
+import { PersonIcon, EmployeeModuleCard, Loader, Card, InboxLinks, Table, HomeIcon, TextInput, Header, SubmitBar, DetailsCard, FilterForm, FilterFormField, Dropdown, Label, CustomTooltip, CardLabelError, SearchField, RadioButtons, InboxComposer, EditIcon, DeleteIcon, CardHeader, CardText, LabelFieldPair, CardLabel, ActionBar, Modal, Toast, CardSubHeader, StatusTable, Row, GenericFileIcon, CheckBox, Menu, LinkButton, UploadFile, FormComposer, VerticalTimeline, Close, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, CitizenHomeCard, DocumentIcon } from '@djb25/digit-ui-react-components';
 import * as Chartjs from 'chart.js/auto';
 import Chartjs__default, { Chart } from 'chart.js/auto';
+import 'three/tsl';
 import { FaUsers, FaCheckCircle, FaClock, FaExclamationTriangle, FaUserTie, FaChartLine, FaSearch, FaArrowRight, FaMapMarkedAlt } from 'react-icons/fa';
 import { ResponsiveContainer, LineChart, CartesianGrid, XAxis, YAxis, Tooltip, Legend, Line, BarChart, Bar, PieChart, Pie, Cell } from 'recharts';
 const EKYCCard = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3;
+  var _Digit$SessionStorage, _Digit$SessionStorage2;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const roles = ((_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.roles) === null || _Digit$SessionStorage3 === void 0 ? void 0 : _Digit$SessionStorage3.map(r => r.code)) || [];
+  const citizenInfo = (_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$SessionStorage2.roles;
+  const roles = Array.isArray(citizenInfo) ? citizenInfo.map(ele => ele.code || ele) : [];
   const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycApplicationList({}, {
       tenantId,
       offset: 0,
@@ -23,50 +25,235 @@ const EKYCCard = () => {
     listData = _Digit$Hooks$ekyc$use.data,
     isLoading = _Digit$Hooks$ekyc$use.isLoading;
   const totalCount = isLoading ? "-" : (listData === null || listData === void 0 ? void 0 : listData.totalCount) || 0;
-  const propsForModuleCard = {
-    Icon: /*#__PURE__*/React.createElement(PersonIcon, null),
-    moduleName: t("ACTION_TEST_EKYC"),
-    kpis: [{
-      count: totalCount,
-      label: t("TOTAL_EKYC"),
-      link: "/digit-ui/employee/ekyc/admin-dashboard"
-    }],
-    links: [{
+  const isCitizen = window.location.pathname.includes("/citizen");
+  const prefix = isCitizen ? "/digit-ui/citizen/ekyc" : "/digit-ui/employee/ekyc";
+  let links = [];
+  if (isCitizen) {
+    if (roles.includes("EKYC_SURVEYOR")) {
+      links.push({
+        label: t("SURVEYOR_DASHBOARD"),
+        link: prefix + "/surveyor-dashboard"
+      });
+    }
+    if (roles.includes("EKYC_SUPERVISOR") || roles.includes("EKYC_VENDOR")) {
+      links.push({
+        count: totalCount,
+        label: t("EKYC_INBOX"),
+        link: prefix + "/inbox"
+      });
+    }
+    if (roles.includes("EKYC_SUPERVISOR")) {
+      links.push({
+        label: t("EKYC_SUPERVISOR_DASHBOARD"),
+        link: prefix + "/supervisor-dashboard"
+      }, {
+        label: t("EKYC_ASSIGN"),
+        link: prefix + "/assign"
+      });
+    }
+    if (roles.includes("EKYC_VENDOR")) {
+      links.push({
+        label: t("EKYC_VENDOR_DASHBOARD"),
+        link: prefix + "/vendor-dashboard"
+      });
+    }
+    if (roles.includes("EKYC_SUPERVISOR") || roles.includes("EKYC_VENDOR")) {
+      links.push({
+        label: t("TITLE_VENDOR_MANAGEMENT"),
+        link: "/digit-ui/citizen/vendor/search-vendor"
+      });
+    }
+    if (links.length === 0 || roles.length === 1 && roles.includes("CITIZEN")) {
+      links.push({
+        label: t("EKYC_STATUS"),
+        link: prefix + "/:id"
+      });
+    }
+  } else {
+    links = [{
       label: t("CEO_M.F_DOR_FINANCE_VIEW"),
-      link: "/digit-ui/employee/ekyc/ceo-dashboard"
+      link: prefix + "/ceo-dashboard"
     }, {
       label: t("EKYC_ADMIN_DASHBOARD") || "Admin Dashboard",
-      link: "/digit-ui/employee/ekyc/admin-dashboard"
+      link: prefix + "/admin-dashboard"
     }, {
       count: totalCount,
       label: t("EKYC_INBOX"),
-      link: "/digit-ui/employee/ekyc/inbox"
+      link: prefix + "/inbox"
     }, ...(!roles.includes("EMPLOYEE") ? [{
       label: t("EKYC_ASSIGN"),
-      link: "/digit-ui/employee/ekyc/assign"
-    }] : [])]
+      link: prefix + "/assign"
+    }] : [])];
+  }
+  const propsForModuleCard = {
+    Icon: /*#__PURE__*/React.createElement(PersonIcon, null),
+    moduleName: t("ACTION_TEST_EKYC"),
+    kpis: isCitizen ? [] : [{
+      count: totalCount,
+      label: t("TOTAL_EKYC"),
+      link: prefix + "/admin-dashboard"
+    }],
+    links: links
   };
   return /*#__PURE__*/React.createElement(EmployeeModuleCard, propsForModuleCard);
 };
+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;
+}
+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);
+}
 const getChartConstructor = () => {
   const C = Chart || Chartjs__default || Chartjs;
   return C;
 };
 const StatusCards = _ref => {
+  var _Digit$SessionStorage;
   let countData = _ref.countData;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  const _useState = useState(false),
+    ekycDownloadLoading = _useState[0],
+    setEkycDownloadLoading = _useState[1];
+  let tenantId = Digit.ULBService.getCurrentTenantId();
+  if (!tenantId || tenantId === "dl") {
+    tenantId = "dl.djb";
+  }
+  const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
+  const fullName = (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.name) || "Admin";
+  const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycSurveyorDashboard({}, {
+      tenantId,
+      offset: 0,
+      limit: 10,
+      ekycStatus: "submitted"
+    }, {
+      enabled: !!tenantId
+    }),
+    dashboardData = _Digit$Hooks$ekyc$use.data;
+  const apiCountData = React.useMemo(() => {
+    const info = (dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.dashboardInfo) || {};
+    return {
+      total: info.total || 0,
+      completed: info.completed || 0,
+      pending: info.pending || 0,
+      submittedCount: info.submittedCount || 0,
+      inProgressCount: info.inProgressCount || 0,
+      rejected: info.rejected || 0,
+      active: info.active || 0
+    };
+  }, [dashboardData]);
+  const handleDownloadEkycData = function () {
+    try {
+      setEkycDownloadLoading(true);
+      return Promise.resolve(_finallyRethrows(function () {
+        return _catch(function () {
+          return Promise.resolve(Digit.EkycService.application_list({
+            tenantId: tenantId,
+            offset: 0,
+            limit: 10000,
+            reportDownload: true
+          })).then(function (response) {
+            const consumerList = (response === null || response === void 0 ? void 0 : response.consumerList) || [];
+            if (consumerList.length === 0) {
+              alert(t("NO_DATA_FOUND") || "No data found for download.");
+              return;
+            }
+            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile"];
+            const headerMapping = {
+              kno: t("KNO") || "KNO",
+              firstName: t("FIRST_NAME") || "First Name",
+              middleName: t("MIDDLE_NAME") || "Middle Name",
+              lastName: t("LAST_NAME") || "Last Name",
+              gender: t("GENDER") || "Gender",
+              mobileNumber: t("MOBILE_NUMBER") || "Mobile Number",
+              emailId: t("EMAIL_ID") || "Email ID",
+              fatherOrHusbandName: t("FATHER_HUSBUND_NAME") || "Father/Husband Name",
+              relationship: t("RELATIONSHIP") || "Relationship",
+              dob: t("DOB") || "Date of Birth",
+              ekycStatus: t("EKYC_STATUS") || "eKYC Status",
+              zoneName: t("ZONE") || "Zone",
+              assembly: t("ASSEMBLY") || "Assembly",
+              ward: t("WARD") || "Ward",
+              pincode: t("PINCODE") || "Pincode",
+              mrkey: t("MR_KEY") || "MR Key",
+              consumerType: t("CONSUMER_TYPE") || "Consumer Type",
+              createdTime: t("CREATED_TIME") || "Created Time",
+              lastModifiedTime: t("LAST_MODIFIED_TIME") || "Last Modified Time"
+            };
+            const toTitleCase = str => {
+              if (!str) return "";
+              const cleanStr = String(str).includes(".") ? String(str).split(".").pop() : String(str);
+              return cleanStr.toLowerCase().replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
+            };
+            const skipTitleCase = ["kno", "mobileNumber", "emailId", "pincode", "mrkey", "dob", "createdTime", "lastModifiedTime"];
+            const excelData = consumerList.map(item => {
+              const cleanObj = {};
+              const name = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
+              if (name) {
+                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(name);
+              }
+              Object.keys(item).forEach(key => {
+                if (excludedKeys.includes(key)) return;
+                const val = item[key];
+                if (typeof val === "object" && val !== null) {
+                  return;
+                }
+                const friendlyHeader = headerMapping[key] || t(key.toUpperCase()) || key;
+                if (typeof val === "string" && !skipTitleCase.includes(key)) {
+                  cleanObj[friendlyHeader] = toTitleCase(val);
+                } else {
+                  cleanObj[friendlyHeader] = val;
+                }
+              });
+              return cleanObj;
+            });
+            const cleanFileName = "eKYC_All_Data_Admin_" + fullName.replace(/[^a-zA-Z0-9]/g, "_");
+            Digit.Download.Excel(excelData, cleanFileName);
+          });
+        }, function (error) {
+          console.error("Error downloading eKYC Excel:", error);
+        });
+      }, function (_wasThrown, _result) {
+        setEkycDownloadLoading(false);
+        if (_wasThrown) throw _result;
+        return _result;
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   const chartRef1 = useRef(null);
   const chartInstance1 = useRef(null);
-  const total = (countData === null || countData === void 0 ? void 0 : countData.total) || 0;
-  const pending = (countData === null || countData === void 0 ? void 0 : countData.pending) || 0;
-  const active = (countData === null || countData === void 0 ? void 0 : countData.completed) || 0;
-  const completed = 0;
-  const actualCompleted = (countData === null || countData === void 0 ? void 0 : countData.completed) || 0;
+  const total = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.total) || (countData === null || countData === void 0 ? void 0 : countData.total) || (countData === null || countData === void 0 ? void 0 : countData.totalCount) || 0;
+  const pending = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.pending) || (countData === null || countData === void 0 ? void 0 : countData.pending) || 0;
+  const active = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.active) || (countData === null || countData === void 0 ? void 0 : countData.active) || 0;
+  const completed = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.completed) || (countData === null || countData === void 0 ? void 0 : countData.completed) || 0;
+  const inprocess = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.inProgressCount) || (countData === null || countData === void 0 ? void 0 : countData.inProgressCount) || 0;
+  const submitted = (apiCountData === null || apiCountData === void 0 ? void 0 : apiCountData.submittedCount) || (countData === null || countData === void 0 ? void 0 : countData.submittedCount) || 0;
+  const actualCompleted = completed;
   const approved = actualCompleted;
-  const efficiency = total > 0 ? Math.round(actualCompleted / total * 100) : 0;
-  const healthPct = total > 0 ? Math.round(approved / total * 100) : 0;
+  const efficiency = total > 0 ? Math.round((submitted + completed) / total * 100) : 0;
+  const healthPct = submitted > 0 ? Math.round(approved / submitted * 100) : 0;
   const formatNumber = num => new Intl.NumberFormat("en-IN").format(num || 0);
   useEffect(() => {
     if (chartRef1.current) {
@@ -76,11 +263,11 @@ const StatusCards = _ref => {
       chartInstance1.current = new ChartConstructor(ctx1, {
         type: "doughnut",
         data: {
-          labels: [t("EKYC_ACTIVE"), t("EKYC_PENDING"), t("EKYC_COMPLETED")],
+          labels: [t("EKYC_PENDING"), t("EKYC_COMPLETED"), t("EKYC_SUBMITTED"), t("EKYC_INPROCESS")],
           datasets: [{
-            data: [active, pending, completed],
-            backgroundColor: ["#0c2a52", "#77B6EA", "#c8ddf5"],
-            borderColor: ["#ffffff", "#ffffff", "#ffffff"],
+            data: [pending, completed, submitted, inprocess],
+            backgroundColor: ["#0c2a52", "#77B6EA", "#c8ddf5", "#49a3fb"],
+            borderColor: ["#ffffff", "#ffffff", "#ffffff", "#ffffff"],
             borderWidth: 2,
             hoverOffset: 4
           }]
@@ -102,17 +289,21 @@ const StatusCards = _ref => {
     };
   }, [pending, completed, active, t]);
   const legendItems = [{
-    color: "#0c2a52",
-    label: t("EKYC_ACTIVE"),
-    value: active
-  }, {
     color: "#77B6EA",
+    label: t("EKYC_COMPLETED"),
+    value: completed
+  }, {
+    color: "#0c2a52",
     label: t("EKYC_PENDING"),
     value: pending
   }, {
     color: "#c8ddf5",
-    label: t("EKYC_COMPLETED"),
-    value: completed
+    label: t("EKYC_SUBMITTED"),
+    value: submitted
+  }, {
+    color: "#49a3fb",
+    label: t("EKYC_INPROCESS"),
+    value: inprocess
   }];
   return /*#__PURE__*/React.createElement("div", {
     className: "ekyc-employee-container"
@@ -134,9 +325,29 @@ const StatusCards = _ref => {
     className: "total-label"
   }, t("EKYC_TOTAL_APPLICATIONS") || "Total Applications Processed"), /*#__PURE__*/React.createElement("div", {
     className: "total-number"
-  }, formatNumber(total)), /*#__PURE__*/React.createElement("div", {
-    className: "total-badge"
-  }, "\u2197 +12.4% ", t("EKYC_FROM_LAST_QUARTER") || "from last quarter"))), /*#__PURE__*/React.createElement("div", {
+  }, formatNumber(total)), /*#__PURE__*/React.createElement("button", {
+    className: "download-excel-btn",
+    disabled: ekycDownloadLoading,
+    onClick: handleDownloadEkycData
+  }, /*#__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"))), /*#__PURE__*/React.createElement("div", {
     className: "status-panels-grid"
   }, /*#__PURE__*/React.createElement("div", {
     className: "status-panel"
@@ -178,17 +389,13 @@ const StatusCards = _ref => {
     className: "status-panel"
   }, /*#__PURE__*/React.createElement("div", {
     className: "panel-title"
-  }, t("EKYC_SUBMISSION_HEALTH") || "Submission Health", /*#__PURE__*/React.createElement("span", {
-    className: "optimal-badge"
-  }, t("EKYC_OPTIMAL") || "Optimal")), /*#__PURE__*/React.createElement("div", {
+  }, t("EKYC_SUBMISSION_HEALTH") || "Submission Health"), /*#__PURE__*/React.createElement("div", {
     className: "panel-subtitle"
   }, t("EKYC_PLATFORM_EFFICIENCY") || "Platform operational efficiency"), /*#__PURE__*/React.createElement("div", {
     className: "health-metrics-row"
   }, /*#__PURE__*/React.createElement("div", {
     className: "health-percentage"
-  }, healthPct, "%"), /*#__PURE__*/React.createElement("div", {
-    className: "health-trend"
-  }, "\u2197 +2.1%")), /*#__PURE__*/React.createElement("div", {
+  }, healthPct, "%")), /*#__PURE__*/React.createElement("div", {
     className: "status-progress-bar"
   }, /*#__PURE__*/React.createElement("div", {
     className: "progress-fill",
@@ -203,13 +410,13 @@ const StatusCards = _ref => {
     className: "metric-label"
   }, t("EKYC_AVG_LATENCY") || "Avg Latency"), /*#__PURE__*/React.createElement("div", {
     className: "metric-value"
-  }, "1.2s")), /*#__PURE__*/React.createElement("div", {
+  }, "0s")), /*#__PURE__*/React.createElement("div", {
     className: "metric-box"
   }, /*#__PURE__*/React.createElement("div", {
     className: "metric-label"
   }, t("EKYC_ERROR_RATE") || "Error Rate"), /*#__PURE__*/React.createElement("div", {
     className: "metric-value"
-  }, "0.04%")))))));
+  }, "0.0%")))))));
 };
 const Dashboard = () => {
@@ -279,6 +486,10 @@ const DesktopInbox = _ref => {
     countData = props.countData;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  const toTitleCase = str => {
+    if (!str) return "";
+    return String(str).toLowerCase().replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
+  };
   const history = useHistory();
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const FilterComponent = (_Digit$ComponentRegis = Digit.ComponentRegistryService) === null || _Digit$ComponentRegis === void 0 ? void 0 : _Digit$ComponentRegis.getComponent(filterComponent);
@@ -321,37 +532,38 @@ const DesktopInbox = _ref => {
     Cell: _ref3 => {
       var _row$original3;
       let row = _ref3.row;
-      return /*#__PURE__*/React.createElement("span", null, ((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.citizenName) || "NA");
+      return /*#__PURE__*/React.createElement("span", null, toTitleCase((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.citizenName) || "NA");
     }
   }, {
     Header: t("EKYC_STATUS"),
     accessor: "actionStatus",
     Cell: _ref4 => {
-      var _row$original4;
+      var _row$original4, _row$original5;
       let row = _ref4.row;
       const status = (((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.status) || "DEFAULT").toUpperCase();
       return /*#__PURE__*/React.createElement("span", {
         className: "ekyc-status-tag " + status
-      }, t("" + status));
+      }, toTitleCase(((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.status) || "DEFAULT"));
     }
   }, {
     Header: t("EKYC_EKYC_STATUS"),
     accessor: "ekycStatus",
     Cell: _ref5 => {
-      var _row$original5, _row$original6;
+      var _row$original6, _row$original7;
       let row = _ref5.row;
-      const ekycStatus = (((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.ekycStatus) || ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.ekycstatus) || "NA").toUpperCase();
+      const raw = ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.ekycStatus) || ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.ekycstatus) || "NA";
+      const ekycStatus = raw.toUpperCase();
       return /*#__PURE__*/React.createElement("span", {
         className: "ekyc-status-tag " + ekycStatus
-      }, t("" + ekycStatus));
+      }, toTitleCase(raw));
     }
   }, {
     Header: t("EKYC_ACTION"),
     accessor: "status",
     Cell: _ref6 => {
-      var _row$original7, _row$original8;
+      var _row$original8, _row$original9;
       let row = _ref6.row;
-      const kno = ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.kno) || ((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.applicationNumber) || "NA";
+      const kno = ((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.kno) || ((_row$original9 = row.original) === null || _row$original9 === void 0 ? void 0 : _row$original9.applicationNumber) || "NA";
       return /*#__PURE__*/React.createElement("span", {
         className: "link",
         onClick: () => handleReview(kno)
@@ -1590,31 +1802,6 @@ const CeoDashboard = () => {
   }, /*#__PURE__*/React.createElement("h3", null, topKpis.successRate, "%"), /*#__PURE__*/React.createElement("p", null, "Operational Efficiency")))))));
 };
-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;
-}
-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);
-}
 const downloadSurveyorPDF = function (_ref) {
   let rows = _ref.rows,
     surveyorName = _ref.surveyorName,
@@ -1704,6 +1891,123 @@ const downloadSurveyorPDF = function (_ref) {
     return Promise.reject(e);
   }
 };
+const downloadSupervisorPDF = function (_ref2) {
+  let rows = _ref2.rows,
+    supervisorName = _ref2.supervisorName,
+    mobileNumber = _ref2.mobileNumber,
+    vendorName = _ref2.vendorName,
+    dashboardInfo = _ref2.dashboardInfo,
+    t = _ref2.t;
+  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),
+        submittedAt: 1717171717171,
+        progress: row.progress || "0%"
+      };
+    });
+    const originalToLocaleDateString = Date.prototype.toLocaleDateString;
+    let progressIndex = 0;
+    Date.prototype.toLocaleDateString = function () {
+      if (progressIndex < mappedRows.length) {
+        return mappedRows[progressIndex++].progress || "0%";
+      }
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return originalToLocaleDateString.apply(this, args);
+    };
+    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");
+      }
+    } finally {
+      Date.prototype.toLocaleDateString = originalToLocaleDateString;
+    }
+    return Promise.resolve();
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
 const downloadVendorPDF = function (_ref3) {
   let rows = _ref3.rows,
     vendorName = _ref3.vendorName,
@@ -1929,6 +2233,10 @@ const VendorDetailsCard = () => {
     }
     return "N/A";
   }, [vendor]);
+  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.map(zone => zone.toUpperCase().replace("", " ")).join(", ") : "N/A";
+  }, [vendor]);
   const cards = useMemo(() => {
     const hasRealData = vendorSupervisors.some(s => s.totalKnos > 0);
     const totalKnos = hasRealData ? vendorSupervisors.reduce((acc, s) => acc + (s.totalKnos || 0), 0) : (progressData === null || progressData === void 0 ? void 0 : progressData.totalKnos) || (vendor === null || vendor === void 0 ? void 0 : vendor.assignedConnections) || 0;
@@ -1986,7 +2294,7 @@ const VendorDetailsCard = () => {
               alert(t("NO_EKYC_DATA_FOUND") || "No eKYC data found to download.");
               return;
             }
-            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile"];
+            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "isSelfAssigned", "userType", "tenantName", "tenantMobile"];
             const headerMapping = {
               kno: t("KNO") || "KNO",
               firstName: t("FIRST_NAME") || "First Name",
@@ -2311,9 +2619,9 @@ const VendorDetailsCard = () => {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("JURISDICTIONS") || "Jurisdictions"), /*#__PURE__*/React.createElement("span", {
+  }, t("ASSIGNED_ZONES") || "Assigned Zones"), /*#__PURE__*/React.createElement("span", {
     className: "value"
-  }, jurisdictions)))), /*#__PURE__*/React.createElement("div", {
+  }, zoneIds)))), /*#__PURE__*/React.createElement("div", {
     className: "details-right"
   }, /*#__PURE__*/React.createElement("div", {
     className: "download-card"
@@ -2391,6 +2699,10 @@ const useInboxTableConfig = _ref => {
     tableStyle = _ref$tableStyle === void 0 ? {} : _ref$tableStyle;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  const toTitleCase = str => {
+    if (!str) return "";
+    return String(str).toLowerCase().replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
+  };
   const history = useHistory();
   const _useState = useState(""),
     selectedKno = _useState[0],
@@ -2434,18 +2746,18 @@ const useInboxTableConfig = _ref => {
     Cell: _ref3 => {
       var _row$original3;
       let row = _ref3.row;
-      return /*#__PURE__*/React.createElement("span", null, ((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.citizenName) || "NA");
+      return /*#__PURE__*/React.createElement("span", null, toTitleCase((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : _row$original3.citizenName) || "NA");
     }
   }, {
     Header: t("EKYC_STATUS"),
     accessor: "actionStatus",
     Cell: _ref4 => {
-      var _row$original4;
+      var _row$original4, _row$original5;
       let row = _ref4.row;
       const status = (((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.status) || "DEFAULT").toUpperCase();
       return /*#__PURE__*/React.createElement("span", {
         className: "ekyc-status-tag " + status
-      }, t("" + status));
+      }, toTitleCase(((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.status) || "DEFAULT"));
     }
   }, {
     Header: t("SUBMITTED_AT") || "Submitted At",
@@ -2465,12 +2777,13 @@ const useInboxTableConfig = _ref => {
     Header: t("EKYC_EKYC_STATUS"),
     accessor: "ekycStatus",
     Cell: _ref7 => {
-      var _row$original5, _row$original6;
+      var _row$original6, _row$original7;
       let row = _ref7.row;
-      const ekycStatus = (((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.ekycStatus) || ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.ekycstatus) || "NA").toUpperCase();
+      const raw = ((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.ekycStatus) || ((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.ekycstatus) || "NA";
+      const ekycStatus = raw.toUpperCase();
       return /*#__PURE__*/React.createElement("span", {
         className: "ekyc-status-tag " + ekycStatus
-      }, t("" + ekycStatus));
+      }, toTitleCase(raw));
     }
   }];
   return {
@@ -3181,7 +3494,9 @@ const Inbox = _ref => {
     propsForInboxTable,
     propsForInboxMobileCards,
     formState,
-    countData: listData
+    countData: listData,
+    forceTable: true,
+    showSearchOnMobile: true
   })));
 };
@@ -5861,12 +6176,24 @@ const AssignEkyc = () => {
     propsForInboxMobileCards,
     formState,
     countData: dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.dashboardInfo,
-    isCardLoading: isDataSearchLoading
+    isCardLoading: isDataSearchLoading,
+    showSearchOnMobile: true,
+    forceTable: true
   })));
 };
+const parseAdditionalDetails = additionalDetails => {
+  if (!additionalDetails) return {};
+  if (typeof additionalDetails === "object") return additionalDetails;
+  if (typeof additionalDetails !== "string") return {};
+  try {
+    return JSON.parse(additionalDetails);
+  } catch (error) {
+    return {};
+  }
+};
 const AdminDashboard = () => {
-  var _Digit$SessionStorage, _loggedInUser$roles, _fullName$charAt;
+  var _Digit$SessionStorage;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const history = useHistory();
@@ -5890,162 +6217,46 @@ const AdminDashboard = () => {
     isProgressLoading = _Digit$Hooks$ekyc$use.isLoading;
   const vendorsList = useMemo(() => {
     if (vendorSearchResponse && vendorSearchResponse.length > 0) {
-      return vendorSearchResponse.map(v => {
+      const filteredVendors = vendorSearchResponse.filter(v => {
+        var _additionalDetails$se;
+        const dso = v.dsoDetails || v;
+        const additionalDetails = parseAdditionalDetails(dso.additionalDetails || v.additionalDetails);
+        return (additionalDetails === null || additionalDetails === void 0 ? void 0 : (_additionalDetails$se = additionalDetails.serviceType) === null || _additionalDetails$se === void 0 ? void 0 : _additionalDetails$se.toLowerCase()) === "ekyc";
+      });
+      return filteredVendors.map(v => {
         var _progressData$supervi, _dso$owner, _v$owner, _dso$owner2;
         const dso = v.dsoDetails || v;
         const supervisorsList = dso.supervisors || [];
         const surveyorsList = dso.surveyors || [];
         const supervisorIds = supervisorsList.map(s => {
           var _s$owner;
-          return s.id || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : _s$owner.uuid);
-        }).filter(Boolean);
-        const matchedReports = (progressData === null || progressData === void 0 ? void 0 : (_progressData$supervi = progressData.supervisorReport) === null || _progressData$supervi === void 0 ? void 0 : _progressData$supervi.filter(r => supervisorIds.includes(r.supervisorId))) || [];
-        const completed = matchedReports.reduce((acc, r) => acc + (r.submittedKnos || 0), 0);
-        const pending = matchedReports.reduce((acc, r) => acc + (r.pendingKnos || 0), 0);
-        const total = matchedReports.reduce((acc, r) => acc + (r.totalKnos || 0), 0);
-        const progress = total > 0 ? Math.round(completed / total * 100) : 0;
-        const rejected = 0;
-        return {
-          id: dso.id || dso.vendorId || v.id || v.vendorId,
-          name: dso.name || dso.displayName || v.name || "N/A",
-          ownerName: ((_dso$owner = dso.owner) === null || _dso$owner === void 0 ? void 0 : _dso$owner.name) || ((_v$owner = v.owner) === null || _v$owner === void 0 ? void 0 : _v$owner.name) || "N/A",
-          mobileNumber: dso.mobileNumber || ((_dso$owner2 = dso.owner) === null || _dso$owner2 === void 0 ? void 0 : _dso$owner2.mobileNumber) || v.mobileNumber || "N/A",
-          supervisors: supervisorsList.length,
-          surveyors: surveyorsList.length,
-          completed: completed,
-          progress: progress,
-          pending: pending,
-          rejected: rejected
-        };
-      });
-    }
-    return [];
-  }, [vendorSearchResponse, progressData]);
-  const _useState = useState(false),
-    ekycDownloadLoading = _useState[0],
-    setEkycDownloadLoading = _useState[1];
-  const _useState2 = useState(0),
-    currentPage = _useState2[0];
-  const _useState3 = useState(20),
-    pageSize = _useState3[0];
-  const _Digit$Hooks$ekyc$use2 = Digit.Hooks.ekyc.useEkycApplicationList({}, {
-      tenantId,
-      offset: currentPage * pageSize,
-      limit: pageSize
-    }, {
-      keepPreviousData: true
-    });
-  const fullName = (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.name) || "Admin";
-  const mobileNumber = (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber) || "N/A";
-  const roleText = (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$roles = loggedInUser.roles) === null || _loggedInUser$roles === void 0 ? void 0 : _loggedInUser$roles.map(r => r.name).join(", ")) || "EKYC Admin";
-  const handleDownloadEkycData = function () {
-    try {
-      setEkycDownloadLoading(true);
-      return Promise.resolve(_finallyRethrows(function () {
-        return _catch(function () {
-          return Promise.resolve(Digit.EkycService.application_list({
-            tenantId: tenantId,
-            offset: 0,
-            limit: 10000,
-            reportDownload: true
-          })).then(function (response) {
-            const consumerList = (response === null || response === void 0 ? void 0 : response.consumerList) || [];
-            if (consumerList.length === 0) {
-              alert(t("NO_DATA_FOUND") || "No data found for download.");
-              return;
-            }
-            const excludedKeys = ["status", "source", "submittedAt", "assignedAt", "connectionType", "approvedAt", "alternateMobileNo", "city", "state", "addressType", "addressProofType", "mrcode", "areacode", "verificationStatus", "surveyorId", "supervisorId", "vendorId", "assignmentType", "assignmentValue", "assignedTime", "isSelfAssigned", "userType", "tenantName", "tenantMobile"];
-            const headerMapping = {
-              kno: t("KNO") || "KNO",
-              firstName: t("FIRST_NAME") || "First Name",
-              middleName: t("MIDDLE_NAME") || "Middle Name",
-              lastName: t("LAST_NAME") || "Last Name",
-              gender: t("GENDER") || "Gender",
-              mobileNumber: t("MOBILE_NUMBER") || "Mobile Number",
-              emailId: t("EMAIL_ID") || "Email ID",
-              fatherOrHusbandName: t("FATHER_HUSBUND_NAME") || "Father/Husband Name",
-              relationship: t("RELATIONSHIP") || "Relationship",
-              dob: t("DOB") || "Date of Birth",
-              ekycStatus: t("EKYC_STATUS") || "eKYC Status",
-              zoneName: t("ZONE") || "Zone",
-              assembly: t("ASSEMBLY") || "Assembly",
-              ward: t("WARD") || "Ward",
-              pincode: t("PINCODE") || "Pincode",
-              mrkey: t("MR_KEY") || "MR Key",
-              createdTime: t("CREATED_TIME") || "Created Time",
-              lastModifiedTime: t("LAST_MODIFIED_TIME") || "Last Modified Time"
-            };
-            const excelData = consumerList.map(item => {
-              const cleanObj = {};
-              const name = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
-              if (name) {
-                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = name;
-              }
-              Object.keys(item).forEach(key => {
-                if (excludedKeys.includes(key)) return;
-                const val = item[key];
-                if (typeof val === "object" && val !== null) {
-                  return;
-                }
-                const friendlyHeader = headerMapping[key] || t(key.toUpperCase()) || key;
-                cleanObj[friendlyHeader] = val;
-              });
-              return cleanObj;
-            });
-            const cleanFileName = "eKYC_All_Data_Admin_" + fullName.replace(/[^a-zA-Z0-9]/g, "_");
-            Digit.Download.Excel(excelData, cleanFileName);
-          });
-        }, function (error) {
-          console.error("Error downloading eKYC Excel:", error);
-        });
-      }, function (_wasThrown, _result) {
-        setEkycDownloadLoading(false);
-        if (_wasThrown) throw _result;
-        return _result;
-      }));
-    } catch (e) {
-      return Promise.reject(e);
+          return s.id || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : _s$owner.uuid);
+        }).filter(Boolean);
+        const matchedReports = (progressData === null || progressData === void 0 ? void 0 : (_progressData$supervi = progressData.supervisorReport) === null || _progressData$supervi === void 0 ? void 0 : _progressData$supervi.filter(r => supervisorIds.includes(r.supervisorId))) || [];
+        const completed = matchedReports.reduce((acc, r) => acc + (r.submittedKnos || 0), 0);
+        const pending = matchedReports.reduce((acc, r) => acc + (r.pendingKnos || 0), 0);
+        const total = matchedReports.reduce((acc, r) => acc + (r.totalKnos || 0), 0);
+        const progress = total > 0 ? Math.round(completed / total * 100) : 0;
+        const rejected = 0;
+        return {
+          id: dso.id || dso.vendorId || v.id || v.vendorId,
+          name: dso.name || dso.displayName || v.name || "N/A",
+          ownerName: ((_dso$owner = dso.owner) === null || _dso$owner === void 0 ? void 0 : _dso$owner.name) || ((_v$owner = v.owner) === null || _v$owner === void 0 ? void 0 : _v$owner.name) || "N/A",
+          mobileNumber: dso.mobileNumber || ((_dso$owner2 = dso.owner) === null || _dso$owner2 === void 0 ? void 0 : _dso$owner2.mobileNumber) || v.mobileNumber || "N/A",
+          supervisors: supervisorsList.length,
+          surveyors: surveyorsList.length,
+          completed: completed,
+          progress: progress,
+          pending: pending,
+          rejected: rejected
+        };
+      });
     }
-  };
+    return [];
+  }, [vendorSearchResponse, progressData]);
   return /*#__PURE__*/React.createElement(Card, {
     className: "surveyor-dashboard"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ekyc-dashboard-section"
-  }, /*#__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("EKYC_ADMIN") || "eKYC Admin / Manager"), /*#__PURE__*/React.createElement("div", {
-    className: "mobile-number"
-  }, mobileNumber))), /*#__PURE__*/React.createElement("button", {
-    className: "download-excel-btn",
-    disabled: ekycDownloadLoading,
-    onClick: handleDownloadEkycData
-  }, /*#__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")), /*#__PURE__*/React.createElement(Dashboard, null), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(Dashboard, null), /*#__PURE__*/React.createElement("div", {
     className: "admin-performance-section"
   }, /*#__PURE__*/React.createElement("h3", {
     className: "section-title"
@@ -6333,7 +6544,8 @@ const SupervisorDetailsCard = () => {
     showCustomPicker = _useState6[0],
     setShowCustomPicker = _useState6[1];
   const _useState7 = useState(false),
-    reportLoading = _useState7[0];
+    reportLoading = _useState7[0],
+    setReportLoading = _useState7[1];
   const reportMenuRef = useRef(null);
   useEffect(() => {
     const handler = e => {
@@ -6345,6 +6557,42 @@ const SupervisorDetailsCard = () => {
     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);
+      setShowReportMenu(false);
+      setShowCustomPicker(false);
+    }
+  };
   const handlePresetDownload = filter => {
     handleDownload();
   };
@@ -6364,20 +6612,13 @@ const SupervisorDetailsCard = () => {
       setEkycDownloadLoading(true);
       return Promise.resolve(_finallyRethrows(function () {
         return _catch(function () {
-          const fetchPromises = surveyors.map(s => Digit.EkycService.application_list({
+          return Promise.resolve(Digit.EkycService.application_list({
             tenantId: tenantId || "dl.djb",
             offset: 0,
-            limit: 5000,
-            surveyorId: s.surveyorId || s.id,
+            limit: 10000,
             reportDownload: true
-          }).catch(err => {
-            console.error("Error fetching applications for surveyor " + s.surveyorName + ":", err);
-            return {
-              consumerList: []
-            };
-          }));
-          return Promise.resolve(Promise.all(fetchPromises)).then(function (results) {
-            const consumerList = results.flatMap(res => (res === null || res === void 0 ? void 0 : res.consumerList) || []);
+          })).then(function (response) {
+            const consumerList = (response === null || response === void 0 ? void 0 : response.consumerList) || [];
             if (consumerList.length === 0) {
               alert(t("NO_DATA_FOUND") || "No data found for download.");
               return;
@@ -6400,14 +6641,21 @@ const SupervisorDetailsCard = () => {
               ward: t("WARD") || "Ward",
               pincode: t("PINCODE") || "Pincode",
               mrkey: t("MR_KEY") || "MR Key",
+              consumerType: t("CONSUMER_TYPE") || "Consumer Type",
               createdTime: t("CREATED_TIME") || "Created Time",
               lastModifiedTime: t("LAST_MODIFIED_TIME") || "Last Modified Time"
             };
+            const toTitleCase = str => {
+              if (!str) return "";
+              const cleanStr = String(str).includes(".") ? String(str).split(".").pop() : String(str);
+              return cleanStr.toLowerCase().replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
+            };
+            const titleCaseFields = ["ekycStatus", "zoneName", "gender", "relationship", "assembly", "ward", "consumerType"];
             const excelData = consumerList.map(item => {
               const cleanObj = {};
               const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
               if (fullName) {
-                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = fullName;
+                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(fullName);
               }
               Object.keys(item).forEach(key => {
                 if (excludedKeys.includes(key)) return;
@@ -6416,7 +6664,11 @@ const SupervisorDetailsCard = () => {
                   return;
                 }
                 const friendlyHeader = headerMapping[key] || t(key.toUpperCase()) || key;
-                cleanObj[friendlyHeader] = val;
+                if (typeof val === "string" && titleCaseFields.includes(key)) {
+                  cleanObj[friendlyHeader] = toTitleCase(val);
+                } else {
+                  cleanObj[friendlyHeader] = val;
+                }
               });
               return cleanObj;
             });
@@ -6657,9 +6909,11 @@ const SupervisorDetailsCard = () => {
 const AssignEkycModal = _ref => {
   let surveyor = _ref.surveyor,
     closeModal = _ref.closeModal,
-    refetchDashboard = _ref.refetchDashboard;
+    refetchDashboard = _ref.refetchDashboard,
+    propsTenantId = _ref.tenantId;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  const tenantId = propsTenantId || Digit.ULBService.getCurrentTenantId();
   const _useState = useState([]),
     selectedKnos = _useState[0],
     setSelectedKnos = _useState[1];
@@ -6696,16 +6950,15 @@ const AssignEkycModal = _ref => {
   const _useState8 = useState(filters),
     debouncedFilters = _useState8[0],
     setDebouncedFilters = _useState8[1];
-  const _Digit$Hooks$ws$useWS = Digit.Hooks.ws.useWSConfigMDMS.ZROLocation("dl.djb"),
-    zroLocationsData = _Digit$Hooks$ws$useWS.data,
-    isZroLoading = _Digit$Hooks$ws$useWS.isLoading;
+  const _Digit$Hooks$ws$useWS = Digit.Hooks.ws.useWSConfigMDMS.ZROLocation(tenantId),
+    zroLocationsData = _Digit$Hooks$ws$useWS.data;
   const mappedZROLocation = useMemo(() => {
     return (zroLocationsData || []).map(item => ({
       code: item.code,
       name: item.name
     }));
   }, [zroLocationsData]);
-  const _Digit$Hooks$useCommo = Digit.Hooks.useCommonMDMS("dl.djb", "egov-location", ["TenantBoundary"]),
+  const _Digit$Hooks$useCommo = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]),
     egovLocationData = _Digit$Hooks$useCommo.data;
   const boundaryData = useMemo(() => {
     var _egovLocationData$ego;
@@ -6783,6 +7036,27 @@ const AssignEkycModal = _ref => {
     });
     return Array.from(pinSet).sort();
   }, [structuredLocalityData]);
+  const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycApplicationList({
+      unassignedOnly: true,
+      fetchFilterOptions: true
+    }, {
+      tenantId: tenantId,
+      offset: 0,
+      limit: 1000
+    }, {
+      staleTime: Infinity
+    }),
+    filterOptionsData = _Digit$Hooks$ekyc$use.data;
+  const pincodeOptions = useMemo(() => {
+    if (!filterOptionsData) return fetchedPincodes || [];
+    const pins = filterOptionsData.pincodeOptions || [];
+    return Array.isArray(pins) ? pins.filter(Boolean).map(String).sort() : [];
+  }, [filterOptionsData, fetchedPincodes]);
+  const mrkeyOptions = useMemo(() => {
+    if (!filterOptionsData) return [];
+    const keys = filterOptionsData.mrkeyOptions || [];
+    return Array.isArray(keys) ? keys.filter(Boolean).map(String).sort() : [];
+  }, [filterOptionsData]);
   useEffect(() => {
     const timer = setTimeout(() => {
       setDebouncedFilters(filters);
@@ -6792,7 +7066,7 @@ const AssignEkycModal = _ref => {
   useEffect(() => {
     setCurrentPage(0);
   }, [debouncedFilters, filters.kno]);
-  const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycApplicationList(_extends({
+  const _Digit$Hooks$ekyc$use2 = Digit.Hooks.ekyc.useEkycApplicationList(_extends({
       unassignedOnly: true
     }, filters.kno && {
       kno: filters.kno
@@ -6809,14 +7083,15 @@ const AssignEkycModal = _ref => {
     }, debouncedFilters.pincode && {
       pincode: debouncedFilters.pincode
     }), {
-      tenantId: "dl.djb",
+      tenantId: tenantId,
       offset: currentPage * pageSize,
       limit: pageSize
     }, {
       keepPreviousData: true
     }),
-    applicationData = _Digit$Hooks$ekyc$use.data,
-    isLoading = _Digit$Hooks$ekyc$use.isFetching;
+    applicationData = _Digit$Hooks$ekyc$use2.data,
+    isLoading = _Digit$Hooks$ekyc$use2.isFetching,
+    refetchApplicationList = _Digit$Hooks$ekyc$use2.refetch;
   const handleAssignmentError = (errMsg, variables) => {
     const isAlreadyAssigned = errMsg.toLowerCase().includes("already assigned") || errMsg.toLowerCase().includes("already assign") || errMsg.toLowerCase().includes("active assignment") || errMsg.toLowerCase().includes("mrkey") || errMsg.toLowerCase().includes("mr key") || errMsg.toLowerCase().includes("kno") || errMsg.toLowerCase().includes("already exists");
     if (isAlreadyAssigned) {
@@ -6861,9 +7136,23 @@ const AssignEkycModal = _ref => {
       setShowToast(true);
       setTimeout(function () {
         try {
-          return Promise.resolve(refetchDashboard()).then(function () {
-            closeModal();
-          });
+          function _temp4() {
+            function _temp2() {
+              closeModal();
+            }
+            const _temp = function () {
+              if (refetchApplicationList) {
+                return Promise.resolve(refetchApplicationList()).then(function () {});
+              }
+            }();
+            return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+          }
+          const _temp3 = function () {
+            if (refetchDashboard) {
+              return Promise.resolve(refetchDashboard()).then(function () {});
+            }
+          }();
+          return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
         } catch (e) {
           return Promise.reject(e);
         }
@@ -6919,7 +7208,7 @@ const AssignEkycModal = _ref => {
       assignmentType = _getAssignmentPayload.assignmentType,
       assignmentValue = _getAssignmentPayload.assignmentValue;
     assignmentMutation.mutate({
-      tenantId: "dl.djb",
+      tenantId: tenantId,
       surveyorId: surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner = surveyor.owner) === null || _surveyor$owner === void 0 ? void 0 : _surveyor$owner.uuid,
       assignmentType,
       assignmentValue
@@ -6995,7 +7284,7 @@ const AssignEkycModal = _ref => {
     }),
     actionCancelLabel: "Cancel",
     actionCancelOnSubmit: closeModal,
-    actionSaveLabel: "Assign " + selectedKnos.length + " KNOs",
+    actionSaveLabel: t("EKYC_ASSIGN_KNOS") || "Assign KNOs",
     actionSaveOnSubmit: handleAssign,
     isDisabled: !(selectedKnos !== null && selectedKnos !== void 0 && selectedKnos.length)
   }, /*#__PURE__*/React.createElement("div", {
@@ -7013,35 +7302,25 @@ const AssignEkycModal = _ref => {
     onChange: e => handleFilterChange("pincode", e.target.value)
   }, /*#__PURE__*/React.createElement("option", {
     value: ""
-  }, "Select Pincode"), fetchedPincodes.map(pin => /*#__PURE__*/React.createElement("option", {
+  }, "Select Pincode"), pincodeOptions.map(pin => /*#__PURE__*/React.createElement("option", {
     key: pin,
     value: pin
   }, pin))), /*#__PURE__*/React.createElement("select", {
-    className: "form-control",
-    value: filters.zoneName,
-    onChange: e => {
-      const val = e.target.value;
-      setFilters(prev => _extends({}, prev, {
-        zoneCode: val,
-        zoneName: val
-      }));
-    },
-    disabled: isZroLoading
-  }, /*#__PURE__*/React.createElement("option", {
-    value: ""
-  }, isZroLoading ? "Loading ZRO Locations..." : "Select ZRO Location"), mappedZROLocation.map(loc => /*#__PURE__*/React.createElement("option", {
-    key: loc.code,
-    value: loc.name
-  }, loc.name))), /*#__PURE__*/React.createElement("select", {
     className: "form-control",
     value: filters.ward,
     onChange: e => handleFilterChange("ward", e.target.value)
   }, /*#__PURE__*/React.createElement("option", {
     value: ""
-  }, "Select Ward"), wardOptions.map(ward => /*#__PURE__*/React.createElement("option", {
-    key: ward.code,
-    value: ward.name
-  }, ward.name))), /*#__PURE__*/React.createElement("select", {
+  }, "Select Ward"), wardOptions.filter(ward => {
+    const stripped = ward.name.replace(/[0-9]/g, "").replace(/^[-\s]+|[-\s]+$/g, "");
+    return stripped.trim().length > 0;
+  }).map(ward => {
+    const displayName = ward.name.replace(/[0-9]/g, "").replace(/^[-\s]+|[-\s]+$/g, "");
+    return /*#__PURE__*/React.createElement("option", {
+      key: ward.code,
+      value: ward.name
+    }, displayName);
+  })), /*#__PURE__*/React.createElement("select", {
     className: "form-control",
     value: filters.assembly,
     onChange: e => handleFilterChange("assembly", e.target.value)
@@ -7050,16 +7329,20 @@ const AssignEkycModal = _ref => {
   }, "Select Assembly"), assemblyOptions.map(assembly => /*#__PURE__*/React.createElement("option", {
     key: assembly.code,
     value: assembly.name
-  }, assembly.name))), /*#__PURE__*/React.createElement("input", {
+  }, assembly.name))), /*#__PURE__*/React.createElement("select", {
     className: "form-control",
-    placeholder: "MR Key",
     value: filters.mrkey,
     onChange: e => handleFilterChange("mrkey", e.target.value)
-  }), selectedKnos.length > 0 && /*#__PURE__*/React.createElement("button", {
+  }, /*#__PURE__*/React.createElement("option", {
+    value: ""
+  }, "Select MR Key"), mrkeyOptions.map(key => /*#__PURE__*/React.createElement("option", {
+    key: key,
+    value: key
+  }, key))), selectedKnos.length > 0 && /*#__PURE__*/React.createElement("button", {
     className: "clear-selected-btn",
     type: "button",
     onClick: () => setSelectedKnos([])
-  }, t("EKYC_CLEAR_SELECTION") || "Clear Selected (" + selectedKnos.length + ")")), /*#__PURE__*/React.createElement(Table, {
+  }, t("EKYC_CLEAR_SELECTION") || "Clear Selected")), /*#__PURE__*/React.createElement(Table, {
     tableTitle: "eKYC Applications",
     tableClass: "ekycTable",
     data: tableData,
@@ -7098,7 +7381,7 @@ const AssignEkycModal = _ref => {
 };
 const SurveyorDetailsDashboard = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _surveyor$owner4, _fullName$charAt, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _surveyor$owner8, _surveyor$owner9, _surveyor$owner0, _surveyor$additionalD, _dashboardData$dashbo5, _dashboardData$dashbo6;
+  var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _Digit$SessionStorage4, _surveyor$owner, _surveyor$owner2, _surveyor$owner3, _surveyor$owner4, _fullName$charAt, _dashboardData$dashbo, _dashboardData$dashbo2, _dashboardData$dashbo3, _dashboardData$dashbo4, _surveyor$owner8, _surveyor$owner9, _surveyor$owner0, _dashboardData$dashbo5, _dashboardData$dashbo6;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useState = useState(false),
     showModal = _useState[0],
@@ -7202,16 +7485,22 @@ const SurveyorDetailsDashboard = () => {
     _Digit$Hooks$ekyc$use2 = _Digit$Hooks$ekyc$use.data,
     dashboardData = _Digit$Hooks$ekyc$use2 === void 0 ? {} : _Digit$Hooks$ekyc$use2,
     refetchDashboard = _Digit$Hooks$ekyc$use.refetch;
+  const toTitleCase = str => {
+    if (!str) return "";
+    const cleanStr = String(str).includes(".") ? String(str).split(".").pop() : String(str);
+    return cleanStr.toLowerCase().replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase());
+  };
   const knoColumns = useMemo(() => [{
     Header: t("KNO") || "KNO",
     accessor: "kno"
   }, {
     Header: t("CONSUMER_NAME") || "Consumer Name",
-    accessor: row => ((row.firstName || "") + " " + (row.middleName || "") + " " + (row.lastName || "")).trim(),
+    accessor: row => toTitleCase(((row.firstName || "") + " " + (row.middleName || "") + " " + (row.lastName || "")).trim()),
     id: "consumerName"
   }, {
     Header: t("ZONE") || "Zone",
-    accessor: "zoneName"
+    accessor: row => toTitleCase(row.zoneName),
+    id: "zoneName"
   }, {
     Header: t("EKYC_STATUS") || "eKYC Status",
     accessor: "ekycStatus",
@@ -7220,7 +7509,7 @@ const SurveyorDetailsDashboard = () => {
       const status = (value || "NA").toUpperCase();
       return value ? /*#__PURE__*/React.createElement("span", {
         className: "ekyc-status-tag " + status
-      }, t(status)) : "-";
+      }, toTitleCase(value)) : "-";
     }
   }, {
     Header: t("SUBMITTED_AT") || "Submitted At",
@@ -7459,6 +7748,7 @@ const SurveyorDetailsDashboard = () => {
               ward: t("WARD") || "Ward",
               pincode: t("PINCODE") || "Pincode",
               mrkey: t("MR_KEY") || "MR Key",
+              consumerType: t("CONSUMER_TYPE") || "Consumer Type",
               createdTime: t("CREATED_TIME") || "Created Time",
               lastModifiedTime: t("LAST_MODIFIED_TIME") || "Last Modified Time"
             };
@@ -7466,8 +7756,9 @@ const SurveyorDetailsDashboard = () => {
               const cleanObj = {};
               const fullName = [item.firstName, item.middleName, item.lastName].filter(Boolean).join(" ");
               if (fullName) {
-                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = fullName;
+                cleanObj[t("CONSUMER_NAME") || "Consumer Name"] = toTitleCase(fullName);
               }
+              const titleCaseFields = ["ekycStatus", "zoneName", "gender", "relationship", "assembly", "ward", "consumerType"];
               Object.keys(item).forEach(key => {
                 if (excludedKeys.includes(key)) return;
                 const val = item[key];
@@ -7475,7 +7766,11 @@ const SurveyorDetailsDashboard = () => {
                   return;
                 }
                 const friendlyHeader = headerMapping[key] || t(key.toUpperCase()) || key;
-                cleanObj[friendlyHeader] = val;
+                if (typeof val === "string" && titleCaseFields.includes(key)) {
+                  cleanObj[friendlyHeader] = toTitleCase(val);
+                } else {
+                  cleanObj[friendlyHeader] = val;
+                }
               });
               return cleanObj;
             });
@@ -7639,12 +7934,6 @@ const SurveyorDetailsDashboard = () => {
     className: "detail-item"
   }, /*#__PURE__*/React.createElement("span", {
     className: "label"
-  }, t("SERVICE_TYPE")), /*#__PURE__*/React.createElement("span", {
-    className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$additionalD = surveyor.additionalDetails) === null || _surveyor$additionalD === void 0 ? void 0 : _surveyor$additionalD.serviceType) || "N/A")), /*#__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", {
@@ -9120,74 +9409,6 @@ const MeterDetails = _ref => {
   }));
 };
-const Home = () => {
-  var _Digit$SessionStorage, _Digit$SessionStorage2;
-  const _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  const propsForModuleCard = {
-    moduleName: t("ACTION_TEST_EKYC"),
-    kpis: [{
-      count: "-",
-      label: t("TOTAL_EKYC"),
-      link: "/digit-ui/citizen/ekyc/dashboard"
-    }],
-    links: []
-  };
-  const citizenInfo = (_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$SessionStorage2.roles;
-  const roles = Array.isArray(citizenInfo) ? citizenInfo.map(ele => ele.code) : [];
-  if (roles.includes("EKYC_SURVEYOR")) {
-    propsForModuleCard.links.push({
-      label: t("SURVEYOR_DASHBOARD"),
-      link: "/digit-ui/citizen/ekyc/surveyor-dashboard"
-    });
-  }
-  if (roles.includes("EKYC_SUPERVISOR") || roles.includes("EKYC_VENDOR")) {
-    propsForModuleCard.links.push({
-      label: t("EKYC_INBOX"),
-      link: "/digit-ui/citizen/ekyc/inbox"
-    });
-  }
-  if (roles.includes("EKYC_SUPERVISOR")) {
-    propsForModuleCard.links.push({
-      label: t("EKYC_SUPERVISOR_DASHBOARD"),
-      link: "/digit-ui/citizen/ekyc/supervisor-dashboard"
-    }, {
-      label: t("EKYC_ASSIGN"),
-      link: "/digit-ui/citizen/ekyc/assign"
-    });
-  }
-  if (roles.includes("EKYC_VENDOR")) {
-    propsForModuleCard.links.push({
-      label: t("EKYC_VENDOR_DASHBOARD"),
-      link: "/digit-ui/citizen/ekyc/vendor-dashboard"
-    });
-  }
-  if (roles.includes("EKYC_SUPERVISOR") || roles.includes("EKYC_VENDOR")) {
-    propsForModuleCard.links.push({
-      label: t("TITLE_VENDOR_MANAGEMENT"),
-      link: "/digit-ui/citizen/vendor/search-vendor"
-    });
-  }
-  if (roles.length === 1 && roles.includes("CITIZEN")) {
-    propsForModuleCard.links.push({
-      label: t("EKYC_STATUS"),
-      link: "/digit-ui/citizen/ekyc/:id"
-    });
-  }
-  const formattedLinks = propsForModuleCard.links.map(l => ({
-    i18nKey: l.label,
-    link: l.link,
-    count: l.count
-  }));
-  return /*#__PURE__*/React.createElement(CitizenHomeCard, {
-    header: t("EKYC_MODULE_NAME"),
-    links: formattedLinks,
-    Icon: () => /*#__PURE__*/React.createElement(DocumentIcon, {
-      className: "fill-path-primary-main"
-    })
-  });
-};
 const Inbox$1 = _ref => {
   var _formState$tableForm3, _formState$tableForm4, _formState$searchForm3, _formState$searchForm4, _dashboardData$dashbo;
   let parentRoute = _ref.parentRoute;
@@ -9448,7 +9669,9 @@ const Inbox$1 = _ref => {
   }, propsForSearchForm, propsForMobileSortForm, {
     propsForInboxTable,
     propsForInboxMobileCards,
-    formState
+    formState,
+    forceTable: true,
+    showSearchOnMobile: true
   })));
 };
@@ -9661,7 +9884,8 @@ const EkycStatus = () => {
   }, propsForSearchForm, {
     propsForInboxTable,
     propsForInboxMobileCards,
-    formState
+    formState,
+    showSearchOnMobile: true
   })))), errorMsg && /*#__PURE__*/React.createElement("div", {
     className: "ekyc-status-error-msg"
   }, errorMsg), isLoading && /*#__PURE__*/React.createElement(Loader, null), !isLoading && details && /*#__PURE__*/React.createElement(Card, {
@@ -9709,10 +9933,7 @@ const CitizenApp = () => {
   const location = useLocation();
   const _useRouteMatch = useRouteMatch(),
     path = _useRouteMatch.path;
-  const _Digit$Hooks$useStore = Digit.Hooks.useStore.getInitData(),
-    _Digit$Hooks$useStore2 = _Digit$Hooks$useStore.data,
-    _Digit$Hooks$useStore3 = _Digit$Hooks$useStore2 === void 0 ? {} : _Digit$Hooks$useStore2,
-    stateInfo = _Digit$Hooks$useStore3.stateInfo;
+  const _Digit$Hooks$useStore = Digit.Hooks.useStore.getInitData();
   sessionStorage.removeItem("revalidateddone");
   const getDynamicBreadcrumbs = () => {
     const pathname = location.pathname;
@@ -9791,44 +10012,23 @@ const CitizenApp = () => {
     }
     return crumbs;
   };
-  const isEkycHome = location.pathname === "/digit-ui/citizen/ekyc" || location.pathname === "/digit-ui/citizen/ekyc/";
-  if (isEkycHome) {
-    const isMobile = window.Digit.Utils.browser.isMobile();
-    return (
-      /*#__PURE__*/
-      React.createElement("div", {
-        className: "moduleLinkHomePage"
-      }, /*#__PURE__*/React.createElement("div", {
-        style: {
-          position: "relative"
-        }
-      }, /*#__PURE__*/React.createElement("img", {
-        src: stateInfo === null || stateInfo === void 0 ? void 0 : stateInfo.bannerUrl,
-        alt: "noimagefound"
-      }), /*#__PURE__*/React.createElement(BackButton, {
-        className: "moduleLinkHomePageBackButton"
-      }), /*#__PURE__*/React.createElement("div", {
-        className: "moduleTitle"
-      }, isMobile ? /*#__PURE__*/React.createElement("h4", null, t("MODULE_EKYC")) : /*#__PURE__*/React.createElement("h1", null, t("MODULE_EKYC")))), /*#__PURE__*/React.createElement("div", {
-        className: "moduleLinkHomePageModuleLinks"
-      }, /*#__PURE__*/React.createElement(Home, null)))
-    );
-  }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "ground-container form-container"
+  return /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement("div", {
+    className: "ground-container form-container",
+    style: {
+      flex: 1
+    }
   }, /*#__PURE__*/React.createElement(ModuleHeader, {
     leftContent: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowLeft, {
       className: "icon"
     }), t("CS_COMMON_BACK")),
     onLeftClick: () => window.history.back(),
     breadcrumbs: getDynamicBreadcrumbs()
-  }), /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(PrivateRoute, {
+  }), /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(Route, {
     exact: true,
-    path: "" + path,
-    component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
-      layoutClass: "normal"
-    }, /*#__PURE__*/React.createElement(Home, null))
-  }), /*#__PURE__*/React.createElement(PrivateRoute, {
+    path: "" + path
+  }, /*#__PURE__*/React.createElement(Redirect, {
+    to: "/digit-ui/citizen/ekyc-home"
+  })), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: [path + "/vendor-dashboard/:vendorId", path + "/vendor-dashboard"],
     component: () => /*#__PURE__*/React.createElement(LayoutWrapper, {
       layoutClass: "normal"
@@ -9934,19 +10134,61 @@ const EkycModule = _ref => {
   } else return /*#__PURE__*/React.createElement(CitizenApp, null);
 };
 const EkycLinks = _ref2 => {
-  let matchPath = _ref2.matchPath;
+  var _Digit$SessionStorage, _Digit$SessionStorage2;
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  const links = [{
-    link: matchPath + "/create-kyc",
-    i18nKey: t("EKYC_CREATE_KYC")
-  }, {
-    link: matchPath + "/update-kyc",
-    i18nKey: t("EKYC_UPDATE_KYC")
-  }];
+  const propsForModuleCard = {
+    links: []
+  };
+  const citizenInfo = (_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$SessionStorage2.roles;
+  const roles = Array.isArray(citizenInfo) ? citizenInfo.map(ele => ele.code) : [];
+  if (roles.includes("EKYC_SURVEYOR")) {
+    propsForModuleCard.links.push({
+      label: t("SURVEYOR_DASHBOARD"),
+      link: "/digit-ui/citizen/ekyc/surveyor-dashboard"
+    });
+  }
+  if (roles.includes("EKYC_SUPERVISOR") || roles.includes("EKYC_VENDOR")) {
+    propsForModuleCard.links.push({
+      label: t("EKYC_INBOX"),
+      link: "/digit-ui/citizen/ekyc/inbox"
+    });
+  }
+  if (roles.includes("EKYC_SUPERVISOR")) {
+    propsForModuleCard.links.push({
+      label: t("EKYC_SUPERVISOR_DASHBOARD"),
+      link: "/digit-ui/citizen/ekyc/supervisor-dashboard"
+    }, {
+      label: t("EKYC_ASSIGN"),
+      link: "/digit-ui/citizen/ekyc/assign"
+    });
+  }
+  if (roles.includes("EKYC_VENDOR")) {
+    propsForModuleCard.links.push({
+      label: t("EKYC_VENDOR_DASHBOARD"),
+      link: "/digit-ui/citizen/ekyc/vendor-dashboard"
+    });
+  }
+  if (roles.includes("EKYC_SUPERVISOR") || roles.includes("EKYC_VENDOR")) {
+    propsForModuleCard.links.push({
+      label: t("TITLE_VENDOR_MANAGEMENT"),
+      link: "/digit-ui/citizen/vendor/search-vendor"
+    });
+  }
+  if (roles.length === 1 && roles.includes("CITIZEN")) {
+    propsForModuleCard.links.push({
+      label: t("EKYC_STATUS"),
+      link: "/digit-ui/citizen/ekyc/:id"
+    });
+  }
+  const formattedLinks = propsForModuleCard.links.map(l => ({
+    i18nKey: l.label,
+    link: l.link,
+    count: l.count
+  }));
   return /*#__PURE__*/React.createElement(CitizenHomeCard, {
     header: t("EKYC_MODULE_NAME"),
-    links: links,
+    links: formattedLinks,
     Icon: () => /*#__PURE__*/React.createElement(DocumentIcon, {
       className: "fill-path-primary-main"
     })