@djb25/digit-ui-module-ws 1.0.101 → 1.0.102

package/dist/index.modern.js

@@ -504,35 +504,31 @@ const getPattern = type => {
 };
 const getFiles = function (filesArray, tenant) {
   try {
-    return Promise.resolve(Digit.UploadServices.Filefetch(filesArray, tenant)).then(function (response) {
-      var _response$data, _response$data$fileSt, _response$data$fileSt2, _response$data2, _response$data2$fileS, _response$data2$fileS2;
-      response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && (_response$data$fileSt = _response$data.fileStoreIds) !== null && _response$data$fileSt !== void 0 && (_response$data$fileSt2 = _response$data$fileSt[0]) !== null && _response$data$fileSt2 !== void 0 && _response$data$fileSt2.url ? window.open(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$fileS = _response$data2.fileStoreIds) === null || _response$data2$fileS === void 0 ? void 0 : (_response$data2$fileS2 = _response$data2$fileS[0]) === null || _response$data2$fileS2 === void 0 ? void 0 : _response$data2$fileS2.url) : null;
-      const _temp3 = _catch(function () {
-        return Promise.resolve(Digit.UploadServices.Filefetch(filesArray, tenant)).then(function (response) {
-          var _response$data3, _response$data3$fileS, _response$data3$fileS2, _response$data4;
-          if (response !== null && response !== void 0 && (_response$data3 = response.data) !== null && _response$data3 !== void 0 && (_response$data3$fileS = _response$data3.fileStoreIds) !== null && _response$data3$fileS !== void 0 && (_response$data3$fileS2 = _response$data3$fileS[0]) !== null && _response$data3$fileS2 !== void 0 && _response$data3$fileS2.url) {
-            window.open(response.data.fileStoreIds[0].url);
-          } else if (response !== null && response !== void 0 && (_response$data4 = response.data) !== null && _response$data4 !== void 0 && _response$data4[filesArray === null || filesArray === void 0 ? void 0 : filesArray[0]]) {
-            let linkText = response.data[filesArray[0]];
-            let fileURL = "";
-            if (linkText && typeof linkText == "string") {
-              const linkList = linkText.split(",");
-              linkList.forEach(link => {
-                if (!link.includes("large") && !link.includes("medium") && !link.includes("small")) {
-                  fileURL = link;
-                }
-              });
-            }
-            if (fileURL) {
-              window.open(fileURL);
-            }
+    const _temp3 = _catch(function () {
+      return Promise.resolve(Digit.UploadServices.Filefetch(filesArray, tenant)).then(function (response) {
+        var _response$data, _response$data$fileSt, _response$data$fileSt2, _response$data2;
+        if (response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && (_response$data$fileSt = _response$data.fileStoreIds) !== null && _response$data$fileSt !== void 0 && (_response$data$fileSt2 = _response$data$fileSt[0]) !== null && _response$data$fileSt2 !== void 0 && _response$data$fileSt2.url) {
+          window.open(response.data.fileStoreIds[0].url);
+        } else if (response !== null && response !== void 0 && (_response$data2 = response.data) !== null && _response$data2 !== void 0 && _response$data2[filesArray === null || filesArray === void 0 ? void 0 : filesArray[0]]) {
+          let linkText = response.data[filesArray[0]];
+          let fileURL = "";
+          if (linkText && typeof linkText == "string") {
+            const linkList = linkText.split(",");
+            linkList.forEach(link => {
+              if (!link.includes("large") && !link.includes("medium") && !link.includes("small")) {
+                fileURL = link;
+              }
+            });
           }
-        });
-      }, function (error) {
-        console.error("Error fetching file URL", error);
+          if (fileURL) {
+            window.open(fileURL);
+          }
+        }
       });
-      if (_temp3 && _temp3.then) return _temp3.then(function () {});
+    }, function (error) {
+      console.error("Error fetching file URL", error);
     });
+    return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
   } catch (e) {
     return Promise.reject(e);
   }
@@ -732,7 +728,7 @@ const updatePayloadOfWS = function (data, type) {
       },
       documents: JSON.parse(sessionStorage.getItem("WS_DOCUMENTS_INOF") && sessionStorage.getItem("WS_DOCUMENTS_INOF") !== "undefined" ? sessionStorage.getItem("WS_DOCUMENTS_INOF") : "null"),
       property: JSON.parse(sessionStorage.getItem("WS_PROPERTY_INOF") && sessionStorage.getItem("WS_PROPERTY_INOF") !== "undefined" ? sessionStorage.getItem("WS_PROPERTY_INOF") : "null"),
-      connectionType: type === "WATER" ? (data === null || data === void 0 ? void 0 : data.connectionType) || "Permanent" : "Non Metered",
+      connectionType: type === "WATER" ? (data === null || data === void 0 ? void 0 : data.connectionType) === "Permanent" ? "Metered" : (data === null || data === void 0 ? void 0 : data.connectionType) || "Metered" : "Non Metered",
       additionalDetails: {
         ...(data === null || data === void 0 ? void 0 : data.additionalDetails),
         connectionType: (data === null || data === void 0 ? void 0 : (_data$additionalDetai = data.additionalDetails) === null || _data$additionalDetai === void 0 ? void 0 : _data$additionalDetai.connectionType) || "Permanent",
@@ -12907,6 +12903,7 @@ const WSPlumberPreference = _ref => {
 };
 
 const WSActivationDetails = _ref => {
+  var _formData$activationD;
   let {
     t,
     config,
@@ -12914,20 +12911,39 @@ const WSActivationDetails = _ref => {
     formData,
     onSelect
   } = _ref;
+  const initialData = Array.isArray(formData === null || formData === void 0 ? void 0 : formData.activationDetails) ? formData === null || formData === void 0 ? void 0 : (_formData$activationD = formData.activationDetails) === null || _formData$activationD === void 0 ? void 0 : _formData$activationD[0] : (formData === null || formData === void 0 ? void 0 : formData.activationDetails) || {};
   const [activationDetails, setActivationDetails] = React.useState({
-    meterId: "",
-    meterInstallationDate: "",
-    meterInitialReading: "",
-    connectionExecutionDate: ""
+    meterId: (initialData === null || initialData === void 0 ? void 0 : initialData.meterId) || "",
+    meterInstallationDate: (initialData === null || initialData === void 0 ? void 0 : initialData.meterInstallationDate) || "",
+    meterInitialReading: "0",
+    connectionExecutionDate: (initialData === null || initialData === void 0 ? void 0 : initialData.connectionExecutionDate) || ""
   });
   React.useEffect(() => {
-  });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller",
-    style: {
-      fontWeight: "700"
+    var _formData$activationD2;
+    const actData = Array.isArray(formData === null || formData === void 0 ? void 0 : formData.activationDetails) ? formData === null || formData === void 0 ? void 0 : (_formData$activationD2 = formData.activationDetails) === null || _formData$activationD2 === void 0 ? void 0 : _formData$activationD2[0] : formData === null || formData === void 0 ? void 0 : formData.activationDetails;
+    if (actData) {
+      setActivationDetails(prev => {
+        const nextState = {
+          meterId: actData.meterId !== undefined ? actData.meterId : prev.meterId,
+          meterInstallationDate: actData.meterInstallationDate !== undefined ? actData.meterInstallationDate : prev.meterInstallationDate,
+          meterInitialReading: "0",
+          connectionExecutionDate: actData.connectionExecutionDate !== undefined ? actData.connectionExecutionDate : prev.connectionExecutionDate
+        };
+        if (prev.meterId === nextState.meterId && prev.meterInstallationDate === nextState.meterInstallationDate && prev.meterInitialReading === nextState.meterInitialReading && prev.connectionExecutionDate === nextState.connectionExecutionDate) {
+          return prev;
+        }
+        return nextState;
+      });
     }
-  }, `${t(`WS_METER_ID`)}`), /*#__PURE__*/React.createElement("div", {
+  }, [formData === null || formData === void 0 ? void 0 : formData.activationDetails]);
+  React.useEffect(() => {
+    if (onSelect && config !== null && config !== void 0 && config.key) {
+      onSelect(config.key, [activationDetails]);
+    }
+  }, [activationDetails]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t(`WS_METER_ID`)}`, /*#__PURE__*/React.createElement("span", {
+    className: "check-page-link-button"
+  }, " *")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, {
     t: t,
@@ -12935,51 +12951,48 @@ const WSActivationDetails = _ref => {
     optionKey: "i18nKey",
     name: "meterId",
     value: activationDetails.meterId,
+    placeholder: `${t(`WS_METER_ID_PLACEHOLDER`)}`,
     onChange: ev => {
       setActivationDetails({
         ...activationDetails,
         meterId: ev.target.value
       });
     }
-  }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller",
-    style: {
-      fontWeight: "700"
-    }
-  }, `${t(`WS_METER_INSTALLATION_DATE`)}`), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t(`WS_METER_INSTALLATION_DATE`)}`, /*#__PURE__*/React.createElement("span", {
+    className: "check-page-link-button"
+  }, " *")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(DatePicker, {
     date: activationDetails.meterInstallationDate,
+    placeholder: `${t(`WS_METER_INSTALLATION_DATE_PLACEHOLDER`)}`,
     onChange: date => {
       setActivationDetails({
         ...activationDetails,
         meterInstallationDate: date
       });
     }
-  }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller",
-    style: {
-      fontWeight: "700"
-    }
-  }, `${t(`WS_INIT_METER_READING`)}`), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t(`WS_INIT_METER_READING`)}`, /*#__PURE__*/React.createElement("span", {
+    className: "check-page-link-button"
+  }, " *")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(TextInput, {
-    value: activationDetails.meterInitialReading,
+    value: activationDetails.meterInitialReading || "0",
+    disabled: true,
+    disable: true,
+    placeholder: `${t(`WS_INIT_METER_READING_PLACEHOLDER`)}`,
     onChange: ev => {
       setActivationDetails({
         ...activationDetails,
-        meterInitialReading: ev.target.value
+        meterInitialReading: "0"
       });
     }
-  }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
-    className: "card-label-smaller",
-    style: {
-      fontWeight: "700"
-    }
-  }, `${t(`WS_CONN_EXEC_DATE`)}`), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t(`WS_CONN_EXEC_DATE`)}`, /*#__PURE__*/React.createElement("span", {
+    className: "check-page-link-button"
+  }, " *")), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(DatePicker, {
     date: activationDetails.connectionExecutionDate,
+    placeholder: `${t(`WS_CONN_EXEC_DATE_PLACEHOLDER`)}`,
     onChange: date => {
       setActivationDetails({
         ...activationDetails,
@@ -13432,7 +13445,7 @@ const ConnectionDetails = _props => {
         placeholder: t("Select Applicant Type")
       });
     }
-  })), window.location.href.includes("/citizen") && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("Address Type"), /*#__PURE__*/React.createElement("span", {
+  })), window.location.href.includes("/citizen") && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("WS_Billing_Address_Type"), /*#__PURE__*/React.createElement("span", {
     className: "check-page-link-button"
   }, "*")), /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -15857,11 +15870,13 @@ const createConnectionDetails$1 = service => service == "WATER" ? {
     i18nKey: "WS_CONNECTIONTYPE_METERED",
     name: "Metered"
   },
-  noOfTaps: "",
-  waterSource: "",
-  pipeSize: "",
+  noOfTaps: 0,
+  waterSource: "GROUND.WELL",
+  pipeSize: 0,
   waterSubSource: "",
-  sourceSubData: ""
+  sourceSubData: "",
+  proposedPipeSize: 0,
+  proposedTaps: 0
 } : {
   noOfWaterClosets: "",
   noOfToilets: ""
@@ -15882,7 +15897,7 @@ const WSActivationConnectionDetails = _ref => {
   const {
     pathname
   } = useLocation();
-  const filters = getQueryStringParams(location.search);
+  const filters = getQueryStringParams(window.location.search);
   const [connectionDetails, setConnectionDetails] = useState(() => {
     var _formData$connectionD, _filters$service, _filters$service2, _filters$service3;
     let details = window.location.href.includes("modify") ? formData !== null && formData !== void 0 && formData.connectionDetails ? [formData === null || formData === void 0 ? void 0 : (_formData$connectionD = formData.connectionDetails) === null || _formData$connectionD === void 0 ? void 0 : _formData$connectionD[0]] : [createConnectionDetails$1(filters === null || filters === void 0 ? void 0 : (_filters$service = filters.service) === null || _filters$service === void 0 ? void 0 : _filters$service.toUpperCase())] : (formData === null || formData === void 0 ? void 0 : formData.connectionDetails) || [createConnectionDetails$1(filters === null || filters === void 0 ? void 0 : (_filters$service2 = filters.service) === null || _filters$service2 === void 0 ? void 0 : _filters$service2.toUpperCase())];
@@ -16367,6 +16382,7 @@ const PlumberDetails = _props => {
         selected: getValues("detailsProvidedBy"),
         disable: false,
         option: options,
+        placeholder: `${t(`WS_ADDN_DETAILS_PLUMBER_PROVIDED_BY_PLACEHOLDER`)}`,
         errorStyle: localFormState.touched.detailsProvidedBy && errors !== null && errors !== void 0 && (_errors$detailsProvid = errors.detailsProvidedBy) !== null && _errors$detailsProvid !== void 0 && _errors$detailsProvid.message ? true : false,
         select: e => {
           if (e.code == "ULB") {
@@ -16424,7 +16440,8 @@ const PlumberDetails = _props => {
         labelStyle: {
           marginTop: "unset"
         },
-        onBlur: props.onBlur
+        onBlur: props.onBlur,
+        placeholder: `${t(`WS_PLIMBER_LICENSE_NO_PLACEHOLDER`)}`
       });
     }
   })), localFormState.touched.plumberLicenseNo && errors !== null && errors !== void 0 && (_errors$plumberLicens2 = errors.plumberLicenseNo) !== null && _errors$plumberLicens2 !== void 0 && _errors$plumberLicens2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
@@ -16460,7 +16477,8 @@ const PlumberDetails = _props => {
         labelStyle: {
           marginTop: "unset"
         },
-        onBlur: props.onBlur
+        onBlur: props.onBlur,
+        placeholder: `${t(`WS_ADDN_DETAILS_PLUMBER_NAME_PLACEHOLDER`)}`
       });
     }
   })), localFormState.touched.plumberName && errors !== null && errors !== void 0 && (_errors$plumberName2 = errors.plumberName) !== null && _errors$plumberName2 !== void 0 && _errors$plumberName2.message ? /*#__PURE__*/React.createElement(CardLabelError, {
@@ -16516,7 +16534,8 @@ const PlumberDetails = _props => {
         labelStyle: {
           marginTop: "unset"
         },
-        onBlur: props.onBlur
+        onBlur: props.onBlur,
+        placeholder: `${t(`WS_PLUMBER_MOBILE_NO_PLACEHOLDER`)}`
       }), /*#__PURE__*/React.createElement("div", {
         style: isMobile && isEmployee ? {} : {
           marginRight: "-50px",
@@ -16974,7 +16993,9 @@ const WSActivationSupportingDocuments = _ref => {
       });
     }
   }, [uploadedFile]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t(`WF_APPROVAL_UPLOAD_HEAD`), ":"), /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t(`WF_APPROVAL_UPLOAD_HEAD`), /*#__PURE__*/React.createElement("span", {
+    className: "check-page-link-button"
+  }, " *"), ":"), /*#__PURE__*/React.createElement("div", {
     className: "field"
   }, /*#__PURE__*/React.createElement(UploadFile, {
     onUpload: e => {
@@ -16992,7 +17013,8 @@ const WSActivationSupportingDocuments = _ref => {
     },
     buttonType: "button",
     accept: "image/*, .pdf, .png, .jpeg, .jpg",
-    iserror: error
+    iserror: error,
+    isMandatory: true
   }))));
 };
 
@@ -18601,7 +18623,7 @@ const removeDuplicateOtherDocuments = function (documentList) {
   });
 };
 const WSDocumentsEmployee = _ref => {
-  var _applicationDetailsDa, _applicationDetailsDa2, _wsDocs$wsDocsData3, _wsDocs$wsDocsData3$f, _formData$ConnectionD, _formData$ConnectionD2, _formData$ConnectionD3;
+  var _formData$ConnectionD, _formData$ConnectionD2, _formData$ConnectionD3, _formData$application, _formData$application2, _formData$connectionH, _formData$connectionH2, _formData$connectionH3, _formData$connectionH4, _formData$connectionH5, _applicationDetailsDa, _applicationDetailsDa2, _wsDocs$wsDocsData3, _wsDocs$wsDocsData3$f;
   let {
     t,
     config,
@@ -18613,6 +18635,7 @@ const WSDocumentsEmployee = _ref => {
     formState
   } = _ref;
   const tenantId = Digit.ULBService.getCurrentTenantId();
+  const isTenant = (formData === null || formData === void 0 ? void 0 : (_formData$ConnectionD = formData.ConnectionDetails) === null || _formData$ConnectionD === void 0 ? void 0 : (_formData$ConnectionD2 = _formData$ConnectionD[0]) === null || _formData$ConnectionD2 === void 0 ? void 0 : (_formData$ConnectionD3 = _formData$ConnectionD2.applicantType) === null || _formData$ConnectionD3 === void 0 ? void 0 : _formData$ConnectionD3.code) === "TENANT" || (formData === null || formData === void 0 ? void 0 : (_formData$application = formData.applicationSelection) === null || _formData$application === void 0 ? void 0 : (_formData$application2 = _formData$application.applicantType) === null || _formData$application2 === void 0 ? void 0 : _formData$application2.code) === "TENANT" || (formData === null || formData === void 0 ? void 0 : (_formData$connectionH = formData.connectionHolders) === null || _formData$connectionH === void 0 ? void 0 : (_formData$connectionH2 = _formData$connectionH[0]) === null || _formData$connectionH2 === void 0 ? void 0 : _formData$connectionH2.applicantType) === "TENANT" || (formData === null || formData === void 0 ? void 0 : (_formData$connectionH3 = formData.connectionHolders) === null || _formData$connectionH3 === void 0 ? void 0 : (_formData$connectionH4 = _formData$connectionH3[0]) === null || _formData$connectionH4 === void 0 ? void 0 : (_formData$connectionH5 = _formData$connectionH4.applicantType) === null || _formData$connectionH5 === void 0 ? void 0 : _formData$connectionH5.code) === "TENANT";
   const [documents, setDocuments] = 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) || []);
@@ -18698,9 +18721,18 @@ const WSDocumentsEmployee = _ref => {
   const innerContent = /*#__PURE__*/React.createElement("div", {
     className: "formcomposer-section-grid ws-doc-upload"
   }, wsDocs === null || wsDocs === void 0 ? void 0 : (_wsDocs$wsDocsData3 = wsDocs[wsDocsData]) === null || _wsDocs$wsDocsData3 === void 0 ? void 0 : (_wsDocs$wsDocsData3$f = _wsDocs$wsDocsData3.filter(doc => doc.code !== "OWNER.APPLICANTPHOTO")) === null || _wsDocs$wsDocsData3$f === void 0 ? void 0 : _wsDocs$wsDocsData3$f.map((document, index) => {
+    let modifiedDocument = {
+      ...document
+    };
+    if (!isTenant && modifiedDocument.dropdownData) {
+      modifiedDocument.dropdownData = modifiedDocument.dropdownData.filter(opt => {
+        const code = opt.code || "";
+        return !(code.includes("NOC_FROM_OWNER") || code === "NOC from Owner");
+      });
+    }
     return /*#__PURE__*/React.createElement(SelectDocument, {
       key: index,
-      document: document,
+      document: modifiedDocument,
       action: action,
       t: t,
       id: `pt-document-${index}`,
@@ -18716,7 +18748,6 @@ const WSDocumentsEmployee = _ref => {
       isOtherDocument: isOtherDocument(document === null || document === void 0 ? void 0 : document.code)
     });
   }));
-  const isTenant = (formData === null || formData === void 0 ? void 0 : (_formData$ConnectionD = formData.ConnectionDetails) === null || _formData$ConnectionD === void 0 ? void 0 : (_formData$ConnectionD2 = _formData$ConnectionD[0]) === null || _formData$ConnectionD2 === void 0 ? void 0 : (_formData$ConnectionD3 = _formData$ConnectionD2.applicantType) === null || _formData$ConnectionD3 === void 0 ? void 0 : _formData$ConnectionD3.code) === "TENANT";
   const nocDownloadSection = isTenant ? /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "20px",
@@ -18775,7 +18806,7 @@ const WSDocumentsEmployee = _ref => {
   }));
 };
 function SelectDocument(_ref2) {
-  var _formData$application, _formData$application2, _formData$application3, _formData$ConnectionD4, _formData$ConnectionD5, _formData$ConnectionD6, _formData$ConnectionD7, _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;
+  var _formData$application3, _formData$application4, _formData$application5, _formData$ConnectionD4, _formData$ConnectionD5, _formData$ConnectionD6, _formData$ConnectionD7, _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,
     document: doc,
@@ -18794,9 +18825,10 @@ function SelectDocument(_ref2) {
     isOtherDocument: isOther = false
   } = _ref2;
   const fileRef = useRef();
+  const pendingId = useRef(Date.now());
   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);
+    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)) && (item === null || item === void 0 ? void 0 : item.tempId) !== pendingId.current;
   })) || [] : [];
   const filteredDocument = isOther ? null : documents === null || documents === void 0 ? void 0 : documents.filter(item => {
     var _item$documentType2;
@@ -18927,13 +18959,13 @@ function SelectDocument(_ref2) {
     dropdownData
   } = doc;
   var dropDownData = dropdownData;
-  const applicantTypeVal = (formData === null || formData === void 0 ? void 0 : (_formData$application = formData.applicationSelection) === null || _formData$application === void 0 ? void 0 : _formData$application.applicantType) || (formData === null || formData === void 0 ? void 0 : (_formData$application2 = formData.applicationSelection) === null || _formData$application2 === void 0 ? void 0 : (_formData$application3 = _formData$application2[0]) === null || _formData$application3 === void 0 ? void 0 : _formData$application3.applicantType) || (formData === null || formData === void 0 ? void 0 : (_formData$ConnectionD4 = formData.ConnectionDetails) === null || _formData$ConnectionD4 === void 0 ? void 0 : _formData$ConnectionD4.applicantType) || (formData === null || formData === void 0 ? void 0 : (_formData$ConnectionD5 = formData.ConnectionDetails) === null || _formData$ConnectionD5 === void 0 ? void 0 : (_formData$ConnectionD6 = _formData$ConnectionD5[0]) === null || _formData$ConnectionD6 === void 0 ? void 0 : _formData$ConnectionD6.applicantType);
+  const applicantTypeVal = (formData === null || formData === void 0 ? void 0 : (_formData$application3 = formData.applicationSelection) === null || _formData$application3 === void 0 ? void 0 : _formData$application3.applicantType) || (formData === null || formData === void 0 ? void 0 : (_formData$application4 = formData.applicationSelection) === null || _formData$application4 === void 0 ? void 0 : (_formData$application5 = _formData$application4[0]) === null || _formData$application5 === void 0 ? void 0 : _formData$application5.applicantType) || (formData === null || formData === void 0 ? void 0 : (_formData$ConnectionD4 = formData.ConnectionDetails) === null || _formData$ConnectionD4 === void 0 ? void 0 : _formData$ConnectionD4.applicantType) || (formData === null || formData === void 0 ? void 0 : (_formData$ConnectionD5 = formData.ConnectionDetails) === null || _formData$ConnectionD5 === void 0 ? void 0 : (_formData$ConnectionD6 = _formData$ConnectionD5[0]) === null || _formData$ConnectionD6 === void 0 ? void 0 : _formData$ConnectionD6.applicantType);
   const applicantTypeCode = typeof applicantTypeVal === "object" ? applicantTypeVal === null || applicantTypeVal === void 0 ? void 0 : applicantTypeVal.code : applicantTypeVal;
-  if (isOther && applicantTypeCode === "TENANT") {
+  if (isOther && applicantTypeCode !== "TENANT") {
     var _dropDownData;
     dropDownData = (_dropDownData = dropDownData) === null || _dropDownData === void 0 ? void 0 : _dropDownData.filter(d => {
       var _d$code;
-      return d.code === "OWNER.OTHERDOCUMENTS.NOC_FROM_OWNER" || ((_d$code = d.code) === null || _d$code === void 0 ? void 0 : _d$code.includes("NOC_FROM_OWNER"));
+      return d.code !== "OWNER.OTHERDOCUMENTS.NOC_FROM_OWNER" && !((_d$code = d.code) !== null && _d$code !== void 0 && _d$code.includes("NOC_FROM_OWNER"));
     });
   }
   const [isHidden, setHidden] = useState(false);
@@ -18965,13 +18997,19 @@ function SelectDocument(_ref2) {
     }
   };
   useEffect(() => {
-    if (selectedDocument !== null && selectedDocument !== void 0 && selectedDocument.code && !isOther) {
+    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));
+        var _filteredDocumentsByD;
+        let filteredDocumentsByDocumentType = prev || [];
+        if (!isOther) {
+          filteredDocumentsByDocumentType = filteredDocumentsByDocumentType.filter(item => (item === null || item === void 0 ? void 0 : item.documentType) !== (selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code));
+        } else {
+          filteredDocumentsByDocumentType = filteredDocumentsByDocumentType.filter(item => (item === null || item === void 0 ? void 0 : item.tempId) !== pendingId.current);
+        }
         if ((uploadedFile === null || uploadedFile === void 0 ? void 0 : uploadedFile.length) === 0 || uploadedFile === null) {
-          return isOther ? prev : filteredDocumentsByDocumentType;
+          return filteredDocumentsByDocumentType;
         }
-        const filteredDocumentsByFileStoreId = filteredDocumentsByDocumentType === null || filteredDocumentsByDocumentType === void 0 ? void 0 : filteredDocumentsByDocumentType.filter(item => (item === null || item === void 0 ? void 0 : item.fileStoreId) !== uploadedFile);
+        const filteredDocumentsByFileStoreId = (_filteredDocumentsByD = filteredDocumentsByDocumentType) === null || _filteredDocumentsByD === void 0 ? void 0 : _filteredDocumentsByD.filter(item => (item === null || item === void 0 ? void 0 : item.fileStoreId) !== uploadedFile);
         const data = [...filteredDocumentsByFileStoreId, {
           documentType: selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code,
           fileStoreId: uploadedFile,
@@ -18981,7 +19019,8 @@ function SelectDocument(_ref2) {
           documentNumber: documentUid,
           i18nKey: selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.code,
           id: selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.id,
-          status: "ACTIVE"
+          status: "ACTIVE",
+          tempId: isOther ? pendingId.current : undefined
         }];
         sessionStorage.setItem("DISCONNECTION_EDIT_DOCS", JSON.stringify(data));
         return data;
@@ -19302,21 +19341,7 @@ function SelectDocument(_ref2) {
         setError(docNumberError);
         return;
       }
-      setDocuments(prev => {
-        const data = [...(prev || []), {
-          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,
-          id: selectedDocument === null || selectedDocument === void 0 ? void 0 : selectedDocument.id,
-          status: "ACTIVE"
-        }];
-        sessionStorage.setItem("DISCONNECTION_EDIT_DOCS", JSON.stringify(data));
-        return data;
-      });
+      pendingId.current = Date.now();
       setUploadedFile(null);
       setFile(null);
       setSelectedDocument(doc !== null && doc !== void 0 && doc.hasDropdown ? {} : doc);
@@ -25488,7 +25513,7 @@ const DECIMAL_PATTERN$1 = /^\d+(\.\d{1,2})?$/;
 const normalizeCode = value => String(value || "").replace(/[._\s-]/g, "").toUpperCase();
 const getCode = value => typeof value === "object" ? (value === null || value === void 0 ? void 0 : value.code) || (value === null || value === void 0 ? void 0 : value.value) : value;
 const PropertyWaterConnection = _ref => {
-  var _formData$cpt3, _errors$useDetails, _errors$useDetails2, _errors$useDetails3, _errors$useDetails4, _errors$useDetails5, _errors$useDetails6, _errors$useDetails7, _errors$useDetails8, _errors$useDetails9, _errors$useDetails0, _errors$useDetails1, _errors$useDetails10, _errors$useDetails11, _errors$useDetails12;
+  var _formData$cpt3, _errors$useDetails, _errors$useDetails2, _errors$useDetails3, _errors$useDetails4, _errors$useDetails5, _errors$useDetails6, _errors$useDetails7, _errors$useDetails8, _errors$useDetails9, _errors$useDetails0, _errors$useDetails1, _errors$useDetails10, _errors$useDetails11;
   let {
     t,
     config,
@@ -25530,7 +25555,7 @@ const PropertyWaterConnection = _ref => {
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const {
     data: ptServicesMastersData
-  } = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "NoOfFloors", "PropertyNewUsageType", "PropertyToUsageMapping"]);
+  } = Digit.Hooks.pt.usePropertyMDMS(tenantId, "PropertyTax", ["PropertyCategory", "PropertyType", "NoOfFloors", "PropertyNewUsageType", "PropertyToUsageMapping", "PropertyType2"]);
   const {
     data: wsServicesMastersData
   } = Digit.Hooks.ws.useMDMS(tenantId, "ws-services-masters", ["WsCategoryType"]);
@@ -25539,8 +25564,20 @@ const PropertyWaterConnection = _ref => {
   useEffect(() => {
     var _wsServicesMastersDat;
     const categories = (wsServicesMastersData === null || wsServicesMastersData === void 0 ? void 0 : (_wsServicesMastersDat = wsServicesMastersData["ws-services-masters"]) === null || _wsServicesMastersDat === void 0 ? void 0 : _wsServicesMastersDat.WsCategoryType) || [];
-    categories.forEach(data => data.i18nKey = data.i18nKey || `WS_CATEGORY_${data.code}`);
-    setCategoryTypeList(categories);
+    if (categories.length > 0) {
+      categories.forEach(data => data.i18nKey = data.i18nKey || `WS_CATEGORY_${data.code}`);
+      setCategoryTypeList(categories);
+    } else {
+      setCategoryTypeList([{
+        code: "DOMESTIC",
+        name: "Domestic",
+        i18nKey: "WS_CATEGORY_DOMESTIC"
+      }, {
+        code: "NON_DOMESTIC",
+        name: "Non-Domestic",
+        i18nKey: "WS_CATEGORY_NON_DOMESTIC"
+      }]);
+    }
   }, [wsServicesMastersData]);
   const isPropertyFound = window.location.href.includes("ws/old-application") || window.location.href.includes("/edit-application");
   useEffect(() => {
@@ -25560,7 +25597,6 @@ const PropertyWaterConnection = _ref => {
   const isSchoolCollegeProperty = (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "School" || (watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code) === "College";
   const dwellingPropertyTypes = ["Apartment", "DDAFlats", "GovtFlats", "Bungalows", "FlatOrApartment", "GroupHousingSociety", "JJSLUMS", "IndividualHouse"];
   const isDwellingUnit = dwellingPropertyTypes.includes(watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code);
-  const isServentHouse = dwellingPropertyTypes.includes(watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code);
   const yearOptions = useMemo(() => {
     const currentYear = new Date().getFullYear();
     const years = [];
@@ -25574,76 +25610,68 @@ const PropertyWaterConnection = _ref => {
   }, []);
   const categoryOptions = useMemo(() => {
     var _ptServicesMastersDat, _ptServicesMastersDat2;
-    if (!(watchCategoryType !== null && watchCategoryType !== void 0 && watchCategoryType.code)) return [];
     let options = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat === void 0 ? void 0 : (_ptServicesMastersDat2 = _ptServicesMastersDat.PropertyCategory) === null || _ptServicesMastersDat2 === void 0 ? void 0 : _ptServicesMastersDat2.filter(item => item.active)) || [];
-    options = options.filter(item => normalizeCode(item.type) === normalizeCode(watchCategoryType.code));
     return options.map(item => ({
       code: item.code,
       name: item.name
     }));
-  }, [ptServicesMastersData, watchCategoryType]);
-  useEffect(() => {
-    var _ptServicesMastersDat3;
-    if (watchCategoryType && watchPropertyCategory && ptServicesMastersData !== null && ptServicesMastersData !== void 0 && (_ptServicesMastersDat3 = ptServicesMastersData.PropertyTax) !== null && _ptServicesMastersDat3 !== void 0 && _ptServicesMastersDat3.PropertyCategory) {
-      const isCategoryValid = categoryOptions.some(opt => opt.code === watchPropertyCategory.code);
-      if (!isCategoryValid) {
-        setValue("useDetails.propertyCategory", null);
-      }
-    }
-  }, [watchCategoryType, categoryOptions, setValue, watchPropertyCategory, ptServicesMastersData]);
+  }, [ptServicesMastersData]);
   const propertyTypeOptions = useMemo(() => {
-    var _ptServicesMastersDat4, _ptServicesMastersDat5, _ptServicesMastersDat6, _watchPropertyCategor;
-    if (!(watchPropertyCategory !== null && watchPropertyCategory !== void 0 && watchPropertyCategory.code)) return [];
-    let options = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat4 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat4 === void 0 ? void 0 : (_ptServicesMastersDat5 = _ptServicesMastersDat4.PropertyType) === null || _ptServicesMastersDat5 === void 0 ? void 0 : _ptServicesMastersDat5.filter(item => item.active)) || [];
-    let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat6 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat6 === void 0 ? void 0 : _ptServicesMastersDat6.PropertyToUsageMapping) || [];
-    if (mapping.length > 0) {
-      options = options.filter(item => mapping.some(m => m.propertyTypeCode === item.code));
-    }
-    if ((watchPropertyCategory === null || watchPropertyCategory === void 0 ? void 0 : (_watchPropertyCategor = watchPropertyCategory.code) === null || _watchPropertyCategor === void 0 ? void 0 : _watchPropertyCategor.toUpperCase()) !== "MIXED") {
-      options = options.filter(item => normalizeCode(item.type) === normalizeCode(watchPropertyCategory.code));
-    }
-    return options.map(item => ({
+    var _ptServicesMastersDat3, _ptServicesMastersDat4;
+    const list = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat3 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat3 === void 0 ? void 0 : _ptServicesMastersDat3.PropertyType2) || (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat4 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat4 === void 0 ? void 0 : _ptServicesMastersDat4.PropertyType) || [];
+    return list.filter(item => item.active).map(item => ({
+      ...item,
       code: item.code,
       name: item.name
     }));
-  }, [ptServicesMastersData, watchPropertyCategory]);
-  useEffect(() => {
-    var _ptServicesMastersDat7;
-    if (watchPropertyCategory && watchPropertyType && ptServicesMastersData !== null && ptServicesMastersData !== void 0 && (_ptServicesMastersDat7 = ptServicesMastersData.PropertyTax) !== null && _ptServicesMastersDat7 !== void 0 && _ptServicesMastersDat7.PropertyType) {
-      const isTypeValid = propertyTypeOptions.some(opt => opt.code === watchPropertyType.code);
-      if (!isTypeValid) {
-        setValue("useDetails.propertyType", null);
-      }
-    }
-  }, [watchPropertyCategory, propertyTypeOptions, setValue, watchPropertyType, ptServicesMastersData]);
+  }, [ptServicesMastersData]);
   const usageTypeOptions = useMemo(() => {
-    var _ptServicesMastersDat8, _ptServicesMastersDat9, _ptServicesMastersDat0;
-    if (!(watchPropertyType !== null && watchPropertyType !== void 0 && watchPropertyType.code)) return [];
-    let options = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat8 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat8 === void 0 ? void 0 : (_ptServicesMastersDat9 = _ptServicesMastersDat8.PropertyNewUsageType) === null || _ptServicesMastersDat9 === void 0 ? void 0 : _ptServicesMastersDat9.filter(item => item.active)) || [];
-    let mapping = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat0 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat0 === void 0 ? void 0 : _ptServicesMastersDat0.PropertyToUsageMapping) || [];
-    const selectedMapping = mapping.find(m => m.propertyTypeCode === watchPropertyType.code);
-    if (selectedMapping && selectedMapping.allowedUsages) {
-      options = options.filter(item => selectedMapping.allowedUsages.includes(item.code));
-    } else {
-      options = [];
-    }
-    return options.map(item => ({
-      code: item.code,
-      name: item.name
+    var _ptServicesMastersDat5;
+    const list = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat5 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat5 === void 0 ? void 0 : _ptServicesMastersDat5.PropertyType2) || [];
+    const uniqueTypes = [...new Set(list.map(item => item.waterConnectionUsageType).filter(Boolean))];
+    const typesToMap = uniqueTypes.length > 0 ? uniqueTypes : ["Normal", "Bulk"];
+    return typesToMap.map(type => ({
+      code: type,
+      name: type,
+      value: type
     }));
-  }, [ptServicesMastersData, watchPropertyCategory, watchPropertyType]);
+  }, [ptServicesMastersData]);
+  const prevPropertyTypeCode = React.useRef(null);
   useEffect(() => {
-    var _ptServicesMastersDat1;
-    if (watchPropertyType && watchWaterConnectionUsageType && ptServicesMastersData !== null && ptServicesMastersData !== void 0 && (_ptServicesMastersDat1 = ptServicesMastersData.PropertyTax) !== null && _ptServicesMastersDat1 !== void 0 && _ptServicesMastersDat1.PropertyNewUsageType) {
-      const isUsageTypeValid = usageTypeOptions.some(opt => opt.code === watchWaterConnectionUsageType.code);
-      if (!isUsageTypeValid) {
-        setValue("useDetails.WaterConnectionUsageType", null);
+    var _ptServicesMastersDat6;
+    if (!(watchPropertyType !== null && watchPropertyType !== void 0 && watchPropertyType.code)) {
+      prevPropertyTypeCode.current = null;
+      return;
+    }
+    const isNewType = prevPropertyTypeCode.current !== watchPropertyType.code;
+    prevPropertyTypeCode.current = watchPropertyType.code;
+    const propertyType2List = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat6 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat6 === void 0 ? void 0 : _ptServicesMastersDat6.PropertyType2) || [];
+    const matched = propertyType2List.find(item => normalizeCode(item.code) === normalizeCode(watchPropertyType.code));
+    if (matched && isNewType) {
+      if (matched.categoryType && matched.categoryType.length > 0 && categoryTypeList.length > 0) {
+        const catTarget = matched.categoryType[0];
+        const foundCat = categoryTypeList.find(c => normalizeCode(c.code) === normalizeCode(catTarget) || normalizeCode(c.name) === normalizeCode(catTarget));
+        if (foundCat) {
+          setValue("useDetails.categoryType", foundCat);
+        }
+      }
+      if (matched.propertyCategory && categoryOptions.length > 0) {
+        const foundPropCat = categoryOptions.find(c => normalizeCode(c.code) === normalizeCode(matched.propertyCategory) || normalizeCode(c.name) === normalizeCode(matched.propertyCategory));
+        if (foundPropCat) {
+          setValue("useDetails.propertyCategory", foundPropCat);
+        }
+      }
+      if (matched.waterConnectionUsageType && matched.waterConnectionUsageType.length > 0) {
+        const foundUsage = usageTypeOptions.find(u => normalizeCode(u.code) === normalizeCode(matched.waterConnectionUsageType) || normalizeCode(u.name) === normalizeCode(matched.waterConnectionUsageType));
+        if (foundUsage) {
+          setValue("useDetails.WaterConnectionUsageType", foundUsage);
+        }
       }
     }
-  }, [watchPropertyType, usageTypeOptions, setValue, watchWaterConnectionUsageType, ptServicesMastersData]);
+  }, [watchPropertyType === null || watchPropertyType === void 0 ? void 0 : watchPropertyType.code, ptServicesMastersData, categoryTypeList, categoryOptions, usageTypeOptions, setValue]);
   const floorOptions = useMemo(() => {
-    var _ptServicesMastersDat10, _ptServicesMastersDat11;
-    return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat10 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat10 === void 0 ? void 0 : (_ptServicesMastersDat11 = _ptServicesMastersDat10.NoOfFloors) === null || _ptServicesMastersDat11 === void 0 ? void 0 : _ptServicesMastersDat11.filter(item => item.active).map(item => ({
+    var _ptServicesMastersDat7, _ptServicesMastersDat8;
+    return ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat7 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat7 === void 0 ? void 0 : (_ptServicesMastersDat8 = _ptServicesMastersDat7.NoOfFloors) === null || _ptServicesMastersDat8 === void 0 ? void 0 : _ptServicesMastersDat8.filter(item => item.active).map(item => ({
       code: item.code,
       name: item.name
     }));
@@ -25660,27 +25688,25 @@ const PropertyWaterConnection = _ref => {
     if (propertyDetailsInitialized.current || !(formData !== null && formData !== void 0 && (_formData$cpt = formData.cpt) !== null && _formData$cpt !== void 0 && _formData$cpt.details)) return;
     if (!categoryTypeList.length || !ptServicesMastersData) return;
     if (formData !== null && formData !== void 0 && (_formData$cpt2 = formData.cpt) !== null && _formData$cpt2 !== void 0 && _formData$cpt2.details) {
-      var _ptServicesMastersDat12, _ptServicesMastersDat13, _ptServicesMastersDat14, _ptServicesMastersDat15, _ptServicesMastersDat16, _ptServicesMastersDat17, _details$landArea, _details$superBuiltUp, _details$heightOfTheB, _details$farArea, _details$servantQuart, _details$numberOfBeds, _details$numberOfStud;
+      var _ptServicesMastersDat9, _ptServicesMastersDat0, _ref2, _ptServicesMastersDat1, _ptServicesMastersDat10, _details$landArea, _details$superBuiltUp, _details$heightOfTheB, _details$farArea, _details$servantQuart, _details$numberOfBeds, _details$numberOfStud;
       const details = formData.cpt.details;
       const additionalDetails = (details === null || details === void 0 ? void 0 : details.additionalDetails) || {};
       const usageCategory = getCode(additionalDetails.propertyCategory || additionalDetails.usageCategory || details.usageCategory);
       const catType = getCode(additionalDetails.categoryType) || (String(usageCategory).includes("RESIDENTIAL") ? "DOMESTIC" : "NON_DOMESTIC");
       setValue("useDetails.categoryType", (categoryTypeList === null || categoryTypeList === void 0 ? void 0 : categoryTypeList.find(o => normalizeCode(o.code) === normalizeCode(catType))) || null);
-      const propCategoryMatch = ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat12 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat12 === void 0 ? void 0 : (_ptServicesMastersDat13 = _ptServicesMastersDat12.PropertyCategory) === null || _ptServicesMastersDat13 === void 0 ? void 0 : _ptServicesMastersDat13.find(o => normalizeCode(o.code) === normalizeCode(usageCategory));
+      const propCategoryMatch = ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat9 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat9 === void 0 ? void 0 : (_ptServicesMastersDat0 = _ptServicesMastersDat9.PropertyCategory) === null || _ptServicesMastersDat0 === void 0 ? void 0 : _ptServicesMastersDat0.find(o => normalizeCode(o.code) === normalizeCode(usageCategory));
       setValue("useDetails.propertyCategory", propCategoryMatch ? {
         code: propCategoryMatch.code,
         name: propCategoryMatch.name
       } : null);
-      const propTypeMatch = ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat14 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat14 === void 0 ? void 0 : (_ptServicesMastersDat15 = _ptServicesMastersDat14.PropertyType) === null || _ptServicesMastersDat15 === void 0 ? void 0 : _ptServicesMastersDat15.find(o => normalizeCode(o.code) === normalizeCode(getCode(additionalDetails.propertyType || details.propertyType)));
+      const propTypeMatch = (_ref2 = (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat1 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat1 === void 0 ? void 0 : _ptServicesMastersDat1.PropertyType2) || (ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat10 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat10 === void 0 ? void 0 : _ptServicesMastersDat10.PropertyType)) === null || _ref2 === void 0 ? void 0 : _ref2.find(o => normalizeCode(o.code) === normalizeCode(getCode(additionalDetails.propertyType || details.propertyType)));
       setValue("useDetails.propertyType", propTypeMatch ? {
         code: propTypeMatch.code,
         name: propTypeMatch.name
       } : null);
-      const usageTypeMatch = ptServicesMastersData === null || ptServicesMastersData === void 0 ? void 0 : (_ptServicesMastersDat16 = ptServicesMastersData.PropertyTax) === null || _ptServicesMastersDat16 === void 0 ? void 0 : (_ptServicesMastersDat17 = _ptServicesMastersDat16.PropertyNewUsageType) === null || _ptServicesMastersDat17 === void 0 ? void 0 : _ptServicesMastersDat17.find(o => normalizeCode(o.code) === normalizeCode(getCode(additionalDetails.waterConnectionUsageType || additionalDetails.WaterConnectionUsageType)));
-      setValue("useDetails.WaterConnectionUsageType", usageTypeMatch ? {
-        code: usageTypeMatch.code,
-        name: usageTypeMatch.name
-      } : null);
+      const usageVal = getCode(additionalDetails.waterConnectionUsageType || additionalDetails.WaterConnectionUsageType);
+      const usageTypeMatch = usageTypeOptions.find(o => normalizeCode(o.code) === normalizeCode(usageVal) || normalizeCode(o.name) === normalizeCode(usageVal));
+      setValue("useDetails.WaterConnectionUsageType", usageTypeMatch || null);
       setValue("useDetails.noOfFloors", (floorOptions === null || floorOptions === void 0 ? void 0 : floorOptions.find(o => {
         var _details$noOfFloors;
         const val1 = getCode(additionalDetails.numberOfFloors);
@@ -25744,73 +25770,73 @@ const PropertyWaterConnection = _ref => {
     style: props.style
   }, /*#__PURE__*/React.createElement("div", {
     className: "formcomposer-section-grid"
-  }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_CATEGORY_TYPE")}`, " ", /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_PROPERTY_TYPE")}`, " ", /*#__PURE__*/React.createElement("span", {
     className: "check-page-link-button"
   }, "*")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
-    name: "useDetails.categoryType",
+    name: "useDetails.propertyType",
     rules: {
       required: t("REQUIRED_FIELD")
     },
     render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: categoryTypeList,
-      optionKey: "i18nKey",
+      option: propertyTypeOptions,
+      optionKey: "name",
       selected: props.value,
       select: props.onChange,
       t: t,
       onBlur: props.onBlur,
       disable: isPropertyFound,
-      placeholder: t("WS_CATEGORY_TYPE")
+      placeholder: t("WS_PROPERTY_TYPE")
     })
-  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails = errors.useDetails) === null || _errors$useDetails === void 0 ? void 0 : _errors$useDetails.categoryType) && /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails = errors.useDetails) === null || _errors$useDetails === void 0 ? void 0 : _errors$useDetails.propertyType) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.categoryType.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_PROPERTY_CATEGORY")}`, " ", /*#__PURE__*/React.createElement("span", {
+  }, errors.useDetails.propertyType.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_CATEGORY_TYPE")}`, " ", /*#__PURE__*/React.createElement("span", {
     className: "check-page-link-button"
   }, "*")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
-    name: "useDetails.propertyCategory",
+    name: "useDetails.categoryType",
     rules: {
       required: t("REQUIRED_FIELD")
     },
     render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: categoryOptions,
-      optionKey: "name",
+      option: categoryTypeList,
+      optionKey: "i18nKey",
       selected: props.value,
       select: props.onChange,
       t: t,
       onBlur: props.onBlur,
       disable: isPropertyFound,
-      placeholder: t("WS_PROPERTY_CATEGORY")
+      placeholder: t("WS_CATEGORY_TYPE")
     })
-  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails2 = errors.useDetails) === null || _errors$useDetails2 === void 0 ? void 0 : _errors$useDetails2.propertyCategory) && /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails2 = errors.useDetails) === null || _errors$useDetails2 === void 0 ? void 0 : _errors$useDetails2.categoryType) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.propertyCategory.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_PROPERTY_TYPE")}`, " ", /*#__PURE__*/React.createElement("span", {
+  }, errors.useDetails.categoryType.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_PROPERTY_CATEGORY")}`, " ", /*#__PURE__*/React.createElement("span", {
     className: "check-page-link-button"
   }, "*")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
-    name: "useDetails.propertyType",
+    name: "useDetails.propertyCategory",
     rules: {
       required: t("REQUIRED_FIELD")
     },
     render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: propertyTypeOptions,
+      option: categoryOptions,
       optionKey: "name",
       selected: props.value,
       select: props.onChange,
       t: t,
       onBlur: props.onBlur,
       disable: isPropertyFound,
-      placeholder: t("WS_PROPERTY_TYPE")
+      placeholder: t("WS_PROPERTY_CATEGORY")
     })
-  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails3 = errors.useDetails) === null || _errors$useDetails3 === void 0 ? void 0 : _errors$useDetails3.propertyType) && /*#__PURE__*/React.createElement(CardLabelError, {
+  }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails3 = errors.useDetails) === null || _errors$useDetails3 === void 0 ? void 0 : _errors$useDetails3.propertyCategory) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.propertyType.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_WATER_CONNECTION_USAGE_TYPE")}`, " ", /*#__PURE__*/React.createElement("span", {
+  }, errors.useDetails.propertyCategory.message), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_WATER_CONNECTION_USAGE_TYPE")}`, " ", /*#__PURE__*/React.createElement("span", {
     className: "check-page-link-button"
   }, "*")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
@@ -25933,7 +25959,9 @@ const PropertyWaterConnection = _ref => {
     })
   }))), (errors === null || errors === void 0 ? void 0 : (_errors$useDetails9 = errors.useDetails) === null || _errors$useDetails9 === void 0 ? void 0 : _errors$useDetails9.SelectYearofConstruction) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.SelectYearofConstruction.message), isDwellingUnit ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_NUMBER_OF_DWELLING_UNITS")}`), /*#__PURE__*/React.createElement("div", {
+  }, errors.useDetails.SelectYearofConstruction.message), isDwellingUnit ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_NUMBER_OF_DWELLING_UNITS")}`, /*#__PURE__*/React.createElement("span", {
+    className: "check-page-link-button"
+  }, " *")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(TextInput, {
     t: t,
@@ -25941,10 +25969,14 @@ const PropertyWaterConnection = _ref => {
       pattern: {
         value: NUMBER_PATTERN$1,
         message: t("ERR_INVALID_NUMBER")
-      }
+      },
+      required: t("REQUIRED_FIELD")
     }),
     name: "useDetails.NumberofDwellingUnits",
     disabled: isPropertyFound,
+    rules: {
+      required: t("REQUIRED_FIELD")
+    },
     placeholder: t("WS_NUMBER_OF_DWELLING_UNITS")
   }))) : null, isDwellingUnit && (errors === null || errors === void 0 ? void 0 : (_errors$useDetails0 = errors.useDetails) === null || _errors$useDetails0 === void 0 ? void 0 : _errors$useDetails0.NumberofDwellingUnits) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
@@ -25999,22 +26031,7 @@ const PropertyWaterConnection = _ref => {
     placeholder: t("WS_NUMBER_OF_STUDENTS")
   }))) : null, isSchoolCollegeProperty && (errors === null || errors === void 0 ? void 0 : (_errors$useDetails11 = errors.useDetails) === null || _errors$useDetails11 === void 0 ? void 0 : _errors$useDetails11.numberOfStudents) && /*#__PURE__*/React.createElement(CardLabelError, {
     style: errorStyle
-  }, errors.useDetails.numberOfStudents.message), isServentHouse ? /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WS_SERVENT_HOUSE")}`), /*#__PURE__*/React.createElement("div", {
-    className: "form-field"
-  }, /*#__PURE__*/React.createElement(TextInput, {
-    t: t,
-    inputRef: register({
-      pattern: {
-        value: NUMBER_PATTERN$1,
-        message: t("ERR_INVALID_NUMBER")
-      }
-    }),
-    name: "useDetails.servantQuarterArea",
-    disabled: isPropertyFound,
-    placeholder: t("WS_SERVENT_HOUSE")
-  }))) : null, isServentHouse && (errors === null || errors === void 0 ? void 0 : (_errors$useDetails12 = errors.useDetails) === null || _errors$useDetails12 === void 0 ? void 0 : _errors$useDetails12.servantQuarterArea) && /*#__PURE__*/React.createElement(CardLabelError, {
-    style: errorStyle
-  }, errors.useDetails.servantQuarterArea.message)));
+  }, errors.useDetails.numberOfStudents.message)));
 };
 
 const WSPropertyWaterConnection = props => {
@@ -32978,7 +32995,7 @@ const Rebate_menu = [{
   value: "Others"
 }];
 const WSFeeEstimation = _ref => {
-  var _wsAdditionalDetails$, _wsAdditionalDetails$2, _wsAdditionalDetails$3, _billDetails$billDeta, _billDetails$billDeta2, _fields$adhocPenaltyR, _fields$adhocRebateRe;
+  var _wsAdditionalDetails$, _wsAdditionalDetails$2, _wsAdditionalDetails$3, _wsAdditionalDetails$4, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _wsAdditionalDetails$5, _wsAdditionalDetails$6, _wsAdditionalDetails$7, _billDetails$billDeta, _billDetails$billDeta2, _fields$adhocPenaltyR, _fields$adhocRebateRe;
   let {
     wsAdditionalDetails,
     workflowDetails,
@@ -32989,13 +33006,21 @@ const WSFeeEstimation = _ref => {
   } = useTranslation();
   const [sessionFormData, setSessionFormData, clearSessionFormData] = Digit.Hooks.useSessionStorage("ADHOC_ADD_REBATE_DATA", {});
   const [sessionBillFormData, setSessionBillFormData, clearBillSessionFormData] = Digit.Hooks.useSessionStorage("ADHOC_BILL_ADD_REBATE_DATA", {});
-  const isPaid = wsAdditionalDetails !== null && wsAdditionalDetails !== void 0 && (_wsAdditionalDetails$ = wsAdditionalDetails.additionalDetails) !== null && _wsAdditionalDetails$ !== void 0 && _wsAdditionalDetails$.isPaid ? true : false;
+  const appStatus = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$ = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$ === void 0 ? void 0 : (_wsAdditionalDetails$2 = _wsAdditionalDetails$.appDetails) === null || _wsAdditionalDetails$2 === void 0 ? void 0 : _wsAdditionalDetails$2.applicationStatus) || (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$3 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$3 === void 0 ? void 0 : (_wsAdditionalDetails$4 = _wsAdditionalDetails$3.data) === null || _wsAdditionalDetails$4 === void 0 ? void 0 : _wsAdditionalDetails$4.applicationStatus) || (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.applicationStatus) || (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);
+  const timeline = (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data9 = workflowDetails.data) === null || _workflowDetails$data9 === void 0 ? void 0 : _workflowDetails$data9.processInstances) || (workflowDetails === null || workflowDetails === void 0 ? void 0 : workflowDetails.ProcessInstances);
+  const hasPaymentInTimeline = Array.isArray(timeline) && timeline.some(step => {
+    var _step$state, _step$state2;
+    return (step === null || step === void 0 ? void 0 : step.action) === "PAY" || (step === null || step === void 0 ? void 0 : (_step$state = step.state) === null || _step$state === void 0 ? void 0 : _step$state.state) === "PENDING_FOR_PAYMENT" || (step === null || step === void 0 ? void 0 : (_step$state2 = step.state) === null || _step$state2 === void 0 ? void 0 : _step$state2.applicationStatus) === "PENDING_FOR_PAYMENT";
+  });
+  const isPostPaymentState = hasPaymentInTimeline && appStatus !== "PENDING_FOR_PAYMENT" && appStatus !== "INITIATED" && appStatus !== "PENDING_FOR_DOCUMENT_VERIFICATION" && appStatus !== "PENDING_FOR_CITIZEN_ACTION" && appStatus !== "PENDING_FOR_FIELD_INSPECTION";
+  const isWorkflowPaid = appStatus && appStatus !== "INITIATED" && appStatus !== "PENDING_FOR_DOCUMENT_VERIFICATION" && appStatus !== "PENDING_FOR_CITIZEN_ACTION" && appStatus !== "PENDING_FOR_FIELD_INSPECTION" && appStatus !== "PENDING_FOR_PAYMENT" && appStatus !== "PENDING_FOR_FINAL_PAYMENT" && appStatus !== "PENDING_FOR_ADDITIONAL_PAYMENT" && appStatus !== "PENDING_APPROVAL_FOR_MUTATION";
+  const isPaid = wsAdditionalDetails !== null && wsAdditionalDetails !== void 0 && (_wsAdditionalDetails$5 = wsAdditionalDetails.additionalDetails) !== null && _wsAdditionalDetails$5 !== void 0 && _wsAdditionalDetails$5.isPaid || isWorkflowPaid || isPostPaymentState ? true : false;
   const [popup, showPopUp] = useState(false);
   const [fields, setFields] = useState(sessionFormData ? sessionFormData : {});
   const [showToast, setShowToast] = useState(null);
   const [billDetails, setBillDetails] = useState(wsAdditionalDetails.additionalDetails.data ? wsAdditionalDetails.additionalDetails.data : {});
   const [values, setValues] = useState(wsAdditionalDetails.additionalDetails.values ? wsAdditionalDetails.additionalDetails.values : []);
-  const isDisconnectionExecuted = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$2 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$2 === void 0 ? void 0 : (_wsAdditionalDetails$3 = _wsAdditionalDetails$2.appDetails) === null || _wsAdditionalDetails$3 === void 0 ? void 0 : _wsAdditionalDetails$3.applicationStatus) === "DISCONNECTION_EXECUTED";
+  const isDisconnectionExecuted = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$6 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$6 === void 0 ? void 0 : (_wsAdditionalDetails$7 = _wsAdditionalDetails$6.appDetails) === null || _wsAdditionalDetails$7 === void 0 ? void 0 : _wsAdditionalDetails$7.applicationStatus) === "DISCONNECTION_EXECUTED";
   const billRows = (billDetails === null || billDetails === void 0 ? void 0 : (_billDetails$billDeta = billDetails.billDetails) === null || _billDetails$billDeta === void 0 ? void 0 : (_billDetails$billDeta2 = _billDetails$billDeta[0]) === null || _billDetails$billDeta2 === void 0 ? void 0 : _billDetails$billDeta2.billAccountDetails) || (billDetails === null || billDetails === void 0 ? void 0 : billDetails.taxHeadEstimates) || [];
   const disconnectionFee = billRows.find(row => (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "WS_DISCONNECTION_FEE" || (row === null || row === void 0 ? void 0 : row.taxHeadCode) === "SW_DISCONNECTION_FEE");
   const displayedValues = onlyDisconnectionFee || isDisconnectionExecuted ? values.filter(value => (value === null || value === void 0 ? void 0 : value.title) === "WS_DISCONNECTION_FEE" || (value === null || value === void 0 ? void 0 : value.title) === "SW_DISCONNECTION_FEE") : values;
@@ -33007,9 +33032,9 @@ const WSFeeEstimation = _ref => {
     data: mdmsRes
   } = Digit.Hooks.ws.useMDMS(stateCode, "BillingService", ["TaxHeadMaster"]);
   useEffect(() => {
-    var _wsAdditionalDetails$4, _wsAdditionalDetails$5, _sessionFormData$bill;
+    var _wsAdditionalDetails$8, _wsAdditionalDetails$9, _sessionFormData$bill;
     const data = {
-      ...(wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$4 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$4 === void 0 ? void 0 : (_wsAdditionalDetails$5 = _wsAdditionalDetails$4.appDetails) === null || _wsAdditionalDetails$5 === void 0 ? void 0 : _wsAdditionalDetails$5.additionalDetails)
+      ...(wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$8 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$8 === void 0 ? void 0 : (_wsAdditionalDetails$9 = _wsAdditionalDetails$8.appDetails) === null || _wsAdditionalDetails$9 === void 0 ? void 0 : _wsAdditionalDetails$9.additionalDetails)
     };
     if ((sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill = sessionFormData.billDetails) === null || _sessionFormData$bill === void 0 ? void 0 : _sessionFormData$bill.length) > 0) {
       var _sessionFormData$bill2, _sessionFormData$bill3, _sessionFormData$bill4, _sessionFormData$bill5, _sessionFormData$bill6, _sessionFormData$bill7, _sessionFormData$bill8, _sessionFormData$bill9, _sessionFormData$bill0, _sessionFormData$bill1, _sessionFormData$bill10;
@@ -33063,8 +33088,8 @@ const WSFeeEstimation = _ref => {
     const adhocAmount = fields !== null && fields !== void 0 && fields.adhocPenalty ? Number(fields === null || fields === void 0 ? void 0 : fields.adhocPenalty) : 0;
     const rebateAmount = fields !== null && fields !== void 0 && fields.adhocRebate ? Number(fields === null || fields === void 0 ? void 0 : fields.adhocRebate) : 0;
     if (adhocAmount || rebateAmount) {
-      var _wsAdditionalDetails$6, _wsAdditionalDetails$7;
-      const totalAmount = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$6 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$6 === void 0 ? void 0 : (_wsAdditionalDetails$7 = _wsAdditionalDetails$6.data) === null || _wsAdditionalDetails$7 === void 0 ? void 0 : _wsAdditionalDetails$7.totalAmount;
+      var _wsAdditionalDetails$0, _wsAdditionalDetails$1;
+      const totalAmount = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$0 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$0 === void 0 ? void 0 : (_wsAdditionalDetails$1 = _wsAdditionalDetails$0.data) === null || _wsAdditionalDetails$1 === void 0 ? void 0 : _wsAdditionalDetails$1.totalAmount;
       if (rebateAmount > totalAmount) {
         setShowToast({
           isError: false,
@@ -33073,16 +33098,16 @@ const WSFeeEstimation = _ref => {
           message: t("ERR_WS_REBATE_GREATER_THAN_AMOUNT")
         });
       } else {
-        var _wsAdditionalDetails$10, _wsAdditionalDetails$11, _wsAdditionalDetails$12, _wsAdditionalDetails$13, _wsAdditionalDetails$14, _wsAdditionalDetails$15, _wsAdditionalDetails$16, _wsAdditionalDetails$17, _wsAdditionalDetails$18, _wsAdditionalDetails$19;
-        const applicationNo = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$10 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$10 === void 0 ? void 0 : (_wsAdditionalDetails$11 = _wsAdditionalDetails$10.appDetails) === null || _wsAdditionalDetails$11 === void 0 ? void 0 : _wsAdditionalDetails$11.applicationNo;
-        const tenantId = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$12 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$12 === void 0 ? void 0 : (_wsAdditionalDetails$13 = _wsAdditionalDetails$12.appDetails) === null || _wsAdditionalDetails$13 === void 0 ? void 0 : _wsAdditionalDetails$13.tenantId;
+        var _wsAdditionalDetails$14, _wsAdditionalDetails$15, _wsAdditionalDetails$16, _wsAdditionalDetails$17, _wsAdditionalDetails$18, _wsAdditionalDetails$19, _wsAdditionalDetails$20, _wsAdditionalDetails$21, _wsAdditionalDetails$22, _wsAdditionalDetails$23;
+        const applicationNo = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$14 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$14 === void 0 ? void 0 : (_wsAdditionalDetails$15 = _wsAdditionalDetails$14.appDetails) === null || _wsAdditionalDetails$15 === void 0 ? void 0 : _wsAdditionalDetails$15.applicationNo;
+        const tenantId = wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$16 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$16 === void 0 ? void 0 : (_wsAdditionalDetails$17 = _wsAdditionalDetails$16.appDetails) === null || _wsAdditionalDetails$17 === void 0 ? void 0 : _wsAdditionalDetails$17.tenantId;
         const appAdditionalDetails = {
-          ...(wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$14 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$14 === void 0 ? void 0 : (_wsAdditionalDetails$15 = _wsAdditionalDetails$14.appDetails) === null || _wsAdditionalDetails$15 === void 0 ? void 0 : _wsAdditionalDetails$15.additionalDetails),
+          ...(wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$18 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$18 === void 0 ? void 0 : (_wsAdditionalDetails$19 = _wsAdditionalDetails$18.appDetails) === null || _wsAdditionalDetails$19 === void 0 ? void 0 : _wsAdditionalDetails$19.additionalDetails),
           ...fields
         };
         wsAdditionalDetails.additionalDetails.appDetails.additionalDetails = appAdditionalDetails;
         const data = {
-          CalculationCriteria: (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$16 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$16 === void 0 ? void 0 : (_wsAdditionalDetails$17 = _wsAdditionalDetails$16.appDetails) === null || _wsAdditionalDetails$17 === void 0 ? void 0 : _wsAdditionalDetails$17.service) == "WATER" ? [{
+          CalculationCriteria: (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$20 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$20 === void 0 ? void 0 : (_wsAdditionalDetails$21 = _wsAdditionalDetails$20.appDetails) === null || _wsAdditionalDetails$21 === void 0 ? void 0 : _wsAdditionalDetails$21.service) == "WATER" ? [{
             applicationNo: applicationNo,
             tenantId: tenantId,
             waterConnection: wsAdditionalDetails.additionalDetails.appDetails
@@ -33093,14 +33118,14 @@ const WSFeeEstimation = _ref => {
           }],
           isconnectionCalculation: false
         };
-        let businessService = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$18 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$18 === void 0 ? void 0 : (_wsAdditionalDetails$19 = _wsAdditionalDetails$18.appDetails) === null || _wsAdditionalDetails$19 === void 0 ? void 0 : _wsAdditionalDetails$19.service) == "WATER" ? "WS" : "SW";
+        let businessService = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$22 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$22 === void 0 ? void 0 : (_wsAdditionalDetails$23 = _wsAdditionalDetails$22.appDetails) === null || _wsAdditionalDetails$23 === void 0 ? void 0 : _wsAdditionalDetails$23.service) == "WATER" ? "WS" : "SW";
         Digit.WSService.wsCalculationEstimate(data, businessService).then((result, err) => {
           var _result$Calculation, _result$Calculation$, _result$Calculation$$, _result$Calculation3, _result$Calculation3$, _result$Calculation4, _result$Calculation4$, _result$Calculation5, _result$Calculation5$, _result$Calculation6, _result$Calculation6$, _result$Calculation7, _result$Calculation7$, _result$Calculation8;
           if ((result === null || result === void 0 ? void 0 : (_result$Calculation = result.Calculation) === null || _result$Calculation === void 0 ? void 0 : (_result$Calculation$ = _result$Calculation[0]) === null || _result$Calculation$ === void 0 ? void 0 : (_result$Calculation$$ = _result$Calculation$.taxHeadEstimates) === null || _result$Calculation$$ === void 0 ? void 0 : _result$Calculation$$.length) > 0) {
             var _result$Calculation2, _result$Calculation2$, _result$Calculation2$2;
             result === null || result === void 0 ? void 0 : (_result$Calculation2 = result.Calculation) === null || _result$Calculation2 === void 0 ? void 0 : (_result$Calculation2$ = _result$Calculation2[0]) === null || _result$Calculation2$ === void 0 ? void 0 : (_result$Calculation2$2 = _result$Calculation2$.taxHeadEstimates) === null || _result$Calculation2$2 === void 0 ? void 0 : _result$Calculation2$2.forEach(data => data.amount = data.estimateAmount);
           }
-          result.Calculation[0].billSlabData = _.groupBy(result === null || result === void 0 ? void 0 : (_result$Calculation3 = result.Calculation) === null || _result$Calculation3 === void 0 ? void 0 : (_result$Calculation3$ = _result$Calculation3[0]) === null || _result$Calculation3$ === void 0 ? void 0 : _result$Calculation3$.taxHeadEstimates, "category");
+          result.Calculation[0].billSlabData = lodash.groupBy(result === null || result === void 0 ? void 0 : (_result$Calculation3 = result.Calculation) === null || _result$Calculation3 === void 0 ? void 0 : (_result$Calculation3$ = _result$Calculation3[0]) === null || _result$Calculation3$ === void 0 ? void 0 : _result$Calculation3$.taxHeadEstimates, "category");
           const taxHeadEstimates = (result === null || result === void 0 ? void 0 : (_result$Calculation4 = result.Calculation) === null || _result$Calculation4 === void 0 ? void 0 : (_result$Calculation4$ = _result$Calculation4[0]) === null || _result$Calculation4$ === void 0 ? void 0 : _result$Calculation4$.taxHeadEstimates) || [];
           const values = taxHeadEstimates.length > 0 ? taxHeadEstimates.map(data => ({
             title: data === null || data === void 0 ? void 0 : data.taxHeadCode,
@@ -33198,7 +33223,7 @@ const WSFeeEstimation = _ref => {
     key: `CS_INBOX_STATUS_FILTER`,
     label: `${t(`CS_INBOX_STATUS_FILTER`)}`,
     text: displayedIsPaid ? t("WS_COMMON_PAID_LABEL") : t("WS_COMMON_NOT_PAID"),
-    textStyle: !isPaid ? {
+    textStyle: !displayedIsPaid ? {
       color: "#D83A2F"
     } : {
       color: "#2E9E8F"
@@ -33803,7 +33828,7 @@ 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$WaterConnection5, _data$SewerageConnect3, _data$SewerageConnect4, _data$SewerageConnect5, _data$WaterConnection6, _data$WaterConnection7, _data$SewerageConnect6, _data$SewerageConnect7, _data$WaterConnection8, _data$WaterConnection9, _data$SewerageConnect8, _data$SewerageConnect9, _data$WaterConnection0, _data$WaterConnection1, _data$SewerageConnect0, _data$SewerageConnect1, _data$WaterConnection10, _data$SewerageConnect10, _PTData$Properties, _PTData$Properties$, _PTData$Properties2, _PTData$Properties2$, _data$WaterConnection11, _data$WaterConnection12, _data$WaterConnection13, _data$WaterConnection14, _data$SewerageConnect11, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$WaterConnection15, _data$WaterConnection16, _data$SewerageConnect15, _data$SewerageConnect16, _appDetailsData$appli, _data$WaterConnection35, _data$WaterConnection36, _data$WaterConnection37, _data$SewerageConnect31, _data$SewerageConnect32, _data$SewerageConnect33, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$WaterConnection43, _data$WaterConnection44, _data$WaterConnection45, _data$SewerageConnect39, _data$SewerageConnect40, _data$SewerageConnect41, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect42, _data$WaterConnection48, _data$WaterConnection49, _data$SewerageConnect43, _data$SewerageConnect44, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect45, _data$SewerageConnect46, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect47, _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$WaterConnection61, _data$SewerageConnect54, _data$SewerageConnect55, _data$SewerageConnect56, _data$WaterConnection62, _data$WaterConnection63, _data$SewerageConnect57, _data$SewerageConnect58, _data$WaterConnection64, _data$WaterConnection65, _data$WaterConnection66, _data$SewerageConnect59, _data$SewerageConnect60, _data$SewerageConnect61, _data$WaterConnection67, _data$WaterConnection68, _data$SewerageConnect62, _data$SewerageConnect63, _data$WaterConnection69, _data$WaterConnection70, _data$WaterConnection71, _data$SewerageConnect64, _data$SewerageConnect65, _data$SewerageConnect66, _data$WaterConnection72, _data$WaterConnection73, _data$WaterConnection74, _data$WaterConnection75, _data$SewerageConnect67, _data$SewerageConnect68, _data$SewerageConnect69, _data$SewerageConnect70, _connectionDetails$se, _connectionDetails$se2, _connectionDetails$ap, _connectionDetails$ap2, _connectionDetails$do, _connectionDetails$de, _connectionDetails$de2, _data$WaterConnection76, _data$WaterConnection77, _data$WaterConnection78, _data$SewerageConnect71, _data$SewerageConnect72, _data$SewerageConnect73, _data$WaterConnection79, _data$WaterConnection80, _data$WaterConnection81, _data$WaterConnection82, _data$SewerageConnect74, _data$SewerageConnect75, _data$SewerageConnect76, _data$SewerageConnect77, _data$WaterConnection83, _data$WaterConnection84, _data$WaterConnection85, _data$WaterConnection86, _data$SewerageConnect78, _data$SewerageConnect79, _data$SewerageConnect80, _data$SewerageConnect81, _data$WaterConnection87, _data$WaterConnection88, _data$WaterConnection89, _data$WaterConnection90, _data$SewerageConnect82, _data$SewerageConnect83, _data$SewerageConnect84, _data$SewerageConnect85, _data$WaterConnection91, _data$WaterConnection92, _data$WaterConnection93, _data$WaterConnection94, _data$SewerageConnect86, _data$SewerageConnect87, _data$SewerageConnect88, _data$SewerageConnect89, _data$WaterConnection95, _data$WaterConnection96, _data$WaterConnection97, _data$WaterConnection98, _data$SewerageConnect90, _data$SewerageConnect91, _data$SewerageConnect92, _data$SewerageConnect93, _data$WaterConnection99, _data$WaterConnection100, _data$WaterConnection101, _data$WaterConnection102, _data$SewerageConnect94, _data$SewerageConnect95, _data$SewerageConnect96, _data$SewerageConnect97, _data$WaterConnection103, _data$WaterConnection104, _data$WaterConnection105, _data$WaterConnection106, _data$SewerageConnect98, _data$SewerageConnect99, _data$SewerageConnect100, _data$SewerageConnect101, _data$WaterConnection107, _data$WaterConnection108, _data$WaterConnection109, _data$WaterConnection110, _data$SewerageConnect102, _data$SewerageConnect103, _data$SewerageConnect104, _data$SewerageConnect105, _data$WaterConnection111, _data$WaterConnection112, _data$WaterConnection113, _data$WaterConnection114, _data$SewerageConnect106, _data$SewerageConnect107, _data$SewerageConnect108, _data$SewerageConnect109, _data$WaterConnection115, _data$WaterConnection116, _data$SewerageConnect110, _data$SewerageConnect111, _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$WaterConnection117, _data$WaterConnection118, _data$SewerageConnect112, _data$SewerageConnect113, _data$WaterConnection119, _data$WaterConnection120, _data$SewerageConnect114, _data$SewerageConnect115, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$city3, _propertyAddress$city4, _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, _applicationData$dueV, _data$WaterConnection121, _data$WaterConnection122, _data$WaterConnection123, _data$WaterConnection124, _data$SewerageConnect116, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$WaterConnection127, _data$WaterConnection128, _data$WaterConnection129, _data$WaterConnection130, _data$WaterConnection131, _data$WaterConnection132, _data$SewerageConnect122, _data$SewerageConnect123, _data$SewerageConnect124, _data$SewerageConnect125, _data$SewerageConnect126, _data$SewerageConnect127, _data$WaterConnection138, _data$WaterConnection139, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$SewerageConnect133, _data$SewerageConnect134, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _data$WaterConnection143, _data$WaterConnection144, _data$SewerageConnect138, _data$SewerageConnect139, _data$WaterConnection145, _data$WaterConnection146, _data$SewerageConnect140, _data$SewerageConnect141, _data$WaterConnection147, _data$WaterConnection148, _data$SewerageConnect142, _data$SewerageConnect143, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$SewerageConnect144, _data$SewerageConnect145, _data$WaterConnection152, _data$WaterConnection153, _data$SewerageConnect146, _data$SewerageConnect147, _data$WaterConnection154, _data$WaterConnection155, _data$WaterConnection156, _data$WaterConnection157, _data$WaterConnection158, _data$SewerageConnect148, _data$SewerageConnect149, _data$SewerageConnect150, _data$SewerageConnect151, _data$SewerageConnect152, _data$WaterConnection159, _data$WaterConnection160, _data$SewerageConnect153, _data$SewerageConnect154, _data$SewerageConnect155, _data$SewerageConnect156, _data$SewerageConnect157, _data$SewerageConnect158, _data$SewerageConnect159, _data$SewerageConnect160, _data$SewerageConnect161, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection161, _data$WaterConnection162, _data$WaterConnection163, _data$WaterConnection164, _data$WaterConnection165, _data$WaterConnection166, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$WaterConnection170, _data$WaterConnection171, _data$WaterConnection172, _data$WaterConnection173, _data$SewerageConnect164, _data$SewerageConnect165, _data$SewerageConnect166, _data$SewerageConnect167, _data$WaterConnection174, _data$SewerageConnect168, _data$WaterConnection175, _data$WaterConnection176, _data$WaterConnection177, _data$SewerageConnect169, _data$SewerageConnect170, _data$WaterConnection178, _data$WaterConnection179, _data$SewerageConnect171, _data$SewerageConnect172, _data$WaterConnection180, _data$WaterConnection181, _data$SewerageConnect173;
+  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$WaterConnection5, _data$SewerageConnect3, _data$SewerageConnect4, _data$SewerageConnect5, _data$WaterConnection6, _data$WaterConnection7, _data$SewerageConnect6, _data$SewerageConnect7, _data$WaterConnection8, _data$WaterConnection9, _data$SewerageConnect8, _data$SewerageConnect9, _data$WaterConnection0, _data$WaterConnection1, _data$SewerageConnect0, _data$SewerageConnect1, _data$WaterConnection10, _data$SewerageConnect10, _PTData$Properties, _PTData$Properties$, _PTData$Properties2, _PTData$Properties2$, _data$WaterConnection11, _data$WaterConnection12, _data$WaterConnection13, _data$WaterConnection14, _data$SewerageConnect11, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$WaterConnection15, _data$WaterConnection16, _data$SewerageConnect15, _data$SewerageConnect16, _appDetailsData$appli, _data$WaterConnection35, _data$WaterConnection36, _data$WaterConnection37, _data$SewerageConnect31, _data$SewerageConnect32, _data$SewerageConnect33, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$WaterConnection43, _data$WaterConnection44, _data$WaterConnection45, _data$SewerageConnect39, _data$SewerageConnect40, _data$SewerageConnect41, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect42, _data$WaterConnection48, _data$WaterConnection49, _data$SewerageConnect43, _data$SewerageConnect44, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect45, _data$SewerageConnect46, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect47, _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$WaterConnection61, _data$SewerageConnect54, _data$SewerageConnect55, _data$SewerageConnect56, _data$WaterConnection62, _data$WaterConnection63, _data$SewerageConnect57, _data$SewerageConnect58, _data$WaterConnection64, _data$WaterConnection65, _data$WaterConnection66, _data$SewerageConnect59, _data$SewerageConnect60, _data$SewerageConnect61, _data$WaterConnection67, _data$WaterConnection68, _data$SewerageConnect62, _data$SewerageConnect63, _data$WaterConnection69, _data$WaterConnection70, _data$WaterConnection71, _data$SewerageConnect64, _data$SewerageConnect65, _data$SewerageConnect66, _data$WaterConnection72, _data$WaterConnection73, _data$WaterConnection74, _data$WaterConnection75, _data$SewerageConnect67, _data$SewerageConnect68, _data$SewerageConnect69, _data$SewerageConnect70, _connectionDetails$se, _connectionDetails$se2, _connectionDetails$ap, _connectionDetails$ap2, _connectionDetails$do, _connectionDetails$de, _connectionDetails$de2, _data$WaterConnection76, _data$WaterConnection77, _data$WaterConnection78, _data$SewerageConnect71, _data$SewerageConnect72, _data$SewerageConnect73, _data$WaterConnection79, _data$WaterConnection80, _data$WaterConnection81, _data$WaterConnection82, _data$SewerageConnect74, _data$SewerageConnect75, _data$SewerageConnect76, _data$SewerageConnect77, _data$WaterConnection83, _data$WaterConnection84, _data$WaterConnection85, _data$WaterConnection86, _data$SewerageConnect78, _data$SewerageConnect79, _data$SewerageConnect80, _data$SewerageConnect81, _data$WaterConnection87, _data$WaterConnection88, _data$WaterConnection89, _data$WaterConnection90, _data$SewerageConnect82, _data$SewerageConnect83, _data$SewerageConnect84, _data$SewerageConnect85, _data$WaterConnection91, _data$WaterConnection92, _data$WaterConnection93, _data$WaterConnection94, _data$SewerageConnect86, _data$SewerageConnect87, _data$SewerageConnect88, _data$SewerageConnect89, _data$WaterConnection95, _data$WaterConnection96, _data$WaterConnection97, _data$WaterConnection98, _data$SewerageConnect90, _data$SewerageConnect91, _data$SewerageConnect92, _data$SewerageConnect93, _data$WaterConnection99, _data$WaterConnection100, _data$WaterConnection101, _data$WaterConnection102, _data$SewerageConnect94, _data$SewerageConnect95, _data$SewerageConnect96, _data$SewerageConnect97, _data$WaterConnection103, _data$WaterConnection104, _data$WaterConnection105, _data$WaterConnection106, _data$SewerageConnect98, _data$SewerageConnect99, _data$SewerageConnect100, _data$SewerageConnect101, _data$WaterConnection107, _data$WaterConnection108, _data$WaterConnection109, _data$WaterConnection110, _data$SewerageConnect102, _data$SewerageConnect103, _data$SewerageConnect104, _data$SewerageConnect105, _data$WaterConnection111, _data$WaterConnection112, _data$WaterConnection113, _data$WaterConnection114, _data$SewerageConnect106, _data$SewerageConnect107, _data$SewerageConnect108, _data$SewerageConnect109, _data$WaterConnection115, _data$WaterConnection116, _data$SewerageConnect110, _data$SewerageConnect111, _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$WaterConnection117, _data$WaterConnection118, _data$SewerageConnect112, _data$SewerageConnect113, _data$WaterConnection119, _data$WaterConnection120, _data$SewerageConnect114, _data$SewerageConnect115, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$city3, _propertyAddress$city4, _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, _useDetails$propertyT3, _applicationData$dueV, _data$WaterConnection121, _data$WaterConnection122, _data$WaterConnection123, _data$WaterConnection124, _data$SewerageConnect116, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$WaterConnection127, _data$WaterConnection128, _data$WaterConnection129, _data$WaterConnection130, _data$WaterConnection131, _data$WaterConnection132, _data$SewerageConnect122, _data$SewerageConnect123, _data$SewerageConnect124, _data$SewerageConnect125, _data$SewerageConnect126, _data$SewerageConnect127, _data$WaterConnection138, _data$WaterConnection139, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$SewerageConnect133, _data$SewerageConnect134, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _data$WaterConnection143, _data$WaterConnection144, _data$SewerageConnect138, _data$SewerageConnect139, _data$WaterConnection145, _data$WaterConnection146, _data$SewerageConnect140, _data$SewerageConnect141, _data$WaterConnection147, _data$WaterConnection148, _data$SewerageConnect142, _data$SewerageConnect143, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$SewerageConnect144, _data$SewerageConnect145, _data$WaterConnection152, _data$WaterConnection153, _data$SewerageConnect146, _data$SewerageConnect147, _data$WaterConnection154, _data$WaterConnection155, _data$WaterConnection156, _data$WaterConnection157, _data$WaterConnection158, _data$SewerageConnect148, _data$SewerageConnect149, _data$SewerageConnect150, _data$SewerageConnect151, _data$SewerageConnect152, _data$WaterConnection159, _data$WaterConnection160, _data$SewerageConnect153, _data$SewerageConnect154, _data$SewerageConnect155, _data$SewerageConnect156, _data$SewerageConnect157, _data$SewerageConnect158, _data$SewerageConnect159, _data$SewerageConnect160, _data$SewerageConnect161, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection161, _data$WaterConnection162, _data$WaterConnection163, _data$WaterConnection164, _data$WaterConnection165, _data$WaterConnection166, _data$WaterConnection167, _data$WaterConnection168, _data$WaterConnection169, _data$WaterConnection170, _data$WaterConnection171, _data$WaterConnection172, _data$WaterConnection173, _data$SewerageConnect164, _data$SewerageConnect165, _data$SewerageConnect166, _data$SewerageConnect167, _data$WaterConnection174, _data$SewerageConnect168, _data$WaterConnection175, _data$WaterConnection176, _data$WaterConnection177, _data$SewerageConnect169, _data$SewerageConnect170, _data$WaterConnection178, _data$WaterConnection179, _data$SewerageConnect171, _data$SewerageConnect172, _data$WaterConnection180, _data$WaterConnection181, _data$SewerageConnect173;
   const getDisconnectionNoticeSearch = function () {
     try {
       var _data$WaterConnection183, _data$WaterConnection184, _data$SewerageConnect175, _data$SewerageConnect176;
@@ -34396,6 +34421,9 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("SubLocality"),
     text: `${t(checkForNA$1((propertyAddress === null || propertyAddress === void 0 ? void 0 : (_propertyAddress$subL = propertyAddress.subLocality) === null || _propertyAddress$subL === void 0 ? void 0 : _propertyAddress$subL.name) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : (_propertyAddress$subL2 = propertyAddress.subLocality) === null || _propertyAddress$subL2 === void 0 ? void 0 : _propertyAddress$subL2.code) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.subLocality)))}`
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("COMMON_COLONY_MCD_CATEGORY"),
+    text: `${t(checkForNA$1(propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.colonyMcdCategory))}`
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("STREET_NAME"),
     text: `${t(checkForNA$1((propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.streetName) || (propertyAddress === null || propertyAddress === void 0 ? void 0 : propertyAddress.street)))}`
@@ -34465,13 +34493,16 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_BUILT_UP_AREA"),
     text: `${t(checkForNA$1(useDetails === null || useDetails === void 0 ? void 0 : useDetails.builtUpArea))}`
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("WS_HEIGHT_OF_THE_BUILDING"),
+    text: `${t(checkForNA$1(useDetails === null || useDetails === void 0 ? void 0 : useDetails.heightOfTheBuilding))}`
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_SELECT_YEAR_OF_CONSTRUCTION"),
     text: `${t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$SelectYea = useDetails.SelectYearofConstruction) === null || _useDetails$SelectYea === void 0 ? void 0 : _useDetails$SelectYea.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$SelectYea2 = useDetails.SelectYearofConstruction) === null || _useDetails$SelectYea2 === void 0 ? void 0 : _useDetails$SelectYea2.value) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$SelectYea3 = useDetails.SelectYearofConstruction) === null || _useDetails$SelectYea3 === void 0 ? void 0 : _useDetails$SelectYea3.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.SelectYearofConstruction) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$construct = useDetails.constructionYear) === null || _useDetails$construct === void 0 ? void 0 : _useDetails$construct.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$construct2 = useDetails.constructionYear) === null || _useDetails$construct2 === void 0 ? void 0 : _useDetails$construct2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.constructionYear)))}`
-  }), /*#__PURE__*/React.createElement(Row, {
+  }), ["Apartment", "DDAFlats", "GovtFlats", "Bungalows", "FlatOrApartment", "GroupHousingSociety", "JJSLUMS", "IndividualHouse", "BuiltUp.GroupHousingSociety", "BuiltUp.JJSLUMS", "BuiltUp.IndividualHouse"].includes((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyT3 = useDetails.propertyType) === null || _useDetails$propertyT3 === void 0 ? void 0 : _useDetails$propertyT3.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.propertyType)) ? /*#__PURE__*/React.createElement(Row, {
     label: t("WS_NUMBER_OF_DWELLING_UNITS"),
     text: `${t(checkForNA$1((useDetails === null || useDetails === void 0 ? void 0 : useDetails.NumberofDwellingUnits) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.noOfDwellingUnits)))}`
-  })), /*#__PURE__*/React.createElement(CardHeader, {
+  }) : null), /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
@@ -34486,9 +34517,6 @@ const WSApplicationDetails = () => {
   }), (djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.isDjbEmployee) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_EMPLOYEE_ID"),
     text: `${t(checkForNA$1(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.employeeId))}`
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("WS_DATE_OF_RETIREMENT"),
-    text: `${t(checkForNA$1(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.dor))}`
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_EMPLOYEE_DESIGNATION"),
     text: `${t(checkForNA$1(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.designation))}`
@@ -37338,7 +37366,7 @@ const ReSubmitDisconnectionApplication = () => {
 };
 
 const CheckPage = _ref => {
-  var _value$ConnectionDeta, _value$waterConnectio, _cpt$details12, _cpt$details13, _cpt$details14, _reversedOwners$, _cpt$details15, _cpt$details16, _cpt$details17, _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, _ConnectionHolderDeta, _ConnectionHolderDeta2, _ConnectionHolderDeta3, _ConnectionHolderDeta4, _ConnectionHolderDeta5, _ConnectionHolderDeta6, _ConnectionHolderDeta7, _ConnectionHolderDeta8, _ConnectionHolderDeta9, _ConnectionHolderDeta0, _propertyAddress$zro, _propertyAddress$addi, _propertyAddress$addr, _propertyAddress$addr2, _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;
+  var _value$ConnectionDeta, _value$waterConnectio, _cpt$details12, _cpt$details13, _cpt$details14, _reversedOwners$, _cpt$details15, _cpt$details16, _cpt$details17, _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, _ConnectionHolderDeta, _ConnectionHolderDeta2, _ConnectionHolderDeta3, _ConnectionHolderDeta4, _ConnectionHolderDeta5, _ConnectionHolderDeta6, _ConnectionHolderDeta7, _ConnectionHolderDeta8, _ConnectionHolderDeta9, _ConnectionHolderDeta0, _propertyAddress$zro, _propertyAddress$addi, _propertyAddress$addr, _propertyAddress$addr2, _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, _useDetails$propertyT3;
   let {
     onSubmit,
     value
@@ -37642,10 +37670,10 @@ const CheckPage = _ref => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_SELECT_YEAR_OF_CONSTRUCTION"),
     text: `${t(checkForNA((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$SelectYea = useDetails.SelectYearofConstruction) === null || _useDetails$SelectYea === void 0 ? void 0 : _useDetails$SelectYea.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$SelectYea2 = useDetails.SelectYearofConstruction) === null || _useDetails$SelectYea2 === void 0 ? void 0 : _useDetails$SelectYea2.value) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$SelectYea3 = useDetails.SelectYearofConstruction) === null || _useDetails$SelectYea3 === void 0 ? void 0 : _useDetails$SelectYea3.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.SelectYearofConstruction) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$construct = useDetails.constructionYear) === null || _useDetails$construct === void 0 ? void 0 : _useDetails$construct.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$construct2 = useDetails.constructionYear) === null || _useDetails$construct2 === void 0 ? void 0 : _useDetails$construct2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.constructionYear)))}`
-  }), /*#__PURE__*/React.createElement(Row, {
+  }), ["Apartment", "DDAFlats", "GovtFlats", "Bungalows", "FlatOrApartment", "GroupHousingSociety", "JJSLUMS", "IndividualHouse", "BuiltUp.GroupHousingSociety", "BuiltUp.JJSLUMS", "BuiltUp.IndividualHouse"].includes((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyT3 = useDetails.propertyType) === null || _useDetails$propertyT3 === void 0 ? void 0 : _useDetails$propertyT3.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.propertyType)) ? /*#__PURE__*/React.createElement(Row, {
     label: t("WS_NUMBER_OF_DWELLING_UNITS"),
     text: `${t(checkForNA((useDetails === null || useDetails === void 0 ? void 0 : useDetails.NumberofDwellingUnits) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.noOfDwellingUnits)))}`
-  })), /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_DJB_EMPLOYEE")), /*#__PURE__*/React.createElement(StatusTable, {
+  }) : null), /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_DJB_EMPLOYEE")), /*#__PURE__*/React.createElement(StatusTable, {
     style: {
       marginTop: "10px",
       marginBottom: "30px"
@@ -37659,9 +37687,6 @@ const CheckPage = _ref => {
   }), (djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.isDjbEmployee) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     label: t("WS_EMPLOYEE_ID"),
     text: `${t(checkForNA(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.employeeId))}`
-  }), /*#__PURE__*/React.createElement(Row, {
-    label: t("WS_DATE_OF_RETIREMENT"),
-    text: `${t(checkForNA(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.dor))}`
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_EMPLOYEE_DESIGNATION"),
     text: `${t(checkForNA(djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.designation))}`
@@ -40154,92 +40179,12 @@ const WSInfoPage = () => {
             }
           }
         `), /*#__PURE__*/React.createElement("div", {
-    className: "ws-info-header-card"
-  }, /*#__PURE__*/React.createElement("div", {
     className: "ws-header-badge-row"
   }, /*#__PURE__*/React.createElement("span", {
     className: "ws-service-tag"
-  }, t("Water & Sewerage Services")), /*#__PURE__*/React.createElement("span", {
+  }, t("Apply For New Connection")), /*#__PURE__*/React.createElement("span", {
     className: "ws-portal-tag"
-  }, isEmployee ? t("Employee Portal") : t("Citizen Services"))), /*#__PURE__*/React.createElement("h1", {
-    className: "ws-page-title"
-  }, t("Apply For New Connection")), /*#__PURE__*/React.createElement("p", {
-    className: "ws-page-subtitle"
-  }, t("Submit an application for a new domestic, commercial, or industrial water/sewerage connection with Delhi Jal Board.")), /*#__PURE__*/React.createElement("div", {
-    className: "ws-guidance-box"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ws-guidance-icon-wrap"
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "24",
-    height: "24",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "#1a67a3",
-    strokeWidth: "2",
-    strokeLinecap: "round",
-    strokeLinejoin: "round"
-  }, /*#__PURE__*/React.createElement("circle", {
-    cx: "12",
-    cy: "12",
-    r: "10"
-  }), /*#__PURE__*/React.createElement("line", {
-    x1: "12",
-    y1: "16",
-    x2: "12",
-    y2: "12"
-  }), /*#__PURE__*/React.createElement("line", {
-    x1: "12",
-    y1: "8",
-    x2: "12.01",
-    y2: "8"
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: "ws-guidance-text-wrap"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ws-guidance-title"
-  }, t("Before You Begin: What You Need To Know")), /*#__PURE__*/React.createElement("div", {
-    className: "ws-guidance-desc"
-  }, t("Applying for a new connection takes about 10–20 minutes. Water and sewerage connections are linked to a registered Property ID. Please verify your property below, review the required information checklist, and ensure you have all supporting documents ready before starting.")), /*#__PURE__*/React.createElement("div", {
-    className: "ws-guidance-chips"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "ws-chip"
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "14",
-    height: "14",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "currentColor",
-    strokeWidth: "2"
-  }, /*#__PURE__*/React.createElement("circle", {
-    cx: "12",
-    cy: "12",
-    r: "10"
-  }), /*#__PURE__*/React.createElement("polyline", {
-    points: "12 6 12 12 16 14"
-  })), /*#__PURE__*/React.createElement("span", null, t("Estimated time: 10-20 minutes"))), /*#__PURE__*/React.createElement("div", {
-    className: "ws-chip"
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "14",
-    height: "14",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "currentColor",
-    strokeWidth: "2"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
-  })), /*#__PURE__*/React.createElement("span", null, t("Requires Registered Property ID"))), /*#__PURE__*/React.createElement("div", {
-    className: "ws-chip"
-  }, /*#__PURE__*/React.createElement("svg", {
-    width: "14",
-    height: "14",
-    viewBox: "0 0 24 24",
-    fill: "none",
-    stroke: "currentColor",
-    strokeWidth: "2"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"
-  }), /*#__PURE__*/React.createElement("polyline", {
-    points: "14 2 14 8 20 8"
-  })), /*#__PURE__*/React.createElement("span", null, t("Keep Scanned Documents Ready (≤ 5MB)"))))))), /*#__PURE__*/React.createElement("div", {
+  }, isEmployee ? t("Employee Portal") : t("Citizen Services"))), /*#__PURE__*/React.createElement("div", {
     className: "ws-card"
   }, /*#__PURE__*/React.createElement("div", {
     className: "ws-step-header"
@@ -40584,8 +40529,6 @@ const WSInfoPage = () => {
     className: "ws-tag-item"
   }, t("Employee ID")), /*#__PURE__*/React.createElement("span", {
     className: "ws-tag-item"
-  }, t("Date of Retirement")), /*#__PURE__*/React.createElement("span", {
-    className: "ws-tag-item"
   }, t("Employee Designation")))))), /*#__PURE__*/React.createElement("div", {
     className: "ws-checklist-column"
   }, /*#__PURE__*/React.createElement("div", {
@@ -42424,7 +42367,7 @@ const FileUploadField = _ref6 => {
   })))));
 };
 const NewApplication = () => {
-  var _Digit$SessionStorage, _getFieldError, _getFieldError2, _getFieldError3, _getFieldError4, _getFieldError5, _getFieldError6, _getFieldError7, _getFieldError8, _getFieldError9, _getFieldError0, _getFieldError1, _getFieldError10, _getFieldError11, _watch, _watch3, _watch4, _watch6, _watch8, _watch0, _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$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, _watch4, _watch6, _watch8, _watch0, _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$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$useDetail12, _formValues$useDetail13, _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 {
     t
   } = useTranslation();
@@ -42583,6 +42526,8 @@ const NewApplication = () => {
   const isDjbEmployee = watch("djbEmployee.isDjbEmployee");
   const isGovernmentEmployee = watch("governmentEmployee.isGovernmentEmployee");
   const selectedPropertyType = watch("useDetails.propertyType");
+  const dwellingPropertyTypes = ["Apartment", "DDAFlats", "GovtFlats", "Bungalows", "FlatOrApartment", "GroupHousingSociety", "JJSLUMS", "IndividualHouse", "BuiltUp.GroupHousingSociety", "BuiltUp.JJSLUMS", "BuiltUp.IndividualHouse"];
+  const isDwellingUnit = dwellingPropertyTypes.includes(selectedPropertyType === null || selectedPropertyType === void 0 ? void 0 : selectedPropertyType.code);
   const selectedLocality = watch("propertyAddress.locality");
   const selectedSubLocality = watch("propertyAddress.subLocality");
   const pCode = watch("propertyAddress.pinCode");
@@ -43850,20 +43795,6 @@ const NewApplication = () => {
       required: isDjbEmployee ? "Employee ID is required." : false
     }),
     name: "djbEmployee.employeeId"
-  })), /*#__PURE__*/React.createElement(FieldBlock, {
-    error: getFieldError("djbEmployee.retirementDate"),
-    label: t("WS_DATE_OF_RETIREMENT"),
-    required: isDjbEmployee
-  }, /*#__PURE__*/React.createElement(Controller, {
-    control: control,
-    name: "djbEmployee.retirementDate",
-    rules: {
-      required: isDjbEmployee ? "Date of Retirement is required." : false
-    },
-    render: props => /*#__PURE__*/React.createElement(DatePicker, {
-      date: props.value,
-      onChange: props.onChange
-    })
   })), /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("djbEmployee.officeNameAndAddress"),
     isFullWidth: true,
@@ -44196,7 +44127,7 @@ const NewApplication = () => {
       select: props.onChange,
       t: t
     })
-  })), /*#__PURE__*/React.createElement(FieldBlock, {
+  })), isDwellingUnit ? /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("useDetails.NumberofDwellingUnits"),
     label: t("WS_NUMBER_OF_DWELLING_UNITS"),
     required: true
@@ -44207,10 +44138,10 @@ const NewApplication = () => {
         value: DECIMAL_PATTERN$2,
         message: "Enter a valid numeric value."
       },
-      required: "Built Up Area is required."
+      required: "Number of Dwelling Units is required."
     }),
     name: "useDetails.NumberofDwellingUnits"
-  })), /*#__PURE__*/React.createElement(FieldBlock, {
+  })) : null, /*#__PURE__*/React.createElement(FieldBlock, {
     error: getFieldError("useDetails.NumberofRooms"),
     label: t("WS_NUMBER_OF_ROOMS"),
     required: true
@@ -44403,7 +44334,7 @@ const NewApplication = () => {
     control: control,
     name: "documents.otherDocument",
     render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: OTHER_DOCUMENTS_OPTIONS,
+      option: (selectedApplicantType === null || selectedApplicantType === void 0 ? void 0 : selectedApplicantType.code) === "TENANT" ? OTHER_DOCUMENTS_OPTIONS : OTHER_DOCUMENTS_OPTIONS.filter(opt => opt.code !== "NOC_FROM_OWNER"),
       optionKey: "name",
       selected: props.value,
       select: props.onChange,
@@ -44622,13 +44553,10 @@ const NewApplication = () => {
   }), formValues !== null && formValues !== void 0 && (_formValues$djbEmploy2 = formValues.djbEmployee) !== null && _formValues$djbEmploy2 !== void 0 && _formValues$djbEmploy2.isDjbEmployee ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Employee ID",
     value: formValues === null || formValues === void 0 ? void 0 : (_formValues$djbEmploy3 = formValues.djbEmployee) === null || _formValues$djbEmploy3 === void 0 ? void 0 : _formValues$djbEmploy3.employeeId
-  }), /*#__PURE__*/React.createElement(PreviewItem, {
-    label: "Date of Retirement",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$djbEmploy4 = formValues.djbEmployee) === null || _formValues$djbEmploy4 === void 0 ? void 0 : _formValues$djbEmploy4.retirementDate
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     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
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$djbEmploy4 = formValues.djbEmployee) === null || _formValues$djbEmploy4 === void 0 ? void 0 : _formValues$djbEmploy4.officeNameAndAddress
   })) : null), /*#__PURE__*/React.createElement(SectionCard, {
     description: "Divyangjan/Person with Disability declaration.",
     isOpen: collapsedSections.disability,
@@ -44715,18 +44643,18 @@ const NewApplication = () => {
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Number of Floors",
     value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail5 = formValues.useDetails) === null || _formValues$useDetail5 === void 0 ? void 0 : _formValues$useDetail5.noOfFloors
-  }), /*#__PURE__*/React.createElement(PreviewItem, {
+  }), dwellingPropertyTypes.includes(formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail6 = formValues.useDetails) === null || _formValues$useDetail6 === void 0 ? void 0 : (_formValues$useDetail7 = _formValues$useDetail6.propertyType) === null || _formValues$useDetail7 === void 0 ? void 0 : _formValues$useDetail7.code) ? /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Number of Dwelling Units",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail6 = formValues.useDetails) === null || _formValues$useDetail6 === void 0 ? void 0 : _formValues$useDetail6.NumberofDwellingUnits
-  }), (formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail7 = formValues.useDetails) === null || _formValues$useDetail7 === void 0 ? void 0 : (_formValues$useDetail8 = _formValues$useDetail7.propertyType) === null || _formValues$useDetail8 === void 0 ? void 0 : _formValues$useDetail8.code) === "HOSPITAL" || (formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail9 = formValues.useDetails) === null || _formValues$useDetail9 === void 0 ? void 0 : (_formValues$useDetail0 = _formValues$useDetail9.propertyType) === null || _formValues$useDetail0 === void 0 ? void 0 : _formValues$useDetail0.code) === "HOSPITAL_NURSING_HOME" ? /*#__PURE__*/React.createElement(PreviewItem, {
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail8 = formValues.useDetails) === null || _formValues$useDetail8 === void 0 ? void 0 : _formValues$useDetail8.NumberofDwellingUnits
+  }) : null, (formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail9 = formValues.useDetails) === null || _formValues$useDetail9 === void 0 ? void 0 : (_formValues$useDetail0 = _formValues$useDetail9.propertyType) === null || _formValues$useDetail0 === void 0 ? void 0 : _formValues$useDetail0.code) === "HOSPITAL" || (formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail1 = formValues.useDetails) === null || _formValues$useDetail1 === void 0 ? void 0 : (_formValues$useDetail10 = _formValues$useDetail1.propertyType) === null || _formValues$useDetail10 === void 0 ? void 0 : _formValues$useDetail10.code) === "HOSPITAL_NURSING_HOME" ? /*#__PURE__*/React.createElement(PreviewItem, {
     label: "No. of Beds",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail1 = formValues.useDetails) === null || _formValues$useDetail1 === void 0 ? void 0 : _formValues$useDetail1.hospitalBeds
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail11 = formValues.useDetails) === null || _formValues$useDetail11 === void 0 ? void 0 : _formValues$useDetail11.hospitalBeds
   }) : null, /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Year of Construction",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail10 = formValues.useDetails) === null || _formValues$useDetail10 === void 0 ? void 0 : _formValues$useDetail10.SelectYearofConstruction
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail12 = formValues.useDetails) === null || _formValues$useDetail12 === void 0 ? void 0 : _formValues$useDetail12.SelectYearofConstruction
   }), /*#__PURE__*/React.createElement(PreviewItem, {
     label: "Water Connection Usage Type",
-    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail11 = formValues.useDetails) === null || _formValues$useDetail11 === void 0 ? void 0 : _formValues$useDetail11.WaterConnectionUsageType
+    value: formValues === null || formValues === void 0 ? void 0 : (_formValues$useDetail13 = formValues.useDetails) === null || _formValues$useDetail13 === void 0 ? void 0 : _formValues$useDetail13.WaterConnectionUsageType
   })), /*#__PURE__*/React.createElement(SectionCard, {
     description: "Uploaded supporting documents.",
     isOpen: collapsedSections.documents,
@@ -52494,7 +52422,7 @@ const ApplicationDetails = props => {
 };
 
 const ApplicationDetails$1 = () => {
-  var _mdmsCommonmastersDat, _commonPayInfo, _applicationDetails$p4, _applicationDetails$p5, _applicationDetails$p6, _applicationDetails$p7, _applicationDetails$a3, _applicationDetails$a4, _applicationDetails$a5, _newValueFilter$, _applicationDetails$a6, _applicationDetails$a7, _applicationDetails$a8, _applicationDetails$a9, _applicationDetails$p8, _applicationDetails$p9, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _oldData$WaterConnect, _oldData$WaterConnect2, _oldData$SewerageConn, _oldData$SewerageConn2, _applicationDetails$a22, _applicationDetails$a23, _reciept_data$Payment2, _applicationDetails$p17, _applicationDetails$p18, _applicationDetails$p19, _applicationDetails$p20, _applicationDetails$p21, _applicationDetails$p22;
+  var _mdmsCommonmastersDat, _commonPayInfo, _applicationDetails$p4, _applicationDetails$p5, _applicationDetails$p6, _applicationDetails$p7, _applicationDetails$a3, _applicationDetails$a4, _applicationDetails$a5, _newValueFilter$, _applicationDetails$a6, _applicationDetails$a7, _applicationDetails$a8, _applicationDetails$a9, _reciept_data$Payment, _applicationDetails$a0, _applicationDetails$p8, _applicationDetails$p9, _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11, _workflowDetails$data12, _workflowDetails$data13, _workflowDetails$data14, _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23, _oldData$WaterConnect, _oldData$WaterConnect2, _oldData$SewerageConn, _oldData$SewerageConn2, _applicationDetails$a23, _applicationDetails$a24, _reciept_data$Payment3, _applicationDetails$p17, _applicationDetails$p18, _applicationDetails$p19, _applicationDetails$p20, _applicationDetails$p21, _applicationDetails$p22;
   const getRecieptSearch = function (tenantId, payments, consumerCodes, receiptKey) {
     try {
       let response = null;
@@ -52538,7 +52466,7 @@ const ApplicationDetails$1 = () => {
   const [showToast, setShowToast] = useState(null);
   const [showWaringToast, setShowWaringToast] = useState(null);
   const [showOptions, setShowOptions] = useState(false);
-  let filters = getQueryStringParams(location.search);
+  let filters = getQueryStringParams(window.location.search);
   const applicationNumber = filters === null || filters === void 0 ? void 0 : filters.applicationNumber;
   const serviceType = filters === null || filters === void 0 ? void 0 : filters.service;
   const menuRef = useRef();
@@ -52655,6 +52583,11 @@ const ApplicationDetails$1 = () => {
   };
   let dowloadOptions = [],
     appStatus = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a9 = applicationDetails.applicationData) === null || _applicationDetails$a9 === void 0 ? void 0 : _applicationDetails$a9.applicationStatus) || "";
+  const isFeePaid = (reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment = reciept_data.Payments) === null || _reciept_data$Payment === void 0 ? void 0 : _reciept_data$Payment.length) > 0 || appStatus && appStatus !== "INITIATED" && appStatus !== "PENDING_FOR_DOCUMENT_VERIFICATION" && appStatus !== "PENDING_FOR_CITIZEN_ACTION" && appStatus !== "PENDING_FOR_FIELD_INSPECTION" && appStatus !== "PENDING_FOR_PAYMENT" && appStatus !== "PENDING_FOR_FINAL_PAYMENT" && appStatus !== "PENDING_FOR_ADDITIONAL_PAYMENT" && appStatus !== "PENDING_APPROVAL_FOR_MUTATION";
+  const feeEstimationSection = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a0 = applicationDetails.applicationDetails) === null || _applicationDetails$a0 === void 0 ? void 0 : _applicationDetails$a0.find(section => (section === null || section === void 0 ? void 0 : section.title) === "WS_TASK_DETAILS_FEE_ESTIMATE");
+  if (feeEstimationSection !== null && feeEstimationSection !== void 0 && feeEstimationSection.additionalDetails && isFeePaid) {
+    feeEstimationSection.additionalDetails.isPaid = true;
+  }
   if (workflowDetails !== null && workflowDetails !== void 0 && workflowDetails.data && (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p8 = applicationDetails.processInstancesDetails) === null || _applicationDetails$p8 === void 0 ? void 0 : (_applicationDetails$p9 = _applicationDetails$p8[0]) === null || _applicationDetails$p9 === void 0 ? void 0 : _applicationDetails$p9.businessService) === "NewWS1" && appStatus === "PENDING_FOR_BILLING_CLERK_REVIEW") {
     var _applicationDetails$p0, _applicationDetails$p1, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3;
     const plotArea = Number((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p0 = applicationDetails.propertyDetails) === null || _applicationDetails$p0 === void 0 ? void 0 : (_applicationDetails$p1 = _applicationDetails$p0.additionalDetails) === null || _applicationDetails$p1 === void 0 ? void 0 : _applicationDetails$p1.plotArea) ?? 0);
@@ -52690,8 +52623,8 @@ const ApplicationDetails$1 = () => {
       };
     }
     if ((action === null || action === void 0 ? void 0 : action.action) === "RESUBMIT_APPLICATION") {
-      var _applicationDetails$a0, _applicationDetails$a1, _applicationDetails$p10, _applicationDetails$p11, _servicesMasterData$w, _userConfig$, _userConfig$2;
-      const isMutation = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a0 = applicationDetails.applicationData) === null || _applicationDetails$a0 === void 0 ? void 0 : (_applicationDetails$a1 = _applicationDetails$a0.applicationType) === null || _applicationDetails$a1 === void 0 ? void 0 : _applicationDetails$a1.includes("MUTATION");
+      var _applicationDetails$a1, _applicationDetails$a10, _applicationDetails$p10, _applicationDetails$p11, _servicesMasterData$w, _userConfig$, _userConfig$2;
+      const isMutation = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a1 = applicationDetails.applicationData) === null || _applicationDetails$a1 === void 0 ? void 0 : (_applicationDetails$a10 = _applicationDetails$a1.applicationType) === null || _applicationDetails$a10 === void 0 ? void 0 : _applicationDetails$a10.includes("MUTATION");
       let pathName = isMutation ? `/digit-ui/employee/ws/mutation-application?applicationNumber=${applicationNumber}&tenantId=${tenantId}&service=${serviceType}&propertyId=${applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p10 = applicationDetails.propertyDetails) === null || _applicationDetails$p10 === void 0 ? void 0 : _applicationDetails$p10.propertyId}` : `/digit-ui/employee/ws/edit-application?applicationNumber=${applicationNumber}&service=${serviceType}&propertyId=${applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p11 = applicationDetails.propertyDetails) === null || _applicationDetails$p11 === void 0 ? void 0 : _applicationDetails$p11.propertyId}`;
       const userConfig = (servicesMasterData === null || servicesMasterData === void 0 ? void 0 : (_servicesMasterData$w = servicesMasterData["ws-services-masters"]) === null || _servicesMasterData$w === void 0 ? void 0 : _servicesMasterData$w.WSEditApplicationByConfigUser) || [];
       const editApplicationUserRole = (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$ = userConfig[0]) === null || _userConfig$ === void 0 ? void 0 : _userConfig$.roles) || [];
@@ -52725,8 +52658,8 @@ const ApplicationDetails$1 = () => {
   });
   workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data7 = workflowDetails.data) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7.actionState) === null || _workflowDetails$data8 === void 0 ? void 0 : (_workflowDetails$data9 = _workflowDetails$data8.nextActions) === null || _workflowDetails$data9 === void 0 ? void 0 : _workflowDetails$data9.forEach(action => {
     if ((action === null || action === void 0 ? void 0 : action.action) === "EDIT") {
-      var _applicationDetails$a10, _applicationDetails$a11, _applicationDetails$p14, _applicationDetails$p15, _servicesMasterData$w2, _userConfig$3, _userConfig$4;
-      const isMutation = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a10 = applicationDetails.applicationData) === null || _applicationDetails$a10 === void 0 ? void 0 : (_applicationDetails$a11 = _applicationDetails$a10.applicationType) === null || _applicationDetails$a11 === void 0 ? void 0 : _applicationDetails$a11.includes("MUTATION");
+      var _applicationDetails$a11, _applicationDetails$a12, _applicationDetails$p14, _applicationDetails$p15, _servicesMasterData$w2, _userConfig$3, _userConfig$4;
+      const isMutation = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a11 = applicationDetails.applicationData) === null || _applicationDetails$a11 === void 0 ? void 0 : (_applicationDetails$a12 = _applicationDetails$a11.applicationType) === null || _applicationDetails$a12 === void 0 ? void 0 : _applicationDetails$a12.includes("MUTATION");
       let pathName = isMutation ? `/digit-ui/employee/ws/mutation-application?applicationNumber=${applicationNumber}&tenantId=${tenantId}&service=${serviceType}&propertyId=${applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p14 = applicationDetails.propertyDetails) === null || _applicationDetails$p14 === void 0 ? void 0 : _applicationDetails$p14.propertyId}` : `/digit-ui/employee/ws/edit-application?applicationNumber=${applicationNumber}&service=${serviceType}&propertyId=${applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$p15 = applicationDetails.propertyDetails) === null || _applicationDetails$p15 === void 0 ? void 0 : _applicationDetails$p15.propertyId}`;
       const userConfig = (servicesMasterData === null || servicesMasterData === void 0 ? void 0 : (_servicesMasterData$w2 = servicesMasterData["ws-services-masters"]) === null || _servicesMasterData$w2 === void 0 ? void 0 : _servicesMasterData$w2.WSEditApplicationByConfigUser) || [];
       const editApplicationUserRole = (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$3 = userConfig[0]) === null || _userConfig$3 === void 0 ? void 0 : _userConfig$3.roles) || [];
@@ -52807,10 +52740,10 @@ const ApplicationDetails$1 = () => {
   const oldApplication = serviceType === "WATER" ? oldData === null || oldData === void 0 ? void 0 : (_oldData$WaterConnect = oldData.WaterConnection) === null || _oldData$WaterConnect === void 0 ? void 0 : _oldData$WaterConnect[(oldData === null || oldData === void 0 ? void 0 : (_oldData$WaterConnect2 = oldData.WaterConnection) === null || _oldData$WaterConnect2 === void 0 ? void 0 : _oldData$WaterConnect2.length) - 1] : oldData === null || oldData === void 0 ? void 0 : (_oldData$SewerageConn = oldData.SewerageConnections) === null || _oldData$SewerageConn === void 0 ? void 0 : _oldData$SewerageConn[(oldData === null || oldData === void 0 ? void 0 : (_oldData$SewerageConn2 = oldData.SewerageConnections) === null || _oldData$SewerageConn2 === void 0 ? void 0 : _oldData$SewerageConn2.length) - 1];
   const handleDownloadPdf = function () {
     try {
-      var _applicationDetails$a12, _applicationDetails$a13, _applicationDetails$a14;
-      const tenantInfo = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a12 = applicationDetails.applicationData) === null || _applicationDetails$a12 === void 0 ? void 0 : _applicationDetails$a12.tenantId;
+      var _applicationDetails$a13, _applicationDetails$a14, _applicationDetails$a15;
+      const tenantInfo = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a13 = applicationDetails.applicationData) === null || _applicationDetails$a13 === void 0 ? void 0 : _applicationDetails$a13.tenantId;
       let result = applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData;
-      if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a13 = applicationDetails.applicationData) !== null && _applicationDetails$a13 !== void 0 && (_applicationDetails$a14 = _applicationDetails$a13.applicationType) !== null && _applicationDetails$a14 !== void 0 && _applicationDetails$a14.includes("MODIFY_")) {
+      if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a14 = applicationDetails.applicationData) !== null && _applicationDetails$a14 !== void 0 && (_applicationDetails$a15 = _applicationDetails$a14.applicationType) !== null && _applicationDetails$a15 !== void 0 && _applicationDetails$a15.includes("MODIFY_")) {
         const PDFdata = getWSAcknowledgementData$1({
           ...result
         }, {
@@ -52832,10 +52765,10 @@ const ApplicationDetails$1 = () => {
   };
   const handleEstimateDownload = function () {
     try {
-      const _temp2 = function (_applicationDetails$a15, _applicationDetails$a16) {
-        if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a15 = applicationDetails.applicationData) !== null && _applicationDetails$a15 !== void 0 && (_applicationDetails$a16 = _applicationDetails$a15.additionalDetails) !== null && _applicationDetails$a16 !== void 0 && _applicationDetails$a16.estimationFileStoreId) {
-          var _applicationDetails$a17, _applicationDetails$a18;
-          getFiles([applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a17 = applicationDetails.applicationData) === null || _applicationDetails$a17 === void 0 ? void 0 : (_applicationDetails$a18 = _applicationDetails$a17.additionalDetails) === null || _applicationDetails$a18 === void 0 ? void 0 : _applicationDetails$a18.estimationFileStoreId], applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId);
+      const _temp2 = function (_applicationDetails$a16, _applicationDetails$a17) {
+        if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a16 = applicationDetails.applicationData) !== null && _applicationDetails$a16 !== void 0 && (_applicationDetails$a17 = _applicationDetails$a16.additionalDetails) !== null && _applicationDetails$a17 !== void 0 && _applicationDetails$a17.estimationFileStoreId) {
+          var _applicationDetails$a18, _applicationDetails$a19;
+          getFiles([applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a18 = applicationDetails.applicationData) === null || _applicationDetails$a18 === void 0 ? void 0 : (_applicationDetails$a19 = _applicationDetails$a18.additionalDetails) === null || _applicationDetails$a19 === void 0 ? void 0 : _applicationDetails$a19.estimationFileStoreId], applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId);
         } else {
           const warningCount = sessionStorage.getItem("WARINIG_COUNT") || "0";
           const warningCountDetails = JSON.parse(warningCount);
@@ -52895,8 +52828,8 @@ const ApplicationDetails$1 = () => {
     order: 2,
     label: t("WS_SANCTION_LETTER"),
     onClick: () => {
-      var _applicationDetails$a19, _applicationDetails$a20;
-      return getFiles([applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a19 = applicationDetails.applicationData) === null || _applicationDetails$a19 === void 0 ? void 0 : (_applicationDetails$a20 = _applicationDetails$a19.additionalDetails) === null || _applicationDetails$a20 === void 0 ? void 0 : _applicationDetails$a20.sanctionFileStoreId], applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId);
+      var _applicationDetails$a20, _applicationDetails$a21;
+      return getFiles([applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a20 = applicationDetails.applicationData) === null || _applicationDetails$a20 === void 0 ? void 0 : (_applicationDetails$a21 = _applicationDetails$a20.additionalDetails) === null || _applicationDetails$a21 === void 0 ? void 0 : _applicationDetails$a21.sanctionFileStoreId], applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.tenantId);
     }
   };
   const applicationDownloadObject = {
@@ -52908,8 +52841,8 @@ const ApplicationDetails$1 = () => {
     order: 4,
     label: t("DOWNLOAD_RECEIPT_HEADER"),
     onClick: () => {
-      var _reciept_data$Payment, _applicationDetails$a21;
-      return getRecieptSearch(Digit.ULBService.getStateId(), reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment = reciept_data.Payments) === null || _reciept_data$Payment === void 0 ? void 0 : _reciept_data$Payment[0], applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a21 = applicationDetails.applicationData) === null || _applicationDetails$a21 === void 0 ? void 0 : _applicationDetails$a21.applicationNo, receiptKey);
+      var _reciept_data$Payment2, _applicationDetails$a22;
+      return getRecieptSearch(Digit.ULBService.getStateId(), reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment2 = reciept_data.Payments) === null || _reciept_data$Payment2 === void 0 ? void 0 : _reciept_data$Payment2[0], applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a22 = applicationDetails.applicationData) === null || _applicationDetails$a22 === void 0 ? void 0 : _applicationDetails$a22.applicationNo, receiptKey);
     }
   };
   switch (appStatus) {
@@ -52924,7 +52857,7 @@ const ApplicationDetails$1 = () => {
       break;
     case "PENDING_FOR_CONNECTION_ACTIVATION":
     case "CONNECTION_ACTIVATED":
-      if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a22 = applicationDetails.applicationData) !== null && _applicationDetails$a22 !== void 0 && (_applicationDetails$a23 = _applicationDetails$a22.applicationType) !== null && _applicationDetails$a23 !== void 0 && _applicationDetails$a23.includes("NEW_") && (reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment2 = reciept_data.Payments) === null || _reciept_data$Payment2 === void 0 ? void 0 : _reciept_data$Payment2.length) > 0) dowloadOptions = [sanctionDownloadObject, wsEstimateDownloadObject, applicationDownloadObject, appFeeDownloadReceipt];else dowloadOptions = [sanctionDownloadObject, wsEstimateDownloadObject, applicationDownloadObject];
+      if (applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a23 = applicationDetails.applicationData) !== null && _applicationDetails$a23 !== void 0 && (_applicationDetails$a24 = _applicationDetails$a23.applicationType) !== null && _applicationDetails$a24 !== void 0 && _applicationDetails$a24.includes("NEW_") && (reciept_data === null || reciept_data === void 0 ? void 0 : (_reciept_data$Payment3 = reciept_data.Payments) === null || _reciept_data$Payment3 === void 0 ? void 0 : _reciept_data$Payment3.length) > 0) dowloadOptions = [sanctionDownloadObject, wsEstimateDownloadObject, applicationDownloadObject, appFeeDownloadReceipt];else dowloadOptions = [sanctionDownloadObject, wsEstimateDownloadObject, applicationDownloadObject];
       break;
     case "REJECTED":
       dowloadOptions = [applicationDownloadObject];
@@ -53332,15 +53265,53 @@ const GetConnectionDetails = () => {
   }));
 };
 
+const newConfig$2 = [{
+  hideInCitizen: true,
+  body: [{
+    body: [{
+      type: "component",
+      key: "connectionDetails",
+      component: "WSActivationConnectionDetails",
+      withoutLabel: true
+    }]
+  }, {
+    body: [{
+      type: "component",
+      key: "plumberDetails",
+      component: "WSActivationPlumberDetails",
+      withoutLabel: true
+    }]
+  }, {
+    body: [{
+      type: "component",
+      key: "activationDetails",
+      component: "WSActivationDetails",
+      withoutLabel: true
+    }]
+  }, {
+    body: [{
+      type: "component",
+      key: "comments",
+      component: "WSActivationCommentsDetails",
+      withoutLabel: true
+    }]
+  }, {
+    body: [{
+      type: "component",
+      key: "supportingDocuments",
+      component: "WSActivationSupportingDocuments",
+      withoutLabel: true
+    }]
+  }]
+}];
+
 const ActivateConnection = () => {
-  var _Digit$SessionStorage, _state, _details, _details2, _state2, _state2$data, _state3, _state3$data, _state4, _state4$data, _state5, _state5$data, _state6, _state6$data, _state6$data$connecti, _state7, _state7$data, _state8, _state8$data, _state9, _state9$data, _state9$data$waterSou, _state9$data$waterSou2, _state0, _state0$data, _state1, _state1$data, _state10, _state10$data, _state11, _state11$data, _state12, _state12$data, _state13, _state13$data, _state14, _state14$data, _state15, _state15$data, _state16, _state16$data, _state16$data$plumber, _state16$data$plumber2, _state17, _state17$data, _state17$data$plumber, _state17$data$plumber2, _state18, _state18$data, _state18$data$plumber, _state18$data$plumber2, _state19, _state19$data, _state19$data$additio, _state20, _state20$data, _state20$data$additio, _state20$data$additio2, _state21, _state21$data, _state21$data$additio, _state22, _state22$data, _state23, _state23$data, _state23$data$connect, _state24, _state24$data, _state25, _state25$data, _state26, _state26$data, _state27, _state27$data, _state28, _state28$data, _state28$data$additio, _state29, _state29$data, _state30, _state30$data, _state31, _state31$data, _state32, _state32$data;
+  var _Digit$SessionStorage, _state, _details, _details2, _state2, _state2$data, _state3, _state3$data, _state4, _state4$data, _state5, _state5$data, _ref, _ref$split$, _state6, _state6$data, _state7, _state7$data, _state8, _state8$data, _state9, _state9$data, _state0, _state0$data, _state1, _state1$data, _state10, _state10$data, _state11, _state11$data, _state12, _state12$data, _state13, _state13$data, _state14, _state14$data, _state15, _state15$data, _state15$data$plumber, _state15$data$plumber2, _state16, _state16$data, _state16$data$plumber, _state16$data$plumber2, _state17, _state17$data, _state17$data$plumber, _state17$data$plumber2, _state18, _state18$data, _state18$data$additio, _state19, _state19$data, _state19$data$additio, _state19$data$additio2, _state20, _state20$data, _state20$data$additio, _state21, _state21$data, _state22, _state22$data, _state23, _state23$data, _state23$data$connect, _state24, _state24$data, _state24$data$connect, _state25, _state25$data, _state25$data$additio, _state25$data$additio2, _state26, _state26$data, _state26$data$additio, _state26$data$additio2, _state27, _state27$data, _state28, _state28$data, _state29, _state29$data, _state30, _state30$data, _state31, _state31$data, _state31$data$additio, _state32, _state32$data, _state33, _state33$data, _state34, _state34$data, _state35, _state35$data;
   const {
     t
   } = useTranslation();
-  let {
-    state
-  } = useLocation();
-  state = state ? typeof state === "string" ? JSON.parse(state) : state : {};
+  const location = useLocation();
+  let state = location !== null && location !== void 0 && location.state ? typeof location.state === "string" ? JSON.parse(location.state) : location.state : {};
   const history = useHistory();
   let filters = getQueryStringParams(location.search);
   const [canSubmit, setSubmitValve] = useState(false);
@@ -53352,8 +53323,7 @@ const ActivateConnection = () => {
     body: []
   });
   const stateId = Digit.ULBService.getStateId();
-  let tenantId = Digit.ULBService.getCurrentTenantId();
-  tenantId ? tenantId : (_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code;
+  let tenantId = Digit.ULBService.getCurrentTenantId() || ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code);
   let {
     data: newConfig,
     isLoading
@@ -53384,47 +53354,51 @@ const ActivateConnection = () => {
   const waterSourceSubDataWithUS = waterSourceSubDataWithClone ? stringReplaceAll(waterSourceSubDataWithClone === null || waterSourceSubDataWithClone === void 0 ? void 0 : waterSourceSubDataWithClone.toUpperCase(), " ", "_") : "";
   const waterSourceSubDataWithCma = waterSourceSubDataWithUS ? stringReplaceAll(waterSourceSubDataWithUS === null || waterSourceSubDataWithUS === void 0 ? void 0 : waterSourceSubDataWithUS.toUpperCase(), ".", "_") : "";
   const connectionDetails = (filters === null || filters === void 0 ? void 0 : filters.service) === "WATER" ? {
-    connectionType: (_state4 = state) !== null && _state4 !== void 0 && (_state4$data = _state4.data) !== null && _state4$data !== void 0 && _state4$data.connectionType ? {
-      code: (_state5 = state) === null || _state5 === void 0 ? void 0 : (_state5$data = _state5.data) === null || _state5$data === void 0 ? void 0 : _state5$data.connectionType,
-      i18nKey: `WS_CONNECTIONTYPE_${stringReplaceAll((_state6 = state) === null || _state6 === void 0 ? void 0 : (_state6$data = _state6.data) === null || _state6$data === void 0 ? void 0 : (_state6$data$connecti = _state6$data.connectionType) === null || _state6$data$connecti === void 0 ? void 0 : _state6$data$connecti.toUpperCase(), " ", "_")}`
+    connectionType: {
+      code: "Metered",
+      i18nKey: "WS_CONNECTIONTYPE_METERED",
+      name: "Metered"
+    },
+    waterSource: (_state4 = state) !== null && _state4 !== void 0 && (_state4$data = _state4.data) !== null && _state4$data !== void 0 && _state4$data.waterSource || "GROUND.WELL" ? {
+      code: ((_state5 = state) === null || _state5 === void 0 ? void 0 : (_state5$data = _state5.data) === null || _state5$data === void 0 ? void 0 : _state5$data.waterSource) || "GROUND.WELL",
+      i18nKey: `WS_SERVICES_MASTERS_WATERSOURCE_${stringReplaceAll((_ref = ((_state6 = state) === null || _state6 === void 0 ? void 0 : (_state6$data = _state6.data) === null || _state6$data === void 0 ? void 0 : _state6$data.waterSource) || "GROUND.WELL") === null || _ref === void 0 ? void 0 : (_ref$split$ = _ref.split(".")[0]) === null || _ref$split$ === void 0 ? void 0 : _ref$split$.toUpperCase(), " ", "_")}`
     } : "",
-    waterSource: (_state7 = state) !== null && _state7 !== void 0 && (_state7$data = _state7.data) !== null && _state7$data !== void 0 && _state7$data.waterSource ? {
-      code: (_state8 = state) === null || _state8 === void 0 ? void 0 : (_state8$data = _state8.data) === null || _state8$data === void 0 ? void 0 : _state8$data.waterSource,
-      i18nKey: `WS_SERVICES_MASTERS_WATERSOURCE_${stringReplaceAll((_state9 = state) === null || _state9 === void 0 ? void 0 : (_state9$data = _state9.data) === null || _state9$data === void 0 ? void 0 : (_state9$data$waterSou = _state9$data.waterSource) === null || _state9$data$waterSou === void 0 ? void 0 : (_state9$data$waterSou2 = _state9$data$waterSou.split(".")[0]) === null || _state9$data$waterSou2 === void 0 ? void 0 : _state9$data$waterSou2.toUpperCase(), " ", "_")}`
+    sourceSubData: (_state7 = state) !== null && _state7 !== void 0 && (_state7$data = _state7.data) !== null && _state7$data !== void 0 && _state7$data.waterSource || "GROUND.WELL" ? {
+      code: ((_state8 = state) === null || _state8 === void 0 ? void 0 : (_state8$data = _state8.data) === null || _state8$data === void 0 ? void 0 : _state8$data.waterSource) || "GROUND.WELL",
+      i18nKey: `WS_SERVICES_MASTERS_WATERSOURCE_${waterSourceSubDataWithCma || "GROUND_WELL"}`
     } : "",
-    sourceSubData: (_state0 = state) !== null && _state0 !== void 0 && (_state0$data = _state0.data) !== null && _state0$data !== void 0 && _state0$data.waterSource ? {
-      code: (_state1 = state) === null || _state1 === void 0 ? void 0 : (_state1$data = _state1.data) === null || _state1$data === void 0 ? void 0 : _state1$data.waterSource,
-      i18nKey: `WS_SERVICES_MASTERS_WATERSOURCE_${waterSourceSubDataWithCma}`
-    } : "",
-    pipeSize: (_state10 = state) !== null && _state10 !== void 0 && (_state10$data = _state10.data) !== null && _state10$data !== void 0 && _state10$data.pipeSize ? {
-      code: (_state11 = state) === null || _state11 === void 0 ? void 0 : (_state11$data = _state11.data) === null || _state11$data === void 0 ? void 0 : _state11$data.pipeSize,
-      i18nKey: (_state12 = state) === null || _state12 === void 0 ? void 0 : (_state12$data = _state12.data) === null || _state12$data === void 0 ? void 0 : _state12$data.pipeSize
-    } : "",
-    noOfTaps: ((_state13 = state) === null || _state13 === void 0 ? void 0 : (_state13$data = _state13.data) === null || _state13$data === void 0 ? void 0 : _state13$data.noOfTaps) || "",
+    pipeSize: (_state9 = state) !== null && _state9 !== void 0 && (_state9$data = _state9.data) !== null && _state9$data !== void 0 && _state9$data.pipeSize ? {
+      code: (_state0 = state) === null || _state0 === void 0 ? void 0 : (_state0$data = _state0.data) === null || _state0$data === void 0 ? void 0 : _state0$data.pipeSize,
+      i18nKey: (_state1 = state) === null || _state1 === void 0 ? void 0 : (_state1$data = _state1.data) === null || _state1$data === void 0 ? void 0 : _state1$data.pipeSize
+    } : 0,
+    noOfTaps: ((_state10 = state) === null || _state10 === void 0 ? void 0 : (_state10$data = _state10.data) === null || _state10$data === void 0 ? void 0 : _state10$data.noOfTaps) !== undefined && ((_state11 = state) === null || _state11 === void 0 ? void 0 : (_state11$data = _state11.data) === null || _state11$data === void 0 ? void 0 : _state11$data.noOfTaps) !== "" ? (_state12 = state) === null || _state12 === void 0 ? void 0 : (_state12$data = _state12.data) === null || _state12$data === void 0 ? void 0 : _state12$data.noOfTaps : 0,
+    proposedPipeSize: 0,
+    proposedTaps: 0,
     formDetails: details
   } : {
-    noOfWaterClosets: ((_state14 = state) === null || _state14 === void 0 ? void 0 : (_state14$data = _state14.data) === null || _state14$data === void 0 ? void 0 : _state14$data.noOfWaterClosets) || "",
-    noOfToilets: ((_state15 = state) === null || _state15 === void 0 ? void 0 : (_state15$data = _state15.data) === null || _state15$data === void 0 ? void 0 : _state15$data.noOfToilets) || "",
+    noOfWaterClosets: ((_state13 = state) === null || _state13 === void 0 ? void 0 : (_state13$data = _state13.data) === null || _state13$data === void 0 ? void 0 : _state13$data.noOfWaterClosets) || "",
+    noOfToilets: ((_state14 = state) === null || _state14 === void 0 ? void 0 : (_state14$data = _state14.data) === null || _state14$data === void 0 ? void 0 : _state14$data.noOfToilets) || "",
     formDetails: details
   };
   const plumberDetails = [{
-    plumberName: ((_state16 = state) === null || _state16 === void 0 ? void 0 : (_state16$data = _state16.data) === null || _state16$data === void 0 ? void 0 : (_state16$data$plumber = _state16$data.plumberInfo) === null || _state16$data$plumber === void 0 ? void 0 : (_state16$data$plumber2 = _state16$data$plumber[0]) === null || _state16$data$plumber2 === void 0 ? void 0 : _state16$data$plumber2.name) || "",
-    plumberMobileNo: ((_state17 = state) === null || _state17 === void 0 ? void 0 : (_state17$data = _state17.data) === null || _state17$data === void 0 ? void 0 : (_state17$data$plumber = _state17$data.plumberInfo) === null || _state17$data$plumber === void 0 ? void 0 : (_state17$data$plumber2 = _state17$data$plumber[0]) === null || _state17$data$plumber2 === void 0 ? void 0 : _state17$data$plumber2.mobileNumber) || "",
-    plumberLicenseNo: ((_state18 = state) === null || _state18 === void 0 ? void 0 : (_state18$data = _state18.data) === null || _state18$data === void 0 ? void 0 : (_state18$data$plumber = _state18$data.plumberInfo) === null || _state18$data$plumber === void 0 ? void 0 : (_state18$data$plumber2 = _state18$data$plumber[0]) === null || _state18$data$plumber2 === void 0 ? void 0 : _state18$data$plumber2.licenseNo) || "",
-    detailsProvidedBy: (_state19 = state) !== null && _state19 !== void 0 && (_state19$data = _state19.data) !== null && _state19$data !== void 0 && (_state19$data$additio = _state19$data.additionalDetails) !== null && _state19$data$additio !== void 0 && _state19$data$additio.detailsProvidedBy ? {
-      i18nKey: `WS_PLUMBER_${(_state20 = state) === null || _state20 === void 0 ? void 0 : (_state20$data = _state20.data) === null || _state20$data === void 0 ? void 0 : (_state20$data$additio = _state20$data.additionalDetails) === null || _state20$data$additio === void 0 ? void 0 : (_state20$data$additio2 = _state20$data$additio.detailsProvidedBy) === null || _state20$data$additio2 === void 0 ? void 0 : _state20$data$additio2.toUpperCase()}`,
-      code: (_state21 = state) === null || _state21 === void 0 ? void 0 : (_state21$data = _state21.data) === null || _state21$data === void 0 ? void 0 : (_state21$data$additio = _state21$data.additionalDetails) === null || _state21$data$additio === void 0 ? void 0 : _state21$data$additio.detailsProvidedBy
+    plumberName: ((_state15 = state) === null || _state15 === void 0 ? void 0 : (_state15$data = _state15.data) === null || _state15$data === void 0 ? void 0 : (_state15$data$plumber = _state15$data.plumberInfo) === null || _state15$data$plumber === void 0 ? void 0 : (_state15$data$plumber2 = _state15$data$plumber[0]) === null || _state15$data$plumber2 === void 0 ? void 0 : _state15$data$plumber2.name) || "",
+    plumberMobileNo: ((_state16 = state) === null || _state16 === void 0 ? void 0 : (_state16$data = _state16.data) === null || _state16$data === void 0 ? void 0 : (_state16$data$plumber = _state16$data.plumberInfo) === null || _state16$data$plumber === void 0 ? void 0 : (_state16$data$plumber2 = _state16$data$plumber[0]) === null || _state16$data$plumber2 === void 0 ? void 0 : _state16$data$plumber2.mobileNumber) || "",
+    plumberLicenseNo: ((_state17 = state) === null || _state17 === void 0 ? void 0 : (_state17$data = _state17.data) === null || _state17$data === void 0 ? void 0 : (_state17$data$plumber = _state17$data.plumberInfo) === null || _state17$data$plumber === void 0 ? void 0 : (_state17$data$plumber2 = _state17$data$plumber[0]) === null || _state17$data$plumber2 === void 0 ? void 0 : _state17$data$plumber2.licenseNo) || "",
+    detailsProvidedBy: (_state18 = state) !== null && _state18 !== void 0 && (_state18$data = _state18.data) !== null && _state18$data !== void 0 && (_state18$data$additio = _state18$data.additionalDetails) !== null && _state18$data$additio !== void 0 && _state18$data$additio.detailsProvidedBy ? {
+      i18nKey: `WS_PLUMBER_${(_state19 = state) === null || _state19 === void 0 ? void 0 : (_state19$data = _state19.data) === null || _state19$data === void 0 ? void 0 : (_state19$data$additio = _state19$data.additionalDetails) === null || _state19$data$additio === void 0 ? void 0 : (_state19$data$additio2 = _state19$data$additio.detailsProvidedBy) === null || _state19$data$additio2 === void 0 ? void 0 : _state19$data$additio2.toUpperCase()}`,
+      code: (_state20 = state) === null || _state20 === void 0 ? void 0 : (_state20$data = _state20.data) === null || _state20$data === void 0 ? void 0 : (_state20$data$additio = _state20$data.additionalDetails) === null || _state20$data$additio === void 0 ? void 0 : _state20$data$additio.detailsProvidedBy
     } : "",
-    applicationNo: (_state22 = state) === null || _state22 === void 0 ? void 0 : (_state22$data = _state22.data) === null || _state22$data === void 0 ? void 0 : _state22$data.applicationNo,
+    applicationNo: (_state21 = state) === null || _state21 === void 0 ? void 0 : (_state21$data = _state21.data) === null || _state21$data === void 0 ? void 0 : _state21$data.applicationNo,
     key: Date.now()
   }];
-  const activationDetails = ((_state23 = state) === null || _state23 === void 0 ? void 0 : (_state23$data = _state23.data) === null || _state23$data === void 0 ? void 0 : (_state23$data$connect = _state23$data.connectionType) === null || _state23$data$connect === void 0 ? void 0 : _state23$data$connect.toUpperCase()) === "METERED" && ((_state24 = state) === null || _state24 === void 0 ? void 0 : (_state24$data = _state24.data) === null || _state24$data === void 0 ? void 0 : _state24$data.applicationType) !== "WATER_RECONNECTION" ? [{
-    meterId: ((_state25 = state) === null || _state25 === void 0 ? void 0 : (_state25$data = _state25.data) === null || _state25$data === void 0 ? void 0 : _state25$data.meterId) || "",
-    meterInstallationDate: (_state26 = state) !== null && _state26 !== void 0 && (_state26$data = _state26.data) !== null && _state26$data !== void 0 && _state26$data.meterInstallationDate ? convertEpochToDates((_state27 = state) === null || _state27 === void 0 ? void 0 : (_state27$data = _state27.data) === null || _state27$data === void 0 ? void 0 : _state27$data.meterInstallationDate) : null,
-    meterInitialReading: ((_state28 = state) === null || _state28 === void 0 ? void 0 : (_state28$data = _state28.data) === null || _state28$data === void 0 ? void 0 : (_state28$data$additio = _state28$data.additionalDetails) === null || _state28$data$additio === void 0 ? void 0 : _state28$data$additio.initialMeterReading) || "",
-    connectionExecutionDate: (_state29 = state) !== null && _state29 !== void 0 && (_state29$data = _state29.data) !== null && _state29$data !== void 0 && _state29$data.connectionExecutionDate ? convertEpochToDates((_state30 = state) === null || _state30 === void 0 ? void 0 : (_state30$data = _state30.data) === null || _state30$data === void 0 ? void 0 : _state30$data.connectionExecutionDate) : null
+  const isMeteredConn = !((_state22 = state) !== null && _state22 !== void 0 && (_state22$data = _state22.data) !== null && _state22$data !== void 0 && _state22$data.connectionType) || ((_state23 = state) === null || _state23 === void 0 ? void 0 : (_state23$data = _state23.data) === null || _state23$data === void 0 ? void 0 : (_state23$data$connect = _state23$data.connectionType) === null || _state23$data$connect === void 0 ? void 0 : _state23$data$connect.toUpperCase()) === "METERED" || ((_state24 = state) === null || _state24 === void 0 ? void 0 : (_state24$data = _state24.data) === null || _state24$data === void 0 ? void 0 : (_state24$data$connect = _state24$data.connectionType) === null || _state24$data$connect === void 0 ? void 0 : _state24$data$connect.toUpperCase()) === "PERMANENT" || ((_state25 = state) === null || _state25 === void 0 ? void 0 : (_state25$data = _state25.data) === null || _state25$data === void 0 ? void 0 : (_state25$data$additio = _state25$data.additionalDetails) === null || _state25$data$additio === void 0 ? void 0 : (_state25$data$additio2 = _state25$data$additio.connectionType) === null || _state25$data$additio2 === void 0 ? void 0 : _state25$data$additio2.toUpperCase()) === "METERED" || ((_state26 = state) === null || _state26 === void 0 ? void 0 : (_state26$data = _state26.data) === null || _state26$data === void 0 ? void 0 : (_state26$data$additio = _state26$data.additionalDetails) === null || _state26$data$additio === void 0 ? void 0 : (_state26$data$additio2 = _state26$data$additio.connectionType) === null || _state26$data$additio2 === void 0 ? void 0 : _state26$data$additio2.toUpperCase()) === "PERMANENT";
+  const activationDetails = isMeteredConn && ((_state27 = state) === null || _state27 === void 0 ? void 0 : (_state27$data = _state27.data) === null || _state27$data === void 0 ? void 0 : _state27$data.applicationType) !== "WATER_RECONNECTION" ? [{
+    meterId: ((_state28 = state) === null || _state28 === void 0 ? void 0 : (_state28$data = _state28.data) === null || _state28$data === void 0 ? void 0 : _state28$data.meterId) || "",
+    meterInstallationDate: (_state29 = state) !== null && _state29 !== void 0 && (_state29$data = _state29.data) !== null && _state29$data !== void 0 && _state29$data.meterInstallationDate ? convertEpochToDates((_state30 = state) === null || _state30 === void 0 ? void 0 : (_state30$data = _state30.data) === null || _state30$data === void 0 ? void 0 : _state30$data.meterInstallationDate) : null,
+    meterInitialReading: ((_state31 = state) === null || _state31 === void 0 ? void 0 : (_state31$data = _state31.data) === null || _state31$data === void 0 ? void 0 : (_state31$data$additio = _state31$data.additionalDetails) === null || _state31$data$additio === void 0 ? void 0 : _state31$data$additio.initialMeterReading) || "",
+    connectionExecutionDate: (_state32 = state) !== null && _state32 !== void 0 && (_state32$data = _state32.data) !== null && _state32$data !== void 0 && _state32$data.connectionExecutionDate ? convertEpochToDates((_state33 = state) === null || _state33 === void 0 ? void 0 : (_state33$data = _state33.data) === null || _state33$data === void 0 ? void 0 : _state33$data.connectionExecutionDate) : null
   }] : [{
-    connectionExecutionDate: (_state31 = state) !== null && _state31 !== void 0 && (_state31$data = _state31.data) !== null && _state31$data !== void 0 && _state31$data.connectionExecutionDate ? convertEpochToDates((_state32 = state) === null || _state32 === void 0 ? void 0 : (_state32$data = _state32.data) === null || _state32$data === void 0 ? void 0 : _state32$data.connectionExecutionDate) : null
+    connectionExecutionDate: (_state34 = state) !== null && _state34 !== void 0 && (_state34$data = _state34.data) !== null && _state34$data !== void 0 && _state34$data.connectionExecutionDate ? convertEpochToDates((_state35 = state) === null || _state35 === void 0 ? void 0 : (_state35$data = _state35.data) === null || _state35$data === void 0 ? void 0 : _state35$data.connectionExecutionDate) : null
   }];
   const defaultValues = {
     formDetails: details,
@@ -53438,13 +53412,25 @@ const ActivateConnection = () => {
     }
   }, []);
   useEffect(() => {
-    if (!isLoading && newConfig && Array.isArray(newConfig)) {
-      const configObj = newConfig.find(conf => conf.hideInCitizen);
+    const configsToUse = !isLoading && newConfig && Array.isArray(newConfig) && newConfig.length > 0 ? newConfig : newConfig$2;
+    if (configsToUse && Array.isArray(configsToUse)) {
+      var _Digit$UserService$ge, _Digit$UserService$ge2;
+      const isCitizen = ((_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.type) === "CITIZEN" || window.location.href.includes("/citizen");
+      const configObj = configsToUse.find(conf => conf.hideInCitizen) || configsToUse[0];
       if (configObj && configObj.body) {
         let flattenedBody = [];
         configObj.body.forEach(section => {
           if (section.body && Array.isArray(section.body)) {
-            flattenedBody = [...flattenedBody, ...section.body];
+            const mappedSectionBody = section.body.map(item => {
+              if (item.key === "activationDetails" && (isCitizen || item.component === "WSActivationPageDetails")) {
+                return {
+                  ...item,
+                  component: "WSActivationDetails"
+                };
+              }
+              return item;
+            });
+            flattenedBody = [...flattenedBody, ...mappedSectionBody];
           }
         });
         setConfig([{
@@ -53453,12 +53439,12 @@ const ActivateConnection = () => {
         }]);
       }
     }
-  }, [newConfig]);
+  }, [newConfig, isLoading]);
   useEffect(() => {
     const timer = setTimeout(() => {
       if (isAppDetailsPage) {
-        var _Digit$UserService$ge, _Digit$UserService$ge2;
-        const isCitizen = ((_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.type) === "CITIZEN";
+        var _Digit$UserService$ge3, _Digit$UserService$ge4;
+        const isCitizen = ((_Digit$UserService$ge3 = Digit.UserService.getUser()) === null || _Digit$UserService$ge3 === void 0 ? void 0 : (_Digit$UserService$ge4 = _Digit$UserService$ge3.info) === null || _Digit$UserService$ge4 === void 0 ? void 0 : _Digit$UserService$ge4.type) === "CITIZEN";
         if (isCitizen) {
           window.location.href = `${window.location.origin}/digit-ui/citizen/ws/connection/application/${filters === null || filters === void 0 ? void 0 : filters.applicationNumber}`;
         } else {
@@ -53503,9 +53489,8 @@ const ActivateConnection = () => {
             setShowToast(false);
           }, 3000);
         } else {
-          var _Object$keys, _details3, _formDetails$connecti, _formDetails$connecti2, _formDetails$connecti3, _formDetails$connecti4, _formDetails$connecti5, _formDetails$connecti6, _formDetails$connecti7, _formDetails$connecti8, _formDetails$connecti9, _formDetails$connecti0, _formDetails$connecti1, _formDetails$connecti10, _formDetails$connecti11, _formDetails$connecti12, _formDetails$connecti13, _formDetails$connecti14, _formDetails$connecti15, _formDetails$connecti16, _formDetails$connecti17, _formDetails$connecti18, _formDetails$connecti19, _formDetails$connecti20, _formDetails$connecti21, _formDetails$connecti22, _formDetails$connecti23, _formDetails$connecti24, _formDetails$connecti25, _formDetails$connecti26, _formDetails$connecti27, _formDetails$connecti28, _formDetails$plumberD, _formDetails$plumberD2, _formDetails$plumberD3, _formData$plumberInfo, _formDetails$plumberD7, _formDetails$plumberD8, _formDetails$plumberD9, _formDetails$plumberD0, _formDetails$plumberD1, _formDetails$plumberD10, _formDetails$plumberD11, _formDetails$plumberD12, _formDetails$plumberD13, _formDetails$plumberD14, _formDetails$plumberD15, _formDetails$plumberD16, _formDetails$activati9, _formDetails$activati0, _formDetails$activati1, _formDetails$activati10;
+          var _Object$keys, _details3, _formDetails$connecti, _formDetails$connecti2, _formDetails$connecti3, _formDetails$connecti4, _formDetails$connecti5, _formDetails$connecti6, _formDetails$connecti7, _formDetails$connecti8, _formDetails$connecti9, _formDetails$connecti0, _formDetails$connecti1, _formDetails$connecti10, _formDetails$connecti11, _formDetails$connecti12, _formDetails$connecti13, _formDetails$connecti14, _formDetails$connecti15, _formDetails$connecti16, _formDetails$connecti17, _formDetails$connecti18, _formDetails$connecti19, _formDetails$connecti20, _formDetails$connecti21, _formDetails$connecti22, _formDetails$connecti23, _formDetails$connecti24, _formDetails$connecti25, _formDetails$connecti26, _formDetails$connecti27, _formDetails$connecti28, _formDetails$plumberD, _formDetails$plumberD2, _formDetails$plumberD3, _formData$plumberInfo, _formDetails$plumberD7, _formDetails$plumberD8, _formDetails$plumberD9, _formDetails$plumberD0, _formDetails$plumberD1, _formDetails$plumberD10, _formDetails$plumberD11, _formDetails$plumberD12, _formDetails$plumberD13, _formDetails$plumberD14, _formDetails$plumberD15, _formDetails$plumberD16, _formDetails$activati;
           function _temp4() {
-            var _formDetails$activati, _formDetails$activati2, _formDetails$activati3, _formDetails$activati4;
             function _temp2() {
               var _formDetails$comments, _data$supportingDocum, _data$supportingDocum2, _data$supportingDocum3, _data$supportingDocum4, _formDetails$comments2, _data$supportingDocum5, _data$supportingDocum6, _data$supportingDocum7, _data$supportingDocum8;
               formData.comment = (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$comments = formDetails.comments) === null || _formDetails$comments === void 0 ? void 0 : _formDetails$comments.comments) || "";
@@ -53513,7 +53498,8 @@ const ActivateConnection = () => {
               formData.wfDocuments = data !== null && data !== void 0 && (_data$supportingDocum = data.supportingDocuments) !== null && _data$supportingDocum !== void 0 && (_data$supportingDocum2 = _data$supportingDocum[0]) !== null && _data$supportingDocum2 !== void 0 && _data$supportingDocum2.fileStoreId ? [{
                 documentType: "Document - 1",
                 fileStoreId: data === null || data === void 0 ? void 0 : (_data$supportingDocum3 = data.supportingDocuments) === null || _data$supportingDocum3 === void 0 ? void 0 : (_data$supportingDocum4 = _data$supportingDocum3[0]) === null || _data$supportingDocum4 === void 0 ? void 0 : _data$supportingDocum4.fileStoreId
-              }] : [], formData.processInstance = {
+              }] : [];
+              formData.processInstance = {
                 action: filters === null || filters === void 0 ? void 0 : filters.action,
                 comment: (formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$comments2 = formDetails.comments) === null || _formDetails$comments2 === void 0 ? void 0 : _formDetails$comments2.comments) || "",
                 documents: data !== null && data !== void 0 && (_data$supportingDocum5 = data.supportingDocuments) !== null && _data$supportingDocum5 !== void 0 && (_data$supportingDocum6 = _data$supportingDocum5[0]) !== null && _data$supportingDocum6 !== void 0 && _data$supportingDocum6.fileStoreId ? [{
@@ -53521,7 +53507,18 @@ const ActivateConnection = () => {
                   fileStoreId: data === null || data === void 0 ? void 0 : (_data$supportingDocum7 = data.supportingDocuments) === null || _data$supportingDocum7 === void 0 ? void 0 : (_data$supportingDocum8 = _data$supportingDocum7[0]) === null || _data$supportingDocum8 === void 0 ? void 0 : _data$supportingDocum8.fileStoreId
                 }] : []
               };
-              const reqDetails = (filters === null || filters === void 0 ? void 0 : filters.service) == "WATER" ? (formData === null || formData === void 0 ? void 0 : formData.applicationType) === "WATER_RECONNECTION" ? {
+              const isWater = filters !== null && filters !== void 0 && filters.service ? filters.service.toUpperCase() === "WATER" : (formData === null || formData === void 0 ? void 0 : formData.serviceType) === "WATER" || !(formData !== null && formData !== void 0 && formData.serviceType);
+              if (isWater) {
+                formData.waterSource = "GROUND.WELL";
+                formData.proposedPipeSize = 0;
+                formData.proposedTaps = 0;
+                formData.pipeSize = 0;
+                formData.noOfTaps = 0;
+                formData.connectionType = "Metered";
+                if (!formData.additionalDetails) formData.additionalDetails = {};
+                formData.additionalDetails.connectionType = "Permanent";
+              }
+              const reqDetails = isWater ? (formData === null || formData === void 0 ? void 0 : formData.applicationType) === "WATER_RECONNECTION" ? {
                 WaterConnection: formData,
                 reconnectRequest: true,
                 disconnectRequest: false
@@ -53538,6 +53535,20 @@ const ActivateConnection = () => {
                 reconnectRequest: false,
                 disconnectRequest: false
               };
+              if (reqDetails !== null && reqDetails !== void 0 && reqDetails.WaterConnection) {
+                reqDetails.WaterConnection.waterSource = "GROUND.WELL";
+                reqDetails.WaterConnection.proposedPipeSize = 0;
+                reqDetails.WaterConnection.proposedTaps = 0;
+                reqDetails.WaterConnection.pipeSize = 0;
+                reqDetails.WaterConnection.noOfTaps = 0;
+                reqDetails.WaterConnection.connectionType = "Metered";
+                if (!reqDetails.WaterConnection.additionalDetails) reqDetails.WaterConnection.additionalDetails = {};
+                reqDetails.WaterConnection.additionalDetails.connectionType = "Permanent";
+              }
+              if (reqDetails !== null && reqDetails !== void 0 && reqDetails.SewerageConnection) {
+                if (!reqDetails.SewerageConnection.additionalDetails) reqDetails.SewerageConnection.additionalDetails = {};
+                reqDetails.SewerageConnection.additionalDetails.connectionType = "Permanent";
+              }
               if (mutate) {
                 mutate(reqDetails, {
                   onError: (error, variables) => {
@@ -53557,9 +53568,10 @@ const ActivateConnection = () => {
                 });
               }
             }
-            if (formDetails !== null && formDetails !== void 0 && (_formDetails$activati = formDetails.activationDetails) !== null && _formDetails$activati !== void 0 && (_formDetails$activati2 = _formDetails$activati[0]) !== null && _formDetails$activati2 !== void 0 && _formDetails$activati2.meterInitialReading) formData.additionalDetails.initialMeterReading = formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$activati3 = formDetails.activationDetails) === null || _formDetails$activati3 === void 0 ? void 0 : (_formDetails$activati4 = _formDetails$activati3[0]) === null || _formDetails$activati4 === void 0 ? void 0 : _formDetails$activati4.meterInitialReading;
-            const _temp = function (_formDetails$activati5, _formDetails$activati6, _formDetails$activati7, _formDetails$activati8) {
-              if (formDetails !== null && formDetails !== void 0 && (_formDetails$activati5 = formDetails.activationDetails) !== null && _formDetails$activati5 !== void 0 && (_formDetails$activati6 = _formDetails$activati5[0]) !== null && _formDetails$activati6 !== void 0 && _formDetails$activati6.connectionExecutionDate) return Promise.resolve(getConvertedDate(formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$activati7 = formDetails.activationDetails) === null || _formDetails$activati7 === void 0 ? void 0 : (_formDetails$activati8 = _formDetails$activati7[0]) === null || _formDetails$activati8 === void 0 ? void 0 : _formDetails$activati8.connectionExecutionDate)).then(function (_getConvertedDate2) {
+            if (!formData.additionalDetails) formData.additionalDetails = {};
+            formData.additionalDetails.initialMeterReading = (actObj === null || actObj === void 0 ? void 0 : actObj.meterInitialReading) !== undefined && (actObj === null || actObj === void 0 ? void 0 : actObj.meterInitialReading) !== "" ? actObj.meterInitialReading : "0";
+            const _temp = function () {
+              if (actObj !== null && actObj !== void 0 && actObj.connectionExecutionDate) return Promise.resolve(getConvertedDate(actObj === null || actObj === void 0 ? void 0 : actObj.connectionExecutionDate)).then(function (_getConvertedDate2) {
                 formData.connectionExecutionDate = _getConvertedDate2;
               });
             }();
@@ -53586,9 +53598,10 @@ const ActivateConnection = () => {
           if (formDetails !== null && formDetails !== void 0 && (_formDetails$plumberD7 = formDetails.plumberDetails) !== null && _formDetails$plumberD7 !== void 0 && (_formDetails$plumberD8 = _formDetails$plumberD7[0]) !== null && _formDetails$plumberD8 !== void 0 && _formDetails$plumberD8.plumberName) formData.plumberInfo[0].name = formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$plumberD9 = formDetails.plumberDetails) === null || _formDetails$plumberD9 === void 0 ? void 0 : (_formDetails$plumberD0 = _formDetails$plumberD9[0]) === null || _formDetails$plumberD0 === void 0 ? void 0 : _formDetails$plumberD0.plumberName;
           if (formDetails !== null && formDetails !== void 0 && (_formDetails$plumberD1 = formDetails.plumberDetails) !== null && _formDetails$plumberD1 !== void 0 && (_formDetails$plumberD10 = _formDetails$plumberD1[0]) !== null && _formDetails$plumberD10 !== void 0 && _formDetails$plumberD10.plumberLicenseNo) formData.plumberInfo[0].licenseNo = formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$plumberD11 = formDetails.plumberDetails) === null || _formDetails$plumberD11 === void 0 ? void 0 : (_formDetails$plumberD12 = _formDetails$plumberD11[0]) === null || _formDetails$plumberD12 === void 0 ? void 0 : _formDetails$plumberD12.plumberLicenseNo;
           if (formDetails !== null && formDetails !== void 0 && (_formDetails$plumberD13 = formDetails.plumberDetails) !== null && _formDetails$plumberD13 !== void 0 && (_formDetails$plumberD14 = _formDetails$plumberD13[0]) !== null && _formDetails$plumberD14 !== void 0 && _formDetails$plumberD14.plumberMobileNo) formData.plumberInfo[0].mobileNumber = formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$plumberD15 = formDetails.plumberDetails) === null || _formDetails$plumberD15 === void 0 ? void 0 : (_formDetails$plumberD16 = _formDetails$plumberD15[0]) === null || _formDetails$plumberD16 === void 0 ? void 0 : _formDetails$plumberD16.plumberMobileNo;
-          if (formDetails !== null && formDetails !== void 0 && (_formDetails$activati9 = formDetails.activationDetails) !== null && _formDetails$activati9 !== void 0 && (_formDetails$activati0 = _formDetails$activati9[0]) !== null && _formDetails$activati0 !== void 0 && _formDetails$activati0.meterId) formData.meterId = formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$activati1 = formDetails.activationDetails) === null || _formDetails$activati1 === void 0 ? void 0 : (_formDetails$activati10 = _formDetails$activati1[0]) === null || _formDetails$activati10 === void 0 ? void 0 : _formDetails$activati10.meterId;
-          const _temp3 = function (_formDetails$activati11, _formDetails$activati12, _formDetails$activati13, _formDetails$activati14) {
-            if (formDetails !== null && formDetails !== void 0 && (_formDetails$activati11 = formDetails.activationDetails) !== null && _formDetails$activati11 !== void 0 && (_formDetails$activati12 = _formDetails$activati11[0]) !== null && _formDetails$activati12 !== void 0 && _formDetails$activati12.meterInstallationDate) return Promise.resolve(getConvertedDate(formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$activati13 = formDetails.activationDetails) === null || _formDetails$activati13 === void 0 ? void 0 : (_formDetails$activati14 = _formDetails$activati13[0]) === null || _formDetails$activati14 === void 0 ? void 0 : _formDetails$activati14.meterInstallationDate)).then(function (_getConvertedDate) {
+          const actObj = Array.isArray(formDetails === null || formDetails === void 0 ? void 0 : formDetails.activationDetails) ? formDetails === null || formDetails === void 0 ? void 0 : (_formDetails$activati = formDetails.activationDetails) === null || _formDetails$activati === void 0 ? void 0 : _formDetails$activati[0] : formDetails === null || formDetails === void 0 ? void 0 : formDetails.activationDetails;
+          if (actObj !== null && actObj !== void 0 && actObj.meterId) formData.meterId = actObj === null || actObj === void 0 ? void 0 : actObj.meterId;
+          const _temp3 = function () {
+            if (actObj !== null && actObj !== void 0 && actObj.meterInstallationDate) return Promise.resolve(getConvertedDate(actObj === null || actObj === void 0 ? void 0 : actObj.meterInstallationDate)).then(function (_getConvertedDate) {
               formData.meterInstallationDate = _getConvertedDate;
             });
           }();
@@ -53622,7 +53635,6 @@ const ActivateConnection = () => {
         body: config.body
       };
     }),
-    userType: "employee",
     defaultValues: defaultValues,
     onSubmit: onSubmit,
     label: t("WF_EMPLOYEE_NEWSW1_ACTIVATE_CONNECTION"),
@@ -60568,7 +60580,7 @@ const openFilePDF = fileId => {
   }).catch(error => console.error("Error fetching file:", error));
 };
 const CheckPage$4 = _ref2 => {
-  var _Digit$UserService$ge, _data$cpt, _data$ConnectionDetai, _data$connectionDetai, _data$ConnectionHolde, _data$connectionHolde, _data$useDetails, _data$DocumentsRequir, _data$documents, _data$djbEmployee, _data$disability, _connectionDetails, _connectionDetails$se, _connectionDetails2, _connectionDetails2$s, _connectionDetails3, _connectionDetails4, _connectionDetails4$a, _connectionDetails5, _connectionDetails5$a, _connectionDetails6, _holderDetails, _holderDetails2, _holderDetails3, _holderDetails4, _holderDetails4$gende, _holderDetails5, _holderDetails5$gende, _holderDetails6, _holderDetails7, _holderDetails8, _holderDetails9, _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;
+  var _Digit$UserService$ge, _data$cpt, _data$ConnectionDetai, _data$connectionDetai, _data$ConnectionHolde, _data$connectionHolde, _data$useDetails, _data$DocumentsRequir, _data$documents, _data$djbEmployee, _data$disability, _connectionDetails, _connectionDetails$se, _connectionDetails2, _connectionDetails2$s, _connectionDetails3, _connectionDetails4, _connectionDetails4$a, _connectionDetails5, _connectionDetails5$a, _connectionDetails6, _holderDetails, _holderDetails2, _holderDetails3, _holderDetails4, _holderDetails4$gende, _holderDetails5, _holderDetails5$gende, _holderDetails6, _holderDetails7, _holderDetails8, _holderDetails9, _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, _useDetails$propertyT3;
   let {
     data,
     onSubmit,
@@ -60757,10 +60769,10 @@ const CheckPage$4 = _ref2 => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("WS_SELECT_YEAR_OF_CONSTRUCTION"),
     text: `${t(checkForNA((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$SelectYea = useDetails.SelectYearofConstruction) === null || _useDetails$SelectYea === void 0 ? void 0 : _useDetails$SelectYea.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$SelectYea2 = useDetails.SelectYearofConstruction) === null || _useDetails$SelectYea2 === void 0 ? void 0 : _useDetails$SelectYea2.value) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$SelectYea3 = useDetails.SelectYearofConstruction) === null || _useDetails$SelectYea3 === void 0 ? void 0 : _useDetails$SelectYea3.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.SelectYearofConstruction) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$construct = useDetails.constructionYear) === null || _useDetails$construct === void 0 ? void 0 : _useDetails$construct.i18nKey) || (useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$construct2 = useDetails.constructionYear) === null || _useDetails$construct2 === void 0 ? void 0 : _useDetails$construct2.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.constructionYear)))}`
-  }), /*#__PURE__*/React.createElement(Row, {
+  }), ["Apartment", "DDAFlats", "GovtFlats", "Bungalows", "FlatOrApartment", "GroupHousingSociety", "JJSLUMS", "IndividualHouse", "BuiltUp.GroupHousingSociety", "BuiltUp.JJSLUMS", "BuiltUp.IndividualHouse"].includes((useDetails === null || useDetails === void 0 ? void 0 : (_useDetails$propertyT3 = useDetails.propertyType) === null || _useDetails$propertyT3 === void 0 ? void 0 : _useDetails$propertyT3.code) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.propertyType)) ? /*#__PURE__*/React.createElement(Row, {
     label: t("WS_NUMBER_OF_DWELLING_UNITS"),
     text: `${t(checkForNA((useDetails === null || useDetails === void 0 ? void 0 : useDetails.NumberofDwellingUnits) || (useDetails === null || useDetails === void 0 ? void 0 : useDetails.noOfDwellingUnits)))}`
-  })), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_DJB_EMPLOYEE")), /*#__PURE__*/React.createElement(StatusTable, {
+  }) : null), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_DJB_EMPLOYEE")), /*#__PURE__*/React.createElement(StatusTable, {
     style: {
       marginTop: "10px",
       marginBottom: "30px"