@djb25/digit-ui-module-ws 1.0.95 → 1.0.96

package/dist/index.js

@@ -509,6 +509,31 @@ const getFiles = function (filesArray, tenant) {
     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);
+            }
+          }
+        });
+      }, function (error) {
+        console.error("Error fetching file URL", error);
+      });
+      if (_temp3 && _temp3.then) return _temp3.then(function () {});
     });
   } catch (e) {
     return Promise.reject(e);
@@ -876,6 +901,7 @@ const convertToEditWSUpdate = data => {
       } : {
         ...(waterResult === null || waterResult === void 0 ? void 0 : waterResult.property)
       },
+      dueVerification: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.dueVerification : waterResult === null || waterResult === void 0 ? void 0 : waterResult.dueVerification,
       water: data !== null && data !== void 0 && (_data$applicationType = data.applicationType) !== null && _data$applicationType !== void 0 && _data$applicationType.includes("WATER") ? true : false,
       sewerage: data !== null && data !== void 0 && (_data$applicationType2 = data.applicationType) !== null && _data$applicationType2 !== void 0 && _data$applicationType2.includes("WATER") ? true : false,
       service: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : (_data$serviceName = data.serviceName) === null || _data$serviceName === void 0 ? void 0 : _data$serviceName.code : waterResult === null || waterResult === void 0 ? void 0 : (_waterResult$serviceN = waterResult.serviceName) === null || _waterResult$serviceN === void 0 ? void 0 : _waterResult$serviceN.code,
@@ -958,6 +984,7 @@ const convertToEditSWUpdate = data => {
       } : {
         ...(SewerageResult === null || SewerageResult === void 0 ? void 0 : SewerageResult.property)
       },
+      dueVerification: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : data.dueVerification : SewerageResult === null || SewerageResult === void 0 ? void 0 : SewerageResult.dueVerification,
       water: data !== null && data !== void 0 && (_data$applicationType3 = data.applicationType) !== null && _data$applicationType3 !== void 0 && _data$applicationType3.includes("WATER") ? true : false,
       sewerage: data !== null && data !== void 0 && (_data$applicationType4 = data.applicationType) !== null && _data$applicationType4 !== void 0 && _data$applicationType4.includes("WATER") ? true : false,
       service: data !== null && data !== void 0 && data.isEditApplication ? data === null || data === void 0 ? void 0 : (_data$serviceName2 = data.serviceName) === null || _data$serviceName2 === void 0 ? void 0 : _data$serviceName2.code : SewerageResult === null || SewerageResult === void 0 ? void 0 : (_SewerageResult$servi = SewerageResult.serviceName) === null || _SewerageResult$servi === void 0 ? void 0 : _SewerageResult$servi.code,
@@ -1912,16 +1939,16 @@ const convertDisonnectEditApplicationDetails = function (data, appData, actionDa
       name: data === null || data === void 0 ? void 0 : (_data$plumberDetails1 = data.plumberDetails) === null || _data$plumberDetails1 === void 0 ? void 0 : (_data$plumberDetails10 = _data$plumberDetails1[0]) === null || _data$plumberDetails10 === void 0 ? void 0 : _data$plumberDetails10.plumberName,
       id: appData === null || appData === void 0 ? void 0 : (_appData$applicationD6 = appData.applicationData) === null || _appData$applicationD6 === void 0 ? void 0 : (_appData$applicationD7 = _appData$applicationD6.plumberInfo) === null || _appData$applicationD7 === void 0 ? void 0 : (_appData$applicationD8 = _appData$applicationD7[0]) === null || _appData$applicationD8 === void 0 ? void 0 : _appData$applicationD8.id
     }];
-    const _temp5 = (data === null || data === void 0 ? void 0 : (_data$disConnectionDe = data.disConnectionDetails) === null || _data$disConnectionDe === void 0 ? void 0 : (_data$disConnectionDe2 = _data$disConnectionDe[0]) === null || _data$disConnectionDe2 === void 0 ? void 0 : _data$disConnectionDe2.disConnectionReason) || "",
-      _temp4 = (data === null || data === void 0 ? void 0 : (_data$disConnectionDe3 = data.disConnectionDetails) === null || _data$disConnectionDe3 === void 0 ? void 0 : (_data$disConnectionDe4 = _data$disConnectionDe3[0]) === null || _data$disConnectionDe4 === void 0 ? void 0 : _data$disConnectionDe4.disConnectionType) == "TEMPORARY" ? true : false,
-      _temp3 = (documentsData === null || documentsData === void 0 ? void 0 : documentsData.length) > 0 ? documentsData : data === null || data === void 0 ? void 0 : (_data$DocumentsRequir2 = data.DocumentsRequired) === null || _data$DocumentsRequir2 === void 0 ? void 0 : _data$DocumentsRequir2.documents;
+    const _temp6 = (data === null || data === void 0 ? void 0 : (_data$disConnectionDe = data.disConnectionDetails) === null || _data$disConnectionDe === void 0 ? void 0 : (_data$disConnectionDe2 = _data$disConnectionDe[0]) === null || _data$disConnectionDe2 === void 0 ? void 0 : _data$disConnectionDe2.disConnectionReason) || "",
+      _temp5 = (data === null || data === void 0 ? void 0 : (_data$disConnectionDe3 = data.disConnectionDetails) === null || _data$disConnectionDe3 === void 0 ? void 0 : (_data$disConnectionDe4 = _data$disConnectionDe3[0]) === null || _data$disConnectionDe4 === void 0 ? void 0 : _data$disConnectionDe4.disConnectionType) == "TEMPORARY" ? true : false,
+      _temp4 = (documentsData === null || documentsData === void 0 ? void 0 : documentsData.length) > 0 ? documentsData : data === null || data === void 0 ? void 0 : (_data$DocumentsRequir2 = data.DocumentsRequired) === null || _data$DocumentsRequir2 === void 0 ? void 0 : _data$DocumentsRequir2.documents;
     return Promise.resolve(getConvertedDate(data === null || data === void 0 ? void 0 : (_data$disConnectionDe5 = data.disConnectionDetails) === null || _data$disConnectionDe5 === void 0 ? void 0 : (_data$disConnectionDe6 = _data$disConnectionDe5[0]) === null || _data$disConnectionDe6 === void 0 ? void 0 : _data$disConnectionDe6.disConnectionProposeDate)).then(function (_getConvertedDate) {
       var _data$plumberDetails11, _data$plumberDetails12, _data$plumberDetails13;
       let payload = {
         ...appData.applicationData,
-        documents: _temp3,
-        isDisconnectionTemporary: _temp4,
-        disconnectionReason: _temp5,
+        documents: _temp4,
+        isDisconnectionTemporary: _temp5,
+        disconnectionReason: _temp6,
         dateEffectiveFrom: _getConvertedDate,
         processInstance: {
           action: actionData ? actionData : "RESUBMIT_APPLICATION"
@@ -1964,10 +1991,10 @@ const convertModifyApplicationDetails = function (data, appData, actionData) {
   }
   try {
     var _data$cpt34, _data$cpt34$details, _data$cpt34$details$o, _data$cpt35, _data$cpt35$details, _data$cpt36, _data$cpt36$details, _data$connectionDetai, _data$connectionDetai2, _data$connectionDetai3, _data$connectionDetai4, _data$connectionDetai5, _data$connectionDetai6, _data$connectionDetai7, _data$connectionDetai8, _data$connectionDetai9, _data$connectionDetai0, _data$connectionDetai1, _data$connectionDetai10, _data$connectionDetai11, _data$connectionDetai12, _data$connectionDetai13, _data$connectionDetai14, _data$connectionDetai15, _data$connectionDetai16, _data$connectionDetai17, _data$connectionDetai18, _data$connectionDetai19, _data$connectionDetai20, _data$connectionDetai21, _data$connectionDetai22, _data$connectionDetai23, _data$connectionDetai24, _data$connectionDetai25, _data$connectionDetai26, _data$connectionDetai27, _data$connectionDetai28, _data$activationDetai11, _data$activationDetai12, _data$activationDetai13, _data$activationDetai14;
-    function _temp1() {
+    function _temp10() {
       var _data$activationDetai5, _data$activationDetai6, _data$activationDetai7, _data$activationDetai8;
-      function _temp9() {
-        function _temp7() {
+      function _temp0() {
+        function _temp8() {
           var _data$DocumentsRequir3, _data$DocumentsRequir4, _data$DocumentsRequir5, _appData$applicationD9, _data$ConnectionHolde87, _data$ConnectionHolde88, _Digit$UserService$ge12, _Digit$UserService$ge13, _Digit$UserService$ge14, _data$DocumentsRequir6, _data$cpt33;
           if (data !== null && data !== void 0 && (_data$DocumentsRequir3 = data.DocumentsRequired) !== null && _data$DocumentsRequir3 !== void 0 && (_data$DocumentsRequir4 = _data$DocumentsRequir3.documents) !== null && _data$DocumentsRequir4 !== void 0 && _data$DocumentsRequir4.length) formData.documents = data === null || data === void 0 ? void 0 : (_data$DocumentsRequir5 = data.DocumentsRequired) === null || _data$DocumentsRequir5 === void 0 ? void 0 : _data$DocumentsRequir5.documents;else formData.documents = null;
           const existingDocs = (appData === null || appData === void 0 ? void 0 : (_appData$applicationD9 = appData.applicationData) === null || _appData$applicationD9 === void 0 ? void 0 : _appData$applicationD9.documents) || (appData === null || appData === void 0 ? void 0 : appData.documents) || [];
@@ -2001,20 +2028,20 @@ const convertModifyApplicationDetails = function (data, appData, actionData) {
           sessionStorage.setItem("WS_PROPERTY_INOF", JSON.stringify(data === null || data === void 0 ? void 0 : (_data$cpt33 = data.cpt) === null || _data$cpt33 === void 0 ? void 0 : _data$cpt33.details));
           return formData;
         }
-        const _temp6 = function (_data$activationDetai, _data$activationDetai2, _data$activationDetai3, _data$activationDetai4) {
+        const _temp7 = function (_data$activationDetai, _data$activationDetai2, _data$activationDetai3, _data$activationDetai4) {
           if (data !== null && data !== void 0 && (_data$activationDetai = data.activationDetails) !== null && _data$activationDetai !== void 0 && (_data$activationDetai2 = _data$activationDetai[0]) !== null && _data$activationDetai2 !== void 0 && _data$activationDetai2.dateEffectiveFrom) return Promise.resolve(getConvertedDate(data === null || data === void 0 ? void 0 : (_data$activationDetai3 = data.activationDetails) === null || _data$activationDetai3 === void 0 ? void 0 : (_data$activationDetai4 = _data$activationDetai3[0]) === null || _data$activationDetai4 === void 0 ? void 0 : _data$activationDetai4.dateEffectiveFrom)).then(function (_getConvertedDate4) {
             formData.dateEffectiveFrom = _getConvertedDate4;
           });
         }();
-        return _temp6 && _temp6.then ? _temp6.then(_temp7) : _temp7(_temp6);
+        return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
       }
       if (data !== null && data !== void 0 && (_data$activationDetai5 = data.activationDetails) !== null && _data$activationDetai5 !== void 0 && (_data$activationDetai6 = _data$activationDetai5[0]) !== null && _data$activationDetai6 !== void 0 && _data$activationDetai6.meterInitialReading) formData.additionalDetails.initialMeterReading = data === null || data === void 0 ? void 0 : (_data$activationDetai7 = data.activationDetails) === null || _data$activationDetai7 === void 0 ? void 0 : (_data$activationDetai8 = _data$activationDetai7[0]) === null || _data$activationDetai8 === void 0 ? void 0 : _data$activationDetai8.meterInitialReading;
-      const _temp8 = function (_data$activationDetai9, _data$activationDetai0, _data$activationDetai1, _data$activationDetai10) {
+      const _temp9 = function (_data$activationDetai9, _data$activationDetai0, _data$activationDetai1, _data$activationDetai10) {
         if (data !== null && data !== void 0 && (_data$activationDetai9 = data.activationDetails) !== null && _data$activationDetai9 !== void 0 && (_data$activationDetai0 = _data$activationDetai9[0]) !== null && _data$activationDetai0 !== void 0 && _data$activationDetai0.connectionExecutionDate) return Promise.resolve(getConvertedDate(data === null || data === void 0 ? void 0 : (_data$activationDetai1 = data.activationDetails) === null || _data$activationDetai1 === void 0 ? void 0 : (_data$activationDetai10 = _data$activationDetai1[0]) === null || _data$activationDetai10 === void 0 ? void 0 : _data$activationDetai10.connectionExecutionDate)).then(function (_getConvertedDate3) {
           formData.connectionExecutionDate = _getConvertedDate3;
         });
       }();
-      return _temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8);
+      return _temp9 && _temp9.then ? _temp9.then(_temp0) : _temp0(_temp9);
     }
     data === null || data === void 0 ? void 0 : (_data$cpt34 = data.cpt) === null || _data$cpt34 === void 0 ? void 0 : (_data$cpt34$details = _data$cpt34.details) === null || _data$cpt34$details === void 0 ? void 0 : (_data$cpt34$details$o = _data$cpt34$details.owners) === null || _data$cpt34$details$o === void 0 ? void 0 : _data$cpt34$details$o.forEach(owner => {
       if (owner !== null && owner !== void 0 && owner.permanentAddress) owner.correspondenceAddress = owner === null || owner === void 0 ? void 0 : owner.permanentAddress;
@@ -2030,12 +2057,12 @@ const convertModifyApplicationDetails = function (data, appData, actionData) {
     if (data !== null && data !== void 0 && (_data$connectionDetai21 = data.connectionDetails) !== null && _data$connectionDetai21 !== void 0 && (_data$connectionDetai22 = _data$connectionDetai21[0]) !== null && _data$connectionDetai22 !== void 0 && _data$connectionDetai22.noOfWaterClosets) formData.noOfWaterClosets = data === null || data === void 0 ? void 0 : (_data$connectionDetai23 = data.connectionDetails) === null || _data$connectionDetai23 === void 0 ? void 0 : (_data$connectionDetai24 = _data$connectionDetai23[0]) === null || _data$connectionDetai24 === void 0 ? void 0 : _data$connectionDetai24.noOfWaterClosets;
     if (data !== null && data !== void 0 && (_data$connectionDetai25 = data.connectionDetails) !== null && _data$connectionDetai25 !== void 0 && (_data$connectionDetai26 = _data$connectionDetai25[0]) !== null && _data$connectionDetai26 !== void 0 && _data$connectionDetai26.noOfToilets) formData.noOfToilets = data === null || data === void 0 ? void 0 : (_data$connectionDetai27 = data.connectionDetails) === null || _data$connectionDetai27 === void 0 ? void 0 : (_data$connectionDetai28 = _data$connectionDetai27[0]) === null || _data$connectionDetai28 === void 0 ? void 0 : _data$connectionDetai28.noOfToilets;
     if (data !== null && data !== void 0 && (_data$activationDetai11 = data.activationDetails) !== null && _data$activationDetai11 !== void 0 && (_data$activationDetai12 = _data$activationDetai11[0]) !== null && _data$activationDetai12 !== void 0 && _data$activationDetai12.meterId) formData.meterId = data === null || data === void 0 ? void 0 : (_data$activationDetai13 = data.activationDetails) === null || _data$activationDetai13 === void 0 ? void 0 : (_data$activationDetai14 = _data$activationDetai13[0]) === null || _data$activationDetai14 === void 0 ? void 0 : _data$activationDetai14.meterId;
-    const _temp0 = function (_data$activationDetai15, _data$activationDetai16, _data$activationDetai17, _data$activationDetai18) {
+    const _temp1 = function (_data$activationDetai15, _data$activationDetai16, _data$activationDetai17, _data$activationDetai18) {
       if (data !== null && data !== void 0 && (_data$activationDetai15 = data.activationDetails) !== null && _data$activationDetai15 !== void 0 && (_data$activationDetai16 = _data$activationDetai15[0]) !== null && _data$activationDetai16 !== void 0 && _data$activationDetai16.meterInstallationDate) return Promise.resolve(getConvertedDate(data === null || data === void 0 ? void 0 : (_data$activationDetai17 = data.activationDetails) === null || _data$activationDetai17 === void 0 ? void 0 : (_data$activationDetai18 = _data$activationDetai17[0]) === null || _data$activationDetai18 === void 0 ? void 0 : _data$activationDetai18.meterInstallationDate)).then(function (_getConvertedDate2) {
         formData.meterInstallationDate = _getConvertedDate2;
       });
     }();
-    return Promise.resolve(_temp0 && _temp0.then ? _temp0.then(_temp1) : _temp1(_temp0));
+    return Promise.resolve(_temp1 && _temp1.then ? _temp1.then(_temp10) : _temp10(_temp1));
   } catch (e) {
     return Promise.reject(e);
   }
@@ -8263,12 +8290,23 @@ const WSMyApplications = () => {
         return GetCell(slaDays ? `${slaDays} Days` : t("CS_NA"));
       }
     }, {
-      Header: t("WS_VIEW_DETAILS"),
+      Header: t("dueAmount"),
       disableSortBy: true,
       Cell: _ref7 => {
+        var _row$original9;
         let {
           row
         } = _ref7;
+        const dueAmounts = (((_row$original9 = row.original) === null || _row$original9 === void 0 ? void 0 : _row$original9.dueVerification) || []).map(item => item === null || item === void 0 ? void 0 : item.dueAmount).filter(amount => amount !== null && amount !== undefined && amount !== "");
+        return GetCell(dueAmounts.length > 0 ? dueAmounts.map(amount => `₹${Number(amount).toLocaleString("en-IN")}`).join(", ") : t("CS_NA"));
+      }
+    }, {
+      Header: t("WS_VIEW_DETAILS"),
+      disableSortBy: true,
+      Cell: _ref8 => {
+        let {
+          row
+        } = _ref8;
         const application = row.original;
         return /*#__PURE__*/React__default.createElement("span", {
           className: "link"
@@ -8279,11 +8317,11 @@ const WSMyApplications = () => {
     }, {
       Header: t("MAKE_PAYMENT"),
       disableSortBy: true,
-      Cell: _ref8 => {
+      Cell: _ref9 => {
         var _application$applicat, _application$applicat2, _application$applicat3, _application$applicat4, _application$applicat5, _application$connecti, _application$property, _application$property2, _application$applicat6, _application$applicat7;
         let {
           row
-        } = _ref8;
+        } = _ref9;
         const application = row.original;
         const isMutation = application === null || application === void 0 ? void 0 : (_application$applicat = application.applicationType) === null || _application$applicat === void 0 ? void 0 : _application$applicat.includes("MUTATION");
         const businessService = application !== null && application !== void 0 && (_application$applicat2 = application.applicationNo) !== null && _application$applicat2 !== void 0 && _application$applicat2.includes("SW") ? application !== null && application !== void 0 && (_application$applicat3 = application.applicationNo) !== null && _application$applicat3 !== void 0 && _application$applicat3.includes("DC") ? "SW" : isMutation ? "SW.MUTATION" : "SW.ONE_TIME_FEE" : application !== null && application !== void 0 && (_application$applicat4 = application.applicationNo) !== null && _application$applicat4 !== void 0 && _application$applicat4.includes("DC") ? "WS" : isMutation ? "WS.MUTATION" : "WS.ONE_TIME_FEE";
@@ -8331,14 +8369,14 @@ const WSMyApplications = () => {
     var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3;
     return {
       ...ob,
-      "sla": 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.filter(pi => pi.businessId == ob.applicationNo)[0]) === null || _workflowDetails$data3 === void 0 ? void 0 : _workflowDetails$data3.businesssServiceSla
+      sla: 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.filter(pi => pi.businessId == ob.applicationNo)[0]) === null || _workflowDetails$data3 === void 0 ? void 0 : _workflowDetails$data3.businesssServiceSla
     };
   })) || [];
   SWapplicationsList = ((_SWapplicationsList = SWapplicationsList) === null || _SWapplicationsList === void 0 ? void 0 : _SWapplicationsList.map(ob => {
     var _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6;
     return {
       ...ob,
-      "sla": workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data4 = workflowDetails.data) === null || _workflowDetails$data4 === void 0 ? void 0 : (_workflowDetails$data5 = _workflowDetails$data4.processInstances) === null || _workflowDetails$data5 === void 0 ? void 0 : (_workflowDetails$data6 = _workflowDetails$data5.filter(pi => pi.businessId == ob.applicationNo)[0]) === null || _workflowDetails$data6 === void 0 ? void 0 : _workflowDetails$data6.businesssServiceSla
+      sla: workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data4 = workflowDetails.data) === null || _workflowDetails$data4 === void 0 ? void 0 : (_workflowDetails$data5 = _workflowDetails$data4.processInstances) === null || _workflowDetails$data5 === void 0 ? void 0 : (_workflowDetails$data6 = _workflowDetails$data5.filter(pi => pi.businessId == ob.applicationNo)[0]) === null || _workflowDetails$data6 === void 0 ? void 0 : _workflowDetails$data6.businesssServiceSla
     };
   })) || [];
   WSapplicationsList = ((_WSapplicationsList2 = WSapplicationsList) === null || _WSapplicationsList2 === void 0 ? void 0 : _WSapplicationsList2.filter(ob => (ob === null || ob === void 0 ? void 0 : ob.applicationType) !== "MODIFY_WATER_CONNECTION")) || [];
@@ -8415,8 +8453,8 @@ const WSMyApplications = () => {
       label: "SEWERAGE",
       count: sewerageCount,
       color: "#F59E0B"
-    }, ...Object.entries(statusCounts).map((_ref9, idx) => {
-      let [status, count] = _ref9;
+    }, ...Object.entries(statusCounts).map((_ref0, idx) => {
+      let [status, count] = _ref0;
       const colors = ["#10B981", "#A855F7", "#EF4444", "#64748B", "#F97316", "#06B6D4"];
       return {
         label: status === "UNKNOWN" ? "UNKNOWN" : `CS_${status}`,
@@ -9800,7 +9838,7 @@ const getWSDisconectionAcknowledgementData = function (application, property, te
 };
 
 const WSDisconnectionResponse = props => {
-  var _filters$applicationN;
+  var _filters$applicationN2;
   const {
     t
   } = reactI18next.useTranslation();
@@ -9813,13 +9851,19 @@ const WSDisconnectionResponse = props => {
     const PDFdata = getWSDisconectionAcknowledgementData(disconnectionRes, disconnectionData === null || disconnectionData === void 0 ? void 0 : disconnectionData.propertyDetails, disconnectionRes === null || disconnectionRes === void 0 ? void 0 : disconnectionRes.tenantId, t);
     PDFdata.then(res => Digit.Utils.pdf.generatev1(res));
   };
+  const onMakePayment = () => {
+    var _filters$applicationN;
+    const isWater = filters === null || filters === void 0 ? void 0 : (_filters$applicationN = filters.applicationNumber) === null || _filters$applicationN === void 0 ? void 0 : _filters$applicationN.includes("WS");
+    const businessService = isWater ? "WS.DISCONNECTION" : "SW.DISCONNECTION";
+    history.push(`/digit-ui/employee/payment/collect/${businessService}/${filters === null || filters === void 0 ? void 0 : filters.applicationNumber}/${tenantId}?tenantId=${tenantId}&ISWSAPP&applicationNumber=${filters === null || filters === void 0 ? void 0 : filters.applicationNumber}&IsDisconnectionFlow=true`);
+  };
   const onSubmit = () => {
     history.push(`/digit-ui/employee`);
   };
   return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Banner, {
     message: t("WS_APPLICATION_SUBMITTED_SUCCESSFULLY_LABEL"),
     applicationNumber: filters === null || filters === void 0 ? void 0 : filters.applicationNumber,
-    info: filters !== null && filters !== void 0 && (_filters$applicationN = filters.applicationNumber) !== null && _filters$applicationN !== void 0 && _filters$applicationN.includes("WS") ? t("WS_WATER_APPLICATION_NUMBER_LABEL") : t("WS_SEWERAGE_APPLICATION_NUMBER_LABEL"),
+    info: filters !== null && filters !== void 0 && (_filters$applicationN2 = filters.applicationNumber) !== null && _filters$applicationN2 !== void 0 && _filters$applicationN2.includes("WS") ? t("WS_WATER_APPLICATION_NUMBER_LABEL") : t("WS_SEWERAGE_APPLICATION_NUMBER_LABEL"),
     successful: true,
     style: {
       padding: "10px"
@@ -9863,6 +9907,12 @@ const WSDisconnectionResponse = props => {
       alignItems: "baseline"
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: t("COMMON_MAKE_PAYMENT"),
+    onSubmit: onMakePayment,
+    style: {
+      margin: "10px 10px 0px 0px"
+    }
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("CORE_COMMON_GO_TO_HOME"),
     onSubmit: onSubmit,
     style: {
@@ -11809,7 +11859,7 @@ const BILLSBreadCrumbs = _ref => {
   }));
 };
 const App$1 = _ref2 => {
-  var _Digit, _Digit$ComponentRegis, _Digit2, _Digit2$ComponentRegi, _Digit3, _Digit3$ComponentRegi, _Digit4, _Digit4$ComponentRegi, _Digit5, _Digit5$ComponentRegi, _Digit6, _Digit6$ComponentRegi, _Digit7, _Digit7$ComponentRegi, _Digit8, _Digit8$ComponentRegi, _Digit9, _Digit9$ComponentRegi, _Digit0, _Digit0$ComponentRegi, _Digit1, _Digit1$ComponentRegi, _Digit10, _Digit10$ComponentReg, _Digit11, _Digit11$ComponentReg, _Digit12, _Digit12$ComponentReg, _Digit13, _Digit13$ComponentReg, _Digit14, _Digit14$ComponentReg, _Digit15, _Digit15$ComponentReg, _Digit16, _Digit16$ComponentReg, _Digit17, _Digit17$ComponentReg, _Digit18, _Digit18$ComponentReg, _Digit19, _Digit19$ComponentReg, _Digit20, _Digit20$ComponentReg, _Digit21, _Digit21$ComponentReg, _Digit22, _Digit22$ComponentReg, _Digit23, _Digit23$ComponentReg, _Digit24, _Digit24$ComponentReg, _Digit25, _Digit25$ComponentReg, _Digit26, _Digit26$ComponentReg, _Digit27, _Digit27$ComponentReg, _Digit28, _Digit28$ComponentReg, _Digit29, _Digit29$ComponentReg, _Digit30, _Digit30$ComponentReg;
+  var _Digit, _Digit$ComponentRegis, _Digit2, _Digit2$ComponentRegi, _Digit3, _Digit3$ComponentRegi, _Digit4, _Digit4$ComponentRegi, _Digit5, _Digit5$ComponentRegi, _Digit6, _Digit6$ComponentRegi, _Digit7, _Digit7$ComponentRegi, _Digit8, _Digit8$ComponentRegi, _Digit9, _Digit9$ComponentRegi, _Digit0, _Digit0$ComponentRegi, _Digit1, _Digit1$ComponentRegi, _Digit10, _Digit10$ComponentReg, _Digit11, _Digit11$ComponentReg, _Digit12, _Digit12$ComponentReg, _Digit13, _Digit13$ComponentReg, _Digit14, _Digit14$ComponentReg, _Digit15, _Digit15$ComponentReg, _Digit16, _Digit16$ComponentReg, _Digit17, _Digit17$ComponentReg, _Digit18, _Digit18$ComponentReg, _Digit19, _Digit19$ComponentReg, _Digit20, _Digit20$ComponentReg, _Digit21, _Digit21$ComponentReg, _Digit22, _Digit22$ComponentReg, _Digit23, _Digit23$ComponentReg, _Digit24, _Digit24$ComponentReg, _Digit25, _Digit25$ComponentReg, _Digit26, _Digit26$ComponentReg, _Digit27, _Digit27$ComponentReg, _Digit28, _Digit28$ComponentReg, _Digit29, _Digit29$ComponentReg, _Digit30, _Digit30$ComponentReg, _Digit31, _Digit31$ComponentReg;
   let {
     path
   } = _ref2;
@@ -11887,7 +11937,8 @@ const App$1 = _ref2 => {
   const CPTCreateProperty = (_Digit28 = Digit) === null || _Digit28 === void 0 ? void 0 : (_Digit28$ComponentReg = _Digit28.ComponentRegistryService) === null || _Digit28$ComponentReg === void 0 ? void 0 : _Digit28$ComponentReg.getComponent("CPTCreateProperty");
   const CPTAcknowledgement = (_Digit29 = Digit) === null || _Digit29 === void 0 ? void 0 : (_Digit29$ComponentReg = _Digit29.ComponentRegistryService) === null || _Digit29$ComponentReg === void 0 ? void 0 : _Digit29$ComponentReg.getComponent("CPTAcknowledgement");
   const WSInfoPage = (_Digit30 = Digit) === null || _Digit30 === void 0 ? void 0 : (_Digit30$ComponentReg = _Digit30.ComponentRegistryService) === null || _Digit30$ComponentReg === void 0 ? void 0 : _Digit30$ComponentReg.getComponent("WSInfoPage");
-  const locationCheck = window.location.href.includes("/employee/ws/new-application") || window.location.href.includes("/employee/ws/modify-application") || window.location.href.includes("/employee/ws/mutation-application") || window.location.href.includes("/employee/ws/edit-application") || window.location.href.includes("/employee/ws/activate-connection") || window.location.href.includes("/employee/ws/application-details") || window.location.href.includes("/employee/ws/modify-details") || window.location.href.includes("/employee/ws/ws-response") || window.location.href.includes("/employee/ws/new-disconnection/application-form") || window.location.href.includes("/employee/ws/new-disconnection/k-number") || window.location.href.includes("/employee/ws/new-disconnection/consumer-details") || window.location.href.includes("/employee/ws/ws-disconnection-response") || window.location.href.includes("/employee/ws/consumption-details") || window.location.href.includes("/employee/ws/edit-disconnection-application") || window.location.href.includes("/employee/ws/config-by-disconnection-application") || window.location.href.includes("/employee/ws/resubmit-disconnection-application") || window.location.href.includes("/employee/ws/water/bulk-bill");
+  const WSExecuteDisconnection = (_Digit31 = Digit) === null || _Digit31 === void 0 ? void 0 : (_Digit31$ComponentReg = _Digit31.ComponentRegistryService) === null || _Digit31$ComponentReg === void 0 ? void 0 : _Digit31$ComponentReg.getComponent("WSExecuteDisconnection");
+  const locationCheck = window.location.href.includes("/employee/ws/new-application") || window.location.href.includes("/employee/ws/modify-application") || window.location.href.includes("/employee/ws/mutation-application") || window.location.href.includes("/employee/ws/edit-application") || window.location.href.includes("/employee/ws/activate-connection") || window.location.href.includes("/employee/ws/application-details") || window.location.href.includes("/employee/ws/modify-details") || window.location.href.includes("/employee/ws/ws-response") || window.location.href.includes("/employee/ws/new-disconnection/application-form") || window.location.href.includes("/employee/ws/new-disconnection/k-number") || window.location.href.includes("/employee/ws/new-disconnection/consumer-details") || window.location.href.includes("/employee/ws/ws-disconnection-response") || window.location.href.includes("/employee/ws/consumption-details") || window.location.href.includes("/employee/ws/edit-disconnection-application") || window.location.href.includes("/employee/ws/config-by-disconnection-application") || window.location.href.includes("/employee/ws/resubmit-disconnection-application") || window.location.href.includes("/employee/ws/execute-disconnection") || window.location.href.includes("/employee/ws/water/bulk-bill");
   const locationCheckReqDocs = window.location.href.includes("/employee/ws/create-application") || window.location.href.includes("/employee/ws/new-disconnection/docsrequired");
   return /*#__PURE__*/React__default.createElement("div", {
     className: "app-container"
@@ -12102,6 +12153,9 @@ const App$1 = _ref2 => {
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.PrivateRoute, {
     path: `${path}/zro-verification-details`,
     component: () => /*#__PURE__*/React__default.createElement(WSZROVerificationDetails, null)
+  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.PrivateRoute, {
+    path: `${path}/execute-disconnection`,
+    component: WSExecuteDisconnection
   }))))));
 };
 
@@ -18826,7 +18880,7 @@ function SelectDocument(_ref2) {
     }
   };
   React.useEffect(() => {
-    if (selectedDocument !== null && selectedDocument !== void 0 && selectedDocument.code) {
+    if (selectedDocument !== null && selectedDocument !== void 0 && selectedDocument.code && !isOther) {
       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));
         if ((uploadedFile === null || uploadedFile === void 0 ? void 0 : uploadedFile.length) === 0 || uploadedFile === null) {
@@ -19162,6 +19216,21 @@ 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;
+      });
       setUploadedFile(null);
       setFile(null);
       setSelectedDocument(doc !== null && doc !== void 0 && doc.hasDropdown ? {} : doc);
@@ -19915,54 +19984,70 @@ const WSDisconnectionKNumber = _ref => {
           businessService: "WS"
         }).catch(() => null)).then(function (wsResponse) {
           var _waterResponse$WaterC;
-          function _temp2() {
-            var _connection, _connection$connectio, _connection$connectio2, _connection2;
-            if (!connection) {
-              setIsLoading(false);
-              setShowToast({
-                key: "error",
-                message: "Active connection not found for the given K Number"
+          function _temp3() {
+            var _connection4, _connection5;
+            function _temp(propertyResponse) {
+              var _propertyResponse$Pro, _connection, _connection$connectio, _connection$connectio2, _connection2;
+              const property = propertyResponse === null || propertyResponse === void 0 ? void 0 : (_propertyResponse$Pro = propertyResponse.Properties) === null || _propertyResponse$Pro === void 0 ? void 0 : _propertyResponse$Pro[0];
+              if (property) connection = {
+                ...connection,
+                property
+              };
+              const fetchedMobileNumber = ((_connection = connection) === null || _connection === void 0 ? void 0 : (_connection$connectio = _connection.connectionHolders) === null || _connection$connectio === void 0 ? void 0 : (_connection$connectio2 = _connection$connectio[0]) === null || _connection$connectio2 === void 0 ? void 0 : _connection$connectio2.mobileNumber) || ((_connection2 = connection) === null || _connection2 === void 0 ? void 0 : _connection2.mobileNumber);
+              if (!fetchedMobileNumber || fetchedMobileNumber.length !== 10) {
+                setIsLoading(false);
+                setShowToast({
+                  key: "error",
+                  message: "No valid registered mobile number found for this connection"
+                });
+                return;
+              }
+              const userType = Digit.UserService.getType().toUpperCase();
+              const payload = {
+                otp: {
+                  mobileNumber: fetchedMobileNumber,
+                  tenantId: "dl",
+                  type: "register",
+                  userType: "EMPLOYEE"
+                }
+              };
+              return Promise.resolve(Digit.UserService.sendOtp(payload, "dl")).then(function () {
+                var _connection3;
+                const existingData = Digit.SessionStorage.get("WS_DISCONNECTION") || {};
+                connection.serviceType = detectedServiceType;
+                Digit.SessionStorage.set("WS_DISCONNECTION", {
+                  ...existingData,
+                  kNumber: trimmed,
+                  serviceType: detectedServiceType,
+                  applicationData: connection,
+                  connectionNo: (_connection3 = connection) === null || _connection3 === void 0 ? void 0 : _connection3.connectionNo
+                });
+                setIsLoading(false);
+                history.push(match.path.replace("k-number", "consumer-details"), {
+                  connection
+                });
               });
-              return;
             }
-            const fetchedMobileNumber = ((_connection = connection) === null || _connection === void 0 ? void 0 : (_connection$connectio = _connection.connectionHolders) === null || _connection$connectio === void 0 ? void 0 : (_connection$connectio2 = _connection$connectio[0]) === null || _connection$connectio2 === void 0 ? void 0 : _connection$connectio2.mobileNumber) || ((_connection2 = connection) === null || _connection2 === void 0 ? void 0 : _connection2.mobileNumber);
-            if (!fetchedMobileNumber || fetchedMobileNumber.length !== 10) {
+            if (!connection) {
               setIsLoading(false);
               setShowToast({
                 key: "error",
-                message: "No valid registered mobile number found for this connection"
+                message: "Active connection not found for the given K Number"
               });
               return;
             }
-            const userType = Digit.UserService.getType().toUpperCase();
-            const payload = {
-              otp: {
-                mobileNumber: fetchedMobileNumber,
-                tenantId: "dl",
-                type: "register",
-                userType: userType
-              }
-            };
-            return Promise.resolve(Digit.UserService.sendOtp(payload, "dl")).then(function () {
-              var _connection3;
-              const existingData = Digit.SessionStorage.get("WS_DISCONNECTION") || {};
-              connection.serviceType = detectedServiceType;
-              Digit.SessionStorage.set("WS_DISCONNECTION", {
-                ...existingData,
-                kNumber: trimmed,
-                serviceType: detectedServiceType,
-                applicationData: connection,
-                connectionNo: (_connection3 = connection) === null || _connection3 === void 0 ? void 0 : _connection3.connectionNo
-              });
-              setIsLoading(false);
-              history.push(match.path.replace("k-number", "consumer-details"), {
-                connection
-              });
-            });
+            const _connection$propertyI = (_connection4 = connection) === null || _connection4 === void 0 ? void 0 : _connection4.propertyId;
+            return _connection$propertyI ? Promise.resolve(Digit.PTService.search({
+              tenantId: ((_connection5 = connection) === null || _connection5 === void 0 ? void 0 : _connection5.tenantId) || tenantId,
+              filters: {
+                propertyIds: connection.propertyId
+              },
+              auth: true
+            }).catch(() => null)).then(_temp) : _temp(null);
           }
           const waterResponse = (wsResponse === null || wsResponse === void 0 ? void 0 : wsResponse.data) || wsResponse;
           let connection = waterResponse === null || waterResponse === void 0 ? void 0 : (_waterResponse$WaterC = waterResponse.WaterConnection) === null || _waterResponse$WaterC === void 0 ? void 0 : _waterResponse$WaterC.find(c => c.applicationStatus === "CONNECTION_ACTIVATED");
-          const _temp = function () {
+          const _temp2 = function () {
             if (!connection) {
               return Promise.resolve(Digit.WSService.search({
                 tenantId,
@@ -19976,7 +20061,7 @@ const WSDisconnectionKNumber = _ref => {
               });
             }
           }();
-          return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+          return _temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2);
         });
       }, function (err) {
         var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
@@ -23593,7 +23678,7 @@ const BannerPicker = props => {
   });
 };
 const WSDisconnectAcknowledgement = () => {
-  var _disconnectionData$Di;
+  var _disconnectionData$Di4;
   const {
     t
   } = reactI18next.useTranslation();
@@ -23603,6 +23688,17 @@ const WSDisconnectAcknowledgement = () => {
     const PDFdata = getWSDisconectionAcknowledgementData(disconnectionRes, disconnectionData === null || disconnectionData === void 0 ? void 0 : disconnectionData.property, disconnectionRes === null || disconnectionRes === void 0 ? void 0 : disconnectionRes.tenantId, t);
     PDFdata.then(res => Digit.Utils.pdf.generatev1(res));
   };
+  const getPaymentUrl = () => {
+    var _disconnectionData$Di, _disconnectionData$Di2, _disconnectionData$Di3, _disconnectionData$pr, _disconnectionData$pr2;
+    const appNo = disconnectionData === null || disconnectionData === void 0 ? void 0 : (_disconnectionData$Di = disconnectionData.DisconnectionResponse) === null || _disconnectionData$Di === void 0 ? void 0 : _disconnectionData$Di.applicationNo;
+    const connNo = disconnectionData === null || disconnectionData === void 0 ? void 0 : (_disconnectionData$Di2 = disconnectionData.DisconnectionResponse) === null || _disconnectionData$Di2 === void 0 ? void 0 : _disconnectionData$Di2.connectionNo;
+    const isWater = appNo === null || appNo === void 0 ? void 0 : appNo.includes("WS");
+    const businessService = isWater ? "WS.DISCONNECTION" : "SW.DISCONNECTION";
+    const formattedConnNo = connNo ? connNo.split("/").join("+") : "";
+    const tenantId = disconnectionData === null || disconnectionData === void 0 ? void 0 : (_disconnectionData$Di3 = disconnectionData.DisconnectionResponse) === null || _disconnectionData$Di3 === void 0 ? void 0 : _disconnectionData$Di3.tenantId;
+    const ownerName = disconnectionData === null || disconnectionData === void 0 ? void 0 : (_disconnectionData$pr = disconnectionData.property) === null || _disconnectionData$pr === void 0 ? void 0 : (_disconnectionData$pr2 = _disconnectionData$pr.owners) === null || _disconnectionData$pr2 === void 0 ? void 0 : _disconnectionData$pr2.map(o => o.name).join(",");
+    return `/digit-ui/citizen/payment/my-bills/${businessService}/${formattedConnNo}?workflow=WNS&tenantId=${tenantId}&ConsumerName=${ownerName}&isDisoconnectFlow=true&consumerCode=${appNo}`;
+  };
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
     style: {
       padding: "10px"
@@ -23610,11 +23706,19 @@ const WSDisconnectAcknowledgement = () => {
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, null, /*#__PURE__*/React__default.createElement(BannerPicker, {
     isSuccess: true,
     message: t("WS_APPLICATION_COMPLETED_SUCCESSFULLY_LABEL"),
-    applicationNumber: disconnectionData === null || disconnectionData === void 0 ? void 0 : (_disconnectionData$Di = disconnectionData.DisconnectionResponse) === null || _disconnectionData$Di === void 0 ? void 0 : _disconnectionData$Di.applicationNo
+    applicationNumber: disconnectionData === null || disconnectionData === void 0 ? void 0 : (_disconnectionData$Di4 = disconnectionData.DisconnectionResponse) === null || _disconnectionData$Di4 === void 0 ? void 0 : _disconnectionData$Di4.applicationNo
   }), " ", /*#__PURE__*/React__default.createElement("successSvg", null)), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardText, null, t('WS_DISCONNECTION_APPLICATION_SUCC_MSG')), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("WS_DOWNLOAD_ACK_FORM"),
     onSubmit: handleDownloadPdf
   }), /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+    to: getPaymentUrl()
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
+    label: t("COMMON_MAKE_PAYMENT"),
+    style: {
+      marginTop: "10px",
+      marginBottom: "10px"
+    }
+  })), /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
     to: `/digit-ui/citizen`
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.LinkButton, {
     label: t("CORE_COMMON_GO_TO_HOME"),
@@ -24333,7 +24437,7 @@ const WSDeclaration = _ref => {
 };
 
 const WSDjbEmployee = _ref => {
-  var _formData$djbEmployee, _formData$additionalD, _formData$djbEmployee2, _formData$additionalD2, _formData$djbEmployee3, _formData$additionalD3, _formData$djbEmployee4, _formData$additionalD4, _formData$djbEmployee5, _formData$additionalD5;
+  var _formData$djbEmployee, _formData$additionalD, _formData$djbEmployee2, _formData$additionalD2, _formData$djbEmployee3, _formData$additionalD3, _formData$djbEmployee4, _formData$additionalD4, _formData$djbEmployee5, _formData$additionalD5, _formData$dueVerifica;
   let {
     config,
     onSelect,
@@ -24615,6 +24719,115 @@ const WSDjbEmployee = _ref => {
       fontSize: "18px"
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.RemoveIcon, null)))))))));
+  const DueVerificationContent = (formData === null || formData === void 0 ? void 0 : (_formData$dueVerifica = formData.dueVerification) === null || _formData$dueVerifica === void 0 ? void 0 : _formData$dueVerifica.length) > 0 ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.CollapsibleCardPage, {
+    title: t("WS_DUE_VERIFICATION_DETAILS"),
+    defaultOpen: true
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      overflowX: "auto",
+      marginTop: "10px",
+      marginBottom: "30px",
+      width: "100%"
+    }
+  }, /*#__PURE__*/React__default.createElement("table", {
+    style: {
+      width: "100%",
+      textAlign: "left",
+      borderCollapse: "collapse",
+      border: "1px solid #e0e0e0"
+    }
+  }, /*#__PURE__*/React__default.createElement("thead", null, /*#__PURE__*/React__default.createElement("tr", {
+    style: {
+      backgroundColor: "#f4f7fb",
+      borderBottom: "2px solid #e0e0e0"
+    }
+  }, /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("K No.")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Full Name")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Full Address")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Due Amount")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Total Amount")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Remarks")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("ABG_COMMON_TABLE_COL_ACTION")))), /*#__PURE__*/React__default.createElement("tbody", null, formData.dueVerification.map((dueItem, index) => {
+    var _formData$serviceName, _formData$application, _dueItem$kno;
+    return /*#__PURE__*/React__default.createElement("tr", {
+      key: `due-${index}`,
+      style: {
+        borderBottom: "1px solid #e0e0e0"
+      }
+    }, /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, (dueItem === null || dueItem === void 0 ? void 0 : dueItem.kno) || t("CS_NA")), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, (dueItem === null || dueItem === void 0 ? void 0 : dueItem.fullName) || t("CS_NA")), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, (dueItem === null || dueItem === void 0 ? void 0 : dueItem.fullAddress) || t("CS_NA")), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, (dueItem === null || dueItem === void 0 ? void 0 : dueItem.dueAmount) || t("CS_NA")), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, (dueItem === null || dueItem === void 0 ? void 0 : dueItem.totalAmount) || t("CS_NA")), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, (dueItem === null || dueItem === void 0 ? void 0 : dueItem.remarks) || t("CS_NA")), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, Number(dueItem === null || dueItem === void 0 ? void 0 : dueItem.dueAmount) > 0 || Number(dueItem === null || dueItem === void 0 ? void 0 : dueItem.totalAmount) > 0 ? /*#__PURE__*/React__default.createElement("span", {
+      className: "link"
+    }, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+      to: {
+        pathname: `/digit-ui/citizen/payment/my-bills/${(formData === null || formData === void 0 ? void 0 : (_formData$serviceName = formData.serviceName) === null || _formData$serviceName === void 0 ? void 0 : _formData$serviceName.code) === "WATER" || formData !== null && formData !== void 0 && (_formData$application = formData.applicationType) !== null && _formData$application !== void 0 && _formData$application.includes("WATER") ? "WS" : "SW"}/${dueItem === null || dueItem === void 0 ? void 0 : (_dueItem$kno = dueItem.kno) === null || _dueItem$kno === void 0 ? void 0 : _dueItem$kno.replaceAll("/", "+")}`,
+        search: `?workflow=WNS&tenantId=${tenantId}&ConsumerName=${dueItem === null || dueItem === void 0 ? void 0 : dueItem.fullName}&consumerCode=${dueItem === null || dueItem === void 0 ? void 0 : dueItem.kno}`,
+        state: {
+          fromApplicationDetails: true
+        }
+      }
+    }, t("MAKE_PAYMENT"))) : /*#__PURE__*/React__default.createElement("span", {
+      style: {
+        color: "green",
+        fontWeight: "bold"
+      }
+    }, t("BILL_ALREADY_PAID"))));
+  }))))) : null;
   if (userType === "citizen") {
     return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(Timeline, {
       currentStep: 2
@@ -24629,9 +24842,22 @@ const WSDjbEmployee = _ref => {
         marginTop: "-30px",
         marginBottom: "-30px"
       }
+    }, FormContent, DueVerificationContent ? /*#__PURE__*/React__default.createElement("div", {
+      style: {
+        marginTop: "24px"
+      }
+    }, DueVerificationContent) : null), /*#__PURE__*/React__default.createElement("div", {
+      style: {
+        marginTop: "-30px",
+        marginBottom: "-30px"
+      }
     }, FormContent)));
   }
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, FormContent);
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, FormContent, DueVerificationContent ? /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      marginTop: "24px"
+    }
+  }, DueVerificationContent) : null);
 };
 
 const WSDivyangjan = _ref => {
@@ -28076,11 +28302,6 @@ const WSCard = () => {
       label: t("WATER_INBOX"),
       link: `/digit-ui/employee/ws/water/inbox`,
       roles: ["WS_CEMP", "WS_APPROVER", "WS_FIELD_INSPECTOR", "WS_DOC_VERIFIER", "WS_CLERK"]
-    }, {
-      count: isWSInboxLoading ? "-" : wsData === null || wsData === void 0 ? void 0 : wsData.totalCount,
-      label: t("SEWERAGE_INBOX"),
-      link: `/digit-ui/employee/ws/sewerage/inbox`,
-      roles: ["SW_CEMP", "SW_APPROVER", "SW_FIELD_INSPECTOR", "SW_DOC_VERIFIER", "SW_CLERK"]
     }, ...links, {
       label: t("WS_WATER_CONNECTION_SEARCH_LABEL"),
       link: `/digit-ui/employee/ws/water/search-connection`,
@@ -31601,7 +31822,7 @@ const TOKEN$1 = {
 const StatusPill = _ref => {
   let {
     label,
-    isActive
+    isGreen
   } = _ref;
   return /*#__PURE__*/React__default.createElement("span", {
     style: {
@@ -31612,9 +31833,9 @@ const StatusPill = _ref => {
       textTransform: "uppercase",
       padding: "2px 10px",
       borderRadius: "999px",
-      background: isActive ? "rgba(0,195,255,0.15)" : "rgba(0,230,118,0.12)",
-      color: isActive ? TOKEN$1.active : TOKEN$1.done,
-      border: `1px solid ${isActive ? TOKEN$1.active : TOKEN$1.done}`,
+      background: !isGreen ? "rgba(0,195,255,0.15)" : "rgba(0,230,118,0.12)",
+      color: !isGreen ? TOKEN$1.active : TOKEN$1.done,
+      border: `1px solid ${!isGreen ? TOKEN$1.active : TOKEN$1.done}`,
       lineHeight: "18px"
     }
   }, label);
@@ -31630,8 +31851,10 @@ const StepCard = _ref2 => {
   } = _ref2;
   const [expanded, setExpanded] = React.useState(isActive);
   const stateLabel = checkpoint.state ? t(`CS_${checkpoint.state}`) : "NA";
-  const dotColor = isActive ? TOKEN$1.active : TOKEN$1.done;
-  const glowColor = isActive ? "0 0 14px rgba(0,195,255,0.5)" : "0 0 10px rgba(0,230,118,0.35)";
+  const isTerminal = (checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.state) === "CONNECTION_ACTIVATED" || (checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.applicationStatus) === "CONNECTION_ACTIVATED" || (checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.status) === "ACTIVE" || (checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint.isTerminateState);
+  const isGreen = !isActive || isTerminal;
+  const dotColor = !isGreen ? TOKEN$1.active : TOKEN$1.done;
+  const glowColor = !isGreen ? "0 0 14px rgba(0,195,255,0.5)" : "0 0 10px rgba(0,230,118,0.35)";
   return /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: "flex",
@@ -31657,9 +31880,23 @@ const StepCard = _ref2 => {
       border: `2px solid ${dotColor}`,
       zIndex: 1,
       flexShrink: 0,
-      marginTop: "16px"
+      marginTop: "16px",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center"
     }
-  }), /*#__PURE__*/React__default.createElement("div", {
+  }, isGreen && /*#__PURE__*/React__default.createElement("svg", {
+    width: "10",
+    height: "10",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    stroke: "white",
+    strokeWidth: "4",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }, /*#__PURE__*/React__default.createElement("polyline", {
+    points: "20 6 9 17 4 12"
+  }))), /*#__PURE__*/React__default.createElement("div", {
     style: {
       width: "2px",
       flex: 1,
@@ -31715,8 +31952,8 @@ const StepCard = _ref2 => {
       flexShrink: 0
     }
   }, /*#__PURE__*/React__default.createElement(StatusPill, {
-    label: isActive ? "Active" : "Done",
-    isActive: isActive
+    label: isActive ? "ACTIVE" : "DONE",
+    isGreen: isGreen
   }), /*#__PURE__*/React__default.createElement("span", {
     style: {
       color: TOKEN$1.textMut,
@@ -33005,33 +33242,33 @@ 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$SewerageConnect31, _data$SewerageConnect32, _data$WaterConnection37, _data$WaterConnection38, _data$SewerageConnect33, _data$SewerageConnect34, _data$WaterConnection39, _data$WaterConnection40, _data$SewerageConnect35, _data$SewerageConnect36, _data$WaterConnection41, _data$WaterConnection42, _data$SewerageConnect37, _data$SewerageConnect38, _data$WaterConnection43, _data$WaterConnection44, _data$SewerageConnect39, _data$WaterConnection45, _data$WaterConnection46, _data$SewerageConnect40, _data$SewerageConnect41, _data$WaterConnection47, _data$WaterConnection48, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection49, _data$WaterConnection50, _data$SewerageConnect44, _data$SewerageConnect45, _data$WaterConnection51, _data$WaterConnection52, _data$SewerageConnect46, _data$SewerageConnect47, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect48, _data$SewerageConnect49, _data$WaterConnection55, _data$WaterConnection56, _data$SewerageConnect50, _data$SewerageConnect51, _data$WaterConnection57, _data$WaterConnection58, _data$SewerageConnect52, _data$SewerageConnect53, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect54, _data$SewerageConnect55, _data$WaterConnection61, _data$WaterConnection62, _data$SewerageConnect56, _data$SewerageConnect57, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect58, _data$SewerageConnect59, _data$WaterConnection65, _data$WaterConnection66, _data$WaterConnection67, _data$WaterConnection68, _data$SewerageConnect60, _data$SewerageConnect61, _data$SewerageConnect62, _data$SewerageConnect63, _connectionDetails$se, _connectionDetails$se2, _connectionDetails$ap, _connectionDetails$ap2, _connectionDetails$do, _connectionDetails$de, _connectionDetails$de2, _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, _data$WaterConnection76, _data$WaterConnection77, _data$WaterConnection78, _data$WaterConnection79, _data$SewerageConnect71, _data$SewerageConnect72, _data$SewerageConnect73, _data$SewerageConnect74, _data$WaterConnection80, _data$WaterConnection81, _data$WaterConnection82, _data$WaterConnection83, _data$SewerageConnect75, _data$SewerageConnect76, _data$SewerageConnect77, _data$SewerageConnect78, _data$WaterConnection84, _data$WaterConnection85, _data$WaterConnection86, _data$WaterConnection87, _data$SewerageConnect79, _data$SewerageConnect80, _data$SewerageConnect81, _data$SewerageConnect82, _data$WaterConnection88, _data$WaterConnection89, _data$WaterConnection90, _data$WaterConnection91, _data$SewerageConnect83, _data$SewerageConnect84, _data$SewerageConnect85, _data$SewerageConnect86, _data$WaterConnection92, _data$WaterConnection93, _data$WaterConnection94, _data$WaterConnection95, _data$SewerageConnect87, _data$SewerageConnect88, _data$SewerageConnect89, _data$SewerageConnect90, _data$WaterConnection96, _data$WaterConnection97, _data$WaterConnection98, _data$WaterConnection99, _data$SewerageConnect91, _data$SewerageConnect92, _data$SewerageConnect93, _data$SewerageConnect94, _data$WaterConnection100, _data$WaterConnection101, _data$WaterConnection102, _data$WaterConnection103, _data$SewerageConnect95, _data$SewerageConnect96, _data$SewerageConnect97, _data$SewerageConnect98, _data$WaterConnection104, _data$WaterConnection105, _data$WaterConnection106, _data$WaterConnection107, _data$SewerageConnect99, _data$SewerageConnect100, _data$SewerageConnect101, _data$SewerageConnect102, _data$WaterConnection108, _data$WaterConnection109, _data$WaterConnection110, _data$WaterConnection111, _data$SewerageConnect103, _data$SewerageConnect104, _data$SewerageConnect105, _data$SewerageConnect106, _data$WaterConnection112, _data$WaterConnection113, _data$WaterConnection114, _data$WaterConnection115, _data$SewerageConnect107, _data$SewerageConnect108, _data$SewerageConnect109, _data$SewerageConnect110, _data$WaterConnection116, _data$WaterConnection117, _data$WaterConnection118, _data$WaterConnection119, _data$SewerageConnect111, _data$SewerageConnect112, _data$SewerageConnect113, _data$SewerageConnect114, _data$WaterConnection120, _data$WaterConnection121, _data$WaterConnection122, _data$WaterConnection123, _data$SewerageConnect115, _data$SewerageConnect116, _data$SewerageConnect117, _data$SewerageConnect118, _data$WaterConnection124, _data$WaterConnection125, _data$WaterConnection126, _data$WaterConnection127, _data$SewerageConnect119, _data$SewerageConnect120, _data$SewerageConnect121, _data$SewerageConnect122, _data$WaterConnection128, _data$WaterConnection129, _data$WaterConnection130, _data$WaterConnection131, _data$SewerageConnect123, _data$SewerageConnect124, _data$SewerageConnect125, _data$SewerageConnect126, _data$WaterConnection132, _data$WaterConnection133, _data$SewerageConnect127, _data$SewerageConnect128, _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$WaterConnection134, _data$WaterConnection135, _data$SewerageConnect129, _data$SewerageConnect130, _data$WaterConnection136, _data$WaterConnection137, _data$SewerageConnect131, _data$SewerageConnect132, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _propertyAddress$zone3, _propertyAddress$zone4, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _propertyAdditionalDe, _propertyAdditionalDe2, _PTData$Properties9, _PTData$Properties9$, _useDetails$propertyT, _useDetails$propertyT2, _propertyAdditionalDe3, _propertyAdditionalDe4, _PTData$Properties0, _PTData$Properties0$, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _propertyAdditionalDe5, _propertyAdditionalDe6, _useDetails$noOfFloor, _useDetails$noOfFloor2, _PTData$Properties1, _PTData$Properties1$, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _data$WaterConnection138, _data$WaterConnection139, _data$WaterConnection140, _data$WaterConnection141, _data$SewerageConnect133, _data$SewerageConnect134, _data$SewerageConnect135, _data$SewerageConnect136, _data$WaterConnection144, _data$WaterConnection145, _data$WaterConnection146, _data$WaterConnection147, _data$WaterConnection148, _data$WaterConnection149, _data$SewerageConnect139, _data$SewerageConnect140, _data$SewerageConnect141, _data$SewerageConnect142, _data$SewerageConnect143, _data$SewerageConnect144, _data$WaterConnection155, _data$WaterConnection156, _data$WaterConnection157, _data$WaterConnection158, _data$SewerageConnect150, _data$SewerageConnect151, _data$SewerageConnect152, _data$SewerageConnect153, _data$WaterConnection159, _data$WaterConnection160, _data$SewerageConnect154, _data$SewerageConnect155, _data$WaterConnection161, _data$WaterConnection162, _data$SewerageConnect156, _data$SewerageConnect157, _data$WaterConnection163, _data$WaterConnection164, _data$SewerageConnect158, _data$SewerageConnect159, _data$WaterConnection165, _data$WaterConnection166, _data$WaterConnection167, _data$SewerageConnect160, _data$SewerageConnect161, _data$WaterConnection168, _data$WaterConnection169, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection170, _data$WaterConnection171, _data$WaterConnection172, _data$WaterConnection173, _data$SewerageConnect164, _data$SewerageConnect165, _data$SewerageConnect166, _data$SewerageConnect167, _data$WaterConnection174, _data$WaterConnection175, _data$SewerageConnect168, _data$SewerageConnect169, _data$SewerageConnect170, _data$SewerageConnect171, _data$SewerageConnect172, _data$SewerageConnect173, _data$SewerageConnect174, _data$SewerageConnect175, _data$SewerageConnect176, _data$SewerageConnect177, _data$SewerageConnect178, _data$WaterConnection176, _data$WaterConnection177, _data$WaterConnection178, _data$WaterConnection179, _data$WaterConnection180, _data$WaterConnection181, _data$WaterConnection182, _data$WaterConnection183, _data$WaterConnection184;
+  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$SewerageConnect31, _data$SewerageConnect32, _data$WaterConnection37, _data$WaterConnection38, _data$SewerageConnect33, _data$SewerageConnect34, _data$WaterConnection39, _data$WaterConnection40, _data$SewerageConnect35, _data$SewerageConnect36, _data$WaterConnection41, _data$WaterConnection42, _data$SewerageConnect37, _data$SewerageConnect38, _data$WaterConnection43, _data$WaterConnection44, _data$SewerageConnect39, _data$WaterConnection45, _data$WaterConnection46, _data$SewerageConnect40, _data$SewerageConnect41, _data$WaterConnection47, _data$WaterConnection48, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection49, _data$WaterConnection50, _data$SewerageConnect44, _data$SewerageConnect45, _data$WaterConnection51, _data$WaterConnection52, _data$SewerageConnect46, _data$SewerageConnect47, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect48, _data$SewerageConnect49, _data$WaterConnection55, _data$WaterConnection56, _data$SewerageConnect50, _data$SewerageConnect51, _data$WaterConnection57, _data$WaterConnection58, _data$SewerageConnect52, _data$SewerageConnect53, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect54, _data$SewerageConnect55, _data$WaterConnection61, _data$WaterConnection62, _data$SewerageConnect56, _data$SewerageConnect57, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect58, _data$SewerageConnect59, _data$WaterConnection65, _data$WaterConnection66, _data$WaterConnection67, _data$WaterConnection68, _data$SewerageConnect60, _data$SewerageConnect61, _data$SewerageConnect62, _data$SewerageConnect63, _connectionDetails$se, _connectionDetails$se2, _connectionDetails$ap, _connectionDetails$ap2, _connectionDetails$do, _connectionDetails$de, _connectionDetails$de2, _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, _data$WaterConnection76, _data$WaterConnection77, _data$WaterConnection78, _data$WaterConnection79, _data$SewerageConnect71, _data$SewerageConnect72, _data$SewerageConnect73, _data$SewerageConnect74, _data$WaterConnection80, _data$WaterConnection81, _data$WaterConnection82, _data$WaterConnection83, _data$SewerageConnect75, _data$SewerageConnect76, _data$SewerageConnect77, _data$SewerageConnect78, _data$WaterConnection84, _data$WaterConnection85, _data$WaterConnection86, _data$WaterConnection87, _data$SewerageConnect79, _data$SewerageConnect80, _data$SewerageConnect81, _data$SewerageConnect82, _data$WaterConnection88, _data$WaterConnection89, _data$WaterConnection90, _data$WaterConnection91, _data$SewerageConnect83, _data$SewerageConnect84, _data$SewerageConnect85, _data$SewerageConnect86, _data$WaterConnection92, _data$WaterConnection93, _data$WaterConnection94, _data$WaterConnection95, _data$SewerageConnect87, _data$SewerageConnect88, _data$SewerageConnect89, _data$SewerageConnect90, _data$WaterConnection96, _data$WaterConnection97, _data$WaterConnection98, _data$WaterConnection99, _data$SewerageConnect91, _data$SewerageConnect92, _data$SewerageConnect93, _data$SewerageConnect94, _data$WaterConnection100, _data$WaterConnection101, _data$WaterConnection102, _data$WaterConnection103, _data$SewerageConnect95, _data$SewerageConnect96, _data$SewerageConnect97, _data$SewerageConnect98, _data$WaterConnection104, _data$WaterConnection105, _data$WaterConnection106, _data$WaterConnection107, _data$SewerageConnect99, _data$SewerageConnect100, _data$SewerageConnect101, _data$SewerageConnect102, _data$WaterConnection108, _data$WaterConnection109, _data$SewerageConnect103, _data$SewerageConnect104, _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$WaterConnection110, _data$WaterConnection111, _data$SewerageConnect105, _data$SewerageConnect106, _data$WaterConnection112, _data$WaterConnection113, _data$SewerageConnect107, _data$SewerageConnect108, _propertyAddress$city, _propertyAddress$city2, _propertyAddress$loca, _propertyAddress$loca2, _propertyAddress$subL, _propertyAddress$subL2, _propertyAddress$asse, _propertyAddress$asse2, _propertyAddress$bloc, _propertyAddress$bloc2, _propertyAddress$ward, _propertyAddress$ward2, _propertyAddress$zone, _propertyAddress$zone2, _propertyAddress$zone3, _propertyAddress$zone4, _useDetails$categoryT, _useDetails$categoryT2, _useDetails$propertyC, _useDetails$propertyC2, _propertyAdditionalDe, _propertyAdditionalDe2, _PTData$Properties9, _PTData$Properties9$, _useDetails$propertyT, _useDetails$propertyT2, _propertyAdditionalDe3, _propertyAdditionalDe4, _PTData$Properties0, _PTData$Properties0$, _useDetails$WaterConn, _useDetails$WaterConn2, _useDetails$waterConn, _useDetails$waterConn2, _propertyAdditionalDe5, _propertyAdditionalDe6, _useDetails$noOfFloor, _useDetails$noOfFloor2, _PTData$Properties1, _PTData$Properties1$, _useDetails$SelectYea, _useDetails$SelectYea2, _useDetails$SelectYea3, _useDetails$construct, _useDetails$construct2, _applicationData$dueV, _data$WaterConnection114, _data$WaterConnection115, _data$WaterConnection116, _data$WaterConnection117, _data$SewerageConnect109, _data$SewerageConnect110, _data$SewerageConnect111, _data$SewerageConnect112, _data$WaterConnection120, _data$WaterConnection121, _data$WaterConnection122, _data$WaterConnection123, _data$WaterConnection124, _data$WaterConnection125, _data$SewerageConnect115, _data$SewerageConnect116, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$SewerageConnect120, _data$WaterConnection131, _data$WaterConnection132, _data$WaterConnection133, _data$WaterConnection134, _data$SewerageConnect126, _data$SewerageConnect127, _data$SewerageConnect128, _data$SewerageConnect129, _data$WaterConnection135, _data$WaterConnection136, _data$SewerageConnect130, _data$SewerageConnect131, _data$WaterConnection137, _data$WaterConnection138, _data$SewerageConnect132, _data$SewerageConnect133, _data$WaterConnection139, _data$WaterConnection140, _data$SewerageConnect134, _data$SewerageConnect135, _data$WaterConnection141, _data$WaterConnection142, _data$WaterConnection143, _data$SewerageConnect136, _data$SewerageConnect137, _data$WaterConnection144, _data$WaterConnection145, _data$SewerageConnect138, _data$SewerageConnect139, _data$WaterConnection146, _data$WaterConnection147, _data$WaterConnection148, _data$WaterConnection149, _data$SewerageConnect140, _data$SewerageConnect141, _data$SewerageConnect142, _data$SewerageConnect143, _data$WaterConnection150, _data$WaterConnection151, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _data$SewerageConnect147, _data$SewerageConnect148, _data$SewerageConnect149, _data$SewerageConnect150, _data$SewerageConnect151, _data$SewerageConnect152, _data$SewerageConnect153, _data$SewerageConnect154, _data$WaterConnection152, _data$WaterConnection153, _data$WaterConnection154, _data$WaterConnection155, _data$WaterConnection156, _data$WaterConnection157, _data$WaterConnection158, _data$WaterConnection159, _data$WaterConnection160;
   const getDisconnectionNoticeSearch = function () {
     try {
-      var _data$WaterConnection186, _data$WaterConnection187, _data$SewerageConnect180, _data$SewerageConnect181;
+      var _data$WaterConnection162, _data$WaterConnection163, _data$SewerageConnect156, _data$SewerageConnect157;
       let key = "ws-waterdisconnectionnotice";
       let details = {};
       if (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS")) {
-        var _data$WaterConnection185, _PTData$Properties11;
+        var _data$WaterConnection161, _PTData$Properties11;
         details = {
           WaterConnection: [{
-            ...(data === null || data === void 0 ? void 0 : (_data$WaterConnection185 = data.WaterConnection) === null || _data$WaterConnection185 === void 0 ? void 0 : _data$WaterConnection185[0]),
+            ...(data === null || data === void 0 ? void 0 : (_data$WaterConnection161 = data.WaterConnection) === null || _data$WaterConnection161 === void 0 ? void 0 : _data$WaterConnection161[0]),
             property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties11 = PTData.Properties) === null || _PTData$Properties11 === void 0 ? void 0 : _PTData$Properties11[0]
           }]
         };
       } else {
-        var _data$SewerageConnect179, _PTData$Properties12;
+        var _data$SewerageConnect155, _PTData$Properties12;
         key = "ws-seweragedisconnectionnotice";
         details = {
           SewerageConnection: [{
-            ...(data === null || data === void 0 ? void 0 : (_data$SewerageConnect179 = data.SewerageConnections) === null || _data$SewerageConnect179 === void 0 ? void 0 : _data$SewerageConnect179[0]),
+            ...(data === null || data === void 0 ? void 0 : (_data$SewerageConnect155 = data.SewerageConnections) === null || _data$SewerageConnect155 === void 0 ? void 0 : _data$SewerageConnect155[0]),
             property: PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties12 = PTData.Properties) === null || _PTData$Properties12 === void 0 ? void 0 : _PTData$Properties12[0]
           }]
         };
       }
-      return Promise.resolve(Digit.WSService.WSDisconnectionNotice((data === null || data === void 0 ? void 0 : (_data$WaterConnection186 = data.WaterConnection) === null || _data$WaterConnection186 === void 0 ? void 0 : (_data$WaterConnection187 = _data$WaterConnection186[0]) === null || _data$WaterConnection187 === void 0 ? void 0 : _data$WaterConnection187.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect180 = data.SewerageConnections) === null || _data$SewerageConnect180 === void 0 ? void 0 : (_data$SewerageConnect181 = _data$SewerageConnect180[0]) === null || _data$SewerageConnect181 === void 0 ? void 0 : _data$SewerageConnect181.tenantId), details, key)).then(function (response) {
-        var _data$WaterConnection188, _data$WaterConnection189, _data$SewerageConnect182, _data$SewerageConnect183;
-        return Promise.resolve(Digit.PaymentService.printReciept((data === null || data === void 0 ? void 0 : (_data$WaterConnection188 = data.WaterConnection) === null || _data$WaterConnection188 === void 0 ? void 0 : (_data$WaterConnection189 = _data$WaterConnection188[0]) === null || _data$WaterConnection189 === void 0 ? void 0 : _data$WaterConnection189.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect182 = data.SewerageConnections) === null || _data$SewerageConnect182 === void 0 ? void 0 : (_data$SewerageConnect183 = _data$SewerageConnect182[0]) === null || _data$SewerageConnect183 === void 0 ? void 0 : _data$SewerageConnect183.tenantId), {
+      return Promise.resolve(Digit.WSService.WSDisconnectionNotice((data === null || data === void 0 ? void 0 : (_data$WaterConnection162 = data.WaterConnection) === null || _data$WaterConnection162 === void 0 ? void 0 : (_data$WaterConnection163 = _data$WaterConnection162[0]) === null || _data$WaterConnection163 === void 0 ? void 0 : _data$WaterConnection163.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect156 = data.SewerageConnections) === null || _data$SewerageConnect156 === void 0 ? void 0 : (_data$SewerageConnect157 = _data$SewerageConnect156[0]) === null || _data$SewerageConnect157 === void 0 ? void 0 : _data$SewerageConnect157.tenantId), details, key)).then(function (response) {
+        var _data$WaterConnection164, _data$WaterConnection165, _data$SewerageConnect158, _data$SewerageConnect159;
+        return Promise.resolve(Digit.PaymentService.printReciept((data === null || data === void 0 ? void 0 : (_data$WaterConnection164 = data.WaterConnection) === null || _data$WaterConnection164 === void 0 ? void 0 : (_data$WaterConnection165 = _data$WaterConnection164[0]) === null || _data$WaterConnection165 === void 0 ? void 0 : _data$WaterConnection165.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect158 = data.SewerageConnections) === null || _data$SewerageConnect158 === void 0 ? void 0 : (_data$SewerageConnect159 = _data$SewerageConnect158[0]) === null || _data$SewerageConnect159 === void 0 ? void 0 : _data$SewerageConnect159.tenantId), {
           fileStoreIds: response.filestoreIds[0]
         })).then(function (fileStore) {
           window.open(fileStore[response === null || response === void 0 ? void 0 : response.filestoreIds[0]], "_blank");
@@ -33477,77 +33714,14 @@ const WSApplicationDetails = () => {
         isArray: false
       }
     }
-  }), !isMutation && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_OWN_DETAIL_FATHER_OR_HUSBAND_NAME"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection100 = data.WaterConnection) === null || _data$WaterConnection100 === void 0 ? void 0 : (_data$WaterConnection101 = _data$WaterConnection100[0]) === null || _data$WaterConnection101 === void 0 ? void 0 : (_data$WaterConnection102 = _data$WaterConnection101.connectionHolders) === null || _data$WaterConnection102 === void 0 ? void 0 : (_data$WaterConnection103 = _data$WaterConnection102[0]) === null || _data$WaterConnection103 === void 0 ? void 0 : _data$WaterConnection103.fatherOrHusbandName) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect95 = data.SewerageConnections) === null || _data$SewerageConnect95 === void 0 ? void 0 : (_data$SewerageConnect96 = _data$SewerageConnect95[0]) === null || _data$SewerageConnect96 === void 0 ? void 0 : (_data$SewerageConnect97 = _data$SewerageConnect96.connectionHolders) === null || _data$SewerageConnect97 === void 0 ? void 0 : (_data$SewerageConnect98 = _data$SewerageConnect97[0]) === null || _data$SewerageConnect98 === void 0 ? void 0 : _data$SewerageConnect98.fatherOrHusbandName) || t("CS_NA"),
-    textStyle: {
-      whiteSpace: "pre"
-    },
-    privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection104 = data.WaterConnection) === null || _data$WaterConnection104 === void 0 ? void 0 : (_data$WaterConnection105 = _data$WaterConnection104[0]) === null || _data$WaterConnection105 === void 0 ? void 0 : (_data$WaterConnection106 = _data$WaterConnection105.connectionHolders) === null || _data$WaterConnection106 === void 0 ? void 0 : (_data$WaterConnection107 = _data$WaterConnection106[0]) === null || _data$WaterConnection107 === void 0 ? void 0 : _data$WaterConnection107.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect99 = data.SewerageConnections) === null || _data$SewerageConnect99 === void 0 ? void 0 : (_data$SewerageConnect100 = _data$SewerageConnect99[0]) === null || _data$SewerageConnect100 === void 0 ? void 0 : (_data$SewerageConnect101 = _data$SewerageConnect100.connectionHolders) === null || _data$SewerageConnect101 === void 0 ? void 0 : (_data$SewerageConnect102 = _data$SewerageConnect101[0]) === null || _data$SewerageConnect102 === void 0 ? void 0 : _data$SewerageConnect102.uuid,
-      fieldName: "fatherOrHusbandName",
-      model: "WnSConnectionOwner",
-      showValue: false,
-      loadData: {
-        serviceName: serviceType === "WATER" ? "/ws-services/wc/_search" : "/sw-services/swc/_search",
-        requestBody: {},
-        requestParam: {
-          tenantId,
-          applicationNumber: applicationNobyData
-        },
-        jsonPath: serviceType === "WATER" ? "WaterConnection[0].connectionHolders[0].fatherOrHusbandName" : "SewerageConnections[0].connectionHolders[0].fatherOrHusbandName",
-        isArray: false
-      }
-    }
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_OWN_DETAIL_RELATION_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection108 = data.WaterConnection) === null || _data$WaterConnection108 === void 0 ? void 0 : (_data$WaterConnection109 = _data$WaterConnection108[0]) === null || _data$WaterConnection109 === void 0 ? void 0 : (_data$WaterConnection110 = _data$WaterConnection109.connectionHolders) === null || _data$WaterConnection110 === void 0 ? void 0 : (_data$WaterConnection111 = _data$WaterConnection110[0]) === null || _data$WaterConnection111 === void 0 ? void 0 : _data$WaterConnection111.relationship) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect103 = data.SewerageConnections) === null || _data$SewerageConnect103 === void 0 ? void 0 : (_data$SewerageConnect104 = _data$SewerageConnect103[0]) === null || _data$SewerageConnect104 === void 0 ? void 0 : (_data$SewerageConnect105 = _data$SewerageConnect104.connectionHolders) === null || _data$SewerageConnect105 === void 0 ? void 0 : (_data$SewerageConnect106 = _data$SewerageConnect105[0]) === null || _data$SewerageConnect106 === void 0 ? void 0 : _data$SewerageConnect106.relationship) || t("CS_NA"),
-    textStyle: {
-      whiteSpace: "pre"
-    },
-    privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection112 = data.WaterConnection) === null || _data$WaterConnection112 === void 0 ? void 0 : (_data$WaterConnection113 = _data$WaterConnection112[0]) === null || _data$WaterConnection113 === void 0 ? void 0 : (_data$WaterConnection114 = _data$WaterConnection113.connectionHolders) === null || _data$WaterConnection114 === void 0 ? void 0 : (_data$WaterConnection115 = _data$WaterConnection114[0]) === null || _data$WaterConnection115 === void 0 ? void 0 : _data$WaterConnection115.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect107 = data.SewerageConnections) === null || _data$SewerageConnect107 === void 0 ? void 0 : (_data$SewerageConnect108 = _data$SewerageConnect107[0]) === null || _data$SewerageConnect108 === void 0 ? void 0 : (_data$SewerageConnect109 = _data$SewerageConnect108.connectionHolders) === null || _data$SewerageConnect109 === void 0 ? void 0 : (_data$SewerageConnect110 = _data$SewerageConnect109[0]) === null || _data$SewerageConnect110 === void 0 ? void 0 : _data$SewerageConnect110.uuid,
-      fieldName: "relationship",
-      model: "WnSConnection",
-      showValue: false,
-      loadData: {
-        serviceName: serviceType === "WATER" ? "/ws-services/wc/_search" : "/sw-services/swc/_search",
-        requestBody: {},
-        requestParam: {
-          tenantId,
-          applicationNumber: applicationNobyData
-        },
-        jsonPath: serviceType === "WATER" ? "WaterConnection[0].connectionHolders[0].relationship" : "SewerageConnections[0].connectionHolders[0].relationship",
-        isArray: false
-      }
-    }
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
-    label: t("WS_OWN_DETAIL_CROSADD"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection116 = data.WaterConnection) === null || _data$WaterConnection116 === void 0 ? void 0 : (_data$WaterConnection117 = _data$WaterConnection116[0]) === null || _data$WaterConnection117 === void 0 ? void 0 : (_data$WaterConnection118 = _data$WaterConnection117.connectionHolders) === null || _data$WaterConnection118 === void 0 ? void 0 : (_data$WaterConnection119 = _data$WaterConnection118[0]) === null || _data$WaterConnection119 === void 0 ? void 0 : _data$WaterConnection119.correspondenceAddress) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect111 = data.SewerageConnections) === null || _data$SewerageConnect111 === void 0 ? void 0 : (_data$SewerageConnect112 = _data$SewerageConnect111[0]) === null || _data$SewerageConnect112 === void 0 ? void 0 : (_data$SewerageConnect113 = _data$SewerageConnect112.connectionHolders) === null || _data$SewerageConnect113 === void 0 ? void 0 : (_data$SewerageConnect114 = _data$SewerageConnect113[0]) === null || _data$SewerageConnect114 === void 0 ? void 0 : _data$SewerageConnect114.correspondenceAddress) || t("CS_NA"),
-    privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection120 = data.WaterConnection) === null || _data$WaterConnection120 === void 0 ? void 0 : (_data$WaterConnection121 = _data$WaterConnection120[0]) === null || _data$WaterConnection121 === void 0 ? void 0 : (_data$WaterConnection122 = _data$WaterConnection121.connectionHolders) === null || _data$WaterConnection122 === void 0 ? void 0 : (_data$WaterConnection123 = _data$WaterConnection122[0]) === null || _data$WaterConnection123 === void 0 ? void 0 : _data$WaterConnection123.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect115 = data.SewerageConnections) === null || _data$SewerageConnect115 === void 0 ? void 0 : (_data$SewerageConnect116 = _data$SewerageConnect115[0]) === null || _data$SewerageConnect116 === void 0 ? void 0 : (_data$SewerageConnect117 = _data$SewerageConnect116.connectionHolders) === null || _data$SewerageConnect117 === void 0 ? void 0 : (_data$SewerageConnect118 = _data$SewerageConnect117[0]) === null || _data$SewerageConnect118 === void 0 ? void 0 : _data$SewerageConnect118.uuid,
-      fieldName: "correspondenceAddress",
-      model: "WnSConnectionOwner",
-      showValue: false,
-      loadData: {
-        serviceName: serviceType === "WATER" ? "/ws-services/wc/_search" : "/sw-services/swc/_search",
-        requestBody: {},
-        requestParam: {
-          tenantId,
-          applicationNumber: applicationNobyData
-        },
-        jsonPath: serviceType === "WATER" ? "WaterConnection[0].connectionHolders[0].correspondenceAddress" : "SewerageConnections[0].connectionHolders[0].correspondenceAddress",
-        isArray: false
-      }
-    }
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_OWN_DETAIL_EMAIL_ID_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection124 = data.WaterConnection) === null || _data$WaterConnection124 === void 0 ? void 0 : (_data$WaterConnection125 = _data$WaterConnection124[0]) === null || _data$WaterConnection125 === void 0 ? void 0 : (_data$WaterConnection126 = _data$WaterConnection125.connectionHolders) === null || _data$WaterConnection126 === void 0 ? void 0 : (_data$WaterConnection127 = _data$WaterConnection126[0]) === null || _data$WaterConnection127 === void 0 ? void 0 : _data$WaterConnection127.emailId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect119 = data.SewerageConnections) === null || _data$SewerageConnect119 === void 0 ? void 0 : (_data$SewerageConnect120 = _data$SewerageConnect119[0]) === null || _data$SewerageConnect120 === void 0 ? void 0 : (_data$SewerageConnect121 = _data$SewerageConnect120.connectionHolders) === null || _data$SewerageConnect121 === void 0 ? void 0 : (_data$SewerageConnect122 = _data$SewerageConnect121[0]) === null || _data$SewerageConnect122 === void 0 ? void 0 : _data$SewerageConnect122.emailId) || "NA",
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection100 = data.WaterConnection) === null || _data$WaterConnection100 === void 0 ? void 0 : (_data$WaterConnection101 = _data$WaterConnection100[0]) === null || _data$WaterConnection101 === void 0 ? void 0 : (_data$WaterConnection102 = _data$WaterConnection101.connectionHolders) === null || _data$WaterConnection102 === void 0 ? void 0 : (_data$WaterConnection103 = _data$WaterConnection102[0]) === null || _data$WaterConnection103 === void 0 ? void 0 : _data$WaterConnection103.emailId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect95 = data.SewerageConnections) === null || _data$SewerageConnect95 === void 0 ? void 0 : (_data$SewerageConnect96 = _data$SewerageConnect95[0]) === null || _data$SewerageConnect96 === void 0 ? void 0 : (_data$SewerageConnect97 = _data$SewerageConnect96.connectionHolders) === null || _data$SewerageConnect97 === void 0 ? void 0 : (_data$SewerageConnect98 = _data$SewerageConnect97[0]) === null || _data$SewerageConnect98 === void 0 ? void 0 : _data$SewerageConnect98.emailId) || "NA",
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection128 = data.WaterConnection) === null || _data$WaterConnection128 === void 0 ? void 0 : (_data$WaterConnection129 = _data$WaterConnection128[0]) === null || _data$WaterConnection129 === void 0 ? void 0 : (_data$WaterConnection130 = _data$WaterConnection129.connectionHolders) === null || _data$WaterConnection130 === void 0 ? void 0 : (_data$WaterConnection131 = _data$WaterConnection130[0]) === null || _data$WaterConnection131 === void 0 ? void 0 : _data$WaterConnection131.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect123 = data.SewerageConnections) === null || _data$SewerageConnect123 === void 0 ? void 0 : (_data$SewerageConnect124 = _data$SewerageConnect123[0]) === null || _data$SewerageConnect124 === void 0 ? void 0 : (_data$SewerageConnect125 = _data$SewerageConnect124.connectionHolders) === null || _data$SewerageConnect125 === void 0 ? void 0 : (_data$SewerageConnect126 = _data$SewerageConnect125[0]) === null || _data$SewerageConnect126 === void 0 ? void 0 : _data$SewerageConnect126.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection104 = data.WaterConnection) === null || _data$WaterConnection104 === void 0 ? void 0 : (_data$WaterConnection105 = _data$WaterConnection104[0]) === null || _data$WaterConnection105 === void 0 ? void 0 : (_data$WaterConnection106 = _data$WaterConnection105.connectionHolders) === null || _data$WaterConnection106 === void 0 ? void 0 : (_data$WaterConnection107 = _data$WaterConnection106[0]) === null || _data$WaterConnection107 === void 0 ? void 0 : _data$WaterConnection107.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect99 = data.SewerageConnections) === null || _data$SewerageConnect99 === void 0 ? void 0 : (_data$SewerageConnect100 = _data$SewerageConnect99[0]) === null || _data$SewerageConnect100 === void 0 ? void 0 : (_data$SewerageConnect101 = _data$SewerageConnect100.connectionHolders) === null || _data$SewerageConnect101 === void 0 ? void 0 : (_data$SewerageConnect102 = _data$SewerageConnect101[0]) === null || _data$SewerageConnect102 === void 0 ? void 0 : _data$SewerageConnect102.uuid,
       fieldName: "connectionHoldersEmailId",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -33568,7 +33742,7 @@ const WSApplicationDetails = () => {
     }
   }, t("WS_COMMON_PROPERTY_DETAILS")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     label: t("WS_PROPERTY_ID_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection132 = data.WaterConnection) === null || _data$WaterConnection132 === void 0 ? void 0 : (_data$WaterConnection133 = _data$WaterConnection132[0]) === null || _data$WaterConnection133 === void 0 ? void 0 : _data$WaterConnection133.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect127 = data.SewerageConnections) === null || _data$SewerageConnect127 === void 0 ? void 0 : (_data$SewerageConnect128 = _data$SewerageConnect127[0]) === null || _data$SewerageConnect128 === void 0 ? void 0 : _data$SewerageConnect128.propertyId),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection108 = data.WaterConnection) === null || _data$WaterConnection108 === void 0 ? void 0 : (_data$WaterConnection109 = _data$WaterConnection108[0]) === null || _data$WaterConnection109 === void 0 ? void 0 : _data$WaterConnection109.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect103 = data.SewerageConnections) === null || _data$SewerageConnect103 === void 0 ? void 0 : (_data$SewerageConnect104 = _data$SewerageConnect103[0]) === null || _data$SewerageConnect104 === void 0 ? void 0 : _data$SewerageConnect104.propertyId),
     textStyle: {
       wordBreak: "break-word"
     }
@@ -33609,7 +33783,7 @@ const WSApplicationDetails = () => {
       }
     }
   }), /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
-    to: `/digit-ui/citizen/commonpt/view-property?propertyId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection134 = data.WaterConnection) === null || _data$WaterConnection134 === void 0 ? void 0 : (_data$WaterConnection135 = _data$WaterConnection134[0]) === null || _data$WaterConnection135 === void 0 ? void 0 : _data$WaterConnection135.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect129 = data.SewerageConnections) === null || _data$SewerageConnect129 === void 0 ? void 0 : (_data$SewerageConnect130 = _data$SewerageConnect129[0]) === null || _data$SewerageConnect130 === void 0 ? void 0 : _data$SewerageConnect130.propertyId)}&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection136 = data.WaterConnection) === null || _data$WaterConnection136 === void 0 ? void 0 : (_data$WaterConnection137 = _data$WaterConnection136[0]) === null || _data$WaterConnection137 === void 0 ? void 0 : _data$WaterConnection137.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect131 = data.SewerageConnections) === null || _data$SewerageConnect131 === void 0 ? void 0 : (_data$SewerageConnect132 = _data$SewerageConnect131[0]) === null || _data$SewerageConnect132 === void 0 ? void 0 : _data$SewerageConnect132.tenantId)}`
+    to: `/digit-ui/citizen/commonpt/view-property?propertyId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection110 = data.WaterConnection) === null || _data$WaterConnection110 === void 0 ? void 0 : (_data$WaterConnection111 = _data$WaterConnection110[0]) === null || _data$WaterConnection111 === void 0 ? void 0 : _data$WaterConnection111.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect105 = data.SewerageConnections) === null || _data$SewerageConnect105 === void 0 ? void 0 : (_data$SewerageConnect106 = _data$SewerageConnect105[0]) === null || _data$SewerageConnect106 === void 0 ? void 0 : _data$SewerageConnect106.propertyId)}&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection112 = data.WaterConnection) === null || _data$WaterConnection112 === void 0 ? void 0 : (_data$WaterConnection113 = _data$WaterConnection112[0]) === null || _data$WaterConnection113 === void 0 ? void 0 : _data$WaterConnection113.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect107 = data.SewerageConnections) === null || _data$SewerageConnect107 === void 0 ? void 0 : (_data$SewerageConnect108 = _data$SewerageConnect107[0]) === null || _data$SewerageConnect108 === void 0 ? void 0 : _data$SewerageConnect108.tenantId)}`
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.LinkButton, {
     style: {
       textAlign: "left"
@@ -33742,13 +33916,121 @@ const WSApplicationDetails = () => {
         cursor: "pointer",
         color: "#f47738"
       },
-      onClick: () => getFiles([djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.document], tenantId)
+      onClick: () => getFiles([djbEmployee === null || djbEmployee === void 0 ? void 0 : djbEmployee.document], tenantId === null || tenantId === void 0 ? void 0 : tenantId.split(".")[0])
     }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.GenericFileIcon, null), " ", t("CS_COMMON_VIEW"))
-  }))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, {
+  }))), (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$dueV = applicationData.dueVerification) === null || _applicationData$dueV === void 0 ? void 0 : _applicationData$dueV.length) > 0 && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, {
+    styles: {
+      fontSize: "28px"
+    }
+  }, t("WS_DUE_VERIFICATION_DETAILS")), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      overflowX: "auto",
+      marginTop: "10px",
+      marginBottom: "30px"
+    }
+  }, /*#__PURE__*/React__default.createElement("table", {
+    style: {
+      width: "100%",
+      textAlign: "left",
+      borderCollapse: "collapse",
+      border: "1px solid #e0e0e0"
+    }
+  }, /*#__PURE__*/React__default.createElement("thead", null, /*#__PURE__*/React__default.createElement("tr", {
+    style: {
+      backgroundColor: "#f4f7fb",
+      borderBottom: "2px solid #e0e0e0"
+    }
+  }, /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("K No.")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Full Name")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Full Address")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Due Amount")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Total Amount")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("Remarks")), /*#__PURE__*/React__default.createElement("th", {
+    style: {
+      padding: "12px 8px",
+      borderBottom: "1px solid #e0e0e0"
+    }
+  }, t("ABG_COMMON_TABLE_COL_ACTION")))), /*#__PURE__*/React__default.createElement("tbody", null, applicationData.dueVerification.map((dueItem, index) => {
+    var _applicationData$appl, _dueItem$kno;
+    return /*#__PURE__*/React__default.createElement("tr", {
+      key: `due-${index}`,
+      style: {
+        borderBottom: "1px solid #e0e0e0"
+      }
+    }, /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, checkForNA$1(dueItem === null || dueItem === void 0 ? void 0 : dueItem.kno)), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, checkForNA$1(dueItem === null || dueItem === void 0 ? void 0 : dueItem.fullName)), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, checkForNA$1(dueItem === null || dueItem === void 0 ? void 0 : dueItem.fullAddress)), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, checkForNA$1(dueItem === null || dueItem === void 0 ? void 0 : dueItem.dueAmount)), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, checkForNA$1(dueItem === null || dueItem === void 0 ? void 0 : dueItem.totalAmount)), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, checkForNA$1(dueItem === null || dueItem === void 0 ? void 0 : dueItem.remarks)), /*#__PURE__*/React__default.createElement("td", {
+      style: {
+        padding: "12px 8px"
+      }
+    }, Number(dueItem === null || dueItem === void 0 ? void 0 : dueItem.dueAmount) > 0 || Number(dueItem === null || dueItem === void 0 ? void 0 : dueItem.totalAmount) > 0 ? /*#__PURE__*/React__default.createElement("span", {
+      className: "link"
+    }, /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+      to: {
+        pathname: `/digit-ui/citizen/payment/my-bills/${(applicationData === null || applicationData === void 0 ? void 0 : applicationData.serviceType) === "WATER" || applicationData !== null && applicationData !== void 0 && (_applicationData$appl = applicationData.applicationType) !== null && _applicationData$appl !== void 0 && _applicationData$appl.includes("WATER") ? "WS" : "SW"}/${dueItem === null || dueItem === void 0 ? void 0 : (_dueItem$kno = dueItem.kno) === null || _dueItem$kno === void 0 ? void 0 : _dueItem$kno.replaceAll("/", "+")}`,
+        search: `?workflow=WNS&tenantId=${applicationData === null || applicationData === void 0 ? void 0 : applicationData.tenantId}&ConsumerName=${dueItem === null || dueItem === void 0 ? void 0 : dueItem.fullName}&consumerCode=${dueItem === null || dueItem === void 0 ? void 0 : dueItem.kno}`,
+        state: {
+          fromApplicationDetails: true
+        }
+      }
+    }, t("MAKE_PAYMENT"))) : /*#__PURE__*/React__default.createElement("span", {
+      style: {
+        color: "green",
+        fontWeight: "bold"
+      }
+    }, t("BILL_ALREADY_PAID"))));
+  }))))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, {
     styles: {
       fontSize: "28px"
     }
-  }, t("WS_COMMON_DOCUMENT_DETAILS")), (data === null || data === void 0 ? void 0 : (_data$WaterConnection138 = data.WaterConnection) === null || _data$WaterConnection138 === void 0 ? void 0 : (_data$WaterConnection139 = _data$WaterConnection138[0]) === null || _data$WaterConnection139 === void 0 ? void 0 : _data$WaterConnection139.documents) && (data === null || data === void 0 ? void 0 : (_data$WaterConnection140 = data.WaterConnection) === null || _data$WaterConnection140 === void 0 ? void 0 : (_data$WaterConnection141 = _data$WaterConnection140[0]) === null || _data$WaterConnection141 === void 0 ? void 0 : _data$WaterConnection141.documents.reduce((acc, current) => {
+  }, t("WS_COMMON_DOCUMENT_DETAILS")), (data === null || data === void 0 ? void 0 : (_data$WaterConnection114 = data.WaterConnection) === null || _data$WaterConnection114 === void 0 ? void 0 : (_data$WaterConnection115 = _data$WaterConnection114[0]) === null || _data$WaterConnection115 === void 0 ? void 0 : _data$WaterConnection115.documents) && (data === null || data === void 0 ? void 0 : (_data$WaterConnection116 = data.WaterConnection) === null || _data$WaterConnection116 === void 0 ? void 0 : (_data$WaterConnection117 = _data$WaterConnection116[0]) === null || _data$WaterConnection117 === void 0 ? void 0 : _data$WaterConnection117.documents.reduce((acc, current) => {
     const x = acc.find(item => item.documentType === current.documentType);
     if (!x) {
       return acc.concat([current]);
@@ -33756,11 +34038,11 @@ const WSApplicationDetails = () => {
       return acc;
     }
   }, []).map((doc, index, array) => {
-    var _doc$documentType, _data$WaterConnection142, _data$WaterConnection143;
+    var _doc$documentType, _data$WaterConnection118, _data$WaterConnection119;
     return /*#__PURE__*/React__default.createElement("div", {
       key: `doc-${index}`
     }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, null, t(doc === null || doc === void 0 ? void 0 : (_doc$documentType = doc.documentType) === null || _doc$documentType === void 0 ? void 0 : _doc$documentType.split(".").slice(0, 2).join("_"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(WSDocument, {
-      value: data === null || data === void 0 ? void 0 : (_data$WaterConnection142 = data.WaterConnection) === null || _data$WaterConnection142 === void 0 ? void 0 : (_data$WaterConnection143 = _data$WaterConnection142[0]) === null || _data$WaterConnection143 === void 0 ? void 0 : _data$WaterConnection143.documents,
+      value: data === null || data === void 0 ? void 0 : (_data$WaterConnection118 = data.WaterConnection) === null || _data$WaterConnection118 === void 0 ? void 0 : (_data$WaterConnection119 = _data$WaterConnection118[0]) === null || _data$WaterConnection119 === void 0 ? void 0 : _data$WaterConnection119.documents,
       Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
       index: index
     }), array.length != index + 1 ? /*#__PURE__*/React__default.createElement("hr", {
@@ -33772,7 +34054,7 @@ const WSApplicationDetails = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  })), (data === null || data === void 0 ? void 0 : (_data$SewerageConnect133 = data.SewerageConnections) === null || _data$SewerageConnect133 === void 0 ? void 0 : (_data$SewerageConnect134 = _data$SewerageConnect133[0]) === null || _data$SewerageConnect134 === void 0 ? void 0 : _data$SewerageConnect134.documents) && (data === null || data === void 0 ? void 0 : (_data$SewerageConnect135 = data.SewerageConnections) === null || _data$SewerageConnect135 === void 0 ? void 0 : (_data$SewerageConnect136 = _data$SewerageConnect135[0]) === null || _data$SewerageConnect136 === void 0 ? void 0 : _data$SewerageConnect136.documents.reduce((acc, current) => {
+  })), (data === null || data === void 0 ? void 0 : (_data$SewerageConnect109 = data.SewerageConnections) === null || _data$SewerageConnect109 === void 0 ? void 0 : (_data$SewerageConnect110 = _data$SewerageConnect109[0]) === null || _data$SewerageConnect110 === void 0 ? void 0 : _data$SewerageConnect110.documents) && (data === null || data === void 0 ? void 0 : (_data$SewerageConnect111 = data.SewerageConnections) === null || _data$SewerageConnect111 === void 0 ? void 0 : (_data$SewerageConnect112 = _data$SewerageConnect111[0]) === null || _data$SewerageConnect112 === void 0 ? void 0 : _data$SewerageConnect112.documents.reduce((acc, current) => {
     const x = acc.find(item => item.documentType === current.documentType);
     if (!x) {
       return acc.concat([current]);
@@ -33780,11 +34062,11 @@ const WSApplicationDetails = () => {
       return acc;
     }
   }, []).map((doc, index, array) => {
-    var _doc$documentType2, _data$SewerageConnect137, _data$SewerageConnect138;
+    var _doc$documentType2, _data$SewerageConnect113, _data$SewerageConnect114;
     return /*#__PURE__*/React__default.createElement("div", {
       key: `doc-${index}`
     }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSectionHeader, null, t(doc === null || doc === void 0 ? void 0 : (_doc$documentType2 = doc.documentType) === null || _doc$documentType2 === void 0 ? void 0 : _doc$documentType2.split(".").slice(0, 2).join("_"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.StatusTable, null, /*#__PURE__*/React__default.createElement(WSDocument, {
-      value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect137 = data.SewerageConnections) === null || _data$SewerageConnect137 === void 0 ? void 0 : (_data$SewerageConnect138 = _data$SewerageConnect137[0]) === null || _data$SewerageConnect138 === void 0 ? void 0 : _data$SewerageConnect138.documents,
+      value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect113 = data.SewerageConnections) === null || _data$SewerageConnect113 === void 0 ? void 0 : (_data$SewerageConnect114 = _data$SewerageConnect113[0]) === null || _data$SewerageConnect114 === void 0 ? void 0 : _data$SewerageConnect114.documents,
       Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
       index: index
     }), array.length != index + 1 ? /*#__PURE__*/React__default.createElement("hr", {
@@ -33796,46 +34078,46 @@ const WSApplicationDetails = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection144 = data.WaterConnection) === null || _data$WaterConnection144 === void 0 ? void 0 : (_data$WaterConnection145 = _data$WaterConnection144[0]) === null || _data$WaterConnection145 === void 0 ? void 0 : _data$WaterConnection145.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection146 = data.WaterConnection) === null || _data$WaterConnection146 === void 0 ? void 0 : (_data$WaterConnection147 = _data$WaterConnection146[0]) === null || _data$WaterConnection147 === void 0 ? void 0 : _data$WaterConnection147.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection148 = data.WaterConnection) === null || _data$WaterConnection148 === void 0 ? void 0 : (_data$WaterConnection149 = _data$WaterConnection148[0]) === null || _data$WaterConnection149 === void 0 ? void 0 : _data$WaterConnection149.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect139 = data.SewerageConnections) === null || _data$SewerageConnect139 === void 0 ? void 0 : (_data$SewerageConnect140 = _data$SewerageConnect139[0]) === null || _data$SewerageConnect140 === void 0 ? void 0 : _data$SewerageConnect140.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect141 = data.SewerageConnections) === null || _data$SewerageConnect141 === void 0 ? void 0 : (_data$SewerageConnect142 = _data$SewerageConnect141[0]) === null || _data$SewerageConnect142 === void 0 ? void 0 : _data$SewerageConnect142.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect143 = data.SewerageConnections) === null || _data$SewerageConnect143 === void 0 ? void 0 : (_data$SewerageConnect144 = _data$SewerageConnect143[0]) === null || _data$SewerageConnect144 === void 0 ? void 0 : _data$SewerageConnect144.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" ? /*#__PURE__*/React__default.createElement("div", {
+  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection120 = data.WaterConnection) === null || _data$WaterConnection120 === void 0 ? void 0 : (_data$WaterConnection121 = _data$WaterConnection120[0]) === null || _data$WaterConnection121 === void 0 ? void 0 : _data$WaterConnection121.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection122 = data.WaterConnection) === null || _data$WaterConnection122 === void 0 ? void 0 : (_data$WaterConnection123 = _data$WaterConnection122[0]) === null || _data$WaterConnection123 === void 0 ? void 0 : _data$WaterConnection123.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$WaterConnection124 = data.WaterConnection) === null || _data$WaterConnection124 === void 0 ? void 0 : (_data$WaterConnection125 = _data$WaterConnection124[0]) === null || _data$WaterConnection125 === void 0 ? void 0 : _data$WaterConnection125.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect115 = data.SewerageConnections) === null || _data$SewerageConnect115 === void 0 ? void 0 : (_data$SewerageConnect116 = _data$SewerageConnect115[0]) === null || _data$SewerageConnect116 === void 0 ? void 0 : _data$SewerageConnect116.applicationStatus) === "PENDING_FOR_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect117 = data.SewerageConnections) === null || _data$SewerageConnect117 === void 0 ? void 0 : (_data$SewerageConnect118 = _data$SewerageConnect117[0]) === null || _data$SewerageConnect118 === void 0 ? void 0 : _data$SewerageConnect118.applicationStatus) === "PENDING_FOR_FINAL_PAYMENT" || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect119 = data.SewerageConnections) === null || _data$SewerageConnect119 === void 0 ? void 0 : (_data$SewerageConnect120 = _data$SewerageConnect119[0]) === null || _data$SewerageConnect120 === void 0 ? void 0 : _data$SewerageConnect120.applicationStatus) === "PENDING_FOR_ADDITIONAL_PAYMENT" ? /*#__PURE__*/React__default.createElement("div", {
     style: {
       marginTop: "10px"
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("MAKE_PAYMENT"),
     onSubmit: () => {
-      var _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _data$WaterConnection150, _data$WaterConnection151, _data$SewerageConnect145, _data$SewerageConnect146, _data$WaterConnection152, _data$WaterConnection153, _data$WaterConnection154, _data$SewerageConnect147, _data$SewerageConnect148, _data$SewerageConnect149, _PTData$Properties10, _PTData$Properties10$, _PTData$Properties10$2, _paymentDetails$data5, _paymentDetails$data6, _paymentDetails$data7;
+      var _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _data$WaterConnection126, _data$WaterConnection127, _data$SewerageConnect121, _data$SewerageConnect122, _data$WaterConnection128, _data$WaterConnection129, _data$WaterConnection130, _data$SewerageConnect123, _data$SewerageConnect124, _data$SewerageConnect125, _PTData$Properties10, _PTData$Properties10$, _PTData$Properties10$2, _paymentDetails$data5, _paymentDetails$data6, _paymentDetails$data7;
       history.push({
         pathname: `/digit-ui/citizen/payment/my-bills/${paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data = paymentDetails.data) === null || _paymentDetails$data === void 0 ? void 0 : (_paymentDetails$data$ = _paymentDetails$data.Bill) === null || _paymentDetails$data$ === void 0 ? void 0 : (_paymentDetails$data$2 = _paymentDetails$data$[0]) === null || _paymentDetails$data$2 === void 0 ? void 0 : _paymentDetails$data$2.businessService}/${stringReplaceAll(paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data2 = paymentDetails.data) === null || _paymentDetails$data2 === void 0 ? void 0 : (_paymentDetails$data3 = _paymentDetails$data2.Bill) === null || _paymentDetails$data3 === void 0 ? void 0 : (_paymentDetails$data4 = _paymentDetails$data3[0]) === null || _paymentDetails$data4 === void 0 ? void 0 : _paymentDetails$data4.consumerCode, "/", "+")}`,
-        search: `?workflow=WNS&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection150 = data.WaterConnection) === null || _data$WaterConnection150 === void 0 ? void 0 : (_data$WaterConnection151 = _data$WaterConnection150[0]) === null || _data$WaterConnection151 === void 0 ? void 0 : _data$WaterConnection151.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect145 = data.SewerageConnections) === null || _data$SewerageConnect145 === void 0 ? void 0 : (_data$SewerageConnect146 = _data$SewerageConnect145[0]) === null || _data$SewerageConnect146 === void 0 ? void 0 : _data$SewerageConnect146.tenantId)}&ConsumerName=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection152 = data.WaterConnection) === null || _data$WaterConnection152 === void 0 ? void 0 : (_data$WaterConnection153 = _data$WaterConnection152[0]) === null || _data$WaterConnection153 === void 0 ? void 0 : (_data$WaterConnection154 = _data$WaterConnection153.connectionHolders) === null || _data$WaterConnection154 === void 0 ? void 0 : _data$WaterConnection154.map(owner => owner.name).join(",")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect147 = data.SewerageConnections) === null || _data$SewerageConnect147 === void 0 ? void 0 : (_data$SewerageConnect148 = _data$SewerageConnect147[0]) === null || _data$SewerageConnect148 === void 0 ? void 0 : (_data$SewerageConnect149 = _data$SewerageConnect148.connectionHolders) === null || _data$SewerageConnect149 === void 0 ? void 0 : _data$SewerageConnect149.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties10 = PTData.Properties) === null || _PTData$Properties10 === void 0 ? void 0 : (_PTData$Properties10$ = _PTData$Properties10[0]) === null || _PTData$Properties10$ === void 0 ? void 0 : (_PTData$Properties10$2 = _PTData$Properties10$.owners) === null || _PTData$Properties10$2 === void 0 ? void 0 : _PTData$Properties10$2.map(owner => owner.name).join(","))}&isDisoconnectFlow=${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false}&consumerCode=${paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data5 = paymentDetails.data) === null || _paymentDetails$data5 === void 0 ? void 0 : (_paymentDetails$data6 = _paymentDetails$data5.Bill) === null || _paymentDetails$data6 === void 0 ? void 0 : (_paymentDetails$data7 = _paymentDetails$data6[0]) === null || _paymentDetails$data7 === void 0 ? void 0 : _paymentDetails$data7.consumerCode}`,
+        search: `?workflow=WNS&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection126 = data.WaterConnection) === null || _data$WaterConnection126 === void 0 ? void 0 : (_data$WaterConnection127 = _data$WaterConnection126[0]) === null || _data$WaterConnection127 === void 0 ? void 0 : _data$WaterConnection127.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect121 = data.SewerageConnections) === null || _data$SewerageConnect121 === void 0 ? void 0 : (_data$SewerageConnect122 = _data$SewerageConnect121[0]) === null || _data$SewerageConnect122 === void 0 ? void 0 : _data$SewerageConnect122.tenantId)}&ConsumerName=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection128 = data.WaterConnection) === null || _data$WaterConnection128 === void 0 ? void 0 : (_data$WaterConnection129 = _data$WaterConnection128[0]) === null || _data$WaterConnection129 === void 0 ? void 0 : (_data$WaterConnection130 = _data$WaterConnection129.connectionHolders) === null || _data$WaterConnection130 === void 0 ? void 0 : _data$WaterConnection130.map(owner => owner.name).join(",")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect123 = data.SewerageConnections) === null || _data$SewerageConnect123 === void 0 ? void 0 : (_data$SewerageConnect124 = _data$SewerageConnect123[0]) === null || _data$SewerageConnect124 === void 0 ? void 0 : (_data$SewerageConnect125 = _data$SewerageConnect124.connectionHolders) === null || _data$SewerageConnect125 === void 0 ? void 0 : _data$SewerageConnect125.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties10 = PTData.Properties) === null || _PTData$Properties10 === void 0 ? void 0 : (_PTData$Properties10$ = _PTData$Properties10[0]) === null || _PTData$Properties10$ === void 0 ? void 0 : (_PTData$Properties10$2 = _PTData$Properties10$.owners) === null || _PTData$Properties10$2 === void 0 ? void 0 : _PTData$Properties10$2.map(owner => owner.name).join(","))}&isDisoconnectFlow=${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false}&consumerCode=${paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data5 = paymentDetails.data) === null || _paymentDetails$data5 === void 0 ? void 0 : (_paymentDetails$data6 = _paymentDetails$data5.Bill) === null || _paymentDetails$data6 === void 0 ? void 0 : (_paymentDetails$data7 = _paymentDetails$data6[0]) === null || _paymentDetails$data7 === void 0 ? void 0 : _paymentDetails$data7.consumerCode}`,
         state: {
           fromApplicationDetails: true
         }
       });
     }
-  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection155 = data.WaterConnection) !== null && _data$WaterConnection155 !== void 0 && (_data$WaterConnection156 = _data$WaterConnection155[0]) !== null && _data$WaterConnection156 !== void 0 && _data$WaterConnection156.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection157 = data.WaterConnection) !== null && _data$WaterConnection157 !== void 0 && (_data$WaterConnection158 = _data$WaterConnection157[0]) !== null && _data$WaterConnection158 !== void 0 && _data$WaterConnection158.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect150 = data.SewerageConnections) !== null && _data$SewerageConnect150 !== void 0 && (_data$SewerageConnect151 = _data$SewerageConnect150[0]) !== null && _data$SewerageConnect151 !== void 0 && _data$SewerageConnect151.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect152 = data.SewerageConnections) !== null && _data$SewerageConnect152 !== void 0 && (_data$SewerageConnect153 = _data$SewerageConnect152[0]) !== null && _data$SewerageConnect153 !== void 0 && _data$SewerageConnect153.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection131 = data.WaterConnection) !== null && _data$WaterConnection131 !== void 0 && (_data$WaterConnection132 = _data$WaterConnection131[0]) !== null && _data$WaterConnection132 !== void 0 && _data$WaterConnection132.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection133 = data.WaterConnection) !== null && _data$WaterConnection133 !== void 0 && (_data$WaterConnection134 = _data$WaterConnection133[0]) !== null && _data$WaterConnection134 !== void 0 && _data$WaterConnection134.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect126 = data.SewerageConnections) !== null && _data$SewerageConnect126 !== void 0 && (_data$SewerageConnect127 = _data$SewerageConnect126[0]) !== null && _data$SewerageConnect127 !== void 0 && _data$SewerageConnect127.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect128 = data.SewerageConnections) !== null && _data$SewerageConnect128 !== void 0 && (_data$SewerageConnect129 = _data$SewerageConnect128[0]) !== null && _data$SewerageConnect129 !== void 0 && _data$SewerageConnect129.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
     to: {
-      pathname: isMutation ? `/digit-ui/citizen/ws/mutation-application` : `/digit-ui/citizen/ws/edit-application/${(data === null || data === void 0 ? void 0 : (_data$WaterConnection159 = data.WaterConnection) === null || _data$WaterConnection159 === void 0 ? void 0 : (_data$WaterConnection160 = _data$WaterConnection159[0]) === null || _data$WaterConnection160 === void 0 ? void 0 : _data$WaterConnection160.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect154 = data.SewerageConnections) === null || _data$SewerageConnect154 === void 0 ? void 0 : (_data$SewerageConnect155 = _data$SewerageConnect154[0]) === null || _data$SewerageConnect155 === void 0 ? void 0 : _data$SewerageConnect155.tenantId)}`,
-      search: isMutation ? `?applicationNumber=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection161 = data.WaterConnection) === null || _data$WaterConnection161 === void 0 ? void 0 : (_data$WaterConnection162 = _data$WaterConnection161[0]) === null || _data$WaterConnection162 === void 0 ? void 0 : _data$WaterConnection162.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect156 = data.SewerageConnections) === null || _data$SewerageConnect156 === void 0 ? void 0 : (_data$SewerageConnect157 = _data$SewerageConnect156[0]) === null || _data$SewerageConnect157 === void 0 ? void 0 : _data$SewerageConnect157.applicationNo)}&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection163 = data.WaterConnection) === null || _data$WaterConnection163 === void 0 ? void 0 : (_data$WaterConnection164 = _data$WaterConnection163[0]) === null || _data$WaterConnection164 === void 0 ? void 0 : _data$WaterConnection164.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect158 = data.SewerageConnections) === null || _data$SewerageConnect158 === void 0 ? void 0 : (_data$SewerageConnect159 = _data$SewerageConnect158[0]) === null || _data$SewerageConnect159 === void 0 ? void 0 : _data$SewerageConnect159.tenantId)}&service=${data !== null && data !== void 0 && (_data$WaterConnection165 = data.WaterConnection) !== null && _data$WaterConnection165 !== void 0 && _data$WaterConnection165[0] ? "WATER" : "SEWERAGE"}&propertyId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection166 = data.WaterConnection) === null || _data$WaterConnection166 === void 0 ? void 0 : (_data$WaterConnection167 = _data$WaterConnection166[0]) === null || _data$WaterConnection167 === void 0 ? void 0 : _data$WaterConnection167.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect160 = data.SewerageConnections) === null || _data$SewerageConnect160 === void 0 ? void 0 : (_data$SewerageConnect161 = _data$SewerageConnect160[0]) === null || _data$SewerageConnect161 === void 0 ? void 0 : _data$SewerageConnect161.propertyId)}` : "",
+      pathname: isMutation ? `/digit-ui/citizen/ws/mutation-application` : `/digit-ui/citizen/ws/edit-application/${(data === null || data === void 0 ? void 0 : (_data$WaterConnection135 = data.WaterConnection) === null || _data$WaterConnection135 === void 0 ? void 0 : (_data$WaterConnection136 = _data$WaterConnection135[0]) === null || _data$WaterConnection136 === void 0 ? void 0 : _data$WaterConnection136.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect130 = data.SewerageConnections) === null || _data$SewerageConnect130 === void 0 ? void 0 : (_data$SewerageConnect131 = _data$SewerageConnect130[0]) === null || _data$SewerageConnect131 === void 0 ? void 0 : _data$SewerageConnect131.tenantId)}`,
+      search: isMutation ? `?applicationNumber=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection137 = data.WaterConnection) === null || _data$WaterConnection137 === void 0 ? void 0 : (_data$WaterConnection138 = _data$WaterConnection137[0]) === null || _data$WaterConnection138 === void 0 ? void 0 : _data$WaterConnection138.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect132 = data.SewerageConnections) === null || _data$SewerageConnect132 === void 0 ? void 0 : (_data$SewerageConnect133 = _data$SewerageConnect132[0]) === null || _data$SewerageConnect133 === void 0 ? void 0 : _data$SewerageConnect133.applicationNo)}&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection139 = data.WaterConnection) === null || _data$WaterConnection139 === void 0 ? void 0 : (_data$WaterConnection140 = _data$WaterConnection139[0]) === null || _data$WaterConnection140 === void 0 ? void 0 : _data$WaterConnection140.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect134 = data.SewerageConnections) === null || _data$SewerageConnect134 === void 0 ? void 0 : (_data$SewerageConnect135 = _data$SewerageConnect134[0]) === null || _data$SewerageConnect135 === void 0 ? void 0 : _data$SewerageConnect135.tenantId)}&service=${data !== null && data !== void 0 && (_data$WaterConnection141 = data.WaterConnection) !== null && _data$WaterConnection141 !== void 0 && _data$WaterConnection141[0] ? "WATER" : "SEWERAGE"}&propertyId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection142 = data.WaterConnection) === null || _data$WaterConnection142 === void 0 ? void 0 : (_data$WaterConnection143 = _data$WaterConnection142[0]) === null || _data$WaterConnection143 === void 0 ? void 0 : _data$WaterConnection143.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect136 = data.SewerageConnections) === null || _data$SewerageConnect136 === void 0 ? void 0 : (_data$SewerageConnect137 = _data$SewerageConnect136[0]) === null || _data$SewerageConnect137 === void 0 ? void 0 : _data$SewerageConnect137.propertyId)}` : "",
       state: {
-        id: `${(data === null || data === void 0 ? void 0 : (_data$WaterConnection168 = data.WaterConnection) === null || _data$WaterConnection168 === void 0 ? void 0 : (_data$WaterConnection169 = _data$WaterConnection168[0]) === null || _data$WaterConnection169 === void 0 ? void 0 : _data$WaterConnection169.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect162 = data.SewerageConnections) === null || _data$SewerageConnect162 === void 0 ? void 0 : (_data$SewerageConnect163 = _data$SewerageConnect162[0]) === null || _data$SewerageConnect163 === void 0 ? void 0 : _data$SewerageConnect163.applicationNo)}`
+        id: `${(data === null || data === void 0 ? void 0 : (_data$WaterConnection144 = data.WaterConnection) === null || _data$WaterConnection144 === void 0 ? void 0 : (_data$WaterConnection145 = _data$WaterConnection144[0]) === null || _data$WaterConnection145 === void 0 ? void 0 : _data$WaterConnection145.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect138 = data.SewerageConnections) === null || _data$SewerageConnect138 === void 0 ? void 0 : (_data$SewerageConnect139 = _data$SewerageConnect138[0]) === null || _data$SewerageConnect139 === void 0 ? void 0 : _data$SewerageConnect139.applicationNo)}`
       }
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("COMMON_EDIT")
-  })) : null, data !== null && data !== void 0 && (_data$WaterConnection170 = data.WaterConnection) !== null && _data$WaterConnection170 !== void 0 && (_data$WaterConnection171 = _data$WaterConnection170[0]) !== null && _data$WaterConnection171 !== void 0 && _data$WaterConnection171.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection172 = data.WaterConnection) !== null && _data$WaterConnection172 !== void 0 && (_data$WaterConnection173 = _data$WaterConnection172[0]) !== null && _data$WaterConnection173 !== void 0 && _data$WaterConnection173.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect164 = data.SewerageConnections) !== null && _data$SewerageConnect164 !== void 0 && (_data$SewerageConnect165 = _data$SewerageConnect164[0]) !== null && _data$SewerageConnect165 !== void 0 && _data$SewerageConnect165.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect166 = data.SewerageConnections) !== null && _data$SewerageConnect166 !== void 0 && (_data$SewerageConnect167 = _data$SewerageConnect166[0]) !== null && _data$SewerageConnect167 !== void 0 && _data$SewerageConnect167.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
+  })) : null, data !== null && data !== void 0 && (_data$WaterConnection146 = data.WaterConnection) !== null && _data$WaterConnection146 !== void 0 && (_data$WaterConnection147 = _data$WaterConnection146[0]) !== null && _data$WaterConnection147 !== void 0 && _data$WaterConnection147.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection148 = data.WaterConnection) !== null && _data$WaterConnection148 !== void 0 && (_data$WaterConnection149 = _data$WaterConnection148[0]) !== null && _data$WaterConnection149 !== void 0 && _data$WaterConnection149.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect140 = data.SewerageConnections) !== null && _data$SewerageConnect140 !== void 0 && (_data$SewerageConnect141 = _data$SewerageConnect140[0]) !== null && _data$SewerageConnect141 !== void 0 && _data$SewerageConnect141.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect142 = data.SewerageConnections) !== null && _data$SewerageConnect142 !== void 0 && (_data$SewerageConnect143 = _data$SewerageConnect142[0]) !== null && _data$SewerageConnect143 !== void 0 && _data$SewerageConnect143.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React__default.createElement(reactRouterDom.Link, {
     to: {
       pathname: `/digit-ui/citizen/ws/resubmit-disconnect-application`,
       state: {
-        id: `${(data === null || data === void 0 ? void 0 : (_data$WaterConnection174 = data.WaterConnection) === null || _data$WaterConnection174 === void 0 ? void 0 : (_data$WaterConnection175 = _data$WaterConnection174[0]) === null || _data$WaterConnection175 === void 0 ? void 0 : _data$WaterConnection175.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect168 = data.SewerageConnections) === null || _data$SewerageConnect168 === void 0 ? void 0 : (_data$SewerageConnect169 = _data$SewerageConnect168[0]) === null || _data$SewerageConnect169 === void 0 ? void 0 : _data$SewerageConnect169.applicationNo)}`
+        id: `${(data === null || data === void 0 ? void 0 : (_data$WaterConnection150 = data.WaterConnection) === null || _data$WaterConnection150 === void 0 ? void 0 : (_data$WaterConnection151 = _data$WaterConnection150[0]) === null || _data$WaterConnection151 === void 0 ? void 0 : _data$WaterConnection151.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect144 = data.SewerageConnections) === null || _data$SewerageConnect144 === void 0 ? void 0 : (_data$SewerageConnect145 = _data$SewerageConnect144[0]) === null || _data$SewerageConnect145 === void 0 ? void 0 : _data$SewerageConnect145.applicationNo)}`
       }
     }
   }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
     label: t("RESUBMIT_APPLICATION"),
     onSubmit: Digit.SessionStorage.set("WS_DISCONNECTION", applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("SW") ? {
-      applicationData: data === null || data === void 0 ? void 0 : (_data$SewerageConnect170 = data.SewerageConnections) === null || _data$SewerageConnect170 === void 0 ? void 0 : _data$SewerageConnect170[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$SewerageConnect146 = data.SewerageConnections) === null || _data$SewerageConnect146 === void 0 ? void 0 : _data$SewerageConnect146[0],
       serviceType: "SEWERAGE",
       WSDisconnectionForm: {
-        type: data !== null && data !== void 0 && (_data$SewerageConnect171 = data.SewerageConnections) !== null && _data$SewerageConnect171 !== void 0 && (_data$SewerageConnect172 = _data$SewerageConnect171[0]) !== null && _data$SewerageConnect172 !== void 0 && _data$SewerageConnect172.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$SewerageConnect147 = data.SewerageConnections) !== null && _data$SewerageConnect147 !== void 0 && (_data$SewerageConnect148 = _data$SewerageConnect147[0]) !== null && _data$SewerageConnect148 !== void 0 && _data$SewerageConnect148.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -33852,18 +34134,18 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$SewerageConnect173 = data.SewerageConnections) === null || _data$SewerageConnect173 === void 0 ? void 0 : (_data$SewerageConnect174 = _data$SewerageConnect173[0]) === null || _data$SewerageConnect174 === void 0 ? void 0 : _data$SewerageConnect174.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$SewerageConnect149 = data.SewerageConnections) === null || _data$SewerageConnect149 === void 0 ? void 0 : (_data$SewerageConnect150 = _data$SewerageConnect149[0]) === null || _data$SewerageConnect150 === void 0 ? void 0 : _data$SewerageConnect150.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect175 = data.SewerageConnections) === null || _data$SewerageConnect175 === void 0 ? void 0 : (_data$SewerageConnect176 = _data$SewerageConnect175[0]) === null || _data$SewerageConnect176 === void 0 ? void 0 : _data$SewerageConnect176.disconnectionReason
+          value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect151 = data.SewerageConnections) === null || _data$SewerageConnect151 === void 0 ? void 0 : (_data$SewerageConnect152 = _data$SewerageConnect151[0]) === null || _data$SewerageConnect152 === void 0 ? void 0 : _data$SewerageConnect152.disconnectionReason
         },
-        documents: data === null || data === void 0 ? void 0 : (_data$SewerageConnect177 = data.SewerageConnections) === null || _data$SewerageConnect177 === void 0 ? void 0 : (_data$SewerageConnect178 = _data$SewerageConnect177[0]) === null || _data$SewerageConnect178 === void 0 ? void 0 : _data$SewerageConnect178.documents
+        documents: data === null || data === void 0 ? void 0 : (_data$SewerageConnect153 = data.SewerageConnections) === null || _data$SewerageConnect153 === void 0 ? void 0 : (_data$SewerageConnect154 = _data$SewerageConnect153[0]) === null || _data$SewerageConnect154 === void 0 ? void 0 : _data$SewerageConnect154.documents
       }
     } : {
-      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection176 = data.WaterConnection) === null || _data$WaterConnection176 === void 0 ? void 0 : _data$WaterConnection176[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection152 = data.WaterConnection) === null || _data$WaterConnection152 === void 0 ? void 0 : _data$WaterConnection152[0],
       serviceType: "WATER",
       WSDisconnectionForm: {
-        type: data !== null && data !== void 0 && (_data$WaterConnection177 = data.WaterConnection) !== null && _data$WaterConnection177 !== void 0 && (_data$WaterConnection178 = _data$WaterConnection177[0]) !== null && _data$WaterConnection178 !== void 0 && _data$WaterConnection178.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$WaterConnection153 = data.WaterConnection) !== null && _data$WaterConnection153 !== void 0 && (_data$WaterConnection154 = _data$WaterConnection153[0]) !== null && _data$WaterConnection154 !== void 0 && _data$WaterConnection154.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -33880,12 +34162,12 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$WaterConnection179 = data.WaterConnection) === null || _data$WaterConnection179 === void 0 ? void 0 : (_data$WaterConnection180 = _data$WaterConnection179[0]) === null || _data$WaterConnection180 === void 0 ? void 0 : _data$WaterConnection180.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$WaterConnection155 = data.WaterConnection) === null || _data$WaterConnection155 === void 0 ? void 0 : (_data$WaterConnection156 = _data$WaterConnection155[0]) === null || _data$WaterConnection156 === void 0 ? void 0 : _data$WaterConnection156.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: data === null || data === void 0 ? void 0 : (_data$WaterConnection181 = data.WaterConnection) === null || _data$WaterConnection181 === void 0 ? void 0 : (_data$WaterConnection182 = _data$WaterConnection181[0]) === null || _data$WaterConnection182 === void 0 ? void 0 : _data$WaterConnection182.disconnectionReason
+          value: data === null || data === void 0 ? void 0 : (_data$WaterConnection157 = data.WaterConnection) === null || _data$WaterConnection157 === void 0 ? void 0 : (_data$WaterConnection158 = _data$WaterConnection157[0]) === null || _data$WaterConnection158 === void 0 ? void 0 : _data$WaterConnection158.disconnectionReason
         },
-        documents: data === null || data === void 0 ? void 0 : (_data$WaterConnection183 = data.WaterConnection) === null || _data$WaterConnection183 === void 0 ? void 0 : (_data$WaterConnection184 = _data$WaterConnection183[0]) === null || _data$WaterConnection184 === void 0 ? void 0 : _data$WaterConnection184.documents
+        documents: data === null || data === void 0 ? void 0 : (_data$WaterConnection159 = data.WaterConnection) === null || _data$WaterConnection159 === void 0 ? void 0 : (_data$WaterConnection160 = _data$WaterConnection159[0]) === null || _data$WaterConnection160 === void 0 ? void 0 : _data$WaterConnection160.documents
       }
     })
   })) : null)))));
@@ -34251,7 +34533,7 @@ const getConnectionDetailsPDF = function (application, property, tenantInfo, t)
 };
 
 const ConnectionDetails$5 = () => {
-  var _Digit$SessionStorage, _user$info, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection, _data$WaterConnection2, _Object$keys, _connectionData$Water, _connectionData$Water2, _connectionData$Sewer, _connectionData$Sewer2, _data$WaterConnection3, _data$WaterConnection4, _data$WaterConnection5, _data$WaterConnection6, _data$WaterConnection7, _data$WaterConnection8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect3, _data$SewerageConnect4, _data$SewerageConnect5, _data$SewerageConnect6, _state, _state$applicationNo, _state2, _state3, _state4, _state4$applicationTy, _state5, _state6, _state7, _state8, _state8$applicationTy, _state9, _state0, _state1, _state10, _state10$applicationT, _state11, _state12, _state13, _state14, _state15, _state15$applicationT, _state16, _state16$waterSource, _state16$waterSource$, _state17, _state18, _state18$waterSource, _state18$waterSource$, _state19, _state20, _state21, _state22, _state22$additionalDe, _state23, _state23$applicationT, _state24, _state24$additionalDe, _state24$additionalDe2, _state25, _state25$additionalDe, _state25$additionalDe2, _state26, _state26$additionalDe, _state27, _state27$additionalDe, _state28, _state28$additionalDe, _state28$additionalDe2, _state29, _state29$additionalDe, _state30, _state31, _state32, _state33, _state33$property, _state33$property$own, _PTData$Properties2, _PTData$Properties2$, _PTData$Properties3, _PTData$Properties3$, _PTData$Properties3$$, _PTData$Properties3$$2, _PTData$Properties4, _PTData$Properties4$, _user$info2, _user$info2$userName, _user$info3, _user$info4, _state34, _state34$additionalDe, _state34$additionalDe2, _state35, _state35$additionalDe, _state35$additionalDe2, _state36, _state36$additionalDe, _state37, _state37$additionalDe, _state38, _state38$additionalDe, _state39, _state39$additionalDe, _state40, _state40$additionalDe, _state41, _state42, _state43, _state44, _state44$connectionHo, _state44$connectionHo2, _data$WaterConnection16, _data$WaterConnection17, _data$WaterConnection18, _data$WaterConnection19, _data$SewerageConnect0, _data$SewerageConnect1, _data$SewerageConnect10, _data$SewerageConnect11, _data$WaterConnection20, _data$WaterConnection21, _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$WaterConnection24, _data$WaterConnection25, _data$WaterConnection26, _data$WaterConnection27, _data$SewerageConnect16, _data$SewerageConnect17, _data$SewerageConnect18, _data$SewerageConnect19, _data$WaterConnection28, _data$WaterConnection29, _data$WaterConnection30, _data$WaterConnection31, _data$SewerageConnect20, _data$SewerageConnect21, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection32, _data$WaterConnection33, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect24, _data$SewerageConnect25, _data$SewerageConnect26, _data$SewerageConnect27, _data$WaterConnection36, _data$WaterConnection37, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect28, _data$SewerageConnect29, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect32, _data$SewerageConnect33, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection44, _data$WaterConnection45, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect40, _data$SewerageConnect41, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect44, _data$SewerageConnect45, _data$SewerageConnect46, _data$SewerageConnect47, _state45, _state46, _state49, _state50, _state51, _state52, _state53, _state54, _paymentDetails$data17, _paymentDetails$data18;
+  var _Digit$SessionStorage, _user$info, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection, _data$WaterConnection2, _Object$keys, _connectionData$Water, _connectionData$Water2, _connectionData$Sewer, _connectionData$Sewer2, _data$WaterConnection3, _data$WaterConnection4, _data$SewerageConnect3, _data$SewerageConnect4, _data$WaterConnection5, _data$WaterConnection6, _data$SewerageConnect5, _data$SewerageConnect6, _data$WaterConnection7, _data$WaterConnection8, _data$WaterConnection9, _data$WaterConnection0, _data$SewerageConnect7, _data$SewerageConnect8, _data$SewerageConnect9, _data$SewerageConnect0, _state, _state$applicationNo, _state2, _state3, _state4, _state4$applicationTy, _state5, _state6, _state7, _state8, _state8$applicationTy, _state9, _state0, _state1, _state10, _state10$applicationT, _state11, _state12, _state13, _state14, _state15, _state15$applicationT, _state16, _state16$waterSource, _state16$waterSource$, _state17, _state18, _state18$waterSource, _state18$waterSource$, _state19, _state20, _state21, _state22, _state22$additionalDe, _state23, _state23$applicationT, _state24, _state24$additionalDe, _state24$additionalDe2, _state25, _state25$additionalDe, _state25$additionalDe2, _state26, _state26$additionalDe, _state27, _state27$additionalDe, _state28, _state28$additionalDe, _state28$additionalDe2, _state29, _state29$additionalDe, _state30, _state31, _state32, _state33, _state33$property, _state33$property$own, _PTData$Properties2, _PTData$Properties2$, _PTData$Properties3, _PTData$Properties3$, _PTData$Properties3$$, _PTData$Properties3$$2, _PTData$Properties4, _PTData$Properties4$, _user$info2, _user$info2$userName, _user$info3, _user$info4, _state34, _state34$additionalDe, _state34$additionalDe2, _state35, _state35$additionalDe, _state35$additionalDe2, _state36, _state36$additionalDe, _state37, _state37$additionalDe, _state38, _state38$additionalDe, _state39, _state39$additionalDe, _state40, _state40$additionalDe, _state41, _state42, _state43, _state44, _state44$connectionHo, _state44$connectionHo2, _data$WaterConnection16, _data$WaterConnection17, _data$WaterConnection18, _data$WaterConnection19, _data$SewerageConnect12, _data$SewerageConnect13, _data$SewerageConnect14, _data$SewerageConnect15, _data$WaterConnection20, _data$WaterConnection21, _data$WaterConnection22, _data$WaterConnection23, _data$SewerageConnect16, _data$SewerageConnect17, _data$SewerageConnect18, _data$SewerageConnect19, _data$WaterConnection24, _data$WaterConnection25, _data$WaterConnection26, _data$WaterConnection27, _data$SewerageConnect20, _data$SewerageConnect21, _data$SewerageConnect22, _data$SewerageConnect23, _data$WaterConnection28, _data$WaterConnection29, _data$WaterConnection30, _data$WaterConnection31, _data$SewerageConnect24, _data$SewerageConnect25, _data$SewerageConnect26, _data$SewerageConnect27, _data$WaterConnection32, _data$WaterConnection33, _data$WaterConnection34, _data$WaterConnection35, _data$SewerageConnect28, _data$SewerageConnect29, _data$SewerageConnect30, _data$SewerageConnect31, _data$WaterConnection36, _data$WaterConnection37, _data$WaterConnection38, _data$WaterConnection39, _data$SewerageConnect32, _data$SewerageConnect33, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection40, _data$WaterConnection41, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect36, _data$SewerageConnect37, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection44, _data$WaterConnection45, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect40, _data$SewerageConnect41, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$WaterConnection51, _data$SewerageConnect44, _data$SewerageConnect45, _data$SewerageConnect46, _data$SewerageConnect47, _data$WaterConnection52, _data$WaterConnection53, _data$WaterConnection54, _data$WaterConnection55, _data$SewerageConnect48, _data$SewerageConnect49, _data$SewerageConnect50, _data$SewerageConnect51, _state45, _state46, _state49, _state50, _state51, _state52, _state53, _state54, _paymentDetails$data17, _paymentDetails$data18;
   const {
     t
   } = reactI18next.useTranslation();
@@ -34307,6 +34589,8 @@ const ConnectionDetails$5 = () => {
     setShowOptions(false);
   };
   Digit.Hooks.useClickOutside(menuRef, closeModal, showOptions);
+  const propertyId = (data === null || data === void 0 ? void 0 : (_data$WaterConnection3 = data.WaterConnection) === null || _data$WaterConnection3 === void 0 ? void 0 : (_data$WaterConnection4 = _data$WaterConnection3[0]) === null || _data$WaterConnection4 === void 0 ? void 0 : _data$WaterConnection4.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect3 = data.SewerageConnections) === null || _data$SewerageConnect3 === void 0 ? void 0 : (_data$SewerageConnect4 = _data$SewerageConnect3[0]) === null || _data$SewerageConnect4 === void 0 ? void 0 : _data$SewerageConnect4.propertyId);
+  const propertyTenantId = (data === null || data === void 0 ? void 0 : (_data$WaterConnection5 = data.WaterConnection) === null || _data$WaterConnection5 === void 0 ? void 0 : (_data$WaterConnection6 = _data$WaterConnection5[0]) === null || _data$WaterConnection6 === void 0 ? void 0 : _data$WaterConnection6.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect5 = data.SewerageConnections) === null || _data$SewerageConnect5 === void 0 ? void 0 : (_data$SewerageConnect6 = _data$SewerageConnect5[0]) === null || _data$SewerageConnect6 === void 0 ? void 0 : _data$SewerageConnect6.tenantId) || tenantId;
   const {
     isLoading: isPTLoading,
     isError: isPTError,
@@ -34314,17 +34598,20 @@ const ConnectionDetails$5 = () => {
     data: PTData
   } = Digit.Hooks.pt.usePropertySearch({
     filters: {
-      propertyIds: data === null || data === void 0 ? void 0 : (_data$WaterConnection3 = data.WaterConnection) === null || _data$WaterConnection3 === void 0 ? void 0 : (_data$WaterConnection4 = _data$WaterConnection3[0]) === null || _data$WaterConnection4 === void 0 ? void 0 : _data$WaterConnection4.propertyId
-    }
+      propertyIds: propertyId
+    },
+    tenantId: propertyTenantId
   }, {
     filters: {
-      propertyIds: data === null || data === void 0 ? void 0 : (_data$WaterConnection5 = data.WaterConnection) === null || _data$WaterConnection5 === void 0 ? void 0 : (_data$WaterConnection6 = _data$WaterConnection5[0]) === null || _data$WaterConnection6 === void 0 ? void 0 : _data$WaterConnection6.propertyId
+      propertyIds: propertyId
     },
+    tenantId: propertyTenantId,
+    enabled: !!propertyId,
     privacy: Digit.Utils.getPrivacyObject()
   });
   const checkifPrivacyenabled = Digit.Hooks.ws.useToCheckPrivacyEnablement({
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection7 = data.WaterConnection) === null || _data$WaterConnection7 === void 0 ? void 0 : (_data$WaterConnection8 = _data$WaterConnection7[0]) === null || _data$WaterConnection8 === void 0 ? void 0 : (_data$WaterConnection9 = _data$WaterConnection8.connectionHolders) === null || _data$WaterConnection9 === void 0 ? void 0 : (_data$WaterConnection0 = _data$WaterConnection9[0]) === null || _data$WaterConnection0 === void 0 ? void 0 : _data$WaterConnection0.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect3 = data.SewerageConnections) === null || _data$SewerageConnect3 === void 0 ? void 0 : (_data$SewerageConnect4 = _data$SewerageConnect3[0]) === null || _data$SewerageConnect4 === void 0 ? void 0 : (_data$SewerageConnect5 = _data$SewerageConnect4.connectionHolders) === null || _data$SewerageConnect5 === void 0 ? void 0 : (_data$SewerageConnect6 = _data$SewerageConnect5[0]) === null || _data$SewerageConnect6 === void 0 ? void 0 : _data$SewerageConnect6.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection7 = data.WaterConnection) === null || _data$WaterConnection7 === void 0 ? void 0 : (_data$WaterConnection8 = _data$WaterConnection7[0]) === null || _data$WaterConnection8 === void 0 ? void 0 : (_data$WaterConnection9 = _data$WaterConnection8.connectionHolders) === null || _data$WaterConnection9 === void 0 ? void 0 : (_data$WaterConnection0 = _data$WaterConnection9[0]) === null || _data$WaterConnection0 === void 0 ? void 0 : _data$WaterConnection0.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect7 = data.SewerageConnections) === null || _data$SewerageConnect7 === void 0 ? void 0 : (_data$SewerageConnect8 = _data$SewerageConnect7[0]) === null || _data$SewerageConnect8 === void 0 ? void 0 : (_data$SewerageConnect9 = _data$SewerageConnect8.connectionHolders) === null || _data$SewerageConnect9 === void 0 ? void 0 : (_data$SewerageConnect0 = _data$SewerageConnect9[0]) === null || _data$SewerageConnect0 === void 0 ? void 0 : _data$SewerageConnect0.uuid,
       fieldName: "connectionHoldersMobileNumber",
       model: "WnSConnectionOwner"
     }
@@ -34354,9 +34641,9 @@ const ConnectionDetails$5 = () => {
   });
   const handleDownloadPdf = function () {
     try {
-      var _data$WaterConnection1, _data$WaterConnection10, _data$SewerageConnect7, _data$SewerageConnect8, _data$WaterConnection11, _data$SewerageConnect9, _PTData$Properties;
-      const tenantInfo = (data === null || data === void 0 ? void 0 : (_data$WaterConnection1 = data.WaterConnection) === null || _data$WaterConnection1 === void 0 ? void 0 : (_data$WaterConnection10 = _data$WaterConnection1[0]) === null || _data$WaterConnection10 === void 0 ? void 0 : _data$WaterConnection10.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect7 = data.SewerageConnections) === null || _data$SewerageConnect7 === void 0 ? void 0 : (_data$SewerageConnect8 = _data$SewerageConnect7[0]) === null || _data$SewerageConnect8 === void 0 ? void 0 : _data$SewerageConnect8.tenantId);
-      let res = (data === null || data === void 0 ? void 0 : (_data$WaterConnection11 = data.WaterConnection) === null || _data$WaterConnection11 === void 0 ? void 0 : _data$WaterConnection11[0]) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect9 = data.SewerageConnections) === null || _data$SewerageConnect9 === void 0 ? void 0 : _data$SewerageConnect9[0]);
+      var _data$WaterConnection1, _data$WaterConnection10, _data$SewerageConnect1, _data$SewerageConnect10, _data$WaterConnection11, _data$SewerageConnect11, _PTData$Properties;
+      const tenantInfo = (data === null || data === void 0 ? void 0 : (_data$WaterConnection1 = data.WaterConnection) === null || _data$WaterConnection1 === void 0 ? void 0 : (_data$WaterConnection10 = _data$WaterConnection1[0]) === null || _data$WaterConnection10 === void 0 ? void 0 : _data$WaterConnection10.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect1 = data.SewerageConnections) === null || _data$SewerageConnect1 === void 0 ? void 0 : (_data$SewerageConnect10 = _data$SewerageConnect1[0]) === null || _data$SewerageConnect10 === void 0 ? void 0 : _data$SewerageConnect10.tenantId);
+      let res = (data === null || data === void 0 ? void 0 : (_data$WaterConnection11 = data.WaterConnection) === null || _data$WaterConnection11 === void 0 ? void 0 : _data$WaterConnection11[0]) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect11 = data.SewerageConnections) === null || _data$SewerageConnect11 === void 0 ? void 0 : _data$SewerageConnect11[0]);
       const PDFdata = getConnectionDetailsPDF({
         ...res
       }, {
@@ -34802,12 +35089,12 @@ const ConnectionDetails$5 = () => {
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_GENDER_LABEL"),
-    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection16 = data.WaterConnection) === null || _data$WaterConnection16 === void 0 ? void 0 : (_data$WaterConnection17 = _data$WaterConnection16[0]) === null || _data$WaterConnection17 === void 0 ? void 0 : (_data$WaterConnection18 = _data$WaterConnection17.connectionHolders) === null || _data$WaterConnection18 === void 0 ? void 0 : (_data$WaterConnection19 = _data$WaterConnection18[0]) === null || _data$WaterConnection19 === void 0 ? void 0 : _data$WaterConnection19.gender : data === null || data === void 0 ? void 0 : (_data$SewerageConnect0 = data.SewerageConnections) === null || _data$SewerageConnect0 === void 0 ? void 0 : (_data$SewerageConnect1 = _data$SewerageConnect0[0]) === null || _data$SewerageConnect1 === void 0 ? void 0 : (_data$SewerageConnect10 = _data$SewerageConnect1.connectionHolders) === null || _data$SewerageConnect10 === void 0 ? void 0 : (_data$SewerageConnect11 = _data$SewerageConnect10[0]) === null || _data$SewerageConnect11 === void 0 ? void 0 : _data$SewerageConnect11.gender,
+    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection16 = data.WaterConnection) === null || _data$WaterConnection16 === void 0 ? void 0 : (_data$WaterConnection17 = _data$WaterConnection16[0]) === null || _data$WaterConnection17 === void 0 ? void 0 : (_data$WaterConnection18 = _data$WaterConnection17.connectionHolders) === null || _data$WaterConnection18 === void 0 ? void 0 : (_data$WaterConnection19 = _data$WaterConnection18[0]) === null || _data$WaterConnection19 === void 0 ? void 0 : _data$WaterConnection19.gender : data === null || data === void 0 ? void 0 : (_data$SewerageConnect12 = data.SewerageConnections) === null || _data$SewerageConnect12 === void 0 ? void 0 : (_data$SewerageConnect13 = _data$SewerageConnect12[0]) === null || _data$SewerageConnect13 === void 0 ? void 0 : (_data$SewerageConnect14 = _data$SewerageConnect13.connectionHolders) === null || _data$SewerageConnect14 === void 0 ? void 0 : (_data$SewerageConnect15 = _data$SewerageConnect14[0]) === null || _data$SewerageConnect15 === void 0 ? void 0 : _data$SewerageConnect15.gender,
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection20 = data.WaterConnection) === null || _data$WaterConnection20 === void 0 ? void 0 : (_data$WaterConnection21 = _data$WaterConnection20[0]) === null || _data$WaterConnection21 === void 0 ? void 0 : (_data$WaterConnection22 = _data$WaterConnection21.connectionHolders) === null || _data$WaterConnection22 === void 0 ? void 0 : (_data$WaterConnection23 = _data$WaterConnection22[0]) === null || _data$WaterConnection23 === void 0 ? void 0 : _data$WaterConnection23.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect12 = data.SewerageConnections) === null || _data$SewerageConnect12 === void 0 ? void 0 : (_data$SewerageConnect13 = _data$SewerageConnect12[0]) === null || _data$SewerageConnect13 === void 0 ? void 0 : (_data$SewerageConnect14 = _data$SewerageConnect13.connectionHolders) === null || _data$SewerageConnect14 === void 0 ? void 0 : (_data$SewerageConnect15 = _data$SewerageConnect14[0]) === null || _data$SewerageConnect15 === void 0 ? void 0 : _data$SewerageConnect15.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection20 = data.WaterConnection) === null || _data$WaterConnection20 === void 0 ? void 0 : (_data$WaterConnection21 = _data$WaterConnection20[0]) === null || _data$WaterConnection21 === void 0 ? void 0 : (_data$WaterConnection22 = _data$WaterConnection21.connectionHolders) === null || _data$WaterConnection22 === void 0 ? void 0 : (_data$WaterConnection23 = _data$WaterConnection22[0]) === null || _data$WaterConnection23 === void 0 ? void 0 : _data$WaterConnection23.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect16 = data.SewerageConnections) === null || _data$SewerageConnect16 === void 0 ? void 0 : (_data$SewerageConnect17 = _data$SewerageConnect16[0]) === null || _data$SewerageConnect17 === void 0 ? void 0 : (_data$SewerageConnect18 = _data$SewerageConnect17.connectionHolders) === null || _data$SewerageConnect18 === void 0 ? void 0 : (_data$SewerageConnect19 = _data$SewerageConnect18[0]) === null || _data$SewerageConnect19 === void 0 ? void 0 : _data$SewerageConnect19.uuid,
       fieldName: "gender",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -34825,12 +35112,12 @@ const ConnectionDetails$5 = () => {
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_MOBILE_NO_LABEL"),
-    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection24 = data.WaterConnection) === null || _data$WaterConnection24 === void 0 ? void 0 : (_data$WaterConnection25 = _data$WaterConnection24[0]) === null || _data$WaterConnection25 === void 0 ? void 0 : (_data$WaterConnection26 = _data$WaterConnection25.connectionHolders) === null || _data$WaterConnection26 === void 0 ? void 0 : (_data$WaterConnection27 = _data$WaterConnection26[0]) === null || _data$WaterConnection27 === void 0 ? void 0 : _data$WaterConnection27.mobileNumber : data === null || data === void 0 ? void 0 : (_data$SewerageConnect16 = data.SewerageConnections) === null || _data$SewerageConnect16 === void 0 ? void 0 : (_data$SewerageConnect17 = _data$SewerageConnect16[0]) === null || _data$SewerageConnect17 === void 0 ? void 0 : (_data$SewerageConnect18 = _data$SewerageConnect17.connectionHolders) === null || _data$SewerageConnect18 === void 0 ? void 0 : (_data$SewerageConnect19 = _data$SewerageConnect18[0]) === null || _data$SewerageConnect19 === void 0 ? void 0 : _data$SewerageConnect19.mobileNumber,
+    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection24 = data.WaterConnection) === null || _data$WaterConnection24 === void 0 ? void 0 : (_data$WaterConnection25 = _data$WaterConnection24[0]) === null || _data$WaterConnection25 === void 0 ? void 0 : (_data$WaterConnection26 = _data$WaterConnection25.connectionHolders) === null || _data$WaterConnection26 === void 0 ? void 0 : (_data$WaterConnection27 = _data$WaterConnection26[0]) === null || _data$WaterConnection27 === void 0 ? void 0 : _data$WaterConnection27.mobileNumber : data === null || data === void 0 ? void 0 : (_data$SewerageConnect20 = data.SewerageConnections) === null || _data$SewerageConnect20 === void 0 ? void 0 : (_data$SewerageConnect21 = _data$SewerageConnect20[0]) === null || _data$SewerageConnect21 === void 0 ? void 0 : (_data$SewerageConnect22 = _data$SewerageConnect21.connectionHolders) === null || _data$SewerageConnect22 === void 0 ? void 0 : (_data$SewerageConnect23 = _data$SewerageConnect22[0]) === null || _data$SewerageConnect23 === void 0 ? void 0 : _data$SewerageConnect23.mobileNumber,
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection28 = data.WaterConnection) === null || _data$WaterConnection28 === void 0 ? void 0 : (_data$WaterConnection29 = _data$WaterConnection28[0]) === null || _data$WaterConnection29 === void 0 ? void 0 : (_data$WaterConnection30 = _data$WaterConnection29.connectionHolders) === null || _data$WaterConnection30 === void 0 ? void 0 : (_data$WaterConnection31 = _data$WaterConnection30[0]) === null || _data$WaterConnection31 === void 0 ? void 0 : _data$WaterConnection31.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect20 = data.SewerageConnections) === null || _data$SewerageConnect20 === void 0 ? void 0 : (_data$SewerageConnect21 = _data$SewerageConnect20[0]) === null || _data$SewerageConnect21 === void 0 ? void 0 : (_data$SewerageConnect22 = _data$SewerageConnect21.connectionHolders) === null || _data$SewerageConnect22 === void 0 ? void 0 : (_data$SewerageConnect23 = _data$SewerageConnect22[0]) === null || _data$SewerageConnect23 === void 0 ? void 0 : _data$SewerageConnect23.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection28 = data.WaterConnection) === null || _data$WaterConnection28 === void 0 ? void 0 : (_data$WaterConnection29 = _data$WaterConnection28[0]) === null || _data$WaterConnection29 === void 0 ? void 0 : (_data$WaterConnection30 = _data$WaterConnection29.connectionHolders) === null || _data$WaterConnection30 === void 0 ? void 0 : (_data$WaterConnection31 = _data$WaterConnection30[0]) === null || _data$WaterConnection31 === void 0 ? void 0 : _data$WaterConnection31.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect24 = data.SewerageConnections) === null || _data$SewerageConnect24 === void 0 ? void 0 : (_data$SewerageConnect25 = _data$SewerageConnect24[0]) === null || _data$SewerageConnect25 === void 0 ? void 0 : (_data$SewerageConnect26 = _data$SewerageConnect25.connectionHolders) === null || _data$SewerageConnect26 === void 0 ? void 0 : (_data$SewerageConnect27 = _data$SewerageConnect26[0]) === null || _data$SewerageConnect27 === void 0 ? void 0 : _data$SewerageConnect27.uuid,
       fieldName: "connectionHoldersMobileNumber",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -34848,12 +35135,12 @@ const ConnectionDetails$5 = () => {
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_FATHER_OR_HUSBAND_NAME"),
-    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection32 = data.WaterConnection) === null || _data$WaterConnection32 === void 0 ? void 0 : (_data$WaterConnection33 = _data$WaterConnection32[0]) === null || _data$WaterConnection33 === void 0 ? void 0 : (_data$WaterConnection34 = _data$WaterConnection33.connectionHolders) === null || _data$WaterConnection34 === void 0 ? void 0 : (_data$WaterConnection35 = _data$WaterConnection34[0]) === null || _data$WaterConnection35 === void 0 ? void 0 : _data$WaterConnection35.fatherOrHusbandName : data === null || data === void 0 ? void 0 : (_data$SewerageConnect24 = data.SewerageConnections) === null || _data$SewerageConnect24 === void 0 ? void 0 : (_data$SewerageConnect25 = _data$SewerageConnect24[0]) === null || _data$SewerageConnect25 === void 0 ? void 0 : (_data$SewerageConnect26 = _data$SewerageConnect25.connectionHolders) === null || _data$SewerageConnect26 === void 0 ? void 0 : (_data$SewerageConnect27 = _data$SewerageConnect26[0]) === null || _data$SewerageConnect27 === void 0 ? void 0 : _data$SewerageConnect27.fatherOrHusbandName,
+    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection32 = data.WaterConnection) === null || _data$WaterConnection32 === void 0 ? void 0 : (_data$WaterConnection33 = _data$WaterConnection32[0]) === null || _data$WaterConnection33 === void 0 ? void 0 : (_data$WaterConnection34 = _data$WaterConnection33.connectionHolders) === null || _data$WaterConnection34 === void 0 ? void 0 : (_data$WaterConnection35 = _data$WaterConnection34[0]) === null || _data$WaterConnection35 === void 0 ? void 0 : _data$WaterConnection35.fatherOrHusbandName : data === null || data === void 0 ? void 0 : (_data$SewerageConnect28 = data.SewerageConnections) === null || _data$SewerageConnect28 === void 0 ? void 0 : (_data$SewerageConnect29 = _data$SewerageConnect28[0]) === null || _data$SewerageConnect29 === void 0 ? void 0 : (_data$SewerageConnect30 = _data$SewerageConnect29.connectionHolders) === null || _data$SewerageConnect30 === void 0 ? void 0 : (_data$SewerageConnect31 = _data$SewerageConnect30[0]) === null || _data$SewerageConnect31 === void 0 ? void 0 : _data$SewerageConnect31.fatherOrHusbandName,
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection36 = data.WaterConnection) === null || _data$WaterConnection36 === void 0 ? void 0 : (_data$WaterConnection37 = _data$WaterConnection36[0]) === null || _data$WaterConnection37 === void 0 ? void 0 : (_data$WaterConnection38 = _data$WaterConnection37.connectionHolders) === null || _data$WaterConnection38 === void 0 ? void 0 : (_data$WaterConnection39 = _data$WaterConnection38[0]) === null || _data$WaterConnection39 === void 0 ? void 0 : _data$WaterConnection39.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect28 = data.SewerageConnections) === null || _data$SewerageConnect28 === void 0 ? void 0 : (_data$SewerageConnect29 = _data$SewerageConnect28[0]) === null || _data$SewerageConnect29 === void 0 ? void 0 : (_data$SewerageConnect30 = _data$SewerageConnect29.connectionHolders) === null || _data$SewerageConnect30 === void 0 ? void 0 : (_data$SewerageConnect31 = _data$SewerageConnect30[0]) === null || _data$SewerageConnect31 === void 0 ? void 0 : _data$SewerageConnect31.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection36 = data.WaterConnection) === null || _data$WaterConnection36 === void 0 ? void 0 : (_data$WaterConnection37 = _data$WaterConnection36[0]) === null || _data$WaterConnection37 === void 0 ? void 0 : (_data$WaterConnection38 = _data$WaterConnection37.connectionHolders) === null || _data$WaterConnection38 === void 0 ? void 0 : (_data$WaterConnection39 = _data$WaterConnection38[0]) === null || _data$WaterConnection39 === void 0 ? void 0 : _data$WaterConnection39.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect32 = data.SewerageConnections) === null || _data$SewerageConnect32 === void 0 ? void 0 : (_data$SewerageConnect33 = _data$SewerageConnect32[0]) === null || _data$SewerageConnect33 === void 0 ? void 0 : (_data$SewerageConnect34 = _data$SewerageConnect33.connectionHolders) === null || _data$SewerageConnect34 === void 0 ? void 0 : (_data$SewerageConnect35 = _data$SewerageConnect34[0]) === null || _data$SewerageConnect35 === void 0 ? void 0 : _data$SewerageConnect35.uuid,
       fieldName: "fatherOrHusbandName",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -34871,12 +35158,12 @@ const ConnectionDetails$5 = () => {
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_RELATION_LABEL"),
-    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection40 = data.WaterConnection) === null || _data$WaterConnection40 === void 0 ? void 0 : (_data$WaterConnection41 = _data$WaterConnection40[0]) === null || _data$WaterConnection41 === void 0 ? void 0 : (_data$WaterConnection42 = _data$WaterConnection41.connectionHolders) === null || _data$WaterConnection42 === void 0 ? void 0 : (_data$WaterConnection43 = _data$WaterConnection42[0]) === null || _data$WaterConnection43 === void 0 ? void 0 : _data$WaterConnection43.relationship : data === null || data === void 0 ? void 0 : (_data$SewerageConnect32 = data.SewerageConnections) === null || _data$SewerageConnect32 === void 0 ? void 0 : (_data$SewerageConnect33 = _data$SewerageConnect32[0]) === null || _data$SewerageConnect33 === void 0 ? void 0 : (_data$SewerageConnect34 = _data$SewerageConnect33.connectionHolders) === null || _data$SewerageConnect34 === void 0 ? void 0 : (_data$SewerageConnect35 = _data$SewerageConnect34[0]) === null || _data$SewerageConnect35 === void 0 ? void 0 : _data$SewerageConnect35.relationship,
+    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection40 = data.WaterConnection) === null || _data$WaterConnection40 === void 0 ? void 0 : (_data$WaterConnection41 = _data$WaterConnection40[0]) === null || _data$WaterConnection41 === void 0 ? void 0 : (_data$WaterConnection42 = _data$WaterConnection41.connectionHolders) === null || _data$WaterConnection42 === void 0 ? void 0 : (_data$WaterConnection43 = _data$WaterConnection42[0]) === null || _data$WaterConnection43 === void 0 ? void 0 : _data$WaterConnection43.relationship : data === null || data === void 0 ? void 0 : (_data$SewerageConnect36 = data.SewerageConnections) === null || _data$SewerageConnect36 === void 0 ? void 0 : (_data$SewerageConnect37 = _data$SewerageConnect36[0]) === null || _data$SewerageConnect37 === void 0 ? void 0 : (_data$SewerageConnect38 = _data$SewerageConnect37.connectionHolders) === null || _data$SewerageConnect38 === void 0 ? void 0 : (_data$SewerageConnect39 = _data$SewerageConnect38[0]) === null || _data$SewerageConnect39 === void 0 ? void 0 : _data$SewerageConnect39.relationship,
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection44 = data.WaterConnection) === null || _data$WaterConnection44 === void 0 ? void 0 : (_data$WaterConnection45 = _data$WaterConnection44[0]) === null || _data$WaterConnection45 === void 0 ? void 0 : (_data$WaterConnection46 = _data$WaterConnection45.connectionHolders) === null || _data$WaterConnection46 === void 0 ? void 0 : (_data$WaterConnection47 = _data$WaterConnection46[0]) === null || _data$WaterConnection47 === void 0 ? void 0 : _data$WaterConnection47.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect36 = data.SewerageConnections) === null || _data$SewerageConnect36 === void 0 ? void 0 : (_data$SewerageConnect37 = _data$SewerageConnect36[0]) === null || _data$SewerageConnect37 === void 0 ? void 0 : (_data$SewerageConnect38 = _data$SewerageConnect37.connectionHolders) === null || _data$SewerageConnect38 === void 0 ? void 0 : (_data$SewerageConnect39 = _data$SewerageConnect38[0]) === null || _data$SewerageConnect39 === void 0 ? void 0 : _data$SewerageConnect39.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection44 = data.WaterConnection) === null || _data$WaterConnection44 === void 0 ? void 0 : (_data$WaterConnection45 = _data$WaterConnection44[0]) === null || _data$WaterConnection45 === void 0 ? void 0 : (_data$WaterConnection46 = _data$WaterConnection45.connectionHolders) === null || _data$WaterConnection46 === void 0 ? void 0 : (_data$WaterConnection47 = _data$WaterConnection46[0]) === null || _data$WaterConnection47 === void 0 ? void 0 : _data$WaterConnection47.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect40 = data.SewerageConnections) === null || _data$SewerageConnect40 === void 0 ? void 0 : (_data$SewerageConnect41 = _data$SewerageConnect40[0]) === null || _data$SewerageConnect41 === void 0 ? void 0 : (_data$SewerageConnect42 = _data$SewerageConnect41.connectionHolders) === null || _data$SewerageConnect42 === void 0 ? void 0 : (_data$SewerageConnect43 = _data$SewerageConnect42[0]) === null || _data$SewerageConnect43 === void 0 ? void 0 : _data$SewerageConnect43.uuid,
       fieldName: "relationship",
       model: "WnSConnection",
       showValue: false,
@@ -34894,12 +35181,12 @@ const ConnectionDetails$5 = () => {
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Row, {
     className: "border-none",
     label: t("WS_OWN_EMAIL_IDNO_LABEL"),
-    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection48 = data.WaterConnection) === null || _data$WaterConnection48 === void 0 ? void 0 : (_data$WaterConnection49 = _data$WaterConnection48[0]) === null || _data$WaterConnection49 === void 0 ? void 0 : (_data$WaterConnection50 = _data$WaterConnection49.connectionHolders) === null || _data$WaterConnection50 === void 0 ? void 0 : (_data$WaterConnection51 = _data$WaterConnection50[0]) === null || _data$WaterConnection51 === void 0 ? void 0 : _data$WaterConnection51.emailId : data === null || data === void 0 ? void 0 : (_data$SewerageConnect40 = data.SewerageConnections) === null || _data$SewerageConnect40 === void 0 ? void 0 : (_data$SewerageConnect41 = _data$SewerageConnect40[0]) === null || _data$SewerageConnect41 === void 0 ? void 0 : (_data$SewerageConnect42 = _data$SewerageConnect41.connectionHolders) === null || _data$SewerageConnect42 === void 0 ? void 0 : (_data$SewerageConnect43 = _data$SewerageConnect42[0]) === null || _data$SewerageConnect43 === void 0 ? void 0 : _data$SewerageConnect43.emailId,
+    text: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection48 = data.WaterConnection) === null || _data$WaterConnection48 === void 0 ? void 0 : (_data$WaterConnection49 = _data$WaterConnection48[0]) === null || _data$WaterConnection49 === void 0 ? void 0 : (_data$WaterConnection50 = _data$WaterConnection49.connectionHolders) === null || _data$WaterConnection50 === void 0 ? void 0 : (_data$WaterConnection51 = _data$WaterConnection50[0]) === null || _data$WaterConnection51 === void 0 ? void 0 : _data$WaterConnection51.emailId : data === null || data === void 0 ? void 0 : (_data$SewerageConnect44 = data.SewerageConnections) === null || _data$SewerageConnect44 === void 0 ? void 0 : (_data$SewerageConnect45 = _data$SewerageConnect44[0]) === null || _data$SewerageConnect45 === void 0 ? void 0 : (_data$SewerageConnect46 = _data$SewerageConnect45.connectionHolders) === null || _data$SewerageConnect46 === void 0 ? void 0 : (_data$SewerageConnect47 = _data$SewerageConnect46[0]) === null || _data$SewerageConnect47 === void 0 ? void 0 : _data$SewerageConnect47.emailId,
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection52 = data.WaterConnection) === null || _data$WaterConnection52 === void 0 ? void 0 : (_data$WaterConnection53 = _data$WaterConnection52[0]) === null || _data$WaterConnection53 === void 0 ? void 0 : (_data$WaterConnection54 = _data$WaterConnection53.connectionHolders) === null || _data$WaterConnection54 === void 0 ? void 0 : (_data$WaterConnection55 = _data$WaterConnection54[0]) === null || _data$WaterConnection55 === void 0 ? void 0 : _data$WaterConnection55.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect44 = data.SewerageConnections) === null || _data$SewerageConnect44 === void 0 ? void 0 : (_data$SewerageConnect45 = _data$SewerageConnect44[0]) === null || _data$SewerageConnect45 === void 0 ? void 0 : (_data$SewerageConnect46 = _data$SewerageConnect45.connectionHolders) === null || _data$SewerageConnect46 === void 0 ? void 0 : (_data$SewerageConnect47 = _data$SewerageConnect46[0]) === null || _data$SewerageConnect47 === void 0 ? void 0 : _data$SewerageConnect47.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection52 = data.WaterConnection) === null || _data$WaterConnection52 === void 0 ? void 0 : (_data$WaterConnection53 = _data$WaterConnection52[0]) === null || _data$WaterConnection53 === void 0 ? void 0 : (_data$WaterConnection54 = _data$WaterConnection53.connectionHolders) === null || _data$WaterConnection54 === void 0 ? void 0 : (_data$WaterConnection55 = _data$WaterConnection54[0]) === null || _data$WaterConnection55 === void 0 ? void 0 : _data$WaterConnection55.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect48 = data.SewerageConnections) === null || _data$SewerageConnect48 === void 0 ? void 0 : (_data$SewerageConnect49 = _data$SewerageConnect48[0]) === null || _data$SewerageConnect49 === void 0 ? void 0 : (_data$SewerageConnect50 = _data$SewerageConnect49.connectionHolders) === null || _data$SewerageConnect50 === void 0 ? void 0 : (_data$SewerageConnect51 = _data$SewerageConnect50[0]) === null || _data$SewerageConnect51 === void 0 ? void 0 : _data$SewerageConnect51.uuid,
       fieldName: "connectionHoldersEmailId",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -36206,6 +36493,14 @@ const EditApplication = _ref => {
         ...params,
         ...EditDetails
       });
+    } else if (Object.keys(params).length > 0 && (Waterresult || Sewarageresult)) {
+      let currentApp = Waterresult || Sewarageresult;
+      if (currentApp && currentApp.dueVerification && JSON.stringify(currentApp.dueVerification) !== JSON.stringify(params.dueVerification)) {
+        setParams({
+          ...params,
+          dueVerification: currentApp.dueVerification
+        });
+      }
     }
   }, [Waterresult, Sewarageresult]);
   const onSuccess = () => {
@@ -36250,6 +36545,20 @@ const EditApplication = _ref => {
     config = config.slice(startIndex);
   }
   config = config.filter(c => c.route !== "docsrequired" && c.route !== "check");
+  const desiredOrder = ["connection-details", "connection-holder", "djb-employee-details", "disability-details", "property-location-details", "property-water-details", "due-verification-details", "document-details"];
+  let sortedConfig = [];
+  desiredOrder.forEach(route => {
+    const found = config.find(c => c.route === route);
+    if (found) {
+      sortedConfig.push(found);
+    }
+  });
+  config.forEach(c => {
+    if (!sortedConfig.find(sc => sc.route === c.route)) {
+      sortedConfig.push(c);
+    }
+  });
+  config = sortedConfig;
   config.forEach(c => {
     if (c.component === "WSDocumentDetails") {
       c.component = "WSDocumentsEmployee";
@@ -43454,22 +43763,7 @@ const configWSApproverApplication = _ref => {
       cancel: "CS_COMMON_CANCEL"
     },
     form: [{
-      body: [...commentsField, {
-        label: t("WS_APPROVAL_CHECKLIST_BUTTON_UP_FILE"),
-        populators: /*#__PURE__*/React__default.createElement(digitUiReactComponents.UploadFile, {
-          id: "workflow-doc",
-          accept: ".jpg,.pdf,.png,.jpeg",
-          onUpload: selectFile,
-          onDelete: () => {
-            setUploadedFile(null);
-          },
-          message: uploadedFile ? `1 ${t(`ES_PT_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`),
-          error: error,
-          iserror: error,
-          showHintBelow: true,
-          hintText: "WS_HINT_TEXT_LABEL"
-        })
-      }]
+      body: [...commentsField]
     }]
   };
 };
@@ -43520,21 +43814,6 @@ const configWSDisConnectApplication = _ref => {
         populators: {
           name: "comments"
         }
-      }, {
-        label: t("WS_APPROVAL_CHECKLIST_BUTTON_UP_FILE"),
-        populators: /*#__PURE__*/React__default.createElement(digitUiReactComponents.UploadFile, {
-          id: "workflow-doc",
-          accept: ".jpg,.pdf,.png,.jpeg",
-          onUpload: selectFile,
-          onDelete: () => {
-            setUploadedFile(null);
-          },
-          message: uploadedFile ? `1 ${t(`ES_PT_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`),
-          error: error,
-          iserror: error,
-          showHintBelow: true,
-          hintText: "WS_HINT_TEXT_LABEL"
-        })
       }]
     }]
   };
@@ -48431,7 +48710,7 @@ const styles = {
     boxShadow: "none"
   },
   table: {
-    minWidth: 700,
+    width: "100%",
     backgroundColor: "rgba(250, 250, 250, var(--bg-opacity))"
   },
   cell: {
@@ -56919,29 +57198,29 @@ const WSEditApplicationByConfig = () => {
 };
 
 const GetDisconnectionDetails = () => {
-  var _location, _applicationDetails$a, _applicationDetails$p, _applicationDetails$p2, _applicationDetails$p3, _applicationDetails$p4, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _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$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _applicationDetails$a2, _applicationDetails$a3, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _workflowDetails$data28, _workflowDetails$data29, _workflowDetails$data30, _workflowDetails$data31, _applicationDetails$p5, _applicationDetails$p6, _applicationDetails$p7, _applicationDetails$p8, _applicationDetails$p9, _applicationDetails$p0;
+  var _location, _applicationDetails$a, _applicationDetails$a2, _propertySearchData$P, _propertySearchData$P2, _applicationDetails$a3, _applicationDetails$a4, _applicationDetails$p, _applicationDetails$p2, _applicationDetails$p3, _applicationDetails$p4, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _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$data15, _workflowDetails$data16, _workflowDetails$data17, _workflowDetails$data18, _applicationDetails$a5, _applicationDetails$a6, _workflowDetails$data24, _workflowDetails$data25, _workflowDetails$data26, _workflowDetails$data27, _workflowDetails$data28, _workflowDetails$data29, _workflowDetails$data30, _workflowDetails$data31, _workflowDetails$data32, _workflowDetails$data33, _workflowDetails$data34, _workflowDetails$data35, _workflowDetails$data36, _applicationDetails$p5, _applicationDetails$p6, _applicationDetails$p7, _applicationDetails$p8, _applicationDetails$p9, _applicationDetails$p0;
   const getDisconnectionNoticeSearch = function () {
     try {
-      var _applicationDetails$a5, _applicationDetails$a6, _applicationDetails$a7;
+      var _applicationDetails$a8, _applicationDetails$a9, _applicationDetails$a0;
       let key = "ws-waterdisconnectionnotice";
       let details = {
         WaterConnection: [{
           ...(applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData),
-          property: applicationDetails.propertyDetails
+          property: propertyDetails
         }]
       };
-      if (!(applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a5 = applicationDetails.applicationData) !== null && _applicationDetails$a5 !== void 0 && (_applicationDetails$a6 = _applicationDetails$a5.applicationType) !== null && _applicationDetails$a6 !== void 0 && _applicationDetails$a6.includes("WATER"))) {
+      if (!(applicationDetails !== null && applicationDetails !== void 0 && (_applicationDetails$a8 = applicationDetails.applicationData) !== null && _applicationDetails$a8 !== void 0 && (_applicationDetails$a9 = _applicationDetails$a8.applicationType) !== null && _applicationDetails$a9 !== void 0 && _applicationDetails$a9.includes("WATER"))) {
         key = "ws-seweragedisconnectionnotice";
         details = {
           SewerageConnection: [{
             ...(applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData),
-            property: applicationDetails.propertyDetails
+            property: propertyDetails
           }]
         };
       }
-      return Promise.resolve(Digit.WSService.WSDisconnectionNotice(applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a7 = applicationDetails.applicationData) === null || _applicationDetails$a7 === void 0 ? void 0 : _applicationDetails$a7.tenantId, details, key)).then(function (response) {
-        var _applicationDetails$a8;
-        return Promise.resolve(Digit.PaymentService.printReciept(applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a8 = applicationDetails.applicationData) === null || _applicationDetails$a8 === void 0 ? void 0 : _applicationDetails$a8.tenantId, {
+      return Promise.resolve(Digit.WSService.WSDisconnectionNotice(applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a0 = applicationDetails.applicationData) === null || _applicationDetails$a0 === void 0 ? void 0 : _applicationDetails$a0.tenantId, details, key)).then(function (response) {
+        var _applicationDetails$a1;
+        return Promise.resolve(Digit.PaymentService.printReciept(applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a1 = applicationDetails.applicationData) === null || _applicationDetails$a1 === void 0 ? void 0 : _applicationDetails$a1.tenantId, {
           fileStoreIds: response.filestoreIds[0]
         })).then(function (fileStore) {
           window.open(fileStore[response === null || response === void 0 ? void 0 : response.filestoreIds[0]], "_blank");
@@ -56976,11 +57255,44 @@ const GetDisconnectionDetails = () => {
   } = Digit.Hooks.ws.useDisConnectionDetails(t, tenantId, applicationNumber, serviceType, {
     privacy: Digit.Utils.getPrivacyObject()
   });
+  const propertyId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a = applicationDetails.applicationData) === null || _applicationDetails$a === void 0 ? void 0 : _applicationDetails$a.propertyId;
+  const propertyTenantId = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a2 = applicationDetails.applicationData) === null || _applicationDetails$a2 === void 0 ? void 0 : _applicationDetails$a2.tenantId) || tenantId;
+  const {
+    data: propertySearchData,
+    isLoading: isPropertyLoading
+  } = Digit.Hooks.pt.usePropertySearch({
+    filters: {
+      propertyIds: propertyId
+    },
+    tenantId: propertyTenantId
+  }, {
+    filters: {
+      propertyIds: propertyId
+    },
+    tenantId: propertyTenantId,
+    enabled: !!propertyId,
+    privacy: Digit.Utils.getPrivacyObject()
+  });
+  const propertyDetails = (propertySearchData === null || propertySearchData === void 0 ? void 0 : (_propertySearchData$P = propertySearchData.Properties) === null || _propertySearchData$P === void 0 ? void 0 : _propertySearchData$P[0]) || (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.propertyDetails);
+  const detailsWithPropertyAddress = propertySearchData !== null && propertySearchData !== void 0 && (_propertySearchData$P2 = propertySearchData.Properties) !== null && _propertySearchData$P2 !== void 0 && _propertySearchData$P2[0] ? {
+    ...applicationDetails,
+    propertyDetails,
+    applicationDetails: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a3 = applicationDetails.applicationDetails) === null || _applicationDetails$a3 === void 0 ? void 0 : _applicationDetails$a3.map(section => {
+      var _section$values;
+      return (section === null || section === void 0 ? void 0 : section.title) === "WS_COMMON_PROPERTY_DETAILS" ? {
+        ...section,
+        values: (_section$values = section.values) === null || _section$values === void 0 ? void 0 : _section$values.map(value => (value === null || value === void 0 ? void 0 : value.title) === "WS_PROPERTY_ADDRESS_LABEL" ? {
+          ...value,
+          value: getAddress(propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address, t) || t("CS_NA")
+        } : value)
+      } : section;
+    })
+  } : applicationDetails;
   const {
     isServicesMasterLoading,
     data: servicesMasterData
   } = Digit.Hooks.ws.useMDMS(stateCode, "ws-services-masters", ["WSEditApplicationByConfigUser"]);
-  const appStatus = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a = applicationDetails.applicationData) === null || _applicationDetails$a === void 0 ? void 0 : _applicationDetails$a.applicationStatus) || "";
+  const appStatus = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a4 = applicationDetails.applicationData) === null || _applicationDetails$a4 === void 0 ? void 0 : _applicationDetails$a4.applicationStatus) || "";
   let workflowDetails = Digit.Hooks.useWorkflowDetails({
     tenantId: tenantId,
     id: applicationNumber,
@@ -57009,12 +57321,12 @@ const GetDisconnectionDetails = () => {
       if (data.action == "EDIT") workflowDetails.data.actionState.nextActions.push(data);
     });
   }
-  if ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a2 = applicationDetails.applicationData) === null || _applicationDetails$a2 === void 0 ? void 0 : _applicationDetails$a2.applicationStatus) == "DISCONNECTION_EXECUTED") {
+  if ((applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a5 = applicationDetails.applicationData) === null || _applicationDetails$a5 === void 0 ? void 0 : _applicationDetails$a5.applicationStatus) == "DISCONNECTION_EXECUTED") {
     var _workflowDetails$data21, _workflowDetails$data22, _workflowDetails$data23;
     if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data21 = workflowDetails.data) !== null && _workflowDetails$data21 !== void 0 && (_workflowDetails$data22 = _workflowDetails$data21.actionState) !== null && _workflowDetails$data22 !== void 0 && _workflowDetails$data22.nextActions) workflowDetails.data.actionState.nextActions = [];
     if (workflowDetails !== null && workflowDetails !== void 0 && (_workflowDetails$data23 = workflowDetails.data) !== null && _workflowDetails$data23 !== void 0 && _workflowDetails$data23.nextActions) workflowDetails.data.nextActions = [];
   }
-  const applicationNo = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a3 = applicationDetails.applicationData) === null || _applicationDetails$a3 === void 0 ? void 0 : _applicationDetails$a3.applicationNo) || (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo) || applicationNumber;
+  const applicationNo = (applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a6 = applicationDetails.applicationData) === null || _applicationDetails$a6 === void 0 ? void 0 : _applicationDetails$a6.applicationNo) || (applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationNo) || applicationNumber;
   workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data24 = workflowDetails.data) === null || _workflowDetails$data24 === void 0 ? void 0 : (_workflowDetails$data25 = _workflowDetails$data24.nextActions) === null || _workflowDetails$data25 === void 0 ? void 0 : _workflowDetails$data25.forEach(action => {
     if ((action === null || action === void 0 ? void 0 : action.action) === "PAY") {
       action.redirectionUrll = {
@@ -57067,15 +57379,41 @@ const GetDisconnectionDetails = () => {
       };
     }
   });
+  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data32 = workflowDetails.data) === null || _workflowDetails$data32 === void 0 ? void 0 : (_workflowDetails$data33 = _workflowDetails$data32.actionState) === null || _workflowDetails$data33 === void 0 ? void 0 : (_workflowDetails$data34 = _workflowDetails$data33.nextActions) === null || _workflowDetails$data34 === void 0 ? void 0 : _workflowDetails$data34.forEach(action => {
+    if ((action === null || action === void 0 ? void 0 : action.action) === "EXECUTE_DISCONNECTION") {
+      action.redirectionUrl = {
+        action: "EXECUTE_DISCONNECTION",
+        pathname: `/digit-ui/employee/ws/execute-disconnection`,
+        state: {
+          applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
+          action: action,
+          serviceType: serviceType
+        }
+      };
+    }
+  });
+  workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data35 = workflowDetails.data) === null || _workflowDetails$data35 === void 0 ? void 0 : (_workflowDetails$data36 = _workflowDetails$data35.nextActions) === null || _workflowDetails$data36 === void 0 ? void 0 : _workflowDetails$data36.forEach(action => {
+    if ((action === null || action === void 0 ? void 0 : action.action) === "EXECUTE_DISCONNECTION") {
+      action.redirectionUrl = {
+        action: "EXECUTE_DISCONNECTION",
+        pathname: `/digit-ui/employee/ws/execute-disconnection`,
+        state: {
+          applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
+          action: action,
+          serviceType: serviceType
+        }
+      };
+    }
+  });
   const handleDownloadPdf = function () {
     try {
-      var _applicationDetails$a4;
-      const tenantInfo = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a4 = applicationDetails.applicationData) === null || _applicationDetails$a4 === void 0 ? void 0 : _applicationDetails$a4.tenantId;
+      var _applicationDetails$a7;
+      const tenantInfo = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a7 = applicationDetails.applicationData) === null || _applicationDetails$a7 === void 0 ? void 0 : _applicationDetails$a7.tenantId;
       let result = applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData;
       const PDFdata = getWSDisconnectionApplicationForm({
         ...result
       }, {
-        ...(applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.propertyDetails)
+        ...propertyDetails
       }, tenantInfo, t);
       PDFdata.then(ress => Digit.Utils.pdf.generatev1(ress));
       return Promise.resolve();
@@ -57145,9 +57483,9 @@ const GetDisconnectionDetails = () => {
     optionsClassName: "employee-options-btn-className",
     ref: menuRef
   })), /*#__PURE__*/React__default.createElement(ApplicationDetails, {
-    applicationDetails: applicationDetails,
-    isLoading: isLoading || isServicesMasterLoading,
-    isDataLoading: isLoading || isServicesMasterLoading,
+    applicationDetails: detailsWithPropertyAddress,
+    isLoading: isLoading || isPropertyLoading || isServicesMasterLoading,
+    isDataLoading: isLoading || isPropertyLoading || isServicesMasterLoading,
     applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
     mutate: mutate,
     workflowDetails: workflowDetails,
@@ -58733,12 +59071,12 @@ const OLDApplication = () => {
     label: "WS_COMMON_CONNECTION_DETAIL"
   }, {
     label: "WS_COMMON_CONNECTION_HOLDER_DETAILS_HEADER"
+  }, {
+    label: "WS_DJB_EMPLOYEE"
   }, {
     label: "PT_LOCATION_DETAILS"
   }, {
     label: "WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS"
-  }, {
-    label: "WS_DJB_EMPLOYEE"
   }, {
     label: "WS_DOCUMENTS"
   }, {
@@ -59334,6 +59672,473 @@ const OLDApplication = () => {
   })));
 };
 
+const FitterSandbox = _ref => {
+  var _applicationData$addi;
+  let {
+    t,
+    action,
+    applicationData,
+    submitAction,
+    closeModal
+  } = _ref;
+  const [beforeImage, setBeforeImage] = React.useState(null);
+  const [afterImage, setAfterImage] = React.useState(null);
+  const [meterReading, setMeterReading] = React.useState("");
+  const [gpsLocation, setGpsLocation] = React.useState("Fetching GPS...");
+  const [timestamp, setTimestamp] = React.useState("");
+  const [error, setError] = React.useState(null);
+  const handleUpload = function (e, setFileId) {
+    try {
+      const file = e.target.files[0];
+      if (!file) return Promise.resolve();
+      const _temp = _catch(function () {
+        return Promise.resolve(Digit.UploadServices.Filestorage("WS", file, Digit.ULBService.getCurrentTenantId())).then(function (response) {
+          var _response$data, _response$data$files;
+          if ((response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$files = _response$data.files) === null || _response$data$files === void 0 ? void 0 : _response$data$files.length) > 0) {
+            setFileId(response.data.files[0].fileStoreId);
+          }
+        });
+      }, function () {
+        setError("File upload failed.");
+      });
+      return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  React.useEffect(() => {
+    if (navigator.geolocation) {
+      navigator.geolocation.getCurrentPosition(position => {
+        setGpsLocation(`<b>${position.coords.latitude.toFixed(4)}° N, ${position.coords.longitude.toFixed(4)}° E</b>`);
+      }, error => {
+        setGpsLocation("<b>Location access denied</b>");
+      });
+    } else {
+      setGpsLocation("<b>Geolocation not supported</b>");
+    }
+    const now = new Date();
+    setTimestamp(`<b>${now.toLocaleDateString('en-US')}, ${now.toLocaleTimeString('en-US')}</b>`);
+  }, []);
+  const handleSubmit = () => {
+    if (!beforeImage || !afterImage || !meterReading) {
+      setError("Please provide Before Photograph, Final Meter Index Reading, and After Photograph.");
+      return;
+    }
+    const payload = {
+      ...applicationData
+    };
+    const docArray = [{
+      documentType: "BEFORE_PHOTOGRAPH",
+      fileStoreId: beforeImage,
+      id: null,
+      documentUid: beforeImage,
+      documentNumber: null,
+      auditDetails: null,
+      status: "ACTIVE",
+      isVerified: false
+    }, {
+      documentType: "AFTER_PHOTOGRAPH",
+      fileStoreId: afterImage,
+      id: null,
+      documentUid: afterImage,
+      documentNumber: null,
+      auditDetails: null,
+      status: "ACTIVE",
+      isVerified: false
+    }];
+    payload.connectionExecutionDate = Date.now();
+    payload.disconnectionExecutionDate = Date.now();
+    payload.wfDocuments = docArray;
+    payload.documents = [...(payload.documents || []), ...docArray];
+    payload.additionalDetails = {
+      ...payload.additionalDetails,
+      finalMeterReading: meterReading,
+      disconnectionGpsLocation: gpsLocation.replace(/<[^>]*>?/gm, ""),
+      disconnectionTimestamp: timestamp.replace(/<[^>]*>?/gm, "")
+    };
+    payload.processInstance = {
+      ...payload.processInstance,
+      action: action === null || action === void 0 ? void 0 : action.action,
+      comment: `Meter Reading: ${meterReading} m3`,
+      documents: docArray
+    };
+    if ((payload === null || payload === void 0 ? void 0 : payload.serviceType) === "WATER") {
+      submitAction({
+        WaterConnection: payload,
+        disconnectRequest: true
+      });
+    } else {
+      submitAction({
+        SewerageConnection: payload,
+        disconnectRequest: true
+      });
+    }
+  };
+  return /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      backgroundColor: "#fff9f9",
+      padding: "24px",
+      borderRadius: "8px",
+      border: "1px solid #ffebeb"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      justifyContent: "space-between",
+      alignItems: "flex-start",
+      marginBottom: "24px"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "flex-start",
+      gap: "12px"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      color: "#d4351c",
+      marginTop: "4px"
+    }
+  }, /*#__PURE__*/React__default.createElement("svg", {
+    width: "24",
+    height: "24",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    stroke: "currentColor",
+    strokeWidth: "2",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }, /*#__PURE__*/React__default.createElement("polyline", {
+    points: "22 12 18 12 15 21 9 3 6 12 2 12"
+  }))), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("h2", {
+    style: {
+      fontSize: "16px",
+      fontWeight: "700",
+      color: "#3b1c1c",
+      margin: 0,
+      textTransform: "uppercase"
+    }
+  }, "FITTER SANDBOX MOBILE TERMINAL (DIGITAL VERIFICATION)"), /*#__PURE__*/React__default.createElement("p", {
+    style: {
+      fontSize: "14px",
+      color: "#6e5e5e",
+      margin: "4px 0 0 0"
+    }
+  }, "Simulate the physical field actions of Delhi Jal Board fitter ", (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$addi = applicationData.additionalDetails) === null || _applicationData$addi === void 0 ? void 0 : _applicationData$addi.ownerName) || "Amit Kumar", "."))), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      backgroundColor: "#ffeded",
+      color: "#d4351c",
+      padding: "4px 12px",
+      borderRadius: "4px",
+      fontSize: "12px",
+      fontWeight: "700"
+    }
+  }, "FIELD SIMULATOR")), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "16px",
+      marginBottom: "24px"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      flex: 1,
+      backgroundColor: "#ffffff",
+      padding: "20px",
+      borderRadius: "8px",
+      border: "1px solid #eaebec",
+      textAlign: "center"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      color: "#6a7b8c",
+      marginBottom: "12px"
+    }
+  }, /*#__PURE__*/React__default.createElement("svg", {
+    width: "24",
+    height: "24",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    stroke: "currentColor",
+    strokeWidth: "2"
+  }, /*#__PURE__*/React__default.createElement("path", {
+    d: "M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"
+  }), /*#__PURE__*/React__default.createElement("polyline", {
+    points: "17 8 12 3 7 8"
+  }), /*#__PURE__*/React__default.createElement("line", {
+    x1: "12",
+    y1: "3",
+    x2: "12",
+    y2: "15"
+  }))), /*#__PURE__*/React__default.createElement("h3", {
+    style: {
+      fontSize: "16px",
+      fontWeight: "700",
+      margin: "0 0 8px 0"
+    }
+  }, "Before Photograph"), /*#__PURE__*/React__default.createElement("p", {
+    style: {
+      fontSize: "12px",
+      color: "#8a96a3",
+      margin: "0 0 16px 0"
+    }
+  }, "Upload Pre-Disconnection site"), /*#__PURE__*/React__default.createElement(digitUiReactComponents.UploadFile, {
+    id: "before-photo",
+    accept: ".jpg,.png,.jpeg",
+    onUpload: e => handleUpload(e, setBeforeImage),
+    onDelete: () => setBeforeImage(null),
+    message: beforeImage ? `1 File Uploaded` : `Upload`,
+    showHintBelow: false
+  })), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      flex: 1,
+      backgroundColor: "#ffffff",
+      padding: "20px",
+      borderRadius: "8px",
+      border: "1px solid #eaebec"
+    }
+  }, /*#__PURE__*/React__default.createElement("h3", {
+    style: {
+      fontSize: "12px",
+      fontWeight: "700",
+      color: "#8a96a3",
+      margin: "0 0 8px 0",
+      textTransform: "uppercase"
+    }
+  }, "FINAL METER INDEX READING"), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex",
+      alignItems: "center",
+      gap: "8px",
+      marginBottom: "8px"
+    }
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+    style: {
+      margin: 0,
+      flex: 1,
+      fontSize: "18px",
+      fontWeight: "600"
+    },
+    value: meterReading,
+    onChange: e => setMeterReading(e.target.value),
+    placeholder: "e.g. 1402.5"
+  }), /*#__PURE__*/React__default.createElement("span", {
+    style: {
+      fontSize: "14px",
+      fontWeight: "600",
+      color: "#6a7b8c"
+    }
+  }, "m\xB3")), /*#__PURE__*/React__default.createElement("p", {
+    style: {
+      fontSize: "12px",
+      color: "#8a96a3",
+      margin: 0
+    }
+  }, "Locks absolute consumption meter index.")), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      flex: 1,
+      backgroundColor: "#ffffff",
+      padding: "20px",
+      borderRadius: "8px",
+      border: "1px solid #eaebec",
+      textAlign: "center"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      color: "#6a7b8c",
+      marginBottom: "12px"
+    }
+  }, /*#__PURE__*/React__default.createElement("svg", {
+    width: "24",
+    height: "24",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    stroke: "currentColor",
+    strokeWidth: "2"
+  }, /*#__PURE__*/React__default.createElement("path", {
+    d: "M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"
+  }), /*#__PURE__*/React__default.createElement("polyline", {
+    points: "17 8 12 3 7 8"
+  }), /*#__PURE__*/React__default.createElement("line", {
+    x1: "12",
+    y1: "3",
+    x2: "12",
+    y2: "15"
+  }))), /*#__PURE__*/React__default.createElement("h3", {
+    style: {
+      fontSize: "16px",
+      fontWeight: "700",
+      margin: "0 0 8px 0"
+    }
+  }, "After Photograph"), /*#__PURE__*/React__default.createElement("p", {
+    style: {
+      fontSize: "12px",
+      color: "#8a96a3",
+      margin: "0 0 16px 0"
+    }
+  }, "Upload Capped Line proof"), /*#__PURE__*/React__default.createElement(digitUiReactComponents.UploadFile, {
+    id: "after-photo",
+    accept: ".jpg,.png,.jpeg",
+    onUpload: e => handleUpload(e, setAfterImage),
+    onDelete: () => setAfterImage(null),
+    message: afterImage ? `1 File Uploaded` : `Upload`,
+    showHintBelow: false
+  }))), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      backgroundColor: "#ffffff",
+      padding: "16px",
+      borderRadius: "8px",
+      border: "1px solid #eaebec",
+      display: "flex",
+      justifyContent: "space-between",
+      marginBottom: "24px",
+      fontFamily: "monospace",
+      fontSize: "14px",
+      color: "#6a7b8c"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", null, "GPS Location: ", /*#__PURE__*/React__default.createElement("span", {
+    dangerouslySetInnerHTML: {
+      __html: gpsLocation
+    }
+  })), /*#__PURE__*/React__default.createElement("div", null, "Timestamp: ", /*#__PURE__*/React__default.createElement("span", {
+    dangerouslySetInnerHTML: {
+      __html: timestamp
+    }
+  }))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.ButtonSelector, {
+    label: /*#__PURE__*/React__default.createElement("div", {
+      style: {
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        gap: "8px"
+      }
+    }, /*#__PURE__*/React__default.createElement("svg", {
+      width: "18",
+      height: "18",
+      viewBox: "0 0 24 24",
+      fill: "none",
+      stroke: "#28a745",
+      strokeWidth: "2"
+    }, /*#__PURE__*/React__default.createElement("polyline", {
+      points: "20 6 9 17 4 12"
+    })), /*#__PURE__*/React__default.createElement("span", {
+      style: {
+        color: "#6a7b8c"
+      }
+    }, "Submit")),
+    onSubmit: handleSubmit,
+    style: {
+      width: "100%",
+      backgroundColor: "#e9ecef",
+      border: "none",
+      borderRadius: "8px",
+      fontWeight: "700"
+    },
+    textStyles: {
+      width: "100%"
+    }
+  }), error && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
+    error: true,
+    label: error,
+    onClose: () => setError(null)
+  }));
+};
+
+const WSExecuteDisconnection = () => {
+  var _applicationData$appl;
+  const {
+    t
+  } = reactI18next.useTranslation();
+  let {
+    state
+  } = reactRouterDom.useLocation();
+  const applicationData = state === null || state === void 0 ? void 0 : state.applicationData;
+  const action = state === null || state === void 0 ? void 0 : state.action;
+  const serviceType = (state === null || state === void 0 ? void 0 : state.serviceType) || (applicationData !== null && applicationData !== void 0 && (_applicationData$appl = applicationData.applicationNo) !== null && _applicationData$appl !== void 0 && _applicationData$appl.includes("WS") ? "WATER" : "SEWERAGE");
+  const history = reactRouterDom.useHistory();
+  const [showConfirmation, setShowConfirmation] = React.useState(false);
+  const [payload, setPayload] = React.useState(null);
+  const [isEnableLoader, setIsEnableLoader] = React.useState(false);
+  const [showToast, setShowToast] = React.useState(null);
+  const {
+    isLoading: updatingApplication,
+    isError: updateApplicationError,
+    data: updateResponse,
+    error: updateError,
+    mutate
+  } = Digit.Hooks.ws.useWSApplicationActions(serviceType);
+  const onSubmitAction = data => {
+    setPayload(data);
+    setShowConfirmation(true);
+  };
+  const executeAction = () => {
+    setShowConfirmation(false);
+    setIsEnableLoader(true);
+    if (mutate) {
+      mutate(payload, {
+        onError: (error, variables) => {
+          setIsEnableLoader(false);
+          setShowToast({
+            key: "error",
+            message: error !== null && error !== void 0 && error.message ? error.message : error
+          });
+        },
+        onSuccess: (data, variables) => {
+          setIsEnableLoader(false);
+          setShowToast({
+            key: false,
+            message: "Disconnection Executed Successfully"
+          });
+          setTimeout(() => {
+            history.push(`/digit-ui/employee/ws/application-details?applicationNumber=${applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationNo}&service=${serviceType}`);
+          }, 3000);
+        }
+      });
+    }
+  };
+  if (isEnableLoader || updatingApplication) {
+    return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
+  }
+  return /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      padding: "20px"
+    }
+  }, /*#__PURE__*/React__default.createElement(FitterSandbox, {
+    t: t,
+    action: action,
+    applicationData: applicationData,
+    submitAction: onSubmitAction,
+    closeModal: () => history.goBack()
+  }), showConfirmation && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Modal, {
+    headerBarMain: /*#__PURE__*/React__default.createElement("h1", {
+      className: "heading-m"
+    }, "Confirmation"),
+    headerBarEnd: /*#__PURE__*/React__default.createElement("div", {
+      onClick: () => setShowConfirmation(false),
+      style: {
+        cursor: "pointer",
+        fontSize: "16px",
+        padding: "10px"
+      }
+    }, "\u2715"),
+    actionCancelLabel: "Cancel",
+    actionCancelOnSubmit: () => setShowConfirmation(false),
+    actionSaveLabel: "Yes",
+    actionSaveOnSubmit: executeAction
+  }, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      padding: "16px"
+    }
+  }, /*#__PURE__*/React__default.createElement("p", {
+    style: {
+      fontSize: "16px"
+    }
+  }, "Are you sure you want to execute disconnection?"))), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
+    error: showToast.key === "error",
+    label: t(showToast === null || showToast === void 0 ? void 0 : showToast.message),
+    onClose: () => setShowToast(null)
+  }));
+};
+
 const WSModule = _ref => {
   var _Digit$SessionStorage;
   let {
@@ -59391,6 +60196,9 @@ const WSLinks = _ref2 => {
   }, {
     link: `${matchPath}/mutation-application`,
     i18nKey: t("WS_APPLY_MUTATION")
+  }, {
+    link: `${matchPath}/disconnect-application`,
+    i18nKey: t("WS_DISCONNECTION")
   }];
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.CitizenHomeCard, {
     header: t("ACTION_TEST_WATER_AND_SEWERAGE"),
@@ -59497,7 +60305,8 @@ const componentsToRegister = {
   WSSearchWaterConnectionViewIntegrated: SearchWaterConnectionViewIntegrated,
   WSBulkBillGeneration: BulkBillGeneration,
   WSOLDApplication: OLDApplication,
-  WSDivyangjan: WSDivyangjan
+  WSDivyangjan: WSDivyangjan,
+  WSExecuteDisconnection: WSExecuteDisconnection
 };
 const initWSComponents = () => {
   Object.entries(componentsToRegister).forEach(_ref3 => {