@djb25/digit-ui-module-ekyc 1.0.59 → 1.0.61

package/dist/index.js

@@ -2519,9 +2519,7 @@ const VendorDetailsCard = () => {
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "ekyc-details-wrapper"
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "details-left"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "details-grid"
+    className: "details-top-row"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React__default.createElement("span", {
@@ -2535,28 +2533,8 @@ const VendorDetailsCard = () => {
   }, t("EMAIL")), /*#__PURE__*/React__default.createElement("span", {
     className: "value"
   }, email)), /*#__PURE__*/React__default.createElement("div", {
-    className: "detail-item",
-    style: {
-      gridColumn: "1 / -1"
-    }
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "label"
-  }, t("ASSIGNED_ZONES") || "Assigned Zones"), /*#__PURE__*/React__default.createElement("span", {
-    className: "value"
-  }, zoneIds.length > 0 ? /*#__PURE__*/React__default.createElement("div", {
-    className: "selected-zones",
-    style: {
-      marginTop: "4px",
-      width: "100%"
-    }
-  }, zoneIds.map(zone => /*#__PURE__*/React__default.createElement("span", {
-    key: zone,
-    className: "selected-zone-chip"
-  }, t(zone) || zone))) : "N/A")))), /*#__PURE__*/React__default.createElement("div", {
-    className: "details-right"
-  }, /*#__PURE__*/React__default.createElement("div", {
     className: "download-card"
-  }, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format.")), /*#__PURE__*/React__default.createElement("div", {
     className: "report-download",
     ref: reportMenuRef
   }, /*#__PURE__*/React__default.createElement("button", {
@@ -2640,12 +2618,31 @@ const VendorDetailsCard = () => {
   }, t("CANCEL") || "Cancel"), /*#__PURE__*/React__default.createElement("button", {
     className: "picker-apply-btn",
     onClick: handleCustomDownload
-  }, t("APPLY") || "Apply"))))))))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
+  }, t("APPLY") || "Apply"))))))), /*#__PURE__*/React__default.createElement("div", {
+    className: "full-width-item"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "label"
+  }, t("ASSIGNED_ZONES") || "Assigned Zones"), /*#__PURE__*/React__default.createElement("span", {
+    className: "value"
+  }, zoneIds.length > 0 ? /*#__PURE__*/React__default.createElement("div", {
+    className: "selected-zones",
+    style: {
+      marginTop: "4px",
+      width: "100%",
+      display: "flex",
+      flexWrap: "wrap",
+      gap: "8px"
+    }
+  }, 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, {
     className: "dashboard-card"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
     t: t,
     tableTitle: t("CONNECTED_SUPERVISORS") || "Connected Supervisors",
     tableClass: "ekycTable",
+    isTableScrollable: true,
     data: paginatedSupervisors,
     columns: supervisorColumns,
     isLoading: isPageLoading,
@@ -2663,12 +2660,8 @@ const VendorDetailsCard = () => {
         setCurrentPage(prev => prev - 1);
       }
     },
-    onFirstPage: () => {
-      setCurrentPage(0);
-    },
-    onLastPage: () => {
-      setCurrentPage(Math.max(Math.ceil(vendorSupervisors.length / pageSize) - 1, 0));
-    },
+    onFirstPage: () => setCurrentPage(0),
+    onLastPage: () => setCurrentPage(Math.max(Math.ceil(vendorSupervisors.length / pageSize) - 1, 0)),
     onPageSizeChange: e => {
       setPageSize(Number(e.target.value));
       setCurrentPage(0);
@@ -5632,12 +5625,12 @@ const SupervisorDetailsCard = () => {
       });
     }
     if (matchedSup) {
-      var _progressReport, _progressReport2, _progressReport3, _matchedSup$owner2, _matchedSup$owner3, _matchedSup$owner4;
+      var _progressReport, _progressReport2, _progressReport3, _matchedSup$owner2, _matchedSup$owner3, _matchedSup$owner4, _matchedSup$owner5, _matchedSup$owner6, _matchedSup$owner7;
       const matchedSurveyors = surveyorSearchResponse !== null && surveyorSearchResponse !== void 0 && surveyorSearchResponse.surveyors ? surveyorSearchResponse.surveyors.filter(surv => {
         var _matchedSup$owner;
         return surv.supervisorId === (matchedSup.id || ((_matchedSup$owner = matchedSup.owner) === null || _matchedSup$owner === void 0 ? void 0 : _matchedSup$owner.uuid));
       }).map(surv => {
-        var _surv$owner3, _surv$owner4, _surv$owner5, _realStats, _realStats2, _realStats3, _realStats4;
+        var _surv$owner3, _surv$owner4, _surv$owner5, _surv$owner6, _surv$owner7, _realStats, _realStats2, _realStats3, _realStats4;
         let realStats = null;
         if (progressData !== null && progressData !== void 0 && progressData.supervisorReport) {
           for (const report of progressData.supervisorReport) {
@@ -5657,6 +5650,8 @@ const SupervisorDetailsCard = () => {
           surveyorId: surv.id || ((_surv$owner3 = surv.owner) === null || _surv$owner3 === void 0 ? void 0 : _surv$owner3.uuid),
           surveyorName: surv.name || ((_surv$owner4 = surv.owner) === null || _surv$owner4 === void 0 ? void 0 : _surv$owner4.name) || "N/A",
           mobileNo: ((_surv$owner5 = surv.owner) === null || _surv$owner5 === void 0 ? void 0 : _surv$owner5.mobileNumber) || surv.mobileNo || "N/A",
+          email: ((_surv$owner6 = surv.owner) === null || _surv$owner6 === void 0 ? void 0 : _surv$owner6.emailId) || "N/A",
+          gender: ((_surv$owner7 = surv.owner) === null || _surv$owner7 === void 0 ? void 0 : _surv$owner7.gender) || "N/A",
           status: surv.status || "ACTIVE",
           totalKnos: ((_realStats = realStats) === null || _realStats === void 0 ? void 0 : _realStats.totalKnos) || 0,
           submittedKnos: ((_realStats2 = realStats) === null || _realStats2 === void 0 ? void 0 : _realStats2.submittedKnos) || 0,
@@ -5672,6 +5667,8 @@ const SupervisorDetailsCard = () => {
         supervisorId: matchedSup.id || ((_matchedSup$owner2 = matchedSup.owner) === null || _matchedSup$owner2 === void 0 ? void 0 : _matchedSup$owner2.uuid),
         supervisorName: matchedSup.name || ((_matchedSup$owner3 = matchedSup.owner) === null || _matchedSup$owner3 === void 0 ? void 0 : _matchedSup$owner3.name) || "N/A",
         mobileNo: ((_matchedSup$owner4 = matchedSup.owner) === null || _matchedSup$owner4 === void 0 ? void 0 : _matchedSup$owner4.mobileNumber) || matchedSup.mobileNo || "N/A",
+        email: ((_matchedSup$owner5 = matchedSup.owner) === null || _matchedSup$owner5 === void 0 ? void 0 : _matchedSup$owner5.emailId) || ((_matchedSup$owner6 = matchedSup.owner) === null || _matchedSup$owner6 === void 0 ? void 0 : _matchedSup$owner6.email) || matchedSup.email || matchedSup.emailId || "N/A",
+        gender: ((_matchedSup$owner7 = matchedSup.owner) === null || _matchedSup$owner7 === void 0 ? void 0 : _matchedSup$owner7.gender) || matchedSup.gender || "N/A",
         status: matchedSup.status || "ACTIVE",
         assignedZoneId: matchedSup.assignedZoneId || "N/A",
         vendorId: matchedSup.vendorId,
@@ -5683,20 +5680,28 @@ const SupervisorDetailsCard = () => {
       };
     }
     if (progressReport) {
-      var _loggedInUser$uuid;
+      var _loggedInUser$uuid, _supervisorSearchResp, _matchedSupForFallbac, _matchedSupForFallbac2, _matchedSupForFallbac3;
       const isSelf = (targetId === null || targetId === void 0 ? void 0 : targetId.toLowerCase()) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$uuid = loggedInUser.uuid) === null || _loggedInUser$uuid === void 0 ? void 0 : _loggedInUser$uuid.toLowerCase());
       const supervisorName = isSelf ? (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.name) || progressReport.supervisorName || "N/A" : progressReport.supervisorName || "N/A";
       const mobileNo = isSelf ? (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber) || progressReport.mobileNo || "N/A" : progressReport.mobileNo || "N/A";
+      const matchedSupForFallback = supervisorSearchResponse === null || supervisorSearchResponse === void 0 ? void 0 : (_supervisorSearchResp = supervisorSearchResponse.supervisors) === null || _supervisorSearchResp === void 0 ? void 0 : _supervisorSearchResp.find(s => {
+        var _s$id7, _ref, _s$owner4, _s$owner4$uuid, _ref2;
+        return ((_s$id7 = s.id) === null || _s$id7 === void 0 ? void 0 : _s$id7.toLowerCase()) === ((_ref = progressReport.supervisorId || progressReport.id) === null || _ref === void 0 ? void 0 : _ref.toLowerCase()) || ((_s$owner4 = s.owner) === null || _s$owner4 === void 0 ? void 0 : (_s$owner4$uuid = _s$owner4.uuid) === null || _s$owner4$uuid === void 0 ? void 0 : _s$owner4$uuid.toLowerCase()) === ((_ref2 = progressReport.supervisorId || progressReport.id) === null || _ref2 === void 0 ? void 0 : _ref2.toLowerCase());
+      });
+      const email = (matchedSupForFallback === null || matchedSupForFallback === void 0 ? void 0 : (_matchedSupForFallbac = matchedSupForFallback.owner) === null || _matchedSupForFallbac === void 0 ? void 0 : _matchedSupForFallbac.emailId) || (matchedSupForFallback === null || matchedSupForFallback === void 0 ? void 0 : (_matchedSupForFallbac2 = matchedSupForFallback.owner) === null || _matchedSupForFallbac2 === void 0 ? void 0 : _matchedSupForFallbac2.email) || (matchedSupForFallback === null || matchedSupForFallback === void 0 ? void 0 : matchedSupForFallback.email) || (isSelf ? loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.emailId : null) || progressReport.email || "N/A";
+      const gender = (matchedSupForFallback === null || matchedSupForFallback === void 0 ? void 0 : (_matchedSupForFallbac3 = matchedSupForFallback.owner) === null || _matchedSupForFallbac3 === void 0 ? void 0 : _matchedSupForFallbac3.gender) || (matchedSupForFallback === null || matchedSupForFallback === void 0 ? void 0 : matchedSupForFallback.gender) || (isSelf ? loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.gender : null) || progressReport.gender || "N/A";
       const surveyorsMapped = progressReport.surveyors ? progressReport.surveyors.map(surv => {
-        var _surveyorSearchRespon, _matchedSurv$owner, _matchedSurv$owner2;
+        var _surveyorSearchRespon, _matchedSurv$owner, _matchedSurv$owner2, _matchedSurv$owner3, _matchedSurv$owner4, _matchedSurv$owner5;
         const matchedSurv = surveyorSearchResponse === null || surveyorSearchResponse === void 0 ? void 0 : (_surveyorSearchRespon = surveyorSearchResponse.surveyors) === null || _surveyorSearchRespon === void 0 ? void 0 : _surveyorSearchRespon.find(s => {
-          var _s$id7, _surv$surveyorId, _s$owner4, _s$owner4$uuid, _surv$surveyorId2;
-          return ((_s$id7 = s.id) === null || _s$id7 === void 0 ? void 0 : _s$id7.toLowerCase()) === ((_surv$surveyorId = surv.surveyorId) === null || _surv$surveyorId === void 0 ? void 0 : _surv$surveyorId.toLowerCase()) || ((_s$owner4 = s.owner) === null || _s$owner4 === void 0 ? void 0 : (_s$owner4$uuid = _s$owner4.uuid) === null || _s$owner4$uuid === void 0 ? void 0 : _s$owner4$uuid.toLowerCase()) === ((_surv$surveyorId2 = surv.surveyorId) === null || _surv$surveyorId2 === void 0 ? void 0 : _surv$surveyorId2.toLowerCase());
+          var _s$id8, _surv$surveyorId, _s$owner5, _s$owner5$uuid, _surv$surveyorId2;
+          return ((_s$id8 = s.id) === null || _s$id8 === void 0 ? void 0 : _s$id8.toLowerCase()) === ((_surv$surveyorId = surv.surveyorId) === null || _surv$surveyorId === void 0 ? void 0 : _surv$surveyorId.toLowerCase()) || ((_s$owner5 = s.owner) === null || _s$owner5 === void 0 ? void 0 : (_s$owner5$uuid = _s$owner5.uuid) === null || _s$owner5$uuid === void 0 ? void 0 : _s$owner5$uuid.toLowerCase()) === ((_surv$surveyorId2 = surv.surveyorId) === null || _surv$surveyorId2 === void 0 ? void 0 : _surv$surveyorId2.toLowerCase());
         });
         return {
           surveyorId: surv.surveyorId || surv.id,
           surveyorName: (matchedSurv === null || matchedSurv === void 0 ? void 0 : matchedSurv.name) || (matchedSurv === null || matchedSurv === void 0 ? void 0 : (_matchedSurv$owner = matchedSurv.owner) === null || _matchedSurv$owner === void 0 ? void 0 : _matchedSurv$owner.name) || surv.surveyorName || "N/A",
           mobileNo: (matchedSurv === null || matchedSurv === void 0 ? void 0 : (_matchedSurv$owner2 = matchedSurv.owner) === null || _matchedSurv$owner2 === void 0 ? void 0 : _matchedSurv$owner2.mobileNumber) || (matchedSurv === null || matchedSurv === void 0 ? void 0 : matchedSurv.mobileNo) || surv.mobileNo || "N/A",
+          email: (matchedSurv === null || matchedSurv === void 0 ? void 0 : (_matchedSurv$owner3 = matchedSurv.owner) === null || _matchedSurv$owner3 === void 0 ? void 0 : _matchedSurv$owner3.emailId) || (matchedSurv === null || matchedSurv === void 0 ? void 0 : (_matchedSurv$owner4 = matchedSurv.owner) === null || _matchedSurv$owner4 === void 0 ? void 0 : _matchedSurv$owner4.email) || (matchedSurv === null || matchedSurv === void 0 ? void 0 : matchedSurv.email) || surv.email || "N/A",
+          gender: (matchedSurv === null || matchedSurv === void 0 ? void 0 : (_matchedSurv$owner5 = matchedSurv.owner) === null || _matchedSurv$owner5 === void 0 ? void 0 : _matchedSurv$owner5.gender) || (matchedSurv === null || matchedSurv === void 0 ? void 0 : matchedSurv.gender) || surv.gender || "N/A",
           status: (matchedSurv === null || matchedSurv === void 0 ? void 0 : matchedSurv.status) || surv.status || "ACTIVE",
           totalKnos: surv.totalKnos || 0,
           submittedKnos: surv.submittedKnos || 0,
@@ -5708,6 +5713,8 @@ const SupervisorDetailsCard = () => {
         supervisorId: progressReport.supervisorId || progressReport.id,
         supervisorName,
         mobileNo,
+        email,
+        gender,
         status: progressReport.status || "ACTIVE",
         assignedZoneId: progressReport.assignedZoneId || "N/A",
         vendorId: progressReport.vendorId,
@@ -5722,8 +5729,8 @@ const SupervisorDetailsCard = () => {
   }, [progressData, supervisorSearchResponse, surveyorSearchResponse, supervisorId, loggedInUser]);
   const fullName = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.supervisorName) || "N/A";
   const mobileNumber = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.mobileNo) || "N/A";
-  const email = (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.emailId) || "N/A";
-  const gender = (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.gender) || "N/A";
+  const email = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.email) || ((supervisor === null || supervisor === void 0 ? void 0 : supervisor.supervisorId) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.uuid) ? loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.emailId : null) || "N/A";
+  const gender = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.gender) || ((supervisor === null || supervisor === void 0 ? void 0 : supervisor.supervisorId) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.uuid) ? loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.gender : null) || "N/A";
   const status = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.status) || "N/A";
   const assignedZone = (supervisor === null || supervisor === void 0 ? void 0 : supervisor.assignedZoneId) || "N/A";
   const vendorName = React.useMemo(() => {
@@ -5779,9 +5786,9 @@ const SupervisorDetailsCard = () => {
   const surveyorColumns = React.useMemo(() => [{
     Header: t("SURVEYOR_NAME") || "Surveyor Name",
     accessor: row => (row === null || row === void 0 ? void 0 : row.surveyorName) || "N/A",
-    Cell: _ref => {
+    Cell: _ref3 => {
       var _Digit$SessionStorage2, _Digit$SessionStorage3, _Digit$SessionStorage4, _row$original;
-      let row = _ref.row;
+      let row = _ref3.row;
       const userType = ((_Digit$SessionStorage2 = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage2 === void 0 ? void 0 : (_Digit$SessionStorage3 = _Digit$SessionStorage2.info) === null || _Digit$SessionStorage3 === void 0 ? void 0 : (_Digit$SessionStorage4 = _Digit$SessionStorage3.type) === null || _Digit$SessionStorage4 === void 0 ? void 0 : _Digit$SessionStorage4.toLowerCase()) || "citizen";
       const targetPath = "/digit-ui/" + userType + "/ekyc/surveyor-dashboard/" + row.original.surveyorId;
       return /*#__PURE__*/React__default.createElement("a", {
@@ -5805,8 +5812,8 @@ const SupervisorDetailsCard = () => {
     Header: t("STATUS") || "Status",
     accessor: () => "ACTIVE",
     id: "status",
-    Cell: _ref2 => {
-      let value = _ref2.value;
+    Cell: _ref4 => {
+      let value = _ref4.value;
       return /*#__PURE__*/React__default.createElement("span", {
         className: "status-badge verified"
       }, t(value) || value);
@@ -6134,12 +6141,12 @@ const SupervisorDetailsCard = () => {
     }
     return null;
   };
-  const StatCard = _ref3 => {
-    let title = _ref3.title,
-      value = _ref3.value,
-      type = _ref3.type,
-      isLoading = _ref3.isLoading,
-      icon = _ref3.icon;
+  const StatCard = _ref5 => {
+    let title = _ref5.title,
+      value = _ref5.value,
+      type = _ref5.type,
+      isLoading = _ref5.isLoading,
+      icon = _ref5.icon;
     return /*#__PURE__*/React__default.createElement("div", {
       className: "stat-card " + type
     }, isLoading ? /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
@@ -6199,9 +6206,7 @@ const SupervisorDetailsCard = () => {
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "ekyc-details-wrapper"
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "details-left"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "details-grid"
+    className: "details-top-row"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React__default.createElement("span", {
@@ -6215,41 +6220,8 @@ const SupervisorDetailsCard = () => {
   }, t("EMAIL")), /*#__PURE__*/React__default.createElement("span", {
     className: "value"
   }, email)), /*#__PURE__*/React__default.createElement("div", {
-    className: "detail-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "label"
-  }, t("GENDER")), /*#__PURE__*/React__default.createElement("span", {
-    className: "value"
-  }, gender)), /*#__PURE__*/React__default.createElement("div", {
-    className: "detail-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "label"
-  }, t("STATUS")), /*#__PURE__*/React__default.createElement("span", {
-    className: "value"
-  }, status)), /*#__PURE__*/React__default.createElement("div", {
-    className: "detail-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "label"
-  }, t("ASSIGNED_ZONE") || "Assigned Zone"), /*#__PURE__*/React__default.createElement("span", {
-    className: "value"
-  }, assignedZone && assignedZone !== "N/A" ? /*#__PURE__*/React__default.createElement("div", {
-    className: "selected-zones",
-    style: {
-      marginTop: "4px"
-    }
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "selected-zone-chip"
-  }, t(assignedZone.trim().toUpperCase()) || assignedZone)) : assignedZone)), /*#__PURE__*/React__default.createElement("div", {
-    className: "detail-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "label"
-  }, t("VENDOR_NAME") || "Vendor Name"), /*#__PURE__*/React__default.createElement("span", {
-    className: "value"
-  }, vendorName)))), /*#__PURE__*/React__default.createElement("div", {
-    className: "details-right"
-  }, /*#__PURE__*/React__default.createElement("div", {
     className: "download-card"
-  }, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format.")), /*#__PURE__*/React__default.createElement("div", {
     className: "report-download",
     ref: reportMenuRef
   }, /*#__PURE__*/React__default.createElement("button", {
@@ -6288,9 +6260,9 @@ const SupervisorDetailsCard = () => {
   }, {
     label: t("THIS_MONTH") || "This Month",
     key: "month"
-  }].map(_ref4 => {
-    let label = _ref4.label,
-      key = _ref4.key;
+  }].map(_ref6 => {
+    let label = _ref6.label,
+      key = _ref6.key;
     return /*#__PURE__*/React__default.createElement("div", {
       key: key,
       className: "menu-item",
@@ -6333,12 +6305,46 @@ const SupervisorDetailsCard = () => {
   }, t("CANCEL") || "Cancel"), /*#__PURE__*/React__default.createElement("button", {
     className: "picker-apply-btn",
     onClick: handleCustomDownload
-  }, t("APPLY") || "Apply"))))))))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
+  }, t("APPLY") || "Apply"))))))), /*#__PURE__*/React__default.createElement("div", {
+    className: "details-grid-row"
+  }, /*#__PURE__*/React__default.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "label"
+  }, t("GENDER")), /*#__PURE__*/React__default.createElement("span", {
+    className: "value"
+  }, t(gender) || gender)), /*#__PURE__*/React__default.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "label"
+  }, t("STATUS")), /*#__PURE__*/React__default.createElement("span", {
+    className: "value"
+  }, status)), /*#__PURE__*/React__default.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "label"
+  }, t("ASSIGNED_ZONE") || "Assigned Zone"), /*#__PURE__*/React__default.createElement("span", {
+    className: "value"
+  }, assignedZone && assignedZone !== "N/A" ? /*#__PURE__*/React__default.createElement("div", {
+    className: "selected-zones",
+    style: {
+      marginTop: "4px"
+    }
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "selected-zone-chip"
+  }, t(assignedZone.trim().toUpperCase()) || assignedZone)) : assignedZone)), /*#__PURE__*/React__default.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "label"
+  }, t("VENDOR_NAME") || "Vendor Name"), /*#__PURE__*/React__default.createElement("span", {
+    className: "value"
+  }, vendorName))))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
     className: "dashboard-card"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
     t: t,
     tableTitle: t("CONNECTED_SURVEYORS") || "Connected Surveyors",
     tableClass: "ekycTable",
+    isTableScrollable: true,
     data: paginatedSurveyors,
     columns: surveyorColumns,
     isLoading: isProgressLoading,
@@ -6672,12 +6678,6 @@ const AssignEkycModal = _ref => {
     const start = currentPage * pageSize;
     return allData.slice(start, start + pageSize);
   }, [allData, currentPage, pageSize]);
-  React.useEffect(() => {
-    if (filters.mrkey && (allData === null || allData === void 0 ? void 0 : allData.length) > 0) {
-      const mrKnos = allData.map(item => item.kno).filter(Boolean);
-      setSelectedKnos(mrKnos);
-    }
-  }, [filters.mrkey, allData]);
   const handleAssign = () => {
     const payload = {
       tenantId: tenantId,
@@ -6693,22 +6693,36 @@ const AssignEkycModal = _ref => {
     }
     activeMutation.mutate(payload);
   };
-  const handleSelectAll = () => {
-    const currentKnos = paginatedData.map(item => item.kno);
-    const allSelected = currentKnos.length > 0 && currentKnos.every(kno => selectedKnos.includes(kno));
-    setSelectedKnos(prev => allSelected ? prev.filter(kno => !currentKnos.includes(kno)) : [...new Set([...prev, ...currentKnos])]);
+  const handleSelect = kno => {
+    setSelectedKnos(prev => prev.includes(kno) ? prev.filter(item => item !== kno) : [...prev, kno]);
+  };
+  const handleSelectAll = e => {
+    e === null || e === void 0 ? void 0 : e.stopPropagation();
+    const allMatchingKnos = allData.map(item => item.kno).filter(Boolean);
+    if (allMatchingKnos.length === 0) return;
+    const isAllSelected = allMatchingKnos.length > 0 && allMatchingKnos.every(kno => selectedKnos.includes(kno));
+    setSelectedKnos(isAllSelected ? [] : allMatchingKnos);
   };
   const handleFilterChange = (key, value) => {
     setFilters(prev => _extends({}, prev, {
       [key]: value
     }));
+    setCurrentPage(0);
   };
   const columns = React.useMemo(() => [{
-    Header: () => /*#__PURE__*/React__default.createElement("input", {
-      type: "checkbox",
-      checked: paginatedData.length > 0 && paginatedData.every(item => selectedKnos.includes(item.kno)),
-      onChange: handleSelectAll
-    }),
+    Header: () => {
+      const allMatchingKnos = allData.map(item => item.kno).filter(Boolean);
+      const isAllChecked = allMatchingKnos.length > 0 && allMatchingKnos.every(kno => selectedKnos.includes(kno));
+      return /*#__PURE__*/React__default.createElement("input", {
+        type: "checkbox",
+        checked: isAllChecked,
+        onChange: e => {
+          e.stopPropagation();
+          handleSelectAll(e);
+        },
+        onClick: e => e.stopPropagation()
+      });
+    },
     id: "selection",
     Cell: _ref2 => {
       let row = _ref2.row;
@@ -6716,7 +6730,11 @@ const AssignEkycModal = _ref => {
       return /*#__PURE__*/React__default.createElement("input", {
         type: "checkbox",
         checked: selectedKnos.includes(kno),
-        onChange: () => handleSelect(kno)
+        onChange: e => {
+          e.stopPropagation();
+          handleSelect(kno);
+        },
+        onClick: e => e.stopPropagation()
       });
     }
   }, {
@@ -6751,10 +6769,7 @@ const AssignEkycModal = _ref => {
         className: "ekyc-status-tag " + status
       }, t(status)) : "-";
     }
-  }], [selectedKnos, paginatedData]);
-  const handleSelect = kno => {
-    setSelectedKnos(prev => prev.includes(kno) ? prev.filter(item => item !== kno) : [...prev, kno]);
-  };
+  }], [selectedKnos, paginatedData, allData]);
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
     headerBarMain: isReassign ? "Reassign KNOs to " + (surveyor === null || surveyor === void 0 ? void 0 : surveyor.name) : "Assign KNOs to " + (surveyor === null || surveyor === void 0 ? void 0 : surveyor.name),
     headerBarEnd: /*#__PURE__*/React__default.createElement(digitUiReactComponents.Close, {
@@ -6799,6 +6814,7 @@ const AssignEkycModal = _ref => {
   }, t("EKYC_CLEAR_SELECTION") || "Clear Selected")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
     tableTitle: "eKYC Applications",
     tableClass: "ekycTable",
+    isTableScrollable: true,
     data: paginatedData,
     columns: columns,
     isLoading: isLoading,
@@ -7383,9 +7399,7 @@ const SurveyorDetailsDashboard = () => {
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "ekyc-details-wrapper"
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "details-left"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "details-grid"
+    className: "details-top-row"
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "detail-item"
   }, /*#__PURE__*/React__default.createElement("span", {
@@ -7399,34 +7413,8 @@ const SurveyorDetailsDashboard = () => {
   }, t("EMAIL")), /*#__PURE__*/React__default.createElement("span", {
     className: "value"
   }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner8 = surveyor.owner) === null || _surveyor$owner8 === void 0 ? void 0 : _surveyor$owner8.emailId) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
-    className: "detail-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "label"
-  }, t("GENDER")), /*#__PURE__*/React__default.createElement("span", {
-    className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner9 = surveyor.owner) === null || _surveyor$owner9 === void 0 ? void 0 : _surveyor$owner9.gender) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
-    className: "detail-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "label"
-  }, t("STATUS")), /*#__PURE__*/React__default.createElement("span", {
-    className: "value"
-  }, (surveyor === null || surveyor === void 0 ? void 0 : surveyor.status) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
-    className: "detail-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "label"
-  }, t("VENDOR_NAME") || "Vendor Name"), /*#__PURE__*/React__default.createElement("span", {
-    className: "value"
-  }, vendorName)), /*#__PURE__*/React__default.createElement("div", {
-    className: "detail-item"
-  }, /*#__PURE__*/React__default.createElement("span", {
-    className: "label"
-  }, t("SUPERVISOR_NAME") || "Supervisor Name"), /*#__PURE__*/React__default.createElement("span", {
-    className: "value"
-  }, supervisorName)))), /*#__PURE__*/React__default.createElement("div", {
-    className: "details-right"
-  }, /*#__PURE__*/React__default.createElement("div", {
     className: "download-card"
-  }, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format."), /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("h4", null, t("DOWNLOAD_EKYC_DATA") || "Download eKYC Data"), /*#__PURE__*/React__default.createElement("p", null, t("DOWNLOAD_EKYC_DATA_DESC") || "Export the complete eKYC verification records for your assigned jurisdiction into Excel format.")), /*#__PURE__*/React__default.createElement("div", {
     className: "report-download",
     ref: reportMenuRef
   }, /*#__PURE__*/React__default.createElement("button", {
@@ -7510,12 +7498,39 @@ const SurveyorDetailsDashboard = () => {
   }, t("CANCEL") || "Cancel"), /*#__PURE__*/React__default.createElement("button", {
     className: "picker-apply-btn",
     onClick: handleCustomDownload
-  }, t("APPLY") || "Apply"))))))))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
+  }, t("APPLY") || "Apply"))))))), /*#__PURE__*/React__default.createElement("div", {
+    className: "details-grid-row"
+  }, /*#__PURE__*/React__default.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "label"
+  }, t("GENDER")), /*#__PURE__*/React__default.createElement("span", {
+    className: "value"
+  }, (surveyor === null || surveyor === void 0 ? void 0 : (_surveyor$owner9 = surveyor.owner) === null || _surveyor$owner9 === void 0 ? void 0 : _surveyor$owner9.gender) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "label"
+  }, t("STATUS")), /*#__PURE__*/React__default.createElement("span", {
+    className: "value"
+  }, (surveyor === null || surveyor === void 0 ? void 0 : surveyor.status) || "N/A")), /*#__PURE__*/React__default.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "label"
+  }, t("VENDOR_NAME") || "Vendor Name"), /*#__PURE__*/React__default.createElement("span", {
+    className: "value"
+  }, vendorName)), /*#__PURE__*/React__default.createElement("div", {
+    className: "detail-item"
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "label"
+  }, t("SUPERVISOR_NAME") || "Supervisor Name"), /*#__PURE__*/React__default.createElement("span", {
+    className: "value"
+  }, supervisorName))))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
     className: "dashboard-card"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Table, {
     t: t,
     tableTitle: t("ASSIGNED_KNOS"),
     tableClass: "ekycTable",
+    isTableScrollable: true,
     data: (dashboardData === null || dashboardData === void 0 ? void 0 : (_dashboardData$dashbo5 = dashboardData.dashboardInfo) === null || _dashboardData$dashbo5 === void 0 ? void 0 : _dashboardData$dashbo5.consumerList) || [],
     columns: knoColumns,
     isLoading: isDashboardLoading,