@djb25/digit-ui-module-vendor 1.0.64 → 1.0.66

package/dist/index.js

@@ -126,6 +126,22 @@ const SurveyorConfig = function (t, agencies, reportingManagers, disabled) {
         },
         className: "payment-form-text-input-correction"
       }
+    }, {
+      label: t("ES_VENDOR_ZONE"),
+      isMandatory: true,
+      type: "component",
+      key: "zoneIds",
+      populators: {
+        name: "zoneIds",
+        validation: {
+          required: true
+        },
+        className: "mb-16"
+      },
+      props: {
+        isMultiSelect: false
+      },
+      component: "SelectEkycZones"
     }, {
       label: t("ES_VENDOR_SURVEYOR_DESCRIPTION"),
       isMandatory: false,
@@ -139,7 +155,7 @@ const SurveyorConfig = function (t, agencies, reportingManagers, disabled) {
 };
 
 const AddSurveyor = _ref => {
-  var _Digit$UserService$ge;
+  var _Digit$UserService$ge, _userInfo$roles;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const history = reactRouterDom.useHistory();
@@ -156,14 +172,63 @@ const AddSurveyor = _ref => {
     setCanSubmit = _useState2[1];
   const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSurveyorCreate(tenantId),
     mutateAsync = _Digit$Hooks$fsm$useS.mutateAsync;
-  const Config = SurveyorConfig(t);
-  const defaultValues = {
-    role: {
-      code: "SURVEYOR",
-      name: "Surveyor"
-    },
-    mobileNumber: ""
-  };
+  const isSupervisor = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$roles = userInfo.roles) === null || _userInfo$roles === void 0 ? void 0 : _userInfo$roles.some(role => role.code === "EKYC_SUPERVISOR");
+  const _Digit$Hooks$fsm$useS2 = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
+      status: "ACTIVE"
+    }, {
+      enabled: isSupervisor,
+      staleTime: Infinity
+    }),
+    supervisorSearchResponse = _Digit$Hooks$fsm$useS2.data,
+    isSupervisorSearchLoading = _Digit$Hooks$fsm$useS2.isLoading;
+  const matchedSupervisor = React.useMemo(() => {
+    if (!(supervisorSearchResponse !== null && supervisorSearchResponse !== void 0 && supervisorSearchResponse.supervisors)) return null;
+    return supervisorSearchResponse.supervisors.find(s => {
+      var _s$id, _userInfo$uuid, _s$owner, _s$owner$uuid, _userInfo$uuid2, _s$owner2;
+      return ((_s$id = s.id) === null || _s$id === void 0 ? void 0 : _s$id.toLowerCase()) === (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$uuid = userInfo.uuid) === null || _userInfo$uuid === void 0 ? void 0 : _userInfo$uuid.toLowerCase()) || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : (_s$owner$uuid = _s$owner.uuid) === null || _s$owner$uuid === void 0 ? void 0 : _s$owner$uuid.toLowerCase()) === (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$uuid2 = userInfo.uuid) === null || _userInfo$uuid2 === void 0 ? void 0 : _userInfo$uuid2.toLowerCase()) || ((_s$owner2 = s.owner) === null || _s$owner2 === void 0 ? void 0 : _s$owner2.mobileNumber) === (userInfo === null || userInfo === void 0 ? void 0 : userInfo.mobileNumber) || s.mobileNo === (userInfo === null || userInfo === void 0 ? void 0 : userInfo.mobileNumber);
+    });
+  }, [supervisorSearchResponse, userInfo]);
+  const _useState3 = React.useState(null),
+    defaultValues = _useState3[0],
+    setDefaultValues = _useState3[1];
+  React.useEffect(() => {
+    if (!isSupervisor) {
+      setDefaultValues({
+        role: {
+          code: "SURVEYOR",
+          name: "Surveyor"
+        },
+        mobileNumber: ""
+      });
+    } else if (supervisorSearchResponse && !isSupervisorSearchLoading) {
+      setDefaultValues({
+        role: {
+          code: "SURVEYOR",
+          name: "Surveyor"
+        },
+        mobileNumber: "",
+        zoneIds: (matchedSupervisor === null || matchedSupervisor === void 0 ? void 0 : matchedSupervisor.assignedZoneId) || ""
+      });
+    }
+  }, [isSupervisor, supervisorSearchResponse, isSupervisorSearchLoading, matchedSupervisor]);
+  const Config = React.useMemo(() => {
+    const baseConfig = SurveyorConfig(t);
+    if (isSupervisor) {
+      return baseConfig.map(section => _extends({}, section, {
+        body: section.body.map(field => {
+          if (field.key === "zoneIds") {
+            return _extends({}, field, {
+              props: _extends({}, field.props, {
+                disable: true
+              })
+            });
+          }
+          return field;
+        })
+      }));
+    }
+    return baseConfig;
+  }, [t, isSupervisor]);
   const isValidAge = dateStr => {
     if (!dateStr) return false;
     const today = new Date();
@@ -188,8 +253,8 @@ const AddSurveyor = _ref => {
   };
   const onSubmit = function (data) {
     try {
-      var _userInfo$roles, _Digit$UserService$ge2, _data$gender;
-      const isSupervisor = userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$roles = userInfo.roles) === null || _userInfo$roles === void 0 ? void 0 : _userInfo$roles.some(role => role.code === "EKYC_SUPERVISOR");
+      var _data$zoneIds, _Digit$UserService$ge2, _data$gender;
+      const assignedZone = Array.isArray(data === null || data === void 0 ? void 0 : data.zoneIds) ? (data === null || data === void 0 ? void 0 : (_data$zoneIds = data.zoneIds) === null || _data$zoneIds === void 0 ? void 0 : _data$zoneIds.map(ele => ele.code).join(",")) || "" : (data === null || data === void 0 ? void 0 : data.zoneIds) || "";
       const formData = {
         RequestInfo: _extends({
           apiId: "Rainmaker",
@@ -211,6 +276,9 @@ const AddSurveyor = _ref => {
         }),
         surveyor: {
           tenantId: tenantId,
+          vendorId: isSupervisor ? matchedSupervisor === null || matchedSupervisor === void 0 ? void 0 : matchedSupervisor.vendorId : undefined,
+          supervisorId: isSupervisor ? matchedSupervisor === null || matchedSupervisor === void 0 ? void 0 : matchedSupervisor.id : undefined,
+          assignedZoneId: assignedZone,
           description: (data === null || data === void 0 ? void 0 : data.description) || "",
           correspondenceAddress: data === null || data === void 0 ? void 0 : data.correspondenceAddress,
           additionalDetails: {
@@ -253,6 +321,9 @@ const AddSurveyor = _ref => {
       return Promise.reject(e);
     }
   };
+  if (isSupervisor && (isSupervisorSearchLoading || !defaultValues)) {
+    return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
+  }
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.VerticalTimeline, {
     config: [{
       route: "surveyor-details",
@@ -1020,7 +1091,7 @@ const VendorInbox = props => {
   const userInfo = Digit.SessionStorage.get("User");
   const userRoles = userInfo.info.roles;
   const userType = (_userInfo$info$type = userInfo.info.type) === null || _userInfo$info$type === void 0 ? void 0 : _userInfo$info$type.toLowerCase();
-  const EKYC_ROLES = ["EKYC_VENDOR", "EKYC_SUPERVISOR", "EKYC_SURVEYOR"];
+  const EKYC_ROLES = ["EKYC_SUPERVISOR", "EKYC_SURVEYOR"];
   const isEkycRole = userRoles === null || userRoles === void 0 ? void 0 : userRoles.some(role => EKYC_ROLES.includes((role === null || role === void 0 ? void 0 : role.code) || role));
   const openWorkOrderModal = vendorDetails => {
     setSelectedVendorForWorkOrder(vendorDetails);
@@ -1345,9 +1416,11 @@ const VendorInbox = props => {
         });
       },
       onSuccess: (data, variables) => {
+        console.log("newStatus:", newStatus, "isDisable:", newStatus === "DISABLED");
         setShowToast({
           key: "success",
-          action: "SUPERVISOR"
+          action: "SUPERVISOR",
+          isDisable: newStatus === "DISABLED"
         });
         queryClient.invalidateQueries("FSM_SUPERVISOR_SEARCH");
         queryClient.invalidateQueries("SUPERVISOR_SEARCH");
@@ -1381,9 +1454,11 @@ const VendorInbox = props => {
         });
       },
       onSuccess: (data, variables) => {
+        console.log("newStatus:", newStatus, "isDisable:", newStatus === "DISABLED");
         setShowToast({
           key: "success",
-          action: "SURVEYOR"
+          action: "SURVEYOR",
+          isDisable: newStatus === "DISABLED"
         });
         queryClient.invalidateQueries("FSM_SURVEYOR_SEARCH");
         queryClient.invalidateQueries("SURVEYOR_SEARCH");
@@ -1791,7 +1866,7 @@ const VendorInbox = props => {
             }
             const hasDetails = ((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.vendorAdditionalDetails) !== null;
             return /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
-              to: hasDetails ? "/digit-ui/" + userType + "/vendor/registry/additionaldetails/info?vendorId=" + vendorId : "/digit-ui/" + userType + "/vendor/registry/additionaldetails/vendor-details?vendorId=" + vendorId
+              to: !hasDetails ? "/digit-ui/" + userType + "/vendor/registry/additionaldetails/info?vendorId=" + vendorId : "/digit-ui/" + userType + "/vendor/registry/vendor-details/" + vendorId
             }, /*#__PURE__*/React__default.createElement("button", {
               className: "submit-bar",
               style: {
@@ -4675,13 +4750,26 @@ const VendorConfig = function (t, module, genderMenu, update) {
       populators: {
         name: "dob",
         validation: {
-          required: true
+          required: true,
+          validate: value => {
+            if (!value) return true;
+            const dob = new Date(value);
+            const today = new Date();
+            let age = today.getFullYear() - dob.getFullYear();
+            const m = today.getMonth() - dob.getMonth();
+            if (m < 0 || m === 0 && today.getDate() < dob.getDate()) {
+              age--;
+            }
+            return age >= 18 || t("ES_VENDOR_DOB_MIN_AGE_ERROR") || "Vendor must be 18 years or older";
+          }
         },
         component: (props, customProps) => /*#__PURE__*/React__default.createElement(digitUiReactComponents.DatePicker, _extends({
           onChange: props.onChange,
           date: props.value
         }, customProps, {
-          max: convertEpochToDate(new Date().setFullYear(new Date().getFullYear()))
+          isDOB: true,
+          minAge: 18,
+          max: convertEpochToDate(new Date().setFullYear(new Date().getFullYear() - 18))
         }))
       }
     }] : [])]
@@ -4706,7 +4794,8 @@ const VendorConfig = function (t, module, genderMenu, update) {
 
 const AddVendor = () => {
   var _Digit$UserService$ge, _formData$serviceType2;
-  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const rawTenantId = Digit.ULBService.getCurrentTenantId();
+  const tenantId = rawTenantId !== null && rawTenantId !== void 0 && rawTenantId.includes(".") ? rawTenantId : rawTenantId + ".djb";
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const history = reactRouterDom.useHistory();
@@ -4928,7 +5017,7 @@ const AddVendor = () => {
       onError: error => {
         setShowToast({
           key: "error",
-          action: error
+          action: (error === null || error === void 0 ? void 0 : error.message) || error
         });
       },
       onSuccess: () => {
@@ -5638,7 +5727,7 @@ const createConfig = [{
   body: [{
     route: "info",
     component: "ServiceDoc",
-    nextStep: "vendor-details",
+    nextStep: "modify-details",
     key: "Documents"
   }, {
     route: "modify-details",
@@ -5688,12 +5777,19 @@ const VENDORCreate = _ref => {
   React__default.useEffect(() => {
     const searchParams = new URLSearchParams(search || window.location.search);
     const vendorId = searchParams.get("vendorId");
-    if (vendorId && params.vendor_id !== vendorId) {
-      setParams(_extends({}, params, {
-        vendor_id: vendorId
-      }));
+    if (vendorId) {
+      if (params.vendor_id !== vendorId) {
+        setParams(_extends({}, params, {
+          vendor_id: vendorId
+        }));
+      }
+    } else {
+      if (params && Object.keys(params).length > 0 && window.location.href.includes("/info") && sessionStorage.getItem("docReqScreenByBack") !== "true") {
+        clearParams();
+        queryClient.invalidateQueries("VENDOR_CREATE");
+      }
     }
-  }, [search, window.location.search, params, setParams]);
+  }, [search, pathname, params, setParams, clearParams, queryClient]);
   const goNext = (skipStep, index, isAddMultiple, key) => {
     let currentPath = pathname.split("/").pop(),
       lastchar = currentPath.charAt(currentPath.length - 1),
@@ -5735,10 +5831,6 @@ const VENDORCreate = _ref => {
     }
     redirectWithHistory(nextPage);
   };
-  if (params && Object.keys(params).length > 0 && window.location.href.includes("/info") && sessionStorage.getItem("docReqScreenByBack") !== "true") {
-    clearParams();
-    queryClient.invalidateQueries("VENDOR_CREATE");
-  }
   const vendorcreate = function () {
     try {
       history.push(match.path + "/acknowledgement");
@@ -5829,7 +5921,7 @@ const EditVendor = () => {
   const _useState = React.useState(null),
     showToast = _useState[0],
     setShowToast = _useState[1];
-  const _useState2 = React.useState(false),
+  const _useState2 = React.useState(true),
     canSubmit = _useState2[0],
     setCanSubmit = _useState2[1];
   const _useState3 = React.useState({}),
@@ -5863,22 +5955,20 @@ const EditVendor = () => {
   const _useState6 = React.useState([]),
     zones = _useState6[0],
     setZones = _useState6[1];
-  const _Digit$Hooks$useCommo = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]),
-    boundaryData = _Digit$Hooks$useCommo.data,
+  const _Digit$Hooks$useCommo = Digit.Hooks.useCommonMDMS(tenantId, "common-masters", ["ZroOfficeList"]),
+    zroData = _Digit$Hooks$useCommo.data,
     isLoading = _Digit$Hooks$useCommo.isLoading;
   React.useEffect(() => {
-    var _boundaryData$egovLo, _boundaryData$egovLo$, _boundaryData$MdmsRes, _boundaryData$MdmsRes2, _boundaryData$MdmsRes3;
-    const tenantBoundary = (boundaryData === null || boundaryData === void 0 ? void 0 : (_boundaryData$egovLo = boundaryData["egov-location"]) === null || _boundaryData$egovLo === void 0 ? void 0 : (_boundaryData$egovLo$ = _boundaryData$egovLo.TenantBoundary) === null || _boundaryData$egovLo$ === void 0 ? void 0 : _boundaryData$egovLo$[0]) || (boundaryData === null || boundaryData === void 0 ? void 0 : (_boundaryData$MdmsRes = boundaryData.MdmsRes) === null || _boundaryData$MdmsRes === void 0 ? void 0 : (_boundaryData$MdmsRes2 = _boundaryData$MdmsRes["egov-location"]) === null || _boundaryData$MdmsRes2 === void 0 ? void 0 : (_boundaryData$MdmsRes3 = _boundaryData$MdmsRes2.TenantBoundary) === null || _boundaryData$MdmsRes3 === void 0 ? void 0 : _boundaryData$MdmsRes3[0]);
-    const boundaries = (tenantBoundary === null || tenantBoundary === void 0 ? void 0 : tenantBoundary.boundary) || (tenantBoundary === null || tenantBoundary === void 0 ? void 0 : tenantBoundary.children) || [];
-    if (Array.isArray(boundaries === null || boundaries === void 0 ? void 0 : boundaries.children) && (boundaries === null || boundaries === void 0 ? void 0 : boundaries.children.length) > 0) {
-      const allZones = boundaries.children.flatMap(assembly => ((assembly === null || assembly === void 0 ? void 0 : assembly.children) || []).map(zone => ({
-        code: zone.code,
-        name: zone.name
-      })));
-      const zonesList = [...new Map(allZones.map(zone => [zone.code, zone])).values()];
-      setZones(zonesList);
+    var _zroData$commonMaste, _zroData$MdmsRes, _zroData$MdmsRes$comm;
+    const zroOfficeList = (zroData === null || zroData === void 0 ? void 0 : (_zroData$commonMaste = zroData["common-masters"]) === null || _zroData$commonMaste === void 0 ? void 0 : _zroData$commonMaste.ZroOfficeList) || (zroData === null || zroData === void 0 ? void 0 : (_zroData$MdmsRes = zroData.MdmsRes) === null || _zroData$MdmsRes === void 0 ? void 0 : (_zroData$MdmsRes$comm = _zroData$MdmsRes["common-masters"]) === null || _zroData$MdmsRes$comm === void 0 ? void 0 : _zroData$MdmsRes$comm.ZroOfficeList) || [];
+    if (Array.isArray(zroOfficeList)) {
+      const activeZros = zroOfficeList.filter(zro => zro && zro.active).map(zro => ({
+        code: zro.code,
+        name: zro.code
+      }));
+      setZones(activeZros);
     }
-  }, [boundaryData]);
+  }, [zroData]);
   React.useEffect(() => {
     var _genderTypeData$commo, _genderTypeData$commo2;
     if (genderTypeData && (_genderTypeData$commo = genderTypeData["common-masters"]) !== null && _genderTypeData$commo !== void 0 && (_genderTypeData$commo2 = _genderTypeData$commo.GenderType) !== null && _genderTypeData$commo2 !== void 0 && _genderTypeData$commo2.length) {
@@ -5978,22 +6068,21 @@ const EditVendor = () => {
     if (typeof dsoDetails.zoneIds[0] === "object") return;
     setDefaultValues(prev => _extends({}, prev, {
       zoneIds: zones.filter(z => {
-        var _prev$zoneIds;
-        return prev === null || prev === void 0 ? void 0 : (_prev$zoneIds = prev.zoneIds) === null || _prev$zoneIds === void 0 ? void 0 : _prev$zoneIds.includes(z.name);
+        const prevZones = (prev === null || prev === void 0 ? void 0 : prev.zoneIds) || [];
+        return prevZones.some(prevZ => typeof prevZ === "object" ? (prevZ === null || prevZ === void 0 ? void 0 : prevZ.code) === z.code : prevZ === z.code || prevZ === z.name);
       })
     }));
   }, [dsoDetails === null || dsoDetails === void 0 ? void 0 : dsoDetails.zoneIds, zones]);
   const onFormValueChange = (setValue, data) => {
-    var _data$propertyAddress, _data$propertyAddress2, _data$serviceType, _data$serviceType2;
-    const isAddressFilled = (data === null || data === void 0 ? void 0 : (_data$propertyAddress = data.propertyAddress) === null || _data$propertyAddress === void 0 ? void 0 : _data$propertyAddress.city) && (data === null || data === void 0 ? void 0 : (_data$propertyAddress2 = data.propertyAddress) === null || _data$propertyAddress2 === void 0 ? void 0 : _data$propertyAddress2.locality);
+    var _data$serviceType, _data$serviceType2, _data$serviceType2$co, _data$serviceType3, _data$serviceType3$i;
     const isVendorDetailsFilled = (data === null || data === void 0 ? void 0 : data.vendorName) && (data === null || data === void 0 ? void 0 : data.phone) && (data === null || data === void 0 ? void 0 : (_data$serviceType = data.serviceType) === null || _data$serviceType === void 0 ? void 0 : _data$serviceType.code);
-    const isEkyc = (data === null || data === void 0 ? void 0 : (_data$serviceType2 = data.serviceType) === null || _data$serviceType2 === void 0 ? void 0 : _data$serviceType2.code) === "EKYC";
+    const isEkyc = (data === null || data === void 0 ? void 0 : (_data$serviceType2 = data.serviceType) === null || _data$serviceType2 === void 0 ? void 0 : (_data$serviceType2$co = _data$serviceType2.code) === null || _data$serviceType2$co === void 0 ? void 0 : _data$serviceType2$co.toUpperCase()) === "EKYC" || (data === null || data === void 0 ? void 0 : (_data$serviceType3 = data.serviceType) === null || _data$serviceType3 === void 0 ? void 0 : (_data$serviceType3$i = _data$serviceType3.i18nKey) === null || _data$serviceType3$i === void 0 ? void 0 : _data$serviceType3$i.toUpperCase()) === "EKYC";
     let isEkycFieldsFilled = true;
     if (isEkyc) {
-      var _data$zoneIds, _data$clusterIds;
-      isEkycFieldsFilled = (data === null || data === void 0 ? void 0 : data.ownerName) && (data === null || data === void 0 ? void 0 : data.contractStartDate) && (data === null || data === void 0 ? void 0 : data.contractEndDate) && (data === null || data === void 0 ? void 0 : (_data$zoneIds = data.zoneIds) === null || _data$zoneIds === void 0 ? void 0 : _data$zoneIds.length) > 0 && (data === null || data === void 0 ? void 0 : (_data$clusterIds = data.clusterIds) === null || _data$clusterIds === void 0 ? void 0 : _data$clusterIds.length) > 0 && (data === null || data === void 0 ? void 0 : data.gender) && (data === null || data === void 0 ? void 0 : data.dob);
+      var _data$zoneIds;
+      isEkycFieldsFilled = (data === null || data === void 0 ? void 0 : data.ownerName) && (data === null || data === void 0 ? void 0 : data.contractStartDate) && (data === null || data === void 0 ? void 0 : data.contractEndDate) && (data === null || data === void 0 ? void 0 : (_data$zoneIds = data.zoneIds) === null || _data$zoneIds === void 0 ? void 0 : _data$zoneIds.length) > 0 && (data === null || data === void 0 ? void 0 : data.gender) && (data === null || data === void 0 ? void 0 : data.dob);
     }
-    if (isVendorDetailsFilled && isAddressFilled && isEkycFieldsFilled) {
+    if (isVendorDetailsFilled && isEkycFieldsFilled) {
       setCanSubmit(true);
     } else {
       setCanSubmit(false);
@@ -6003,7 +6092,7 @@ const EditVendor = () => {
     setShowToast(null);
   };
   const onSubmit = data => {
-    var _address$city, _address$city2, _address$city3, _address$city4, _address$locality, _address$locality2, _address$ward, _address$ward2, _mergedData$plotNo, _mergedData$buildingN, _mergedData$serviceTy, _mergedData$address, _mergedData$address2, _mergedData$relations, _mergedData$gender, _mergedData$serviceTy2;
+    var _address$city, _address$city2, _address$city3, _address$city4, _address$locality, _address$locality2, _address$ward, _address$ward2, _mergedData$plotNo, _mergedData$buildingN, _mergedData$serviceTy, _mergedData$serviceTy2, _mergedData$serviceTy3, _mergedData$serviceTy4, _mergedData$address, _mergedData$address2, _mergedData$relations, _mergedData$gender, _mergedData$serviceTy5;
     const mergedData = data;
     const address = mergedData === null || mergedData === void 0 ? void 0 : mergedData.propertyAddress;
     const pincode = address === null || address === void 0 ? void 0 : address.pincode;
@@ -6024,7 +6113,7 @@ const EditVendor = () => {
     const buildingName = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$buildingN = mergedData.buildingName) === null || _mergedData$buildingN === void 0 ? void 0 : _mergedData$buildingN.trim();
     const emailId = mergedData === null || mergedData === void 0 ? void 0 : mergedData.emailId;
     const phone = mergedData === null || mergedData === void 0 ? void 0 : mergedData.phone;
-    const isEkyc = (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$serviceTy = mergedData.serviceType) === null || _mergedData$serviceTy === void 0 ? void 0 : _mergedData$serviceTy.i18nKey) === "EKYC";
+    const isEkyc = (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$serviceTy = mergedData.serviceType) === null || _mergedData$serviceTy === void 0 ? void 0 : (_mergedData$serviceTy2 = _mergedData$serviceTy.code) === null || _mergedData$serviceTy2 === void 0 ? void 0 : _mergedData$serviceTy2.toUpperCase()) === "EKYC" || (mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$serviceTy3 = mergedData.serviceType) === null || _mergedData$serviceTy3 === void 0 ? void 0 : (_mergedData$serviceTy4 = _mergedData$serviceTy3.i18nKey) === null || _mergedData$serviceTy4 === void 0 ? void 0 : _mergedData$serviceTy4.toUpperCase()) === "EKYC";
     let vendorData = _extends({}, dsoDetails, {
       tenantId: tenantId,
       name,
@@ -6069,7 +6158,7 @@ const EditVendor = () => {
         mobileNumber: phone
       }),
       additionalDetails: {
-        serviceType: isEkyc ? "ekyc" : mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$serviceTy2 = mergedData.serviceType) === null || _mergedData$serviceTy2 === void 0 ? void 0 : _mergedData$serviceTy2.code
+        serviceType: isEkyc ? "ekyc" : mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$serviceTy5 = mergedData.serviceType) === null || _mergedData$serviceTy5 === void 0 ? void 0 : _mergedData$serviceTy5.code
       },
       vehicles: [],
       drivers: [],
@@ -6100,7 +6189,7 @@ const EditVendor = () => {
       onError: error => {
         setShowToast({
           key: "error",
-          action: error
+          action: (error === null || error === void 0 ? void 0 : error.message) || error
         });
       },
       onSuccess: () => {
@@ -6562,6 +6651,9 @@ const ServiceDoc = _ref => {
     _Digit$Hooks$asset$us2 = _Digit$Hooks$asset$us.data,
     Documentsob = _Digit$Hooks$asset$us2 === void 0 ? {} : _Digit$Hooks$asset$us2;
   let docs = Documentsob === null || Documentsob === void 0 ? void 0 : (_Documentsob$ASSET = Documentsob.ASSET) === null || _Documentsob$ASSET === void 0 ? void 0 : _Documentsob$ASSET.Documents;
+  const onSubmit = () => {
+    onSelect(config.key, {});
+  };
   return /*#__PURE__*/React__default.createElement("div", {
     className: "employee-form-content"
   }, isLoading && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null), Array.isArray(docs) && docs.map((_ref2, index) => {
@@ -6583,7 +6675,7 @@ const ServiceDoc = _ref => {
     }, dropdownIndex + 1, ". ", t(stringReplaceAll(dropdownData === null || dropdownData === void 0 ? void 0 : dropdownData.code, ".", "_")))));
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("COMMON_NEXT"),
-    onSubmit: onSelect
+    onSubmit: onSubmit
   })));
 };
 
@@ -7666,91 +7758,91 @@ const CheckPage = _ref2 => {
     label: t("VENDOR_ID"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.VendorId)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("VENDOR_BANK_IFSC_CODE"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.IFSC)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("VENDOR_BANK_NAME"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.Bank)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("VENDOR_BANK_BRANCH"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.BankbranchName)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("VENDOR_MICR_NO"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.micrNo)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("BANK_ACCONT_NO"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.AccountNo)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("PAN_NO"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.PanNo)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("GST_NO"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.GstNo)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("GST_REGISTERED_STATE/UT"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.GstState)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("REGISTRATION_NO"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.RegistrationNo)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("EPF_NO"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.EpfNo)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("ESI_NO"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : vendordet.EsiNo)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("VENDOR_TYPE"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : (_vendordet$VendorType = vendordet.VendorType) === null || _vendordet$VendorType === void 0 ? void 0 : _vendordet$VendorType.code)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("VENDOR_CATEGORY"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : (_vendordet$VendorCate = vendordet.VendorCategory) === null || _vendordet$VendorCate === void 0 ? void 0 : _vendordet$VendorCate.code)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("VENDOR_STATUS"),
     text: "" + t(checkForNA(vendordet === null || vendordet === void 0 ? void 0 : (_vendordet$Status = vendordet.Status) === null || _vendordet$Status === void 0 ? void 0 : _vendordet$Status.code)),
     actionButton: /*#__PURE__*/React__default.createElement(ActionButton, {
-      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/vendor-details"
+      jumpTo: "/digit-ui/" + (window.location.pathname.includes("/citizen") ? "citizen" : "employee") + "/vendor/registry/additionaldetails/modify-details"
     })
   }))), /*#__PURE__*/React__default.createElement("br", null), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("VENDOR_DOCUMENTS_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("VENDOR_DOCUMENTS"),
@@ -9463,14 +9555,17 @@ const VehicleDetails = props => {
 };
 
 const SelectEkycZones = _ref => {
-  var _Digit$SessionStorage, _loggedInUser$roles;
+  var _Digit$SessionStorage, _loggedInUser$roles, _config$props;
   let config = _ref.config,
     onSelect = _ref.onSelect,
     t = _ref.t,
     formData = _ref.formData,
     _ref$isMultiSelect = _ref.isMultiSelect,
-    isMultiSelect = _ref$isMultiSelect === void 0 ? true : _ref$isMultiSelect;
-  const tenantId = Digit.ULBService.getCurrentTenantId();
+    isMultiSelect = _ref$isMultiSelect === void 0 ? true : _ref$isMultiSelect,
+    _ref$disable = _ref.disable,
+    disable = _ref$disable === void 0 ? false : _ref$disable;
+  const rawTenantId = Digit.ULBService.getCurrentTenantId();
+  const tenantId = rawTenantId !== null && rawTenantId !== void 0 && rawTenantId.includes(".") ? rawTenantId : rawTenantId + ".djb";
   const _useState = React.useState([]),
     zones = _useState[0],
     setZones = _useState[1];
@@ -9478,16 +9573,25 @@ const SelectEkycZones = _ref => {
     selectedZones = _useState2[0],
     setSelectedZones = _useState2[1];
   const initialized = React.useRef(false);
+  const isVendorPage = window.location.pathname.includes("/new-vendor") || window.location.pathname.includes("/modify-vendor") || window.location.href.includes("/new-vendor") || window.location.href.includes("/modify-vendor");
   const loggedInUser = (_Digit$SessionStorage = Digit.SessionStorage.get("User")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.info;
   const roles = (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$roles = loggedInUser.roles) === null || _loggedInUser$roles === void 0 ? void 0 : _loggedInUser$roles.map(r => r.code)) || [];
   const isEkycVendor = roles.includes("EKYC_VENDOR");
+  const isEkycSupervisor = roles.includes("EKYC_SUPERVISOR");
   const _Digit$Hooks$fsm$useD = Digit.Hooks.fsm.useDsoSearch(tenantId, {
       status: "ACTIVE"
     }, {
-      enabled: isEkycVendor
+      enabled: isEkycVendor && !isVendorPage
     }),
     vendorSearchResponse = _Digit$Hooks$fsm$useD.data,
     isVendorSearchLoading = _Digit$Hooks$fsm$useD.isLoading;
+  const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSupervisorSearch(tenantId, {
+      status: "ACTIVE"
+    }, {
+      enabled: isEkycSupervisor
+    }),
+    supervisorSearchResponse = _Digit$Hooks$fsm$useS.data,
+    isSupervisorSearchLoading = _Digit$Hooks$fsm$useS.isLoading;
   const matchedVendor = React__default.useMemo(() => {
     var _vendorSearchResponse, _vendorSearchResponse2;
     if (!vendorSearchResponse) return null;
@@ -9501,35 +9605,36 @@ const SelectEkycZones = _ref => {
       return userUuid && ownerUuid === userUuid || userMobile && ownerMobile === userMobile;
     })) === null || _vendorSearchResponse === void 0 ? void 0 : _vendorSearchResponse.dsoDetails) || ((_vendorSearchResponse2 = vendorSearchResponse[0]) === null || _vendorSearchResponse2 === void 0 ? void 0 : _vendorSearchResponse2.dsoDetails) || vendorSearchResponse[0];
   }, [vendorSearchResponse, loggedInUser]);
-  const _Digit$Hooks$useCommo = Digit.Hooks.useCommonMDMS(tenantId, "egov-location", ["TenantBoundary"]),
-    boundaryData = _Digit$Hooks$useCommo.data,
+  const matchedSupervisor = React__default.useMemo(() => {
+    if (!(supervisorSearchResponse !== null && supervisorSearchResponse !== void 0 && supervisorSearchResponse.supervisors)) return null;
+    return supervisorSearchResponse.supervisors.find(s => {
+      var _s$id, _loggedInUser$uuid, _s$owner, _s$owner$uuid, _loggedInUser$uuid2, _s$owner2;
+      return ((_s$id = s.id) === null || _s$id === void 0 ? void 0 : _s$id.toLowerCase()) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$uuid = loggedInUser.uuid) === null || _loggedInUser$uuid === void 0 ? void 0 : _loggedInUser$uuid.toLowerCase()) || ((_s$owner = s.owner) === null || _s$owner === void 0 ? void 0 : (_s$owner$uuid = _s$owner.uuid) === null || _s$owner$uuid === void 0 ? void 0 : _s$owner$uuid.toLowerCase()) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$uuid2 = loggedInUser.uuid) === null || _loggedInUser$uuid2 === void 0 ? void 0 : _loggedInUser$uuid2.toLowerCase()) || ((_s$owner2 = s.owner) === null || _s$owner2 === void 0 ? void 0 : _s$owner2.mobileNumber) === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber) || s.mobileNo === (loggedInUser === null || loggedInUser === void 0 ? void 0 : loggedInUser.mobileNumber);
+    });
+  }, [supervisorSearchResponse, loggedInUser]);
+  const _Digit$Hooks$useCommo = Digit.Hooks.useCommonMDMS("dl", "common-masters", ["ZroOfficeList"]),
+    zroData = _Digit$Hooks$useCommo.data,
     isLoading = _Digit$Hooks$useCommo.isLoading;
   React.useEffect(() => {
-    var _boundaryData$egovLo, _boundaryData$egovLo$, _boundaryData$MdmsRes, _boundaryData$MdmsRes2, _boundaryData$MdmsRes3;
-    const tenantBoundary = (boundaryData === null || boundaryData === void 0 ? void 0 : (_boundaryData$egovLo = boundaryData["egov-location"]) === null || _boundaryData$egovLo === void 0 ? void 0 : (_boundaryData$egovLo$ = _boundaryData$egovLo.TenantBoundary) === null || _boundaryData$egovLo$ === void 0 ? void 0 : _boundaryData$egovLo$[0]) || (boundaryData === null || boundaryData === void 0 ? void 0 : (_boundaryData$MdmsRes = boundaryData.MdmsRes) === null || _boundaryData$MdmsRes === void 0 ? void 0 : (_boundaryData$MdmsRes2 = _boundaryData$MdmsRes["egov-location"]) === null || _boundaryData$MdmsRes2 === void 0 ? void 0 : (_boundaryData$MdmsRes3 = _boundaryData$MdmsRes2.TenantBoundary) === null || _boundaryData$MdmsRes3 === void 0 ? void 0 : _boundaryData$MdmsRes3[0]);
-    const boundaries = (tenantBoundary === null || tenantBoundary === void 0 ? void 0 : tenantBoundary.boundary) || (tenantBoundary === null || tenantBoundary === void 0 ? void 0 : tenantBoundary.children) || [];
-    if (Array.isArray(boundaries === null || boundaries === void 0 ? void 0 : boundaries.children)) {
-      const allZones = boundaries.children.flatMap(assembly => (assembly.children || []).map(zone => ({
-        code: zone.code,
-        name: zone.name
-      })));
-      let zonesList = [...new Map(allZones.map(z => [z.code, z])).values()];
-      if (isEkycVendor && matchedVendor !== null && matchedVendor !== void 0 && matchedVendor.zoneIds) {
-        const assignedZoneCodes = matchedVendor.zoneIds.map(z => String(z).toUpperCase());
-        zonesList = zonesList.filter(z => assignedZoneCodes.includes(String(z.code).toUpperCase()) || assignedZoneCodes.includes(String(z.name).toUpperCase()));
-      }
-      setZones(zonesList);
+    var _zroData$commonMaste, _zroData$MdmsRes, _zroData$MdmsRes$comm;
+    const zroOfficeList = (zroData === null || zroData === void 0 ? void 0 : (_zroData$commonMaste = zroData["common-masters"]) === null || _zroData$commonMaste === void 0 ? void 0 : _zroData$commonMaste.ZroOfficeList) || (zroData === null || zroData === void 0 ? void 0 : (_zroData$MdmsRes = zroData.MdmsRes) === null || _zroData$MdmsRes === void 0 ? void 0 : (_zroData$MdmsRes$comm = _zroData$MdmsRes["common-masters"]) === null || _zroData$MdmsRes$comm === void 0 ? void 0 : _zroData$MdmsRes$comm.ZroOfficeList) || [];
+    if (Array.isArray(zroOfficeList)) {
+      const activeZros = zroOfficeList.filter(zro => zro && zro.active).map(zro => ({
+        code: zro.code,
+        name: zro.code
+      }));
+      setZones(activeZros);
     }
-  }, [boundaryData, isEkycVendor, matchedVendor]);
+  }, [zroData]);
   React.useEffect(() => {
     if (!zones.length || !(formData !== null && formData !== void 0 && formData.zoneIds)) return;
     if (isMultiSelect) {
       if (!Array.isArray(formData.zoneIds)) return;
-      if (formData.zoneIds.length && typeof formData.zoneIds[0] === "object") {
-        setSelectedZones(formData.zoneIds);
+      if (formData.zoneIds.length && typeof formData.zoneIds[0] === "object" && formData.zoneIds[0] !== null) {
+        setSelectedZones(formData.zoneIds.filter(Boolean));
         return;
       }
-      const selected = zones.filter(zone => formData.zoneIds.includes(zone.name) || formData.zoneIds.includes(zone.code));
+      const selected = zones.filter(zone => zone && (formData.zoneIds.includes(zone.name) || formData.zoneIds.includes(zone.code)));
       setSelectedZones(selected);
       if (!initialized.current) {
         initialized.current = true;
@@ -9541,10 +9646,10 @@ const SelectEkycZones = _ref => {
         var _selectedVal$, _selectedVal$2;
         selectedVal = ((_selectedVal$ = selectedVal[0]) === null || _selectedVal$ === void 0 ? void 0 : _selectedVal$.name) || ((_selectedVal$2 = selectedVal[0]) === null || _selectedVal$2 === void 0 ? void 0 : _selectedVal$2.code) || selectedVal[0] || "";
       }
-      if (typeof selectedVal === "object") {
+      if (selectedVal && typeof selectedVal === "object") {
         selectedVal = selectedVal.name || selectedVal.code || "";
       }
-      const selected = zones.find(zone => zone.name === selectedVal || zone.code === selectedVal);
+      const selected = zones.find(zone => zone && (zone.name === selectedVal || zone.code === selectedVal));
       setSelectedZones(selected ? [selected] : []);
       if (!initialized.current && selected) {
         initialized.current = true;
@@ -9552,6 +9657,13 @@ const SelectEkycZones = _ref => {
       }
     }
   }, [zones, formData === null || formData === void 0 ? void 0 : formData.zoneIds, config.key, onSelect, isMultiSelect]);
+  React.useEffect(() => {
+    if (isEkycSupervisor && zones.length > 0 && !(formData !== null && formData !== void 0 && formData.zoneIds) && !initialized.current) {
+      initialized.current = true;
+      setSelectedZones([zones[0]]);
+      onSelect(config.key, zones[0].name || "");
+    }
+  }, [isEkycSupervisor, zones, formData === null || formData === void 0 ? void 0 : formData.zoneIds, config.key, onSelect]);
   const handleSelect = value => {
     if (isMultiSelect) {
       const selected = Array.isArray(value) ? value.map(v => Array.isArray(v) ? v[1] : v).filter(Boolean) : [];
@@ -9563,7 +9675,7 @@ const SelectEkycZones = _ref => {
       onSelect(config.key, (selectedZone === null || selectedZone === void 0 ? void 0 : selectedZone.name) || "");
     }
   };
-  if (isLoading || isEkycVendor && isVendorSearchLoading) return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
+  if (isLoading || isEkycVendor && !isVendorPage && isVendorSearchLoading || isEkycSupervisor && isSupervisorSearchLoading) return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.LabelFieldPair, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, t(config.label), config.isMandatory ? /*#__PURE__*/React__default.createElement("span", {
     className: "check-page-link-button"
   }, " * ") : ""), /*#__PURE__*/React__default.createElement("div", {
@@ -9584,13 +9696,14 @@ const SelectEkycZones = _ref => {
     ServerStyle: {
       backgroundColor: "#fff"
     },
-    defaultLabel: isMultiSelect ? selectedZones.length + " Selected" : ""
+    defaultLabel: isMultiSelect ? selectedZones.length + " Selected" : "",
+    disable: disable || isEkycSupervisor || ((_config$props = config.props) === null || _config$props === void 0 ? void 0 : _config$props.disable) || config.disable
   })), isMultiSelect && selectedZones.length > 0 && /*#__PURE__*/React__default.createElement("div", {
     className: "selected-zones"
-  }, selectedZones.map(zone => /*#__PURE__*/React__default.createElement("span", {
+  }, selectedZones.filter(zone => zone && zone.code).map(zone => /*#__PURE__*/React__default.createElement("span", {
     key: zone.code,
     className: "selected-zone-chip"
-  }, zone.name))));
+  }, t(zone.code)))));
 };
 
 const SelectEkycClusters = _ref => {
@@ -9730,70 +9843,82 @@ const SelectEkycDropdown = _ref => {
 };
 
 const AdditionalDetails = _ref => {
-  var _formData$ownerKey, _formData$ownerKey2, _formData$ownerKey3, _formData$ownerKey4;
+  var _formData$ownerKey, _formData$ownerKey2, _formData$ownerKey3, _formData$ownerKey4, _formData$config$key, _formData$config$key2, _formData$config$key3, _formData$config$key4, _formData$config$key5, _formData$config$key6, _formData$config$key7, _formData$config$key8, _formData$config$key9, _formData$config$key0, _formData$config$key1, _formData$config$key10, _formData$config$key11, _formData$config$key12, _formData$config$key13, _formData$config$key14, _formData$config$key15, _formData$config$key16;
   let t = _ref.t,
     config = _ref.config,
     onSelect = _ref.onSelect,
     userType = _ref.userType,
     formData = _ref.formData;
   let index = 0;
+  const rawTenantId = Digit.ULBService.getCurrentTenantId();
+  const tenantId = rawTenantId !== null && rawTenantId !== void 0 && rawTenantId.includes(".") ? rawTenantId : rawTenantId + ".djb";
+  const vendorId = (formData === null || formData === void 0 ? void 0 : formData.vendor_id) || new URLSearchParams(window.location.search).get("vendorId");
+  const _Digit$Hooks$vendor$u = Digit.Hooks.vendor.useEmpvendorCommonSearch({
+      tenantId,
+      filters: {
+        vendorId: vendorId
+      }
+    }, {
+      enabled: !!vendorId
+    }),
+    vendorAdditionalData = _Digit$Hooks$vendor$u.data;
   const user = Digit.UserService.getUser().info;
   const applicantName = formData.ownerKey && formData.ownerKey[index] && formData.ownerKey[index].applicantName || (formData === null || formData === void 0 ? void 0 : (_formData$ownerKey = formData.ownerKey) === null || _formData$ownerKey === void 0 ? void 0 : _formData$ownerKey.applicantName) || "";
   const emailId = formData.ownerKey && formData.ownerKey[index] && formData.ownerKey[index].emailId || (formData === null || formData === void 0 ? void 0 : (_formData$ownerKey2 = formData.ownerKey) === null || _formData$ownerKey2 === void 0 ? void 0 : _formData$ownerKey2.emailId) || "";
   const mobileNumber = formData.ownerKey && formData.ownerKey[index] && formData.ownerKey[index].mobileNumber || (formData === null || formData === void 0 ? void 0 : (_formData$ownerKey3 = formData.ownerKey) === null || _formData$ownerKey3 === void 0 ? void 0 : _formData$ownerKey3.mobileNumber) || (user === null || user === void 0 ? void 0 : user.mobileNumber);
   const altMobileNumber = formData.ownerKey && formData.ownerKey[index] && formData.ownerKey[index].altMobileNumber || (formData === null || formData === void 0 ? void 0 : (_formData$ownerKey4 = formData.ownerKey) === null || _formData$ownerKey4 === void 0 ? void 0 : _formData$ownerKey4.altmobileNumber) || "";
-  const _useState = React.useState(""),
+  const _useState = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key = formData[config.key]) === null || _formData$config$key === void 0 ? void 0 : _formData$config$key.VendorCategory) || ""),
     VendorCategory = _useState[0],
     setVendorCategory = _useState[1];
-  const _useState2 = React.useState(""),
+  const _useState2 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key2 = formData[config.key]) === null || _formData$config$key2 === void 0 ? void 0 : _formData$config$key2.VendorId) || ""),
     VendorId = _useState2[0],
     setVendorId = _useState2[1];
-  const _useState3 = React.useState(""),
+  const _useState3 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key3 = formData[config.key]) === null || _formData$config$key3 === void 0 ? void 0 : _formData$config$key3.name) || ""),
     userName = _useState3[0],
     setUserName = _useState3[1];
-  const _useState4 = React.useState(""),
+  const _useState4 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key4 = formData[config.key]) === null || _formData$config$key4 === void 0 ? void 0 : _formData$config$key4.Bank) || ""),
     Bank = _useState4[0],
     setBank = _useState4[1];
-  const _useState5 = React.useState(),
+  const _useState5 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key5 = formData[config.key]) === null || _formData$config$key5 === void 0 ? void 0 : _formData$config$key5.BankbranchName) || undefined),
     BankbranchName = _useState5[0],
     setBankbranchName = _useState5[1];
-  const _useState6 = React.useState(""),
+  const _useState6 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key6 = formData[config.key]) === null || _formData$config$key6 === void 0 ? void 0 : _formData$config$key6.IFSC) || ""),
     IFSC = _useState6[0],
     setIFSC = _useState6[1];
-  const _useState7 = React.useState(""),
+  const _useState7 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key7 = formData[config.key]) === null || _formData$config$key7 === void 0 ? void 0 : _formData$config$key7.AccountNo) || ""),
     AccountNo = _useState7[0],
     setAccountNo = _useState7[1];
-  const _useState8 = React.useState(""),
+  const _useState8 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key8 = formData[config.key]) === null || _formData$config$key8 === void 0 ? void 0 : _formData$config$key8.PanNo) || ""),
     PanNo = _useState8[0],
     setPanNo = _useState8[1];
-  const _useState9 = React.useState(""),
+  const _useState9 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key9 = formData[config.key]) === null || _formData$config$key9 === void 0 ? void 0 : _formData$config$key9.GstNo) || ""),
     GstNo = _useState9[0],
     setGstNo = _useState9[1];
-  const _useState0 = React.useState(""),
+  const _useState0 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key0 = formData[config.key]) === null || _formData$config$key0 === void 0 ? void 0 : _formData$config$key0.GstState) || ""),
     GstState = _useState0[0],
     setGstState = _useState0[1];
-  const _useState1 = React.useState(""),
+  const _useState1 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key1 = formData[config.key]) === null || _formData$config$key1 === void 0 ? void 0 : _formData$config$key1.RegistrationNo) || ""),
     RegistrationNo = _useState1[0],
     setRegistrationNo = _useState1[1];
-  const _useState10 = React.useState(""),
+  const _useState10 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key10 = formData[config.key]) === null || _formData$config$key10 === void 0 ? void 0 : _formData$config$key10.EpfNo) || ""),
     EpfNo = _useState10[0],
     setEpfNo = _useState10[1];
-  const _useState11 = React.useState(""),
+  const _useState11 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key11 = formData[config.key]) === null || _formData$config$key11 === void 0 ? void 0 : _formData$config$key11.EsiNo) || ""),
     EsiNo = _useState11[0],
     setEsiNo = _useState11[1];
-  const _useState12 = React.useState(""),
+  const _useState12 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key12 = formData[config.key]) === null || _formData$config$key12 === void 0 ? void 0 : _formData$config$key12.VendorType) || ""),
     VendorType = _useState12[0],
     setVendorType = _useState12[1];
-  const _useState13 = React.useState(""),
+  const _useState13 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key13 = formData[config.key]) === null || _formData$config$key13 === void 0 ? void 0 : _formData$config$key13.Status) || ""),
     Status = _useState13[0],
     setStatus = _useState13[1];
-  const _useState14 = React.useState(""),
+  const _useState14 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key14 = formData[config.key]) === null || _formData$config$key14 === void 0 ? void 0 : _formData$config$key14.micrNo) || ""),
     micrNo = _useState14[0],
     setmicrNo = _useState14[1];
-  const _useState15 = React.useState(""),
+  const _useState15 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key15 = formData[config.key]) === null || _formData$config$key15 === void 0 ? void 0 : _formData$config$key15.PhoneNo) || ""),
     PhoneNo = _useState15[0],
     setPhoneNo = _useState15[1];
-  const _useState16 = React.useState(""),
+  const _useState16 = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$config$key16 = formData[config.key]) === null || _formData$config$key16 === void 0 ? void 0 : _formData$config$key16.ContactPerson) || ""),
     ContactPerson = _useState16[0],
     setContactPerson = _useState16[1];
   React.useEffect(() => {
@@ -9853,22 +9978,59 @@ const AdditionalDetails = _ref => {
   function setcontactperson(e) {
     setContactPerson(e.target.value);
   }
-  const tenantId = Digit.ULBService.getCurrentTenantId();
   const _useForm = reactHookForm.useForm(),
     control = _useForm.control;
   const _Digit$Hooks$fsm$useD = Digit.Hooks.fsm.useDsoSearch(tenantId, {
+      ids: vendorId
+    }, {
+      enabled: !!vendorId,
       staleTime: Infinity
     }),
     dsoData = _Digit$Hooks$fsm$useD.data;
   React.useEffect(() => {
-    if (dsoData) {
-      const vendor = dsoData.find(item => item.id);
-      if (vendor) {
-        setUserName(vendor.name);
-        setVendorId(vendor.id);
-      }
+    if (dsoData && dsoData.length > 0) {
+      const vendor = dsoData[0];
+      setUserName(vendor.name);
+      setVendorId(vendor.id);
     }
   }, [dsoData]);
+  React.useEffect(() => {
+    var _vendorAdditionalData, _vendorAdditionalData2;
+    if (vendorAdditionalData !== null && vendorAdditionalData !== void 0 && (_vendorAdditionalData = vendorAdditionalData.VendorDetails) !== null && _vendorAdditionalData !== void 0 && (_vendorAdditionalData2 = _vendorAdditionalData[0]) !== null && _vendorAdditionalData2 !== void 0 && _vendorAdditionalData2.vendorAdditionalDetails) {
+      const details = vendorAdditionalData.VendorDetails[0].vendorAdditionalDetails;
+      if (details.ifscCode) setIFSC(details.ifscCode);
+      if (details.bank) setBank(details.bank);
+      if (details.bankBranchName) setBankbranchName(details.bankBranchName);
+      if (details.micrNo) setmicrNo(details.micrNo);
+      if (details.bankAccountNumber) setAccountNo(details.bankAccountNumber);
+      if (details.vendorPhone) setPhoneNo(details.vendorPhone);
+      if (details.contactPerson) setContactPerson(details.contactPerson);
+      if (details.panNo) setPanNo(details.panNo);
+      if (details.gstTinNo) setGstNo(details.gstTinNo);
+      if (details.gstRegisteredState) setGstState(details.gstRegisteredState);
+      if (details.registrationNo) setRegistrationNo(details.registrationNo);
+      if (details.epfNo) setEpfNo(details.epfNo);
+      if (details.esiNo) setEsiNo(details.esiNo);
+      if (details.serviceType) {
+        setVendorType({
+          code: details.serviceType,
+          i18nKey: details.serviceType === "SUPPLIER" ? "Supplier" : details.serviceType === "CONTRACTOR" ? "Contractor" : details.serviceType
+        });
+      }
+      if (details.vendorCategory) {
+        setVendorCategory({
+          code: details.vendorCategory,
+          i18nKey: details.vendorCategory === "FIRM" ? "Firm" : details.vendorCategory === "Individual" ? "Individual" : details.vendorCategory
+        });
+      }
+      if (details.status) {
+        setStatus({
+          code: details.status,
+          i18nKey: details.status === "ACTIVE" ? "Active" : details.status === "INACTIVE" ? "Inactive" : details.status
+        });
+      }
+    }
+  }, [vendorAdditionalData]);
   const goNext = () => {
     let owner = formData.ownerKey && formData.ownerKey[index];
     let ownerStep;