@djb25/digit-ui-module-ekyc 1.0.63 → 1.0.65

package/dist/index.js

@@ -472,32 +472,36 @@ const StatusCards = _ref => {
   const legendItems = [{
     color: "#77B6EA",
     label: t("EKYC_TOTAL"),
-    value: countData === null || countData === void 0 ? void 0 : countData.total
+    value: (countData === null || countData === void 0 ? void 0 : countData.total) || 0
   }, {
-    color: "#77B6EA",
+    color: "#4C8BF5",
+    label: t("EKYC_ASSIGNED"),
+    value: (countData === null || countData === void 0 ? void 0 : countData.totalAssignments) || 0
+  }, {
+    color: "#2E8B57",
     label: t("EKYC_COMPLETED"),
-    value: countData === null || countData === void 0 ? void 0 : countData.completed
+    value: (countData === null || countData === void 0 ? void 0 : countData.completed) || 0
   }, {
     color: "#0c2a52",
     label: t("EKYC_PENDING"),
-    value: countData === null || countData === void 0 ? void 0 : countData.pending
+    value: (countData === null || countData === void 0 ? void 0 : countData.pending) || 0
   }, {
-    color: "#c8ddf5",
+    color: "#8B5CF6",
     label: t("EKYC_SUBMITTED_BY_VENDORS"),
-    value: countData === null || countData === void 0 ? void 0 : countData.submittedCount
+    value: (countData === null || countData === void 0 ? void 0 : countData.submittedCount) || 0
   }, {
-    color: "#c8ddf5",
+    color: "#F59E0B",
     label: t("EKYC_SUBMITTED_BY_CITIZEN"),
     value: (countData === null || countData === void 0 ? void 0 : countData.selfEkycCount) || 0
   }, {
-    color: "#c8ddf5",
+    color: "#DC3545",
     label: t("EKYC_REJECTED"),
     value: (countData === null || countData === void 0 ? void 0 : countData.rejected) || 0
   }];
   return /*#__PURE__*/React__default.createElement("div", {
     className: "ekyc-employee-container"
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "status-cards-wrapper"
+    className: "status-panel"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "status-cards-header"
   }, /*#__PURE__*/React__default.createElement("div", {
@@ -583,18 +587,6 @@ const StatusCards = _ref => {
       handleCustomDownload();
     }
   }, t("APPLY") || "Apply")))))), /*#__PURE__*/React__default.createElement("div", {
-    className: "status-panels-grid"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "status-panel"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "panel-header"
-  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
-    className: "panel-title"
-  }, t("EKYC_STATUS_BREAKDOWN") || "Status Breakdown"), /*#__PURE__*/React__default.createElement("div", {
-    className: "panel-subtitle"
-  }, t("EKYC_VERIFICATION_LIFECYCLE") || "Verification lifecycle")), /*#__PURE__*/React__default.createElement("div", {
-    className: "completion-badge"
-  }, efficiency, "% Complete")), /*#__PURE__*/React__default.createElement("div", {
     className: "status-breakdown-content"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "chart-wrapper"
@@ -614,7 +606,10 @@ const StatusCards = _ref => {
     className: "status-boxes"
   }, legendItems.map(item => /*#__PURE__*/React__default.createElement("div", {
     className: "status-box",
-    key: item.label
+    key: item.label,
+    style: {
+      "--status-color": item.color
+    }
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "status-box-top"
   }, /*#__PURE__*/React__default.createElement("span", {
@@ -626,43 +621,33 @@ const StatusCards = _ref => {
     className: "status-name"
   }, item.label)), /*#__PURE__*/React__default.createElement("div", {
     className: "status-box-value"
-  }, formatNumber(item.value))))))))));
+  }, formatNumber(item.value))))))));
 };
 
 const Dashboard = () => {
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycSurveyorDashboard({}, {
-      tenantId,
-      offset: 0,
-      limit: 10
-    }, {
-      enabled: !!tenantId
-    }),
-    isLoading = _Digit$Hooks$ekyc$use.isLoading,
-    dashboardData = _Digit$Hooks$ekyc$use.data;
-  const _Digit$Hooks$ekyc$use2 = Digit.Hooks.ekyc.useEkycAssignmentProgress({
+  const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycAssignmentProgress({
       tenantId,
       allVendorsDetailed: true
     }, {
       enabled: true,
       keepPreviousData: true
     }),
-    progressData = _Digit$Hooks$ekyc$use2.data,
-    isProgressLoading = _Digit$Hooks$ekyc$use2.isLoading;
+    progressData = _Digit$Hooks$ekyc$use.data,
+    isProgressLoading = _Digit$Hooks$ekyc$use.isLoading;
   const countData = React.useMemo(() => {
-    const info = (dashboardData === null || dashboardData === void 0 ? void 0 : dashboardData.dashboardInfo) || {};
     return {
-      total: info.total || 0,
+      total: (progressData === null || progressData === void 0 ? void 0 : progressData.totalKnosInSystem) || 0,
       completed: (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) + (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCount) || 0,
-      pending: info.total - (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) - (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCount) || 0,
+      pending: (progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnos) || 0,
       rejected: (progressData === null || progressData === void 0 ? void 0 : progressData.rejectedKnos) || 0,
-      active: (progressData === null || progressData === void 0 ? void 0 : progressData.active) || 0,
+      totalAssignments: (progressData === null || progressData === void 0 ? void 0 : progressData.totalAssignments) || 0,
       submittedCount: (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) || 0,
       selfEkycCount: (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCount) || 0,
       overallProgressPercent: (progressData === null || progressData === void 0 ? void 0 : progressData.overallProgressPercent) || 0
     };
-  }, [dashboardData, progressData]);
-  return isProgressLoading || isLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(StatusCards, {
+  }, [progressData]);
+  return isProgressLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(StatusCards, {
     countData: countData
   });
 };
@@ -1080,483 +1065,6 @@ const Filter = _ref => {
   })));
 };
 
-const ekycMockData = {
-  topKpis: {
-    totalWaterConnections: 2990996,
-    totalEkycCompleted: 2460810,
-    totalPending: 530186,
-    totalRejected: 224324,
-    agencyEkycCompleted: 2352069,
-    citizenSelfEkycCompleted: 638927,
-    todaysEkyc: 54684,
-    successRate: 82,
-    rejectionPercentage: 7
-  },
-  executiveMetrics: {
-    totalSurveyors: 186,
-    totalSupervisors: 56,
-    activeJurisdictions: 27,
-    todaysGrowth: 2.8,
-    selfEkycAdoption: 38,
-    avgApprovalTime: "2.3 Days",
-    riskZones: 7,
-    escalationsOpen: 18
-  },
-  alerts: [{
-    title: "North East District pending increased",
-    priority: "high",
-    change: "+22%",
-    district: "North East District"
-  }, {
-    title: "Agency 2 self eKYC adoption low",
-    priority: "medium",
-    change: "-12%",
-    district: "West District"
-  }, {
-    title: "Escalation raised in NWS Bhera Enclave",
-    priority: "high",
-    change: "+18",
-    district: "Outer North"
-  }, {
-    title: "Approval rate improved in East District",
-    priority: "low",
-    change: "+9%",
-    district: "East District"
-  }],
-  heatmapData: [{
-    district: "Outer North",
-    intensity: 82
-  }, {
-    district: "East District",
-    intensity: 48
-  }, {
-    district: "South District",
-    intensity: 67
-  }, {
-    district: "North East District",
-    intensity: 74
-  }],
-  dailyTrend: [{
-    label: "Mon",
-    completed: 270689,
-    pending: 491305,
-    rejected: 145810
-  }, {
-    label: "Tue",
-    completed: 442945,
-    pending: 466563,
-    rejected: 157026
-  }, {
-    label: "Wed",
-    completed: 615202,
-    pending: 441821,
-    rejected: 168243
-  }, {
-    label: "Thu",
-    completed: 812067,
-    pending: 413545,
-    rejected: 179459
-  }, {
-    label: "Fri",
-    completed: 1033540,
-    pending: 381733,
-    rejected: 190675
-  }, {
-    label: "Sat",
-    completed: 1279621,
-    pending: 346388,
-    rejected: 201891
-  }, {
-    label: "Sun",
-    completed: 1574918,
-    pending: 303973,
-    rejected: 213107
-  }],
-  selfVsAgency: [{
-    label: "Agency1",
-    agency: 201457,
-    citizen: 758414
-  }, {
-    label: "Agency 2",
-    agency: 164302,
-    citizen: 919322
-  }, {
-    label: "Agency 3",
-    agency: 328451,
-    citizen: 541772
-  }],
-  pendingVsCompleted: [{
-    label: "Agency1",
-    completed: 201457,
-    pending: 201457
-  }, {
-    label: "Agency 2",
-    completed: 164302,
-    pending: 164302
-  }, {
-    label: "Agency 3",
-    completed: 328451,
-    pending: 77278
-  }],
-  rejectionAnalysis: [{
-    label: "Agency1",
-    rejected: 71990,
-    success: 72
-  }, {
-    label: "Agency 2",
-    rejected: 81271,
-    success: 77
-  }, {
-    label: "Agency 3",
-    rejected: 71063,
-    success: 86
-  }],
-  vendors: [{
-    id: 1,
-    name: "Agency1",
-    assignedConnections: 959871,
-    completedEkyc: 201457,
-    selfEkyc: 758414,
-    pending: 201457,
-    rejected: 71990,
-    inactiveDemand: 1161328,
-    successRate: 72,
-    progress: 21,
-    supervisors: 23,
-    activeSurveyors: 64,
-    jurisdictions: ["Outer North", "North West District", "Model Town AC 18", "Cluster 2", "North District"],
-    dailyPerformance: [{
-      day: "Mon",
-      completed: 16116,
-      pending: 196084,
-      rejected: 53272
-    }, {
-      day: "Tue",
-      completed: 26189,
-      pending: 192727,
-      rejected: 55072
-    }, {
-      day: "Wed",
-      completed: 38276,
-      pending: 188698,
-      rejected: 57232
-    }, {
-      day: "Thu",
-      completed: 52378,
-      pending: 183997,
-      rejected: 59751
-    }, {
-      day: "Fri",
-      completed: 68495,
-      pending: 178625,
-      rejected: 62631
-    }, {
-      day: "Sat",
-      completed: 84611,
-      pending: 173253,
-      rejected: 65510
-    }, {
-      day: "Sun",
-      completed: 100728,
-      pending: 167880,
-      rejected: 68390
-    }],
-    zones: [{
-      agency: "Agency1",
-      district: "Outer North",
-      cluster: "NWS Bhera Enclave",
-      assignedConnections: 102669,
-      location: "102669",
-      zroOffice: "NWS Bhera Enclave",
-      assemblyConstituency: "Part of Mundka AC 08",
-      gpsLocation: null,
-      distanceFromFarthestPoint: null,
-      activeDemand: 202197,
-      pppZones: 15800,
-      inactiveDemand: 35265,
-      districtwiseInactiveTotal: 237462
-    }, {
-      agency: "Agency1",
-      district: "Outer North",
-      cluster: "Narela",
-      assignedConnections: 99528,
-      location: "99528",
-      zroOffice: "Narela",
-      assemblyConstituency: "Narela AC 01",
-      activeDemand: 99528,
-      pppZones: 19465,
-      inactiveDemand: 35265
-    }, {
-      agency: "Agency1",
-      district: "North West District",
-      cluster: "Rohini AC 13",
-      assignedConnections: 71041,
-      location: "71041",
-      zroOffice: "Rohini",
-      assemblyConstituency: "Rithala AC 06",
-      activeDemand: 247949,
-      pppZones: 28975,
-      inactiveDemand: 49494
-    }, {
-      agency: "Agency1",
-      district: "Mangol Puri AC 12",
-      cluster: "Model Town AC 18",
-      assignedConnections: 68957,
-      location: "68957",
-      zroOffice: "Central North District",
-      assemblyConstituency: "Ashok Vihar",
-      activeDemand: 231216,
-      pppZones: 16627,
-      inactiveDemand: 36915
-    }, {
-      agency: "Agency1",
-      district: "Timarpur AC 03",
-      cluster: "Cluster 2",
-      assignedConnections: 34862,
-      location: "34862",
-      zroOffice: "Old Delhi District",
-      assemblyConstituency: "Pratap Nagar",
-      activeDemand: 99694,
-      pppZones: 20011,
-      inactiveDemand: 48011
-    }, {
-      agency: "Agency1",
-      district: "Bali Maran AC 22",
-      cluster: "North District",
-      assignedConnections: 110507,
-      location: "110507",
-      zroOffice: "Burari",
-      assemblyConstituency: "Burari AC 2",
-      activeDemand: 178815,
-      pppZones: 14700,
-      inactiveDemand: 31772
-    }]
-  }, {
-    id: 2,
-    name: "Agency 2",
-    assignedConnections: 1083624,
-    completedEkyc: 164302,
-    selfEkyc: 919322,
-    pending: 164302,
-    rejected: 81271,
-    inactiveDemand: 1247926,
-    successRate: 77,
-    progress: 15,
-    supervisors: 14,
-    activeSurveyors: 64,
-    jurisdictions: ["West District", "Janak Puri", "South District"],
-    dailyPerformance: [{
-      day: "Mon",
-      completed: 13144,
-      pending: 159920,
-      rejected: 60140
-    }, {
-      day: "Tue",
-      completed: 21359,
-      pending: 157182,
-      rejected: 62172
-    }, {
-      day: "Wed",
-      completed: 31217,
-      pending: 153896,
-      rejected: 64610
-    }, {
-      day: "Thu",
-      completed: 42718,
-      pending: 150062,
-      rejected: 67454
-    }, {
-      day: "Fri",
-      completed: 55862,
-      pending: 145681,
-      rejected: 70705
-    }, {
-      day: "Sat",
-      completed: 69006,
-      pending: 141299,
-      rejected: 73956
-    }, {
-      day: "Sun",
-      completed: 82151,
-      pending: 136918,
-      rejected: 77207
-    }],
-    zones: [{
-      agency: "Agency 2",
-      district: "West District",
-      cluster: "Rajouri Garden AC 27",
-      assignedConnections: 84506,
-      location: "84506",
-      zroOffice: "Rajouri Garden AC 27",
-      assemblyConstituency: "Punjabi Bagh",
-      activeDemand: 470766,
-      pppZones: 13269,
-      inactiveDemand: 64564
-    }, {
-      agency: "Agency 2",
-      district: "West District",
-      cluster: "Tilak Nagar AC 29",
-      assignedConnections: 51428,
-      location: "51428",
-      zroOffice: "Tilak Nagar AC 29",
-      assemblyConstituency: "Paschim Vihar",
-      activeDemand: 470766,
-      pppZones: 6298,
-      inactiveDemand: 64564
-    }, {
-      agency: "Agency 2",
-      district: "Part of Uttam Nagar & Vikas puri",
-      cluster: "Janak Puri",
-      assignedConnections: 163041,
-      location: "163041",
-      zroOffice: "Janakpuri",
-      assemblyConstituency: "Janakpuri AC 30",
-      activeDemand: 369772,
-      pppZones: 25729,
-      inactiveDemand: 60534
-    }, {
-      agency: "Agency 2",
-      district: "South District",
-      cluster: "South District",
-      assignedConnections: 52803,
-      location: "52803",
-      zroOffice: "R K Puram",
-      assemblyConstituency: "Malviya Nagar AC 43",
-      activeDemand: 243086,
-      pppZones: 9678,
-      inactiveDemand: 39204
-    }, {
-      agency: "Agency 2",
-      district: "South District",
-      cluster: "Vasant Kunz",
-      assignedConnections: 58997,
-      location: "58997",
-      zroOffice: "Vasant Kunj",
-      assemblyConstituency: "Vasant Kunj",
-      activeDemand: 243086,
-      pppZones: 6691,
-      inactiveDemand: 39204
-    }]
-  }, {
-    id: 3,
-    name: "Agency 3",
-    assignedConnections: 947501,
-    completedEkyc: 328451,
-    selfEkyc: 541772,
-    pending: 77278,
-    rejected: 71063,
-    inactiveDemand: 1016841,
-    successRate: 86,
-    progress: 78,
-    supervisors: 19,
-    activeSurveyors: 58,
-    jurisdictions: ["East District", "North East District", "South East District", "MNWS"],
-    dailyPerformance: [{
-      day: "Mon",
-      completed: 44120,
-      pending: 130002,
-      rejected: 5711
-    }, {
-      day: "Tue",
-      completed: 58221,
-      pending: 121998,
-      rejected: 7104
-    }, {
-      day: "Wed",
-      completed: 70218,
-      pending: 113201,
-      rejected: 8842
-    }, {
-      day: "Thu",
-      completed: 85124,
-      pending: 104006,
-      rejected: 9911
-    }, {
-      day: "Fri",
-      completed: 102315,
-      pending: 94441,
-      rejected: 11214
-    }, {
-      day: "Sat",
-      completed: 121009,
-      pending: 85218,
-      rejected: 12902
-    }, {
-      day: "Sun",
-      completed: 142118,
-      pending: 77278,
-      rejected: 14101
-    }],
-    zones: [{
-      agency: "Agency 3",
-      district: "East District",
-      cluster: "Mayur Vihar",
-      assignedConnections: 72326,
-      location: "72326",
-      zroOffice: "Mayur Vihar",
-      assemblyConstituency: "Trilokpuri AC 55",
-      activeDemand: 328564,
-      pppZones: 9691,
-      inactiveDemand: 52477
-    }, {
-      agency: "Agency 3",
-      district: "East District",
-      cluster: "Yojna Vihar",
-      assignedConnections: 40651,
-      location: "40651",
-      zroOffice: "Yojna Vihar",
-      assemblyConstituency: "Vishwas Nagar AC 59",
-      activeDemand: 328564,
-      pppZones: 10097,
-      inactiveDemand: 52477
-    }, {
-      agency: "Agency 3",
-      district: "North East District",
-      cluster: "GTB Enclave",
-      assignedConnections: 80453,
-      location: "80453",
-      zroOffice: "GTB Enclave",
-      assemblyConstituency: "Seemapuri AC 63",
-      activeDemand: 323753,
-      pppZones: 10671,
-      inactiveDemand: 50575
-    }, {
-      agency: "Agency 3",
-      district: "North East District",
-      cluster: "Yamuna Vihar",
-      assignedConnections: 90599,
-      location: "90599",
-      zroOffice: "Yamuna Vihar",
-      assemblyConstituency: "Mustafabad AC 69",
-      activeDemand: 323753,
-      pppZones: 18185,
-      inactiveDemand: 50575
-    }, {
-      agency: "Agency 3",
-      district: "South East District",
-      cluster: "Kalkaji AC 51",
-      assignedConnections: 29188,
-      location: "29188",
-      zroOffice: "Kalkaji AC 51",
-      assemblyConstituency: "Saket",
-      activeDemand: 136102,
-      pppZones: 3675,
-      inactiveDemand: 23977
-    }, {
-      agency: "Agency 3",
-      district: "South East District",
-      cluster: "Okhla",
-      assignedConnections: 18473,
-      location: "18473",
-      zroOffice: "Sarita Vihar/Okhla",
-      assemblyConstituency: "Okhla AC 54",
-      activeDemand: 136102,
-      pppZones: 3703,
-      inactiveDemand: 23977
-    }]
-  }]
-};
-
 const downloadSurveyorPDF = function (_ref) {
   let rows = _ref.rows,
     surveyorName = _ref.surveyorName,
@@ -1879,21 +1387,30 @@ const downloadVendorPDF = function (_ref3) {
 };
 
 const VendorDetailsCard = () => {
-  var _Digit$SessionStorage, _vendor$owner, _vendor$owner2, _vendorName$charAt;
+  var _vendor$owner, _vendor$owner2, _vendorName$charAt;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const history = reactRouterDom.useHistory();
   const tenantId = Digit.ULBService.getCurrentTenantId() || "dl.djb";
   const _useParams = reactRouterDom.useParams(),
     vendorId = _useParams.vendorId;
-  const _Digit$Hooks$fsm$useD = Digit.Hooks.fsm.useDsoSearch(tenantId, {
-      status: "ACTIVE"
-    }, {
-      enabled: !!tenantId,
-      staleTime: 300000
+  const _Digit$Hooks$fsm$useV = Digit.Hooks.fsm.useVendorSearch({
+      tenantId,
+      filters: {
+        status: "ACTIVE",
+        ids: vendorId
+      },
+      config: {
+        enabled: !!tenantId,
+        staleTime: 300000
+      }
     }),
-    vendorSearchResponse = _Digit$Hooks$fsm$useD.data,
-    isVendorSearchLoading = _Digit$Hooks$fsm$useD.isLoading;
+    _Digit$Hooks$fsm$useV2 = _Digit$Hooks$fsm$useV.data,
+    _Digit$Hooks$fsm$useV3 = _Digit$Hooks$fsm$useV2 === void 0 ? {} : _Digit$Hooks$fsm$useV2,
+    _Digit$Hooks$fsm$useV4 = _Digit$Hooks$fsm$useV3.vendor,
+    _Digit$Hooks$fsm$useV5 = _Digit$Hooks$fsm$useV4 === void 0 ? [] : _Digit$Hooks$fsm$useV4,
+    vendor = _Digit$Hooks$fsm$useV5[0],
+    isVendorSearchLoading = _Digit$Hooks$fsm$useV.isLoading;
   const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
       status: "ACTIVE"
     }, {
@@ -1902,43 +1419,9 @@ const VendorDetailsCard = () => {
     }),
     supervisorSearchResponse = _Digit$Hooks$fsm$useS.data,
     isSupervisorSearchLoading = _Digit$Hooks$fsm$useS.isLoading;
-  const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
-  const vendor = React.useMemo(() => {
-    const userUuid = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.uuid;
-    const userMobile = loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber;
-    const matchesUser = v => {
-      var _v$owner, _v$owner2, _v$owner3;
-      const ownerUuid = ((_v$owner = v.owner) === null || _v$owner === void 0 ? void 0 : _v$owner.uuid) || ((_v$owner2 = v.owner) === null || _v$owner2 === void 0 ? void 0 : _v$owner2.id);
-      const ownerMobile = ((_v$owner3 = v.owner) === null || _v$owner3 === void 0 ? void 0 : _v$owner3.mobileNumber) || v.mobileNumber;
-      return userUuid && ownerUuid === userUuid || userMobile && ownerMobile === userMobile;
-    };
-    if (vendorSearchResponse) {
-      if (vendorId) {
-        const matched = vendorSearchResponse.find(v => {
-          var _v$dsoDetails, _v$dsoDetails2;
-          return ((_v$dsoDetails = v.dsoDetails) === null || _v$dsoDetails === void 0 ? void 0 : _v$dsoDetails.id) === vendorId || ((_v$dsoDetails2 = v.dsoDetails) === null || _v$dsoDetails2 === void 0 ? void 0 : _v$dsoDetails2.vendorId) === vendorId || v.id === vendorId || v.vendorId === vendorId;
-        });
-        if (matched) return matched.dsoDetails || matched;
-      } else {
-        const matched = vendorSearchResponse.find(v => matchesUser(v.dsoDetails || v));
-        if (matched) return matched.dsoDetails || matched;
-        if (vendorSearchResponse.length > 0) return vendorSearchResponse[0].dsoDetails || vendorSearchResponse[0];
-      }
-    }
-    if (vendorId) {
-      return ekycMockData.vendors.find(v => v.id === Number(vendorId) || v.name === vendorId) || ekycMockData.vendors[0];
-    } else {
-      const matchedMock = ekycMockData.vendors.find(v => {
-        var _v$name, _loggedInUser$name;
-        return ((_v$name = v.name) === null || _v$name === void 0 ? void 0 : _v$name.toLowerCase()) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$name = loggedInUser.name) === null || _loggedInUser$name === void 0 ? void 0 : _loggedInUser$name.toLowerCase());
-      });
-      return matchedMock || ekycMockData.vendors[0];
-    }
-  }, [vendorSearchResponse, vendorId, loggedInUser]);
   const targetVendorId = vendorId || (vendor === null || vendor === void 0 ? void 0 : vendor.id) || (vendor === null || vendor === void 0 ? void 0 : vendor.vendorId);
   const _Digit$Hooks$ekyc$use = Digit.Hooks.ekyc.useEkycAssignmentProgress(targetVendorId ? {
-      vendorId: targetVendorId,
-      vendorIds: [targetVendorId]
+      vendorId: targetVendorId
     } : {}, {
       enabled: !!tenantId,
       keepPreviousData: true
@@ -1997,32 +1480,43 @@ const VendorDetailsCard = () => {
     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()) : [];
   }, [vendor]);
   const cards = React.useMemo(() => {
-    const hasRealData = vendorSupervisors.some(s => s.totalKnos > 0);
-    console.log("11111111111111111", vendorSupervisors);
-    console.log(progressData);
-    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;
-    const totalAssignments = 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;
-    const completedKnos = hasRealData ? vendorSupervisors.reduce((acc, s) => acc + (s.submittedKnos || 0), 0) : (progressData === null || progressData === void 0 ? void 0 : progressData.completedKnos) || (vendor === null || vendor === void 0 ? void 0 : vendor.completedEkyc) || 0;
-    const pendingKnos = hasRealData ? vendorSupervisors.reduce((acc, s) => acc + (s.pendingKnos || 0), 0) : totalKnos - completedKnos;
-    const progressPercent = totalKnos > 0 ? Math.round(completedKnos / totalKnos * 100) : (vendor === null || vendor === void 0 ? void 0 : vendor.progress) || 0;
+    const totalKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.totalKnosInZones) || 0;
+    const totalAssignments = (progressData === null || progressData === void 0 ? void 0 : progressData.totalKnos) || 0;
+    const completedKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnos) || 0;
+    const selfEkycCount = (progressData === null || progressData === void 0 ? void 0 : progressData.selfEkycCountInZones) || 0;
+    const submittedKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.submittedKnosInZones) || 0;
+    const pendingKnos = (progressData === null || progressData === void 0 ? void 0 : progressData.pendingKnos) || 0;
+    const progressPercent = (progressData === null || progressData === void 0 ? void 0 : progressData.overallProgressPercent) || 0;
     return [{
-      label: "TOTAL_EKYC_APPLICATIONS",
+      label: "TOTAL_KNOS",
       count: totalKnos,
       color: "#0B2559",
       type: "today",
-      icon: /*#__PURE__*/React__default.createElement(fa.FaUsers, null)
+      icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.FaDatabase, null)
     }, {
       label: "TOTAL_EKYC_APPLICATIONS",
       count: totalAssignments,
       color: "#0B2559",
       type: "today",
-      icon: /*#__PURE__*/React__default.createElement(fa.FaUsers, null)
+      icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.FaFileAlt, null)
     }, {
       label: "EKYC_COMPLETED",
       count: completedKnos,
       color: "#10B981",
       type: "month",
       icon: /*#__PURE__*/React__default.createElement(fa.FaCheckCircle, null)
+    }, {
+      label: "EKYC_SUBMITTED_BY_VENDORS",
+      count: submittedKnos,
+      color: "#10B981",
+      type: "month",
+      icon: /*#__PURE__*/React__default.createElement(fa.FaBuilding, null)
+    }, {
+      label: "EKYC_SUBMITTED_BY_CITIZEN",
+      count: selfEkycCount,
+      color: "#10B981",
+      type: "month",
+      icon: /*#__PURE__*/React__default.createElement(fa.FaUser, null)
     }, {
       label: "PENDING_APPLICATIONS",
       count: pendingKnos,
@@ -2270,9 +1764,9 @@ const VendorDetailsCard = () => {
     Header: t("SUPERVISOR_NAME") || "Supervisor Name",
     accessor: row => (row === null || row === void 0 ? void 0 : row.name) || "N/A",
     Cell: _ref => {
-      var _Digit$SessionStorage2, _Digit$SessionStorage3, _Digit$SessionStorage4, _row$original;
+      var _Digit$SessionStorage, _Digit$SessionStorage2, _Digit$SessionStorage3, _row$original;
       let row = _ref.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 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.original.id;
       return /*#__PURE__*/React__default.createElement("a", {
         href: targetPath,
@@ -2495,25 +1989,7 @@ const VendorDetailsCard = () => {
       setShowReportMenu(p => !p);
       setShowCustomPicker(false);
     }
-  }, /*#__PURE__*/React__default.createElement("svg", {
-    width: "16",
-    height: "16",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "currentColor",
-    strokeWidth: "2.5",
-    strokeLinecap: "round",
-    strokeLinejoin: "round"
-  }, /*#__PURE__*/React__default.createElement("path", {
-    d: "M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"
-  }), /*#__PURE__*/React__default.createElement("polyline", {
-    points: "7 10 12 15 17 10"
-  }), /*#__PURE__*/React__default.createElement("line", {
-    x1: "12",
-    y1: "15",
-    x2: "12",
-    y2: "3"
-  })), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.MdDownloadIcon, null), ekycDownloadLoading ? t("DOWNLOADING") || "Downloading..." : t("DOWNLOAD_EXCEL") || "Download Excel"), showReportMenu && /*#__PURE__*/React__default.createElement("div", {
     className: "report-menu"
   }, [{
     label: t("TODAY") || "Today",
@@ -2587,7 +2063,7 @@ const VendorDetailsCard = () => {
   }, zoneIds.map(zone => /*#__PURE__*/React__default.createElement("span", {
     key: zone,
     className: "selected-zone-chip"
-  }, t(zone) || zone))) : "N/A")))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
+  }, t(zone) || zone))) : "N/A")))), /*#__PURE__*/React__default.createElement("div", {
     className: "dashboard-card"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
     t: t,
@@ -2729,7 +2205,7 @@ const useInboxTableConfig = _ref => {
     manualPagination: true,
     initSortId: "applicationDate",
     onPageSizeChange: onPageSizeChange,
-    currentPage: offset,
+    currentPage: Math.floor(offset / limit),
     onNextPage: () => {
       var _formState$tableForm3;
       return dispatch({
@@ -5358,66 +4834,73 @@ const AdminDashboard = () => {
     className: "section-title"
   }, t("EKYC_VENDORS_PERFORMANCE") || "eKYC Vendors Performance"), isVendorSearchLoading || isProgressLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.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 => /*#__PURE__*/React__default.createElement("div", {
-    key: vendor.vendorId,
-    className: "vendor-perf-card",
-    onClick: () => history.push("/digit-ui/employee/ekyc/vendors/" + vendor.vendorId)
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "vendor-card-header"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "vendor-title"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "vendor-icon"
-  }, /*#__PURE__*/React__default.createElement("span", null, vendor.vendorName[0].toUpperCase())), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("h4", null, vendor.vendorName), /*#__PURE__*/React__default.createElement("span", {
-    className: "vendor-subtitle"
-  }, t("EKYC_VENDOR") || "eKYC Vendor"))), /*#__PURE__*/React__default.createElement("div", {
-    className: "progress-badge"
-  }, vendor.progressPercent, "%")), /*#__PURE__*/React__default.createElement("div", {
-    className: "progress-section"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "progress-bar-container"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "progress-bar-fill",
-    style: {
-      width: vendor.progressPercent + "%"
-    }
-  })), /*#__PURE__*/React__default.createElement("div", {
-    className: "progress-label"
-  }, /*#__PURE__*/React__default.createElement("span", null, t("PROGRESS") || "Progress"), /*#__PURE__*/React__default.createElement("span", null, vendor.progressPercent, "%"))), /*#__PURE__*/React__default.createElement("div", {
-    className: "stats-grid"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "stat-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "stat-value"
-  }, vendor.totalSupervisors), /*#__PURE__*/React__default.createElement("span", {
-    className: "stat-label"
-  }, t("SUPERVISORS") || "Supervisors")), /*#__PURE__*/React__default.createElement("div", {
-    className: "stat-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "stat-value"
-  }, vendor.totalSurveyors), /*#__PURE__*/React__default.createElement("span", {
-    className: "stat-label"
-  }, t("SURVEYORS") || "Surveyors")), /*#__PURE__*/React__default.createElement("div", {
-    className: "stat-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "stat-value completed-val"
-  }, vendor.submittedKnos), /*#__PURE__*/React__default.createElement("span", {
-    className: "stat-label"
-  }, t("COMPLETED") || "Completed"))), /*#__PURE__*/React__default.createElement("div", {
-    className: "knos-summary"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "kno-stat"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "kno-label"
-  }, t("TOTAL") || "Total"), /*#__PURE__*/React__default.createElement("strong", null, vendor.totalKnos)), /*#__PURE__*/React__default.createElement("div", {
-    className: "kno-stat pending"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "kno-label"
-  }, t("PENDING") || "Pending"), /*#__PURE__*/React__default.createElement("strong", null, vendor.pendingKnos)), /*#__PURE__*/React__default.createElement("div", {
-    className: "kno-stat rejected"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "kno-label"
-  }, t("REJECTED") || "Rejected"), /*#__PURE__*/React__default.createElement("strong", null, vendor.rejectedKnos)))))))));
+  }, 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__default.createElement("div", {
+      key: vendor.vendorId,
+      className: "vendor-perf-card",
+      onClick: () => history.push("/digit-ui/employee/ekyc/vendors/" + vendor.vendorId)
+    }, /*#__PURE__*/React__default.createElement("div", {
+      className: "vendor-card-header"
+    }, /*#__PURE__*/React__default.createElement("div", {
+      className: "vendor-title"
+    }, /*#__PURE__*/React__default.createElement("div", {
+      className: "vendor-icon"
+    }, /*#__PURE__*/React__default.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__default.createElement("div", null, /*#__PURE__*/React__default.createElement("h4", null, vendor.vendorName), /*#__PURE__*/React__default.createElement("span", {
+      className: "vendor-subtitle"
+    }, t("EKYC_VENDOR") || "eKYC Vendor"))), /*#__PURE__*/React__default.createElement("div", {
+      className: "kno-count-badge"
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: "kno-count-label"
+    }, t("TOTAL_KNOS") || "Total KNOs", " -"), /*#__PURE__*/React__default.createElement("span", {
+      className: "kno-count-value"
+    }, vendor.totalKnosInZones))), /*#__PURE__*/React__default.createElement("div", {
+      className: "progress-section"
+    }, /*#__PURE__*/React__default.createElement("div", {
+      className: "progress-bar-container"
+    }, /*#__PURE__*/React__default.createElement("div", {
+      className: "progress-bar-fill",
+      style: {
+        width: vendor.progressPercent + "%"
+      }
+    })), /*#__PURE__*/React__default.createElement("div", {
+      className: "progress-label"
+    }, /*#__PURE__*/React__default.createElement("span", null, t("PROGRESS") || "Progress"), /*#__PURE__*/React__default.createElement("span", null, vendor.progressPercent, "%"))), /*#__PURE__*/React__default.createElement("div", {
+      className: "stats-grid"
+    }, /*#__PURE__*/React__default.createElement("div", {
+      className: "stat-item"
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: "stat-value"
+    }, vendor.totalSupervisors), /*#__PURE__*/React__default.createElement("span", {
+      className: "stat-label"
+    }, t("SUPERVISORS") || "Supervisors")), /*#__PURE__*/React__default.createElement("div", {
+      className: "stat-item"
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: "stat-value"
+    }, vendor.totalSurveyors), /*#__PURE__*/React__default.createElement("span", {
+      className: "stat-label"
+    }, t("SURVEYORS") || "Surveyors")), /*#__PURE__*/React__default.createElement("div", {
+      className: "stat-item"
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: "stat-value"
+    }, vendor.totalKnos), /*#__PURE__*/React__default.createElement("span", {
+      className: "stat-label"
+    }, t("TOTAL_KNOS") || "Total KNOs"))), /*#__PURE__*/React__default.createElement("div", {
+      className: "knos-summary"
+    }, /*#__PURE__*/React__default.createElement("div", {
+      className: "kno-stat"
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: "kno-label"
+    }, t("SUBMITTED") || "Submitted"), /*#__PURE__*/React__default.createElement("strong", null, vendor.submittedKnos)), /*#__PURE__*/React__default.createElement("div", {
+      className: "kno-stat pending"
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: "kno-label"
+    }, t("PENDING") || "Pending"), /*#__PURE__*/React__default.createElement("strong", null, vendor.pendingKnos)), /*#__PURE__*/React__default.createElement("div", {
+      className: "kno-stat rejected"
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: "kno-label"
+    }, t("REJECTED") || "Rejected"), /*#__PURE__*/React__default.createElement("strong", null, vendor.rejectedKnos))));
+  })))));
 };
 
 const SupervisorDetailsCard = () => {
@@ -7377,7 +6860,8 @@ const SurveyorDetailsDashboard = () => {
     isPaginationRequired: true,
     onNextPage: () => {
       var _dashboardData$dashbo7;
-      if (currentPage < ((dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo7 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo7 === void 0 ? void 0 : _dashboardData$dashbo7.totalPages) || 1) - 1) {
+      const total = (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo7 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo7 === void 0 ? void 0 : _dashboardData$dashbo7.total) || 0;
+      if (currentPage < Math.ceil(total / pageSize) - 1) {
         setCurrentPage(prev => prev + 1);
       }
     },
@@ -7391,7 +6875,8 @@ const SurveyorDetailsDashboard = () => {
     },
     onLastPage: () => {
       var _dashboardData$dashbo8;
-      setCurrentPage(Math.max(((dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo8 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo8 === void 0 ? void 0 : _dashboardData$dashbo8.totalPages) || 1) - 1, 0));
+      const total = (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo8 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo8 === void 0 ? void 0 : _dashboardData$dashbo8.total) || 0;
+      setCurrentPage(Math.max(Math.ceil(total / pageSize) - 1, 0));
     },
     onPageSizeChange: e => {
       setPageSize(Number(e.target.value));