@djb25/digit-ui-module-ws 1.0.83 → 1.0.85

package/dist/index.js

@@ -534,7 +534,7 @@ const getFiles = function (filesArray, tenant) {
 };
 const createPayloadOfWS = function (data) {
   try {
-    var _Digit$UserService$ge, _userInfo$roles, _data$cpt, _data$cpt$details, _data$cpt$details$own, _data$applicationSele, _data$ConnectionDetai, _data$ConnectionDetai2, _ref, _data$ConnectionHolde, _data$documents, _data$djbEmployee, _data$governmentEmplo, _connectionHolder$gen, _data$cpt2, _data$cpt2$details, _data$cpt2$details$ow, _data$cpt2$details$ow2, _connectionHolder$own, _connectionHolder$rel, _data$propertyAddress, _data$applicant, _data$useDetails, _data$useDetails$gend, _data$contact, _data$applicant2, _data$applicant3, _data$applicant4, _data$contact2, _data$contact3, _data$applicationSele2, _data$applicationSele3, _data$contact4, _data$cpt3, _data$cpt4, _data$cpt4$details, _data$propertyAddress2, _data$propertyAddress3, _data$propertyAddress4, _data$cpt5, _data$cpt5$details, _data$cpt5$details$ad, _data$propertyAddress5, _data$cpt6, _data$cpt6$details, _data$cpt6$details$ad, _data$propertyAddress6, _data$cpt7, _data$cpt7$details, _data$cpt7$details$ad, _data$propertyAddress7, _data$cpt8, _data$cpt8$details, _data$cpt8$details$ad, _data$propertyAddress8, _data$cpt9, _data$cpt9$details, _data$cpt9$details$ad, _data$propertyAddress9, _data$cpt0, _data$cpt0$details, _data$cpt0$details$ad, _data$propertyAddress0, _data$cpt1, _data$cpt1$details, _data$cpt1$details$ad, _data$propertyAddress1, _data$cpt10, _data$cpt10$details, _data$cpt10$details$a, _data$propertyAddress10, _data$cpt11, _data$cpt11$details, _data$cpt11$details$a, _data$cpt12, _data$cpt12$details, _data$cpt12$details$a, _data$propertyAddress11, _data$cpt13, _data$cpt13$details, _data$cpt13$details$a, _data$cpt13$details$a2, _data$propertyAddress12, _data$cpt14, _data$cpt14$details, _data$cpt14$details$a, _data$cpt14$details$a2, _data$propertyAddress13, _data$cpt15, _data$cpt15$details, _data$cpt15$details$a, _data$cpt15$details$a2, _data$cpt16, _data$cpt16$details, _data$roadCuttingDeta, _data$plumberDetails, _data$djbEmployee4, _data$djbEmployee4$do, _data$djbEmployee5, _data$zro, _data$propertyAddress14, _data$propertyAddress15, _data$cpt17, _data$cpt17$details, _data$cpt17$details$a, _data$cpt17$details$a2, _data$plumberDetails2, _data$plumberDetails3, _data$plumberDetails4, _data$plumberDetails5, _data$plumberDetails6, _data$applicationSele4, _data$applicationSele5, _data$applicationSele6, _data$applicationSele7, _connectionDetailsObj, _useDetailsObject$cat, _data$applicationSele8, _data$applicationSele9, _connectionHolder$own2, _useDetailsObject$noO, _data$applicationSele0, _data$applicationSele1, _data$applicationSele10, _data$applicationSele11, _data$applicationSele12, _data$applicationSele13, _data$applicationSele14, _data$applicationSele15, _data$applicationSele16, _data$applicationSele17, _data$applicationSele18, _data$applicationSele19, _data$applicationSele20, _data$applicationSele21, _data$applicationSele22, _data$applicationSele23, _data$applicationSele24, _data$contact5, _data$documents2, _data$documents3, _data$documents4, _data$cpt18, _Digit, _Digit$Customizations, _Digit$Customizations2, _Digit2, _Digit2$Customization, _Digit2$Customization2;
+    var _Digit$UserService$ge, _userInfo$roles, _data$cpt, _data$cpt$details, _data$cpt$details$own, _data$applicationSele, _data$ConnectionDetai, _data$ConnectionDetai2, _ref, _data$ConnectionHolde, _data$documents, _data$djbEmployee, _data$governmentEmplo, _connectionHolder$gen, _data$cpt2, _data$cpt2$details, _data$cpt2$details$ow, _data$cpt2$details$ow2, _connectionHolder$own, _connectionHolder$rel, _data$propertyAddress, _data$applicant, _data$useDetails, _data$useDetails$gend, _data$contact, _data$applicant2, _data$applicant3, _data$applicant4, _data$contact2, _data$contact3, _data$applicationSele2, _data$applicationSele3, _data$contact4, _data$cpt3, _data$cpt4, _data$cpt4$details, _data$propertyAddress2, _data$propertyAddress3, _data$propertyAddress4, _data$cpt5, _data$cpt5$details, _data$cpt5$details$ad, _data$propertyAddress5, _data$cpt6, _data$cpt6$details, _data$cpt6$details$ad, _data$propertyAddress6, _data$cpt7, _data$cpt7$details, _data$cpt7$details$ad, _data$propertyAddress7, _data$cpt8, _data$cpt8$details, _data$cpt8$details$ad, _data$propertyAddress8, _data$cpt9, _data$cpt9$details, _data$cpt9$details$ad, _data$propertyAddress9, _data$cpt0, _data$cpt0$details, _data$cpt0$details$ad, _data$propertyAddress0, _data$cpt1, _data$cpt1$details, _data$cpt1$details$ad, _data$propertyAddress1, _data$cpt10, _data$cpt10$details, _data$cpt10$details$a, _data$propertyAddress10, _data$cpt11, _data$cpt11$details, _data$cpt11$details$a, _data$cpt12, _data$cpt12$details, _data$cpt12$details$a, _data$propertyAddress11, _data$cpt13, _data$cpt13$details, _data$cpt13$details$a, _data$cpt13$details$a2, _data$propertyAddress12, _data$cpt14, _data$cpt14$details, _data$cpt14$details$a, _data$cpt14$details$a2, _data$propertyAddress13, _data$cpt15, _data$cpt15$details, _data$cpt15$details$a, _data$cpt15$details$a2, _data$cpt16, _data$cpt16$details, _data$roadCuttingDeta, _data$plumberDetails, _data$disability, _data$djbEmployee4, _data$djbEmployee4$do, _data$djbEmployee5, _data$zro, _data$propertyAddress14, _data$propertyAddress15, _data$cpt17, _data$cpt17$details, _data$cpt17$details$a, _data$cpt17$details$a2, _data$plumberDetails2, _data$plumberDetails3, _data$plumberDetails4, _data$plumberDetails5, _data$plumberDetails6, _data$applicationSele4, _data$applicationSele5, _data$applicationSele6, _data$applicationSele7, _connectionDetailsObj, _useDetailsObject$cat, _data$applicationSele8, _data$applicationSele9, _connectionHolder$own2, _useDetailsObject$noO, _data$applicationSele0, _data$applicationSele1, _data$applicationSele10, _data$applicationSele11, _data$applicationSele12, _data$applicationSele13, _data$applicationSele14, _data$applicationSele15, _data$applicationSele16, _data$applicationSele17, _data$applicationSele18, _data$applicationSele19, _data$applicationSele20, _data$applicationSele21, _data$applicationSele22, _data$applicationSele23, _data$applicationSele24, _data$contact5, _data$documents2, _data$documents3, _data$documents4, _data$cpt18, _Digit, _Digit$Customizations, _Digit$Customizations2, _Digit2, _Digit2$Customization, _Digit2$Customization2;
     const userInfo = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.info;
     const isCitizen = (userInfo === null || userInfo === void 0 ? void 0 : userInfo.type) === "CITIZEN" || (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$roles = userInfo.roles) === null || _userInfo$roles === void 0 ? void 0 : _userInfo$roles.some(role => role.code === "CITIZEN"));
     data === null || data === void 0 ? void 0 : (_data$cpt = data.cpt) === null || _data$cpt === void 0 ? void 0 : (_data$cpt$details = _data$cpt.details) === null || _data$cpt$details === void 0 ? void 0 : (_data$cpt$details$own = _data$cpt$details.owners) === null || _data$cpt$details$own === void 0 ? void 0 : _data$cpt$details$own.forEach(owner => {
@@ -645,7 +645,8 @@ const createPayloadOfWS = function (data) {
         name: details === null || details === void 0 ? void 0 : details.plumberName,
         mobileNumber: details === null || details === void 0 ? void 0 : details.plumberMobileNo
       })),
-      additionalDetails: _extends({}, useDetailsObject, data === null || data === void 0 ? void 0 : data.djbEmployee, {
+      additionalDetails: _extends({}, useDetailsObject, data === null || data === void 0 ? void 0 : data.djbEmployee, data === null || data === void 0 ? void 0 : data.disability, {
+        isDivyangjan: !!(data !== null && data !== void 0 && (_data$disability = data.disability) !== null && _data$disability !== void 0 && _data$disability.isDivyangjan),
         document: (data === null || data === void 0 ? void 0 : (_data$djbEmployee4 = data.djbEmployee) === null || _data$djbEmployee4 === void 0 ? void 0 : (_data$djbEmployee4$do = _data$djbEmployee4.document) === null || _data$djbEmployee4$do === void 0 ? void 0 : _data$djbEmployee4$do.fileStoreId) || (data === null || data === void 0 ? void 0 : (_data$djbEmployee5 = data.djbEmployee) === null || _data$djbEmployee5 === void 0 ? void 0 : _data$djbEmployee5.document) || undefined
       }, data === null || data === void 0 ? void 0 : data.bankDetails, data === null || data === void 0 ? void 0 : data.declarationData, data === null || data === void 0 ? void 0 : data.declaration, {
         zro: (data === null || data === void 0 ? void 0 : (_data$zro = data.zro) === null || _data$zro === void 0 ? void 0 : _data$zro.code) || (data === null || data === void 0 ? void 0 : data.zro),
@@ -11323,7 +11324,9 @@ const App$1 = _ref2 => {
     }))
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.PrivateRoute, {
     path: path + "/consumption-details",
-    component: WSConsumptionDetails
+    component: () => /*#__PURE__*/React__default.createElement(digitUiReactComponents.LayoutWrapper, {
+      layoutClass: "action"
+    }, /*#__PURE__*/React__default.createElement(WSConsumptionDetails, null))
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.PrivateRoute, {
     path: path + "/modify-application",
     component: WSModifyApplication
@@ -18050,6 +18053,14 @@ const UploadFileDigiLocker = props => {
 };
 
 const DIGILOCKER_SUPPORTED_CODES = ["AADHAAR", "AADHAR", "DRIVING", "DRVLC", "PAN"];
+const ENVIRONMENT_FILE_STORE_IDS = {
+  uat: "261542df-8dae-41e7-aa17-00cd288faf3b",
+  dev: "0d394691-45ed-4036-97e8-8de8b0f166b1"
+};
+const getEnvironmentFileStoreId = () => {
+  const hostname = window.location.hostname.toLowerCase();
+  return hostname.includes("uat") ? ENVIRONMENT_FILE_STORE_IDS.uat : ENVIRONMENT_FILE_STORE_IDS.dev;
+};
 const isDigiLockerEligible = function (code) {
   if (code === void 0) {
     code = "";
@@ -18057,8 +18068,26 @@ const isDigiLockerEligible = function (code) {
   const upper = code.toUpperCase();
   return DIGILOCKER_SUPPORTED_CODES.some(keyword => upper.includes(keyword));
 };
+const isOtherDocument = function (code) {
+  if (code === void 0) {
+    code = "";
+  }
+  return code.toUpperCase().includes("OTHER");
+};
+const removeDuplicateOtherDocuments = function (documentList) {
+  if (documentList === void 0) {
+    documentList = [];
+  }
+  const documentTypes = new Set();
+  return documentList.filter(document => {
+    if (!isOtherDocument(document === null || document === void 0 ? void 0 : document.documentType)) return true;
+    if (documentTypes.has(document.documentType)) return false;
+    documentTypes.add(document.documentType);
+    return true;
+  });
+};
 const WSDocumentsEmployee = _ref => {
-  var _formData$documents, _formData$DocumentsRe, _applicationDetailsDa, _applicationDetailsDa2, _wsDocs$wsDocsData3;
+  var _applicationDetailsDa, _applicationDetailsDa2, _wsDocs$wsDocsData3;
   let t = _ref.t,
     config = _ref.config,
     onSelect = _ref.onSelect,
@@ -18068,7 +18097,10 @@ const WSDocumentsEmployee = _ref => {
     clearFormErrors = _ref.clearErrors,
     formState = _ref.formState;
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const _useState = React.useState(userType === "citizen" ? (formData === null || formData === void 0 ? void 0 : (_formData$documents = formData.documents) === null || _formData$documents === void 0 ? void 0 : _formData$documents.documents) || (formData === null || formData === void 0 ? void 0 : formData.documents) || [] : (formData === null || formData === void 0 ? void 0 : (_formData$DocumentsRe = formData.DocumentsRequired) === null || _formData$DocumentsRe === void 0 ? void 0 : _formData$DocumentsRe.documents) || []),
+  const _useState = React.useState(() => {
+      var _formData$documents, _formData$DocumentsRe;
+      return removeDuplicateOtherDocuments(userType === "citizen" ? (formData === null || formData === void 0 ? void 0 : (_formData$documents = formData.documents) === null || _formData$documents === void 0 ? void 0 : _formData$documents.documents) || (formData === null || formData === void 0 ? void 0 : formData.documents) || [] : (formData === null || formData === void 0 ? void 0 : (_formData$DocumentsRe = formData.DocumentsRequired) === null || _formData$DocumentsRe === void 0 ? void 0 : _formData$DocumentsRe.documents) || []);
+    }),
     documents = _useState[0],
     setDocuments = _useState[1];
   const _useState2 = React.useState(true),
@@ -18095,8 +18127,19 @@ const WSDocumentsEmployee = _ref => {
       onSelect(config.key, documentStep);
     } else {
       onSelect(config.key, {
-        documents
+        documents: removeDuplicateOtherDocuments(documents)
+      });
+    }
+  };
+  const downloadDocument = function () {
+    try {
+      return Promise.resolve(Digit.UploadServices.DownloadFile(getEnvironmentFileStoreId(), "dl", "NOC for New Delhi Jal Board Connection.pdf")).then(function (downloaded) {
+        if (!downloaded) {
+          setError(t("CS_FILE_DOWNLOAD_ERROR") || "PDF download failed");
+        }
       });
+    } catch (e) {
+      return Promise.reject(e);
     }
   };
   React.useEffect(() => {
@@ -18155,7 +18198,8 @@ const WSDocumentsEmployee = _ref => {
       setFormError: setFormError,
       clearFormErrors: clearFormErrors,
       config: config,
-      formState: formState
+      formState: formState,
+      isOtherDocument: isOtherDocument(document === null || document === void 0 ? void 0 : document.code)
     });
   }));
   if (userType === "citizen") {
@@ -18176,14 +18220,32 @@ const WSDocumentsEmployee = _ref => {
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.CollapsibleCardPage, {
     title: t("WS_DOCUMENTS"),
     defaultOpen: true
-  }, innerContent, error && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
+  }, /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: event => {
+      event.stopPropagation();
+      downloadDocument();
+    },
+    style: {
+      cursor: "pointer",
+      color: "#fff",
+      fontWeight: "bold",
+      padding: "6px 14px",
+      border: "1px solid #00497e",
+      borderRadius: "4px",
+      backgroundColor: "#00497e",
+      marginLeft: "auto",
+      marginRight: "32px",
+      whiteSpace: "nowrap"
+    }
+  }, t("WS_DOWNLOAD_DOCUMENT")), innerContent, error && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
     label: error,
     onClose: () => setError(null),
     error: true
   }));
 };
 function SelectDocument(_ref2) {
-  var _formData$ConnectionD, _doc$i18nKey, _selectedDocument$cod2, _selectedDocument$cod3, _selectedDocument$cod4, _selectedDocument$cod5, _selectedDocument$cod6, _selectedDocument$cod7, _selectedDocument$cod8, _selectedDocument$cod9, _selectedDocument$cod0, _selectedDocument$cod1, _selectedDocument$cod10, _selectedDocument$cod11, _selectedDocument$cod12, _selectedDocument$cod13, _selectedDocument$cod14, _selectedDocument$cod15, _doc$i18nKey2, _doc$i18nKey3;
+  var _formData$ConnectionD, _doc$i18nKey, _selectedDocument$cod2, _selectedDocument$cod3, _selectedDocument$cod4, _selectedDocument$cod5, _selectedDocument$cod6, _selectedDocument$cod7, _selectedDocument$cod8, _selectedDocument$cod9, _selectedDocument$cod0, _selectedDocument$cod1, _selectedDocument$cod10, _selectedDocument$cod11, _selectedDocument$cod12, _selectedDocument$cod13, _selectedDocument$cod14, _selectedDocument$cod15, _doc$i18nKey2;
   let t = _ref2.t,
     doc = _ref2.document,
     setDocuments = _ref2.setDocuments,
@@ -18194,11 +18256,17 @@ function SelectDocument(_ref2) {
     clearFormErrors = _ref2.clearFormErrors,
     config = _ref2.config,
     formState = _ref2.formState,
-    id = _ref2.id;
+    id = _ref2.id,
+    _ref2$isOtherDocument = _ref2.isOtherDocument,
+    isOther = _ref2$isOtherDocument === void 0 ? false : _ref2$isOtherDocument;
   const fileRef = React.useRef();
-  const filteredDocument = documents === null || documents === void 0 ? void 0 : documents.filter(item => {
+  const otherUploadedDocuments = isOther ? (documents === null || documents === void 0 ? void 0 : documents.filter(item => {
     var _item$documentType;
     return item === null || item === void 0 ? void 0 : (_item$documentType = item.documentType) === null || _item$documentType === void 0 ? void 0 : _item$documentType.includes(doc === null || doc === void 0 ? void 0 : doc.code);
+  })) || [] : [];
+  const filteredDocument = isOther ? null : documents === null || documents === void 0 ? void 0 : documents.filter(item => {
+    var _item$documentType2;
+    return item === null || item === void 0 ? void 0 : (_item$documentType2 = item.documentType) === null || _item$documentType2 === void 0 ? void 0 : _item$documentType2.includes(doc === null || doc === void 0 ? void 0 : doc.code);
   })[0];
   const _useState4 = React.useState(() => {
       var _filteredDocument$doc, _doc$dropdownData2;
@@ -18217,10 +18285,10 @@ function SelectDocument(_ref2) {
   const _useState5 = React.useState(null),
     file = _useState5[0],
     setFile = _useState5[1];
-  const _useState6 = React.useState(() => (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId) || null),
+  const _useState6 = React.useState(() => isOther ? null : (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId) || null),
     uploadedFile = _useState6[0],
     setUploadedFile = _useState6[1];
-  const _useState7 = React.useState(() => (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentUid) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentNumber) || ""),
+  const _useState7 = React.useState(() => isOther ? "" : (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentUid) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.documentNumber) || ""),
     documentUid = _useState7[0],
     setDocumentUid = _useState7[1];
   const _useState8 = React.useState(false),
@@ -18279,12 +18347,23 @@ function SelectDocument(_ref2) {
     setShowCamera(false);
   };
   const handleSelectDocument = value => setSelectedDocument(value);
-  const viewDocument = function () {
+  const removeUploadedDocument = fileStoreId => {
+    setDocuments(previousDocuments => previousDocuments.filter(item => (item === null || item === void 0 ? void 0 : item.fileStoreId) !== fileStoreId));
+    if (fileStoreId === uploadedFile) {
+      setUploadedFile(null);
+      setFile(null);
+      setDocumentUid("");
+    }
+  };
+  const viewDocument = function (fileStoreId) {
+    if (fileStoreId === void 0) {
+      fileStoreId = uploadedFile;
+    }
     try {
       const _temp2 = function () {
-        if (uploadedFile) {
+        if (fileStoreId) {
           const _temp = _catch(function () {
-            return Promise.resolve(Digit.UploadServices.FileFetchbyid(uploadedFile, Digit.ULBService.getStateId())).then(function (res) {
+            return Promise.resolve(Digit.UploadServices.FileFetchbyid(fileStoreId, Digit.ULBService.getStateId())).then(function (res) {
               if (res !== null && res !== void 0 && res.data) {
                 var _res$headers, _res$headers2;
                 const contentType = ((_res$headers = res.headers) === null || _res$headers === void 0 ? void 0 : _res$headers["content-type"]) || ((_res$headers2 = res.headers) === null || _res$headers2 === void 0 ? void 0 : _res$headers2["Content-Type"]) || "";
@@ -18336,6 +18415,7 @@ function SelectDocument(_ref2) {
   var dropDownData = dropdownData;
   const _useState15 = React.useState(false),
     isHidden = _useState15[0];
+  const documentDisplayName = (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.i18nKey) || (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.name) || (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code) || (doc === null || doc === void 0 ? void 0 : doc.i18nKey) || (doc === null || doc === void 0 ? void 0 : doc.name) || (doc === null || doc === void 0 ? void 0 : doc.code);
   const addError = () => {
     var _formState$errors, _formState$errors$con;
     let type = formState === null || formState === void 0 ? void 0 : (_formState$errors = formState.errors) === null || _formState$errors === void 0 ? void 0 : (_formState$errors$con = _formState$errors[config.key]) === null || _formState$errors$con === void 0 ? void 0 : _formState$errors$con.type;
@@ -18365,7 +18445,7 @@ function SelectDocument(_ref2) {
   React.useEffect(() => {
     if (selectedDocument !== null && selectedDocument !== void 0 && selectedDocument.code) {
       setDocuments(prev => {
-        const filteredDocumentsByDocumentType = prev === null || prev === void 0 ? void 0 : prev.filter(item => (item === null || item === void 0 ? void 0 : item.documentType) !== (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code));
+        const filteredDocumentsByDocumentType = isOther ? prev === null || prev === void 0 ? void 0 : prev.filter(item => (item === null || item === void 0 ? void 0 : item.fileStoreId) !== (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileStoreId)) : prev === null || prev === void 0 ? void 0 : prev.filter(item => (item === null || item === void 0 ? void 0 : item.documentType) !== (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code));
         if ((uploadedFile === null || uploadedFile === void 0 ? void 0 : uploadedFile.length) === 0 || uploadedFile === null) {
           return filteredDocumentsByDocumentType;
         }
@@ -18374,6 +18454,7 @@ function SelectDocument(_ref2) {
           documentType: selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code,
           fileStoreId: uploadedFile,
           fileName: (file === null || file === void 0 ? void 0 : file.name) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileName) || "",
+          documentName: (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.i18nKey) || (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code) || "",
           documentUid: documentUid,
           documentNumber: documentUid,
           i18nKey: selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code,
@@ -18403,48 +18484,60 @@ function SelectDocument(_ref2) {
     (function () {
       try {
         setError(null);
-        const _temp6 = function () {
+        const _temp7 = function () {
           if (file) {
-            const _temp5 = function () {
-              if (file.size >= 5242880) {
-                setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
+            const isDuplicateDocument = isOther && documents.some(item => (item === null || item === void 0 ? void 0 : item.documentType) === (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code));
+            const _temp6 = function () {
+              if (isDuplicateDocument) {
+                const documentNameKey = (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.i18nKey) || (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code) || "This";
+                const translatedDocumentName = t(documentNameKey);
+                const documentName = translatedDocumentName === documentNameKey ? documentNameKey.replaceAll("_", " ") : translatedDocumentName;
+                setError("Document \"" + documentName + "\" has already been uploaded.");
+                setFile(null);
               } else {
-                const _temp4 = function () {
-                  if ((doc === null || doc === void 0 ? void 0 : doc.code) === "OWNER.APPLICANTPHOTO" && !file.type.match(/image\/(jpeg|png)/i) && !file.name.match(/\.(jpg|jpeg|png)$/i)) {
-                    setError(t("WS_ONLY_JPG_PNG_ALLOWED") || "Only JPG and PNG files are allowed for Applicant Photo");
-                    setFile(null);
+                const _temp5 = function () {
+                  if (file.size >= 5242880) {
+                    setError(t("CS_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
                   } else {
-                    const _temp3 = _finallyRethrows(function () {
-                      return _catch(function () {
-                        setUploadedFile(null);
-                        setIsUploading(true);
-                        return Promise.resolve(Digit.UploadServices.Filestorage("WS", file, Digit.ULBService.getStateId())).then(function (response) {
-                          var _response$data, _response$data$files;
-                          if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
-                            var _response$data2, _response$data2$files;
-                            setUploadedFile(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$files = _response$data2.files[0]) === null || _response$data2$files === void 0 ? void 0 : _response$data2$files.fileStoreId);
-                          } else {
+                    const _temp4 = function () {
+                      if ((doc === null || doc === void 0 ? void 0 : doc.code) === "OWNER.APPLICANTPHOTO" && !file.type.match(/image\/(jpeg|png)/i) && !file.name.match(/\.(jpg|jpeg|png)$/i)) {
+                        setError(t("WS_ONLY_JPG_PNG_ALLOWED") || "Only JPG and PNG files are allowed for Applicant Photo");
+                        setFile(null);
+                      } else {
+                        const _temp3 = _finallyRethrows(function () {
+                          return _catch(function () {
+                            setUploadedFile(null);
+                            setIsUploading(true);
+                            return Promise.resolve(Digit.UploadServices.Filestorage("WS", file, Digit.ULBService.getStateId())).then(function (response) {
+                              var _response$data, _response$data$files;
+                              if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
+                                var _response$data2, _response$data2$files;
+                                setUploadedFile(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$files = _response$data2.files[0]) === null || _response$data2$files === void 0 ? void 0 : _response$data2$files.fileStoreId);
+                              } else {
+                                setError(t("CS_FILE_UPLOAD_ERROR"));
+                              }
+                            });
+                          }, function () {
                             setError(t("CS_FILE_UPLOAD_ERROR"));
-                          }
+                          });
+                        }, function (_wasThrown, _result) {
+                          setIsUploading(false);
+                          if (_wasThrown) throw _result;
+                          return _result;
                         });
-                      }, function () {
-                        setError(t("CS_FILE_UPLOAD_ERROR"));
-                      });
-                    }, function (_wasThrown, _result) {
-                      setIsUploading(false);
-                      if (_wasThrown) throw _result;
-                      return _result;
-                    });
-                    if (_temp3 && _temp3.then) return _temp3.then(function () {});
+                        if (_temp3 && _temp3.then) return _temp3.then(function () {});
+                      }
+                    }();
+                    if (_temp4 && _temp4.then) return _temp4.then(function () {});
                   }
                 }();
-                if (_temp4 && _temp4.then) return _temp4.then(function () {});
+                if (_temp5 && _temp5.then) return _temp5.then(function () {});
               }
             }();
-            if (_temp5 && _temp5.then) return _temp5.then(function () {});
+            if (_temp6 && _temp6.then) return _temp6.then(function () {});
           }
         }();
-        return _temp6 && _temp6.then ? _temp6.then(function () {}) : void 0;
+        return _temp7 && _temp7.then ? _temp7.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
@@ -18570,11 +18663,35 @@ function SelectDocument(_ref2) {
       gap: "8px",
       gridColumn: "span 1"
     }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "space-between"
+    }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, {
     style: {
       margin: 0
     }
-  }, doc !== null && doc !== void 0 && doc.required ? t((doc === null || doc === void 0 ? void 0 : (_doc$i18nKey2 = doc.i18nKey) === null || _doc$i18nKey2 === void 0 ? void 0 : _doc$i18nKey2.replaceAll(".", "_")) + "_UPLOAD_DOCUMENT") + "*" : "" + t((doc === null || doc === void 0 ? void 0 : (_doc$i18nKey3 = doc.i18nKey) === null || _doc$i18nKey3 === void 0 ? void 0 : _doc$i18nKey3.replaceAll(".", "_")) + "_UPLOAD_DOCUMENT")), /*#__PURE__*/React__default.createElement("div", {
+  }, t((doc === null || doc === void 0 ? void 0 : (_doc$i18nKey2 = doc.i18nKey) === null || _doc$i18nKey2 === void 0 ? void 0 : _doc$i18nKey2.replaceAll(".", "_")) + "_UPLOAD_DOCUMENT"), doc !== null && doc !== void 0 && doc.required ? "*" : ""), isOther && /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: () => {
+      setUploadedFile(null);
+      setFile(null);
+      setSelectedDocument(doc !== null && doc !== void 0 && doc.hasDropdown ? {} : doc);
+      setDocumentUid("");
+      setDocNumberError(null);
+    },
+    style: {
+      border: "1px solid #00497e",
+      background: "#fff",
+      color: "#00497e",
+      borderRadius: "4px",
+      padding: "4px 10px",
+      cursor: "pointer",
+      fontWeight: "bold"
+    }
+  }, "+ Add")), /*#__PURE__*/React__default.createElement("div", {
     className: "field",
     style: {
       display: "flex",
@@ -18603,7 +18720,7 @@ function SelectDocument(_ref2) {
     buttonType: "button",
     error: !uploadedFile,
     accept: (doc === null || doc === void 0 ? void 0 : doc.code) === "OWNER.APPLICANTPHOTO" ? "image/jpeg, image/png, .jpg, .jpeg, .png" : "image/*, .pdf, .png, .jpeg, .jpg",
-    uploadedFiles: uploadedFile && !file ? [[(filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileName) || (file === null || file === void 0 ? void 0 : file.name) || t("CS_COMMON_DOCUMENT"), {
+    uploadedFiles: uploadedFile && !file ? [[(filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileName) || (file === null || file === void 0 ? void 0 : file.name) || t(documentDisplayName || "CS_COMMON_DOCUMENT"), {
       fileStoreId: uploadedFile
     }]] : undefined,
     removeTargetedFile: () => {
@@ -18635,7 +18752,7 @@ function SelectDocument(_ref2) {
     buttonType: "button",
     error: !uploadedFile,
     accept: (doc === null || doc === void 0 ? void 0 : doc.code) === "OWNER.APPLICANTPHOTO" ? "image/jpeg, image/png, .jpg, .jpeg, .png" : "image/*, .pdf, .png, .jpeg, .jpg",
-    uploadedFiles: uploadedFile && !file ? [[(filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileName) || (file === null || file === void 0 ? void 0 : file.name) || t("CS_COMMON_DOCUMENT"), {
+    uploadedFiles: uploadedFile && !file ? [[(filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileName) || (file === null || file === void 0 ? void 0 : file.name) || t(documentDisplayName || "CS_COMMON_DOCUMENT"), {
       fileStoreId: uploadedFile
     }]] : undefined,
     removeTargetedFile: () => {
@@ -18645,7 +18762,47 @@ function SelectDocument(_ref2) {
       setIsDocumentUidLocked(false);
       setDocumentUid("");
     }
-  })))), /*#__PURE__*/React__default.createElement("div", {
+  }))), (isOther ? otherUploadedDocuments : uploadedFile ? [{
+    fileStoreId: uploadedFile,
+    fileName: (file === null || file === void 0 ? void 0 : file.name) || (filteredDocument === null || filteredDocument === void 0 ? void 0 : filteredDocument.fileName),
+    documentNumber: documentUid
+  }] : []).map((uploadedDocument, index) => /*#__PURE__*/React__default.createElement("div", {
+    key: uploadedDocument.fileStoreId || index,
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "12px",
+      marginTop: "4px",
+      color: "#00497e"
+    }
+  }, /*#__PURE__*/React__default.createElement("span", {
+    style: {
+      fontWeight: "bold"
+    }
+  }, uploadedDocument.documentName || uploadedDocument.i18nKey || uploadedDocument.documentType || documentDisplayName ? t(uploadedDocument.documentName || uploadedDocument.i18nKey || uploadedDocument.documentType || documentDisplayName) : t("CS_COMMON_DOCUMENT"), " - ", uploadedDocument.fileName || t("CS_COMMON_DOCUMENT")), uploadedDocument.documentNumber && /*#__PURE__*/React__default.createElement("span", null, uploadedDocument.documentNumber), /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: () => viewDocument(uploadedDocument.fileStoreId),
+    title: t("WS_VIEW_DOCUMENT") || "View Document",
+    style: {
+      border: "none",
+      background: "transparent",
+      color: "#00497e",
+      cursor: "pointer",
+      padding: 0
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.ViewsIcon, null)), /*#__PURE__*/React__default.createElement("button", {
+    type: "button",
+    onClick: () => removeUploadedDocument(uploadedDocument.fileStoreId),
+    title: "Remove Document",
+    style: {
+      border: "none",
+      background: "transparent",
+      color: "#d32f2f",
+      cursor: "pointer",
+      padding: 0,
+      fontSize: "18px"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.RemoveIcon, null))))), /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
       flexDirection: "column",
@@ -18698,21 +18855,7 @@ function SelectDocument(_ref2) {
       fontWeight: "bold",
       fontSize: "14px"
     }
-  }, "\u2714 Uploaded")), uploadedFile && /*#__PURE__*/React__default.createElement("div", {
-    onClick: viewDocument,
-    style: {
-      display: "flex",
-      alignItems: "center",
-      gap: "8px",
-      cursor: "pointer",
-      color: "#00497e",
-      fontWeight: "bold",
-      padding: "8px 16px",
-      border: "1px solid #00497e",
-      borderRadius: "4px",
-      backgroundColor: "#fff"
-    }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.ViewsIcon, null), /*#__PURE__*/React__default.createElement("span", null, t("WS_VIEW_DOCUMENT") || "View Document")))), showCamera && /*#__PURE__*/React__default.createElement(CameraCaptureModal, {
+  }, "\u2714 Uploaded")))), showCamera && /*#__PURE__*/React__default.createElement(CameraCaptureModal, {
     onCapture: handleCapture,
     onClose: () => setShowCamera(false),
     t: t
@@ -18788,7 +18931,7 @@ const CameraCaptureModal = _ref4 => {
   React.useEffect(() => {
     const startCamera = function () {
       try {
-        const _temp7 = _catch(function () {
+        const _temp8 = _catch(function () {
           return Promise.resolve(navigator.mediaDevices.getUserMedia({
             video: true
           })).then(function (mediaStream) {
@@ -18801,7 +18944,7 @@ const CameraCaptureModal = _ref4 => {
           setError(t("WS_CAMERA_ACCESS_ERROR") || "Camera Access Error");
           console.error("Error accessing camera: ", err);
         });
-        return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(function () {}) : void 0);
+        return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -23549,6 +23692,61 @@ const WSDjbEmployee = _ref => {
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, FormContent);
 };
 
+const WSDivyangjan = _ref => {
+  var _formData$disability, _formData$additionalD;
+  let config = _ref.config,
+    onSelect = _ref.onSelect,
+    userType = _ref.userType,
+    formData = _ref.formData;
+  const _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
+  const _useForm = reactHookForm.useForm({
+      defaultValues: {
+        isDivyangjan: !!(formData !== null && formData !== void 0 && (_formData$disability = formData.disability) !== null && _formData$disability !== void 0 && _formData$disability.isDivyangjan || formData !== null && formData !== void 0 && (_formData$additionalD = formData.additionalDetails) !== null && _formData$additionalD !== void 0 && _formData$additionalD.isDivyangjan)
+      }
+    }),
+    control = _useForm.control,
+    watch = _useForm.watch;
+  const formValue = watch();
+  const onSelectRef = React.useRef(onSelect);
+  const goNext = () => onSelect(config.key, {
+    isDivyangjan: !!formValue.isDivyangjan
+  });
+  const onSkip = () => onSelect();
+  React.useEffect(() => {
+    onSelectRef.current = onSelect;
+  }, [onSelect]);
+  React.useEffect(() => {
+    if (userType === "employee") {
+      onSelectRef.current(config.key, {
+        isDivyangjan: !!formValue.isDivyangjan
+      });
+    }
+  }, [config.key, formValue.isDivyangjan, userType]);
+  const content = /*#__PURE__*/React__default.createElement(digitUiReactComponents.CollapsibleCardPage, {
+    title: "Divyangjan/Person with Disability?",
+    defaultOpen: true
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      width: "max-content"
+    }
+  }, /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
+    name: "isDivyangjan",
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.CheckBox, {
+      label: "Divyangjan/Person with Disability?",
+      checked: !!props.value,
+      onChange: event => props.onChange(event.target.checked)
+    })
+  })));
+  return userType === "citizen" ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormStep, {
+    t: t,
+    config: config,
+    onSelect: goNext,
+    onSkip: onSkip
+  }, content) : content;
+};
+
 const _excluded$1 = ["t", "config", "onSelect", "formData", "formState", "setError", "clearErrors"];
 const NUMBER_PATTERN$1 = /^\d+$/;
 const DECIMAL_PATTERN$1 = /^\d+(\.\d{1,2})?$/;
@@ -27624,12 +27822,25 @@ const newConfig = [{
       cardText: "",
       submitBarLabel: "CS_COMMON_NEXT"
     }
+  }, {
+    route: "disability-details",
+    component: "WSDivyangjan",
+    key: "disability",
+    nextStep: "document-details",
+    WATER: "document-details",
+    hideInEmployee: true,
+    texts: {
+      headerCaption: "WS_COMMON_CONNECTION_DETAIL",
+      header: "Divyangjan/Person with Disability?",
+      cardText: "",
+      submitBarLabel: "CS_COMMON_NEXT"
+    }
   }, {
     route: "djb-employee-details",
     component: "WSDjbEmployee",
     key: "djbEmployee",
-    nextStep: "document-details",
-    WATER: "document-details",
+    nextStep: "disability-details",
+    WATER: "disability-details",
     hideInEmployee: true,
     texts: {
       headerCaption: "WS_COMMON_CONNECTION_DETAIL",
@@ -32078,7 +32289,7 @@ const ViewBreakup = _ref => {
       title: t("WS_APPLICATION_FEE_HEADER"),
       values: amountRows([...((breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab = breakUpData.billSlabData) === null || _breakUpData$billSlab === void 0 ? void 0 : _breakUpData$billSlab.FEE) || []), ...((breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab2 = breakUpData.billSlabData) === null || _breakUpData$billSlab2 === void 0 ? void 0 : _breakUpData$billSlab2.CHARGES) || [])])
     }, {
-      title: "Property details",
+      title: t("WS_PROPERTY_DETAILS"),
       values: propertyRows.map(_ref4 => {
         let label = _ref4.label,
           value = _ref4.value,
@@ -32091,10 +32302,10 @@ const ViewBreakup = _ref => {
         };
       })
     }, {
-      title: "Taxes",
+      title: t("WS_TAXES"),
       values: amountRows(breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$billSlab3 = breakUpData.billSlabData) === null || _breakUpData$billSlab3 === void 0 ? void 0 : _breakUpData$billSlab3.TAX)
     }, {
-      title: "Water demand details",
+      title: t("WS_WATER_DEMAND_DETAILS"),
       values: waterDemandRows.map(_ref5 => {
         let label = _ref5.label,
           value = _ref5.value,
@@ -32107,7 +32318,7 @@ const ViewBreakup = _ref => {
         };
       })
     }, {
-      title: "Infrastructure charge details",
+      title: t("WS_INFRASTRUCTURE_CHARGE_DETAILS"),
       values: infrastructureChargeRows.map(_ref6 => {
         let label = _ref6.label,
           value = _ref6.value,
@@ -32120,7 +32331,7 @@ const ViewBreakup = _ref => {
         };
       })
     }, {
-      title: "Total",
+      title: t("WS_TOTAL"),
       values: [{
         title: t("PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT"),
         value: "\u20B9" + formatNumber(breakUpData === null || breakUpData === void 0 ? void 0 : breakUpData.totalAmount)
@@ -32163,134 +32374,135 @@ const ViewBreakup = _ref => {
   const propertyDetail = breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$calculat = breakUpData.calculationDetail) === null || _breakUpData$calculat === void 0 ? void 0 : _breakUpData$calculat.propertyDetail;
   const waterDemandDetail = breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$calculat2 = breakUpData.calculationDetail) === null || _breakUpData$calculat2 === void 0 ? void 0 : _breakUpData$calculat2.waterDemandDetail;
   const infrastructureChargeDetail = breakUpData === null || breakUpData === void 0 ? void 0 : (_breakUpData$calculat3 = breakUpData.calculationDetail) === null || _breakUpData$calculat3 === void 0 ? void 0 : _breakUpData$calculat3.infrastructureChargeDetail;
+  const isValidValue = value => value !== null && value !== undefined && value !== "" && value !== 0 && value !== "0" && value !== "0.0";
   const propertyRows = propertyDetail ? [{
-    label: "Property ID",
+    label: t("WS_PROPERTY_ID"),
     value: propertyDetail.propertyId,
     isText: true
   }, {
-    label: "Property type",
+    label: t("WS_PROPERTY_TYPE"),
     value: propertyDetail.propertyType,
     isText: true
   }, {
-    label: "Plot area",
+    label: t("WS_PLOT_AREA"),
     value: propertyDetail.landArea,
     unit: " (sq. meter.)"
   }, {
-    label: "Built-up area",
+    label: t("WS_BUILT_UP_AREA"),
     value: propertyDetail.superBuiltUpArea,
     unit: " (sq. meter.)"
-  }, {
-    label: "farArea",
+  }, isValidValue(propertyDetail.farArea) ? {
+    label: t("WS_FAR_AREA"),
     value: propertyDetail.farArea,
     isText: true
-  }, {
-    label: "coveredArea",
+  } : null, isValidValue(propertyDetail.coveredArea) ? {
+    label: t("WS_COVERED_AREA"),
     value: propertyDetail.coveredArea,
     isText: true
-  }, {
-    label: "numberOfDwellingUnits",
+  } : null, isValidValue(propertyDetail.numberOfDwellingUnits) ? {
+    label: t("WS_NUMBER_OF_DWELLING_UNITS"),
     value: propertyDetail.numberOfDwellingUnits,
     isText: true
-  }, {
-    label: "numberOfBeds",
+  } : null, isValidValue(propertyDetail.numberOfBeds) ? {
+    label: t("WS_NUMBER_OF_BEDS"),
     value: propertyDetail.numberOfBeds,
     isText: true
-  }, {
-    label: "numberOfRooms",
+  } : null, isValidValue(propertyDetail.numberOfRooms) ? {
+    label: t("WS_NUMBER_OF_ROOMS"),
     value: propertyDetail.numberOfRooms,
     isText: true
-  }, {
-    label: "numberOfStudents",
+  } : null, isValidValue(propertyDetail.numberOfStudents) ? {
+    label: t("WS_NUMBER_OF_STUDENTS"),
     value: propertyDetail.numberOfStudents,
     isText: true
-  }, {
-    label: "numberOfStaff",
+  } : null, isValidValue(propertyDetail.numberOfStaff) ? {
+    label: t("WS_NUMBER_OF_STAFF"),
     value: propertyDetail.numberOfStaff,
     isText: true
-  }, {
-    label: "Usage category",
+  } : null, {
+    label: t("WS_USAGE_CATEGORY"),
     value: propertyDetail.usageCategory,
     isText: true
-  }] : [];
+  }].filter(Boolean) : [];
   const waterDemandRows = waterDemandDetail ? [{
-    label: "Calculated occupancy",
+    label: t("WS_CALCULATED_OCCUPANCY"),
     value: waterDemandDetail.calculatedOccupancy,
     unit: " person"
   }, {
-    label: "Applied LPCD",
+    label: t("WS_APPLIED_LPCD"),
     value: waterDemandDetail.chosenLpcd,
     unit: " LPD"
   }, {
-    label: "Base demand",
+    label: t("WS_BASE_DEMAND"),
     value: waterDemandDetail.baseDemand,
     unit: " LPD"
   }, {
-    label: "Contingency/Floating Occupancy",
+    label: t("WS_CONTINGENCY_FLOATING_OCCUPANCY"),
     value: waterDemandDetail.contingencyPercentage,
     unit: "%"
   }, {
-    label: "Total water demand",
+    label: t("WS_TOTAL_WATER_DEMAND"),
     value: waterDemandDetail.totalWaterDemandLPD,
     unit: " LPD"
   }] : [];
   const infrastructureChargeRows = infrastructureChargeDetail ? [{
-    label: "Colony category",
+    label: t("WS_COLONY_CATEGORY"),
     value: infrastructureChargeDetail.colonyCategory,
     isText: true
   }, {
-    label: "Plot area",
+    label: t("WS_PLOT_AREA"),
     value: infrastructureChargeDetail.plotArea,
     unit: " (sq. meter.)"
   }, {
-    label: "Water rate",
+    label: t("WS_WATER_RATE"),
     value: infrastructureChargeDetail.waterRatePerLPD,
     currency: true
   }, {
-    label: "Sewer rate",
+    label: t("WS_SEWER_RATE"),
     value: infrastructureChargeDetail.sewerRatePerLPD,
     currency: true
   }, {
-    label: "Water Infra Charges",
+    label: t("WS_WATER_INFRA_CHARGES"),
     value: infrastructureChargeDetail.waterComponentIFC,
     currency: true
   }, {
-    label: "Sewer Infra Charges",
+    label: t("WS_SEWER_INFRA_CHARGES"),
     value: infrastructureChargeDetail.sewerComponentIFC,
     currency: true
   }, ...(infrastructureChargeDetail.rebateAmount > 0 ? [{
-    label: "Rebate",
+    label: t("WS_REBATE"),
     value: infrastructureChargeDetail.rebatePercentage,
     unit: "%"
   }, {
-    label: "Rebate amount",
+    label: t("WS_REBATE_AMOUNT"),
     value: infrastructureChargeDetail.rebateAmount,
     currency: true
   }] : []), ...(infrastructureChargeDetail.institutionalRebateApplied ? [{
-    label: "Institutional rebate",
+    label: t("WS_INSTITUTIONAL_REBATE"),
     value: infrastructureChargeDetail.institutionalRebatePercentage,
     unit: "%"
   }, {
-    label: "Institutional rebate amount",
+    label: t("WS_INSTITUTIONAL_REBATE_AMOUNT"),
     value: infrastructureChargeDetail.institutionalRebateAmount,
     currency: true
   }, {
-    label: "Institutional rebate reason",
+    label: t("WS_INSTITUTIONAL_REBATE_REASON"),
     value: t(infrastructureChargeDetail.institutionalRebateReason),
     isText: true
   }] : []), ...(infrastructureChargeDetail.dwellingRebateApplied ? [{
-    label: "Dwelling rebate",
+    label: t("WS_DWELLING_REBATE"),
     value: infrastructureChargeDetail.dwellingRebatePercentage,
     unit: "%"
   }, {
-    label: "Dwelling rebate amount",
+    label: t("WS_DWELLING_REBATE_AMOUNT"),
     value: infrastructureChargeDetail.dwellingRebateAmount,
     currency: true
   }, {
-    label: "Dwelling rebate reason",
+    label: t("WS_DWELLING_REBATE_REASON"),
     value: t(infrastructureChargeDetail.dwellingRebateReason),
     isText: true
   }] : []), {
-    label: "Net IFC",
+    label: t("WS_NET_IFC"),
     value: infrastructureChargeDetail.netIFC,
     currency: true
   }] : [];
@@ -32381,19 +32593,19 @@ const ViewBreakup = _ref => {
     style: {
       margin: "10px 0px"
     }
-  }, "Property details"), /*#__PURE__*/React__default.createElement(DetailRows, {
+  }, t("WS_PROPERTY_DETAILS")), /*#__PURE__*/React__default.createElement(DetailRows, {
     rows: propertyRows
   })), waterDemandRows.length > 0 && /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, {
     style: {
       margin: "10px 0px"
     }
-  }, "Water demand details"), /*#__PURE__*/React__default.createElement(DetailRows, {
+  }, t("WS_WATER_DEMAND_DETAILS")), /*#__PURE__*/React__default.createElement(DetailRows, {
     rows: waterDemandRows
   })), infrastructureChargeRows.length > 0 && /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, {
     style: {
       margin: "10px 0px"
     }
-  }, "Infrastructure charge details"), /*#__PURE__*/React__default.createElement(DetailRows, {
+  }, t("WS_INFRASTRUCTURE_CHARGE_DETAILS")), /*#__PURE__*/React__default.createElement(DetailRows, {
     rows: infrastructureChargeRows
   })), /*#__PURE__*/React__default.createElement("hr", {
     style: {
@@ -32424,31 +32636,31 @@ const checkForNA$1 = value => {
   return value ? value : "CS_NA";
 };
 const WSApplicationDetails = () => {
-  var _user$info, _user$info$userName, _user$info2, _user$info3, _Digit$SessionStorage, _user$info4, _data$WaterConnection, _data$WaterConnection2, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection3, _data$WaterConnection4, _data$SewerageConnect3, _data$SewerageConnect4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$SewerageConnect5, _data$SewerageConnect6, _data$SewerageConnect7, _data$WaterConnection8, _data$WaterConnection9, _data$SewerageConnect8, _data$SewerageConnect9, _data$WaterConnection0, _data$WaterConnection1, _data$SewerageConnect0, _data$SewerageConnect1, _data$WaterConnection10, _data$WaterConnection11, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection12, _data$SewerageConnect12, _PTData$Properties, _PTData$Properties$, _data$WaterConnection13, _data$WaterConnection14, _data$WaterConnection15, _data$WaterConnection16, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$SewerageConnect16, _data$WaterConnection17, _data$WaterConnection18, _data$SewerageConnect17, _data$SewerageConnect18, _appDetailsData$appli, _data$WaterConnection37, _data$WaterConnection38, _data$SewerageConnect33, _data$SewerageConnect34, _data$WaterConnection39, _data$WaterConnection40, _data$SewerageConnect35, _data$SewerageConnect36, _data$WaterConnection41, _data$WaterConnection42, _data$SewerageConnect37, _data$SewerageConnect38, _data$WaterConnection43, _data$WaterConnection44, _data$SewerageConnect39, _data$SewerageConnect40, _data$WaterConnection45, _data$WaterConnection46, _data$SewerageConnect41, _data$WaterConnection47, _data$WaterConnection48, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection49, _data$WaterConnection50, _data$SewerageConnect44, _data$SewerageConnect45, _data$WaterConnection51, _data$WaterConnection52, _data$SewerageConnect46, _data$SewerageConnect47, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect48, _data$SewerageConnect49, _data$WaterConnection55, _data$WaterConnection56, _data$SewerageConnect50, _data$SewerageConnect51, _data$WaterConnection57, _data$WaterConnection58, _data$SewerageConnect52, _data$SewerageConnect53, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect54, _data$SewerageConnect55, _data$WaterConnection61, _data$WaterConnection62, _data$SewerageConnect56, _data$SewerageConnect57, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect58, _data$SewerageConnect59, _data$WaterConnection65, _data$WaterConnection66, _data$SewerageConnect60, _data$SewerageConnect61, _data$WaterConnection67, _data$WaterConnection68, _data$WaterConnection69, _data$WaterConnection70, _data$SewerageConnect62, _data$SewerageConnect63, _data$SewerageConnect64, _data$SewerageConnect65, _connectionDetails$se, _connectionDetails$se2, _connectionDetails$co, _connectionDetails$co2, _connectionDetails$wa, _connectionDetails$wa2, _connectionDetails$ap, _connectionDetails$ap2, _connectionDetails$do, _connectionDetails$do2, _connectionDetails$do3, _connectionDetails$de, _connectionDetails$de2, _data$WaterConnection71, _data$WaterConnection72, _data$WaterConnection73, _data$SewerageConnect66, _data$SewerageConnect67, _data$SewerageConnect68, _data$WaterConnection74, _data$WaterConnection75, _data$WaterConnection76, _data$WaterConnection77, _data$SewerageConnect69, _data$SewerageConnect70, _data$SewerageConnect71, _data$SewerageConnect72, _data$WaterConnection78, _data$WaterConnection79, _data$WaterConnection80, _data$WaterConnection81, _data$SewerageConnect73, _data$SewerageConnect74, _data$SewerageConnect75, _data$SewerageConnect76, _data$WaterConnection82, _data$WaterConnection83, _data$WaterConnection84, _data$WaterConnection85, _data$SewerageConnect77, _data$SewerageConnect78, _data$SewerageConnect79, _data$SewerageConnect80, _data$WaterConnection86, _data$WaterConnection87, _data$WaterConnection88, _data$WaterConnection89, _data$SewerageConnect81, _data$SewerageConnect82, _data$SewerageConnect83, _data$SewerageConnect84, _data$WaterConnection90, _data$WaterConnection91, _data$WaterConnection92, _data$WaterConnection93, _data$SewerageConnect85, _data$SewerageConnect86, _data$SewerageConnect87, _data$SewerageConnect88, _data$WaterConnection94, _data$WaterConnection95, _data$WaterConnection96, _data$WaterConnection97, _data$SewerageConnect89, _data$SewerageConnect90, _data$SewerageConnect91, _data$SewerageConnect92, _data$WaterConnection98, _data$WaterConnection99, _data$WaterConnection100, _data$WaterConnection101, _data$SewerageConnect93, _data$SewerageConnect94, _data$SewerageConnect95, _data$SewerageConnect96, _data$WaterConnection102, _data$WaterConnection103, _data$WaterConnection104, _data$WaterConnection105, _data$SewerageConnect97, _data$SewerageConnect98, _data$SewerageConnect99, _data$SewerageConnect100, _data$WaterConnection106, _data$WaterConnection107, _data$WaterConnection108, _data$WaterConnection109, _data$SewerageConnect101, _data$SewerageConnect102, _data$SewerageConnect103, _data$SewerageConnect104, _data$WaterConnection110, _data$WaterConnection111, _data$WaterConnection112, _data$WaterConnection113, _data$SewerageConnect105, _data$SewerageConnect106, _data$SewerageConnect107, _data$SewerageConnect108, _data$WaterConnection114, _data$WaterConnection115, _data$WaterConnection116, _data$WaterConnection117, _data$SewerageConnect109, _data$SewerageConnect110, _data$SewerageConnect111, _data$SewerageConnect112, _data$WaterConnection118, _data$WaterConnection119, _data$WaterConnection120, _data$WaterConnection121, _data$SewerageConnect113, _data$SewerageConnect114, _data$SewerageConnect115, _data$SewerageConnect116, _data$WaterConnection122, _data$WaterConnection123, _data$WaterConnection124, _data$WaterConnection125, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$SewerageConnect120, _data$WaterConnection126, _data$WaterConnection127, _data$SewerageConnect121, _data$SewerageConnect122, _PTData$Properties4, _PTData$Properties4$, _PTData$Properties4$$, _PTData$Properties4$$2, _PTData$Properties5, _PTData$Properties5$, _PTData$Properties6, _PTData$Properties6$, _PTData$Properties6$$, _PTData$Properties6$$2, _PTData$Properties7, _PTData$Properties7$, _data$WaterConnection128, _data$WaterConnection129, _data$SewerageConnect123, _data$SewerageConnect124, _data$WaterConnection130, _data$WaterConnection131, _data$SewerageConnect125, _data$SewerageConnect126, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _propertyAddress$zone3, _propertyAddress$zone4, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _data$WaterConnection132, _data$WaterConnection133, _data$WaterConnection134, _data$WaterConnection135, _data$SewerageConnect127, _data$SewerageConnect128, _data$SewerageConnect129, _data$SewerageConnect130, _data$WaterConnection138, _data$WaterConnection139, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$WaterConnection143, _data$SewerageConnect133, _data$SewerageConnect134, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _data$SewerageConnect138, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _data$WaterConnection144, _data$WaterConnection145, _data$SewerageConnect139, _data$SewerageConnect140, _data$WaterConnection146, _data$WaterConnection147, _data$WaterConnection148, _data$SewerageConnect141, _data$SewerageConnect142, _data$SewerageConnect143, _PTData$Properties8, _PTData$Properties8$, _PTData$Properties8$$, _paymentDetails$data5, _paymentDetails$data6, _paymentDetails$data7, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$WaterConnection152, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _data$SewerageConnect147, _data$WaterConnection153, _data$WaterConnection154, _data$SewerageConnect148, _data$SewerageConnect149, _data$WaterConnection155, _data$WaterConnection156, _data$SewerageConnect150, _data$SewerageConnect151, _data$WaterConnection157, _data$WaterConnection158, _data$SewerageConnect152, _data$SewerageConnect153, _data$WaterConnection159, _data$WaterConnection160, _data$WaterConnection161, _data$SewerageConnect154, _data$SewerageConnect155, _data$WaterConnection162, _data$WaterConnection163, _data$SewerageConnect156, _data$SewerageConnect157, _data$WaterConnection164, _data$WaterConnection165, _data$WaterConnection166, _data$WaterConnection167, _data$SewerageConnect158, _data$SewerageConnect159, _data$SewerageConnect160, _data$SewerageConnect161, _data$WaterConnection168, _data$WaterConnection169, _data$SewerageConnect162, _data$SewerageConnect163, _data$SewerageConnect164, _data$SewerageConnect165, _data$SewerageConnect166, _data$SewerageConnect167, _data$SewerageConnect168, _data$SewerageConnect169, _data$SewerageConnect170, _data$SewerageConnect171, _data$SewerageConnect172, _data$WaterConnection170, _data$WaterConnection171, _data$WaterConnection172, _data$WaterConnection173, _data$WaterConnection174, _data$WaterConnection175, _data$WaterConnection176, _data$WaterConnection177, _data$WaterConnection178;
+  var _user$info, _user$info$userName, _user$info2, _user$info3, _Digit$SessionStorage, _user$info4, _data$WaterConnection, _data$WaterConnection2, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection3, _data$WaterConnection4, _data$SewerageConnect3, _data$SewerageConnect4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$SewerageConnect5, _data$SewerageConnect6, _data$SewerageConnect7, _data$WaterConnection8, _data$WaterConnection9, _data$SewerageConnect8, _data$SewerageConnect9, _data$WaterConnection0, _data$WaterConnection1, _data$SewerageConnect0, _data$SewerageConnect1, _data$WaterConnection10, _data$WaterConnection11, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection12, _data$SewerageConnect12, _PTData$Properties, _PTData$Properties$, _PTData$Properties2, _PTData$Properties2$, _data$WaterConnection13, _data$WaterConnection14, _data$WaterConnection15, _data$WaterConnection16, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$SewerageConnect16, _data$WaterConnection17, _data$WaterConnection18, _data$SewerageConnect17, _data$SewerageConnect18, _appDetailsData$appli, _data$WaterConnection37, _data$WaterConnection38, _data$SewerageConnect33, _data$SewerageConnect34, _data$WaterConnection39, _data$WaterConnection40, _data$SewerageConnect35, _data$SewerageConnect36, _data$WaterConnection41, _data$WaterConnection42, _data$SewerageConnect37, _data$SewerageConnect38, _data$WaterConnection43, _data$WaterConnection44, _data$SewerageConnect39, _data$SewerageConnect40, _data$WaterConnection45, _data$WaterConnection46, _data$SewerageConnect41, _data$WaterConnection47, _data$WaterConnection48, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection49, _data$WaterConnection50, _data$SewerageConnect44, _data$SewerageConnect45, _data$WaterConnection51, _data$WaterConnection52, _data$SewerageConnect46, _data$SewerageConnect47, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect48, _data$SewerageConnect49, _data$WaterConnection55, _data$WaterConnection56, _data$SewerageConnect50, _data$SewerageConnect51, _data$WaterConnection57, _data$WaterConnection58, _data$SewerageConnect52, _data$SewerageConnect53, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect54, _data$SewerageConnect55, _data$WaterConnection61, _data$WaterConnection62, _data$SewerageConnect56, _data$SewerageConnect57, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect58, _data$SewerageConnect59, _data$WaterConnection65, _data$WaterConnection66, _data$SewerageConnect60, _data$SewerageConnect61, _data$WaterConnection67, _data$WaterConnection68, _data$WaterConnection69, _data$WaterConnection70, _data$SewerageConnect62, _data$SewerageConnect63, _data$SewerageConnect64, _data$SewerageConnect65, _connectionDetails$se, _connectionDetails$se2, _connectionDetails$co, _connectionDetails$co2, _connectionDetails$wa, _connectionDetails$wa2, _connectionDetails$ap, _connectionDetails$ap2, _connectionDetails$do, _connectionDetails$do2, _connectionDetails$do3, _connectionDetails$de, _connectionDetails$de2, _data$WaterConnection71, _data$WaterConnection72, _data$WaterConnection73, _data$SewerageConnect66, _data$SewerageConnect67, _data$SewerageConnect68, _data$WaterConnection74, _data$WaterConnection75, _data$WaterConnection76, _data$WaterConnection77, _data$SewerageConnect69, _data$SewerageConnect70, _data$SewerageConnect71, _data$SewerageConnect72, _data$WaterConnection78, _data$WaterConnection79, _data$WaterConnection80, _data$WaterConnection81, _data$SewerageConnect73, _data$SewerageConnect74, _data$SewerageConnect75, _data$SewerageConnect76, _data$WaterConnection82, _data$WaterConnection83, _data$WaterConnection84, _data$WaterConnection85, _data$SewerageConnect77, _data$SewerageConnect78, _data$SewerageConnect79, _data$SewerageConnect80, _data$WaterConnection86, _data$WaterConnection87, _data$WaterConnection88, _data$WaterConnection89, _data$SewerageConnect81, _data$SewerageConnect82, _data$SewerageConnect83, _data$SewerageConnect84, _data$WaterConnection90, _data$WaterConnection91, _data$WaterConnection92, _data$WaterConnection93, _data$SewerageConnect85, _data$SewerageConnect86, _data$SewerageConnect87, _data$SewerageConnect88, _data$WaterConnection94, _data$WaterConnection95, _data$WaterConnection96, _data$WaterConnection97, _data$SewerageConnect89, _data$SewerageConnect90, _data$SewerageConnect91, _data$SewerageConnect92, _data$WaterConnection98, _data$WaterConnection99, _data$WaterConnection100, _data$WaterConnection101, _data$SewerageConnect93, _data$SewerageConnect94, _data$SewerageConnect95, _data$SewerageConnect96, _data$WaterConnection102, _data$WaterConnection103, _data$WaterConnection104, _data$WaterConnection105, _data$SewerageConnect97, _data$SewerageConnect98, _data$SewerageConnect99, _data$SewerageConnect100, _data$WaterConnection106, _data$WaterConnection107, _data$WaterConnection108, _data$WaterConnection109, _data$SewerageConnect101, _data$SewerageConnect102, _data$SewerageConnect103, _data$SewerageConnect104, _data$WaterConnection110, _data$WaterConnection111, _data$WaterConnection112, _data$WaterConnection113, _data$SewerageConnect105, _data$SewerageConnect106, _data$SewerageConnect107, _data$SewerageConnect108, _data$WaterConnection114, _data$WaterConnection115, _data$WaterConnection116, _data$WaterConnection117, _data$SewerageConnect109, _data$SewerageConnect110, _data$SewerageConnect111, _data$SewerageConnect112, _data$WaterConnection118, _data$WaterConnection119, _data$WaterConnection120, _data$WaterConnection121, _data$SewerageConnect113, _data$SewerageConnect114, _data$SewerageConnect115, _data$SewerageConnect116, _data$WaterConnection122, _data$WaterConnection123, _data$WaterConnection124, _data$WaterConnection125, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$SewerageConnect120, _data$WaterConnection126, _data$WaterConnection127, _data$WaterConnection128, _data$WaterConnection129, _data$SewerageConnect121, _data$SewerageConnect122, _data$SewerageConnect123, _data$SewerageConnect124, _data$WaterConnection130, _data$WaterConnection131, _data$WaterConnection132, _data$WaterConnection133, _data$SewerageConnect125, _data$SewerageConnect126, _data$SewerageConnect127, _data$SewerageConnect128, _data$WaterConnection134, _data$WaterConnection135, _data$SewerageConnect129, _data$SewerageConnect130, _PTData$Properties5, _PTData$Properties5$, _PTData$Properties5$$, _PTData$Properties5$$2, _PTData$Properties6, _PTData$Properties6$, _PTData$Properties7, _PTData$Properties7$, _PTData$Properties7$$, _PTData$Properties7$$2, _PTData$Properties8, _PTData$Properties8$, _data$WaterConnection136, _data$WaterConnection137, _data$SewerageConnect131, _data$SewerageConnect132, _data$WaterConnection138, _data$WaterConnection139, _data$SewerageConnect133, _data$SewerageConnect134, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _propertyAddress$zone3, _propertyAddress$zone4, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _propertyAdditionalDe, _propertyAdditionalDe2, _PTData$Properties9, _PTData$Properties9$, _useDetails$propertyT, _useDetails$propertyT2, _propertyAdditionalDe3, _propertyAdditionalDe4, _PTData$Properties0, _PTData$Properties0$, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _propertyAdditionalDe5, _propertyAdditionalDe6, _useDetails$noOfFloor, _useDetails$noOfFloor2, _PTData$Properties1, _PTData$Properties1$, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$WaterConnection143, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _data$SewerageConnect138, _data$WaterConnection146, _data$WaterConnection147, _data$WaterConnection148, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$SewerageConnect141, _data$SewerageConnect142, _data$SewerageConnect143, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _data$WaterConnection152, _data$WaterConnection153, _data$SewerageConnect147, _data$SewerageConnect148, _data$WaterConnection154, _data$WaterConnection155, _data$WaterConnection156, _data$SewerageConnect149, _data$SewerageConnect150, _data$SewerageConnect151, _PTData$Properties10, _PTData$Properties10$, _PTData$Properties10$2, _paymentDetails$data5, _paymentDetails$data6, _paymentDetails$data7, _data$WaterConnection157, _data$WaterConnection158, _data$WaterConnection159, _data$WaterConnection160, _data$SewerageConnect152, _data$SewerageConnect153, _data$SewerageConnect154, _data$SewerageConnect155, _data$WaterConnection161, _data$WaterConnection162, _data$SewerageConnect156, _data$SewerageConnect157, _data$WaterConnection163, _data$WaterConnection164, _data$SewerageConnect158, _data$SewerageConnect159, _data$WaterConnection165, _data$WaterConnection166, _data$SewerageConnect160, _data$SewerageConnect161, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection170, _data$WaterConnection171, _data$SewerageConnect164, _data$SewerageConnect165, _data$WaterConnection172, _data$WaterConnection173, _data$WaterConnection174, _data$WaterConnection175, _data$SewerageConnect166, _data$SewerageConnect167, _data$SewerageConnect168, _data$SewerageConnect169, _data$WaterConnection176, _data$WaterConnection177, _data$SewerageConnect170, _data$SewerageConnect171, _data$SewerageConnect172, _data$SewerageConnect173, _data$SewerageConnect174, _data$SewerageConnect175, _data$SewerageConnect176, _data$SewerageConnect177, _data$SewerageConnect178, _data$SewerageConnect179, _data$SewerageConnect180, _data$WaterConnection178, _data$WaterConnection179, _data$WaterConnection180, _data$WaterConnection181, _data$WaterConnection182, _data$WaterConnection183, _data$WaterConnection184, _data$WaterConnection185, _data$WaterConnection186;
   const getDisconnectionNoticeSearch = function () {
     try {
-      var _data$WaterConnection180, _data$WaterConnection181, _data$SewerageConnect174, _data$SewerageConnect175;
+      var _data$WaterConnection188, _data$WaterConnection189, _data$SewerageConnect182, _data$SewerageConnect183;
       let key = "ws-waterdisconnectionnotice";
       let details = {};
       if (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS")) {
-        var _data$WaterConnection179, _PTData$Properties9;
+        var _data$WaterConnection187, _PTData$Properties11;
         details = {
-          WaterConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$WaterConnection179 = data.WaterConnection) === null || _data$WaterConnection179 === void 0 ? void 0 : _data$WaterConnection179[0], {
-            property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties9 = PTData.Properties) === null || _PTData$Properties9 === void 0 ? void 0 : _PTData$Properties9[0]
+          WaterConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$WaterConnection187 = data.WaterConnection) === null || _data$WaterConnection187 === void 0 ? void 0 : _data$WaterConnection187[0], {
+            property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties11 = PTData.Properties) === null || _PTData$Properties11 === void 0 ? void 0 : _PTData$Properties11[0]
           })]
         };
       } else {
-        var _data$SewerageConnect173, _PTData$Properties0;
+        var _data$SewerageConnect181, _PTData$Properties12;
         key = "ws-seweragedisconnectionnotice";
         details = {
-          SewerageConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$SewerageConnect173 = data.SewerageConnections) === null || _data$SewerageConnect173 === void 0 ? void 0 : _data$SewerageConnect173[0], {
-            property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties0 = PTData.Properties) === null || _PTData$Properties0 === void 0 ? void 0 : _PTData$Properties0[0]
+          SewerageConnection: [_extends({}, data === null || data === void 0 ? void 0 : (_data$SewerageConnect181 = data.SewerageConnections) === null || _data$SewerageConnect181 === void 0 ? void 0 : _data$SewerageConnect181[0], {
+            property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties12 = PTData.Properties) === null || _PTData$Properties12 === void 0 ? void 0 : _PTData$Properties12[0]
           })]
         };
       }
-      return Promise.resolve(Digit.WSService.WSDisconnectionNotice((data === null || data === void 0 ? void 0 : (_data$WaterConnection180 = data.WaterConnection) === null || _data$WaterConnection180 === void 0 ? void 0 : (_data$WaterConnection181 = _data$WaterConnection180[0]) === null || _data$WaterConnection181 === void 0 ? void 0 : _data$WaterConnection181.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect174 = data.SewerageConnections) === null || _data$SewerageConnect174 === void 0 ? void 0 : (_data$SewerageConnect175 = _data$SewerageConnect174[0]) === null || _data$SewerageConnect175 === void 0 ? void 0 : _data$SewerageConnect175.tenantId), details, key)).then(function (response) {
-        var _data$WaterConnection182, _data$WaterConnection183, _data$SewerageConnect176, _data$SewerageConnect177;
-        return Promise.resolve(Digit.PaymentService.printReciept((data === null || data === void 0 ? void 0 : (_data$WaterConnection182 = data.WaterConnection) === null || _data$WaterConnection182 === void 0 ? void 0 : (_data$WaterConnection183 = _data$WaterConnection182[0]) === null || _data$WaterConnection183 === void 0 ? void 0 : _data$WaterConnection183.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect176 = data.SewerageConnections) === null || _data$SewerageConnect176 === void 0 ? void 0 : (_data$SewerageConnect177 = _data$SewerageConnect176[0]) === null || _data$SewerageConnect177 === void 0 ? void 0 : _data$SewerageConnect177.tenantId), {
+      return Promise.resolve(Digit.WSService.WSDisconnectionNotice((data === null || data === void 0 ? void 0 : (_data$WaterConnection188 = data.WaterConnection) === null || _data$WaterConnection188 === void 0 ? void 0 : (_data$WaterConnection189 = _data$WaterConnection188[0]) === null || _data$WaterConnection189 === void 0 ? void 0 : _data$WaterConnection189.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect182 = data.SewerageConnections) === null || _data$SewerageConnect182 === void 0 ? void 0 : (_data$SewerageConnect183 = _data$SewerageConnect182[0]) === null || _data$SewerageConnect183 === void 0 ? void 0 : _data$SewerageConnect183.tenantId), details, key)).then(function (response) {
+        var _data$WaterConnection190, _data$WaterConnection191, _data$SewerageConnect184, _data$SewerageConnect185;
+        return Promise.resolve(Digit.PaymentService.printReciept((data === null || data === void 0 ? void 0 : (_data$WaterConnection190 = data.WaterConnection) === null || _data$WaterConnection190 === void 0 ? void 0 : (_data$WaterConnection191 = _data$WaterConnection190[0]) === null || _data$WaterConnection191 === void 0 ? void 0 : _data$WaterConnection191.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect184 = data.SewerageConnections) === null || _data$SewerageConnect184 === void 0 ? void 0 : (_data$SewerageConnect185 = _data$SewerageConnect184[0]) === null || _data$SewerageConnect185 === void 0 ? void 0 : _data$SewerageConnect185.tenantId), {
           fileStoreIds: response.filestoreIds[0]
         })).then(function (fileStore) {
           window.open(fileStore[response === null || response === void 0 ? void 0 : response.filestoreIds[0]], "_blank");
@@ -32529,9 +32741,10 @@ const WSApplicationDetails = () => {
   const additionalDetails = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.additionalDetails) || {};
   const connectionDetails = additionalDetails;
   const useDetails = additionalDetails;
+  const propertyAdditionalDetails = (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties = PTData.Properties) === null || _PTData$Properties === void 0 ? void 0 : (_PTData$Properties$ = _PTData$Properties[0]) === null || _PTData$Properties$ === void 0 ? void 0 : _PTData$Properties$.additionalDetails) || {};
   const djbEmployee = additionalDetails;
   const bankDetails = additionalDetails;
-  const propertyAddress = (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties = PTData.Properties) === null || _PTData$Properties === void 0 ? void 0 : (_PTData$Properties$ = _PTData$Properties[0]) === null || _PTData$Properties$ === void 0 ? void 0 : _PTData$Properties$.address) || additionalDetails;
+  const propertyAddress = (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties2 = PTData.Properties) === null || _PTData$Properties2 === void 0 ? void 0 : (_PTData$Properties2$ = _PTData$Properties2[0]) === null || _PTData$Properties2$ === void 0 ? void 0 : _PTData$Properties2$.address) || additionalDetails;
   const checkifPrivacyenabled = Digit.Hooks.ws.useToCheckPrivacyEnablement({
     privacy: {
       uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection13 = data.WaterConnection) === null || _data$WaterConnection13 === void 0 ? void 0 : (_data$WaterConnection14 = _data$WaterConnection13[0]) === null || _data$WaterConnection14 === void 0 ? void 0 : (_data$WaterConnection15 = _data$WaterConnection14.connectionHolders) === null || _data$WaterConnection15 === void 0 ? void 0 : (_data$WaterConnection16 = _data$WaterConnection15[0]) === null || _data$WaterConnection16 === void 0 ? void 0 : _data$WaterConnection16.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect13 = data.SewerageConnections) === null || _data$SewerageConnect13 === void 0 ? void 0 : (_data$SewerageConnect14 = _data$SewerageConnect13[0]) === null || _data$SewerageConnect14 === void 0 ? void 0 : (_data$SewerageConnect15 = _data$SewerageConnect14.connectionHolders) === null || _data$SewerageConnect15 === void 0 ? void 0 : (_data$SewerageConnect16 = _data$SewerageConnect15[0]) === null || _data$SewerageConnect16 === void 0 ? void 0 : _data$SewerageConnect16.uuid,
@@ -32553,10 +32766,10 @@ const WSApplicationDetails = () => {
   }
   const handleDownloadPdf = function () {
     try {
-      var _data$WaterConnection19, _data$WaterConnection20, _data$SewerageConnect19, _data$SewerageConnect20, _data$WaterConnection21, _data$SewerageConnect21, _PTData$Properties2;
+      var _data$WaterConnection19, _data$WaterConnection20, _data$SewerageConnect19, _data$SewerageConnect20, _data$WaterConnection21, _data$SewerageConnect21, _PTData$Properties3;
       const tenantInfo = (data === null || data === void 0 ? void 0 : (_data$WaterConnection19 = data.WaterConnection) === null || _data$WaterConnection19 === void 0 ? void 0 : (_data$WaterConnection20 = _data$WaterConnection19[0]) === null || _data$WaterConnection20 === void 0 ? void 0 : _data$WaterConnection20.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect19 = data.SewerageConnections) === null || _data$SewerageConnect19 === void 0 ? void 0 : (_data$SewerageConnect20 = _data$SewerageConnect19[0]) === null || _data$SewerageConnect20 === void 0 ? void 0 : _data$SewerageConnect20.tenantId);
       let res = (data === null || data === void 0 ? void 0 : (_data$WaterConnection21 = data.WaterConnection) === null || _data$WaterConnection21 === void 0 ? void 0 : _data$WaterConnection21[0]) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect21 = data.SewerageConnections) === null || _data$SewerageConnect21 === void 0 ? void 0 : _data$SewerageConnect21[0]);
-      const PDFdata = getWSAcknowledgementData(_extends({}, res), _extends({}, PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties2 = PTData.Properties) === null || _PTData$Properties2 === void 0 ? void 0 : _PTData$Properties2[0]), tenantInfo, t);
+      const PDFdata = getWSAcknowledgementData(_extends({}, res), _extends({}, PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties3 = PTData.Properties) === null || _PTData$Properties3 === void 0 ? void 0 : _PTData$Properties3[0]), tenantInfo, t);
       PDFdata.then(ress => Digit.Utils.pdf.generatev1(ress));
       setShowOptions(false);
       return Promise.resolve();
@@ -32566,10 +32779,10 @@ const WSApplicationDetails = () => {
   };
   const handleDownloadDisconnectPdf = function () {
     try {
-      var _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection24, _data$SewerageConnect24, _PTData$Properties3;
+      var _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection24, _data$SewerageConnect24, _PTData$Properties4;
       const tenantInfo = (data === null || data === void 0 ? void 0 : (_data$WaterConnection22 = data.WaterConnection) === null || _data$WaterConnection22 === void 0 ? void 0 : (_data$WaterConnection23 = _data$WaterConnection22[0]) === null || _data$WaterConnection23 === void 0 ? void 0 : _data$WaterConnection23.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect22 = data.SewerageConnections) === null || _data$SewerageConnect22 === void 0 ? void 0 : (_data$SewerageConnect23 = _data$SewerageConnect22[0]) === null || _data$SewerageConnect23 === void 0 ? void 0 : _data$SewerageConnect23.tenantId);
       let res = (data === null || data === void 0 ? void 0 : (_data$WaterConnection24 = data.WaterConnection) === null || _data$WaterConnection24 === void 0 ? void 0 : _data$WaterConnection24[0]) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect24 = data.SewerageConnections) === null || _data$SewerageConnect24 === void 0 ? void 0 : _data$SewerageConnect24[0]);
-      const PDFdata = getWSDisconnectionApplicationForm(_extends({}, res), _extends({}, PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties3 = PTData.Properties) === null || _PTData$Properties3 === void 0 ? void 0 : _PTData$Properties3[0]), tenantInfo, t);
+      const PDFdata = getWSDisconnectionApplicationForm(_extends({}, res), _extends({}, PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties4 = PTData.Properties) === null || _PTData$Properties4 === void 0 ? void 0 : _PTData$Properties4[0]), tenantInfo, t);
       PDFdata.then(ress => Digit.Utils.pdf.generatev1(ress));
       setShowOptions(false);
       return Promise.resolve();
@@ -32847,14 +33060,26 @@ const WSApplicationDetails = () => {
     textStyle: {
       whiteSpace: "pre"
     }
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_OWN_DETAIL_MIDDLE_NAME"),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection86 = data.WaterConnection) === null || _data$WaterConnection86 === void 0 ? void 0 : (_data$WaterConnection87 = _data$WaterConnection86[0]) === null || _data$WaterConnection87 === void 0 ? void 0 : (_data$WaterConnection88 = _data$WaterConnection87.connectionHolders) === null || _data$WaterConnection88 === void 0 ? void 0 : (_data$WaterConnection89 = _data$WaterConnection88[0]) === null || _data$WaterConnection89 === void 0 ? void 0 : _data$WaterConnection89.middleName) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect81 = data.SewerageConnections) === null || _data$SewerageConnect81 === void 0 ? void 0 : (_data$SewerageConnect82 = _data$SewerageConnect81[0]) === null || _data$SewerageConnect82 === void 0 ? void 0 : (_data$SewerageConnect83 = _data$SewerageConnect82.connectionHolders) === null || _data$SewerageConnect83 === void 0 ? void 0 : (_data$SewerageConnect84 = _data$SewerageConnect83[0]) === null || _data$SewerageConnect84 === void 0 ? void 0 : _data$SewerageConnect84.middleName),
+    textStyle: {
+      whiteSpace: "pre"
+    }
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: t("WS_OWN_DETAIL_LAST_NAME"),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection90 = data.WaterConnection) === null || _data$WaterConnection90 === void 0 ? void 0 : (_data$WaterConnection91 = _data$WaterConnection90[0]) === null || _data$WaterConnection91 === void 0 ? void 0 : (_data$WaterConnection92 = _data$WaterConnection91.connectionHolders) === null || _data$WaterConnection92 === void 0 ? void 0 : (_data$WaterConnection93 = _data$WaterConnection92[0]) === null || _data$WaterConnection93 === void 0 ? void 0 : _data$WaterConnection93.lastName) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect85 = data.SewerageConnections) === null || _data$SewerageConnect85 === void 0 ? void 0 : (_data$SewerageConnect86 = _data$SewerageConnect85[0]) === null || _data$SewerageConnect86 === void 0 ? void 0 : (_data$SewerageConnect87 = _data$SewerageConnect86.connectionHolders) === null || _data$SewerageConnect87 === void 0 ? void 0 : (_data$SewerageConnect88 = _data$SewerageConnect87[0]) === null || _data$SewerageConnect88 === void 0 ? void 0 : _data$SewerageConnect88.lastName),
+    textStyle: {
+      whiteSpace: "pre"
+    }
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_OWN_DETAIL_GENDER_LABEL"),
-    text: t((data === null || data === void 0 ? void 0 : (_data$WaterConnection86 = data.WaterConnection) === null || _data$WaterConnection86 === void 0 ? void 0 : (_data$WaterConnection87 = _data$WaterConnection86[0]) === null || _data$WaterConnection87 === void 0 ? void 0 : (_data$WaterConnection88 = _data$WaterConnection87.connectionHolders) === null || _data$WaterConnection88 === void 0 ? void 0 : (_data$WaterConnection89 = _data$WaterConnection88[0]) === null || _data$WaterConnection89 === void 0 ? void 0 : _data$WaterConnection89.gender) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect81 = data.SewerageConnections) === null || _data$SewerageConnect81 === void 0 ? void 0 : (_data$SewerageConnect82 = _data$SewerageConnect81[0]) === null || _data$SewerageConnect82 === void 0 ? void 0 : (_data$SewerageConnect83 = _data$SewerageConnect82.connectionHolders) === null || _data$SewerageConnect83 === void 0 ? void 0 : (_data$SewerageConnect84 = _data$SewerageConnect83[0]) === null || _data$SewerageConnect84 === void 0 ? void 0 : _data$SewerageConnect84.gender)),
+    text: t((data === null || data === void 0 ? void 0 : (_data$WaterConnection94 = data.WaterConnection) === null || _data$WaterConnection94 === void 0 ? void 0 : (_data$WaterConnection95 = _data$WaterConnection94[0]) === null || _data$WaterConnection95 === void 0 ? void 0 : (_data$WaterConnection96 = _data$WaterConnection95.connectionHolders) === null || _data$WaterConnection96 === void 0 ? void 0 : (_data$WaterConnection97 = _data$WaterConnection96[0]) === null || _data$WaterConnection97 === void 0 ? void 0 : _data$WaterConnection97.gender) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect89 = data.SewerageConnections) === null || _data$SewerageConnect89 === void 0 ? void 0 : (_data$SewerageConnect90 = _data$SewerageConnect89[0]) === null || _data$SewerageConnect90 === void 0 ? void 0 : (_data$SewerageConnect91 = _data$SewerageConnect90.connectionHolders) === null || _data$SewerageConnect91 === void 0 ? void 0 : (_data$SewerageConnect92 = _data$SewerageConnect91[0]) === null || _data$SewerageConnect92 === void 0 ? void 0 : _data$SewerageConnect92.gender)),
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection90 = data.WaterConnection) === null || _data$WaterConnection90 === void 0 ? void 0 : (_data$WaterConnection91 = _data$WaterConnection90[0]) === null || _data$WaterConnection91 === void 0 ? void 0 : (_data$WaterConnection92 = _data$WaterConnection91.connectionHolders) === null || _data$WaterConnection92 === void 0 ? void 0 : (_data$WaterConnection93 = _data$WaterConnection92[0]) === null || _data$WaterConnection93 === void 0 ? void 0 : _data$WaterConnection93.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect85 = data.SewerageConnections) === null || _data$SewerageConnect85 === void 0 ? void 0 : (_data$SewerageConnect86 = _data$SewerageConnect85[0]) === null || _data$SewerageConnect86 === void 0 ? void 0 : (_data$SewerageConnect87 = _data$SewerageConnect86.connectionHolders) === null || _data$SewerageConnect87 === void 0 ? void 0 : (_data$SewerageConnect88 = _data$SewerageConnect87[0]) === null || _data$SewerageConnect88 === void 0 ? void 0 : _data$SewerageConnect88.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection98 = data.WaterConnection) === null || _data$WaterConnection98 === void 0 ? void 0 : (_data$WaterConnection99 = _data$WaterConnection98[0]) === null || _data$WaterConnection99 === void 0 ? void 0 : (_data$WaterConnection100 = _data$WaterConnection99.connectionHolders) === null || _data$WaterConnection100 === void 0 ? void 0 : (_data$WaterConnection101 = _data$WaterConnection100[0]) === null || _data$WaterConnection101 === void 0 ? void 0 : _data$WaterConnection101.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect93 = data.SewerageConnections) === null || _data$SewerageConnect93 === void 0 ? void 0 : (_data$SewerageConnect94 = _data$SewerageConnect93[0]) === null || _data$SewerageConnect94 === void 0 ? void 0 : (_data$SewerageConnect95 = _data$SewerageConnect94.connectionHolders) === null || _data$SewerageConnect95 === void 0 ? void 0 : (_data$SewerageConnect96 = _data$SewerageConnect95[0]) === null || _data$SewerageConnect96 === void 0 ? void 0 : _data$SewerageConnect96.uuid,
       fieldName: "gender",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -32871,12 +33096,12 @@ const WSApplicationDetails = () => {
     }
   }), !isMutation && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_OWN_DETAIL_FATHER_OR_HUSBAND_NAME"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection94 = data.WaterConnection) === null || _data$WaterConnection94 === void 0 ? void 0 : (_data$WaterConnection95 = _data$WaterConnection94[0]) === null || _data$WaterConnection95 === void 0 ? void 0 : (_data$WaterConnection96 = _data$WaterConnection95.connectionHolders) === null || _data$WaterConnection96 === void 0 ? void 0 : (_data$WaterConnection97 = _data$WaterConnection96[0]) === null || _data$WaterConnection97 === void 0 ? void 0 : _data$WaterConnection97.fatherOrHusbandName) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect89 = data.SewerageConnections) === null || _data$SewerageConnect89 === void 0 ? void 0 : (_data$SewerageConnect90 = _data$SewerageConnect89[0]) === null || _data$SewerageConnect90 === void 0 ? void 0 : (_data$SewerageConnect91 = _data$SewerageConnect90.connectionHolders) === null || _data$SewerageConnect91 === void 0 ? void 0 : (_data$SewerageConnect92 = _data$SewerageConnect91[0]) === null || _data$SewerageConnect92 === void 0 ? void 0 : _data$SewerageConnect92.fatherOrHusbandName) || t("CS_NA"),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection102 = data.WaterConnection) === null || _data$WaterConnection102 === void 0 ? void 0 : (_data$WaterConnection103 = _data$WaterConnection102[0]) === null || _data$WaterConnection103 === void 0 ? void 0 : (_data$WaterConnection104 = _data$WaterConnection103.connectionHolders) === null || _data$WaterConnection104 === void 0 ? void 0 : (_data$WaterConnection105 = _data$WaterConnection104[0]) === null || _data$WaterConnection105 === void 0 ? void 0 : _data$WaterConnection105.fatherOrHusbandName) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect97 = data.SewerageConnections) === null || _data$SewerageConnect97 === void 0 ? void 0 : (_data$SewerageConnect98 = _data$SewerageConnect97[0]) === null || _data$SewerageConnect98 === void 0 ? void 0 : (_data$SewerageConnect99 = _data$SewerageConnect98.connectionHolders) === null || _data$SewerageConnect99 === void 0 ? void 0 : (_data$SewerageConnect100 = _data$SewerageConnect99[0]) === null || _data$SewerageConnect100 === void 0 ? void 0 : _data$SewerageConnect100.fatherOrHusbandName) || t("CS_NA"),
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection98 = data.WaterConnection) === null || _data$WaterConnection98 === void 0 ? void 0 : (_data$WaterConnection99 = _data$WaterConnection98[0]) === null || _data$WaterConnection99 === void 0 ? void 0 : (_data$WaterConnection100 = _data$WaterConnection99.connectionHolders) === null || _data$WaterConnection100 === void 0 ? void 0 : (_data$WaterConnection101 = _data$WaterConnection100[0]) === null || _data$WaterConnection101 === void 0 ? void 0 : _data$WaterConnection101.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect93 = data.SewerageConnections) === null || _data$SewerageConnect93 === void 0 ? void 0 : (_data$SewerageConnect94 = _data$SewerageConnect93[0]) === null || _data$SewerageConnect94 === void 0 ? void 0 : (_data$SewerageConnect95 = _data$SewerageConnect94.connectionHolders) === null || _data$SewerageConnect95 === void 0 ? void 0 : (_data$SewerageConnect96 = _data$SewerageConnect95[0]) === null || _data$SewerageConnect96 === void 0 ? void 0 : _data$SewerageConnect96.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection106 = data.WaterConnection) === null || _data$WaterConnection106 === void 0 ? void 0 : (_data$WaterConnection107 = _data$WaterConnection106[0]) === null || _data$WaterConnection107 === void 0 ? void 0 : (_data$WaterConnection108 = _data$WaterConnection107.connectionHolders) === null || _data$WaterConnection108 === void 0 ? void 0 : (_data$WaterConnection109 = _data$WaterConnection108[0]) === null || _data$WaterConnection109 === void 0 ? void 0 : _data$WaterConnection109.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect101 = data.SewerageConnections) === null || _data$SewerageConnect101 === void 0 ? void 0 : (_data$SewerageConnect102 = _data$SewerageConnect101[0]) === null || _data$SewerageConnect102 === void 0 ? void 0 : (_data$SewerageConnect103 = _data$SewerageConnect102.connectionHolders) === null || _data$SewerageConnect103 === void 0 ? void 0 : (_data$SewerageConnect104 = _data$SewerageConnect103[0]) === null || _data$SewerageConnect104 === void 0 ? void 0 : _data$SewerageConnect104.uuid,
       fieldName: "fatherOrHusbandName",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -32893,12 +33118,12 @@ const WSApplicationDetails = () => {
     }
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_OWN_DETAIL_RELATION_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection102 = data.WaterConnection) === null || _data$WaterConnection102 === void 0 ? void 0 : (_data$WaterConnection103 = _data$WaterConnection102[0]) === null || _data$WaterConnection103 === void 0 ? void 0 : (_data$WaterConnection104 = _data$WaterConnection103.connectionHolders) === null || _data$WaterConnection104 === void 0 ? void 0 : (_data$WaterConnection105 = _data$WaterConnection104[0]) === null || _data$WaterConnection105 === void 0 ? void 0 : _data$WaterConnection105.relationship) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect97 = data.SewerageConnections) === null || _data$SewerageConnect97 === void 0 ? void 0 : (_data$SewerageConnect98 = _data$SewerageConnect97[0]) === null || _data$SewerageConnect98 === void 0 ? void 0 : (_data$SewerageConnect99 = _data$SewerageConnect98.connectionHolders) === null || _data$SewerageConnect99 === void 0 ? void 0 : (_data$SewerageConnect100 = _data$SewerageConnect99[0]) === null || _data$SewerageConnect100 === void 0 ? void 0 : _data$SewerageConnect100.relationship) || t("CS_NA"),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection110 = data.WaterConnection) === null || _data$WaterConnection110 === void 0 ? void 0 : (_data$WaterConnection111 = _data$WaterConnection110[0]) === null || _data$WaterConnection111 === void 0 ? void 0 : (_data$WaterConnection112 = _data$WaterConnection111.connectionHolders) === null || _data$WaterConnection112 === void 0 ? void 0 : (_data$WaterConnection113 = _data$WaterConnection112[0]) === null || _data$WaterConnection113 === void 0 ? void 0 : _data$WaterConnection113.relationship) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect105 = data.SewerageConnections) === null || _data$SewerageConnect105 === void 0 ? void 0 : (_data$SewerageConnect106 = _data$SewerageConnect105[0]) === null || _data$SewerageConnect106 === void 0 ? void 0 : (_data$SewerageConnect107 = _data$SewerageConnect106.connectionHolders) === null || _data$SewerageConnect107 === void 0 ? void 0 : (_data$SewerageConnect108 = _data$SewerageConnect107[0]) === null || _data$SewerageConnect108 === void 0 ? void 0 : _data$SewerageConnect108.relationship) || t("CS_NA"),
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection106 = data.WaterConnection) === null || _data$WaterConnection106 === void 0 ? void 0 : (_data$WaterConnection107 = _data$WaterConnection106[0]) === null || _data$WaterConnection107 === void 0 ? void 0 : (_data$WaterConnection108 = _data$WaterConnection107.connectionHolders) === null || _data$WaterConnection108 === void 0 ? void 0 : (_data$WaterConnection109 = _data$WaterConnection108[0]) === null || _data$WaterConnection109 === void 0 ? void 0 : _data$WaterConnection109.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect101 = data.SewerageConnections) === null || _data$SewerageConnect101 === void 0 ? void 0 : (_data$SewerageConnect102 = _data$SewerageConnect101[0]) === null || _data$SewerageConnect102 === void 0 ? void 0 : (_data$SewerageConnect103 = _data$SewerageConnect102.connectionHolders) === null || _data$SewerageConnect103 === void 0 ? void 0 : (_data$SewerageConnect104 = _data$SewerageConnect103[0]) === null || _data$SewerageConnect104 === void 0 ? void 0 : _data$SewerageConnect104.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection114 = data.WaterConnection) === null || _data$WaterConnection114 === void 0 ? void 0 : (_data$WaterConnection115 = _data$WaterConnection114[0]) === null || _data$WaterConnection115 === void 0 ? void 0 : (_data$WaterConnection116 = _data$WaterConnection115.connectionHolders) === null || _data$WaterConnection116 === void 0 ? void 0 : (_data$WaterConnection117 = _data$WaterConnection116[0]) === null || _data$WaterConnection117 === void 0 ? void 0 : _data$WaterConnection117.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect109 = data.SewerageConnections) === null || _data$SewerageConnect109 === void 0 ? void 0 : (_data$SewerageConnect110 = _data$SewerageConnect109[0]) === null || _data$SewerageConnect110 === void 0 ? void 0 : (_data$SewerageConnect111 = _data$SewerageConnect110.connectionHolders) === null || _data$SewerageConnect111 === void 0 ? void 0 : (_data$SewerageConnect112 = _data$SewerageConnect111[0]) === null || _data$SewerageConnect112 === void 0 ? void 0 : _data$SewerageConnect112.uuid,
       fieldName: "relationship",
       model: "WnSConnection",
       showValue: false,
@@ -32915,9 +33140,9 @@ const WSApplicationDetails = () => {
     }
   })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_OWN_DETAIL_CROSADD"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection110 = data.WaterConnection) === null || _data$WaterConnection110 === void 0 ? void 0 : (_data$WaterConnection111 = _data$WaterConnection110[0]) === null || _data$WaterConnection111 === void 0 ? void 0 : (_data$WaterConnection112 = _data$WaterConnection111.connectionHolders) === null || _data$WaterConnection112 === void 0 ? void 0 : (_data$WaterConnection113 = _data$WaterConnection112[0]) === null || _data$WaterConnection113 === void 0 ? void 0 : _data$WaterConnection113.correspondenceAddress) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect105 = data.SewerageConnections) === null || _data$SewerageConnect105 === void 0 ? void 0 : (_data$SewerageConnect106 = _data$SewerageConnect105[0]) === null || _data$SewerageConnect106 === void 0 ? void 0 : (_data$SewerageConnect107 = _data$SewerageConnect106.connectionHolders) === null || _data$SewerageConnect107 === void 0 ? void 0 : (_data$SewerageConnect108 = _data$SewerageConnect107[0]) === null || _data$SewerageConnect108 === void 0 ? void 0 : _data$SewerageConnect108.correspondenceAddress) || t("CS_NA"),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection118 = data.WaterConnection) === null || _data$WaterConnection118 === void 0 ? void 0 : (_data$WaterConnection119 = _data$WaterConnection118[0]) === null || _data$WaterConnection119 === void 0 ? void 0 : (_data$WaterConnection120 = _data$WaterConnection119.connectionHolders) === null || _data$WaterConnection120 === void 0 ? void 0 : (_data$WaterConnection121 = _data$WaterConnection120[0]) === null || _data$WaterConnection121 === void 0 ? void 0 : _data$WaterConnection121.correspondenceAddress) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect113 = data.SewerageConnections) === null || _data$SewerageConnect113 === void 0 ? void 0 : (_data$SewerageConnect114 = _data$SewerageConnect113[0]) === null || _data$SewerageConnect114 === void 0 ? void 0 : (_data$SewerageConnect115 = _data$SewerageConnect114.connectionHolders) === null || _data$SewerageConnect115 === void 0 ? void 0 : (_data$SewerageConnect116 = _data$SewerageConnect115[0]) === null || _data$SewerageConnect116 === void 0 ? void 0 : _data$SewerageConnect116.correspondenceAddress) || t("CS_NA"),
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection114 = data.WaterConnection) === null || _data$WaterConnection114 === void 0 ? void 0 : (_data$WaterConnection115 = _data$WaterConnection114[0]) === null || _data$WaterConnection115 === void 0 ? void 0 : (_data$WaterConnection116 = _data$WaterConnection115.connectionHolders) === null || _data$WaterConnection116 === void 0 ? void 0 : (_data$WaterConnection117 = _data$WaterConnection116[0]) === null || _data$WaterConnection117 === void 0 ? void 0 : _data$WaterConnection117.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect109 = data.SewerageConnections) === null || _data$SewerageConnect109 === void 0 ? void 0 : (_data$SewerageConnect110 = _data$SewerageConnect109[0]) === null || _data$SewerageConnect110 === void 0 ? void 0 : (_data$SewerageConnect111 = _data$SewerageConnect110.connectionHolders) === null || _data$SewerageConnect111 === void 0 ? void 0 : (_data$SewerageConnect112 = _data$SewerageConnect111[0]) === null || _data$SewerageConnect112 === void 0 ? void 0 : _data$SewerageConnect112.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection122 = data.WaterConnection) === null || _data$WaterConnection122 === void 0 ? void 0 : (_data$WaterConnection123 = _data$WaterConnection122[0]) === null || _data$WaterConnection123 === void 0 ? void 0 : (_data$WaterConnection124 = _data$WaterConnection123.connectionHolders) === null || _data$WaterConnection124 === void 0 ? void 0 : (_data$WaterConnection125 = _data$WaterConnection124[0]) === null || _data$WaterConnection125 === void 0 ? void 0 : _data$WaterConnection125.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect117 = data.SewerageConnections) === null || _data$SewerageConnect117 === void 0 ? void 0 : (_data$SewerageConnect118 = _data$SewerageConnect117[0]) === null || _data$SewerageConnect118 === void 0 ? void 0 : (_data$SewerageConnect119 = _data$SewerageConnect118.connectionHolders) === null || _data$SewerageConnect119 === void 0 ? void 0 : (_data$SewerageConnect120 = _data$SewerageConnect119[0]) === null || _data$SewerageConnect120 === void 0 ? void 0 : _data$SewerageConnect120.uuid,
       fieldName: "correspondenceAddress",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -32934,12 +33159,12 @@ const WSApplicationDetails = () => {
     }
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_OWN_DETAIL_EMAIL_ID_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection118 = data.WaterConnection) === null || _data$WaterConnection118 === void 0 ? void 0 : (_data$WaterConnection119 = _data$WaterConnection118[0]) === null || _data$WaterConnection119 === void 0 ? void 0 : (_data$WaterConnection120 = _data$WaterConnection119.connectionHolders) === null || _data$WaterConnection120 === void 0 ? void 0 : (_data$WaterConnection121 = _data$WaterConnection120[0]) === null || _data$WaterConnection121 === void 0 ? void 0 : _data$WaterConnection121.emailId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect113 = data.SewerageConnections) === null || _data$SewerageConnect113 === void 0 ? void 0 : (_data$SewerageConnect114 = _data$SewerageConnect113[0]) === null || _data$SewerageConnect114 === void 0 ? void 0 : (_data$SewerageConnect115 = _data$SewerageConnect114.connectionHolders) === null || _data$SewerageConnect115 === void 0 ? void 0 : (_data$SewerageConnect116 = _data$SewerageConnect115[0]) === null || _data$SewerageConnect116 === void 0 ? void 0 : _data$SewerageConnect116.emailId) || "NA",
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection126 = data.WaterConnection) === null || _data$WaterConnection126 === void 0 ? void 0 : (_data$WaterConnection127 = _data$WaterConnection126[0]) === null || _data$WaterConnection127 === void 0 ? void 0 : (_data$WaterConnection128 = _data$WaterConnection127.connectionHolders) === null || _data$WaterConnection128 === void 0 ? void 0 : (_data$WaterConnection129 = _data$WaterConnection128[0]) === null || _data$WaterConnection129 === void 0 ? void 0 : _data$WaterConnection129.emailId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect121 = data.SewerageConnections) === null || _data$SewerageConnect121 === void 0 ? void 0 : (_data$SewerageConnect122 = _data$SewerageConnect121[0]) === null || _data$SewerageConnect122 === void 0 ? void 0 : (_data$SewerageConnect123 = _data$SewerageConnect122.connectionHolders) === null || _data$SewerageConnect123 === void 0 ? void 0 : (_data$SewerageConnect124 = _data$SewerageConnect123[0]) === null || _data$SewerageConnect124 === void 0 ? void 0 : _data$SewerageConnect124.emailId) || "NA",
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection122 = data.WaterConnection) === null || _data$WaterConnection122 === void 0 ? void 0 : (_data$WaterConnection123 = _data$WaterConnection122[0]) === null || _data$WaterConnection123 === void 0 ? void 0 : (_data$WaterConnection124 = _data$WaterConnection123.connectionHolders) === null || _data$WaterConnection124 === void 0 ? void 0 : (_data$WaterConnection125 = _data$WaterConnection124[0]) === null || _data$WaterConnection125 === void 0 ? void 0 : _data$WaterConnection125.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect117 = data.SewerageConnections) === null || _data$SewerageConnect117 === void 0 ? void 0 : (_data$SewerageConnect118 = _data$SewerageConnect117[0]) === null || _data$SewerageConnect118 === void 0 ? void 0 : (_data$SewerageConnect119 = _data$SewerageConnect118.connectionHolders) === null || _data$SewerageConnect119 === void 0 ? void 0 : (_data$SewerageConnect120 = _data$SewerageConnect119[0]) === null || _data$SewerageConnect120 === void 0 ? void 0 : _data$SewerageConnect120.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection130 = data.WaterConnection) === null || _data$WaterConnection130 === void 0 ? void 0 : (_data$WaterConnection131 = _data$WaterConnection130[0]) === null || _data$WaterConnection131 === void 0 ? void 0 : (_data$WaterConnection132 = _data$WaterConnection131.connectionHolders) === null || _data$WaterConnection132 === void 0 ? void 0 : (_data$WaterConnection133 = _data$WaterConnection132[0]) === null || _data$WaterConnection133 === void 0 ? void 0 : _data$WaterConnection133.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect125 = data.SewerageConnections) === null || _data$SewerageConnect125 === void 0 ? void 0 : (_data$SewerageConnect126 = _data$SewerageConnect125[0]) === null || _data$SewerageConnect126 === void 0 ? void 0 : (_data$SewerageConnect127 = _data$SewerageConnect126.connectionHolders) === null || _data$SewerageConnect127 === void 0 ? void 0 : (_data$SewerageConnect128 = _data$SewerageConnect127[0]) === null || _data$SewerageConnect128 === void 0 ? void 0 : _data$SewerageConnect128.uuid,
       fieldName: "connectionHoldersEmailId",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -32960,30 +33185,30 @@ const WSApplicationDetails = () => {
     }
   }, t("WS_COMMON_PROPERTY_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_PROPERTY_ID_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection126 = data.WaterConnection) === null || _data$WaterConnection126 === void 0 ? void 0 : (_data$WaterConnection127 = _data$WaterConnection126[0]) === null || _data$WaterConnection127 === void 0 ? void 0 : _data$WaterConnection127.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect121 = data.SewerageConnections) === null || _data$SewerageConnect121 === void 0 ? void 0 : (_data$SewerageConnect122 = _data$SewerageConnect121[0]) === null || _data$SewerageConnect122 === void 0 ? void 0 : _data$SewerageConnect122.propertyId),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection134 = data.WaterConnection) === null || _data$WaterConnection134 === void 0 ? void 0 : (_data$WaterConnection135 = _data$WaterConnection134[0]) === null || _data$WaterConnection135 === void 0 ? void 0 : _data$WaterConnection135.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect129 = data.SewerageConnections) === null || _data$SewerageConnect129 === void 0 ? void 0 : (_data$SewerageConnect130 = _data$SewerageConnect129[0]) === null || _data$SewerageConnect130 === void 0 ? void 0 : _data$SewerageConnect130.propertyId),
     textStyle: {
       wordBreak: "break-word"
     }
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_OWN_DETAIL_OWN_NAME_LABEL"),
-    text: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties4 = PTData.Properties) === null || _PTData$Properties4 === void 0 ? void 0 : (_PTData$Properties4$ = _PTData$Properties4[0]) === null || _PTData$Properties4$ === void 0 ? void 0 : (_PTData$Properties4$$ = _PTData$Properties4$.owners.sort((a, b) => {
+    text: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties5 = PTData.Properties) === null || _PTData$Properties5 === void 0 ? void 0 : (_PTData$Properties5$ = _PTData$Properties5[0]) === null || _PTData$Properties5$ === void 0 ? void 0 : (_PTData$Properties5$$ = _PTData$Properties5$.owners.sort((a, b) => {
       var _a$additionalDetails, _b$additionalDetails;
       return (a === null || a === void 0 ? void 0 : (_a$additionalDetails = a.additionalDetails) === null || _a$additionalDetails === void 0 ? void 0 : _a$additionalDetails.ownerSequence) - (b === null || b === void 0 ? void 0 : (_b$additionalDetails = b.additionalDetails) === null || _b$additionalDetails === void 0 ? void 0 : _b$additionalDetails.ownerSequence);
-    })) === null || _PTData$Properties4$$ === void 0 ? void 0 : (_PTData$Properties4$$2 = _PTData$Properties4$$[0]) === null || _PTData$Properties4$$2 === void 0 ? void 0 : _PTData$Properties4$$2.name,
+    })) === null || _PTData$Properties5$$ === void 0 ? void 0 : (_PTData$Properties5$$2 = _PTData$Properties5$$[0]) === null || _PTData$Properties5$$2 === void 0 ? void 0 : _PTData$Properties5$$2.name,
     textStyle: {
       whiteSpace: "pre"
     }
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_PROPERTY_ADDRESS"),
-    text: getAddress(PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties5 = PTData.Properties) === null || _PTData$Properties5 === void 0 ? void 0 : (_PTData$Properties5$ = _PTData$Properties5[0]) === null || _PTData$Properties5$ === void 0 ? void 0 : _PTData$Properties5$.address, t) || t("CS_NA"),
+    text: getAddress(PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties6 = PTData.Properties) === null || _PTData$Properties6 === void 0 ? void 0 : (_PTData$Properties6$ = _PTData$Properties6[0]) === null || _PTData$Properties6$ === void 0 ? void 0 : _PTData$Properties6$.address, t) || t("CS_NA"),
     textStyle: {
       wordBreak: "break-word"
     },
     privacy: {
-      uuid: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties6 = PTData.Properties) === null || _PTData$Properties6 === void 0 ? void 0 : (_PTData$Properties6$ = _PTData$Properties6[0]) === null || _PTData$Properties6$ === void 0 ? void 0 : (_PTData$Properties6$$ = _PTData$Properties6$.owners) === null || _PTData$Properties6$$ === void 0 ? void 0 : (_PTData$Properties6$$2 = _PTData$Properties6$$[0]) === null || _PTData$Properties6$$2 === void 0 ? void 0 : _PTData$Properties6$$2.uuid,
+      uuid: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties7 = PTData.Properties) === null || _PTData$Properties7 === void 0 ? void 0 : (_PTData$Properties7$ = _PTData$Properties7[0]) === null || _PTData$Properties7$ === void 0 ? void 0 : (_PTData$Properties7$$ = _PTData$Properties7$.owners) === null || _PTData$Properties7$$ === void 0 ? void 0 : (_PTData$Properties7$$2 = _PTData$Properties7$$[0]) === null || _PTData$Properties7$$2 === void 0 ? void 0 : _PTData$Properties7$$2.uuid,
       fieldName: ["doorNo", "street", "landmark"],
       model: "Property",
-      hide: !(PTData !== null && PTData !== void 0 && (_PTData$Properties7 = PTData.Properties) !== null && _PTData$Properties7 !== void 0 && (_PTData$Properties7$ = _PTData$Properties7[0]) !== null && _PTData$Properties7$ !== void 0 && _PTData$Properties7$.address),
+      hide: !(PTData !== null && PTData !== void 0 && (_PTData$Properties8 = PTData.Properties) !== null && _PTData$Properties8 !== void 0 && (_PTData$Properties8$ = _PTData$Properties8[0]) !== null && _PTData$Properties8$ !== void 0 && _PTData$Properties8$.address),
       showValue: true,
       loadData: {
         serviceName: "/property-services/property/_search",
@@ -33001,7 +33226,7 @@ const WSApplicationDetails = () => {
       }
     }
   }), /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
-    to: "/digit-ui/citizen/commonpt/view-property?propertyId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection128 = data.WaterConnection) === null || _data$WaterConnection128 === void 0 ? void 0 : (_data$WaterConnection129 = _data$WaterConnection128[0]) === null || _data$WaterConnection129 === void 0 ? void 0 : _data$WaterConnection129.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect123 = data.SewerageConnections) === null || _data$SewerageConnect123 === void 0 ? void 0 : (_data$SewerageConnect124 = _data$SewerageConnect123[0]) === null || _data$SewerageConnect124 === void 0 ? void 0 : _data$SewerageConnect124.propertyId)) + "&tenantId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection130 = data.WaterConnection) === null || _data$WaterConnection130 === void 0 ? void 0 : (_data$WaterConnection131 = _data$WaterConnection130[0]) === null || _data$WaterConnection131 === void 0 ? void 0 : _data$WaterConnection131.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect125 = data.SewerageConnections) === null || _data$SewerageConnect125 === void 0 ? void 0 : (_data$SewerageConnect126 = _data$SewerageConnect125[0]) === null || _data$SewerageConnect126 === void 0 ? void 0 : _data$SewerageConnect126.tenantId))
+    to: "/digit-ui/citizen/commonpt/view-property?propertyId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection136 = data.WaterConnection) === null || _data$WaterConnection136 === void 0 ? void 0 : (_data$WaterConnection137 = _data$WaterConnection136[0]) === null || _data$WaterConnection137 === void 0 ? void 0 : _data$WaterConnection137.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect131 = data.SewerageConnections) === null || _data$SewerageConnect131 === void 0 ? void 0 : (_data$SewerageConnect132 = _data$SewerageConnect131[0]) === null || _data$SewerageConnect132 === void 0 ? void 0 : _data$SewerageConnect132.propertyId)) + "&tenantId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection138 = data.WaterConnection) === null || _data$WaterConnection138 === void 0 ? void 0 : (_data$WaterConnection139 = _data$WaterConnection138[0]) === null || _data$WaterConnection139 === void 0 ? void 0 : _data$WaterConnection139.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect133 = data.SewerageConnections) === null || _data$SewerageConnect133 === void 0 ? void 0 : (_data$SewerageConnect134 = _data$SewerageConnect133[0]) === null || _data$SewerageConnect134 === void 0 ? void 0 : _data$SewerageConnect134.tenantId))
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.LinkButton, {
     style: {
       textAlign: "left"
@@ -33081,16 +33306,16 @@ const WSApplicationDetails = () => {
     text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$categoryT = useDetails.categoryType) === null || _useDetails$categoryT === void 0 ? void 0 : _useDetails$categoryT.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$categoryT2 = useDetails.categoryType) === null || _useDetails$categoryT2 === void 0 ? void 0 : _useDetails$categoryT2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.categoryType)))
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_PROPERTY_CATEGORY"),
-    text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyC = useDetails.propertyCategory) === null || _useDetails$propertyC === void 0 ? void 0 : _useDetails$propertyC.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyC2 = useDetails.propertyCategory) === null || _useDetails$propertyC2 === void 0 ? void 0 : _useDetails$propertyC2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.propertyCategory)))
+    text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyC = useDetails.propertyCategory) === null || _useDetails$propertyC === void 0 ? void 0 : _useDetails$propertyC.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyC2 = useDetails.propertyCategory) === null || _useDetails$propertyC2 === void 0 ? void 0 : _useDetails$propertyC2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.propertyCategory) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : (_propertyAdditionalDe = propertyAdditionalDetails.propertyCategory) === null || _propertyAdditionalDe === void 0 ? void 0 : _propertyAdditionalDe.name) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : (_propertyAdditionalDe2 = propertyAdditionalDetails.propertyCategory) === null || _propertyAdditionalDe2 === void 0 ? void 0 : _propertyAdditionalDe2.code) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : propertyAdditionalDetails.propertyCategory) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties9 = PTData.Properties) === null || _PTData$Properties9 === void 0 ? void 0 : (_PTData$Properties9$ = _PTData$Properties9[0]) === null || _PTData$Properties9$ === void 0 ? void 0 : _PTData$Properties9$.usageCategory)))
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_PROPERTY_TYPE"),
-    text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyT = useDetails.propertyType) === null || _useDetails$propertyT === void 0 ? void 0 : _useDetails$propertyT.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyT2 = useDetails.propertyType) === null || _useDetails$propertyT2 === void 0 ? void 0 : _useDetails$propertyT2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.propertyType)))
+    text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyT = useDetails.propertyType) === null || _useDetails$propertyT === void 0 ? void 0 : _useDetails$propertyT.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyT2 = useDetails.propertyType) === null || _useDetails$propertyT2 === void 0 ? void 0 : _useDetails$propertyT2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.propertyType) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : (_propertyAdditionalDe3 = propertyAdditionalDetails.propertyType) === null || _propertyAdditionalDe3 === void 0 ? void 0 : _propertyAdditionalDe3.name) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : (_propertyAdditionalDe4 = propertyAdditionalDetails.propertyType) === null || _propertyAdditionalDe4 === void 0 ? void 0 : _propertyAdditionalDe4.code) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : propertyAdditionalDetails.propertyType) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties0 = PTData.Properties) === null || _PTData$Properties0 === void 0 ? void 0 : (_PTData$Properties0$ = _PTData$Properties0[0]) === null || _PTData$Properties0$ === void 0 ? void 0 : _PTData$Properties0$.propertyType)))
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_WATER_CONNECTION_USAGE_TYPE"),
-    text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$WaterConn = useDetails.WaterConnectionUsageType) === null || _useDetails$WaterConn === void 0 ? void 0 : _useDetails$WaterConn.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$WaterConn2 = useDetails.WaterConnectionUsageType) === null || _useDetails$WaterConn2 === void 0 ? void 0 : _useDetails$WaterConn2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.WaterConnectionUsageType) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$waterConn = useDetails.waterConnectionUsageType) === null || _useDetails$waterConn === void 0 ? void 0 : _useDetails$waterConn.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$waterConn2 = useDetails.waterConnectionUsageType) === null || _useDetails$waterConn2 === void 0 ? void 0 : _useDetails$waterConn2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.waterConnectionUsageType)))
+    text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$WaterConn = useDetails.WaterConnectionUsageType) === null || _useDetails$WaterConn === void 0 ? void 0 : _useDetails$WaterConn.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$WaterConn2 = useDetails.WaterConnectionUsageType) === null || _useDetails$WaterConn2 === void 0 ? void 0 : _useDetails$WaterConn2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.WaterConnectionUsageType) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$waterConn = useDetails.waterConnectionUsageType) === null || _useDetails$waterConn === void 0 ? void 0 : _useDetails$waterConn.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$waterConn2 = useDetails.waterConnectionUsageType) === null || _useDetails$waterConn2 === void 0 ? void 0 : _useDetails$waterConn2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.waterConnectionUsageType) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : (_propertyAdditionalDe5 = propertyAdditionalDetails.waterConnectionUsageType) === null || _propertyAdditionalDe5 === void 0 ? void 0 : _propertyAdditionalDe5.name) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : (_propertyAdditionalDe6 = propertyAdditionalDetails.waterConnectionUsageType) === null || _propertyAdditionalDe6 === void 0 ? void 0 : _propertyAdditionalDe6.code) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : propertyAdditionalDetails.waterConnectionUsageType)))
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_NUMBER_OF_FLOORS"),
-    text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$noOfFloor = useDetails.noOfFloors) === null || _useDetails$noOfFloor === void 0 ? void 0 : _useDetails$noOfFloor.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$noOfFloor2 = useDetails.noOfFloors) === null || _useDetails$noOfFloor2 === void 0 ? void 0 : _useDetails$noOfFloor2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.noOfFloors)))
+    text: "" + t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$noOfFloor = useDetails.noOfFloors) === null || _useDetails$noOfFloor === void 0 ? void 0 : _useDetails$noOfFloor.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$noOfFloor2 = useDetails.noOfFloors) === null || _useDetails$noOfFloor2 === void 0 ? void 0 : _useDetails$noOfFloor2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.noOfFloors) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : propertyAdditionalDetails.numberOfFloors) || (propertyAdditionalDetails === null || propertyAdditionalDetails === void 0 ? void 0 : propertyAdditionalDetails.noOfFloors) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties1 = PTData.Properties) === null || _PTData$Properties1 === void 0 ? void 0 : (_PTData$Properties1$ = _PTData$Properties1[0]) === null || _PTData$Properties1$ === void 0 ? void 0 : _PTData$Properties1$.noOfFloors)))
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_PLOT_AREA"),
     text: "" + t(checkForNA$1(useDetails === null || useDetails === void 0 ? void 0 : useDetails.plotArea))
@@ -33161,7 +33386,7 @@ const WSApplicationDetails = () => {
     styles: {
       fontSize: "28px"
     }
-  }, t("WS_COMMON_DOCUMENT_DETAILS")), (data === null || data === void 0 ? void 0 : (_data$WaterConnection132 = data.WaterConnection) === null || _data$WaterConnection132 === void 0 ? void 0 : (_data$WaterConnection133 = _data$WaterConnection132[0]) === null || _data$WaterConnection133 === void 0 ? void 0 : _data$WaterConnection133.documents) && (data === null || data === void 0 ? void 0 : (_data$WaterConnection134 = data.WaterConnection) === null || _data$WaterConnection134 === void 0 ? void 0 : (_data$WaterConnection135 = _data$WaterConnection134[0]) === null || _data$WaterConnection135 === void 0 ? void 0 : _data$WaterConnection135.documents.reduce((acc, current) => {
+  }, t("WS_COMMON_DOCUMENT_DETAILS")), (data === null || data === void 0 ? void 0 : (_data$WaterConnection140 = data.WaterConnection) === null || _data$WaterConnection140 === void 0 ? void 0 : (_data$WaterConnection141 = _data$WaterConnection140[0]) === null || _data$WaterConnection141 === void 0 ? void 0 : _data$WaterConnection141.documents) && (data === null || data === void 0 ? void 0 : (_data$WaterConnection142 = data.WaterConnection) === null || _data$WaterConnection142 === void 0 ? void 0 : (_data$WaterConnection143 = _data$WaterConnection142[0]) === null || _data$WaterConnection143 === void 0 ? void 0 : _data$WaterConnection143.documents.reduce((acc, current) => {
     const x = acc.find(item => item.documentType === current.documentType);
     if (!x) {
       return acc.concat([current]);
@@ -33169,11 +33394,11 @@ const WSApplicationDetails = () => {
       return acc;
     }
   }, []).map((doc, index, array) => {
-    var _doc$documentType, _data$WaterConnection136, _data$WaterConnection137;
+    var _doc$documentType, _data$WaterConnection144, _data$WaterConnection145;
     return /*#__PURE__*/React__default.createElement("div", {
       key: "doc-" + index
     }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, null, t(doc === null || doc === void 0 ? void 0 : (_doc$documentType = doc.documentType) === null || _doc$documentType === void 0 ? void 0 : _doc$documentType.split(".").slice(0, 2).join("_"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(WSDocument, {
-      value: data === null || data === void 0 ? void 0 : (_data$WaterConnection136 = data.WaterConnection) === null || _data$WaterConnection136 === void 0 ? void 0 : (_data$WaterConnection137 = _data$WaterConnection136[0]) === null || _data$WaterConnection137 === void 0 ? void 0 : _data$WaterConnection137.documents,
+      value: data === null || data === void 0 ? void 0 : (_data$WaterConnection144 = data.WaterConnection) === null || _data$WaterConnection144 === void 0 ? void 0 : (_data$WaterConnection145 = _data$WaterConnection144[0]) === null || _data$WaterConnection145 === void 0 ? void 0 : _data$WaterConnection145.documents,
       Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
       index: index
     }), array.length != index + 1 ? /*#__PURE__*/React__default.createElement("hr", {
@@ -33185,7 +33410,7 @@ const WSApplicationDetails = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  })), (data === null || data === void 0 ? void 0 : (_data$SewerageConnect127 = data.SewerageConnections) === null || _data$SewerageConnect127 === void 0 ? void 0 : (_data$SewerageConnect128 = _data$SewerageConnect127[0]) === null || _data$SewerageConnect128 === void 0 ? void 0 : _data$SewerageConnect128.documents) && (data === null || data === void 0 ? void 0 : (_data$SewerageConnect129 = data.SewerageConnections) === null || _data$SewerageConnect129 === void 0 ? void 0 : (_data$SewerageConnect130 = _data$SewerageConnect129[0]) === null || _data$SewerageConnect130 === void 0 ? void 0 : _data$SewerageConnect130.documents.reduce((acc, current) => {
+  })), (data === null || data === void 0 ? void 0 : (_data$SewerageConnect135 = data.SewerageConnections) === null || _data$SewerageConnect135 === void 0 ? void 0 : (_data$SewerageConnect136 = _data$SewerageConnect135[0]) === null || _data$SewerageConnect136 === void 0 ? void 0 : _data$SewerageConnect136.documents) && (data === null || data === void 0 ? void 0 : (_data$SewerageConnect137 = data.SewerageConnections) === null || _data$SewerageConnect137 === void 0 ? void 0 : (_data$SewerageConnect138 = _data$SewerageConnect137[0]) === null || _data$SewerageConnect138 === void 0 ? void 0 : _data$SewerageConnect138.documents.reduce((acc, current) => {
     const x = acc.find(item => item.documentType === current.documentType);
     if (!x) {
       return acc.concat([current]);
@@ -33193,11 +33418,11 @@ const WSApplicationDetails = () => {
       return acc;
     }
   }, []).map((doc, index, array) => {
-    var _doc$documentType2, _data$SewerageConnect131, _data$SewerageConnect132;
+    var _doc$documentType2, _data$SewerageConnect139, _data$SewerageConnect140;
     return /*#__PURE__*/React__default.createElement("div", {
       key: "doc-" + index
     }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, null, t(doc === null || doc === void 0 ? void 0 : (_doc$documentType2 = doc.documentType) === null || _doc$documentType2 === void 0 ? void 0 : _doc$documentType2.split(".").slice(0, 2).join("_"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(WSDocument, {
-      value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect131 = data.SewerageConnections) === null || _data$SewerageConnect131 === void 0 ? void 0 : (_data$SewerageConnect132 = _data$SewerageConnect131[0]) === null || _data$SewerageConnect132 === void 0 ? void 0 : _data$SewerageConnect132.documents,
+      value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect139 = data.SewerageConnections) === null || _data$SewerageConnect139 === void 0 ? void 0 : (_data$SewerageConnect140 = _data$SewerageConnect139[0]) === null || _data$SewerageConnect140 === void 0 ? void 0 : _data$SewerageConnect140.documents,
       Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
       index: index
     }), array.length != index + 1 ? /*#__PURE__*/React__default.createElement("hr", {
@@ -33209,40 +33434,40 @@ const WSApplicationDetails = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection138 = data.WaterConnection) === null || _data$WaterConnection138 === void 0 ? void 0 : (_data$WaterConnection139 = _data$WaterConnection138[0]) === null || _data$WaterConnection139 === void 0 ? void 0 : _data$WaterConnection139.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection140 = data.WaterConnection) === null || _data$WaterConnection140 === void 0 ? void 0 : (_data$WaterConnection141 = _data$WaterConnection140[0]) === null || _data$WaterConnection141 === void 0 ? void 0 : _data$WaterConnection141.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection142 = data.WaterConnection) === null || _data$WaterConnection142 === void 0 ? void 0 : (_data$WaterConnection143 = _data$WaterConnection142[0]) === null || _data$WaterConnection143 === void 0 ? void 0 : _data$WaterConnection143.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect133 = data.SewerageConnections) === null || _data$SewerageConnect133 === void 0 ? void 0 : (_data$SewerageConnect134 = _data$SewerageConnect133[0]) === null || _data$SewerageConnect134 === void 0 ? void 0 : _data$SewerageConnect134.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect135 = data.SewerageConnections) === null || _data$SewerageConnect135 === void 0 ? void 0 : (_data$SewerageConnect136 = _data$SewerageConnect135[0]) === null || _data$SewerageConnect136 === void 0 ? void 0 : _data$SewerageConnect136.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect137 = data.SewerageConnections) === null || _data$SewerageConnect137 === void 0 ? void 0 : (_data$SewerageConnect138 = _data$SewerageConnect137[0]) === null || _data$SewerageConnect138 === void 0 ? void 0 : _data$SewerageConnect138.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection146 = data.WaterConnection) === null || _data$WaterConnection146 === void 0 ? void 0 : (_data$WaterConnection147 = _data$WaterConnection146[0]) === null || _data$WaterConnection147 === void 0 ? void 0 : _data$WaterConnection147.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection148 = data.WaterConnection) === null || _data$WaterConnection148 === void 0 ? void 0 : (_data$WaterConnection149 = _data$WaterConnection148[0]) === null || _data$WaterConnection149 === void 0 ? void 0 : _data$WaterConnection149.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection150 = data.WaterConnection) === null || _data$WaterConnection150 === void 0 ? void 0 : (_data$WaterConnection151 = _data$WaterConnection150[0]) === null || _data$WaterConnection151 === void 0 ? void 0 : _data$WaterConnection151.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect141 = data.SewerageConnections) === null || _data$SewerageConnect141 === void 0 ? void 0 : (_data$SewerageConnect142 = _data$SewerageConnect141[0]) === null || _data$SewerageConnect142 === void 0 ? void 0 : _data$SewerageConnect142.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect143 = data.SewerageConnections) === null || _data$SewerageConnect143 === void 0 ? void 0 : (_data$SewerageConnect144 = _data$SewerageConnect143[0]) === null || _data$SewerageConnect144 === void 0 ? void 0 : _data$SewerageConnect144.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect145 = data.SewerageConnections) === null || _data$SewerageConnect145 === void 0 ? void 0 : (_data$SewerageConnect146 = _data$SewerageConnect145[0]) === null || _data$SewerageConnect146 === void 0 ? void 0 : _data$SewerageConnect146.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
     to: {
       pathname: "/digit-ui/citizen/payment/my-bills/" + (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data = paymentDetails.data) === null || _paymentDetails$data === void 0 ? void 0 : (_paymentDetails$data$ = _paymentDetails$data.Bill) === null || _paymentDetails$data$ === void 0 ? void 0 : (_paymentDetails$data$2 = _paymentDetails$data$[0]) === null || _paymentDetails$data$2 === void 0 ? void 0 : _paymentDetails$data$2.businessService) + "/" + stringReplaceAll(paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data2 = paymentDetails.data) === null || _paymentDetails$data2 === void 0 ? void 0 : (_paymentDetails$data3 = _paymentDetails$data2.Bill) === null || _paymentDetails$data3 === void 0 ? void 0 : (_paymentDetails$data4 = _paymentDetails$data3[0]) === null || _paymentDetails$data4 === void 0 ? void 0 : _paymentDetails$data4.consumerCode, "/", "+"),
-      search: "?workflow=WNS&tenantId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection144 = data.WaterConnection) === null || _data$WaterConnection144 === void 0 ? void 0 : (_data$WaterConnection145 = _data$WaterConnection144[0]) === null || _data$WaterConnection145 === void 0 ? void 0 : _data$WaterConnection145.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect139 = data.SewerageConnections) === null || _data$SewerageConnect139 === void 0 ? void 0 : (_data$SewerageConnect140 = _data$SewerageConnect139[0]) === null || _data$SewerageConnect140 === void 0 ? void 0 : _data$SewerageConnect140.tenantId)) + "&ConsumerName=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection146 = data.WaterConnection) === null || _data$WaterConnection146 === void 0 ? void 0 : (_data$WaterConnection147 = _data$WaterConnection146[0]) === null || _data$WaterConnection147 === void 0 ? void 0 : (_data$WaterConnection148 = _data$WaterConnection147.connectionHolders) === null || _data$WaterConnection148 === void 0 ? void 0 : _data$WaterConnection148.map(owner => owner.name).join(",")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect141 = data.SewerageConnections) === null || _data$SewerageConnect141 === void 0 ? void 0 : (_data$SewerageConnect142 = _data$SewerageConnect141[0]) === null || _data$SewerageConnect142 === void 0 ? void 0 : (_data$SewerageConnect143 = _data$SewerageConnect142.connectionHolders) === null || _data$SewerageConnect143 === void 0 ? void 0 : _data$SewerageConnect143.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties8 = PTData.Properties) === null || _PTData$Properties8 === void 0 ? void 0 : (_PTData$Properties8$ = _PTData$Properties8[0]) === null || _PTData$Properties8$ === void 0 ? void 0 : (_PTData$Properties8$$ = _PTData$Properties8$.owners) === null || _PTData$Properties8$$ === void 0 ? void 0 : _PTData$Properties8$$.map(owner => owner.name).join(","))) + "&isDisoconnectFlow=" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false) + "&consumerCode=" + (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data5 = paymentDetails.data) === null || _paymentDetails$data5 === void 0 ? void 0 : (_paymentDetails$data6 = _paymentDetails$data5.Bill) === null || _paymentDetails$data6 === void 0 ? void 0 : (_paymentDetails$data7 = _paymentDetails$data6[0]) === null || _paymentDetails$data7 === void 0 ? void 0 : _paymentDetails$data7.consumerCode),
+      search: "?workflow=WNS&tenantId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection152 = data.WaterConnection) === null || _data$WaterConnection152 === void 0 ? void 0 : (_data$WaterConnection153 = _data$WaterConnection152[0]) === null || _data$WaterConnection153 === void 0 ? void 0 : _data$WaterConnection153.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect147 = data.SewerageConnections) === null || _data$SewerageConnect147 === void 0 ? void 0 : (_data$SewerageConnect148 = _data$SewerageConnect147[0]) === null || _data$SewerageConnect148 === void 0 ? void 0 : _data$SewerageConnect148.tenantId)) + "&ConsumerName=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection154 = data.WaterConnection) === null || _data$WaterConnection154 === void 0 ? void 0 : (_data$WaterConnection155 = _data$WaterConnection154[0]) === null || _data$WaterConnection155 === void 0 ? void 0 : (_data$WaterConnection156 = _data$WaterConnection155.connectionHolders) === null || _data$WaterConnection156 === void 0 ? void 0 : _data$WaterConnection156.map(owner => owner.name).join(",")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect149 = data.SewerageConnections) === null || _data$SewerageConnect149 === void 0 ? void 0 : (_data$SewerageConnect150 = _data$SewerageConnect149[0]) === null || _data$SewerageConnect150 === void 0 ? void 0 : (_data$SewerageConnect151 = _data$SewerageConnect150.connectionHolders) === null || _data$SewerageConnect151 === void 0 ? void 0 : _data$SewerageConnect151.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties10 = PTData.Properties) === null || _PTData$Properties10 === void 0 ? void 0 : (_PTData$Properties10$ = _PTData$Properties10[0]) === null || _PTData$Properties10$ === void 0 ? void 0 : (_PTData$Properties10$2 = _PTData$Properties10$.owners) === null || _PTData$Properties10$2 === void 0 ? void 0 : _PTData$Properties10$2.map(owner => owner.name).join(","))) + "&isDisoconnectFlow=" + (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false) + "&consumerCode=" + (paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data5 = paymentDetails.data) === null || _paymentDetails$data5 === void 0 ? void 0 : (_paymentDetails$data6 = _paymentDetails$data5.Bill) === null || _paymentDetails$data6 === void 0 ? void 0 : (_paymentDetails$data7 = _paymentDetails$data6[0]) === null || _paymentDetails$data7 === void 0 ? void 0 : _paymentDetails$data7.consumerCode),
       state: {
         fromApplicationDetails: true
       }
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("MAKE_PAYMENT")
-  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection149 = data.WaterConnection) !== null && _data$WaterConnection149 !== void 0 && (_data$WaterConnection150 = _data$WaterConnection149[0]) !== null && _data$WaterConnection150 !== void 0 && _data$WaterConnection150.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection151 = data.WaterConnection) !== null && _data$WaterConnection151 !== void 0 && (_data$WaterConnection152 = _data$WaterConnection151[0]) !== null && _data$WaterConnection152 !== void 0 && _data$WaterConnection152.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect144 = data.SewerageConnections) !== null && _data$SewerageConnect144 !== void 0 && (_data$SewerageConnect145 = _data$SewerageConnect144[0]) !== null && _data$SewerageConnect145 !== void 0 && _data$SewerageConnect145.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect146 = data.SewerageConnections) !== null && _data$SewerageConnect146 !== void 0 && (_data$SewerageConnect147 = _data$SewerageConnect146[0]) !== null && _data$SewerageConnect147 !== void 0 && _data$SewerageConnect147.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection157 = data.WaterConnection) !== null && _data$WaterConnection157 !== void 0 && (_data$WaterConnection158 = _data$WaterConnection157[0]) !== null && _data$WaterConnection158 !== void 0 && _data$WaterConnection158.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection159 = data.WaterConnection) !== null && _data$WaterConnection159 !== void 0 && (_data$WaterConnection160 = _data$WaterConnection159[0]) !== null && _data$WaterConnection160 !== void 0 && _data$WaterConnection160.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect152 = data.SewerageConnections) !== null && _data$SewerageConnect152 !== void 0 && (_data$SewerageConnect153 = _data$SewerageConnect152[0]) !== null && _data$SewerageConnect153 !== void 0 && _data$SewerageConnect153.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect154 = data.SewerageConnections) !== null && _data$SewerageConnect154 !== void 0 && (_data$SewerageConnect155 = _data$SewerageConnect154[0]) !== null && _data$SewerageConnect155 !== void 0 && _data$SewerageConnect155.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
     to: {
-      pathname: isMutation ? "/digit-ui/citizen/ws/mutation-application" : "/digit-ui/citizen/ws/edit-application/" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection153 = data.WaterConnection) === null || _data$WaterConnection153 === void 0 ? void 0 : (_data$WaterConnection154 = _data$WaterConnection153[0]) === null || _data$WaterConnection154 === void 0 ? void 0 : _data$WaterConnection154.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect148 = data.SewerageConnections) === null || _data$SewerageConnect148 === void 0 ? void 0 : (_data$SewerageConnect149 = _data$SewerageConnect148[0]) === null || _data$SewerageConnect149 === void 0 ? void 0 : _data$SewerageConnect149.tenantId)),
-      search: isMutation ? "?applicationNumber=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection155 = data.WaterConnection) === null || _data$WaterConnection155 === void 0 ? void 0 : (_data$WaterConnection156 = _data$WaterConnection155[0]) === null || _data$WaterConnection156 === void 0 ? void 0 : _data$WaterConnection156.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect150 = data.SewerageConnections) === null || _data$SewerageConnect150 === void 0 ? void 0 : (_data$SewerageConnect151 = _data$SewerageConnect150[0]) === null || _data$SewerageConnect151 === void 0 ? void 0 : _data$SewerageConnect151.applicationNo)) + "&tenantId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection157 = data.WaterConnection) === null || _data$WaterConnection157 === void 0 ? void 0 : (_data$WaterConnection158 = _data$WaterConnection157[0]) === null || _data$WaterConnection158 === void 0 ? void 0 : _data$WaterConnection158.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect152 = data.SewerageConnections) === null || _data$SewerageConnect152 === void 0 ? void 0 : (_data$SewerageConnect153 = _data$SewerageConnect152[0]) === null || _data$SewerageConnect153 === void 0 ? void 0 : _data$SewerageConnect153.tenantId)) + "&service=" + (data !== null && data !== void 0 && (_data$WaterConnection159 = data.WaterConnection) !== null && _data$WaterConnection159 !== void 0 && _data$WaterConnection159[0] ? "WATER" : "SEWERAGE") + "&propertyId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection160 = data.WaterConnection) === null || _data$WaterConnection160 === void 0 ? void 0 : (_data$WaterConnection161 = _data$WaterConnection160[0]) === null || _data$WaterConnection161 === void 0 ? void 0 : _data$WaterConnection161.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect154 = data.SewerageConnections) === null || _data$SewerageConnect154 === void 0 ? void 0 : (_data$SewerageConnect155 = _data$SewerageConnect154[0]) === null || _data$SewerageConnect155 === void 0 ? void 0 : _data$SewerageConnect155.propertyId)) : "",
+      pathname: isMutation ? "/digit-ui/citizen/ws/mutation-application" : "/digit-ui/citizen/ws/edit-application/" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection161 = data.WaterConnection) === null || _data$WaterConnection161 === void 0 ? void 0 : (_data$WaterConnection162 = _data$WaterConnection161[0]) === null || _data$WaterConnection162 === void 0 ? void 0 : _data$WaterConnection162.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect156 = data.SewerageConnections) === null || _data$SewerageConnect156 === void 0 ? void 0 : (_data$SewerageConnect157 = _data$SewerageConnect156[0]) === null || _data$SewerageConnect157 === void 0 ? void 0 : _data$SewerageConnect157.tenantId)),
+      search: isMutation ? "?applicationNumber=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection163 = data.WaterConnection) === null || _data$WaterConnection163 === void 0 ? void 0 : (_data$WaterConnection164 = _data$WaterConnection163[0]) === null || _data$WaterConnection164 === void 0 ? void 0 : _data$WaterConnection164.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect158 = data.SewerageConnections) === null || _data$SewerageConnect158 === void 0 ? void 0 : (_data$SewerageConnect159 = _data$SewerageConnect158[0]) === null || _data$SewerageConnect159 === void 0 ? void 0 : _data$SewerageConnect159.applicationNo)) + "&tenantId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection165 = data.WaterConnection) === null || _data$WaterConnection165 === void 0 ? void 0 : (_data$WaterConnection166 = _data$WaterConnection165[0]) === null || _data$WaterConnection166 === void 0 ? void 0 : _data$WaterConnection166.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect160 = data.SewerageConnections) === null || _data$SewerageConnect160 === void 0 ? void 0 : (_data$SewerageConnect161 = _data$SewerageConnect160[0]) === null || _data$SewerageConnect161 === void 0 ? void 0 : _data$SewerageConnect161.tenantId)) + "&service=" + (data !== null && data !== void 0 && (_data$WaterConnection167 = data.WaterConnection) !== null && _data$WaterConnection167 !== void 0 && _data$WaterConnection167[0] ? "WATER" : "SEWERAGE") + "&propertyId=" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection168 = data.WaterConnection) === null || _data$WaterConnection168 === void 0 ? void 0 : (_data$WaterConnection169 = _data$WaterConnection168[0]) === null || _data$WaterConnection169 === void 0 ? void 0 : _data$WaterConnection169.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect162 = data.SewerageConnections) === null || _data$SewerageConnect162 === void 0 ? void 0 : (_data$SewerageConnect163 = _data$SewerageConnect162[0]) === null || _data$SewerageConnect163 === void 0 ? void 0 : _data$SewerageConnect163.propertyId)) : "",
       state: {
-        id: "" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection162 = data.WaterConnection) === null || _data$WaterConnection162 === void 0 ? void 0 : (_data$WaterConnection163 = _data$WaterConnection162[0]) === null || _data$WaterConnection163 === void 0 ? void 0 : _data$WaterConnection163.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect156 = data.SewerageConnections) === null || _data$SewerageConnect156 === void 0 ? void 0 : (_data$SewerageConnect157 = _data$SewerageConnect156[0]) === null || _data$SewerageConnect157 === void 0 ? void 0 : _data$SewerageConnect157.applicationNo))
+        id: "" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection170 = data.WaterConnection) === null || _data$WaterConnection170 === void 0 ? void 0 : (_data$WaterConnection171 = _data$WaterConnection170[0]) === null || _data$WaterConnection171 === void 0 ? void 0 : _data$WaterConnection171.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect164 = data.SewerageConnections) === null || _data$SewerageConnect164 === void 0 ? void 0 : (_data$SewerageConnect165 = _data$SewerageConnect164[0]) === null || _data$SewerageConnect165 === void 0 ? void 0 : _data$SewerageConnect165.applicationNo))
       }
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("COMMON_EDIT")
-  })) : null, data !== null && data !== void 0 && (_data$WaterConnection164 = data.WaterConnection) !== null && _data$WaterConnection164 !== void 0 && (_data$WaterConnection165 = _data$WaterConnection164[0]) !== null && _data$WaterConnection165 !== void 0 && _data$WaterConnection165.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection166 = data.WaterConnection) !== null && _data$WaterConnection166 !== void 0 && (_data$WaterConnection167 = _data$WaterConnection166[0]) !== null && _data$WaterConnection167 !== void 0 && _data$WaterConnection167.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect158 = data.SewerageConnections) !== null && _data$SewerageConnect158 !== void 0 && (_data$SewerageConnect159 = _data$SewerageConnect158[0]) !== null && _data$SewerageConnect159 !== void 0 && _data$SewerageConnect159.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect160 = data.SewerageConnections) !== null && _data$SewerageConnect160 !== void 0 && (_data$SewerageConnect161 = _data$SewerageConnect160[0]) !== null && _data$SewerageConnect161 !== void 0 && _data$SewerageConnect161.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+  })) : null, data !== null && data !== void 0 && (_data$WaterConnection172 = data.WaterConnection) !== null && _data$WaterConnection172 !== void 0 && (_data$WaterConnection173 = _data$WaterConnection172[0]) !== null && _data$WaterConnection173 !== void 0 && _data$WaterConnection173.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection174 = data.WaterConnection) !== null && _data$WaterConnection174 !== void 0 && (_data$WaterConnection175 = _data$WaterConnection174[0]) !== null && _data$WaterConnection175 !== void 0 && _data$WaterConnection175.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect166 = data.SewerageConnections) !== null && _data$SewerageConnect166 !== void 0 && (_data$SewerageConnect167 = _data$SewerageConnect166[0]) !== null && _data$SewerageConnect167 !== void 0 && _data$SewerageConnect167.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect168 = data.SewerageConnections) !== null && _data$SewerageConnect168 !== void 0 && (_data$SewerageConnect169 = _data$SewerageConnect168[0]) !== null && _data$SewerageConnect169 !== void 0 && _data$SewerageConnect169.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
     to: {
       pathname: "/digit-ui/citizen/ws/resubmit-disconnect-application",
       state: {
-        id: "" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection168 = data.WaterConnection) === null || _data$WaterConnection168 === void 0 ? void 0 : (_data$WaterConnection169 = _data$WaterConnection168[0]) === null || _data$WaterConnection169 === void 0 ? void 0 : _data$WaterConnection169.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect162 = data.SewerageConnections) === null || _data$SewerageConnect162 === void 0 ? void 0 : (_data$SewerageConnect163 = _data$SewerageConnect162[0]) === null || _data$SewerageConnect163 === void 0 ? void 0 : _data$SewerageConnect163.applicationNo))
+        id: "" + ((data === null || data === void 0 ? void 0 : (_data$WaterConnection176 = data.WaterConnection) === null || _data$WaterConnection176 === void 0 ? void 0 : (_data$WaterConnection177 = _data$WaterConnection176[0]) === null || _data$WaterConnection177 === void 0 ? void 0 : _data$WaterConnection177.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect170 = data.SewerageConnections) === null || _data$SewerageConnect170 === void 0 ? void 0 : (_data$SewerageConnect171 = _data$SewerageConnect170[0]) === null || _data$SewerageConnect171 === void 0 ? void 0 : _data$SewerageConnect171.applicationNo))
       }
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("RESUBMIT_APPLICATION"),
     onSubmit: Digit.SessionStorage.set("WS_DISCONNECTION", applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("SW") ? {
-      applicationData: data === null || data === void 0 ? void 0 : (_data$SewerageConnect164 = data.SewerageConnections) === null || _data$SewerageConnect164 === void 0 ? void 0 : _data$SewerageConnect164[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$SewerageConnect172 = data.SewerageConnections) === null || _data$SewerageConnect172 === void 0 ? void 0 : _data$SewerageConnect172[0],
       serviceType: "SEWERAGE",
       WSDisconnectionForm: {
-        type: data !== null && data !== void 0 && (_data$SewerageConnect165 = data.SewerageConnections) !== null && _data$SewerageConnect165 !== void 0 && (_data$SewerageConnect166 = _data$SewerageConnect165[0]) !== null && _data$SewerageConnect166 !== void 0 && _data$SewerageConnect166.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$SewerageConnect173 = data.SewerageConnections) !== null && _data$SewerageConnect173 !== void 0 && (_data$SewerageConnect174 = _data$SewerageConnect173[0]) !== null && _data$SewerageConnect174 !== void 0 && _data$SewerageConnect174.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -33259,18 +33484,18 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$SewerageConnect167 = data.SewerageConnections) === null || _data$SewerageConnect167 === void 0 ? void 0 : (_data$SewerageConnect168 = _data$SewerageConnect167[0]) === null || _data$SewerageConnect168 === void 0 ? void 0 : _data$SewerageConnect168.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$SewerageConnect175 = data.SewerageConnections) === null || _data$SewerageConnect175 === void 0 ? void 0 : (_data$SewerageConnect176 = _data$SewerageConnect175[0]) === null || _data$SewerageConnect176 === void 0 ? void 0 : _data$SewerageConnect176.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect169 = data.SewerageConnections) === null || _data$SewerageConnect169 === void 0 ? void 0 : (_data$SewerageConnect170 = _data$SewerageConnect169[0]) === null || _data$SewerageConnect170 === void 0 ? void 0 : _data$SewerageConnect170.disconnectionReason
+          value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect177 = data.SewerageConnections) === null || _data$SewerageConnect177 === void 0 ? void 0 : (_data$SewerageConnect178 = _data$SewerageConnect177[0]) === null || _data$SewerageConnect178 === void 0 ? void 0 : _data$SewerageConnect178.disconnectionReason
         },
-        documents: data === null || data === void 0 ? void 0 : (_data$SewerageConnect171 = data.SewerageConnections) === null || _data$SewerageConnect171 === void 0 ? void 0 : (_data$SewerageConnect172 = _data$SewerageConnect171[0]) === null || _data$SewerageConnect172 === void 0 ? void 0 : _data$SewerageConnect172.documents
+        documents: data === null || data === void 0 ? void 0 : (_data$SewerageConnect179 = data.SewerageConnections) === null || _data$SewerageConnect179 === void 0 ? void 0 : (_data$SewerageConnect180 = _data$SewerageConnect179[0]) === null || _data$SewerageConnect180 === void 0 ? void 0 : _data$SewerageConnect180.documents
       }
     } : {
-      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection170 = data.WaterConnection) === null || _data$WaterConnection170 === void 0 ? void 0 : _data$WaterConnection170[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection178 = data.WaterConnection) === null || _data$WaterConnection178 === void 0 ? void 0 : _data$WaterConnection178[0],
       serviceType: "WATER",
       WSDisconnectionForm: {
-        type: data !== null && data !== void 0 && (_data$WaterConnection171 = data.WaterConnection) !== null && _data$WaterConnection171 !== void 0 && (_data$WaterConnection172 = _data$WaterConnection171[0]) !== null && _data$WaterConnection172 !== void 0 && _data$WaterConnection172.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$WaterConnection179 = data.WaterConnection) !== null && _data$WaterConnection179 !== void 0 && (_data$WaterConnection180 = _data$WaterConnection179[0]) !== null && _data$WaterConnection180 !== void 0 && _data$WaterConnection180.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -33287,12 +33512,12 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$WaterConnection173 = data.WaterConnection) === null || _data$WaterConnection173 === void 0 ? void 0 : (_data$WaterConnection174 = _data$WaterConnection173[0]) === null || _data$WaterConnection174 === void 0 ? void 0 : _data$WaterConnection174.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$WaterConnection181 = data.WaterConnection) === null || _data$WaterConnection181 === void 0 ? void 0 : (_data$WaterConnection182 = _data$WaterConnection181[0]) === null || _data$WaterConnection182 === void 0 ? void 0 : _data$WaterConnection182.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: data === null || data === void 0 ? void 0 : (_data$WaterConnection175 = data.WaterConnection) === null || _data$WaterConnection175 === void 0 ? void 0 : (_data$WaterConnection176 = _data$WaterConnection175[0]) === null || _data$WaterConnection176 === void 0 ? void 0 : _data$WaterConnection176.disconnectionReason
+          value: data === null || data === void 0 ? void 0 : (_data$WaterConnection183 = data.WaterConnection) === null || _data$WaterConnection183 === void 0 ? void 0 : (_data$WaterConnection184 = _data$WaterConnection183[0]) === null || _data$WaterConnection184 === void 0 ? void 0 : _data$WaterConnection184.disconnectionReason
         },
-        documents: data === null || data === void 0 ? void 0 : (_data$WaterConnection177 = data.WaterConnection) === null || _data$WaterConnection177 === void 0 ? void 0 : (_data$WaterConnection178 = _data$WaterConnection177[0]) === null || _data$WaterConnection178 === void 0 ? void 0 : _data$WaterConnection178.documents
+        documents: data === null || data === void 0 ? void 0 : (_data$WaterConnection185 = data.WaterConnection) === null || _data$WaterConnection185 === void 0 ? void 0 : (_data$WaterConnection186 = _data$WaterConnection185[0]) === null || _data$WaterConnection186 === void 0 ? void 0 : _data$WaterConnection186.documents
       }
     })
   })) : null)))));
@@ -35146,6 +35371,7 @@ const CheckPage = _ref => {
   const propertyAddress = (value === null || value === void 0 ? void 0 : value.propertyLocationDetails) || {};
   const useDetails = (value === null || value === void 0 ? void 0 : (_value$waterConnectio = value.waterConnection) === null || _value$waterConnectio === void 0 ? void 0 : _value$waterConnectio.useDetails) || {};
   const djbEmployee = (value === null || value === void 0 ? void 0 : value.djbEmployee) || {};
+  const disability = (value === null || value === void 0 ? void 0 : value.disability) || (value === null || value === void 0 ? void 0 : value.additionalDetails) || {};
   const bankDetails = (value === null || value === void 0 ? void 0 : value.bankDetails) || {};
   const additionalDetails = {};
   const checkForNA = val => val ? val : "CS_NA";
@@ -35453,7 +35679,15 @@ const CheckPage = _ref => {
       },
       onClick: () => openFilePDF(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.document)
     }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.GenericFileIcon, null), " ", t("CS_COMMON_VIEW"))
-  }))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
+  }))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, "Divyangjan/Person with Disability?"), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
+    style: {
+      marginTop: "10px",
+      marginBottom: "30px"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: "Divyangjan/Person with Disability?",
+    text: "" + (disability !== null && disability !== void 0 && disability.isDivyangjan ? t("CORE_COMMON_YES") : t("CORE_COMMON_NO"))
+  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
     style: {
       marginTop: "10px",
       marginBottom: "30px"
@@ -36907,20 +37141,22 @@ const getAddress$1 = (address, t) => {
   return (address !== null && address !== void 0 && address.doorNo ? (address === null || address === void 0 ? void 0 : address.doorNo) + ", " : "") + " " + (address !== null && address !== void 0 && address.street ? (address === null || address === void 0 ? void 0 : address.street) + ", " : "") + (address !== null && address !== void 0 && address.landmark ? (address === null || address === void 0 ? void 0 : address.landmark) + ", " : "") + t(Digit.Utils.pt.getMohallaLocale(address === null || address === void 0 ? void 0 : address.locality.code, address === null || address === void 0 ? void 0 : address.tenantId)) + ", " + t(Digit.Utils.pt.getCityLocale(address === null || address === void 0 ? void 0 : address.tenantId)) + (address !== null && address !== void 0 && address.pincode && t(address === null || address === void 0 ? void 0 : address.pincode) ? ", " + address.pincode : " ");
 };
 const WSInfoPage = () => {
-  var _Digit$UserService$ge, _Digit$UserService$ge2, _propertyDetails$Prop;
+  var _user$info, _user$info$userName, _user$info2, _propertyDetails$Prop;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const history = reactRouterDom.useHistory();
   const location = reactRouterDom.useLocation();
   const match = reactRouterDom.useRouteMatch();
   const isEmployee = window.location.href.includes("/employee");
+  const user = Digit.UserService.getUser();
+  const userMobileNumber = user !== null && user !== void 0 && (_user$info = user.info) !== null && _user$info !== void 0 && (_user$info$userName = _user$info.userName) !== null && _user$info$userName !== void 0 && _user$info$userName.match(/^[0-9]{10}$/) ? user.info.userName : user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.mobileNumber;
   const _useState = React.useState(null),
     hasProperty = _useState[0],
     setHasProperty = _useState[1];
   const _useState2 = React.useState(null),
     selectedProperty = _useState2[0],
     setSelectedProperty = _useState2[1];
-  const _useState3 = React.useState(""),
+  const _useState3 = React.useState(isEmployee ? "" : userMobileNumber || ""),
     searchMobileNumber = _useState3[0],
     setSearchMobileNumber = _useState3[1];
   const _useState4 = React.useState(false),
@@ -36938,9 +37174,11 @@ const WSInfoPage = () => {
   const _useState8 = React.useState(null),
     showToast = _useState8[0],
     setShowToast = _useState8[1];
+  React.useEffect(() => {
+    sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
+  }, []);
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const userMobileNumber = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : (_Digit$UserService$ge2 = _Digit$UserService$ge.info) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.mobileNumber;
-  const mobileNumberToSearch = isEmployee ? searchMobileNumber : userMobileNumber;
+  const mobileNumberToSearch = searchMobileNumber;
   const _Digit$Hooks$pt$usePr = Digit.Hooks.pt.usePropertySearch({
       filters: {
         mobileNumber: mobileNumberToSearch
@@ -36966,6 +37204,7 @@ const WSInfoPage = () => {
     const isEmployee = window.location.href.includes("/employee");
     const baseUrl = isEmployee ? "/digit-ui/employee/ws" : "/digit-ui/citizen/ws";
     if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && selectedProperty) {
+      sessionStorage.setItem("WS_OTP_VERIFIED_PROPERTY_ID", selectedProperty.propertyId);
       history.push(baseUrl + "/old-application?propertyId=" + selectedProperty.propertyId);
     } else {
       history.push(baseUrl + "/old-application");
@@ -36984,7 +37223,7 @@ const WSInfoPage = () => {
             mobileNumber: mobileNumberToSearch,
             tenantId: "dl",
             type: "register",
-            userType: isEmployee ? "EMPLOYEE" : "CITIZEN"
+            userType: "EMPLOYEE"
           }
         };
         return Promise.resolve(Digit.UserService.sendOtp(payload, "dl")).then(function (response) {
@@ -37118,11 +37357,7 @@ const WSInfoPage = () => {
       if (e.stopPropagation) e.stopPropagation();
     }
     if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && selectedProperty) {
-      if (!isEmployee) {
-        proceedToNext();
-      } else {
-        handleSendOtp(e);
-      }
+      handleSendOtp(e);
     } else if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && !selectedProperty) {
       return;
     } else {
@@ -37231,7 +37466,26 @@ const WSInfoPage = () => {
     style: {
       marginBottom: "24px"
     }
-  }, isEmployee && /*#__PURE__*/React__default.createElement("div", {
+  }, !isEmployee && /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      marginBottom: "16px"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Label, null, t("CORE_COMMON_MOBILE_NUMBER")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+    t: t,
+    type: "number",
+    isMandatory: false,
+    name: "mobileNumber",
+    value: searchMobileNumber,
+    onChange: e => {
+      const val = e.target.value.replace(/\D/g, "").slice(0, 10);
+      setSearchMobileNumber(val);
+      setSelectedProperty(null);
+      setShowOtpVerification(false);
+      setOtp("");
+    },
+    placeholder: t("Enter mobile number"),
+    maxLength: 10
+  })), isEmployee && /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
       flexDirection: "column",
@@ -38642,6 +38896,7 @@ const DEFAULT_SECTION_STATE = {
   applicant: true,
   contact: true,
   djbEmployee: true,
+  disability: true,
   governmentEmployee: true,
   address: true,
   usage: true,
@@ -38694,6 +38949,9 @@ const DEFAULT_FORM_VALUES = {
     retirementDate: "",
     officeNameAndAddress: ""
   },
+  disability: {
+    isDivyangjan: false
+  },
   governmentEmployee: {
     isGovernmentEmployee: false,
     organizationName: "",
@@ -38847,6 +39105,7 @@ const buildDefaultValues = () => ({
   applicant: _extends({}, DEFAULT_FORM_VALUES.applicant),
   contact: _extends({}, DEFAULT_FORM_VALUES.contact),
   djbEmployee: _extends({}, DEFAULT_FORM_VALUES.djbEmployee),
+  disability: _extends({}, DEFAULT_FORM_VALUES.disability),
   propertyAddress: _extends({}, DEFAULT_FORM_VALUES.propertyAddress),
   useDetails: _extends({}, DEFAULT_FORM_VALUES.useDetails),
   bankDetails: _extends({}, DEFAULT_FORM_VALUES.bankDetails),
@@ -39112,7 +39371,7 @@ const FileUploadField = _ref6 => {
   })))));
 };
 const NewApplication = () => {
-  var _Digit$SessionStorage, _getFieldError, _getFieldError2, _getFieldError3, _getFieldError4, _getFieldError5, _getFieldError6, _getFieldError7, _getFieldError8, _getFieldError9, _getFieldError0, _getFieldError1, _getFieldError10, _getFieldError11, _watch, _watch3, _watch5, _watch7, _watch9, _formValues$applicati, _formValues$applicati2, _formValues$applicati3, _formValues$applicati4, _formValues$applicati5, _formValues$applicati6, _formValues$applicati7, _formValues$applicati8, _formValues$applicati9, _formValues$applicati0, _formValues$applicati1, _formValues$applicati10, _formValues$applicati11, _formValues$applicati12, _formValues$applicati13, _formValues$applicati14, _formValues$applicati15, _formValues$applicati16, _formValues$applicati17, _formValues$applicati18, _formValues$applicati19, _formValues$applicati20, _formValues$applicati21, _formValues$applicati22, _formValues$applicati23, _formValues$applicant, _formValues$applicant2, _formValues$applicant3, _formValues$applicant4, _formValues$applicant5, _formValues$applicant6, _formValues$applicant7, _formValues$useDetail, _formValues$applicant8, _formValues$contact, _formValues$contact2, _formValues$contact3, _formValues$documents, _formValues$djbEmploy, _formValues$djbEmploy2, _formValues$djbEmploy3, _formValues$djbEmploy4, _formValues$djbEmploy5, _formValues$governmen, _formValues$governmen2, _formValues$governmen3, _formValues$governmen4, _formValues$propertyA, _formValues$propertyA2, _formValues$propertyA3, _formValues$propertyA4, _formValues$propertyA5, _formValues$propertyA6, _formValues$propertyA7, _formValues$propertyA8, _formValues$propertyA9, _formValues$propertyA0, _formValues$propertyA1, _formValues$useDetail2, _formValues$useDetail3, _formValues$useDetail4, _formValues$useDetail5, _formValues$useDetail6, _formValues$useDetail7, _formValues$useDetail8, _formValues$useDetail9, _formValues$useDetail0, _formValues$useDetail1, _formValues$useDetail10, _formValues$useDetail11, _formValues$bankDetai, _formValues$bankDetai2, _formValues$bankDetai3, _formValues$bankDetai4, _formValues$documents2, _formValues$documents3, _formValues$documents4, _formValues$documents5, _formValues$documents6, _formValues$documents7, _formValues$documents8, _formValues$documents9, _formValues$documents0, _formValues$documents1, _formValues$declarati, _formValues$declarati2, _formValues$declarati3, _formValues$declarati4, _formValues$declarati5;
+  var _Digit$SessionStorage, _getFieldError, _getFieldError2, _getFieldError3, _getFieldError4, _getFieldError5, _getFieldError6, _getFieldError7, _getFieldError8, _getFieldError9, _getFieldError0, _getFieldError1, _getFieldError10, _getFieldError11, _watch, _watch3, _watch5, _watch7, _watch9, _formValues$applicati, _formValues$applicati2, _formValues$applicati3, _formValues$applicati4, _formValues$applicati5, _formValues$applicati6, _formValues$applicati7, _formValues$applicati8, _formValues$applicati9, _formValues$applicati0, _formValues$applicati1, _formValues$applicati10, _formValues$applicati11, _formValues$applicati12, _formValues$applicati13, _formValues$applicati14, _formValues$applicati15, _formValues$applicati16, _formValues$applicati17, _formValues$applicati18, _formValues$applicati19, _formValues$applicati20, _formValues$applicati21, _formValues$applicati22, _formValues$applicati23, _formValues$applicant, _formValues$applicant2, _formValues$applicant3, _formValues$applicant4, _formValues$applicant5, _formValues$applicant6, _formValues$applicant7, _formValues$useDetail, _formValues$applicant8, _formValues$contact, _formValues$contact2, _formValues$contact3, _formValues$documents, _formValues$djbEmploy, _formValues$djbEmploy2, _formValues$djbEmploy3, _formValues$djbEmploy4, _formValues$djbEmploy5, _formValues$disabilit, _formValues$governmen, _formValues$governmen2, _formValues$governmen3, _formValues$governmen4, _formValues$propertyA, _formValues$propertyA2, _formValues$propertyA3, _formValues$propertyA4, _formValues$propertyA5, _formValues$propertyA6, _formValues$propertyA7, _formValues$propertyA8, _formValues$propertyA9, _formValues$propertyA0, _formValues$propertyA1, _formValues$useDetail2, _formValues$useDetail3, _formValues$useDetail4, _formValues$useDetail5, _formValues$useDetail6, _formValues$useDetail7, _formValues$useDetail8, _formValues$useDetail9, _formValues$useDetail0, _formValues$useDetail1, _formValues$useDetail10, _formValues$useDetail11, _formValues$bankDetai, _formValues$bankDetai2, _formValues$bankDetai3, _formValues$bankDetai4, _formValues$documents2, _formValues$documents3, _formValues$documents4, _formValues$documents5, _formValues$documents6, _formValues$documents7, _formValues$documents8, _formValues$documents9, _formValues$documents0, _formValues$documents1, _formValues$declarati, _formValues$declarati2, _formValues$declarati3, _formValues$declarati4, _formValues$declarati5;
   const _useTranslation2 = reactI18next.useTranslation(),
     t = _useTranslation2.t;
   const history = reactRouterDom.useHistory();
@@ -39154,6 +39413,7 @@ const NewApplication = () => {
     setWaterAndSewerageBoth = _useState12[1];
   const _useState13 = React.useState(new URLSearchParams(location.search).get("propertyId")),
     propertyId = _useState13[0];
+  const initialPropertyQuery = React.useRef(location.search);
   const initialFormValues = buildDefaultValues();
   const _useState14 = React.useState(""),
     city = _useState14[0],
@@ -39246,6 +39506,7 @@ const NewApplication = () => {
     applicant: React__default.useRef(null),
     contact: React__default.useRef(null),
     djbEmployee: React__default.useRef(null),
+    disability: React__default.useRef(null),
     governmentEmployee: React__default.useRef(null),
     propertyAddress: React__default.useRef(null),
     useDetails: React__default.useRef(null),
@@ -39321,7 +39582,11 @@ const NewApplication = () => {
     sectionId: "djbEmployee",
     route: "djb-employee",
     actions: "For DJB Employee"
-  }] : []), ...(isGovernmentEmployee ? [{
+  }] : []), {
+    sectionId: "disability",
+    route: "disability",
+    actions: "Divyangjan/Person with Disability"
+  }, ...(isGovernmentEmployee ? [{
     sectionId: "governmentEmployee",
     route: "government-employee",
     actions: "For Government Employee"
@@ -39402,6 +39667,12 @@ const NewApplication = () => {
     sewerageMutation = _Digit$Hooks$ws$useWa2.mutate;
   const _Digit$Hooks$ws$useWS4 = Digit.Hooks.ws.useWSApplicationActions("SEWERAGE"),
     sewerageUpdateMutation = _Digit$Hooks$ws$useWS4.mutate;
+  React.useEffect(() => {
+    if (location.search !== initialPropertyQuery.current) {
+      window.sessionStorage.removeItem(FORM_STORAGE_KEY);
+      history.replace("/digit-ui/employee/ws/info");
+    }
+  }, [history, location.search]);
   React.useEffect(() => {
     if (!isGovernmentOrganization) {
       setValue("applicant.governmentOrganizationName", "");
@@ -40474,6 +40745,23 @@ const NewApplication = () => {
       minHeight: "96px"
     }
   })))), /*#__PURE__*/React__default.createElement(SectionCard, {
+    description: "Please indicate whether the applicant is a Divyangjan/Person with Disability.",
+    isOpen: collapsedSections.disability,
+    onToggle: toggleSection,
+    sectionKey: "disability",
+    title: "Divyangjan/Person with Disability?",
+    sectionRef: sectionRefs.disability
+  }, /*#__PURE__*/React__default.createElement(FieldBlock, {
+    label: "Divyangjan/Person with Disability?"
+  }, /*#__PURE__*/React__default.createElement(reactHookForm.Controller, {
+    control: control,
+    name: "disability.isDivyangjan",
+    render: props => /*#__PURE__*/React__default.createElement(digitUiReactComponents.CheckBox, {
+      checked: !!props.value,
+      label: "Divyangjan/Person with Disability?",
+      onChange: event => props.onChange(event.target.checked)
+    })
+  }))), /*#__PURE__*/React__default.createElement(SectionCard, {
     description: t("WS_PROPERTY_ADDRESS_DESC"),
     isOpen: collapsedSections.address,
     onToggle: toggleSection,
@@ -41295,7 +41583,17 @@ const NewApplication = () => {
     isFullWidth: true,
     label: "Office Name & Address",
     value: formValues === null || formValues === void 0 ? void 0 : (_formValues$djbEmploy5 = formValues.djbEmployee) === null || _formValues$djbEmploy5 === void 0 ? void 0 : _formValues$djbEmploy5.officeNameAndAddress
-  })) : null), (formValues === null || formValues === void 0 ? void 0 : (_formValues$governmen = formValues.governmentEmployee) === null || _formValues$governmen === void 0 ? void 0 : _formValues$governmen.isGovernmentEmployee) && /*#__PURE__*/React__default.createElement(SectionCard, {
+  })) : null), /*#__PURE__*/React__default.createElement(SectionCard, {
+    description: "Divyangjan/Person with Disability declaration.",
+    isOpen: collapsedSections.disability,
+    onToggle: toggleSection,
+    sectionKey: "disability",
+    title: "Divyangjan/Person with Disability?",
+    onEditClick: () => handleSectionEdit("disability")
+  }, /*#__PURE__*/React__default.createElement(PreviewItem, {
+    label: "Divyangjan/Person with Disability?",
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$disabilit = formValues.disability) === null || _formValues$disabilit === void 0 ? void 0 : _formValues$disabilit.isDivyangjan
+  })), (formValues === null || formValues === void 0 ? void 0 : (_formValues$governmen = formValues.governmentEmployee) === null || _formValues$governmen === void 0 ? void 0 : _formValues$governmen.isGovernmentEmployee) && /*#__PURE__*/React__default.createElement(SectionCard, {
     description: "Government employee organization details.",
     isOpen: collapsedSections.governmentEmployee,
     onToggle: toggleSection,
@@ -43483,6 +43781,8 @@ const ActionModal$5 = _ref => {
     submitAction = _ref.submitAction,
     applicationData = _ref.applicationData,
     businessService = _ref.businessService,
+    approvalChecklist = _ref.approvalChecklist,
+    showApprovalChecklist = _ref.showApprovalChecklist,
     cardClassName = _ref.cardClassName,
     cardFormWrapperClassName = _ref.cardFormWrapperClassName,
     cardFormClassName = _ref.cardFormClassName,
@@ -43585,7 +43885,7 @@ const ActionModal$5 = _ref => {
     })();
   }, [file]);
   function submit(data) {
-    var _applicationData4, _applicationData0, _applicationData1, _applicationData1$app, _applicationData10, _applicationData10$pr, _applicationData11, _applicationData11$pr, _applicationData13, _applicationData14;
+    var _applicationData4, _applicationData0, _applicationData10, _applicationData10$ap, _applicationData11, _applicationData11$pr, _applicationData12, _applicationData12$pr, _applicationData14, _applicationData15;
     let commentValue = (data === null || data === void 0 ? void 0 : data.comments) || "";
     if (isReasonRequiredAction) {
       var _commentValue;
@@ -43672,36 +43972,45 @@ const ActionModal$5 = _ref => {
         }] : []
       })
     });
-    if (data !== null && data !== void 0 && data.date && (_applicationData1 = applicationData) !== null && _applicationData1 !== void 0 && (_applicationData1$app = _applicationData1.applicationType) !== null && _applicationData1$app !== void 0 && _applicationData1$app.includes("DISCONNECT")) {
+    if (showApprovalChecklist) {
+      var _applicationData1;
+      applicationData.additionalDetails = _extends({}, (_applicationData1 = applicationData) === null || _applicationData1 === void 0 ? void 0 : _applicationData1.additionalDetails, {
+        waterPipelineFacility: (approvalChecklist === null || approvalChecklist === void 0 ? void 0 : approvalChecklist.waterPipelineFacility) === true,
+        infrastructureChargesApplicable: (approvalChecklist === null || approvalChecklist === void 0 ? void 0 : approvalChecklist.infrastructureChargesApplicable) === true,
+        rainWaterHarvesting: (approvalChecklist === null || approvalChecklist === void 0 ? void 0 : approvalChecklist.rainWaterHarvesting) === true,
+        bulkConnectionVerification: (approvalChecklist === null || approvalChecklist === void 0 ? void 0 : approvalChecklist.bulkConnectionVerification) === true
+      });
+    }
+    if (data !== null && data !== void 0 && data.date && (_applicationData10 = applicationData) !== null && _applicationData10 !== void 0 && (_applicationData10$ap = _applicationData10.applicationType) !== null && _applicationData10$ap !== void 0 && _applicationData10$ap.includes("DISCONNECT")) {
       const disconnectionExecutionDate = cloneDeep_1(data === null || data === void 0 ? void 0 : data.date);
       applicationData.disconnectionExecutionDate = convertDateToEpochNew$1(disconnectionExecutionDate);
     } else if (data !== null && data !== void 0 && data.date) {
       const connectionExecutionDate = cloneDeep_1(data === null || data === void 0 ? void 0 : data.date);
       applicationData.connectionExecutionDate = convertDateToEpochNew$1(connectionExecutionDate);
     }
-    if (((_applicationData10 = applicationData) === null || _applicationData10 === void 0 ? void 0 : (_applicationData10$pr = _applicationData10.processInstance) === null || _applicationData10$pr === void 0 ? void 0 : _applicationData10$pr.businessService) == "DisconnectWSConnection" || ((_applicationData11 = applicationData) === null || _applicationData11 === void 0 ? void 0 : (_applicationData11$pr = _applicationData11.processInstance) === null || _applicationData11$pr === void 0 ? void 0 : _applicationData11$pr.businessService) == "DisconnectSWConnection" || window.location.href.includes("disconnection")) {
-      var _applicationData12;
-      ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.serviceType) == "WATER" ? submitAction({
+    if (((_applicationData11 = applicationData) === null || _applicationData11 === void 0 ? void 0 : (_applicationData11$pr = _applicationData11.processInstance) === null || _applicationData11$pr === void 0 ? void 0 : _applicationData11$pr.businessService) == "DisconnectWSConnection" || ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : (_applicationData12$pr = _applicationData12.processInstance) === null || _applicationData12$pr === void 0 ? void 0 : _applicationData12$pr.businessService) == "DisconnectSWConnection" || window.location.href.includes("disconnection")) {
+      var _applicationData13;
+      ((_applicationData13 = applicationData) === null || _applicationData13 === void 0 ? void 0 : _applicationData13.serviceType) == "WATER" ? submitAction({
         WaterConnection: applicationData,
         disconnectRequest: true
       }) : submitAction({
         SewerageConnection: applicationData,
         disconnectRequest: true
       });
-    } else if (((_applicationData13 = applicationData) === null || _applicationData13 === void 0 ? void 0 : _applicationData13.applicationType) == "SEWERAGE_RECONNECTION") {
+    } else if (((_applicationData14 = applicationData) === null || _applicationData14 === void 0 ? void 0 : _applicationData14.applicationType) == "SEWERAGE_RECONNECTION") {
       submitAction({
         SewerageConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: true
       });
-    } else if (((_applicationData14 = applicationData) === null || _applicationData14 === void 0 ? void 0 : _applicationData14.applicationType) == "WATER_RECONNECTION") {
+    } else if (((_applicationData15 = applicationData) === null || _applicationData15 === void 0 ? void 0 : _applicationData15.applicationType) == "WATER_RECONNECTION") {
       submitAction({
         WaterConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: true
       });
     } else {
-      var _parsedAdhocRebateDat, _parsedAdhocRebateDat2, _parsedAdhocRebateDat3, _parsedAdhocRebateDat4, _parsedAdhocRebateDat5, _parsedAdhocRebateDat6, _parsedAdhocRebateDat7, _parsedAdhocRebateDat8, _parsedAdhocRebateDat9, _parsedAdhocRebateDat0, _parsedAdhocRebateDat1, _parsedAdhocRebateDat10, _applicationData15;
+      var _parsedAdhocRebateDat, _parsedAdhocRebateDat2, _parsedAdhocRebateDat3, _parsedAdhocRebateDat4, _parsedAdhocRebateDat5, _parsedAdhocRebateDat6, _parsedAdhocRebateDat7, _parsedAdhocRebateDat8, _parsedAdhocRebateDat9, _parsedAdhocRebateDat0, _parsedAdhocRebateDat1, _parsedAdhocRebateDat10, _applicationData16;
       const adhocRebateData = sessionStorage.getItem("Digit.ADHOC_ADD_REBATE_DATA");
       const parsedAdhocRebateData = adhocRebateData ? JSON.parse(adhocRebateData) : "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat !== void 0 && _parsedAdhocRebateDat.adhocPenalty) applicationData.additionalDetails.adhocPenalty = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat2 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat2 === void 0 ? void 0 : _parsedAdhocRebateDat2.adhocPenalty) || "";
@@ -43710,7 +44019,7 @@ const ActionModal$5 = _ref => {
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat7 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat7 !== void 0 && _parsedAdhocRebateDat7.adhocRebate) applicationData.additionalDetails.adhocRebate = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat8 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat8 === void 0 ? void 0 : _parsedAdhocRebateDat8.adhocRebate) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat9 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat9 !== void 0 && _parsedAdhocRebateDat9.adhocRebateComment) applicationData.additionalDetails.adhocRebateComment = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat0 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat0 === void 0 ? void 0 : _parsedAdhocRebateDat0.adhocRebateComment) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat1 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat1 !== void 0 && _parsedAdhocRebateDat1.adhocRebateReason) applicationData.additionalDetails.adhocRebateReason = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat10 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat10 === void 0 ? void 0 : _parsedAdhocRebateDat10.adhocRebateReason) || "";
-      ((_applicationData15 = applicationData) === null || _applicationData15 === void 0 ? void 0 : _applicationData15.serviceType) == "WATER" ? submitAction({
+      ((_applicationData16 = applicationData) === null || _applicationData16 === void 0 ? void 0 : _applicationData16.serviceType) == "WATER" ? submitAction({
         WaterConnection: applicationData,
         disconnectRequest: false,
         reconnectRequest: false
@@ -43722,8 +44031,8 @@ const ActionModal$5 = _ref => {
     }
   }
   React.useEffect(() => {
-    var _applicationData16, _applicationData16$pr, _applicationData17, _applicationData17$pr;
-    if (((_applicationData16 = applicationData) === null || _applicationData16 === void 0 ? void 0 : (_applicationData16$pr = _applicationData16.processInstance) === null || _applicationData16$pr === void 0 ? void 0 : _applicationData16$pr.businessService) == "DisconnectWSConnection" || ((_applicationData17 = applicationData) === null || _applicationData17 === void 0 ? void 0 : (_applicationData17$pr = _applicationData17.processInstance) === null || _applicationData17$pr === void 0 ? void 0 : _applicationData17$pr.businessService) == "DisconnectSWConnection") {
+    var _applicationData17, _applicationData17$pr, _applicationData18, _applicationData18$pr;
+    if (((_applicationData17 = applicationData) === null || _applicationData17 === void 0 ? void 0 : (_applicationData17$pr = _applicationData17.processInstance) === null || _applicationData17$pr === void 0 ? void 0 : _applicationData17$pr.businessService) == "DisconnectWSConnection" || ((_applicationData18 = applicationData) === null || _applicationData18 === void 0 ? void 0 : (_applicationData18$pr = _applicationData18.processInstance) === null || _applicationData18$pr === void 0 ? void 0 : _applicationData18$pr.businessService) == "DisconnectSWConnection") {
       if (action) {
         setConfig(configWSDisConnectApplication({
           t,
@@ -43755,11 +44064,12 @@ const ActionModal$5 = _ref => {
           selectedReason,
           setSelectedReason,
           otherReasonText,
-          setOtherReasonText
+          setOtherReasonText,
+          applicationData
         }));
       }
     }
-  }, [action, approvers, uploadedFile, error, isReasonRequiredAction, selectedReason, otherReasonText]);
+  }, [action, approvers, uploadedFile, error, isReasonRequiredAction, selectedReason, otherReasonText, showApprovalChecklist, approvalChecklist, applicationData]);
   return action && config.form ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
     headerBarMain: /*#__PURE__*/React__default.createElement(Heading$5, {
       label: t(config.label.heading)
@@ -45826,9 +46136,9 @@ function PropertyDocuments(_ref) {
       var _document$values;
       document === null || document === void 0 ? void 0 : (_document$values = document.values) === null || _document$values === void 0 ? void 0 : _document$values.forEach(value => {
         if (!value.isPhoto) {
-          var _ref2, _checkedMap$value$fil, _value$originalDoc;
+          var _ref2, _ref3, _checkedMap$value$fil, _value$originalDoc;
           requiredDocsCount++;
-          const isChecked = (_ref2 = (_checkedMap$value$fil = checkedMap[value === null || value === void 0 ? void 0 : value.fileStoreId]) != null ? _checkedMap$value$fil : value === null || value === void 0 ? void 0 : (_value$originalDoc = value.originalDoc) === null || _value$originalDoc === void 0 ? void 0 : _value$originalDoc.isVerified) != null ? _ref2 : false;
+          const isChecked = (_ref2 = (_ref3 = (_checkedMap$value$fil = checkedMap[value === null || value === void 0 ? void 0 : value.fileStoreId]) != null ? _checkedMap$value$fil : value === null || value === void 0 ? void 0 : value.isVerified) != null ? _ref3 : value === null || value === void 0 ? void 0 : (_value$originalDoc = value.originalDoc) === null || _value$originalDoc === void 0 ? void 0 : _value$originalDoc.isVerified) != null ? _ref2 : false;
           if (isChecked) {
             checkedCount++;
           }
@@ -45866,6 +46176,7 @@ function PropertyDocuments(_ref) {
   const checkLocation = window.location.href.includes("employee/tl") || window.location.href.includes("/obps") || window.location.href.includes("employee/ws");
   const isWSLocation = window.location.href.includes("employee/ws");
   const isStakeholderApplication = window.location.href.includes("stakeholder");
+  const canVerifyDocuments = ["PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationStatus);
   const getDocSubType = documentType => {
     if (!documentType) return "";
     const parts = documentType.split(".");
@@ -46072,7 +46383,7 @@ function PropertyDocuments(_ref) {
         style: {
           cursor: "pointer"
         }
-      }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.ViewsIcon, null)), !isPhoto && ((_ref3, _checkedMap$value$fil2, _value$originalDoc2, _value$originalDoc3, _ref4, _checkedMap$value$fil3, _value$originalDoc4) => {
+      }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.ViewsIcon, null)), !isPhoto && ((_ref4, _ref5, _checkedMap$value$fil2, _value$originalDoc2, _value$isVerified, _value$originalDoc3, _ref6, _ref7, _checkedMap$value$fil3, _value$originalDoc4) => {
         return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
           onClick: () => {
             if (fileUrl) {
@@ -46104,7 +46415,7 @@ function PropertyDocuments(_ref) {
           y1: "15",
           x2: "12",
           y2: "3"
-        }))), applicationStatus !== "PENDING_FOR_PAYMENT" && applicationStatus !== "WF_PENDING_FOR_PAYMENT" && /*#__PURE__*/React__default.createElement("label", {
+        }))), canVerifyDocuments && /*#__PURE__*/React__default.createElement("label", {
           style: {
             display: "flex",
             alignItems: "center",
@@ -46114,19 +46425,20 @@ function PropertyDocuments(_ref) {
             margin: 0
           }
         }, /*#__PURE__*/React__default.createElement("input", {
-          key: "chk-" + (value === null || value === void 0 ? void 0 : value.fileStoreId) + "-" + (value === null || value === void 0 ? void 0 : (_value$originalDoc3 = value.originalDoc) === null || _value$originalDoc3 === void 0 ? void 0 : _value$originalDoc3.isVerified),
+          key: "chk-" + (value === null || value === void 0 ? void 0 : value.fileStoreId) + "-" + ((_value$isVerified = value === null || value === void 0 ? void 0 : value.isVerified) != null ? _value$isVerified : value === null || value === void 0 ? void 0 : (_value$originalDoc3 = value.originalDoc) === null || _value$originalDoc3 === void 0 ? void 0 : _value$originalDoc3.isVerified),
           type: "checkbox",
           className: "verify-doc-checkbox",
           style: {
             width: "18px",
             height: "18px",
-            accentColor: "#F47738",
-            cursor: applicationStatus && applicationStatus !== "PENDING_FOR_DOCUMENT_VERIFICATION" && applicationStatus !== "PENDING_APPROVAL_FOR_MUTATION" ? "not-allowed" : "pointer"
+            accentColor: "#1a67a3",
+            cursor: applicationStatus === "PENDING_FOR_CONNECTION_ACTIVATION" ? "not-allowed" : "pointer"
           },
-          disabled: applicationStatus && applicationStatus !== "PENDING_FOR_DOCUMENT_VERIFICATION" && applicationStatus !== "PENDING_APPROVAL_FOR_MUTATION" && applicationStatus !== "ACTIVATE_MUTATION",
-          checked: applicationStatus === "PENDING_FOR_MUTATION_ACTIVATION" || ((_ref4 = (_checkedMap$value$fil3 = checkedMap[value === null || value === void 0 ? void 0 : value.fileStoreId]) != null ? _checkedMap$value$fil3 : value === null || value === void 0 ? void 0 : (_value$originalDoc4 = value.originalDoc) === null || _value$originalDoc4 === void 0 ? void 0 : _value$originalDoc4.isVerified) != null ? _ref4 : false),
+          disabled: applicationStatus === "PENDING_FOR_CONNECTION_ACTIVATION",
+          checked: (_ref6 = (_ref7 = (_checkedMap$value$fil3 = checkedMap[value === null || value === void 0 ? void 0 : value.fileStoreId]) != null ? _checkedMap$value$fil3 : value === null || value === void 0 ? void 0 : value.isVerified) != null ? _ref7 : value === null || value === void 0 ? void 0 : (_value$originalDoc4 = value.originalDoc) === null || _value$originalDoc4 === void 0 ? void 0 : _value$originalDoc4.isVerified) != null ? _ref6 : false,
           onChange: e => {
             const checked = e.target.checked;
+            value.isVerified = checked;
             if (value !== null && value !== void 0 && value.originalDoc) {
               value.originalDoc.isVerified = checked;
             }
@@ -47223,8 +47535,8 @@ const DueVerification = _ref => {
       return newData;
     });
   }, [applicationData]);
-  const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION";
-  const isActivation = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "PENDING_FOR_CONNECTION_ACTIVATION", "CONNECTION_ACTIVATED"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
+  const isPendingApproval = ["PENDING_FOR_FIELD_INSPECTION", "PENDING_FOR_ZRO_APPROVAL"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
+  const isActivation = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "PENDING_FOR_CONNECTION_ACTIVATION", "CONNECTION_ACTIVATED"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
   const columns = React.useMemo(() => {
     const baseColumns = [{
       Header: t("K No."),
@@ -47273,6 +47585,51 @@ const DueVerification = _ref => {
   const _useState4 = React.useState(null),
     showToast = _useState4[0],
     setShowToast = _useState4[1];
+  const _useState5 = React.useState(null),
+    zroDropdownOptions = _useState5[0],
+    setZroDropdownOptions = _useState5[1];
+  const _useState6 = React.useState(null),
+    selectedZroOption = _useState6[0],
+    setSelectedZroOption = _useState6[1];
+  const isZROApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_ZRO_APPROVAL";
+  React.useEffect(() => {
+    let isMounted = true;
+    const fetchDueVerification = function () {
+      try {
+        return Promise.resolve(function () {
+          if (isZROApproval && applicationData !== null && applicationData !== void 0 && applicationData.applicationNo) {
+            return _catch(function () {
+              return Promise.resolve(checkDueVerification({
+                DueVerification: {
+                  applicationNo: applicationData.applicationNo
+                }
+              })).then(function (response) {
+                if (!isMounted) return;
+                const dueVerifications = Array.isArray(response) ? response : (response === null || response === void 0 ? void 0 : response.DueVerifications) || (response === null || response === void 0 ? void 0 : response.dueVerifications) || (response === null || response === void 0 ? void 0 : response.dueVerification) || [];
+                if (dueVerifications && dueVerifications.length > 0) {
+                  const options = dueVerifications.map(item => _extends({
+                    code: item.kno,
+                    name: item.kno
+                  }, item));
+                  setZroDropdownOptions(options);
+                } else {
+                  setZroDropdownOptions([]);
+                }
+              });
+            }, function (error) {
+              console.error("Error auto-fetching due verification:", error);
+            });
+          }
+        }());
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    fetchDueVerification();
+    return () => {
+      isMounted = false;
+    };
+  }, [isZROApproval, applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNo]);
   const handleAdd = function () {
     try {
       return Promise.resolve(function () {
@@ -47362,13 +47719,23 @@ const DueVerification = _ref => {
     style: {
       color: "red"
     }
-  }, "*")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+  }, "*")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
+    option: zroDropdownOptions,
+    select: val => {
+      setSelectedZroOption(val);
+      setKno(val.code);
+    },
+    selected: selectedZroOption,
+    optionKey: "name",
+    t: t,
+    placeholder: t("WS_SELECT_KNO_PLACEHOLDER") || "Select K No."
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
     type: "text",
     value: kno,
     onChange: e => setKno(e.target.value),
     style: {
       width: "100%",
-      marginBottom: "0"
+      marginTop: "10px"
     }
   })), /*#__PURE__*/React__default.createElement("div", {
     style: {
@@ -47383,9 +47750,10 @@ const DueVerification = _ref => {
       padding: "8px 24px",
       borderRadius: "4px",
       border: "none",
-      cursor: "pointer"
+      cursor: "pointer",
+      color: "white"
     }
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.AddIcon, null)))), tableData.length > 0 && /*#__PURE__*/React__default.createElement("div", {
+  }, "Search"))), tableData.length > 0 && /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginTop: "15px",
       overflowX: "auto"
@@ -47408,148 +47776,81 @@ const DueVerification = _ref => {
   }));
 };
 
-const InspectionInformation = _ref => {
-  let applicationData = _ref.applicationData;
-  const _useTranslation = reactI18next.useTranslation(),
-    t = _useTranslation.t;
-  const defaultInspectionType = {
-    i18nKey: "New Connection Visit",
-    code: "new_connection_visit"
-  };
-  const _useState = React.useState(defaultInspectionType),
-    inspectionType = _useState[0],
-    setInspectionType = _useState[1];
-  const _useState2 = React.useState(""),
-    inspectionDate = _useState2[0],
-    setInspectionDate = _useState2[1];
-  const _useState3 = React.useState(""),
-    inspectorName = _useState3[0],
-    setInspectorName = _useState3[1];
-  React.useEffect(() => {
-    if (applicationData) {
-      if (!applicationData.inspectionInformation) {
-        applicationData.inspectionInformation = {};
-      }
-      if (!applicationData.inspectionInformation.inspectionType) {
-        applicationData.inspectionInformation.inspectionType = defaultInspectionType;
-      }
-      const apiInspectionType = applicationData.inspectionInformation.inspectionType;
-      let matchedType = null;
-      const inspectionCode = typeof apiInspectionType === "object" && apiInspectionType !== null ? apiInspectionType.code : apiInspectionType;
-      if (inspectionCode) {
-        matchedType = [{
-          i18nKey: "New Connection Visit",
-          code: "new_connection_visit"
-        }].find(opt => opt.code === inspectionCode || opt.i18nKey === inspectionCode);
-      }
-      setInspectionType(matchedType || defaultInspectionType);
-      let dateValue = applicationData.inspectionInformation.inspectionDate || "";
-      if (dateValue && typeof dateValue === 'number') {
-        const d = new Date(dateValue);
-        dateValue = d.getFullYear() + "-" + String(d.getMonth() + 1).padStart(2, '0') + "-" + String(d.getDate()).padStart(2, '0');
-      } else if (dateValue && typeof dateValue === 'string' && dateValue.includes('-')) ; else if (dateValue) {
-        const num = Number(dateValue);
-        if (!isNaN(num)) {
-          const d = new Date(num);
-          dateValue = d.getFullYear() + "-" + String(d.getMonth() + 1).padStart(2, '0') + "-" + String(d.getDate()).padStart(2, '0');
-        }
-      }
-      setInspectionDate(dateValue);
-      setInspectorName(applicationData.inspectionInformation.inspectorName || "");
-    }
-  }, [applicationData]);
-  const inspectionTypeOptions = [{
-    i18nKey: "New Connection Visit",
-    code: "new_connection_visit"
+const getWSCurrentState = (applicationData, workflowDetails) => {
+  var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0;
+  return (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.processInstances) === null || _workflowDetails$data2 === void 0 ? void 0 : (_workflowDetails$data3 = _workflowDetails$data2[0]) === null || _workflowDetails$data3 === void 0 ? void 0 : (_workflowDetails$data4 = _workflowDetails$data3.state) === null || _workflowDetails$data4 === void 0 ? void 0 : _workflowDetails$data4.state) || (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data5 = workflowDetails.data) === null || _workflowDetails$data5 === void 0 ? void 0 : (_workflowDetails$data6 = _workflowDetails$data5.ProcessInstances) === null || _workflowDetails$data6 === void 0 ? void 0 : (_workflowDetails$data7 = _workflowDetails$data6[0]) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7.state) === null || _workflowDetails$data8 === void 0 ? void 0 : _workflowDetails$data8.state) || (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data9 = workflowDetails.data) === null || _workflowDetails$data9 === void 0 ? void 0 : (_workflowDetails$data0 = _workflowDetails$data9.actionState) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.state) || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.status);
+};
+const isWSApprovalChecklistState = (applicationData, workflowDetails) => getWSCurrentState(applicationData, workflowDetails) === "PENDING_FOR_EE_APPROVAL";
+const getWSApprovalChecklistFields = applicationData => {
+  var _applicationData$addi, _applicationData$addi2, _applicationData$prop, _applicationData$prop2;
+  const plotArea = Number((applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addi = applicationData.additionalDetails) === null || _applicationData$addi === void 0 ? void 0 : _applicationData$addi.plotArea) || (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addi2 = applicationData.additionalDetails) === null || _applicationData$addi2 === void 0 ? void 0 : _applicationData$addi2.plotSize) || (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$prop = applicationData.property) === null || _applicationData$prop === void 0 ? void 0 : _applicationData$prop.landArea) || (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$prop2 = applicationData.property) === null || _applicationData$prop2 === void 0 ? void 0 : _applicationData$prop2.plotArea) || 0);
+  return [{
+    name: "waterPipelineFacility",
+    label: "Water Pipeline Facility",
+    isMandatory: true
+  }, {
+    name: "infrastructureChargesApplicable",
+    label: "Infrastructure Charges Applicable",
+    isMandatory: plotArea > 200
+  }, {
+    name: "rainWaterHarvesting",
+    label: "Rainwater Harvesting",
+    isMandatory: false
+  }, {
+    name: "bulkConnectionVerification",
+    label: "Bulk Connection Verification",
+    isMandatory: false
   }];
-  const handleInspectionTypeChange = selected => {
-    setInspectionType(selected);
-    if (!applicationData.inspectionInformation) applicationData.inspectionInformation = {};
-    applicationData.inspectionInformation.inspectionType = selected;
-  };
-  const handleInspectionDateChange = date => {
-    setInspectionDate(date);
-    if (!applicationData.inspectionInformation) applicationData.inspectionInformation = {};
-    applicationData.inspectionInformation.inspectionDate = date ? new Date(date).getTime() : null;
-  };
-  const handleInspectorNameChange = e => {
-    const val = e.target.value;
-    setInspectorName(val);
-    if (!applicationData.inspectionInformation) applicationData.inspectionInformation = {};
-    applicationData.inspectionInformation.inspectorName = val;
-  };
-  const readOnly = ["PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "PENDING_FOR_CONNECTION_ACTIVATION", "CONNECTION_ACTIVATED"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus);
+};
+const isWSApprovalChecklistComplete = function (applicationData, values) {
+  if (values === void 0) {
+    values = {};
+  }
+  return getWSApprovalChecklistFields(applicationData).filter(field => field.isMandatory).every(field => {
+    var _values;
+    return ((_values = values) === null || _values === void 0 ? void 0 : _values[field.name]) === true;
+  });
+};
+const WSApprovalChecklist = _ref => {
+  let applicationData = _ref.applicationData,
+    showApprovalChecklist = _ref.showApprovalChecklist,
+    _ref$values = _ref.values,
+    values = _ref$values === void 0 ? {} : _ref$values,
+    onChange = _ref.onChange;
+  if (!showApprovalChecklist) return null;
   return /*#__PURE__*/React__default.createElement("div", {
     style: {
-      marginBottom: "20px"
+      marginTop: "24px",
+      padding: "16px",
+      border: "1px solid #D6D5D4",
+      borderRadius: "4px",
+      background: "#FAFAFA"
     }
-  }, /*#__PURE__*/React__default.createElement("h2", {
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
     style: {
-      fontSize: "24px",
-      fontWeight: "bold",
-      marginBottom: "16px"
+      margin: "0 0 16px",
+      color: "#0B0C0C",
+      fontSize: "20px"
     }
-  }, t("Inspection Information")), /*#__PURE__*/React__default.createElement("div", {
+  }, "Approval Checklist"), /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
-      gap: "20px",
-      marginBottom: "20px",
-      flexWrap: "wrap"
-    }
-  }, /*#__PURE__*/React__default.createElement("div", {
-    style: {
-      flex: 1
-    }
-  }, /*#__PURE__*/React__default.createElement("span", {
-    style: {
-      fontSize: "16px",
-      marginBottom: "8px",
-      display: "inline-block"
-    }
-  }, t("Inspection Type")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
-    option: inspectionTypeOptions,
-    optionKey: "i18nKey",
-    selected: inspectionType,
-    select: handleInspectionTypeChange,
-    t: t,
-    disable: readOnly
-  })), /*#__PURE__*/React__default.createElement("div", {
-    style: {
-      flex: 1
-    }
-  }, /*#__PURE__*/React__default.createElement("span", {
-    style: {
-      fontSize: "16px",
-      marginBottom: "8px",
-      display: "inline-block"
-    }
-  }, t("Inspection Date")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.DatePicker, {
-    date: inspectionDate,
-    onChange: handleInspectionDateChange,
-    disabled: readOnly
-  }))), /*#__PURE__*/React__default.createElement("div", {
-    style: {
-      display: "flex"
-    }
-  }, /*#__PURE__*/React__default.createElement("div", {
-    style: {
-      flex: 1
-    }
-  }, /*#__PURE__*/React__default.createElement("span", {
-    style: {
-      fontSize: "16px",
-      marginBottom: "8px",
-      display: "inline-block"
-    }
-  }, t("Inspector Name")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
-    value: inspectorName,
-    onChange: handleInspectorNameChange,
-    disabled: readOnly
+      flexDirection: "column",
+      gap: "14px"
+    }
+  }, getWSApprovalChecklistFields(applicationData).map(field => /*#__PURE__*/React__default.createElement(digitUiReactComponents.CheckBox, {
+    key: field.name,
+    pageType: "employee",
+    label: "" + field.label + (field.isMandatory ? " *" : ""),
+    checked: (values === null || values === void 0 ? void 0 : values[field.name]) === true,
+    onChange: event => onChange(_extends({}, values, {
+      [field.name]: event.target.checked
+    }))
   }))));
 };
 
 function ApplicationDetailsContent(_ref) {
-  var _applicationDetails$a, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data19, _workflowDetails$data20;
+  var _applicationDetails$a, _applicationDetails$a2, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _workflowDetails$data19, _workflowDetails$data20, _workflowDetails$data21, _workflowDetails$data29, _workflowDetails$data30;
   let applicationDetails = _ref.applicationDetails,
     workflowDetails = _ref.workflowDetails,
     isDataLoading = _ref.isDataLoading,
@@ -47563,7 +47864,11 @@ function ApplicationDetailsContent(_ref) {
     paymentsList = _ref.paymentsList,
     oldValue = _ref.oldValue,
     _ref$isInfoLabel = _ref.isInfoLabel,
-    isInfoLabel = _ref$isInfoLabel === void 0 ? false : _ref$isInfoLabel;
+    isInfoLabel = _ref$isInfoLabel === void 0 ? false : _ref$isInfoLabel,
+    approvalChecklist = _ref.approvalChecklist,
+    onApprovalChecklistChange = _ref.onApprovalChecklistChange,
+    _ref$showApprovalChec = _ref.showApprovalChecklist,
+    showApprovalChecklist = _ref$showApprovalChec === void 0 ? false : _ref$showApprovalChec;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const _useState = React.useState(false),
@@ -47725,6 +48030,7 @@ function ApplicationDetailsContent(_ref) {
     if (window.location.href.includes("employee/obps") || window.location.href.includes("employee/noc")) {
       return {
         justifyContent: "space-between",
+        gap: "24px",
         fontSize: "16px",
         lineHeight: "19px",
         color: "#0B0C0C"
@@ -47732,6 +48038,7 @@ function ApplicationDetailsContent(_ref) {
     } else if (checkLocation) {
       return {
         justifyContent: "space-between",
+        gap: "24px",
         fontSize: "16px",
         lineHeight: "19px",
         color: "#0B0C0C"
@@ -47817,6 +48124,10 @@ function ApplicationDetailsContent(_ref) {
   const handleViewClick = data => {
     setShowPopup(true);
   };
+  const documentsDetailIndex = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a = applicationDetails.applicationDetails) === null || _applicationDetails$a === void 0 ? void 0 : _applicationDetails$a.findIndex(detail => {
+    var _detail$additionalDet;
+    return detail === null || detail === void 0 ? void 0 : (_detail$additionalDet = detail.additionalDetails) === null || _detail$additionalDet === void 0 ? void 0 : _detail$additionalDet.documents;
+  });
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
     style: {
       position: "relative"
@@ -47829,8 +48140,8 @@ function ApplicationDetailsContent(_ref) {
     infoClickLable: "WS_CLICK_ON_LABEL",
     infoClickInfoLabel: getClickInfoDetails(),
     infoClickInfoLabel1: getClickInfoDetails1()
-  }) : null, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a = applicationDetails.applicationDetails) === null || _applicationDetails$a === void 0 ? void 0 : _applicationDetails$a.map((detail, index) => {
-    var _detail$title, _detail$values, _detail$additionalDet, _applicationDetails$a2, _applicationDetails$a3, _applicationDetails$a4, _detail$additionalDet2, _applicationDetails$a5, _applicationDetails$a6, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet0, _detail$additionalDet1, _detail$additionalDet10, _detail$additionalDet11, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _applicationData$appl, _detail$additionalDet20, _applicationData$appl2, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27, _detail$additionalDet28, _detail$additionalDet29;
+  }) : null, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a2 = applicationDetails.applicationDetails) === null || _applicationDetails$a2 === void 0 ? void 0 : _applicationDetails$a2.map((detail, index) => {
+    var _detail$title, _detail$values, _detail$additionalDet2, _applicationDetails$a3, _applicationDetails$a4, _applicationDetails$a5, _detail$additionalDet3, _applicationDetails$a6, _applicationDetails$a7, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _detail$additionalDet0, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet1, _detail$additionalDet10, _detail$additionalDet11, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _detail$additionalDet20, _applicationData$appl, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27, _detail$additionalDet28, _detail$additionalDet29;
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
       key: index
     }, /*#__PURE__*/React__default.createElement("div", {
@@ -48021,49 +48332,47 @@ function ApplicationDetailsContent(_ref) {
       }), value.title === "PT_TOTAL_DUES" ? /*#__PURE__*/React__default.createElement(ArrearSummary, {
         bill: (_fetchBillData$Bill = fetchBillData.Bill) === null || _fetchBillData$Bill === void 0 ? void 0 : _fetchBillData$Bill[0]
       }) : "");
-    })))), (detail === null || detail === void 0 ? void 0 : detail.belowComponent) && /*#__PURE__*/React__default.createElement(detail.belowComponent, null), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet = detail.additionalDetails) === null || _detail$additionalDet === void 0 ? void 0 : _detail$additionalDet.inspectionReport) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
+    })))), (detail === null || detail === void 0 ? void 0 : detail.belowComponent) && /*#__PURE__*/React__default.createElement(detail.belowComponent, null), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet2 = detail.additionalDetails) === null || _detail$additionalDet2 === void 0 ? void 0 : _detail$additionalDet2.inspectionReport) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails,
       paymentsList: paymentsList
-    }), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a2 = applicationDetails.applicationData) === null || _applicationDetails$a2 === void 0 ? void 0 : (_applicationDetails$a3 = _applicationDetails$a2.additionalDetails) === null || _applicationDetails$a3 === void 0 ? void 0 : (_applicationDetails$a4 = _applicationDetails$a3.fieldinspection_pending) === null || _applicationDetails$a4 === void 0 ? void 0 : _applicationDetails$a4.length) > 0 && (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet2 = detail.additionalDetails) === null || _detail$additionalDet2 === void 0 ? void 0 : _detail$additionalDet2.fiReport) && /*#__PURE__*/React__default.createElement(InspectionReport, {
-      fiReport: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a5 = applicationDetails.applicationData) === null || _applicationDetails$a5 === void 0 ? void 0 : (_applicationDetails$a6 = _applicationDetails$a5.additionalDetails) === null || _applicationDetails$a6 === void 0 ? void 0 : _applicationDetails$a6.fieldinspection_pending
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet3 = detail.additionalDetails) === null || _detail$additionalDet3 === void 0 ? void 0 : _detail$additionalDet3.floors) && /*#__PURE__*/React__default.createElement(PropertyFloors, {
-      floors: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet4 = detail.additionalDetails) === null || _detail$additionalDet4 === void 0 ? void 0 : _detail$additionalDet4.floors
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet5 = detail.additionalDetails) === null || _detail$additionalDet5 === void 0 ? void 0 : _detail$additionalDet5.units) && /*#__PURE__*/React__default.createElement(TLTradeUnits, {
-      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet6 = detail.additionalDetails) === null || _detail$additionalDet6 === void 0 ? void 0 : _detail$additionalDet6.units
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet7 = detail.additionalDetails) === null || _detail$additionalDet7 === void 0 ? void 0 : _detail$additionalDet7.accessories) && /*#__PURE__*/React__default.createElement(TLTradeAccessories, {
-      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet8 = detail.additionalDetails) === null || _detail$additionalDet8 === void 0 ? void 0 : _detail$additionalDet8.accessories
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet9 = detail.additionalDetails) === null || _detail$additionalDet9 === void 0 ? void 0 : _detail$additionalDet9.permissions) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.nextActions) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.length) > 0 && /*#__PURE__*/React__default.createElement(PermissionCheck, {
+    }), (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a3 = applicationDetails.applicationData) === null || _applicationDetails$a3 === void 0 ? void 0 : (_applicationDetails$a4 = _applicationDetails$a3.additionalDetails) === null || _applicationDetails$a4 === void 0 ? void 0 : (_applicationDetails$a5 = _applicationDetails$a4.fieldinspection_pending) === null || _applicationDetails$a5 === void 0 ? void 0 : _applicationDetails$a5.length) > 0 && (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet3 = detail.additionalDetails) === null || _detail$additionalDet3 === void 0 ? void 0 : _detail$additionalDet3.fiReport) && /*#__PURE__*/React__default.createElement(InspectionReport, {
+      fiReport: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a6 = applicationDetails.applicationData) === null || _applicationDetails$a6 === void 0 ? void 0 : (_applicationDetails$a7 = _applicationDetails$a6.additionalDetails) === null || _applicationDetails$a7 === void 0 ? void 0 : _applicationDetails$a7.fieldinspection_pending
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet4 = detail.additionalDetails) === null || _detail$additionalDet4 === void 0 ? void 0 : _detail$additionalDet4.floors) && /*#__PURE__*/React__default.createElement(PropertyFloors, {
+      floors: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet5 = detail.additionalDetails) === null || _detail$additionalDet5 === void 0 ? void 0 : _detail$additionalDet5.floors
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet6 = detail.additionalDetails) === null || _detail$additionalDet6 === void 0 ? void 0 : _detail$additionalDet6.units) && /*#__PURE__*/React__default.createElement(TLTradeUnits, {
+      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet7 = detail.additionalDetails) === null || _detail$additionalDet7 === void 0 ? void 0 : _detail$additionalDet7.units
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet8 = detail.additionalDetails) === null || _detail$additionalDet8 === void 0 ? void 0 : _detail$additionalDet8.accessories) && /*#__PURE__*/React__default.createElement(TLTradeAccessories, {
+      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet9 = detail.additionalDetails) === null || _detail$additionalDet9 === void 0 ? void 0 : _detail$additionalDet9.accessories
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet0 = detail.additionalDetails) === null || _detail$additionalDet0 === void 0 ? void 0 : _detail$additionalDet0.permissions) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.nextActions) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.length) > 0 && /*#__PURE__*/React__default.createElement(PermissionCheck, {
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       t: t,
-      permissions: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet0 = detail.additionalDetails) === null || _detail$additionalDet0 === void 0 ? void 0 : _detail$additionalDet0.permissions
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet1 = detail.additionalDetails) === null || _detail$additionalDet1 === void 0 ? void 0 : _detail$additionalDet1.obpsDocuments) && /*#__PURE__*/React__default.createElement(BPADocuments, {
+      permissions: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet1 = detail.additionalDetails) === null || _detail$additionalDet1 === void 0 ? void 0 : _detail$additionalDet1.permissions
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet10 = detail.additionalDetails) === null || _detail$additionalDet10 === void 0 ? void 0 : _detail$additionalDet10.obpsDocuments) && /*#__PURE__*/React__default.createElement(BPADocuments, {
       t: t,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       docs: detail.additionalDetails.obpsDocuments,
       bpaActionsDetails: workflowDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet10 = detail.additionalDetails) === null || _detail$additionalDet10 === void 0 ? void 0 : _detail$additionalDet10.noc) && /*#__PURE__*/React__default.createElement(NOCDocuments, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet11 = detail.additionalDetails) === null || _detail$additionalDet11 === void 0 ? void 0 : _detail$additionalDet11.noc) && /*#__PURE__*/React__default.createElement(NOCDocuments, {
       t: t,
       isNoc: true,
       NOCdata: detail.values,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       docs: detail.additionalDetails.noc,
-      noc: (_detail$additionalDet11 = detail.additionalDetails) === null || _detail$additionalDet11 === void 0 ? void 0 : _detail$additionalDet11.data,
+      noc: (_detail$additionalDet12 = detail.additionalDetails) === null || _detail$additionalDet12 === void 0 ? void 0 : _detail$additionalDet12.data,
       bpaActionsDetails: workflowDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet12 = detail.additionalDetails) === null || _detail$additionalDet12 === void 0 ? void 0 : _detail$additionalDet12.scruntinyDetails) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet13 = detail.additionalDetails) === null || _detail$additionalDet13 === void 0 ? void 0 : _detail$additionalDet13.scruntinyDetails) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet13 = detail.additionalDetails) === null || _detail$additionalDet13 === void 0 ? void 0 : _detail$additionalDet13.buildingExtractionDetails) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet14 = detail.additionalDetails) === null || _detail$additionalDet14 === void 0 ? void 0 : _detail$additionalDet14.buildingExtractionDetails) && /*#__PURE__*/React__default.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet14 = detail.additionalDetails) === null || _detail$additionalDet14 === void 0 ? void 0 : _detail$additionalDet14.subOccupancyTableDetails) && /*#__PURE__*/React__default.createElement(SubOccupancyTable, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet15 = detail.additionalDetails) === null || _detail$additionalDet15 === void 0 ? void 0 : _detail$additionalDet15.subOccupancyTableDetails) && /*#__PURE__*/React__default.createElement(SubOccupancyTable, {
       edcrDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet15 = detail.additionalDetails) === null || _detail$additionalDet15 === void 0 ? void 0 : _detail$additionalDet15.documentsWithUrl) && /*#__PURE__*/React__default.createElement(DocumentsPreview, {
-      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet16 = detail.additionalDetails) === null || _detail$additionalDet16 === void 0 ? void 0 : _detail$additionalDet16.documentsWithUrl
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documents) && /*#__PURE__*/React__default.createElement(PropertyDocuments, {
-      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documents,
-      applicationStatus: applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && !(applicationData !== null && applicationData !== void 0 && (_applicationData$appl = applicationData.applicationType) !== null && _applicationData$appl !== void 0 && _applicationData$appl.includes("MUTATION")) && !(businessService !== null && businessService !== void 0 && businessService.includes("MUTATION")) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_APPROVAL_FOR_CONNECTION", "PENDING_FOR_CONNECTION_ACTIVATION", "PENDING_FOR_RECONNECTION", "PENDING_FOR_DUE_VERIFICATION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "CONNECTION_ACTIVATED", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React__default.createElement(DueVerification, {
-      applicationData: applicationData
-    }), " ", (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && !(applicationData !== null && applicationData !== void 0 && (_applicationData$appl2 = applicationData.applicationType) !== null && _applicationData$appl2 !== void 0 && _applicationData$appl2.includes("MUTATION")) && !(businessService !== null && businessService !== void 0 && businessService.includes("MUTATION")) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "CONNECTION_ACTIVATED", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React__default.createElement(InspectionInformation, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet16 = detail.additionalDetails) === null || _detail$additionalDet16 === void 0 ? void 0 : _detail$additionalDet16.documentsWithUrl) && /*#__PURE__*/React__default.createElement(DocumentsPreview, {
+      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documentsWithUrl
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documents) && index === documentsDetailIndex && /*#__PURE__*/React__default.createElement(PropertyDocuments, {
+      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents,
+      applicationStatus: (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data3 = workflowDetails.data) === null || _workflowDetails$data3 === void 0 ? void 0 : (_workflowDetails$data4 = _workflowDetails$data3.actionState) === null || _workflowDetails$data4 === void 0 ? void 0 : _workflowDetails$data4.state) || (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data5 = workflowDetails.data) === null || _workflowDetails$data5 === void 0 ? void 0 : (_workflowDetails$data6 = _workflowDetails$data5.processInstances) === null || _workflowDetails$data6 === void 0 ? void 0 : (_workflowDetails$data7 = _workflowDetails$data6[0]) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7.state) === null || _workflowDetails$data8 === void 0 ? void 0 : _workflowDetails$data8.state) || (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data9 = workflowDetails.data) === null || _workflowDetails$data9 === void 0 ? void 0 : (_workflowDetails$data0 = _workflowDetails$data9.ProcessInstances) === null || _workflowDetails$data0 === void 0 ? void 0 : (_workflowDetails$data1 = _workflowDetails$data0[0]) === null || _workflowDetails$data1 === void 0 ? void 0 : (_workflowDetails$data10 = _workflowDetails$data1.state) === null || _workflowDetails$data10 === void 0 ? void 0 : _workflowDetails$data10.state) || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) || (applicationData === null || applicationData === void 0 ? void 0 : applicationData.status)
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents) && !(applicationData !== null && applicationData !== void 0 && (_applicationData$appl = applicationData.applicationType) !== null && _applicationData$appl !== void 0 && _applicationData$appl.includes("MUTATION")) && !(businessService !== null && businessService !== void 0 && businessService.includes("MUTATION")) && ["PENDING_FOR_FIELD_INSPECTION", "PENDING_APPROVAL_FOR_CONNECTION", "PENDING_FOR_CONNECTION_ACTIVATION", "PENDING_FOR_RECONNECTION", "PENDING_FOR_DUE_VERIFICATION", "PENDING_FOR_BILLING_CLERK_REVIEW", "PENDING_FOR_ASO_APPROVAL", "PENDING_FOR_ZRO_APPROVAL", "PENDING_FOR_AE_APPROVAL", "PENDING_FOR_FINAL_PAYMENT", "CONNECTION_ACTIVATED", "PENDING_FOR_CONNECTION_ACTIVATION"].includes(applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) && /*#__PURE__*/React__default.createElement(DueVerification, {
       applicationData: applicationData
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.taxHeadEstimatesCalculation) && /*#__PURE__*/React__default.createElement(PropertyEstimates, {
       taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : _detail$additionalDet22.taxHeadEstimatesCalculation
@@ -48081,23 +48390,28 @@ function ApplicationDetailsContent(_ref) {
       wsAdditionalDetails: detail,
       workflowDetails: workflowDetails
     }));
-  }), showTimeLine && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data3 = workflowDetails.data) === null || _workflowDetails$data3 === void 0 ? void 0 : (_workflowDetails$data4 = _workflowDetails$data3.timeline) === null || _workflowDetails$data4 === void 0 ? void 0 : _workflowDetails$data4.length) > 0 && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.BreakLine, null), ((workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.isLoading) || isDataLoading) && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null), !(workflowDetails !== null && workflowDetails !== void 0 && workflowDetails.isLoading) && !isDataLoading && /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
+  }), showApprovalChecklist && /*#__PURE__*/React__default.createElement(WSApprovalChecklist, {
+    applicationData: applicationData,
+    showApprovalChecklist: showApprovalChecklist,
+    values: approvalChecklist,
+    onChange: onApprovalChecklistChange
+  }), showTimeLine && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data11 = workflowDetails.data) === null || _workflowDetails$data11 === void 0 ? void 0 : (_workflowDetails$data12 = _workflowDetails$data11.timeline) === null || _workflowDetails$data12 === void 0 ? void 0 : _workflowDetails$data12.length) > 0 && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.BreakLine, null), ((workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.isLoading) || isDataLoading) && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null), !(workflowDetails !== null && workflowDetails !== void 0 && workflowDetails.isLoading) && !isDataLoading && /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
     id: "timeline"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, {
     style: {
       marginBottom: "16px",
       marginTop: "32px"
     }
-  }, t("ES_APPLICATION_DETAILS_APPLICATION_TIMELINE")), workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data5 = workflowDetails.data) !== null && _workflowDetails$data5 !== void 0 && _workflowDetails$data5.timeline && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data6 = workflowDetails.data) === null || _workflowDetails$data6 === void 0 ? void 0 : (_workflowDetails$data7 = _workflowDetails$data6.timeline) === null || _workflowDetails$data7 === void 0 ? void 0 : _workflowDetails$data7.length) === 1 ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.CheckPoint, {
+  }, t("ES_APPLICATION_DETAILS_APPLICATION_TIMELINE")), workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data13 = workflowDetails.data) !== null && _workflowDetails$data13 !== void 0 && _workflowDetails$data13.timeline && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data14 = workflowDetails.data) === null || _workflowDetails$data14 === void 0 ? void 0 : (_workflowDetails$data15 = _workflowDetails$data14.timeline) === null || _workflowDetails$data15 === void 0 ? void 0 : _workflowDetails$data15.length) === 1 ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.CheckPoint, {
     isCompleted: true,
-    label: t("" + timelineStatusPrefix + (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data8 = workflowDetails.data) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8.timeline[0]) === null || _workflowDetails$data9 === void 0 ? void 0 : _workflowDetails$data9.state)),
-    customChild: getTimelineCaptions(workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data0 = workflowDetails.data) === null || _workflowDetails$data0 === void 0 ? void 0 : _workflowDetails$data0.timeline[0], workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data1 = workflowDetails.data) === null || _workflowDetails$data1 === void 0 ? void 0 : _workflowDetails$data1.timeline)
-  }) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.ConnectingCheckPoints, null, (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data10 = workflowDetails.data) === null || _workflowDetails$data10 === void 0 ? void 0 : _workflowDetails$data10.timeline) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data11 = workflowDetails.data) === null || _workflowDetails$data11 === void 0 ? void 0 : _workflowDetails$data11.timeline.slice(0, showAllTimeline ? workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.data.timeline.length : 2).map((checkpoint, index, arr) => {
-    var _workflowDetails$data18;
+    label: t("" + timelineStatusPrefix + (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data16 = workflowDetails.data) === null || _workflowDetails$data16 === void 0 ? void 0 : (_workflowDetails$data17 = _workflowDetails$data16.timeline[0]) === null || _workflowDetails$data17 === void 0 ? void 0 : _workflowDetails$data17.state)),
+    customChild: getTimelineCaptions(workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data18 = workflowDetails.data) === null || _workflowDetails$data18 === void 0 ? void 0 : _workflowDetails$data18.timeline[0], workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data19 = workflowDetails.data) === null || _workflowDetails$data19 === void 0 ? void 0 : _workflowDetails$data19.timeline)
+  }) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.ConnectingCheckPoints, null, (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data20 = workflowDetails.data) === null || _workflowDetails$data20 === void 0 ? void 0 : _workflowDetails$data20.timeline) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data21 = workflowDetails.data) === null || _workflowDetails$data21 === void 0 ? void 0 : _workflowDetails$data21.timeline.slice(0, showAllTimeline ? workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.data.timeline.length : 2).map((checkpoint, index, arr) => {
+    var _workflowDetails$data28;
     let timelineStatusPostfix = "";
     if (window.location.href.includes("/obps/")) {
-      var _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data15, _workflowDetails$data16, _workflowDetails$data17;
-      if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data12 = workflowDetails.data) !== null && _workflowDetails$data12 !== void 0 && (_workflowDetails$data13 = _workflowDetails$data12.timeline[index - 1]) !== null && _workflowDetails$data13 !== void 0 && (_workflowDetails$data14 = _workflowDetails$data13.state) !== null && _workflowDetails$data14 !== void 0 && _workflowDetails$data14.includes("BACK_FROM") || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data15 = workflowDetails.data) !== null && _workflowDetails$data15 !== void 0 && (_workflowDetails$data16 = _workflowDetails$data15.timeline[index - 1]) !== null && _workflowDetails$data16 !== void 0 && (_workflowDetails$data17 = _workflowDetails$data16.state) !== null && _workflowDetails$data17 !== void 0 && _workflowDetails$data17.includes("SEND_TO_CITIZEN")) timelineStatusPostfix = "_NOT_DONE";else if ((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "SEND_TO_ARCHITECT") timelineStatusPostfix = "_BY_ARCHITECT_DONE";else timelineStatusPostfix = index === 0 ? "" : "_DONE";
+      var _workflowDetails$data22, _workflowDetails$data23, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27;
+      if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data22 = workflowDetails.data) !== null && _workflowDetails$data22 !== void 0 && (_workflowDetails$data23 = _workflowDetails$data22.timeline[index - 1]) !== null && _workflowDetails$data23 !== void 0 && (_workflowDetails$data24 = _workflowDetails$data23.state) !== null && _workflowDetails$data24 !== void 0 && _workflowDetails$data24.includes("BACK_FROM") || workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data25 = workflowDetails.data) !== null && _workflowDetails$data25 !== void 0 && (_workflowDetails$data26 = _workflowDetails$data25.timeline[index - 1]) !== null && _workflowDetails$data26 !== void 0 && (_workflowDetails$data27 = _workflowDetails$data26.state) !== null && _workflowDetails$data27 !== void 0 && _workflowDetails$data27.includes("SEND_TO_CITIZEN")) timelineStatusPostfix = "_NOT_DONE";else if ((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "SEND_TO_ARCHITECT") timelineStatusPostfix = "_BY_ARCHITECT_DONE";else timelineStatusPostfix = index === 0 ? "" : "_DONE";
     }
     return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
       key: index
@@ -48106,9 +48420,9 @@ function ApplicationDetailsContent(_ref) {
       isCompleted: index === 0,
       info: checkpoint.comment,
       label: t("" + timelineStatusPrefix + ((checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction) === "REOPEN" ? checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.performedAction : checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint[statusAttribute]) + timelineStatusPostfix),
-      customChild: getTimelineCaptions(checkpoint, index, workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data18 = workflowDetails.data) === null || _workflowDetails$data18 === void 0 ? void 0 : _workflowDetails$data18.timeline)
+      customChild: getTimelineCaptions(checkpoint, index, workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data28 = workflowDetails.data) === null || _workflowDetails$data28 === void 0 ? void 0 : _workflowDetails$data28.timeline)
     }));
-  }))), (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data19 = workflowDetails.data) === null || _workflowDetails$data19 === void 0 ? void 0 : (_workflowDetails$data20 = _workflowDetails$data19.timeline) === null || _workflowDetails$data20 === void 0 ? void 0 : _workflowDetails$data20.length) > 2 && /*#__PURE__*/React__default.createElement(digitUiReactComponents.LinkButton, {
+  }))), (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data29 = workflowDetails.data) === null || _workflowDetails$data29 === void 0 ? void 0 : (_workflowDetails$data30 = _workflowDetails$data29.timeline) === null || _workflowDetails$data30 === void 0 ? void 0 : _workflowDetails$data30.length) > 2 && /*#__PURE__*/React__default.createElement(digitUiReactComponents.LinkButton, {
     label: showAllTimeline ? t("COLLAPSE") : t("VIEW_TIMELINE"),
     onClick: toggleTimeline
   })))), /*#__PURE__*/React__default.createElement("div", null, showPopup && /*#__PURE__*/React__default.createElement(RenewPopup, {
@@ -48225,7 +48539,9 @@ function ApplicationDetailsActionBar(_ref) {
     _ref$MenuStyle = _ref.MenuStyle,
     MenuStyle = _ref$MenuStyle === void 0 ? {} : _ref$MenuStyle,
     isAction = _ref.isAction,
-    applicationDetails = _ref.applicationDetails;
+    applicationDetails = _ref.applicationDetails,
+    _ref$isApprovalCheckl = _ref.isApprovalChecklistValid,
+    isApprovalChecklistValid = _ref$isApprovalCheckl === void 0 ? false : _ref$isApprovalCheckl;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   let user = Digit.UserService.getUser();
@@ -48234,7 +48550,7 @@ function ApplicationDetailsActionBar(_ref) {
       if (typeof window !== "undefined" && typeof window.isDocumentsVerified !== "undefined") {
         return !window.isDocumentsVerified;
       }
-      return true;
+      return false;
     }),
     isSubmitDisabled = _React$useState[0],
     setIsSubmitDisabled = _React$useState[1];
@@ -48299,7 +48615,7 @@ function ApplicationDetailsActionBar(_ref) {
     ref: menuRef,
     label: t("WF_TAKE_ACTION"),
     onSubmit: () => setDisplayMenu(!displayMenu),
-    disabled: isSubmitDisabled
+    disabled: isSubmitDisabled || !isApprovalChecklistValid
   }) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, {
     style: {
       color: "red",
@@ -48310,7 +48626,7 @@ function ApplicationDetailsActionBar(_ref) {
     ref: menuRef,
     label: t("WF_TAKE_ACTION"),
     onSubmit: () => setDisplayMenu(!displayMenu),
-    disabled: isSubmitDisabled
+    disabled: isSubmitDisabled || !isApprovalChecklistValid
   })), !(workflowDetails !== null && workflowDetails !== void 0 && workflowDetails.isLoading) && !isMenuBotton && isSingleButton && !isAction && /*#__PURE__*/React__default.createElement(digitUiReactComponents.ActionBar, {
     style: _extends({}, ActionBarStyle)
   }, /*#__PURE__*/React__default.createElement("button", {
@@ -48433,6 +48749,9 @@ const ApplicationDetails = props => {
   const _useState5 = React.useState(false),
     isWarningPop = _useState5[0],
     setWarningPopUp = _useState5[1];
+  const _useState6 = React.useState({}),
+    approvalChecklist = _useState6[0],
+    setApprovalChecklist = _useState6[1];
   const applicationDetails = props.applicationDetails,
     showToast = props.showToast,
     setShowToast = props.setShowToast,
@@ -48460,6 +48779,29 @@ const ApplicationDetails = props => {
     clearDataDetails = props.clearDataDetails,
     _props$isAction = props.isAction,
     isAction = _props$isAction === void 0 ? false : _props$isAction;
+  const currentWorkflowState = getWSCurrentState(applicationData, workflowDetails);
+  const showApprovalChecklist = moduleCode === "WS" && isWSApprovalChecklistState(applicationData, workflowDetails);
+  const approvalChecklistValid = (workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.isLoading) || !showApprovalChecklist || isWSApprovalChecklistComplete(applicationData, approvalChecklist);
+  const seededKeyRef = React.useRef(null);
+  React.useEffect(() => {
+    const seedKey = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNo) + "__" + currentWorkflowState;
+    if (showApprovalChecklist) {
+      if (seededKeyRef.current !== seedKey) {
+        seededKeyRef.current = seedKey;
+        const initialChecklist = getWSApprovalChecklistFields(applicationData).reduce((values, field) => {
+          var _applicationData$addi;
+          values[field.name] = (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addi = applicationData.additionalDetails) === null || _applicationData$addi === void 0 ? void 0 : _applicationData$addi[field.name]) === true;
+          return values;
+        }, {});
+        setApprovalChecklist(initialChecklist);
+      }
+    } else {
+      if (seededKeyRef.current !== null) {
+        seededKeyRef.current = null;
+        setApprovalChecklist({});
+      }
+    }
+  }, [applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNo, currentWorkflowState, showApprovalChecklist]);
   React.useEffect(() => {
     if (showToast) {
       workflowDetails.revalidate();
@@ -48667,7 +49009,10 @@ const ApplicationDetails = props => {
     paymentsList: paymentsList,
     showTimeLine: showTimeLine,
     oldValue: oldValue,
-    isInfoLabel: isInfoLabel
+    isInfoLabel: isInfoLabel,
+    approvalChecklist: approvalChecklist,
+    onApprovalChecklistChange: setApprovalChecklist,
+    showApprovalChecklist: showApprovalChecklist
   }), showModal ? /*#__PURE__*/React__default.createElement(ActionModal$c, {
     t: t,
     action: selectedAction,
@@ -48680,7 +49025,8 @@ const ApplicationDetails = props => {
     submitAction: submitAction,
     actionData: workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : _workflowDetails$data.timeline,
     businessService: businessService,
-    workflowDetails: workflowDetails,
+    approvalChecklist: approvalChecklist,
+    showApprovalChecklist: showApprovalChecklist,
     moduleCode: moduleCode,
     cardFormWrapperClassName: "modal-form"
   }) : null, isWarningPop ? /*#__PURE__*/React__default.createElement(ApplicationDetailsWarningPopup, {
@@ -48704,7 +49050,8 @@ const ApplicationDetails = props => {
     forcedActionPrefix: forcedActionPrefix,
     ActionBarStyle: ActionBarStyle,
     MenuStyle: MenuStyle,
-    applicationDetails: applicationDetails
+    applicationDetails: applicationDetails,
+    isApprovalChecklistValid: approvalChecklistValid
   })) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null));
 };
 
@@ -50367,7 +50714,7 @@ const EditApplication$1 = () => {
 };
 
 const ConsumptionDetails = _ref => {
-  var _user$info, _mdmsBillingPeriod$Md, _mdmsBillingPeriod$Md2, _mdmsBillingPeriod$Md3, _mdmsMeterStatus$Mdms, _mdmsMeterStatus$Mdms2, _mdmsMeterStatus$Mdms3, _details$4, _details$5;
+  var _user$info, _mdmsBillingPeriod$Md, _mdmsBillingPeriod$Md2, _mdmsBillingPeriod$Md3, _mdmsMeterStatus$Mdms, _mdmsMeterStatus$Mdms2, _mdmsMeterStatus$Mdms3, _DJBReadingQualityCod, _DJBReadingQualityCod2, _DJBReadingQualityCod3, _details$4, _details$5;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const user = Digit.UserService.getUser();
@@ -50408,11 +50755,14 @@ const ConsumptionDetails = _ref => {
     selectedConsumtion = _useState9[0],
     setConsumption = _useState9[1];
   const _useState0 = React.useState(""),
-    currentBillingPeriod = _useState0[0],
-    setBillingPeriod = _useState0[1];
-  const _useState1 = React.useState(false),
-    isAddMeterReadingButtonEnable = _useState1[0],
-    setisAddMeterReadingButtonEnable = _useState1[1];
+    selectReadingQualityCode = _useState0[0],
+    setSelectReadingQualityCode = _useState0[1];
+  const _useState1 = React.useState(""),
+    currentBillingPeriod = _useState1[0],
+    setBillingPeriod = _useState1[1];
+  const _useState10 = React.useState(false),
+    isAddMeterReadingButtonEnable = _useState10[0],
+    setisAddMeterReadingButtonEnable = _useState10[1];
   const userInfo = Digit.UserService.getUser();
   const userRoles = userInfo.info.roles.map(roleData => roleData.code);
   const isUserAllowedToAddMeterReading = userRoles.filter(role => role === "WS_CEMP" || role === "SW_CEMP").length > 0;
@@ -50429,6 +50779,8 @@ const ConsumptionDetails = _ref => {
   const _Digit$Hooks$ws$useGe2 = Digit.Hooks.ws.useGetBillingPeriodValidation(tenantId),
     billingPeriodLoading = _Digit$Hooks$ws$useGe2.isLoading,
     mdmsBillingPeriod = _Digit$Hooks$ws$useGe2.data;
+  const _Digit$Hooks$ws$useDj = Digit.Hooks.ws.useDjbReadingQualityCodeList(tenantId),
+    DJBReadingQualityCode = _Digit$Hooks$ws$useDj.data;
   let connectionFilters = {
     connectionNumber: applicationNo
   };
@@ -50534,6 +50886,7 @@ const ConsumptionDetails = _ref => {
         lastReading: meterDetails === null || meterDetails === void 0 ? void 0 : meterDetails.currentReading,
         lastReadingDate: meterDetails === null || meterDetails === void 0 ? void 0 : meterDetails.currentReadingDate,
         meterStatus: selectMeterStatus === null || selectMeterStatus === void 0 ? void 0 : selectMeterStatus.code,
+        readingQualityCode: selectReadingQualityCode === null || selectReadingQualityCode === void 0 ? void 0 : selectReadingQualityCode.code,
         tenantId: meterDetails === null || meterDetails === void 0 ? void 0 : meterDetails.tenantId
       };
       let meterReadingsPayload = {
@@ -50581,6 +50934,13 @@ const ConsumptionDetails = _ref => {
     code: status,
     i18nKey: "WS_SERVICES_CALCULATION_METERSTATUS_" + Digit.Utils.locale.getTransformedLocale(status)
   }));
+  const ReadingQualityCodeList = DJBReadingQualityCode === null || DJBReadingQualityCode === void 0 ? void 0 : (_DJBReadingQualityCod = DJBReadingQualityCode.MdmsRes) === null || _DJBReadingQualityCod === void 0 ? void 0 : (_DJBReadingQualityCod2 = _DJBReadingQualityCod["ws-services-calculation"]) === null || _DJBReadingQualityCod2 === void 0 ? void 0 : (_DJBReadingQualityCod3 = _DJBReadingQualityCod2.DJBReadingQualityCode) === null || _DJBReadingQualityCod3 === void 0 ? void 0 : _DJBReadingQualityCod3.map(status => {
+    const statusCode = typeof status === "object" ? status.code : status;
+    return {
+      code: statusCode,
+      i18nKey: "WS_SERVICES_CALCULATION_DJBREADINGQUALITYCODE_" + Digit.Utils.locale.getTransformedLocale(statusCode)
+    };
+  });
   const onFormValueChange = (setValue, formData, formState) => {
     if ((selectMeterStatus === null || selectMeterStatus === void 0 ? void 0 : selectMeterStatus.code) === "Working") {
       var _details$2;
@@ -50677,6 +51037,21 @@ const ConsumptionDetails = _ref => {
             disabled: selectMeterStatus.code === "Working" ? false : true
           }))
         }
+      }, {
+        label: "" + t("WS_READING_QUALITY_CODE"),
+        isMandatory: true,
+        type: "dropdown",
+        populators: /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
+          option: ReadingQualityCodeList,
+          autoComplete: "off",
+          optionKey: "i18nKey",
+          id: "readingQualityCode",
+          select: e => {
+            setSelectReadingQualityCode(e);
+          },
+          selected: selectReadingQualityCode,
+          t: t
+        })
       }, {
         label: t("WS_SERV_DETAIL_CONSUMP"),
         isMandatory: false,
@@ -50756,6 +51131,11 @@ const ConsumptionDetails = _ref => {
     label: "" + t("WS_CONSUMPTION_DETAILS_METER_STATUS_LABEL"),
     text: (application === null || application === void 0 ? void 0 : application.meterStatus) || t("NA"),
     className: "border-none"
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    key: t("WS_READING_QUALITY_CODE"),
+    label: "" + t("WS_READING_QUALITY_CODE"),
+    text: (application === null || application === void 0 ? void 0 : application.readingQualityCode) || t("NA"),
+    className: "border-none"
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     key: t("WS_CONSUMPTION_DETAILS_LAST_READING_LABEL"),
     label: "" + t("WS_CONSUMPTION_DETAILS_LAST_READING_LABEL"),
@@ -50813,7 +51193,7 @@ const ConsumptionDetails = _ref => {
     cardStyle: {
       marginLeft: "0px",
       marginRight: "0px",
-      marginTop: "-25px"
+      marginTop: "0px"
     },
     className: "BPAemployeeCard",
     noBoxShadow: true,
@@ -56042,7 +56422,7 @@ const openFilePDF = fileId => {
   }).catch(error => console.error("Error fetching file:", error));
 };
 const CheckPage$4 = _ref2 => {
-  var _data$cpt, _data$ConnectionDetai, _data$connectionDetai, _data$ConnectionHolde, _data$connectionHolde, _data$useDetails, _data$bankDetails, _data$DocumentsRequir, _data$documents, _data$djbEmployee, _connectionDetails, _connectionDetails$se, _connectionDetails2, _connectionDetails2$s, _connectionDetails3, _connectionDetails4, _connectionDetails4$c, _connectionDetails5, _connectionDetails5$c, _connectionDetails6, _connectionDetails7, _connectionDetails7$w, _connectionDetails8, _connectionDetails8$w, _connectionDetails9, _connectionDetails0, _connectionDetails0$a, _connectionDetails1, _connectionDetails1$a, _connectionDetails10, _connectionDetails11, _connectionDetails11$, _connectionDetails12, _connectionDetails12$, _connectionDetails13, _connectionDetails14, _connectionDetails14$, _connectionDetails15, _connectionDetails15$, _connectionDetails16, _connectionDetails16$, _connectionDetails17, _connectionDetails18, _connectionDetails19, _connectionDetails20, _holderDetails, _holderDetails2, _holderDetails3, _holderDetails4, _holderDetails4$gende, _holderDetails5, _holderDetails5$gende, _holderDetails6, _holderDetails7, _holderDetails8, _holderDetails8$relat, _holderDetails9, _holderDetails9$relat, _holderDetails0, _holderDetails1, _holderDetails10, _holderDetails11, _propertyAddress, _propertyAddress$zro, _propertyAddress2, _propertyAddress3, _propertyAddress4, _propertyAddress4$add, _propertyAddress5, _propertyAddress5$add, _propertyAddress6, _propertyAddress6$add, _propertyAddress7, _propertyAddress8, _propertyAddress8$cit, _propertyAddress9, _propertyAddress9$cit, _propertyAddress0, _propertyAddress1, _propertyAddress10, _propertyAddress11, _propertyAddress11$lo, _propertyAddress12, _propertyAddress12$lo, _propertyAddress13, _propertyAddress14, _propertyAddress14$su, _propertyAddress15, _propertyAddress15$su, _propertyAddress16, _propertyAddress17, _propertyAddress18, _propertyAddress19, _propertyAddress20, _propertyAddress21, _propertyAddress22, _propertyAddress23, _propertyAddress24, _propertyAddress25, _propertyAddress26, _propertyAddress26$as, _propertyAddress27, _propertyAddress27$as, _propertyAddress28, _propertyAddress29, _propertyAddress29$bl, _propertyAddress30, _propertyAddress30$bl, _propertyAddress31, _propertyAddress32, _propertyAddress32$wa, _propertyAddress33, _propertyAddress33$wa, _propertyAddress34, _propertyAddress35, _propertyAddress35$zo, _propertyAddress36, _propertyAddress36$zo, _propertyAddress37, _propertyAddress38, _propertyAddress39, _propertyAddress40, _propertyAddress41, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _declaration$submitte, _declaration$submitte2, _declaration$signatur;
+  var _data$cpt, _data$ConnectionDetai, _data$connectionDetai, _data$ConnectionHolde, _data$connectionHolde, _data$useDetails, _data$bankDetails, _data$DocumentsRequir, _data$documents, _data$djbEmployee, _data$disability, _connectionDetails, _connectionDetails$se, _connectionDetails2, _connectionDetails2$s, _connectionDetails3, _connectionDetails4, _connectionDetails4$c, _connectionDetails5, _connectionDetails5$c, _connectionDetails6, _connectionDetails7, _connectionDetails7$w, _connectionDetails8, _connectionDetails8$w, _connectionDetails9, _connectionDetails0, _connectionDetails0$a, _connectionDetails1, _connectionDetails1$a, _connectionDetails10, _connectionDetails11, _connectionDetails11$, _connectionDetails12, _connectionDetails12$, _connectionDetails13, _connectionDetails14, _connectionDetails14$, _connectionDetails15, _connectionDetails15$, _connectionDetails16, _connectionDetails16$, _connectionDetails17, _connectionDetails18, _connectionDetails19, _connectionDetails20, _holderDetails, _holderDetails2, _holderDetails3, _holderDetails4, _holderDetails4$gende, _holderDetails5, _holderDetails5$gende, _holderDetails6, _holderDetails7, _holderDetails8, _holderDetails8$relat, _holderDetails9, _holderDetails9$relat, _holderDetails0, _holderDetails1, _holderDetails10, _holderDetails11, _propertyAddress, _propertyAddress$zro, _propertyAddress2, _propertyAddress3, _propertyAddress4, _propertyAddress4$add, _propertyAddress5, _propertyAddress5$add, _propertyAddress6, _propertyAddress6$add, _propertyAddress7, _propertyAddress8, _propertyAddress8$cit, _propertyAddress9, _propertyAddress9$cit, _propertyAddress0, _propertyAddress1, _propertyAddress10, _propertyAddress11, _propertyAddress11$lo, _propertyAddress12, _propertyAddress12$lo, _propertyAddress13, _propertyAddress14, _propertyAddress14$su, _propertyAddress15, _propertyAddress15$su, _propertyAddress16, _propertyAddress17, _propertyAddress18, _propertyAddress19, _propertyAddress20, _propertyAddress21, _propertyAddress22, _propertyAddress23, _propertyAddress24, _propertyAddress25, _propertyAddress26, _propertyAddress26$as, _propertyAddress27, _propertyAddress27$as, _propertyAddress28, _propertyAddress29, _propertyAddress29$bl, _propertyAddress30, _propertyAddress30$bl, _propertyAddress31, _propertyAddress32, _propertyAddress32$wa, _propertyAddress33, _propertyAddress33$wa, _propertyAddress34, _propertyAddress35, _propertyAddress35$zo, _propertyAddress36, _propertyAddress36$zo, _propertyAddress37, _propertyAddress38, _propertyAddress39, _propertyAddress40, _propertyAddress41, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _useDetails$propertyT, _useDetails$propertyT2, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _useDetails$noOfFloor, _useDetails$noOfFloor2, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _declaration$submitte, _declaration$submitte2, _declaration$signatur;
   let data = _ref2.data,
     onSubmit = _ref2.onSubmit,
     onEdit = _ref2.onEdit;
@@ -56122,6 +56502,7 @@ const CheckPage$4 = _ref2 => {
   const documents = (data === null || data === void 0 ? void 0 : (_data$DocumentsRequir = data.DocumentsRequired) === null || _data$DocumentsRequir === void 0 ? void 0 : _data$DocumentsRequir.documents) || (data === null || data === void 0 ? void 0 : (_data$documents = data.documents) === null || _data$documents === void 0 ? void 0 : _data$documents.documents) || [];
   const declaration = (data === null || data === void 0 ? void 0 : data.declarationData) || (data === null || data === void 0 ? void 0 : data.declaration) || {};
   const djbEmployee = (data === null || data === void 0 ? void 0 : (_data$djbEmployee = data.djbEmployee) === null || _data$djbEmployee === void 0 ? void 0 : _data$djbEmployee.djbEmployee) || (data === null || data === void 0 ? void 0 : data.djbEmployee) || {};
+  const disability = (data === null || data === void 0 ? void 0 : (_data$disability = data.disability) === null || _data$disability === void 0 ? void 0 : _data$disability.disability) || (data === null || data === void 0 ? void 0 : data.disability) || (data === null || data === void 0 ? void 0 : data.additionalDetails) || {};
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
     className: "overflow-y-scroll"
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, null, t("WS_COMMON_SUMMARY")), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("WS_COMMON_PROPERTY_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
@@ -56349,7 +56730,15 @@ const CheckPage$4 = _ref2 => {
       },
       onClick: () => openFilePDF(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.document)
     }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.GenericFileIcon, null), " ", t("CS_COMMON_VIEW"))
-  }))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
+  }))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, "Divyangjan/Person with Disability?"), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
+    style: {
+      marginTop: "10px",
+      marginBottom: "30px"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
+    label: "Divyangjan/Person with Disability?",
+    text: disability !== null && disability !== void 0 && disability.isDivyangjan ? t("CORE_COMMON_YES") : t("CORE_COMMON_NO")
+  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, null, t("WS_BANK_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, {
     style: {
       marginTop: "10px",
       marginBottom: "30px"
@@ -56492,6 +56881,7 @@ const OLDApplication = () => {
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const history = reactRouterDom.useHistory();
+  const location = reactRouterDom.useLocation();
   const _useState = React.useState(false),
     isEnableLoader = _useState[0],
     setIsEnableLoader = _useState[1];
@@ -56540,9 +56930,12 @@ const OLDApplication = () => {
   let _Digit$Hooks$ws$useWS = Digit.Hooks.ws.useWSConfigMDMS.WSCreateConfig(stateId, {}),
     newConfig = _Digit$Hooks$ws$useWS.data,
     isLoading = _Digit$Hooks$ws$useWS.isLoading;
-  const _useState5 = React.useState(new URLSearchParams(reactRouterDom.useLocation().search).get("propertyId")),
+  const requestedPropertyId = new URLSearchParams(location.search).get("propertyId");
+  const _useState5 = React.useState(requestedPropertyId),
     propertyId = _useState5[0],
     setPropertyId = _useState5[1];
+  const initialPropertyId = React.useRef(requestedPropertyId);
+  const verifiedPropertyId = React.useRef(sessionStorage.getItem("WS_OTP_VERIFIED_PROPERTY_ID"));
   const _Digit$Hooks$useSessi = Digit.Hooks.useSessionStorage("PT_CREATE_EMP_WS_NEW_FORM", {}),
     sessionFormData = _Digit$Hooks$useSessi[0],
     setSessionFormData = _Digit$Hooks$useSessi[1],
@@ -56557,9 +56950,16 @@ const OLDApplication = () => {
         propertyIds: propertyId
       },
       tenantId: tenantId,
-      enabled: propertyId && propertyId !== "" ? true : false
+      enabled: propertyId && propertyId === requestedPropertyId && propertyId === verifiedPropertyId.current
     }),
     propertyDetails = _Digit$Hooks$pt$usePr.data;
+  React.useEffect(() => {
+    if (requestedPropertyId !== initialPropertyId.current || requestedPropertyId && requestedPropertyId !== verifiedPropertyId.current) {
+      clearSessionFormData();
+      sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
+      history.replace("/digit-ui/employee/ws/info");
+    }
+  }, [clearSessionFormData, history, requestedPropertyId]);
   React.useEffect(() => {
     sessionStorage.removeItem("FORMSTATE_ERRORS");
   }, []);
@@ -56569,7 +56969,7 @@ const OLDApplication = () => {
       if (config) {
         var _config$body;
         const allCreateSections = (config === null || config === void 0 ? void 0 : (_config$body = config.body) === null || _config$body === void 0 ? void 0 : _config$body.filter(section => section === null || section === void 0 ? void 0 : section.isCreateConnection)) || [];
-        const desiredComponentOrder = ["CPTPropertySearchNSummary", "WSConnectionDetails", "WSConnectionHolderDetails", "WSPropertyLocationDetails", "PropertyWaterConnection", "WSDjbEmployee", "WSActivationPlumberDetails", "WSRoadCuttingDetails", "WSBankDetails", "WSDocumentsEmployee", "WSDeclaration"];
+        const desiredComponentOrder = ["CPTPropertySearchNSummary", "WSConnectionDetails", "WSConnectionHolderDetails", "WSPropertyLocationDetails", "PropertyWaterConnection", "WSDjbEmployee", "WSDivyangjan", "WSActivationPlumberDetails", "WSRoadCuttingDetails", "WSBankDetails", "WSDocumentsEmployee", "WSDeclaration"];
         const reorderedBody = [];
         desiredComponentOrder.forEach(compName => {
           const section = allCreateSections.find(s => {
@@ -56635,6 +57035,19 @@ const OLDApplication = () => {
                 withoutLabel: true
               }]
             });
+          } else if (compName === "WSDivyangjan") {
+            reorderedBody.push({
+              isCreateConnection: true,
+              body: [{
+                type: "component",
+                key: "disability",
+                component: "WSDivyangjan",
+                withoutLabel: true,
+                texts: {
+                  header: "Divyangjan/Person with Disability?"
+                }
+              }]
+            });
           }
         });
         allCreateSections.forEach(section => {
@@ -56899,6 +57312,7 @@ const OLDApplication = () => {
                                           try {
                                             var _waterUpdateData$Wate, _waterUpdateData$Wate2, _sewerageUpdateData$S, _sewerageUpdateData$S2;
                                             clearSessionFormData();
+                                            sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
                                             history.push(basePath + "/ws-response?applicationNumber=" + (waterUpdateData === null || waterUpdateData === void 0 ? void 0 : (_waterUpdateData$Wate = waterUpdateData.WaterConnection) === null || _waterUpdateData$Wate === void 0 ? void 0 : (_waterUpdateData$Wate2 = _waterUpdateData$Wate[0]) === null || _waterUpdateData$Wate2 === void 0 ? void 0 : _waterUpdateData$Wate2.applicationNo) + "&applicationNumber1=" + (sewerageUpdateData === null || sewerageUpdateData === void 0 ? void 0 : (_sewerageUpdateData$S = sewerageUpdateData.SewerageConnections) === null || _sewerageUpdateData$S === void 0 ? void 0 : (_sewerageUpdateData$S2 = _sewerageUpdateData$S[0]) === null || _sewerageUpdateData$S2 === void 0 ? void 0 : _sewerageUpdateData$S2.applicationNo));
                                             return Promise.resolve();
                                           } catch (e) {
@@ -56962,6 +57376,7 @@ const OLDApplication = () => {
                               onSuccess: data => {
                                 var _data$WaterConnection2, _data$WaterConnection3;
                                 clearSessionFormData();
+                                sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
                                 history.push(basePath + "/ws-response?applicationNumber=" + (data === null || data === void 0 ? void 0 : (_data$WaterConnection2 = data.WaterConnection) === null || _data$WaterConnection2 === void 0 ? void 0 : (_data$WaterConnection3 = _data$WaterConnection2[0]) === null || _data$WaterConnection3 === void 0 ? void 0 : _data$WaterConnection3.applicationNo));
                               }
                             });
@@ -57010,6 +57425,7 @@ const OLDApplication = () => {
                                   onSuccess: data => {
                                     var _data$SewerageConnect2, _data$SewerageConnect3;
                                     clearSessionFormData();
+                                    sessionStorage.removeItem("WS_OTP_VERIFIED_PROPERTY_ID");
                                     history.push(basePath + "/ws-response?applicationNumber1=" + (data === null || data === void 0 ? void 0 : (_data$SewerageConnect2 = data.SewerageConnections) === null || _data$SewerageConnect2 === void 0 ? void 0 : (_data$SewerageConnect3 = _data$SewerageConnect2[0]) === null || _data$SewerageConnect3 === void 0 ? void 0 : _data$SewerageConnect3.applicationNo));
                                   }
                                 })).then(function () {});
@@ -57235,7 +57651,8 @@ const componentsToRegister = {
   WSSearchIntegrated: SearchIntegrated,
   WSSearchWaterConnectionViewIntegrated: SearchWaterConnectionViewIntegrated,
   WSBulkBillGeneration: BulkBillGeneration,
-  WSOLDApplication: OLDApplication
+  WSOLDApplication: OLDApplication,
+  WSDivyangjan: WSDivyangjan
 };
 const initWSComponents = () => {
   Object.entries(componentsToRegister).forEach(_ref3 => {