@djb25/digit-ui-module-ws 1.0.34 → 1.0.36

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef, useMemo, Fragment as Fragment$1, useReducer, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link, useHistory, useLocation, Switch, Route, useRouteMatch, Redirect, useParams } from 'react-router-dom';
-import { InfoBannerIcon, Loader, Header, Table, Card, Banner, CardText, ActionBar, SubmitBar, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, HomeIcon, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, CardLabel, RadioOrSelect, TextInput, CardHeader, CitizenInfoLabel, CardSubHeader, Dropdown, UploadFile, CheckBox, RadioButtons, MobileNumber, LabelFieldPair, DatePicker, CollapsibleCardPage, ViewsIcon, Modal, DeleteIcon, CardLabelError, WrapUnMaskComponent, StatusTable, Row, CardSectionHeader, InfoIcon, TextArea, SearchField, FilterFormField, RemoveableTag, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, Localities, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, CheckPoint, ConnectingCheckPoints, ActionLinks, PDFSvg, KeyNote, EditIcon, CardSectionSubText, DownloadIcon, CardLabelDesc, VerticalTimeline, FormComposer, MultiUploadWrapper, Close as Close$e, BreakLine, Menu, ButtonSelector, GenericFileIcon, CitizenHomeCard } from '@djb25/digit-ui-react-components';
+import { Loader, Card, KeyNote, SubmitBar, InfoBannerIcon, Header, Banner, CardText, ActionBar, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, HomeIcon, PrintBtnCommon, MultiLink, LinkButton, Toast, TickMark, FormStep, CardLabel, RadioOrSelect, TextInput, CardHeader, CitizenInfoLabel, CardSubHeader, Dropdown, UploadFile, CheckBox, RadioButtons, MobileNumber, LabelFieldPair, DatePicker, CollapsibleCardPage, ViewsIcon, Modal, DeleteIcon, CardLabelError, WrapUnMaskComponent, StatusTable, Row, CardSectionHeader, InfoIcon, TextArea, SearchField, FilterFormField, RemoveableTag, MultiSelectDropdown, InboxComposer, DropIcon, WSICon, EmployeeModuleCard, SearchAction, PopUp, DetailsCard, SearchForm, CloseSvg, Table, Localities, DownloadBtnCommon, CollectionIcon, ResponseComposer, TelePhone, DisplayPhotos, CheckPoint, ConnectingCheckPoints, ActionLinks, PDFSvg, EditIcon, Label, CardSectionSubText, DownloadIcon, CardLabelDesc, VerticalTimeline, FormComposer, MultiUploadWrapper, Close as Close$e, BreakLine, Menu, ButtonSelector, GenericFileIcon, CitizenHomeCard } from '@djb25/digit-ui-react-components';
 import { useForm, Controller, useWatch, useFormContext } from 'react-hook-form';
 import { read, utils as utils$1 } from 'xlsx';
 import { useQueryClient } from 'react-query';
@@ -1368,7 +1368,8 @@ const convertApplicationData = (data, serviceType, modify = false, editByConfig
         documentType: data === null || data === void 0 ? void 0 : data.documentType,
         id: data.id,
         documentUid: data === null || data === void 0 ? void 0 : data.documentUid,
-        fileStoreId: data === null || data === void 0 ? void 0 : data.fileStoreId
+        fileStoreId: data === null || data === void 0 ? void 0 : data.fileStoreId,
+        isVerified: data === null || data === void 0 ? void 0 : data.isVerified
       });
     });
   }
@@ -1569,7 +1570,8 @@ const convertDisonnectApplicationData = (data, serviceType, editByConfig = false
         documentType: data === null || data === void 0 ? void 0 : data.documentType,
         id: data.id,
         documentUid: data === null || data === void 0 ? void 0 : data.documentUid,
-        fileStoreId: data === null || data === void 0 ? void 0 : data.fileStoreId
+        fileStoreId: data === null || data === void 0 ? void 0 : data.fileStoreId,
+        isVerified: data === null || data === void 0 ? void 0 : data.isVerified
       });
     });
   }
@@ -7586,6 +7588,117 @@ var lodash = createCommonjsModule(function (module, exports) {
   }).call(commonjsGlobal);
 });
 
+const WSApplication = ({
+  application
+}) => {
+  var _user$info, _user$info$userName, _user$info2, _user$info3, _application$applicat, _application$applicat2, _application$applicat3, _application$applicat4, _application$applicat5, _application$connecti, _application$property, _application$property2, _application$property3, _application$property4, _application$property5, _application$property6, _application$applicat6, _application$connecti2, _application$connecti3, _PTData$Properties, _PTData$Properties$, _PTData$Properties$$o, _application$applicat7;
+  const {
+    t
+  } = useTranslation();
+  const user = Digit.UserService.getUser();
+  const userMobileNumber = user !== null && user !== void 0 && (_user$info = user.info) !== null && _user$info !== void 0 && (_user$info$userName = _user$info.userName) !== null && _user$info$userName !== void 0 && _user$info$userName.match(/^[0-9]{10}$/) ? user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.userName : user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber;
+  let encodeApplicationNo = encodeURI(application.applicationNo);
+  let filter1 = {
+    tenantId: application.tenantId,
+    applicationNumber: application.applicationNo
+  };
+  const {
+    isLoading,
+    isError,
+    error,
+    data
+  } = Digit.Hooks.ws.useMyApplicationSearch({
+    filters: filter1,
+    BusinessService: (_application$applicat = application.applicationNo) !== null && _application$applicat !== void 0 && _application$applicat.includes("SW") ? "SW" : "WS"
+  }, {
+    filters: filter1,
+    privacy: Digit.Utils.getPrivacyObject()
+  });
+  const {
+    isLoading: isPTLoading,
+    isError: isPTError,
+    error: PTerror,
+    data: PTData
+  } = Digit.Hooks.pt.usePropertySearch({
+    tenantId: application === null || application === void 0 ? void 0 : application.tenantId,
+    filters: {
+      propertyIds: application === null || application === void 0 ? void 0 : application.propertyId
+    }
+  }, {
+    filters: {
+      propertyIds: application === null || application === void 0 ? void 0 : application.propertyId
+    },
+    privacy: Digit.Utils.getPrivacyObject()
+  });
+  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" : "SW.ONE_TIME_FEE" : application !== null && application !== void 0 && (_application$applicat4 = application.applicationNo) !== null && _application$applicat4 !== void 0 && _application$applicat4.includes("DC") ? "WS" : "WS.ONE_TIME_FEE";
+  const fetchBillParams = {
+    consumerCode: application !== null && application !== void 0 && (_application$applicat5 = application.applicationNo) !== null && _application$applicat5 !== void 0 && _application$applicat5.includes("DC") ? application === null || application === void 0 ? void 0 : application.connectionNo : application === null || application === void 0 ? void 0 : application.connectionNo
+  };
+  if (isLoading) {
+    return /*#__PURE__*/React.createElement(Loader, null);
+  }
+  return /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(KeyNote, {
+    keyValue: t("WS_MYCONNECTIONS_APPLICATION_NO"),
+    note: application === null || application === void 0 ? void 0 : application.applicationNo
+  }), /*#__PURE__*/React.createElement(KeyNote, {
+    keyValue: t("WS_SERVICE_NAME"),
+    note: t(`WS_APPLICATION_TYPE_${application === null || application === void 0 ? void 0 : application.applicationType}`)
+  }), /*#__PURE__*/React.createElement(KeyNote, {
+    keyValue: t("WS_CONSUMER_NAME"),
+    note: (application === null || application === void 0 ? void 0 : (_application$connecti = application.connectionHolders) === null || _application$connecti === void 0 ? void 0 : _application$connecti.map(owner => owner.name).join(",")) || (application === null || application === void 0 ? void 0 : (_application$property = application.property) === null || _application$property === void 0 ? void 0 : (_application$property2 = _application$property.owners) === null || _application$property2 === void 0 ? void 0 : _application$property2.sort((a, b) => {
+      var _a$additionalDetails, _b$additionalDetails;
+      return (a === null || a === void 0 ? void 0 : (_a$additionalDetails = a.additionalDetails) === null || _a$additionalDetails === void 0 ? void 0 : _a$additionalDetails.ownerSequence) - (b === null || b === void 0 ? void 0 : (_b$additionalDetails = b.additionalDetails) === null || _b$additionalDetails === void 0 ? void 0 : _b$additionalDetails.ownerSequence);
+    }).map(owner => owner.name).join(",")) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(KeyNote, {
+    keyValue: t("WS_PROPERTY_ID"),
+    note: (application === null || application === void 0 ? void 0 : application.propertyId) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(KeyNote, {
+    keyValue: t("WS_STATUS"),
+    note: t(`CS_${application === null || application === void 0 ? void 0 : application.applicationStatus}`) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(KeyNote, {
+    keyValue: t("WS_SLA"),
+    note: Math.round((application === null || application === void 0 ? void 0 : application.sla) / (24 * 60 * 60 * 1000)) ? `${Math.round((application === null || application === void 0 ? void 0 : application.sla) / (24 * 60 * 60 * 1000))} Days` : t("CS_NA")
+  }), /*#__PURE__*/React.createElement(KeyNote, {
+    keyValue: t("WS_PROPERTY_ADDRESS"),
+    note: getAddress(application === null || application === void 0 ? void 0 : (_application$property3 = application.property) === null || _application$property3 === void 0 ? void 0 : _application$property3.address, t),
+    privacy: {
+      uuid: application === null || application === void 0 ? void 0 : (_application$property4 = application.property) === null || _application$property4 === void 0 ? void 0 : (_application$property5 = _application$property4.owners) === null || _application$property5 === void 0 ? void 0 : (_application$property6 = _application$property5[0]) === null || _application$property6 === void 0 ? void 0 : _application$property6.uuid,
+      fieldName: ["doorNo", "street", "landmark"],
+      model: "Property",
+      showValue: true,
+      loadData: {
+        serviceName: "/property-services/property/_search",
+        requestBody: {},
+        requestParam: {
+          tenantId: (application === null || application === void 0 ? void 0 : application.tenantId) || "dl.djb",
+          mobileNumber: userMobileNumber
+        },
+        jsonPath: "Properties[0].address.street",
+        isArray: false,
+        d: res => {
+          let resultString = (lodash.get(res, "Properties[0].address.doorNo") ? `${lodash.get(res, "Properties[0].address.doorNo")}, ` : "") + (lodash.get(res, "Properties[0].address.street") ? `${lodash.get(res, "Properties[0].address.street")}, ` : "") + (lodash.get(res, "Properties[0].address.landmark") ? `${lodash.get(res, "Properties[0].address.landmark")}` : "");
+          return resultString;
+        }
+      }
+    }
+  }), /*#__PURE__*/React.createElement(Link, {
+    to: `/digit-ui/citizen/ws/connection/application/${encodeApplicationNo}`
+  }, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("WS_VIEW_DETAILS_LABEL")
+  })), (application === null || application === void 0 ? void 0 : application.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React.createElement(Link, {
+    to: {
+      pathname: `/digit-ui/citizen/payment/my-bills/${businessService}/${application !== null && application !== void 0 && (_application$applicat6 = application.applicationNo) !== null && _application$applicat6 !== void 0 && _application$applicat6.includes("DC") ? stringReplaceAll(application === null || application === void 0 ? void 0 : application.connectionNo, "/", "+") || stringReplaceAll(application === null || application === void 0 ? void 0 : application.connectionNo, "/", "+") : stringReplaceAll(application === null || application === void 0 ? void 0 : application.applicationNo, "/", "+") || stringReplaceAll(application === null || application === void 0 ? void 0 : application.applicationNo, "/", "+")}?workflow=WNS&tenantId=${application === null || application === void 0 ? void 0 : application.tenantId}&ConsumerName=${(application === null || application === void 0 ? void 0 : (_application$connecti2 = application.connectionHolders) === null || _application$connecti2 === void 0 ? void 0 : _application$connecti2.map(owner => owner.name).join(",")) || (application === null || application === void 0 ? void 0 : (_application$connecti3 = application.connectionHolders) === null || _application$connecti3 === void 0 ? void 0 : _application$connecti3.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties = PTData.Properties) === null || _PTData$Properties === void 0 ? void 0 : (_PTData$Properties$ = _PTData$Properties[0]) === null || _PTData$Properties$ === void 0 ? void 0 : (_PTData$Properties$$o = _PTData$Properties$.owners) === null || _PTData$Properties$$o === void 0 ? void 0 : _PTData$Properties$$o.map(owner => owner.name).join(","))}&isDisoconnectFlow=${application !== null && application !== void 0 && (_application$applicat7 = application.applicationNo) !== null && _application$applicat7 !== void 0 && _application$applicat7.includes("DC") ? true : false}`,
+      state: {}
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "10px"
+    }
+  }, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("MAKE_PAYMENT")
+  }))) : null);
+};
+
 const EyeSvgINdex = ({
   style
 }) => {
@@ -7641,19 +7754,20 @@ const WSInfoLabel = ({
 };
 
 const WSMyApplications = () => {
-  var _Digit$SessionStorage, _user$info, _user$info2, _user$info3, _data$WaterConnection, _SWdata$SewerageConne, _user$info4, _user$info5, _user$info6, _WSapplicationsList, _SWapplicationsList, _WSapplicationsList2, _SWapplicationsList2, _applicationsList, _applicationsList2;
+  var _user$info, _user$info$userName, _user$info2, _user$info3, _data$WaterConnection, _SWdata$SewerageConne, _data$WaterConnection2, _SWdata$SewerageConne2, _WSapplicationsList, _SWapplicationsList, _WSapplicationsList2, _SWapplicationsList2, _applicationsList, _applicationsList2;
   const {
     t
   } = useTranslation();
   const user = Digit.UserService.getUser();
-  const tenantId = ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code) || (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.permanentCity) || Digit.ULBService.getCurrentTenantId();
+  const tenantId = "dl.djb";
   let filter = window.location.href.split("/").pop();
+  const userMobileNumber = user !== null && user !== void 0 && (_user$info = user.info) !== null && _user$info !== void 0 && (_user$info$userName = _user$info.userName) !== null && _user$info$userName !== void 0 && _user$info$userName.match(/^[0-9]{10}$/) ? user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.userName : user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber;
   let filter1 = !isNaN(parseInt(filter)) ? {
     tenantId: tenantId,
-    mobileNumber: user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.mobileNumber
+    mobileNumber: userMobileNumber
   } : {
     tenantId: tenantId,
-    mobileNumber: user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber
+    mobileNumber: userMobileNumber
   };
   const {
     isLoading,
@@ -7678,7 +7792,7 @@ const WSMyApplications = () => {
   });
   let applicationNoWS = data && (data === null || data === void 0 ? void 0 : (_data$WaterConnection = data.WaterConnection) === null || _data$WaterConnection === void 0 ? void 0 : _data$WaterConnection.map(ob => ob.applicationNo).join(",")) || "";
   let applicaionNoSW = SWdata && (SWdata === null || SWdata === void 0 ? void 0 : (_SWdata$SewerageConne = SWdata.SewerageConnections) === null || _SWdata$SewerageConne === void 0 ? void 0 : _SWdata$SewerageConne.map(ob => ob.applicationNo).join(",")) || "";
-  let applicationNos = [applicationNoWS, applicaionNoSW].filter(Boolean).join(",");
+  let applicationNos = applicationNoWS.concat(applicaionNoSW);
   let workflowDetails = Digit.Hooks.useWorkflowDetails({
     tenantId: tenantId,
     id: applicationNos,
@@ -7687,20 +7801,24 @@ const WSMyApplications = () => {
       enabled: !!applicationNos
     }
   });
+  let propertyWS = data && (data === null || data === void 0 ? void 0 : (_data$WaterConnection2 = data.WaterConnection) === null || _data$WaterConnection2 === void 0 ? void 0 : _data$WaterConnection2.map(ob => ob === null || ob === void 0 ? void 0 : ob.propertyId).join(",")) || "";
+  let propertySW = SWdata && (SWdata === null || SWdata === void 0 ? void 0 : (_SWdata$SewerageConne2 = SWdata.SewerageConnections) === null || _SWdata$SewerageConne2 === void 0 ? void 0 : _SWdata$SewerageConne2.map(ob => ob === null || ob === void 0 ? void 0 : ob.propertyId).join(",")) || "";
+  let propertyNos = propertyWS.concat(propertySW);
   const {
     isLoading: PTisLoading,
     isError: PTisError,
     error: PTerror,
     data: PTdata
   } = Digit.Hooks.pt.usePropertySearch({
+    tenantId: tenantId,
     filters: {
-      mobileNumber: user === null || user === void 0 ? void 0 : (_user$info4 = user.info) === null || _user$info4 === void 0 ? void 0 : _user$info4.mobileNumber
+      mobileNumber: userMobileNumber
     }
   }, {
     filters: {
-      mobileNumber: user === null || user === void 0 ? void 0 : (_user$info5 = user.info) === null || _user$info5 === void 0 ? void 0 : _user$info5.mobileNumber
+      mobileNumber: userMobileNumber
     },
-    enabled: user !== null && user !== void 0 && (_user$info6 = user.info) !== null && _user$info6 !== void 0 && _user$info6.mobileNumber ? true : false
+    enabled: userMobileNumber ? true : false
   });
   if (isLoading || isSWLoading || PTisLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
@@ -7712,115 +7830,39 @@ const WSMyApplications = () => {
     SewerageConnections: SWapplicationsList
   } = SWdata || {};
   WSapplicationsList = (_WSapplicationsList = WSapplicationsList) === null || _WSapplicationsList === void 0 ? void 0 : _WSapplicationsList.map(ob => {
-    var _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4;
+    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)) === null || _workflowDetails$data3 === void 0 ? void 0 : (_workflowDetails$data4 = _workflowDetails$data3[0]) === null || _workflowDetails$data4 === void 0 ? void 0 : _workflowDetails$data4.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$data5, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8;
+    var _workflowDetails$data4, _workflowDetails$data5, _workflowDetails$data6;
     return {
       ...ob,
-      "sla": workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data5 = workflowDetails.data) === null || _workflowDetails$data5 === void 0 ? void 0 : (_workflowDetails$data6 = _workflowDetails$data5.processInstances) === null || _workflowDetails$data6 === void 0 ? void 0 : (_workflowDetails$data7 = _workflowDetails$data6.filter(pi => pi.businessId == ob.applicationNo)) === null || _workflowDetails$data7 === void 0 ? void 0 : (_workflowDetails$data8 = _workflowDetails$data7[0]) === null || _workflowDetails$data8 === void 0 ? void 0 : _workflowDetails$data8.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")) || [];
-  SWapplicationsList = ((_SWapplicationsList2 = SWapplicationsList) === null || _SWapplicationsList2 === void 0 ? void 0 : _SWapplicationsList2.filter(ob => (ob === null || ob === void 0 ? void 0 : ob.applicationType) !== "MODIFY_SEWERAGE_CONNECTION")) || [];
+  WSapplicationsList = (_WSapplicationsList2 = WSapplicationsList) === null || _WSapplicationsList2 === void 0 ? void 0 : _WSapplicationsList2.filter(ob => (ob === null || ob === void 0 ? void 0 : ob.applicationType) !== "MODIFY_WATER_CONNECTION");
+  SWapplicationsList = (_SWapplicationsList2 = SWapplicationsList) === null || _SWapplicationsList2 === void 0 ? void 0 : _SWapplicationsList2.filter(ob => (ob === null || ob === void 0 ? void 0 : ob.applicationType) !== "MODIFY_SEWERAGE_CONNECTION");
   let applicationsList = WSapplicationsList.concat(SWapplicationsList);
-  applicationsList = (_applicationsList = applicationsList) === null || _applicationsList === void 0 ? void 0 : _applicationsList.map(ob => {
+  applicationsList = applicationsList && applicationsList.map(ob => {
     var _PTdata$Properties;
     return {
       ...ob,
       property: PTdata === null || PTdata === void 0 ? void 0 : (_PTdata$Properties = PTdata.Properties) === null || _PTdata$Properties === void 0 ? void 0 : _PTdata$Properties.filter(pt => (pt === null || pt === void 0 ? void 0 : pt.propertyId) === (ob === null || ob === void 0 ? void 0 : ob.propertyId))[0]
     };
   });
-  const GetCell = value => /*#__PURE__*/React.createElement("span", {
-    className: "cell-text"
-  }, value);
-  const columns = [{
-    Header: t("WS_MYCONNECTIONS_APPLICATION_NO"),
-    disableSortBy: true,
-    accessor: "applicationNo",
-    Cell: ({
-      row
-    }) => {
-      let encodeApplicationNo = encodeURI(row.original.applicationNo);
-      return /*#__PURE__*/React.createElement("span", {
-        className: "link"
-      }, /*#__PURE__*/React.createElement(Link, {
-        to: `/digit-ui/citizen/ws/connection/application/${encodeApplicationNo}`
-      }, row.original.applicationNo || "NA"));
-    }
-  }, {
-    Header: t("WS_SERVICE_NAME"),
-    disableSortBy: true,
-    Cell: ({
-      row
-    }) => {
-      var _row$original;
-      return GetCell(t(`WS_APPLICATION_TYPE_${(_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.applicationType}`));
-    }
-  }, {
-    Header: t("WS_CONSUMER_NAME"),
-    disableSortBy: true,
-    Cell: ({
-      row
-    }) => {
-      var _row$original2, _row$original2$connec, _row$original3, _row$original3$proper, _row$original3$proper2;
-      return GetCell(((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : (_row$original2$connec = _row$original2.connectionHolders) === null || _row$original2$connec === void 0 ? void 0 : _row$original2$connec.map(owner => owner.name).join(",")) || ((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : (_row$original3$proper = _row$original3.property) === null || _row$original3$proper === void 0 ? void 0 : (_row$original3$proper2 = _row$original3$proper.owners) === null || _row$original3$proper2 === void 0 ? void 0 : _row$original3$proper2.sort((a, b) => {
-        var _a$additionalDetails, _b$additionalDetails;
-        return (a === null || a === void 0 ? void 0 : (_a$additionalDetails = a.additionalDetails) === null || _a$additionalDetails === void 0 ? void 0 : _a$additionalDetails.ownerSequence) - (b === null || b === void 0 ? void 0 : (_b$additionalDetails = b.additionalDetails) === null || _b$additionalDetails === void 0 ? void 0 : _b$additionalDetails.ownerSequence);
-      }).map(owner => owner.name).join(",")) || t("CS_NA"));
-    }
-  }, {
-    Header: t("WS_PROPERTY_ID"),
-    disableSortBy: true,
-    Cell: ({
-      row
-    }) => {
-      var _row$original4;
-      return GetCell(((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.propertyId) || t("CS_NA"));
-    }
-  }, {
-    Header: t("WS_STATUS"),
-    disableSortBy: true,
-    Cell: ({
-      row
-    }) => {
-      var _row$original5;
-      return GetCell(t(`CS_${(_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : _row$original5.applicationStatus}`) || t("CS_NA"));
-    }
-  }, {
-    Header: t("WS_SLA"),
-    disableSortBy: true,
-    Cell: ({
-      row
-    }) => {
-      var _row$original6, _row$original7;
-      return GetCell(Math.round(((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.sla) / (24 * 60 * 60 * 1000)) ? `${Math.round(((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : _row$original7.sla) / (24 * 60 * 60 * 1000))} Days` : t("CS_NA"));
-    }
-  }];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, null, `${t("CS_HOME_MY_APPLICATIONS")} ${applicationsList ? `(${applicationsList.length})` : ""}`), /*#__PURE__*/React.createElement(WSInfoLabel, {
     t: t
-  }), /*#__PURE__*/React.createElement("div", null, ((_applicationsList2 = applicationsList) === null || _applicationsList2 === void 0 ? void 0 : _applicationsList2.length) > 0 ? /*#__PURE__*/React.createElement(Table, {
-    t: t,
-    data: applicationsList.sort((a, b) => {
-      var _b$auditDetails, _a$auditDetails;
-      return ((_b$auditDetails = b.auditDetails) === null || _b$auditDetails === void 0 ? void 0 : _b$auditDetails.lastModifiedTime) - ((_a$auditDetails = a.auditDetails) === null || _a$auditDetails === void 0 ? void 0 : _a$auditDetails.lastModifiedTime);
-    }),
-    columns: columns,
-    getCellProps: cellInfo => {
-      return {
-        style: {
-          padding: "20px 18px",
-          fontSize: "16px"
-        }
-      };
-    },
-    disableSort: true,
-    autoSort: false
-  }) : /*#__PURE__*/React.createElement("p", {
+  }), /*#__PURE__*/React.createElement("div", null, ((_applicationsList = applicationsList) === null || _applicationsList === void 0 ? void 0 : _applicationsList.length) > 0 && applicationsList.sort((a, b) => {
+    var _b$auditDetails, _a$auditDetails;
+    return ((_b$auditDetails = b.auditDetails) === null || _b$auditDetails === void 0 ? void 0 : _b$auditDetails.lastModifiedTime) - ((_a$auditDetails = a.auditDetails) === null || _a$auditDetails === void 0 ? void 0 : _a$auditDetails.lastModifiedTime);
+  }).map((application, index) => /*#__PURE__*/React.createElement("div", {
+    key: index
+  }, /*#__PURE__*/React.createElement(WSApplication, {
+    application: application
+  }))), !((_applicationsList2 = applicationsList) !== null && _applicationsList2 !== void 0 && _applicationsList2.length) > 0 && /*#__PURE__*/React.createElement("p", {
     style: {
       marginLeft: "16px",
       marginTop: "16px"
@@ -8384,7 +8426,7 @@ const WSResponse = props => {
 const App = ({
   path
 }) => {
-  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;
+  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;
   const location = useLocation();
   const {
     t
@@ -8400,7 +8442,7 @@ const App = ({
   }, {
     path: "/digit-ui/citizen/ws/create-application",
     label: t("CS_WS_CREATE_APPLICATION"),
-    show: location.pathname.includes("/create-application")
+    show: location.pathname.includes("/create-application") || location.pathname.includes("/info")
   }, {
     path: "/digit-ui/citizen/ws/search",
     label: t("CS_WS_SEARCH_CONNECTION"),
@@ -8444,6 +8486,7 @@ const App = ({
   const WSMyConnections = (_Digit13 = Digit) === null || _Digit13 === void 0 ? void 0 : (_Digit13$ComponentReg = _Digit13.ComponentRegistryService) === null || _Digit13$ComponentReg === void 0 ? void 0 : _Digit13$ComponentReg.getComponent("WSMyConnections");
   const WNSMyBillsComponent = (_Digit14 = Digit) === null || _Digit14 === void 0 ? void 0 : (_Digit14$ComponentReg = _Digit14.ComponentRegistryService) === null || _Digit14$ComponentReg === void 0 ? void 0 : _Digit14$ComponentReg.getComponent("WNSMyBillsComponent");
   const WSOLDApplication = (_Digit15 = Digit) === null || _Digit15 === void 0 ? void 0 : (_Digit15$ComponentReg = _Digit15.ComponentRegistryService) === null || _Digit15$ComponentReg === void 0 ? void 0 : _Digit15$ComponentReg.getComponent("WSOLDApplication");
+  const WSInfoPage = (_Digit16 = Digit) === null || _Digit16 === void 0 ? void 0 : (_Digit16$ComponentReg = _Digit16.ComponentRegistryService) === null || _Digit16$ComponentReg === void 0 ? void 0 : _Digit16$ComponentReg.getComponent("WSInfoPage");
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement("div", {
     className: "ground-container employee-app-container form-container"
   }, /*#__PURE__*/React.createElement(ModuleHeader, {
@@ -8516,6 +8559,9 @@ const App = ({
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/old-application`,
     component: WSOLDApplication
+  }), /*#__PURE__*/React.createElement(PrivateRoute, {
+    path: `${path}/info`,
+    component: WSInfoPage
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/ws-response`,
     component: WSResponse
@@ -9286,10 +9332,14 @@ const BILLSBreadCrumbs = ({
       width: "20%"
     } : {},
     icon: HomeIcon
+  }, {
+    path: "/digit-ui/employee/ws/wsinformation",
+    label: t("WS_COMMON_APPL_NEW_CONNECTION"),
+    show: location.pathname.includes("/create-application") || location.pathname.includes("/new-application") || location.pathname.includes("/old-application") || location.pathname.includes("/info")
   }, {
     path: "/digit-ui/employee/module/details",
     label: t("ES_TITLE_WATER_AND_SEWERAGE"),
-    show: location.pathname.includes("/create-application") || location.pathname.includes("/new-application") || location.pathname.includes("/old-application")
+    show: location.pathname.includes("/create-application") || location.pathname.includes("/new-application") || location.pathname.includes("/old-application") || location.pathname.includes("/info")
   }, {
     path: "/digit-ui/employee/ws/create-application",
     label: t("ES_COMMON_WS_DOCUMENTS_REQUIRED"),
@@ -9513,7 +9563,7 @@ const BILLSBreadCrumbs = ({
 const App$1 = ({
   path
 }) => {
-  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;
+  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;
   const location = useLocation();
   const WSDocsRequired = (_Digit = Digit) === null || _Digit === void 0 ? void 0 : (_Digit$ComponentRegis = _Digit.ComponentRegistryService) === null || _Digit$ComponentRegis === void 0 ? void 0 : _Digit$ComponentRegis.getComponent("WSDocsRequired");
   const WSInbox = (_Digit2 = Digit) === null || _Digit2 === void 0 ? void 0 : (_Digit2$ComponentRegi = _Digit2.ComponentRegistryService) === null || _Digit2$ComponentRegi === void 0 ? void 0 : _Digit2$ComponentRegi.getComponent("WSInbox");
@@ -9545,6 +9595,7 @@ const App$1 = ({
   const WSBulkBillGeneration = (_Digit26 = Digit) === null || _Digit26 === void 0 ? void 0 : (_Digit26$ComponentReg = _Digit26.ComponentRegistryService) === null || _Digit26$ComponentReg === void 0 ? void 0 : _Digit26$ComponentReg.getComponent("WSBulkBillGeneration");
   const CPTCreateProperty = (_Digit27 = Digit) === null || _Digit27 === void 0 ? void 0 : (_Digit27$ComponentReg = _Digit27.ComponentRegistryService) === null || _Digit27$ComponentReg === void 0 ? void 0 : _Digit27$ComponentReg.getComponent("CPTCreateProperty");
   const CPTAcknowledgement = (_Digit28 = Digit) === null || _Digit28 === void 0 ? void 0 : (_Digit28$ComponentReg = _Digit28.ComponentRegistryService) === null || _Digit28$ComponentReg === void 0 ? void 0 : _Digit28$ComponentReg.getComponent("CPTAcknowledgement");
+  const WSInfoPage = (_Digit29 = Digit) === null || _Digit29 === void 0 ? void 0 : (_Digit29$ComponentReg = _Digit29.ComponentRegistryService) === null || _Digit29$ComponentReg === void 0 ? void 0 : _Digit29$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/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/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 locationCheckReqDocs = window.location.href.includes("/employee/ws/create-application") || window.location.href.includes("/employee/ws/new-disconnection/docsrequired");
   return /*#__PURE__*/React.createElement("div", {
@@ -9720,6 +9771,9 @@ const App$1 = ({
     component: props => /*#__PURE__*/React.createElement(WSBillIAmendMentInbox, Object.assign({}, props, {
       parentRoute: path
     }))
+  }), /*#__PURE__*/React.createElement(PrivateRoute, {
+    path: `${path}/info`,
+    component: WSInfoPage
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/sewerage/bill-amendment/inbox`,
     component: props => /*#__PURE__*/React.createElement(WSBillIAmendMentInbox, Object.assign({}, props, {
@@ -12194,7 +12248,7 @@ const WSPropertyDetails = ({
     type: "button",
     onClick: () => setPropertyId(propertyId)
   }, `${t("PT_SEARCH")}`))), /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/${userType}/commonpt/search`
+    to: `/digit-ui/${userType}/commonpt/search?redirectToUrl=${window.location.pathname}`
   }, /*#__PURE__*/React.createElement(LinkButton, {
     label: t("CPT_SEARCH_PROPERTY"),
     style: {
@@ -12202,7 +12256,7 @@ const WSPropertyDetails = ({
       display: "inline-block"
     }
   })), "\xA0 | \xA0", /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/${userType}/commonpt/new-application`
+    to: `/digit-ui/${userType}/commonpt/property/new-application?redirectToUrl=${window.location.pathname}`
   }, /*#__PURE__*/React.createElement(LinkButton, {
     label: t("CPT_CREATE_PROPERTY"),
     style: {
@@ -23119,7 +23173,7 @@ const WSCard = () => {
   }, [wsData]);
   let links = [{
     label: t("WS_APPLY_NEW_CONNECTION_HOME_CARD_LABEL"),
-    link: `/digit-ui/employee/ws/old-application`,
+    link: `/digit-ui/employee/ws/info`,
     roles: ["WS_CEMP", "SW_CEMP"]
   }];
   links = links.filter(link => link.roles ? checkForEmployee(link.roles) : true);
@@ -24600,9 +24654,15 @@ const WSCreate = () => {
     }
     let redirectWithHistory = history.push;
     if (nextStep === null) {
-      return redirectWithHistory(`${getPath(match.path, match.params)}/check`);
+      return redirectWithHistory({
+        pathname: `${getPath(match.path, match.params)}/check`,
+        search: location.search
+      });
     }
-    redirectWithHistory(`${getPath(match.path, match.params)}/${nextStep}`);
+    redirectWithHistory({
+      pathname: `${getPath(match.path, match.params)}/${nextStep}`,
+      search: location.search
+    });
   };
   if (params && Object.keys(params).length > 0 && window.location.href.includes("/citizen/ws/create-application/search-property")) {
     clearParams();
@@ -27263,7 +27323,10 @@ const WSWFApplicationTimeline = props => {
   } = Digit.Hooks.useWorkflowDetails({
     tenantId: (_props$application2 = props.application) === null || _props$application2 === void 0 ? void 0 : _props$application2.tenantId,
     id: props.id,
-    moduleCode: businessService
+    moduleCode: businessService,
+    config: {
+      enabled: !!props.id
+    }
   });
   const [showAllTimeline, setShowAllTimeline] = useState(false);
   function OpenImage(imageSource, index, thumbnailsToShow) {
@@ -27569,13 +27632,14 @@ const getWSDisconnectionApplicationForm = async (application, property, tenantIn
 };
 
 const WSApplicationDetails = () => {
-  var _Digit$SessionStorage, _user$info, _data$WaterConnection, _data$WaterConnection2, _data$SewerageConnect, _data$SewerageConnect2, _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$WaterConnection1, _data$WaterConnection10, _data$WaterConnection11, _data$WaterConnection12, _data$SewerageConnect7, _data$SewerageConnect8, _data$SewerageConnect9, _data$SewerageConnect0, _data$WaterConnection13, _data$WaterConnection14, _data$WaterConnection15, _data$WaterConnection16, _data$SewerageConnect1, _data$SewerageConnect10, _data$SewerageConnect11, _data$SewerageConnect12, _data$WaterConnection40, _data$WaterConnection41, _data$SewerageConnect32, _data$SewerageConnect33, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection44, _data$WaterConnection45, _data$SewerageConnect36, _data$SewerageConnect37, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$SewerageConnect40, _data$SewerageConnect41, _data$WaterConnection51, _data$WaterConnection52, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect44, _data$SewerageConnect45, _data$WaterConnection55, _data$WaterConnection56, _data$SewerageConnect46, _data$SewerageConnect47, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data$3, _paymentDetails$data$4, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _paymentDetails$data5, _paymentDetails$data6, _data$WaterConnection57, _data$WaterConnection58, _data$SewerageConnect48, _data$SewerageConnect49, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect50, _data$SewerageConnect51, _data$WaterConnection61, _data$WaterConnection62, _data$SewerageConnect52, _data$SewerageConnect53, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect54, _data$SewerageConnect55, _data$WaterConnection65, _data$WaterConnection66, _data$SewerageConnect56, _data$SewerageConnect57, _data$WaterConnection67, _data$WaterConnection68, _data$WaterConnection69, _data$WaterConnection70, _data$SewerageConnect58, _data$SewerageConnect59, _data$SewerageConnect60, _data$SewerageConnect61, _paymentDetails$data7, _paymentDetails$data8, _paymentDetails$data9, _paymentDetails$data0, _paymentDetails$data1, _paymentDetails$data10, _paymentDetails$data11, _paymentDetails$data12, _paymentDetails$data13, _paymentDetails$data14, _paymentDetails$data15, _paymentDetails$data16, _paymentDetails$data17, _paymentDetails$data18, _paymentDetails$data19, _paymentDetails$data20, _paymentDetails$data21, _paymentDetails$data22, _paymentDetails$data23, _paymentDetails$data24, _paymentDetails$data25, _paymentDetails$data26, _paymentDetails$data27, _paymentDetails$data28, _paymentDetails$data29, _data$WaterConnection71, _data$WaterConnection72, _data$SewerageConnect62, _data$SewerageConnect63, _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$WaterConnection73, _data$WaterConnection74, _data$SewerageConnect64, _data$SewerageConnect65, _data$WaterConnection75, _data$WaterConnection76, _data$SewerageConnect66, _data$SewerageConnect67, _data$WaterConnection77, _data$WaterConnection78, _data$SewerageConnect68, _data$SewerageConnect69, _data$WaterConnection79, _data$WaterConnection80, _data$WaterConnection81, _data$SewerageConnect70, _data$SewerageConnect71, _data$SewerageConnect72, _data$WaterConnection82, _data$WaterConnection83, _data$WaterConnection84, _data$WaterConnection85, _data$SewerageConnect73, _data$SewerageConnect74, _data$SewerageConnect75, _data$SewerageConnect76, _data$WaterConnection86, _data$WaterConnection87, _data$WaterConnection88, _data$WaterConnection89, _data$SewerageConnect77, _data$SewerageConnect78, _data$SewerageConnect79, _data$SewerageConnect80, _data$WaterConnection90, _data$WaterConnection91, _data$WaterConnection92, _data$WaterConnection93, _data$SewerageConnect81, _data$SewerageConnect82, _data$SewerageConnect83, _data$SewerageConnect84, _data$WaterConnection94, _data$WaterConnection95, _data$WaterConnection96, _data$WaterConnection97, _data$SewerageConnect85, _data$SewerageConnect86, _data$SewerageConnect87, _data$SewerageConnect88, _data$WaterConnection98, _data$WaterConnection99, _data$WaterConnection100, _data$WaterConnection101, _data$SewerageConnect89, _data$SewerageConnect90, _data$SewerageConnect91, _data$SewerageConnect92, _data$WaterConnection102, _data$WaterConnection103, _data$WaterConnection104, _data$WaterConnection105, _data$SewerageConnect93, _data$SewerageConnect94, _data$SewerageConnect95, _data$SewerageConnect96, _data$WaterConnection106, _data$WaterConnection107, _data$WaterConnection108, _data$WaterConnection109, _data$SewerageConnect97, _data$SewerageConnect98, _data$SewerageConnect99, _data$SewerageConnect100, _data$WaterConnection110, _data$WaterConnection111, _data$WaterConnection112, _data$WaterConnection113, _data$SewerageConnect101, _data$SewerageConnect102, _data$SewerageConnect103, _data$SewerageConnect104, _data$WaterConnection114, _data$WaterConnection115, _data$WaterConnection116, _data$WaterConnection117, _data$SewerageConnect105, _data$SewerageConnect106, _data$SewerageConnect107, _data$SewerageConnect108, _data$WaterConnection118, _data$WaterConnection119, _data$WaterConnection120, _data$WaterConnection121, _data$SewerageConnect109, _data$SewerageConnect110, _data$SewerageConnect111, _data$SewerageConnect112, _data$WaterConnection122, _data$WaterConnection123, _data$WaterConnection124, _data$WaterConnection125, _data$SewerageConnect113, _data$SewerageConnect114, _data$SewerageConnect115, _data$SewerageConnect116, _data$WaterConnection126, _data$WaterConnection127, _data$WaterConnection128, _data$WaterConnection129, _data$WaterConnection130, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$SewerageConnect120, _data$SewerageConnect121, _data$WaterConnection131, _data$WaterConnection132, _data$WaterConnection133, _data$WaterConnection134, _data$SewerageConnect122, _data$SewerageConnect123, _data$SewerageConnect124, _data$SewerageConnect125, _data$WaterConnection135, _data$WaterConnection136, _data$WaterConnection137, _data$WaterConnection138, _data$SewerageConnect126, _data$SewerageConnect127, _data$SewerageConnect128, _data$SewerageConnect129, _data$WaterConnection139, _data$WaterConnection140, _data$WaterConnection141, _data$WaterConnection142, _data$SewerageConnect130, _data$SewerageConnect131, _data$SewerageConnect132, _data$SewerageConnect133, _data$WaterConnection143, _data$WaterConnection144, _data$WaterConnection145, _data$WaterConnection146, _data$SewerageConnect134, _data$SewerageConnect135, _data$SewerageConnect136, _data$SewerageConnect137, _data$WaterConnection147, _data$WaterConnection148, _data$WaterConnection149, _data$WaterConnection150, _data$SewerageConnect138, _data$SewerageConnect139, _data$SewerageConnect140, _data$SewerageConnect141, _data$WaterConnection151, _data$WaterConnection152, _data$WaterConnection153, _data$WaterConnection154, _data$WaterConnection155, _data$WaterConnection156, _data$WaterConnection157, _data$SewerageConnect142, _data$SewerageConnect143, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _data$SewerageConnect147, _data$SewerageConnect148, _data$WaterConnection158, _data$WaterConnection159, _data$WaterConnection160, _data$WaterConnection161, _data$SewerageConnect149, _data$SewerageConnect150, _data$SewerageConnect151, _data$SewerageConnect152, _data$WaterConnection166, _data$SewerageConnect157, _data$WaterConnection167, _data$WaterConnection168, _data$SewerageConnect158, _data$SewerageConnect159, _data$WaterConnection169, _data$WaterConnection170, _data$SewerageConnect160, _data$SewerageConnect161, _paymentDetails$data30, _paymentDetails$data31, _paymentDetails$data32, _data$WaterConnection171, _data$WaterConnection172, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection173, _data$WaterConnection174, _data$SewerageConnect164, _data$SewerageConnect165, _data$WaterConnection175, _data$WaterConnection176, _data$SewerageConnect166, _data$SewerageConnect167, _data$WaterConnection177, _data$WaterConnection178, _data$WaterConnection179, _data$SewerageConnect168, _data$SewerageConnect169, _data$SewerageConnect170, _PTData$Properties9, _PTData$Properties9$, _PTData$Properties9$$, _data$WaterConnection180, _data$WaterConnection181, _data$WaterConnection182, _data$WaterConnection183, _data$SewerageConnect171, _data$SewerageConnect172, _data$SewerageConnect173, _data$SewerageConnect174, _data$WaterConnection184, _data$WaterConnection185, _data$SewerageConnect175, _data$SewerageConnect176, _data$WaterConnection186, _data$WaterConnection187, _data$SewerageConnect177, _data$SewerageConnect178, _data$WaterConnection188, _data$WaterConnection189, _data$WaterConnection190, _data$WaterConnection191, _data$SewerageConnect179, _data$SewerageConnect180, _data$SewerageConnect181, _data$SewerageConnect182, _data$WaterConnection192, _data$WaterConnection193, _data$SewerageConnect183, _data$SewerageConnect184, _data$SewerageConnect185, _data$SewerageConnect186, _data$SewerageConnect187, _data$SewerageConnect188, _data$SewerageConnect189, _data$SewerageConnect190, _data$SewerageConnect191, _data$SewerageConnect192, _data$SewerageConnect193, _data$WaterConnection194, _data$WaterConnection195, _data$WaterConnection196, _data$WaterConnection197, _data$WaterConnection198, _data$WaterConnection199, _data$WaterConnection200, _data$WaterConnection201, _data$WaterConnection202;
+  var _user$info, _user$info$userName, _user$info2, _user$info3, _Digit$SessionStorage, _user$info4, _data$WaterConnection, _data$WaterConnection2, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection3, _data$WaterConnection4, _data$SewerageConnect3, _data$SewerageConnect4, _data$WaterConnection5, _data$WaterConnection6, _data$SewerageConnect5, _data$SewerageConnect6, _data$WaterConnection7, _data$WaterConnection8, _data$WaterConnection9, _data$WaterConnection0, _data$WaterConnection1, _data$WaterConnection10, _data$WaterConnection11, _data$WaterConnection12, _data$SewerageConnect7, _data$SewerageConnect8, _data$SewerageConnect9, _data$SewerageConnect0, _data$WaterConnection13, _data$WaterConnection14, _data$WaterConnection15, _data$WaterConnection16, _data$SewerageConnect1, _data$SewerageConnect10, _data$SewerageConnect11, _data$SewerageConnect12, _data$WaterConnection40, _data$WaterConnection41, _data$SewerageConnect32, _data$SewerageConnect33, _data$WaterConnection42, _data$WaterConnection43, _data$SewerageConnect34, _data$SewerageConnect35, _data$WaterConnection44, _data$WaterConnection45, _data$SewerageConnect36, _data$SewerageConnect37, _data$WaterConnection46, _data$WaterConnection47, _data$SewerageConnect38, _data$SewerageConnect39, _data$WaterConnection48, _data$WaterConnection49, _data$WaterConnection50, _data$SewerageConnect40, _data$SewerageConnect41, _data$WaterConnection51, _data$WaterConnection52, _data$SewerageConnect42, _data$SewerageConnect43, _data$WaterConnection53, _data$WaterConnection54, _data$SewerageConnect44, _data$SewerageConnect45, _data$WaterConnection55, _data$WaterConnection56, _data$SewerageConnect46, _data$SewerageConnect47, _paymentDetails$data, _paymentDetails$data$, _paymentDetails$data$2, _paymentDetails$data$3, _paymentDetails$data$4, _paymentDetails$data2, _paymentDetails$data3, _paymentDetails$data4, _paymentDetails$data5, _paymentDetails$data6, _data$WaterConnection57, _data$WaterConnection58, _data$SewerageConnect48, _data$SewerageConnect49, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect50, _data$SewerageConnect51, _data$WaterConnection61, _data$WaterConnection62, _data$SewerageConnect52, _data$SewerageConnect53, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect54, _data$SewerageConnect55, _data$WaterConnection65, _data$WaterConnection66, _data$SewerageConnect56, _data$SewerageConnect57, _data$WaterConnection67, _data$WaterConnection68, _data$WaterConnection69, _data$WaterConnection70, _data$SewerageConnect58, _data$SewerageConnect59, _data$SewerageConnect60, _data$SewerageConnect61, _paymentDetails$data7, _paymentDetails$data8, _paymentDetails$data9, _paymentDetails$data0, _paymentDetails$data1, _paymentDetails$data10, _paymentDetails$data11, _paymentDetails$data12, _paymentDetails$data13, _paymentDetails$data14, _paymentDetails$data15, _paymentDetails$data16, _paymentDetails$data17, _paymentDetails$data18, _paymentDetails$data19, _paymentDetails$data20, _paymentDetails$data21, _paymentDetails$data22, _paymentDetails$data23, _paymentDetails$data24, _paymentDetails$data25, _paymentDetails$data26, _paymentDetails$data27, _paymentDetails$data28, _paymentDetails$data29, _data$WaterConnection71, _data$WaterConnection72, _data$SewerageConnect62, _data$SewerageConnect63, _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$WaterConnection73, _data$WaterConnection74, _data$SewerageConnect64, _data$SewerageConnect65, _data$WaterConnection75, _data$WaterConnection76, _data$SewerageConnect66, _data$SewerageConnect67, _data$WaterConnection77, _data$WaterConnection78, _data$WaterConnection79, _data$SewerageConnect68, _data$SewerageConnect69, _data$SewerageConnect70, _data$WaterConnection80, _data$WaterConnection81, _data$WaterConnection82, _data$WaterConnection83, _data$SewerageConnect71, _data$SewerageConnect72, _data$SewerageConnect73, _data$SewerageConnect74, _data$WaterConnection84, _data$WaterConnection85, _data$WaterConnection86, _data$WaterConnection87, _data$SewerageConnect75, _data$SewerageConnect76, _data$SewerageConnect77, _data$SewerageConnect78, _data$WaterConnection88, _data$WaterConnection89, _data$WaterConnection90, _data$WaterConnection91, _data$SewerageConnect79, _data$SewerageConnect80, _data$SewerageConnect81, _data$SewerageConnect82, _data$WaterConnection92, _data$WaterConnection93, _data$WaterConnection94, _data$WaterConnection95, _data$SewerageConnect83, _data$SewerageConnect84, _data$SewerageConnect85, _data$SewerageConnect86, _data$WaterConnection96, _data$WaterConnection97, _data$WaterConnection98, _data$WaterConnection99, _data$SewerageConnect87, _data$SewerageConnect88, _data$SewerageConnect89, _data$SewerageConnect90, _data$WaterConnection100, _data$WaterConnection101, _data$WaterConnection102, _data$WaterConnection103, _data$SewerageConnect91, _data$SewerageConnect92, _data$SewerageConnect93, _data$SewerageConnect94, _data$WaterConnection104, _data$WaterConnection105, _data$WaterConnection106, _data$WaterConnection107, _data$SewerageConnect95, _data$SewerageConnect96, _data$SewerageConnect97, _data$SewerageConnect98, _data$WaterConnection108, _data$WaterConnection109, _data$WaterConnection110, _data$WaterConnection111, _data$SewerageConnect99, _data$SewerageConnect100, _data$SewerageConnect101, _data$SewerageConnect102, _data$WaterConnection112, _data$WaterConnection113, _data$WaterConnection114, _data$WaterConnection115, _data$SewerageConnect103, _data$SewerageConnect104, _data$SewerageConnect105, _data$SewerageConnect106, _data$WaterConnection116, _data$WaterConnection117, _data$WaterConnection118, _data$WaterConnection119, _data$SewerageConnect107, _data$SewerageConnect108, _data$SewerageConnect109, _data$SewerageConnect110, _data$WaterConnection120, _data$WaterConnection121, _data$WaterConnection122, _data$WaterConnection123, _data$SewerageConnect111, _data$SewerageConnect112, _data$SewerageConnect113, _data$SewerageConnect114, _data$WaterConnection124, _data$WaterConnection125, _data$WaterConnection126, _data$WaterConnection127, _data$WaterConnection128, _data$SewerageConnect115, _data$SewerageConnect116, _data$SewerageConnect117, _data$SewerageConnect118, _data$SewerageConnect119, _data$WaterConnection129, _data$WaterConnection130, _data$WaterConnection131, _data$WaterConnection132, _data$SewerageConnect120, _data$SewerageConnect121, _data$SewerageConnect122, _data$SewerageConnect123, _data$WaterConnection133, _data$WaterConnection134, _data$WaterConnection135, _data$WaterConnection136, _data$SewerageConnect124, _data$SewerageConnect125, _data$SewerageConnect126, _data$SewerageConnect127, _data$WaterConnection137, _data$WaterConnection138, _data$WaterConnection139, _data$WaterConnection140, _data$SewerageConnect128, _data$SewerageConnect129, _data$SewerageConnect130, _data$SewerageConnect131, _data$WaterConnection141, _data$WaterConnection142, _data$WaterConnection143, _data$WaterConnection144, _data$SewerageConnect132, _data$SewerageConnect133, _data$SewerageConnect134, _data$SewerageConnect135, _data$WaterConnection145, _data$WaterConnection146, _data$WaterConnection147, _data$WaterConnection148, _data$SewerageConnect136, _data$SewerageConnect137, _data$SewerageConnect138, _data$SewerageConnect139, _data$WaterConnection149, _data$WaterConnection150, _data$WaterConnection151, _data$WaterConnection152, _data$WaterConnection153, _data$WaterConnection154, _data$WaterConnection155, _data$SewerageConnect140, _data$SewerageConnect141, _data$SewerageConnect142, _data$SewerageConnect143, _data$SewerageConnect144, _data$SewerageConnect145, _data$SewerageConnect146, _data$WaterConnection156, _data$WaterConnection157, _data$WaterConnection158, _data$WaterConnection159, _data$SewerageConnect147, _data$SewerageConnect148, _data$SewerageConnect149, _data$SewerageConnect150, _data$WaterConnection164, _data$SewerageConnect155, _data$WaterConnection165, _data$WaterConnection166, _data$SewerageConnect156, _data$SewerageConnect157, _data$WaterConnection167, _data$WaterConnection168, _data$SewerageConnect158, _data$SewerageConnect159, _paymentDetails$data30, _paymentDetails$data31, _paymentDetails$data32, _data$WaterConnection169, _data$WaterConnection170, _data$SewerageConnect160, _data$SewerageConnect161, _data$WaterConnection171, _data$WaterConnection172, _data$SewerageConnect162, _data$SewerageConnect163, _data$WaterConnection173, _data$WaterConnection174, _data$SewerageConnect164, _data$SewerageConnect165, _data$WaterConnection175, _data$WaterConnection176, _data$WaterConnection177, _data$SewerageConnect166, _data$SewerageConnect167, _data$SewerageConnect168, _PTData$Properties9, _PTData$Properties9$, _PTData$Properties9$$, _data$WaterConnection178, _data$WaterConnection179, _data$WaterConnection180, _data$WaterConnection181, _data$SewerageConnect169, _data$SewerageConnect170, _data$SewerageConnect171, _data$SewerageConnect172, _data$WaterConnection182, _data$WaterConnection183, _data$SewerageConnect173, _data$SewerageConnect174, _data$WaterConnection184, _data$WaterConnection185, _data$SewerageConnect175, _data$SewerageConnect176, _data$WaterConnection186, _data$WaterConnection187, _data$WaterConnection188, _data$WaterConnection189, _data$SewerageConnect177, _data$SewerageConnect178, _data$SewerageConnect179, _data$SewerageConnect180, _data$WaterConnection190, _data$WaterConnection191, _data$SewerageConnect181, _data$SewerageConnect182, _data$SewerageConnect183, _data$SewerageConnect184, _data$SewerageConnect185, _data$SewerageConnect186, _data$SewerageConnect187, _data$SewerageConnect188, _data$SewerageConnect189, _data$SewerageConnect190, _data$SewerageConnect191, _data$WaterConnection192, _data$WaterConnection193, _data$WaterConnection194, _data$WaterConnection195, _data$WaterConnection196, _data$WaterConnection197, _data$WaterConnection198, _data$WaterConnection199, _data$WaterConnection200;
   const {
     t
   } = useTranslation();
   const menuRef = useRef();
   const user = Digit.UserService.getUser();
-  const tenantId = ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code) || (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.permanentCity) || Digit.ULBService.getCurrentTenantId();
+  const userMobileNumber = user !== null && user !== void 0 && (_user$info = user.info) !== null && _user$info !== void 0 && (_user$info$userName = _user$info.userName) !== null && _user$info$userName !== void 0 && _user$info$userName.match(/^[0-9]{10}$/) ? user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.userName : user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber;
+  const tenantId = ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code) || (user === null || user === void 0 ? void 0 : (_user$info4 = user.info) === null || _user$info4 === void 0 ? void 0 : _user$info4.permanentCity) || Digit.ULBService.getCurrentTenantId();
   const [showOptions, setShowOptions] = useState(false);
   const [viewTimeline, setViewTimeline] = useState(false);
   const applicationNobyData = window.location.href.includes("SW_") ? window.location.href.substring(window.location.href.indexOf("SW_")) : window.location.href.substring(window.location.href.indexOf("WS_"));
@@ -27958,7 +28022,7 @@ const WSApplicationDetails = () => {
         requestBody: {},
         requestParam: {
           tenantId: tenantId,
-          propertyIds: (data === null || data === void 0 ? void 0 : (_data$WaterConnection73 = data.WaterConnection) === null || _data$WaterConnection73 === void 0 ? void 0 : (_data$WaterConnection74 = _data$WaterConnection73[0]) === null || _data$WaterConnection74 === void 0 ? void 0 : _data$WaterConnection74.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect64 = data.SewerageConnections) === null || _data$SewerageConnect64 === void 0 ? void 0 : (_data$SewerageConnect65 = _data$SewerageConnect64[0]) === null || _data$SewerageConnect65 === void 0 ? void 0 : _data$SewerageConnect65.propertyId)
+          mobileNumber: userMobileNumber
         },
         jsonPath: "Properties[0].address.street",
         isArray: false,
@@ -27969,25 +28033,25 @@ const WSApplicationDetails = () => {
       }
     }
   }), /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/citizen/commonpt/view-property?propertyId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection75 = data.WaterConnection) === null || _data$WaterConnection75 === void 0 ? void 0 : (_data$WaterConnection76 = _data$WaterConnection75[0]) === null || _data$WaterConnection76 === void 0 ? void 0 : _data$WaterConnection76.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect66 = data.SewerageConnections) === null || _data$SewerageConnect66 === void 0 ? void 0 : (_data$SewerageConnect67 = _data$SewerageConnect66[0]) === null || _data$SewerageConnect67 === void 0 ? void 0 : _data$SewerageConnect67.propertyId)}&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection77 = data.WaterConnection) === null || _data$WaterConnection77 === void 0 ? void 0 : (_data$WaterConnection78 = _data$WaterConnection77[0]) === null || _data$WaterConnection78 === void 0 ? void 0 : _data$WaterConnection78.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect68 = data.SewerageConnections) === null || _data$SewerageConnect68 === void 0 ? void 0 : (_data$SewerageConnect69 = _data$SewerageConnect68[0]) === null || _data$SewerageConnect69 === void 0 ? void 0 : _data$SewerageConnect69.tenantId)}`
+    to: `/digit-ui/citizen/commonpt/view-property?propertyId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection73 = data.WaterConnection) === null || _data$WaterConnection73 === void 0 ? void 0 : (_data$WaterConnection74 = _data$WaterConnection73[0]) === null || _data$WaterConnection74 === void 0 ? void 0 : _data$WaterConnection74.propertyId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect64 = data.SewerageConnections) === null || _data$SewerageConnect64 === void 0 ? void 0 : (_data$SewerageConnect65 = _data$SewerageConnect64[0]) === null || _data$SewerageConnect65 === void 0 ? void 0 : _data$SewerageConnect65.propertyId)}&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection75 = data.WaterConnection) === null || _data$WaterConnection75 === void 0 ? void 0 : (_data$WaterConnection76 = _data$WaterConnection75[0]) === null || _data$WaterConnection76 === void 0 ? void 0 : _data$WaterConnection76.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect66 = data.SewerageConnections) === null || _data$SewerageConnect66 === void 0 ? void 0 : (_data$SewerageConnect67 = _data$SewerageConnect66[0]) === null || _data$SewerageConnect67 === void 0 ? void 0 : _data$SewerageConnect67.tenantId)}`
   }, /*#__PURE__*/React.createElement(LinkButton, {
     style: {
       textAlign: "left"
     },
     label: t("WS_VIEW_PROPERTY")
-  })))), (data === null || data === void 0 ? void 0 : (_data$WaterConnection79 = data.WaterConnection) === null || _data$WaterConnection79 === void 0 ? void 0 : (_data$WaterConnection80 = _data$WaterConnection79[0]) === null || _data$WaterConnection80 === void 0 ? void 0 : (_data$WaterConnection81 = _data$WaterConnection80.connectionHolders) === null || _data$WaterConnection81 === void 0 ? void 0 : _data$WaterConnection81.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect70 = data.SewerageConnections) === null || _data$SewerageConnect70 === void 0 ? void 0 : (_data$SewerageConnect71 = _data$SewerageConnect70[0]) === null || _data$SewerageConnect71 === void 0 ? void 0 : (_data$SewerageConnect72 = _data$SewerageConnect71.connectionHolders) === null || _data$SewerageConnect72 === void 0 ? void 0 : _data$SewerageConnect72.length) > 0 ? /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
+  })))), (data === null || data === void 0 ? void 0 : (_data$WaterConnection77 = data.WaterConnection) === null || _data$WaterConnection77 === void 0 ? void 0 : (_data$WaterConnection78 = _data$WaterConnection77[0]) === null || _data$WaterConnection78 === void 0 ? void 0 : (_data$WaterConnection79 = _data$WaterConnection78.connectionHolders) === null || _data$WaterConnection79 === void 0 ? void 0 : _data$WaterConnection79.length) > 0 || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect68 = data.SewerageConnections) === null || _data$SewerageConnect68 === void 0 ? void 0 : (_data$SewerageConnect69 = _data$SewerageConnect68[0]) === null || _data$SewerageConnect69 === void 0 ? void 0 : (_data$SewerageConnect70 = _data$SewerageConnect69.connectionHolders) === null || _data$SewerageConnect70 === void 0 ? void 0 : _data$SewerageConnect70.length) > 0 ? /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, {
     styles: {
       fontSize: "28px"
     }
   }, t("WS_COMMON_CONNECTION_HOLDER_DETAILS_HEADER")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_MOBILE_NO_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection82 = data.WaterConnection) === null || _data$WaterConnection82 === void 0 ? void 0 : (_data$WaterConnection83 = _data$WaterConnection82[0]) === null || _data$WaterConnection83 === void 0 ? void 0 : (_data$WaterConnection84 = _data$WaterConnection83.connectionHolders) === null || _data$WaterConnection84 === void 0 ? void 0 : (_data$WaterConnection85 = _data$WaterConnection84[0]) === null || _data$WaterConnection85 === void 0 ? void 0 : _data$WaterConnection85.mobileNumber) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect73 = data.SewerageConnections) === null || _data$SewerageConnect73 === void 0 ? void 0 : (_data$SewerageConnect74 = _data$SewerageConnect73[0]) === null || _data$SewerageConnect74 === void 0 ? void 0 : (_data$SewerageConnect75 = _data$SewerageConnect74.connectionHolders) === null || _data$SewerageConnect75 === void 0 ? void 0 : (_data$SewerageConnect76 = _data$SewerageConnect75[0]) === null || _data$SewerageConnect76 === void 0 ? void 0 : _data$SewerageConnect76.mobileNumber),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection80 = data.WaterConnection) === null || _data$WaterConnection80 === void 0 ? void 0 : (_data$WaterConnection81 = _data$WaterConnection80[0]) === null || _data$WaterConnection81 === void 0 ? void 0 : (_data$WaterConnection82 = _data$WaterConnection81.connectionHolders) === null || _data$WaterConnection82 === void 0 ? void 0 : (_data$WaterConnection83 = _data$WaterConnection82[0]) === null || _data$WaterConnection83 === void 0 ? void 0 : _data$WaterConnection83.mobileNumber) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect71 = data.SewerageConnections) === null || _data$SewerageConnect71 === void 0 ? void 0 : (_data$SewerageConnect72 = _data$SewerageConnect71[0]) === null || _data$SewerageConnect72 === void 0 ? void 0 : (_data$SewerageConnect73 = _data$SewerageConnect72.connectionHolders) === null || _data$SewerageConnect73 === void 0 ? void 0 : (_data$SewerageConnect74 = _data$SewerageConnect73[0]) === null || _data$SewerageConnect74 === void 0 ? void 0 : _data$SewerageConnect74.mobileNumber),
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection86 = data.WaterConnection) === null || _data$WaterConnection86 === void 0 ? void 0 : (_data$WaterConnection87 = _data$WaterConnection86[0]) === null || _data$WaterConnection87 === void 0 ? void 0 : (_data$WaterConnection88 = _data$WaterConnection87.connectionHolders) === null || _data$WaterConnection88 === void 0 ? void 0 : (_data$WaterConnection89 = _data$WaterConnection88[0]) === null || _data$WaterConnection89 === void 0 ? void 0 : _data$WaterConnection89.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect77 = data.SewerageConnections) === null || _data$SewerageConnect77 === void 0 ? void 0 : (_data$SewerageConnect78 = _data$SewerageConnect77[0]) === null || _data$SewerageConnect78 === void 0 ? void 0 : (_data$SewerageConnect79 = _data$SewerageConnect78.connectionHolders) === null || _data$SewerageConnect79 === void 0 ? void 0 : (_data$SewerageConnect80 = _data$SewerageConnect79[0]) === null || _data$SewerageConnect80 === void 0 ? void 0 : _data$SewerageConnect80.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection84 = data.WaterConnection) === null || _data$WaterConnection84 === void 0 ? void 0 : (_data$WaterConnection85 = _data$WaterConnection84[0]) === null || _data$WaterConnection85 === void 0 ? void 0 : (_data$WaterConnection86 = _data$WaterConnection85.connectionHolders) === null || _data$WaterConnection86 === void 0 ? void 0 : (_data$WaterConnection87 = _data$WaterConnection86[0]) === null || _data$WaterConnection87 === void 0 ? void 0 : _data$WaterConnection87.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect75 = data.SewerageConnections) === null || _data$SewerageConnect75 === void 0 ? void 0 : (_data$SewerageConnect76 = _data$SewerageConnect75[0]) === null || _data$SewerageConnect76 === void 0 ? void 0 : (_data$SewerageConnect77 = _data$SewerageConnect76.connectionHolders) === null || _data$SewerageConnect77 === void 0 ? void 0 : (_data$SewerageConnect78 = _data$SewerageConnect77[0]) === null || _data$SewerageConnect78 === void 0 ? void 0 : _data$SewerageConnect78.uuid,
       fieldName: "connectionHoldersMobileNumber",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28005,19 +28069,19 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_OWN_NAME_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection90 = data.WaterConnection) === null || _data$WaterConnection90 === void 0 ? void 0 : (_data$WaterConnection91 = _data$WaterConnection90[0]) === null || _data$WaterConnection91 === void 0 ? void 0 : (_data$WaterConnection92 = _data$WaterConnection91.connectionHolders) === null || _data$WaterConnection92 === void 0 ? void 0 : (_data$WaterConnection93 = _data$WaterConnection92[0]) === null || _data$WaterConnection93 === void 0 ? void 0 : _data$WaterConnection93.name) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect81 = data.SewerageConnections) === null || _data$SewerageConnect81 === void 0 ? void 0 : (_data$SewerageConnect82 = _data$SewerageConnect81[0]) === null || _data$SewerageConnect82 === void 0 ? void 0 : (_data$SewerageConnect83 = _data$SewerageConnect82.connectionHolders) === null || _data$SewerageConnect83 === void 0 ? void 0 : (_data$SewerageConnect84 = _data$SewerageConnect83[0]) === null || _data$SewerageConnect84 === void 0 ? void 0 : _data$SewerageConnect84.name),
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection88 = data.WaterConnection) === null || _data$WaterConnection88 === void 0 ? void 0 : (_data$WaterConnection89 = _data$WaterConnection88[0]) === null || _data$WaterConnection89 === void 0 ? void 0 : (_data$WaterConnection90 = _data$WaterConnection89.connectionHolders) === null || _data$WaterConnection90 === void 0 ? void 0 : (_data$WaterConnection91 = _data$WaterConnection90[0]) === null || _data$WaterConnection91 === void 0 ? void 0 : _data$WaterConnection91.name) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect79 = data.SewerageConnections) === null || _data$SewerageConnect79 === void 0 ? void 0 : (_data$SewerageConnect80 = _data$SewerageConnect79[0]) === null || _data$SewerageConnect80 === void 0 ? void 0 : (_data$SewerageConnect81 = _data$SewerageConnect80.connectionHolders) === null || _data$SewerageConnect81 === void 0 ? void 0 : (_data$SewerageConnect82 = _data$SewerageConnect81[0]) === null || _data$SewerageConnect82 === void 0 ? void 0 : _data$SewerageConnect82.name),
     textStyle: {
       whiteSpace: "pre"
     }
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_GENDER_LABEL"),
-    text: t((data === null || data === void 0 ? void 0 : (_data$WaterConnection94 = data.WaterConnection) === null || _data$WaterConnection94 === void 0 ? void 0 : (_data$WaterConnection95 = _data$WaterConnection94[0]) === null || _data$WaterConnection95 === void 0 ? void 0 : (_data$WaterConnection96 = _data$WaterConnection95.connectionHolders) === null || _data$WaterConnection96 === void 0 ? void 0 : (_data$WaterConnection97 = _data$WaterConnection96[0]) === null || _data$WaterConnection97 === void 0 ? void 0 : _data$WaterConnection97.gender) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect85 = data.SewerageConnections) === null || _data$SewerageConnect85 === void 0 ? void 0 : (_data$SewerageConnect86 = _data$SewerageConnect85[0]) === null || _data$SewerageConnect86 === void 0 ? void 0 : (_data$SewerageConnect87 = _data$SewerageConnect86.connectionHolders) === null || _data$SewerageConnect87 === void 0 ? void 0 : (_data$SewerageConnect88 = _data$SewerageConnect87[0]) === null || _data$SewerageConnect88 === void 0 ? void 0 : _data$SewerageConnect88.gender)),
+    text: t((data === null || data === void 0 ? void 0 : (_data$WaterConnection92 = data.WaterConnection) === null || _data$WaterConnection92 === void 0 ? void 0 : (_data$WaterConnection93 = _data$WaterConnection92[0]) === null || _data$WaterConnection93 === void 0 ? void 0 : (_data$WaterConnection94 = _data$WaterConnection93.connectionHolders) === null || _data$WaterConnection94 === void 0 ? void 0 : (_data$WaterConnection95 = _data$WaterConnection94[0]) === null || _data$WaterConnection95 === void 0 ? void 0 : _data$WaterConnection95.gender) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect83 = data.SewerageConnections) === null || _data$SewerageConnect83 === void 0 ? void 0 : (_data$SewerageConnect84 = _data$SewerageConnect83[0]) === null || _data$SewerageConnect84 === void 0 ? void 0 : (_data$SewerageConnect85 = _data$SewerageConnect84.connectionHolders) === null || _data$SewerageConnect85 === void 0 ? void 0 : (_data$SewerageConnect86 = _data$SewerageConnect85[0]) === null || _data$SewerageConnect86 === void 0 ? void 0 : _data$SewerageConnect86.gender)),
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection98 = data.WaterConnection) === null || _data$WaterConnection98 === void 0 ? void 0 : (_data$WaterConnection99 = _data$WaterConnection98[0]) === null || _data$WaterConnection99 === void 0 ? void 0 : (_data$WaterConnection100 = _data$WaterConnection99.connectionHolders) === null || _data$WaterConnection100 === void 0 ? void 0 : (_data$WaterConnection101 = _data$WaterConnection100[0]) === null || _data$WaterConnection101 === void 0 ? void 0 : _data$WaterConnection101.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect89 = data.SewerageConnections) === null || _data$SewerageConnect89 === void 0 ? void 0 : (_data$SewerageConnect90 = _data$SewerageConnect89[0]) === null || _data$SewerageConnect90 === void 0 ? void 0 : (_data$SewerageConnect91 = _data$SewerageConnect90.connectionHolders) === null || _data$SewerageConnect91 === void 0 ? void 0 : (_data$SewerageConnect92 = _data$SewerageConnect91[0]) === null || _data$SewerageConnect92 === void 0 ? void 0 : _data$SewerageConnect92.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection96 = data.WaterConnection) === null || _data$WaterConnection96 === void 0 ? void 0 : (_data$WaterConnection97 = _data$WaterConnection96[0]) === null || _data$WaterConnection97 === void 0 ? void 0 : (_data$WaterConnection98 = _data$WaterConnection97.connectionHolders) === null || _data$WaterConnection98 === void 0 ? void 0 : (_data$WaterConnection99 = _data$WaterConnection98[0]) === null || _data$WaterConnection99 === void 0 ? void 0 : _data$WaterConnection99.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect87 = data.SewerageConnections) === null || _data$SewerageConnect87 === void 0 ? void 0 : (_data$SewerageConnect88 = _data$SewerageConnect87[0]) === null || _data$SewerageConnect88 === void 0 ? void 0 : (_data$SewerageConnect89 = _data$SewerageConnect88.connectionHolders) === null || _data$SewerageConnect89 === void 0 ? void 0 : (_data$SewerageConnect90 = _data$SewerageConnect89[0]) === null || _data$SewerageConnect90 === void 0 ? void 0 : _data$SewerageConnect90.uuid,
       fieldName: "gender",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28035,12 +28099,12 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_FATHER_OR_HUSBAND_NAME"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection102 = data.WaterConnection) === null || _data$WaterConnection102 === void 0 ? void 0 : (_data$WaterConnection103 = _data$WaterConnection102[0]) === null || _data$WaterConnection103 === void 0 ? void 0 : (_data$WaterConnection104 = _data$WaterConnection103.connectionHolders) === null || _data$WaterConnection104 === void 0 ? void 0 : (_data$WaterConnection105 = _data$WaterConnection104[0]) === null || _data$WaterConnection105 === void 0 ? void 0 : _data$WaterConnection105.fatherOrHusbandName) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect93 = data.SewerageConnections) === null || _data$SewerageConnect93 === void 0 ? void 0 : (_data$SewerageConnect94 = _data$SewerageConnect93[0]) === null || _data$SewerageConnect94 === void 0 ? void 0 : (_data$SewerageConnect95 = _data$SewerageConnect94.connectionHolders) === null || _data$SewerageConnect95 === void 0 ? void 0 : (_data$SewerageConnect96 = _data$SewerageConnect95[0]) === null || _data$SewerageConnect96 === void 0 ? void 0 : _data$SewerageConnect96.fatherOrHusbandName) || t("CS_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.fatherOrHusbandName) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect91 = data.SewerageConnections) === null || _data$SewerageConnect91 === void 0 ? void 0 : (_data$SewerageConnect92 = _data$SewerageConnect91[0]) === null || _data$SewerageConnect92 === void 0 ? void 0 : (_data$SewerageConnect93 = _data$SewerageConnect92.connectionHolders) === null || _data$SewerageConnect93 === void 0 ? void 0 : (_data$SewerageConnect94 = _data$SewerageConnect93[0]) === null || _data$SewerageConnect94 === void 0 ? void 0 : _data$SewerageConnect94.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$WaterConnection106 = data.WaterConnection) === null || _data$WaterConnection106 === void 0 ? void 0 : (_data$WaterConnection107 = _data$WaterConnection106[0]) === null || _data$WaterConnection107 === void 0 ? void 0 : (_data$WaterConnection108 = _data$WaterConnection107.connectionHolders) === null || _data$WaterConnection108 === void 0 ? void 0 : (_data$WaterConnection109 = _data$WaterConnection108[0]) === null || _data$WaterConnection109 === void 0 ? void 0 : _data$WaterConnection109.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect97 = data.SewerageConnections) === null || _data$SewerageConnect97 === void 0 ? void 0 : (_data$SewerageConnect98 = _data$SewerageConnect97[0]) === null || _data$SewerageConnect98 === void 0 ? void 0 : (_data$SewerageConnect99 = _data$SewerageConnect98.connectionHolders) === null || _data$SewerageConnect99 === void 0 ? void 0 : (_data$SewerageConnect100 = _data$SewerageConnect99[0]) === null || _data$SewerageConnect100 === void 0 ? void 0 : _data$SewerageConnect100.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$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.uuid,
       fieldName: "fatherOrHusbandName",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28058,12 +28122,12 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_RELATION_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection110 = data.WaterConnection) === null || _data$WaterConnection110 === void 0 ? void 0 : (_data$WaterConnection111 = _data$WaterConnection110[0]) === null || _data$WaterConnection111 === void 0 ? void 0 : (_data$WaterConnection112 = _data$WaterConnection111.connectionHolders) === null || _data$WaterConnection112 === void 0 ? void 0 : (_data$WaterConnection113 = _data$WaterConnection112[0]) === null || _data$WaterConnection113 === void 0 ? void 0 : _data$WaterConnection113.relationship) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect101 = data.SewerageConnections) === null || _data$SewerageConnect101 === void 0 ? void 0 : (_data$SewerageConnect102 = _data$SewerageConnect101[0]) === null || _data$SewerageConnect102 === void 0 ? void 0 : (_data$SewerageConnect103 = _data$SewerageConnect102.connectionHolders) === null || _data$SewerageConnect103 === void 0 ? void 0 : (_data$SewerageConnect104 = _data$SewerageConnect103[0]) === null || _data$SewerageConnect104 === void 0 ? void 0 : _data$SewerageConnect104.relationship) || t("CS_NA"),
+    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$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.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$WaterConnection114 = data.WaterConnection) === null || _data$WaterConnection114 === void 0 ? void 0 : (_data$WaterConnection115 = _data$WaterConnection114[0]) === null || _data$WaterConnection115 === void 0 ? void 0 : (_data$WaterConnection116 = _data$WaterConnection115.connectionHolders) === null || _data$WaterConnection116 === void 0 ? void 0 : (_data$WaterConnection117 = _data$WaterConnection116[0]) === null || _data$WaterConnection117 === void 0 ? void 0 : _data$WaterConnection117.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect105 = data.SewerageConnections) === null || _data$SewerageConnect105 === void 0 ? void 0 : (_data$SewerageConnect106 = _data$SewerageConnect105[0]) === null || _data$SewerageConnect106 === void 0 ? void 0 : (_data$SewerageConnect107 = _data$SewerageConnect106.connectionHolders) === null || _data$SewerageConnect107 === void 0 ? void 0 : (_data$SewerageConnect108 = _data$SewerageConnect107[0]) === null || _data$SewerageConnect108 === void 0 ? void 0 : _data$SewerageConnect108.uuid,
+      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$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.uuid,
       fieldName: "relationship",
       model: "WnSConnection",
       showValue: false,
@@ -28081,9 +28145,9 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_CROSADD"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection118 = data.WaterConnection) === null || _data$WaterConnection118 === void 0 ? void 0 : (_data$WaterConnection119 = _data$WaterConnection118[0]) === null || _data$WaterConnection119 === void 0 ? void 0 : (_data$WaterConnection120 = _data$WaterConnection119.connectionHolders) === null || _data$WaterConnection120 === void 0 ? void 0 : (_data$WaterConnection121 = _data$WaterConnection120[0]) === null || _data$WaterConnection121 === void 0 ? void 0 : _data$WaterConnection121.correspondenceAddress) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect109 = data.SewerageConnections) === null || _data$SewerageConnect109 === void 0 ? void 0 : (_data$SewerageConnect110 = _data$SewerageConnect109[0]) === null || _data$SewerageConnect110 === void 0 ? void 0 : (_data$SewerageConnect111 = _data$SewerageConnect110.connectionHolders) === null || _data$SewerageConnect111 === void 0 ? void 0 : (_data$SewerageConnect112 = _data$SewerageConnect111[0]) === null || _data$SewerageConnect112 === void 0 ? void 0 : _data$SewerageConnect112.correspondenceAddress) || t("CS_NA"),
+    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$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.correspondenceAddress) || t("CS_NA"),
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection122 = data.WaterConnection) === null || _data$WaterConnection122 === void 0 ? void 0 : (_data$WaterConnection123 = _data$WaterConnection122[0]) === null || _data$WaterConnection123 === void 0 ? void 0 : (_data$WaterConnection124 = _data$WaterConnection123.connectionHolders) === null || _data$WaterConnection124 === void 0 ? void 0 : (_data$WaterConnection125 = _data$WaterConnection124[0]) === null || _data$WaterConnection125 === void 0 ? void 0 : _data$WaterConnection125.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect113 = data.SewerageConnections) === null || _data$SewerageConnect113 === void 0 ? void 0 : (_data$SewerageConnect114 = _data$SewerageConnect113[0]) === null || _data$SewerageConnect114 === void 0 ? void 0 : (_data$SewerageConnect115 = _data$SewerageConnect114.connectionHolders) === null || _data$SewerageConnect115 === void 0 ? void 0 : (_data$SewerageConnect116 = _data$SewerageConnect115[0]) === null || _data$SewerageConnect116 === void 0 ? void 0 : _data$SewerageConnect116.uuid,
+      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$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.uuid,
       fieldName: "correspondenceAddress",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28101,12 +28165,12 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_SPECIAL_APPLICANT_LABEL"),
-    text: (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? !(data !== null && data !== void 0 && (_data$WaterConnection126 = data.WaterConnection) !== null && _data$WaterConnection126 !== void 0 && (_data$WaterConnection127 = _data$WaterConnection126[0]) !== null && _data$WaterConnection127 !== void 0 && (_data$WaterConnection128 = _data$WaterConnection127.connectionHolders) !== null && _data$WaterConnection128 !== void 0 && (_data$WaterConnection129 = _data$WaterConnection128[0]) !== null && _data$WaterConnection129 !== void 0 && (_data$WaterConnection130 = _data$WaterConnection129.ownerType) !== null && _data$WaterConnection130 !== void 0 && _data$WaterConnection130.includes("*")) : !(data !== null && data !== void 0 && (_data$SewerageConnect117 = data.SewerageConnections) !== null && _data$SewerageConnect117 !== void 0 && (_data$SewerageConnect118 = _data$SewerageConnect117[0]) !== null && _data$SewerageConnect118 !== void 0 && (_data$SewerageConnect119 = _data$SewerageConnect118.connectionHolders) !== null && _data$SewerageConnect119 !== void 0 && (_data$SewerageConnect120 = _data$SewerageConnect119[0]) !== null && _data$SewerageConnect120 !== void 0 && (_data$SewerageConnect121 = _data$SewerageConnect120.ownerType) !== null && _data$SewerageConnect121 !== void 0 && _data$SewerageConnect121.includes("*"))) ? t(`COMMON_MASTERS_OWNERTYPE_${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection131 = data.WaterConnection) === null || _data$WaterConnection131 === void 0 ? void 0 : (_data$WaterConnection132 = _data$WaterConnection131[0]) === null || _data$WaterConnection132 === void 0 ? void 0 : (_data$WaterConnection133 = _data$WaterConnection132.connectionHolders) === null || _data$WaterConnection133 === void 0 ? void 0 : (_data$WaterConnection134 = _data$WaterConnection133[0]) === null || _data$WaterConnection134 === void 0 ? void 0 : _data$WaterConnection134.ownerType : data === null || data === void 0 ? void 0 : (_data$SewerageConnect122 = data.SewerageConnections) === null || _data$SewerageConnect122 === void 0 ? void 0 : (_data$SewerageConnect123 = _data$SewerageConnect122[0]) === null || _data$SewerageConnect123 === void 0 ? void 0 : (_data$SewerageConnect124 = _data$SewerageConnect123.connectionHolders) === null || _data$SewerageConnect124 === void 0 ? void 0 : (_data$SewerageConnect125 = _data$SewerageConnect124[0]) === null || _data$SewerageConnect125 === void 0 ? void 0 : _data$SewerageConnect125.ownerType}`) : applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? 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$WaterConnection137 = _data$WaterConnection136.connectionHolders) === null || _data$WaterConnection137 === void 0 ? void 0 : (_data$WaterConnection138 = _data$WaterConnection137[0]) === null || _data$WaterConnection138 === void 0 ? void 0 : _data$WaterConnection138.ownerType : data === null || data === void 0 ? void 0 : (_data$SewerageConnect126 = data.SewerageConnections) === null || _data$SewerageConnect126 === void 0 ? void 0 : (_data$SewerageConnect127 = _data$SewerageConnect126[0]) === null || _data$SewerageConnect127 === void 0 ? void 0 : (_data$SewerageConnect128 = _data$SewerageConnect127.connectionHolders) === null || _data$SewerageConnect128 === void 0 ? void 0 : (_data$SewerageConnect129 = _data$SewerageConnect128[0]) === null || _data$SewerageConnect129 === void 0 ? void 0 : _data$SewerageConnect129.ownerType,
+    text: (applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? !(data !== null && data !== void 0 && (_data$WaterConnection124 = data.WaterConnection) !== null && _data$WaterConnection124 !== void 0 && (_data$WaterConnection125 = _data$WaterConnection124[0]) !== null && _data$WaterConnection125 !== void 0 && (_data$WaterConnection126 = _data$WaterConnection125.connectionHolders) !== null && _data$WaterConnection126 !== void 0 && (_data$WaterConnection127 = _data$WaterConnection126[0]) !== null && _data$WaterConnection127 !== void 0 && (_data$WaterConnection128 = _data$WaterConnection127.ownerType) !== null && _data$WaterConnection128 !== void 0 && _data$WaterConnection128.includes("*")) : !(data !== null && data !== void 0 && (_data$SewerageConnect115 = data.SewerageConnections) !== null && _data$SewerageConnect115 !== void 0 && (_data$SewerageConnect116 = _data$SewerageConnect115[0]) !== null && _data$SewerageConnect116 !== void 0 && (_data$SewerageConnect117 = _data$SewerageConnect116.connectionHolders) !== null && _data$SewerageConnect117 !== void 0 && (_data$SewerageConnect118 = _data$SewerageConnect117[0]) !== null && _data$SewerageConnect118 !== void 0 && (_data$SewerageConnect119 = _data$SewerageConnect118.ownerType) !== null && _data$SewerageConnect119 !== void 0 && _data$SewerageConnect119.includes("*"))) ? t(`COMMON_MASTERS_OWNERTYPE_${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection129 = data.WaterConnection) === null || _data$WaterConnection129 === void 0 ? void 0 : (_data$WaterConnection130 = _data$WaterConnection129[0]) === null || _data$WaterConnection130 === void 0 ? void 0 : (_data$WaterConnection131 = _data$WaterConnection130.connectionHolders) === null || _data$WaterConnection131 === void 0 ? void 0 : (_data$WaterConnection132 = _data$WaterConnection131[0]) === null || _data$WaterConnection132 === void 0 ? void 0 : _data$WaterConnection132.ownerType : data === null || data === void 0 ? void 0 : (_data$SewerageConnect120 = data.SewerageConnections) === null || _data$SewerageConnect120 === void 0 ? void 0 : (_data$SewerageConnect121 = _data$SewerageConnect120[0]) === null || _data$SewerageConnect121 === void 0 ? void 0 : (_data$SewerageConnect122 = _data$SewerageConnect121.connectionHolders) === null || _data$SewerageConnect122 === void 0 ? void 0 : (_data$SewerageConnect123 = _data$SewerageConnect122[0]) === null || _data$SewerageConnect123 === void 0 ? void 0 : _data$SewerageConnect123.ownerType}`) : applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection133 = data.WaterConnection) === null || _data$WaterConnection133 === void 0 ? void 0 : (_data$WaterConnection134 = _data$WaterConnection133[0]) === null || _data$WaterConnection134 === void 0 ? void 0 : (_data$WaterConnection135 = _data$WaterConnection134.connectionHolders) === null || _data$WaterConnection135 === void 0 ? void 0 : (_data$WaterConnection136 = _data$WaterConnection135[0]) === null || _data$WaterConnection136 === void 0 ? void 0 : _data$WaterConnection136.ownerType : data === null || data === void 0 ? void 0 : (_data$SewerageConnect124 = data.SewerageConnections) === null || _data$SewerageConnect124 === void 0 ? void 0 : (_data$SewerageConnect125 = _data$SewerageConnect124[0]) === null || _data$SewerageConnect125 === void 0 ? void 0 : (_data$SewerageConnect126 = _data$SewerageConnect125.connectionHolders) === null || _data$SewerageConnect126 === void 0 ? void 0 : (_data$SewerageConnect127 = _data$SewerageConnect126[0]) === null || _data$SewerageConnect127 === void 0 ? void 0 : _data$SewerageConnect127.ownerType,
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? 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$WaterConnection141 = _data$WaterConnection140.connectionHolders) === null || _data$WaterConnection141 === void 0 ? void 0 : (_data$WaterConnection142 = _data$WaterConnection141[0]) === null || _data$WaterConnection142 === void 0 ? void 0 : _data$WaterConnection142.uuid : 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$SewerageConnect132 = _data$SewerageConnect131.connectionHolders) === null || _data$SewerageConnect132 === void 0 ? void 0 : (_data$SewerageConnect133 = _data$SewerageConnect132[0]) === null || _data$SewerageConnect133 === void 0 ? void 0 : _data$SewerageConnect133.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? 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$WaterConnection139 = _data$WaterConnection138.connectionHolders) === null || _data$WaterConnection139 === void 0 ? void 0 : (_data$WaterConnection140 = _data$WaterConnection139[0]) === null || _data$WaterConnection140 === void 0 ? void 0 : _data$WaterConnection140.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect128 = data.SewerageConnections) === null || _data$SewerageConnect128 === void 0 ? void 0 : (_data$SewerageConnect129 = _data$SewerageConnect128[0]) === null || _data$SewerageConnect129 === void 0 ? void 0 : (_data$SewerageConnect130 = _data$SewerageConnect129.connectionHolders) === null || _data$SewerageConnect130 === void 0 ? void 0 : (_data$SewerageConnect131 = _data$SewerageConnect130[0]) === null || _data$SewerageConnect131 === void 0 ? void 0 : _data$SewerageConnect131.uuid,
       fieldName: "ownerType",
       model: "WnSConnection",
       showValue: false,
@@ -28129,12 +28193,12 @@ const WSApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_EMAIL_ID_LABEL"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection143 = data.WaterConnection) === null || _data$WaterConnection143 === void 0 ? void 0 : (_data$WaterConnection144 = _data$WaterConnection143[0]) === null || _data$WaterConnection144 === void 0 ? void 0 : (_data$WaterConnection145 = _data$WaterConnection144.connectionHolders) === null || _data$WaterConnection145 === void 0 ? void 0 : (_data$WaterConnection146 = _data$WaterConnection145[0]) === null || _data$WaterConnection146 === void 0 ? void 0 : _data$WaterConnection146.emailId) || (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$SewerageConnect136 = _data$SewerageConnect135.connectionHolders) === null || _data$SewerageConnect136 === void 0 ? void 0 : (_data$SewerageConnect137 = _data$SewerageConnect136[0]) === null || _data$SewerageConnect137 === void 0 ? void 0 : _data$SewerageConnect137.emailId) || "NA",
+    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection141 = data.WaterConnection) === null || _data$WaterConnection141 === void 0 ? void 0 : (_data$WaterConnection142 = _data$WaterConnection141[0]) === null || _data$WaterConnection142 === void 0 ? void 0 : (_data$WaterConnection143 = _data$WaterConnection142.connectionHolders) === null || _data$WaterConnection143 === void 0 ? void 0 : (_data$WaterConnection144 = _data$WaterConnection143[0]) === null || _data$WaterConnection144 === void 0 ? void 0 : _data$WaterConnection144.emailId) || (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$SewerageConnect134 = _data$SewerageConnect133.connectionHolders) === null || _data$SewerageConnect134 === void 0 ? void 0 : (_data$SewerageConnect135 = _data$SewerageConnect134[0]) === null || _data$SewerageConnect135 === void 0 ? void 0 : _data$SewerageConnect135.emailId) || "NA",
     textStyle: {
       whiteSpace: "pre"
     },
     privacy: {
-      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection147 = data.WaterConnection) === null || _data$WaterConnection147 === void 0 ? void 0 : (_data$WaterConnection148 = _data$WaterConnection147[0]) === null || _data$WaterConnection148 === void 0 ? void 0 : (_data$WaterConnection149 = _data$WaterConnection148.connectionHolders) === null || _data$WaterConnection149 === void 0 ? void 0 : (_data$WaterConnection150 = _data$WaterConnection149[0]) === null || _data$WaterConnection150 === void 0 ? void 0 : _data$WaterConnection150.uuid : 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$SewerageConnect140 = _data$SewerageConnect139.connectionHolders) === null || _data$SewerageConnect140 === void 0 ? void 0 : (_data$SewerageConnect141 = _data$SewerageConnect140[0]) === null || _data$SewerageConnect141 === void 0 ? void 0 : _data$SewerageConnect141.uuid,
+      uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection145 = data.WaterConnection) === null || _data$WaterConnection145 === void 0 ? void 0 : (_data$WaterConnection146 = _data$WaterConnection145[0]) === null || _data$WaterConnection146 === void 0 ? void 0 : (_data$WaterConnection147 = _data$WaterConnection146.connectionHolders) === null || _data$WaterConnection147 === void 0 ? void 0 : (_data$WaterConnection148 = _data$WaterConnection147[0]) === null || _data$WaterConnection148 === void 0 ? void 0 : _data$WaterConnection148.uuid : 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$SewerageConnect138 = _data$SewerageConnect137.connectionHolders) === null || _data$SewerageConnect138 === void 0 ? void 0 : (_data$SewerageConnect139 = _data$SewerageConnect138[0]) === null || _data$SewerageConnect139 === void 0 ? void 0 : _data$SewerageConnect139.uuid,
       fieldName: "connectionHoldersEmailId",
       model: "WnSConnectionOwner",
       showValue: false,
@@ -28153,43 +28217,43 @@ const WSApplicationDetails = () => {
     styles: {
       fontSize: "28px"
     }
-  }, t("WS_COMMON_CONNECTION_DETAIL")), (data === null || data === void 0 ? void 0 : data.WaterConnection) && (data === null || data === void 0 ? void 0 : (_data$WaterConnection151 = data.WaterConnection) === null || _data$WaterConnection151 === void 0 ? void 0 : _data$WaterConnection151.length) > 0 && /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
+  }, t("WS_COMMON_CONNECTION_DETAIL")), (data === null || data === void 0 ? void 0 : data.WaterConnection) && (data === null || data === void 0 ? void 0 : (_data$WaterConnection149 = data.WaterConnection) === null || _data$WaterConnection149 === void 0 ? void 0 : _data$WaterConnection149.length) > 0 && /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_TASK_DETAILS_CONN_DETAIL_NO_OF_TAPS_PROPOSED"),
-    text: (data === null || data === void 0 ? void 0 : (_data$WaterConnection152 = data.WaterConnection) === null || _data$WaterConnection152 === void 0 ? void 0 : (_data$WaterConnection153 = _data$WaterConnection152[0]) === null || _data$WaterConnection153 === void 0 ? void 0 : _data$WaterConnection153.proposedTaps) || t("CS_NA"),
+    text: (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.proposedTaps) || t("CS_NA"),
     textStyle: {
       whiteSpace: "pre"
     }
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_SERV_DETAIL_PIPE_SIZE"),
-    text: `${data === null || data === void 0 ? void 0 : (_data$WaterConnection154 = data.WaterConnection) === null || _data$WaterConnection154 === void 0 ? void 0 : (_data$WaterConnection155 = _data$WaterConnection154[0]) === null || _data$WaterConnection155 === void 0 ? void 0 : _data$WaterConnection155.proposedPipeSize} ${t("WS_INCHES_LABEL")}` || t("CS_NA"),
+    text: `${data === null || data === void 0 ? void 0 : (_data$WaterConnection152 = data.WaterConnection) === null || _data$WaterConnection152 === void 0 ? void 0 : (_data$WaterConnection153 = _data$WaterConnection152[0]) === null || _data$WaterConnection153 === void 0 ? void 0 : _data$WaterConnection153.proposedPipeSize} ${t("WS_INCHES_LABEL")}` || t("CS_NA"),
     textStyle: {
       whiteSpace: "pre"
     }
   }), /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/citizen/ws/connection/additional/${data === null || data === void 0 ? void 0 : (_data$WaterConnection156 = data.WaterConnection) === null || _data$WaterConnection156 === void 0 ? void 0 : (_data$WaterConnection157 = _data$WaterConnection156[0]) === null || _data$WaterConnection157 === void 0 ? void 0 : _data$WaterConnection157.applicationNo}`
+    to: `/digit-ui/citizen/ws/connection/additional/${data === null || data === void 0 ? void 0 : (_data$WaterConnection154 = data.WaterConnection) === null || _data$WaterConnection154 === void 0 ? void 0 : (_data$WaterConnection155 = _data$WaterConnection154[0]) === null || _data$WaterConnection155 === void 0 ? void 0 : _data$WaterConnection155.applicationNo}`
   }, /*#__PURE__*/React.createElement(LinkButton, {
     style: {
       textAlign: "left"
     },
     label: t("WS_ADDITIONAL_DETAILS")
-  }))), (data === null || data === void 0 ? void 0 : data.SewerageConnections) && (data === null || data === void 0 ? void 0 : (_data$SewerageConnect142 = data.SewerageConnections) === null || _data$SewerageConnect142 === void 0 ? void 0 : _data$SewerageConnect142.length) > 0 && /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
+  }))), (data === null || data === void 0 ? void 0 : data.SewerageConnections) && (data === null || data === void 0 ? void 0 : (_data$SewerageConnect140 = data.SewerageConnections) === null || _data$SewerageConnect140 === void 0 ? void 0 : _data$SewerageConnect140.length) > 0 && /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_NO_OF_WATER_CLOSETS_LABEL"),
-    text: 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.proposedWaterClosets,
+    text: 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.proposedWaterClosets,
     textStyle: {
       whiteSpace: "pre"
     }
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_SERV_DETAIL_NO_OF_TOILETS"),
-    text: (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.proposedToilets) || t("CS_NA"),
+    text: (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.proposedToilets) || t("CS_NA"),
     textStyle: {
       whiteSpace: "pre"
     }
   }), /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/citizen/ws/connection/additional/${data === null || data === void 0 ? void 0 : (_data$SewerageConnect147 = data.SewerageConnections) === null || _data$SewerageConnect147 === void 0 ? void 0 : (_data$SewerageConnect148 = _data$SewerageConnect147[0]) === null || _data$SewerageConnect148 === void 0 ? void 0 : _data$SewerageConnect148.applicationNo}`
+    to: `/digit-ui/citizen/ws/connection/additional/${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.applicationNo}`
   }, /*#__PURE__*/React.createElement(LinkButton, {
     style: {
       textAlign: "left"
@@ -28199,15 +28263,15 @@ const WSApplicationDetails = () => {
     styles: {
       fontSize: "28px"
     }
-  }, t("WS_COMMON_DOCUMENT_DETAILS")), (data === null || data === void 0 ? void 0 : (_data$WaterConnection158 = data.WaterConnection) === null || _data$WaterConnection158 === void 0 ? void 0 : (_data$WaterConnection159 = _data$WaterConnection158[0]) === null || _data$WaterConnection159 === void 0 ? void 0 : _data$WaterConnection159.documents) && (data === null || data === void 0 ? void 0 : (_data$WaterConnection160 = data.WaterConnection) === null || _data$WaterConnection160 === void 0 ? void 0 : (_data$WaterConnection161 = _data$WaterConnection160[0]) === null || _data$WaterConnection161 === void 0 ? void 0 : _data$WaterConnection161.documents.map((doc, index) => {
-    var _doc$documentType, _data$WaterConnection162, _data$WaterConnection163, _data$WaterConnection164, _data$WaterConnection165;
+  }, t("WS_COMMON_DOCUMENT_DETAILS")), (data === null || data === void 0 ? void 0 : (_data$WaterConnection156 = data.WaterConnection) === null || _data$WaterConnection156 === void 0 ? void 0 : (_data$WaterConnection157 = _data$WaterConnection156[0]) === null || _data$WaterConnection157 === void 0 ? void 0 : _data$WaterConnection157.documents) && (data === null || data === void 0 ? void 0 : (_data$WaterConnection158 = data.WaterConnection) === null || _data$WaterConnection158 === void 0 ? void 0 : (_data$WaterConnection159 = _data$WaterConnection158[0]) === null || _data$WaterConnection159 === void 0 ? void 0 : _data$WaterConnection159.documents.map((doc, index) => {
+    var _doc$documentType, _data$WaterConnection160, _data$WaterConnection161, _data$WaterConnection162, _data$WaterConnection163;
     return /*#__PURE__*/React.createElement("div", {
       key: `doc-${index}`
     }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(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.createElement(StatusTable, null, /*#__PURE__*/React.createElement(WSDocument, {
-      value: 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.documents,
+      value: data === null || data === void 0 ? void 0 : (_data$WaterConnection160 = data.WaterConnection) === null || _data$WaterConnection160 === void 0 ? void 0 : (_data$WaterConnection161 = _data$WaterConnection160[0]) === null || _data$WaterConnection161 === void 0 ? void 0 : _data$WaterConnection161.documents,
       Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
       index: index
-    }), (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.documents.length) != index + 1 ? /*#__PURE__*/React.createElement("hr", {
+    }), (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.documents.length) != index + 1 ? /*#__PURE__*/React.createElement("hr", {
       style: {
         color: "#cccccc",
         backgroundColor: "#cccccc",
@@ -28216,15 +28280,15 @@ const WSApplicationDetails = () => {
         marginBottom: "20px"
       }
     }) : null)));
-  })), (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.documents) && (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.documents.map((doc, index) => {
-    var _doc$documentType2, _data$SewerageConnect153, _data$SewerageConnect154, _data$SewerageConnect155, _data$SewerageConnect156;
+  })), (data === null || data === void 0 ? void 0 : (_data$SewerageConnect147 = data.SewerageConnections) === null || _data$SewerageConnect147 === void 0 ? void 0 : (_data$SewerageConnect148 = _data$SewerageConnect147[0]) === null || _data$SewerageConnect148 === void 0 ? void 0 : _data$SewerageConnect148.documents) && (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.documents.map((doc, index) => {
+    var _doc$documentType2, _data$SewerageConnect151, _data$SewerageConnect152, _data$SewerageConnect153, _data$SewerageConnect154;
     return /*#__PURE__*/React.createElement("div", {
       key: `doc-${index}`
     }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(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.createElement(StatusTable, null, /*#__PURE__*/React.createElement(WSDocument, {
-      value: 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,
+      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.documents,
       Code: doc === null || doc === void 0 ? void 0 : doc.documentType,
       index: index
-    }), (data === null || data === void 0 ? void 0 : (_data$SewerageConnect155 = data.SewerageConnections) === null || _data$SewerageConnect155 === void 0 ? void 0 : (_data$SewerageConnect156 = _data$SewerageConnect155[0]) === null || _data$SewerageConnect156 === void 0 ? void 0 : _data$SewerageConnect156.documents.length) != index + 1 ? /*#__PURE__*/React.createElement("hr", {
+    }), (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.length) != index + 1 ? /*#__PURE__*/React.createElement("hr", {
       style: {
         color: "white",
         backgroundColor: "white",
@@ -28236,39 +28300,39 @@ const WSApplicationDetails = () => {
   }))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
     id: "timeline"
   }, /*#__PURE__*/React.createElement(WSWFApplicationTimeline, {
-    application: (data === null || data === void 0 ? void 0 : (_data$WaterConnection166 = data.WaterConnection) === null || _data$WaterConnection166 === void 0 ? void 0 : _data$WaterConnection166[0]) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect157 = data.SewerageConnections) === null || _data$SewerageConnect157 === void 0 ? void 0 : _data$SewerageConnect157[0]),
-    id: (data === null || data === void 0 ? void 0 : (_data$WaterConnection167 = data.WaterConnection) === null || _data$WaterConnection167 === void 0 ? void 0 : (_data$WaterConnection168 = _data$WaterConnection167[0]) === null || _data$WaterConnection168 === void 0 ? void 0 : _data$WaterConnection168.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect158 = data.SewerageConnections) === null || _data$SewerageConnect158 === void 0 ? void 0 : (_data$SewerageConnect159 = _data$SewerageConnect158[0]) === null || _data$SewerageConnect159 === void 0 ? void 0 : _data$SewerageConnect159.applicationNo),
+    application: (data === null || data === void 0 ? void 0 : (_data$WaterConnection164 = data.WaterConnection) === null || _data$WaterConnection164 === void 0 ? void 0 : _data$WaterConnection164[0]) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect155 = data.SewerageConnections) === null || _data$SewerageConnect155 === void 0 ? void 0 : _data$SewerageConnect155[0]),
+    id: (data === null || data === void 0 ? void 0 : (_data$WaterConnection165 = data.WaterConnection) === null || _data$WaterConnection165 === void 0 ? void 0 : (_data$WaterConnection166 = _data$WaterConnection165[0]) === null || _data$WaterConnection166 === void 0 ? void 0 : _data$WaterConnection166.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),
     paymentbuttonenabled: false
-  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection169 = data.WaterConnection) === null || _data$WaterConnection169 === void 0 ? void 0 : (_data$WaterConnection170 = _data$WaterConnection169[0]) === null || _data$WaterConnection170 === void 0 ? void 0 : _data$WaterConnection170.applicationStatus) === "PENDING_FOR_PAYMENT" || (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.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React.createElement(Link, {
+  })), (data === null || data === void 0 ? void 0 : (_data$WaterConnection167 = data.WaterConnection) === null || _data$WaterConnection167 === void 0 ? void 0 : (_data$WaterConnection168 = _data$WaterConnection167[0]) === null || _data$WaterConnection168 === void 0 ? void 0 : _data$WaterConnection168.applicationStatus) === "PENDING_FOR_PAYMENT" || (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.applicationStatus) === "PENDING_FOR_PAYMENT" ? /*#__PURE__*/React.createElement(Link, {
     to: {
-      pathname: `/digit-ui/citizen/payment/my-bills/${paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data30 = paymentDetails.data) === null || _paymentDetails$data30 === void 0 ? void 0 : (_paymentDetails$data31 = _paymentDetails$data30.Bill) === null || _paymentDetails$data31 === void 0 ? void 0 : (_paymentDetails$data32 = _paymentDetails$data31[0]) === null || _paymentDetails$data32 === void 0 ? void 0 : _paymentDetails$data32.businessService}/${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$WaterConnection171 = data.WaterConnection) === null || _data$WaterConnection171 === void 0 ? void 0 : (_data$WaterConnection172 = _data$WaterConnection171[0]) === null || _data$WaterConnection172 === void 0 ? void 0 : _data$WaterConnection172.connectionNo, "/", "+") || stringReplaceAll(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.connectionNo, "/", "+") : stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$WaterConnection173 = data.WaterConnection) === null || _data$WaterConnection173 === void 0 ? void 0 : (_data$WaterConnection174 = _data$WaterConnection173[0]) === null || _data$WaterConnection174 === void 0 ? void 0 : _data$WaterConnection174.applicationNo, "/", "+") || stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$SewerageConnect164 = data.SewerageConnections) === null || _data$SewerageConnect164 === void 0 ? void 0 : (_data$SewerageConnect165 = _data$SewerageConnect164[0]) === null || _data$SewerageConnect165 === void 0 ? void 0 : _data$SewerageConnect165.applicationNo, "/", "+")}?workflow=WNS&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection175 = data.WaterConnection) === null || _data$WaterConnection175 === void 0 ? void 0 : (_data$WaterConnection176 = _data$WaterConnection175[0]) === null || _data$WaterConnection176 === void 0 ? void 0 : _data$WaterConnection176.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect166 = data.SewerageConnections) === null || _data$SewerageConnect166 === void 0 ? void 0 : (_data$SewerageConnect167 = _data$SewerageConnect166[0]) === null || _data$SewerageConnect167 === void 0 ? void 0 : _data$SewerageConnect167.tenantId)}&ConsumerName=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection177 = data.WaterConnection) === null || _data$WaterConnection177 === void 0 ? void 0 : (_data$WaterConnection178 = _data$WaterConnection177[0]) === null || _data$WaterConnection178 === void 0 ? void 0 : (_data$WaterConnection179 = _data$WaterConnection178.connectionHolders) === null || _data$WaterConnection179 === void 0 ? void 0 : _data$WaterConnection179.map(owner => owner.name).join(",")) || (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$SewerageConnect170 = _data$SewerageConnect169.connectionHolders) === null || _data$SewerageConnect170 === void 0 ? void 0 : _data$SewerageConnect170.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties9 = PTData.Properties) === null || _PTData$Properties9 === void 0 ? void 0 : (_PTData$Properties9$ = _PTData$Properties9[0]) === null || _PTData$Properties9$ === void 0 ? void 0 : (_PTData$Properties9$$ = _PTData$Properties9$.owners) === null || _PTData$Properties9$$ === void 0 ? void 0 : _PTData$Properties9$$.map(owner => owner.name).join(","))}&isDisoconnectFlow=${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false}`,
+      pathname: `/digit-ui/citizen/payment/my-bills/${paymentDetails === null || paymentDetails === void 0 ? void 0 : (_paymentDetails$data30 = paymentDetails.data) === null || _paymentDetails$data30 === void 0 ? void 0 : (_paymentDetails$data31 = _paymentDetails$data30.Bill) === null || _paymentDetails$data31 === void 0 ? void 0 : (_paymentDetails$data32 = _paymentDetails$data31[0]) === null || _paymentDetails$data32 === void 0 ? void 0 : _paymentDetails$data32.businessService}/${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$WaterConnection169 = data.WaterConnection) === null || _data$WaterConnection169 === void 0 ? void 0 : (_data$WaterConnection170 = _data$WaterConnection169[0]) === null || _data$WaterConnection170 === void 0 ? void 0 : _data$WaterConnection170.connectionNo, "/", "+") || stringReplaceAll(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.connectionNo, "/", "+") : stringReplaceAll(data === null || data === void 0 ? void 0 : (_data$WaterConnection171 = data.WaterConnection) === null || _data$WaterConnection171 === void 0 ? void 0 : (_data$WaterConnection172 = _data$WaterConnection171[0]) === null || _data$WaterConnection172 === void 0 ? void 0 : _data$WaterConnection172.applicationNo, "/", "+") || stringReplaceAll(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, "/", "+")}?workflow=WNS&tenantId=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection173 = data.WaterConnection) === null || _data$WaterConnection173 === void 0 ? void 0 : (_data$WaterConnection174 = _data$WaterConnection173[0]) === null || _data$WaterConnection174 === void 0 ? void 0 : _data$WaterConnection174.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect164 = data.SewerageConnections) === null || _data$SewerageConnect164 === void 0 ? void 0 : (_data$SewerageConnect165 = _data$SewerageConnect164[0]) === null || _data$SewerageConnect165 === void 0 ? void 0 : _data$SewerageConnect165.tenantId)}&ConsumerName=${(data === null || data === void 0 ? void 0 : (_data$WaterConnection175 = data.WaterConnection) === null || _data$WaterConnection175 === void 0 ? void 0 : (_data$WaterConnection176 = _data$WaterConnection175[0]) === null || _data$WaterConnection176 === void 0 ? void 0 : (_data$WaterConnection177 = _data$WaterConnection176.connectionHolders) === null || _data$WaterConnection177 === void 0 ? void 0 : _data$WaterConnection177.map(owner => owner.name).join(",")) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect166 = data.SewerageConnections) === null || _data$SewerageConnect166 === void 0 ? void 0 : (_data$SewerageConnect167 = _data$SewerageConnect166[0]) === null || _data$SewerageConnect167 === void 0 ? void 0 : (_data$SewerageConnect168 = _data$SewerageConnect167.connectionHolders) === null || _data$SewerageConnect168 === void 0 ? void 0 : _data$SewerageConnect168.map(owner => owner.name).join(",")) || (PTData === null || PTData === void 0 ? void 0 : (_PTData$Properties9 = PTData.Properties) === null || _PTData$Properties9 === void 0 ? void 0 : (_PTData$Properties9$ = _PTData$Properties9[0]) === null || _PTData$Properties9$ === void 0 ? void 0 : (_PTData$Properties9$$ = _PTData$Properties9$.owners) === null || _PTData$Properties9$$ === void 0 ? void 0 : _PTData$Properties9$$.map(owner => owner.name).join(","))}&isDisoconnectFlow=${applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("DC") ? true : false}`,
       state: {}
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("MAKE_PAYMENT")
-  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection180 = data.WaterConnection) !== null && _data$WaterConnection180 !== void 0 && (_data$WaterConnection181 = _data$WaterConnection180[0]) !== null && _data$WaterConnection181 !== void 0 && _data$WaterConnection181.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection182 = data.WaterConnection) !== null && _data$WaterConnection182 !== void 0 && (_data$WaterConnection183 = _data$WaterConnection182[0]) !== null && _data$WaterConnection183 !== void 0 && _data$WaterConnection183.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(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.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$SewerageConnect173 = data.SewerageConnections) !== null && _data$SewerageConnect173 !== void 0 && (_data$SewerageConnect174 = _data$SewerageConnect173[0]) !== null && _data$SewerageConnect174 !== void 0 && _data$SewerageConnect174.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
+  })) : null, !(data !== null && data !== void 0 && (_data$WaterConnection178 = data.WaterConnection) !== null && _data$WaterConnection178 !== void 0 && (_data$WaterConnection179 = _data$WaterConnection178[0]) !== null && _data$WaterConnection179 !== void 0 && _data$WaterConnection179.applicationType.includes("DISCONNECT")) && data !== null && data !== void 0 && (_data$WaterConnection180 = data.WaterConnection) !== null && _data$WaterConnection180 !== void 0 && (_data$WaterConnection181 = _data$WaterConnection180[0]) !== null && _data$WaterConnection181 !== void 0 && _data$WaterConnection181.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || !(data !== null && data !== void 0 && (_data$SewerageConnect169 = data.SewerageConnections) !== null && _data$SewerageConnect169 !== void 0 && (_data$SewerageConnect170 = _data$SewerageConnect169[0]) !== null && _data$SewerageConnect170 !== void 0 && _data$SewerageConnect170.applicationType.includes("DISCONNECT")) && 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.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
     to: {
-      pathname: `/digit-ui/citizen/ws/edit-application/${(data === null || data === void 0 ? void 0 : (_data$WaterConnection184 = data.WaterConnection) === null || _data$WaterConnection184 === void 0 ? void 0 : (_data$WaterConnection185 = _data$WaterConnection184[0]) === null || _data$WaterConnection185 === void 0 ? void 0 : _data$WaterConnection185.tenantId) || (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.tenantId)}`,
+      pathname: `/digit-ui/citizen/ws/edit-application/${(data === null || data === void 0 ? void 0 : (_data$WaterConnection182 = data.WaterConnection) === null || _data$WaterConnection182 === void 0 ? void 0 : (_data$WaterConnection183 = _data$WaterConnection182[0]) === null || _data$WaterConnection183 === void 0 ? void 0 : _data$WaterConnection183.tenantId) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect173 = data.SewerageConnections) === null || _data$SewerageConnect173 === void 0 ? void 0 : (_data$SewerageConnect174 = _data$SewerageConnect173[0]) === null || _data$SewerageConnect174 === void 0 ? void 0 : _data$SewerageConnect174.tenantId)}`,
       state: {
-        id: `${(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.applicationNo) || (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.applicationNo)}`
+        id: `${(data === null || data === void 0 ? void 0 : (_data$WaterConnection184 = data.WaterConnection) === null || _data$WaterConnection184 === void 0 ? void 0 : (_data$WaterConnection185 = _data$WaterConnection184[0]) === null || _data$WaterConnection185 === void 0 ? void 0 : _data$WaterConnection185.applicationNo) || (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.applicationNo)}`
       }
     }
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("COMMON_EDIT")
-  })) : null, data !== null && data !== void 0 && (_data$WaterConnection188 = data.WaterConnection) !== null && _data$WaterConnection188 !== void 0 && (_data$WaterConnection189 = _data$WaterConnection188[0]) !== null && _data$WaterConnection189 !== void 0 && _data$WaterConnection189.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection190 = data.WaterConnection) !== null && _data$WaterConnection190 !== void 0 && (_data$WaterConnection191 = _data$WaterConnection190[0]) !== null && _data$WaterConnection191 !== void 0 && _data$WaterConnection191.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect179 = data.SewerageConnections) !== null && _data$SewerageConnect179 !== void 0 && (_data$SewerageConnect180 = _data$SewerageConnect179[0]) !== null && _data$SewerageConnect180 !== void 0 && _data$SewerageConnect180.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect181 = data.SewerageConnections) !== null && _data$SewerageConnect181 !== void 0 && (_data$SewerageConnect182 = _data$SewerageConnect181[0]) !== null && _data$SewerageConnect182 !== void 0 && _data$SewerageConnect182.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
+  })) : null, data !== null && data !== void 0 && (_data$WaterConnection186 = data.WaterConnection) !== null && _data$WaterConnection186 !== void 0 && (_data$WaterConnection187 = _data$WaterConnection186[0]) !== null && _data$WaterConnection187 !== void 0 && _data$WaterConnection187.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$WaterConnection188 = data.WaterConnection) !== null && _data$WaterConnection188 !== void 0 && (_data$WaterConnection189 = _data$WaterConnection188[0]) !== null && _data$WaterConnection189 !== void 0 && _data$WaterConnection189.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") || data !== null && data !== void 0 && (_data$SewerageConnect177 = data.SewerageConnections) !== null && _data$SewerageConnect177 !== void 0 && (_data$SewerageConnect178 = _data$SewerageConnect177[0]) !== null && _data$SewerageConnect178 !== void 0 && _data$SewerageConnect178.applicationType.includes("DISCONNECT") && data !== null && data !== void 0 && (_data$SewerageConnect179 = data.SewerageConnections) !== null && _data$SewerageConnect179 !== void 0 && (_data$SewerageConnect180 = _data$SewerageConnect179[0]) !== null && _data$SewerageConnect180 !== void 0 && _data$SewerageConnect180.applicationStatus.includes("PENDING_FOR_CITIZEN_ACTION") ? /*#__PURE__*/React.createElement(Link, {
     to: {
       pathname: `/digit-ui/citizen/ws/resubmit-disconnect-application`,
       state: {
-        id: `${(data === null || data === void 0 ? void 0 : (_data$WaterConnection192 = data.WaterConnection) === null || _data$WaterConnection192 === void 0 ? void 0 : (_data$WaterConnection193 = _data$WaterConnection192[0]) === null || _data$WaterConnection193 === void 0 ? void 0 : _data$WaterConnection193.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect183 = data.SewerageConnections) === null || _data$SewerageConnect183 === void 0 ? void 0 : (_data$SewerageConnect184 = _data$SewerageConnect183[0]) === null || _data$SewerageConnect184 === void 0 ? void 0 : _data$SewerageConnect184.applicationNo)}`
+        id: `${(data === null || data === void 0 ? void 0 : (_data$WaterConnection190 = data.WaterConnection) === null || _data$WaterConnection190 === void 0 ? void 0 : (_data$WaterConnection191 = _data$WaterConnection190[0]) === null || _data$WaterConnection191 === void 0 ? void 0 : _data$WaterConnection191.applicationNo) || (data === null || data === void 0 ? void 0 : (_data$SewerageConnect181 = data.SewerageConnections) === null || _data$SewerageConnect181 === void 0 ? void 0 : (_data$SewerageConnect182 = _data$SewerageConnect181[0]) === null || _data$SewerageConnect182 === void 0 ? void 0 : _data$SewerageConnect182.applicationNo)}`
       }
     }
   }, /*#__PURE__*/React.createElement(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$SewerageConnect185 = data.SewerageConnections) === null || _data$SewerageConnect185 === void 0 ? void 0 : _data$SewerageConnect185[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$SewerageConnect183 = data.SewerageConnections) === null || _data$SewerageConnect183 === void 0 ? void 0 : _data$SewerageConnect183[0],
       serviceType: "SEWERAGE",
       WSDisconnectionForm: {
-        type: data !== null && data !== void 0 && (_data$SewerageConnect186 = data.SewerageConnections) !== null && _data$SewerageConnect186 !== void 0 && (_data$SewerageConnect187 = _data$SewerageConnect186[0]) !== null && _data$SewerageConnect187 !== void 0 && _data$SewerageConnect187.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$SewerageConnect184 = data.SewerageConnections) !== null && _data$SewerageConnect184 !== void 0 && (_data$SewerageConnect185 = _data$SewerageConnect184[0]) !== null && _data$SewerageConnect185 !== void 0 && _data$SewerageConnect185.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -28285,18 +28349,18 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$SewerageConnect188 = data.SewerageConnections) === null || _data$SewerageConnect188 === void 0 ? void 0 : (_data$SewerageConnect189 = _data$SewerageConnect188[0]) === null || _data$SewerageConnect189 === void 0 ? void 0 : _data$SewerageConnect189.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$SewerageConnect186 = data.SewerageConnections) === null || _data$SewerageConnect186 === void 0 ? void 0 : (_data$SewerageConnect187 = _data$SewerageConnect186[0]) === null || _data$SewerageConnect187 === void 0 ? void 0 : _data$SewerageConnect187.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect190 = data.SewerageConnections) === null || _data$SewerageConnect190 === void 0 ? void 0 : (_data$SewerageConnect191 = _data$SewerageConnect190[0]) === null || _data$SewerageConnect191 === void 0 ? void 0 : _data$SewerageConnect191.disconnectionReason
+          value: data === null || data === void 0 ? void 0 : (_data$SewerageConnect188 = data.SewerageConnections) === null || _data$SewerageConnect188 === void 0 ? void 0 : (_data$SewerageConnect189 = _data$SewerageConnect188[0]) === null || _data$SewerageConnect189 === void 0 ? void 0 : _data$SewerageConnect189.disconnectionReason
         },
-        documents: data === null || data === void 0 ? void 0 : (_data$SewerageConnect192 = data.SewerageConnections) === null || _data$SewerageConnect192 === void 0 ? void 0 : (_data$SewerageConnect193 = _data$SewerageConnect192[0]) === null || _data$SewerageConnect193 === void 0 ? void 0 : _data$SewerageConnect193.documents
+        documents: data === null || data === void 0 ? void 0 : (_data$SewerageConnect190 = data.SewerageConnections) === null || _data$SewerageConnect190 === void 0 ? void 0 : (_data$SewerageConnect191 = _data$SewerageConnect190[0]) === null || _data$SewerageConnect191 === void 0 ? void 0 : _data$SewerageConnect191.documents
       }
     } : {
-      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection194 = data.WaterConnection) === null || _data$WaterConnection194 === void 0 ? void 0 : _data$WaterConnection194[0],
+      applicationData: data === null || data === void 0 ? void 0 : (_data$WaterConnection192 = data.WaterConnection) === null || _data$WaterConnection192 === void 0 ? void 0 : _data$WaterConnection192[0],
       serviceType: "WATER",
       WSDisconnectionForm: {
-        type: data !== null && data !== void 0 && (_data$WaterConnection195 = data.WaterConnection) !== null && _data$WaterConnection195 !== void 0 && (_data$WaterConnection196 = _data$WaterConnection195[0]) !== null && _data$WaterConnection196 !== void 0 && _data$WaterConnection196.isDisconnectionTemporary ? {
+        type: data !== null && data !== void 0 && (_data$WaterConnection193 = data.WaterConnection) !== null && _data$WaterConnection193 !== void 0 && (_data$WaterConnection194 = _data$WaterConnection193[0]) !== null && _data$WaterConnection194 !== void 0 && _data$WaterConnection194.isDisconnectionTemporary ? {
           code: "type",
           value: {
             name: "Temporary",
@@ -28313,12 +28377,12 @@ const WSApplicationDetails = () => {
             code: "Permanent"
           }
         },
-        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$WaterConnection197 = data.WaterConnection) === null || _data$WaterConnection197 === void 0 ? void 0 : (_data$WaterConnection198 = _data$WaterConnection197[0]) === null || _data$WaterConnection198 === void 0 ? void 0 : _data$WaterConnection198.dateEffectiveFrom, true),
+        date: convertEpochToDateDMY(data === null || data === void 0 ? void 0 : (_data$WaterConnection195 = data.WaterConnection) === null || _data$WaterConnection195 === void 0 ? void 0 : (_data$WaterConnection196 = _data$WaterConnection195[0]) === null || _data$WaterConnection196 === void 0 ? void 0 : _data$WaterConnection196.dateEffectiveFrom, true),
         reason: {
           code: "reason",
-          value: data === null || data === void 0 ? void 0 : (_data$WaterConnection199 = data.WaterConnection) === null || _data$WaterConnection199 === void 0 ? void 0 : (_data$WaterConnection200 = _data$WaterConnection199[0]) === null || _data$WaterConnection200 === void 0 ? void 0 : _data$WaterConnection200.disconnectionReason
+          value: data === null || data === void 0 ? void 0 : (_data$WaterConnection197 = data.WaterConnection) === null || _data$WaterConnection197 === void 0 ? void 0 : (_data$WaterConnection198 = _data$WaterConnection197[0]) === null || _data$WaterConnection198 === void 0 ? void 0 : _data$WaterConnection198.disconnectionReason
         },
-        documents: data === null || data === void 0 ? void 0 : (_data$WaterConnection201 = data.WaterConnection) === null || _data$WaterConnection201 === void 0 ? void 0 : (_data$WaterConnection202 = _data$WaterConnection201[0]) === null || _data$WaterConnection202 === void 0 ? void 0 : _data$WaterConnection202.documents
+        documents: data === null || data === void 0 ? void 0 : (_data$WaterConnection199 = data.WaterConnection) === null || _data$WaterConnection199 === void 0 ? void 0 : (_data$WaterConnection200 = _data$WaterConnection199[0]) === null || _data$WaterConnection200 === void 0 ? void 0 : _data$WaterConnection200.documents
       }
     })
   })) : null)));
@@ -28649,7 +28713,7 @@ const getConnectionDetailsPDF = async (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$Sewer, _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, _state24, _state25, _state26, _state26$property, _state26$property$own, _PTData$Properties2, _PTData$Properties2$, _PTData$Properties3, _PTData$Properties3$, _PTData$Properties3$$, _PTData$Properties3$$2, _PTData$Properties4, _PTData$Properties4$, _state27, _state28, _state29, _state30, _state31, _state31$connectionHo, _state31$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, _state32, _data$WaterConnection56, _data$WaterConnection57, _data$WaterConnection58, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect48, _data$SewerageConnect49, _data$SewerageConnect50, _data$SewerageConnect51, _data$SewerageConnect52, _data$WaterConnection61, _data$WaterConnection62, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect53, _data$SewerageConnect54, _data$SewerageConnect55, _data$SewerageConnect56, _data$WaterConnection65, _data$WaterConnection66, _data$WaterConnection67, _data$WaterConnection68, _data$SewerageConnect57, _data$SewerageConnect58, _data$SewerageConnect59, _data$SewerageConnect60, _data$WaterConnection69, _data$WaterConnection70, _data$WaterConnection71, _data$WaterConnection72, _data$SewerageConnect61, _data$SewerageConnect62, _data$SewerageConnect63, _data$SewerageConnect64, _state33, _state33$connectionHo, _state33$connectionHo2, _data$WaterConnection73, _data$WaterConnection74, _data$WaterConnection75, _data$WaterConnection76, _data$SewerageConnect65, _data$SewerageConnect66, _data$SewerageConnect67, _data$SewerageConnect68, _data$WaterConnection77, _data$WaterConnection78, _data$WaterConnection79, _data$WaterConnection80, _data$SewerageConnect69, _data$SewerageConnect70, _data$SewerageConnect71, _data$SewerageConnect72, _state34, _state35, _state36, _state37, _state38, _state39, _paymentDetails$data17, _paymentDetails$data18;
+  var _Digit$SessionStorage, _user$info, _data$SewerageConnect, _data$SewerageConnect2, _data$WaterConnection, _data$WaterConnection2, _Object$keys, _connectionData$Water, _connectionData$Sewer, _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, _state24, _state25, _state26, _state26$property, _state26$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, _state27, _state28, _state29, _state30, _state30$connectionHo, _state30$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, _state31, _data$WaterConnection56, _data$WaterConnection57, _data$WaterConnection58, _data$WaterConnection59, _data$WaterConnection60, _data$SewerageConnect48, _data$SewerageConnect49, _data$SewerageConnect50, _data$SewerageConnect51, _data$SewerageConnect52, _data$WaterConnection61, _data$WaterConnection62, _data$WaterConnection63, _data$WaterConnection64, _data$SewerageConnect53, _data$SewerageConnect54, _data$SewerageConnect55, _data$SewerageConnect56, _data$WaterConnection65, _data$WaterConnection66, _data$WaterConnection67, _data$WaterConnection68, _data$SewerageConnect57, _data$SewerageConnect58, _data$SewerageConnect59, _data$SewerageConnect60, _data$WaterConnection69, _data$WaterConnection70, _data$WaterConnection71, _data$WaterConnection72, _data$SewerageConnect61, _data$SewerageConnect62, _data$SewerageConnect63, _data$SewerageConnect64, _state32, _state32$connectionHo, _state32$connectionHo2, _data$WaterConnection73, _data$WaterConnection74, _data$WaterConnection75, _data$WaterConnection76, _data$SewerageConnect65, _data$SewerageConnect66, _data$SewerageConnect67, _data$SewerageConnect68, _data$WaterConnection77, _data$WaterConnection78, _data$WaterConnection79, _data$WaterConnection80, _data$SewerageConnect69, _data$SewerageConnect70, _data$SewerageConnect71, _data$SewerageConnect72, _state33, _state34, _state35, _state36, _state37, _state38, _paymentDetails$data17, _paymentDetails$data18;
   const {
     t
   } = useTranslation();
@@ -29084,7 +29148,7 @@ const ConnectionDetails$5 = () => {
         requestBody: {},
         requestParam: {
           tenantId: tenantId,
-          propertyIds: (_state27 = state) === null || _state27 === void 0 ? void 0 : _state27.propertyId
+          mobileNumber: user !== null && user !== void 0 && (_user$info2 = user.info) !== null && _user$info2 !== void 0 && (_user$info2$userName = _user$info2.userName) !== null && _user$info2$userName !== void 0 && _user$info2$userName.match(/^[0-9]{10}$/) ? user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.userName : user === null || user === void 0 ? void 0 : (_user$info4 = user.info) === null || _user$info4 === void 0 ? void 0 : _user$info4.mobileNumber
         },
         jsonPath: "Properties[0].address.street",
         isArray: false,
@@ -29095,7 +29159,7 @@ const ConnectionDetails$5 = () => {
       }
     }
   }), /*#__PURE__*/React.createElement(Link, {
-    to: `/digit-ui/citizen/commonpt/view-property?propertyId=${(_state28 = state) === null || _state28 === void 0 ? void 0 : _state28.propertyId}&tenantId=${(_state29 = state) === null || _state29 === void 0 ? void 0 : _state29.tenantId}`
+    to: `/digit-ui/citizen/commonpt/view-property?propertyId=${(_state27 = state) === null || _state27 === void 0 ? void 0 : _state27.propertyId}&tenantId=${(_state28 = state) === null || _state28 === void 0 ? void 0 : _state28.tenantId}`
   }, /*#__PURE__*/React.createElement(LinkButton, {
     style: {
       textAlign: "left",
@@ -29107,10 +29171,10 @@ const ConnectionDetails$5 = () => {
     styles: {
       fontSize: "28px"
     }
-  }, t("WS_COMMON_CONNECTION_HOLDER_DETAILS_HEADER")), (_state30 = state) !== null && _state30 !== void 0 && _state30.connectionHolders ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
+  }, t("WS_COMMON_CONNECTION_HOLDER_DETAILS_HEADER")), (_state29 = state) !== null && _state29 !== void 0 && _state29.connectionHolders ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("WS_OWN_DETAIL_OWN_NAME_LABEL"),
-    text: (_state31 = state) === null || _state31 === void 0 ? void 0 : (_state31$connectionHo = _state31.connectionHolders) === null || _state31$connectionHo === void 0 ? void 0 : (_state31$connectionHo2 = _state31$connectionHo[0]) === null || _state31$connectionHo2 === void 0 ? void 0 : _state31$connectionHo2.name,
+    text: (_state30 = state) === null || _state30 === void 0 ? void 0 : (_state30$connectionHo = _state30.connectionHolders) === null || _state30$connectionHo === void 0 ? void 0 : (_state30$connectionHo2 = _state30$connectionHo[0]) === null || _state30$connectionHo2 === void 0 ? void 0 : _state30$connectionHo2.name,
     textStyle: {
       whiteSpace: "pre"
     }
@@ -29214,7 +29278,7 @@ const ConnectionDetails$5 = () => {
       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,
       fieldName: "correspondenceAddress",
       model: "WnSConnectionOwner",
-      hide: !((_state32 = state) !== null && _state32 !== void 0 && _state32.connectionHolders),
+      hide: !((_state31 = state) !== null && _state31 !== void 0 && _state31.connectionHolders),
       showValue: false,
       loadData: {
         serviceName: serviceType === "WATER" ? "/ws-services/wc/_search" : "/sw-services/swc/_search",
@@ -29238,7 +29302,7 @@ const ConnectionDetails$5 = () => {
       uuid: applicationNobyData !== null && applicationNobyData !== void 0 && applicationNobyData.includes("WS") ? data === null || data === void 0 ? void 0 : (_data$WaterConnection69 = data.WaterConnection) === null || _data$WaterConnection69 === void 0 ? void 0 : (_data$WaterConnection70 = _data$WaterConnection69[0]) === null || _data$WaterConnection70 === void 0 ? void 0 : (_data$WaterConnection71 = _data$WaterConnection70.connectionHolders) === null || _data$WaterConnection71 === void 0 ? void 0 : (_data$WaterConnection72 = _data$WaterConnection71[0]) === null || _data$WaterConnection72 === void 0 ? void 0 : _data$WaterConnection72.uuid : data === null || data === void 0 ? void 0 : (_data$SewerageConnect61 = data.SewerageConnections) === null || _data$SewerageConnect61 === void 0 ? void 0 : (_data$SewerageConnect62 = _data$SewerageConnect61[0]) === null || _data$SewerageConnect62 === void 0 ? void 0 : (_data$SewerageConnect63 = _data$SewerageConnect62.connectionHolders) === null || _data$SewerageConnect63 === void 0 ? void 0 : (_data$SewerageConnect64 = _data$SewerageConnect63[0]) === null || _data$SewerageConnect64 === void 0 ? void 0 : _data$SewerageConnect64.uuid,
       fieldName: "ownerType",
       model: "WnSConnection",
-      hide: !((_state33 = state) !== null && _state33 !== void 0 && (_state33$connectionHo = _state33.connectionHolders) !== null && _state33$connectionHo !== void 0 && (_state33$connectionHo2 = _state33$connectionHo[0]) !== null && _state33$connectionHo2 !== void 0 && _state33$connectionHo2.ownerType),
+      hide: !((_state32 = state) !== null && _state32 !== void 0 && (_state32$connectionHo = _state32.connectionHolders) !== null && _state32$connectionHo !== void 0 && (_state32$connectionHo2 = _state32$connectionHo[0]) !== null && _state32$connectionHo2 !== void 0 && _state32$connectionHo2.ownerType),
       showValue: false,
       loadData: {
         serviceName: serviceType === "WATER" ? "/ws-services/wc/_search" : "/sw-services/swc/_search",
@@ -29279,7 +29343,7 @@ const ConnectionDetails$5 = () => {
         isArray: false
       }
     }
-  }))) : /*#__PURE__*/React.createElement(CardText, null, t("WS_PROPERTY_OWNER_SAME_AS_CONN_HOLDERS")), (((_state34 = state) === null || _state34 === void 0 ? void 0 : _state34.status) !== "inactive" || ((_state35 = state) === null || _state35 === void 0 ? void 0 : _state35.applicationStatus) !== "Inactive" || ((_state36 = state) === null || _state36 === void 0 ? void 0 : _state36.applicationStatus) !== "INACTIVE") && !isDisconnectionDone ? /*#__PURE__*/React.createElement(ActionBar, {
+  }))) : /*#__PURE__*/React.createElement(CardText, null, t("WS_PROPERTY_OWNER_SAME_AS_CONN_HOLDERS")), (((_state33 = state) === null || _state33 === void 0 ? void 0 : _state33.status) !== "inactive" || ((_state34 = state) === null || _state34 === void 0 ? void 0 : _state34.applicationStatus) !== "Inactive" || ((_state35 = state) === null || _state35 === void 0 ? void 0 : _state35.applicationStatus) !== "INACTIVE") && !isDisconnectionDone ? /*#__PURE__*/React.createElement(ActionBar, {
     style: {
       position: "relative",
       boxShadow: "none",
@@ -29298,7 +29362,7 @@ const ConnectionDetails$5 = () => {
     },
     label: t("WS_DISCONNECTION_BUTTON"),
     onSubmit: onActionSelect
-  }))) : ((_state37 = state) === null || _state37 === void 0 ? void 0 : _state37.applicationStatus) == "DISCONNECTION_EXECUTED" && ((_state38 = state) === null || _state38 === void 0 ? void 0 : _state38.status) == "Inactive" && ((_state39 = state) === null || _state39 === void 0 ? void 0 : _state39.isDisconnectionTemporary) && /*#__PURE__*/React.createElement(ActionBar, {
+  }))) : ((_state36 = state) === null || _state36 === void 0 ? void 0 : _state36.applicationStatus) == "DISCONNECTION_EXECUTED" && ((_state37 = state) === null || _state37 === void 0 ? void 0 : _state37.status) == "Inactive" && ((_state38 = state) === null || _state38 === void 0 ? void 0 : _state38.isDisconnectionTemporary) && /*#__PURE__*/React.createElement(ActionBar, {
     style: {
       position: "relative",
       boxShadow: "none",
@@ -29330,8 +29394,8 @@ const ConnectionDetails$5 = () => {
     actionSingleLabel: t("COMMON_MAKE_PAYMENT"),
     hideSubmit: true,
     actionSingleSubmit: () => {
-      var _state40, _state41;
-      history.push(`/digit-ui/citizen/payment/collect/${isSW ? "SW" : "WS"}/${encodeURIComponent((_state40 = state) === null || _state40 === void 0 ? void 0 : _state40.connectionNo)}/${tenantId}?consumerCode=${(_state41 = state) === null || _state41 === void 0 ? void 0 : _state41.connectionNo}&&tenantId=${tenantId}&&workflow=WNS`);
+      var _state39, _state40;
+      history.push(`/digit-ui/citizen/payment/collect/${isSW ? "SW" : "WS"}/${encodeURIComponent((_state39 = state) === null || _state39 === void 0 ? void 0 : _state39.connectionNo)}/${tenantId}?consumerCode=${(_state40 = state) === null || _state40 === void 0 ? void 0 : _state40.connectionNo}&&tenantId=${tenantId}&&workflow=WNS`);
       setshowModal(false);
     },
     popupStyles: mobileView ? {
@@ -29508,20 +29572,21 @@ const WSPayments = ({
 };
 
 const WSMyPayments = () => {
-  var _Digit$SessionStorage, _user$info, _user$info2, _user$info3, _data$WaterConnection, _data$WaterConnection2, _data$WaterConnection3, _SWdata$SewerageConne, _SWdata$SewerageConne2, _data$WaterConnection4, _data$WaterConnection5, _SWdata$SewerageConne3, _SWdata$SewerageConne4, _applicationsList, _applicationsList2, _applicationsList3, _applicationsList4;
+  var _user$info, _user$info$userName, _user$info2, _user$info3, _data$WaterConnection, _data$WaterConnection2, _data$WaterConnection3, _SWdata$SewerageConne, _SWdata$SewerageConne2, _data$WaterConnection4, _data$WaterConnection5, _SWdata$SewerageConne3, _SWdata$SewerageConne4, _applicationsList, _applicationsList2, _applicationsList3, _applicationsList4;
   const {
     t
   } = useTranslation();
   const user = Digit.UserService.getUser();
-  const tenantId = ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code) || (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.permanentCity) || Digit.ULBService.getCurrentTenantId();
+  const tenantId = "dl.djb";
   let filter = window.location.href.split("/").pop();
+  const userMobileNumber = user !== null && user !== void 0 && (_user$info = user.info) !== null && _user$info !== void 0 && (_user$info$userName = _user$info.userName) !== null && _user$info$userName !== void 0 && _user$info$userName.match(/^[0-9]{10}$/) ? user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.userName : user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber;
   let filter1 = !isNaN(parseInt(filter)) ? {
     tenantId: tenantId,
-    mobileNumber: user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.mobileNumber,
+    mobileNumber: userMobileNumber,
     searchType: "CONNECTION"
   } : {
     tenantId: tenantId,
-    mobileNumber: user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber,
+    mobileNumber: userMobileNumber,
     searchType: "CONNECTION"
   };
   const {
@@ -29581,10 +29646,10 @@ const WSMyPayments = () => {
   } = Digit.Hooks.ws.useWaterPropertySearch({
     tenantId: tenantId,
     filters: {
-      propertyids: totalPropertyIds
+      mobileNumber: userMobileNumber
     }
   }, {
-    enabled: connectionNoSW !== null ? true : false
+    enabled: userMobileNumber ? true : false
   });
   if (isLoading || iswsLoading || isswLoading || isSWLoading || isPropertyLoading) {
     return /*#__PURE__*/React.createElement(Loader, null);
@@ -30308,10 +30373,12 @@ const CheckPage = ({
 const WSConnection = ({
   application
 }) => {
-  var _application$connecti, _application$property, _application$property2, _application$property3, _application$property4, _application$property5, _application$property6, _application$property7;
+  var _user$info, _user$info$userName, _user$info2, _user$info3, _application$connecti, _application$property, _application$property2, _application$property3, _application$property4, _application$property5, _application$property6;
   const {
     t
   } = useTranslation();
+  const user = Digit.UserService.getUser();
+  const userMobileNumber = user !== null && user !== void 0 && (_user$info = user.info) !== null && _user$info !== void 0 && (_user$info$userName = _user$info.userName) !== null && _user$info$userName !== void 0 && _user$info$userName.match(/^[0-9]{10}$/) ? user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.userName : user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber;
   let encodeApplicationNo = encodeURI(application.applicationNo);
   return /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(KeyNote, {
     keyValue: t("WS_MYCONNECTIONS_CONSUMER_NO"),
@@ -30337,8 +30404,8 @@ const WSConnection = ({
         serviceName: "/property-services/property/_search",
         requestBody: {},
         requestParam: {
-          tenantId: application === null || application === void 0 ? void 0 : application.tenantId,
-          propertyIds: application === null || application === void 0 ? void 0 : (_application$property7 = application.property) === null || _application$property7 === void 0 ? void 0 : _application$property7.propertyId
+          tenantId: (application === null || application === void 0 ? void 0 : application.tenantId) || "dl.djb",
+          mobileNumber: userMobileNumber
         },
         jsonPath: "Properties[0].address.street",
         isArray: false,
@@ -30366,20 +30433,21 @@ const WSConnection = ({
 const MyConnections = ({
   view
 }) => {
-  var _Digit$SessionStorage, _user$info, _user$info2, _user$info3, _data$WaterConnection, _SWdata$SewerageConne, _connectionList, _connectionList2;
+  var _user$info, _user$info$userName, _user$info2, _user$info3, _data$WaterConnection, _SWdata$SewerageConne, _connectionList, _connectionList2;
   const {
     t
   } = useTranslation();
   const user = Digit.UserService.getUser();
-  const tenantId = ((_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code) || (user === null || user === void 0 ? void 0 : (_user$info = user.info) === null || _user$info === void 0 ? void 0 : _user$info.permanentCity) || Digit.ULBService.getCurrentTenantId();
+  const tenantId = "dl.djb";
   let filter = window.location.href.split("/").pop();
+  const userMobileNumber = user !== null && user !== void 0 && (_user$info = user.info) !== null && _user$info !== void 0 && (_user$info$userName = _user$info.userName) !== null && _user$info$userName !== void 0 && _user$info$userName.match(/^[0-9]{10}$/) ? user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.userName : user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber;
   let filter1 = !isNaN(parseInt(filter)) ? {
     tenantId: tenantId,
-    mobileNumber: user === null || user === void 0 ? void 0 : (_user$info2 = user.info) === null || _user$info2 === void 0 ? void 0 : _user$info2.mobileNumber,
+    mobileNumber: userMobileNumber,
     searchType: "CONNECTION"
   } : {
     tenantId: tenantId,
-    mobileNumber: user === null || user === void 0 ? void 0 : (_user$info3 = user.info) === null || _user$info3 === void 0 ? void 0 : _user$info3.mobileNumber,
+    mobileNumber: userMobileNumber,
     searchType: "CONNECTION"
   };
   const {
@@ -30413,14 +30481,15 @@ const MyConnections = ({
     error: PTerror,
     data: PTdata
   } = Digit.Hooks.pt.usePropertySearch({
+    tenantId: tenantId,
     filters: {
-      propertyIds: applicationNos
+      mobileNumber: userMobileNumber
     }
   }, {
     filters: {
-      propertyIds: applicationNos
+      mobileNumber: userMobileNumber
     },
-    enabled: applicationNos ? true : false
+    enabled: userMobileNumber ? true : false
   });
   connectionList = connectionList && connectionList.map(ob => {
     var _PTdata$Properties;
@@ -31296,7 +31365,7 @@ const WNSMyBills = ({
   header,
   actionButtonLabel
 }) => {
-  var _Digit$UserService$ge, _Digit$SessionStorage, _Digit$UserService$ge2, _Digit$UserService$ge3, _location$state, _Digit$UserService$ge4, _searchResults, _searchResults2, _searchResults3;
+  var _Digit$UserService$ge, _Digit$SessionStorage, _Digit$UserService$ge2, _Digit$UserService$ge3, _location$state, _Digit$UserService$ge4, _userInfo$userName, _searchResults, _searchResults2, _searchResults3;
   const {
     t
   } = useTranslation();
@@ -31317,9 +31386,8 @@ const WNSMyBills = ({
     });
   }
   let filters = {};
-  const {
-    mobileNumber
-  } = ((_Digit$UserService$ge4 = Digit.UserService.getUser()) === null || _Digit$UserService$ge4 === void 0 ? void 0 : _Digit$UserService$ge4.info) || {};
+  const userInfo = ((_Digit$UserService$ge4 = Digit.UserService.getUser()) === null || _Digit$UserService$ge4 === void 0 ? void 0 : _Digit$UserService$ge4.info) || {};
+  const mobileNumber = userInfo !== null && userInfo !== void 0 && (_userInfo$userName = userInfo.userName) !== null && _userInfo$userName !== void 0 && _userInfo$userName.match(/^[0-9]{10}$/) ? userInfo === null || userInfo === void 0 ? void 0 : userInfo.userName : userInfo === null || userInfo === void 0 ? void 0 : userInfo.mobileNumber;
   filters = {
     ...filters,
     searchType: "CONNECTION"
@@ -31417,6 +31485,266 @@ const BillSearchResults = () => {
   })));
 };
 
+const getAddress$1 = (address, t) => {
+  return `${address !== null && address !== void 0 && address.doorNo ? `${address === null || address === void 0 ? void 0 : address.doorNo}, ` : ""} ${address !== null && address !== void 0 && address.street ? `${address === null || address === void 0 ? void 0 : address.street}, ` : ""}${address !== null && address !== void 0 && address.landmark ? `${address === null || address === void 0 ? void 0 : address.landmark}, ` : ""}${t(Digit.Utils.pt.getMohallaLocale(address === null || address === void 0 ? void 0 : address.locality.code, address === null || address === void 0 ? void 0 : address.tenantId))}, ${t(Digit.Utils.pt.getCityLocale(address === null || address === void 0 ? void 0 : address.tenantId))}${address !== null && address !== void 0 && address.pincode && t(address === null || address === void 0 ? void 0 : address.pincode) ? `, ${address.pincode}` : " "}`;
+};
+const WSInfoPage = () => {
+  var _Digit$UserService$ge, _Digit$UserService$ge2, _propertyDetails$Prop;
+  const {
+    t
+  } = useTranslation();
+  const history = useHistory();
+  const location = useLocation();
+  const match = useRouteMatch();
+  const isEmployee = window.location.href.includes("/employee");
+  const [hasProperty, setHasProperty] = useState(null);
+  const [selectedProperty, setSelectedProperty] = useState(null);
+  const [searchMobileNumber, setSearchMobileNumber] = useState("");
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const userMobileNumber = (_Digit$UserService$ge = Digit.UserService.getUser()) === null || _Digit$UserService$ge === void 0 ? void 0 : (_Digit$UserService$ge2 = _Digit$UserService$ge.info) === null || _Digit$UserService$ge2 === void 0 ? void 0 : _Digit$UserService$ge2.mobileNumber;
+  const mobileNumberToSearch = isEmployee ? searchMobileNumber : userMobileNumber;
+  const {
+    isLoading,
+    data: propertyDetails
+  } = Digit.Hooks.pt.usePropertySearch({
+    filters: {
+      mobileNumber: mobileNumberToSearch
+    },
+    tenantId: tenantId
+  }, {
+    filters: {
+      mobileNumber: mobileNumberToSearch
+    },
+    tenantId: tenantId,
+    enabled: (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && (mobileNumberToSearch === null || mobileNumberToSearch === void 0 ? void 0 : mobileNumberToSearch.length) === 10 ? true : false
+  });
+  const radioOptions = [{
+    code: "YES",
+    i18nKey: "TL_COMMON_YES"
+  }, {
+    code: "NO",
+    i18nKey: "TL_COMMON_NO"
+  }];
+  const handleNext = () => {
+    const isEmployee = window.location.href.includes("/employee");
+    const baseUrl = isEmployee ? "/digit-ui/employee/ws" : "/digit-ui/citizen/ws";
+    if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && selectedProperty) {
+      history.push(`${baseUrl}/old-application?propertyId=${selectedProperty.propertyId}`);
+    } else if ((hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && !selectedProperty) {
+      return;
+    } else {
+      history.push(`${baseUrl}/old-application`);
+    }
+  };
+  const handleCreateProperty = () => {
+    const propertyUrl = isEmployee ? "/digit-ui/employee/ws/create-application/create-property" : "/digit-ui/citizen/commonpt-home";
+    history.push(propertyUrl);
+  };
+  const propertyOptions = (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop = propertyDetails.Properties) === null || _propertyDetails$Prop === void 0 ? void 0 : _propertyDetails$Prop.map(prop => ({
+    ...prop,
+    displayName: `${prop.propertyId} - ${getAddress$1(prop.address, t)}`
+  }))) || [];
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardHeader, null, t("WS_COMMON_APPL_NEW_CONNECTION")), /*#__PURE__*/React.createElement(CitizenInfoLabel, {
+    style: {
+      margin: "0px",
+      textAlign: "left",
+      marginBottom: "16px"
+    },
+    textStyle: {
+      color: "#0B0C0C"
+    },
+    text: t("WS_INFO_ESTIMATED_TIME_10_20_MINS"),
+    showInfo: false
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: "24px"
+    }
+  }, /*#__PURE__*/React.createElement(CardSubHeader, null, t("WS_DO_YOU_HAVE_EXISTING_PROPERTY")), /*#__PURE__*/React.createElement(RadioButtons, {
+    t: t,
+    options: radioOptions,
+    optionsKey: "i18nKey",
+    value: hasProperty,
+    selectedOption: hasProperty,
+    onSelect: val => {
+      setHasProperty(val);
+      setSelectedProperty(null);
+    },
+    style: {
+      display: "flex",
+      gap: "24px"
+    }
+  })), (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: "24px"
+    }
+  }, isEmployee && /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      gap: "24px",
+      marginBottom: "16px",
+      alignItems: "flex-end"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(Label, null, t("CORE_COMMON_MOBILE_NUMBER")), /*#__PURE__*/React.createElement(TextInput, {
+    t: t,
+    type: "number",
+    isMandatory: false,
+    name: "mobileNumber",
+    value: searchMobileNumber,
+    onChange: e => {
+      setSearchMobileNumber(e.target.value);
+      setSelectedProperty(null);
+    },
+    placeholder: t("Enter mobile number"),
+    maxLength: 10
+  })), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(Label, null, t("WS_SELECT_EXISTING_PROPERTY")), /*#__PURE__*/React.createElement("div", {
+    className: "field"
+  }, /*#__PURE__*/React.createElement(Dropdown, {
+    className: "form-field",
+    option: propertyOptions,
+    optionKey: "displayName",
+    id: "propertyId",
+    selected: selectedProperty,
+    select: setSelectedProperty,
+    t: t,
+    placeholder: t("PT_SELECT_PROPERTY"),
+    disable: isLoading || propertyOptions.length === 0
+  })))), !isEmployee && /*#__PURE__*/React.createElement(Label, null, t("WS_SELECT_EXISTING_PROPERTY")), isLoading && !isEmployee ? /*#__PURE__*/React.createElement(Loader, null) : propertyOptions.length > 0 && !isEmployee && /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: "column",
+      gap: "8px"
+    }
+  }, /*#__PURE__*/React.createElement(Dropdown, {
+    option: propertyOptions,
+    optionKey: "displayName",
+    id: "propertyId",
+    selected: selectedProperty,
+    select: setSelectedProperty,
+    t: t,
+    placeholder: t("PT_SELECT_PROPERTY")
+  }), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: "14px",
+      color: "#505A5F"
+    }
+  }, t("WS_PROPERTY_AUTOFILL_MSG")))), (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "NO" && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: "24px",
+      display: "flex",
+      flexDirection: "column",
+      gap: "16px"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    onClick: handleCreateProperty
+  }, /*#__PURE__*/React.createElement("button", {
+    className: "submit-bar",
+    type: "button",
+    style: {
+      color: "white",
+      margin: 0
+    }
+  }, t("CPT_CREATE_PROPERTY")))), /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      marginTop: "0",
+      marginBottom: "0"
+    }
+  }, t("WS_COMMON_CONNECTION_DETAIL")), /*#__PURE__*/React.createElement("ul", {
+    style: {
+      listStyleType: "disc",
+      marginLeft: "20px",
+      marginBottom: "24px",
+      lineHeight: "2"
+    }
+  }, /*#__PURE__*/React.createElement("li", null, t("WS_SERVICE_TYPE")), /*#__PURE__*/React.createElement("li", null, t("WS_CONNECTION_TYPE")), /*#__PURE__*/React.createElement("li", null, t("WS_WATER_DEMAND_TYPE")), /*#__PURE__*/React.createElement("li", null, t("WS_APPLICANT_TYPE")), /*#__PURE__*/React.createElement("li", null, t("WS_DOMESTIC_TYPE"))), /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      marginTop: "0",
+      marginBottom: "0"
+    }
+  }, t("WS_COMMON_CONNECTION_HOLDER_DETAILS_HEADER")), /*#__PURE__*/React.createElement("ul", {
+    style: {
+      listStyleType: "disc",
+      marginLeft: "20px",
+      marginBottom: "24px",
+      lineHeight: "2"
+    }
+  }, /*#__PURE__*/React.createElement("li", null, t("WS_OWN_DETAIL_NAME")), /*#__PURE__*/React.createElement("li", null, t("WS_OWN_DETAIL_MIDDLE_NAME")), /*#__PURE__*/React.createElement("li", null, t("WS_OWN_DETAIL_LAST_NAME")), /*#__PURE__*/React.createElement("li", null, t("WS_CONN_HOLDER_OWN_DETAIL_GENDER_LABEL")), /*#__PURE__*/React.createElement("li", null, t("WS_OWN_DETAIL_GUARDIAN_LABEL")), /*#__PURE__*/React.createElement("li", null, t("CORE_COMMON_MOBILE_NUMBER")), /*#__PURE__*/React.createElement("li", null, t("WS_EMAIL_ID"))), /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      marginTop: "0",
+      marginBottom: "0"
+    }
+  }, t("PT_LOCATION_DETAILS")), /*#__PURE__*/React.createElement("ul", {
+    style: {
+      listStyleType: "disc",
+      marginLeft: "20px",
+      marginBottom: "24px",
+      lineHeight: "2"
+    }
+  }, /*#__PURE__*/React.createElement("li", null, t("WS_ZRO_LOCATION")), /*#__PURE__*/React.createElement("li", null, t("COMMON_ADDRESS_TYPE")), /*#__PURE__*/React.createElement("li", null, t("CITY")), /*#__PURE__*/React.createElement("li", null, t("PINCODE")), /*#__PURE__*/React.createElement("li", null, t("LOCALITY")), /*#__PURE__*/React.createElement("li", null, t("SubLocality")), /*#__PURE__*/React.createElement("li", null, t("STREET_NAME")), /*#__PURE__*/React.createElement("li", null, t("ADDRESS_LINE1")), /*#__PURE__*/React.createElement("li", null, t("ADDRESS_LINE2")), /*#__PURE__*/React.createElement("li", null, t("HOUSE_NO")), /*#__PURE__*/React.createElement("li", null, t("LATITUDE")), /*#__PURE__*/React.createElement("li", null, t("LONGITUDE")), /*#__PURE__*/React.createElement("li", null, t("ASSEMBLY")), /*#__PURE__*/React.createElement("li", null, t("WARD")), /*#__PURE__*/React.createElement("li", null, t("ZONE")), /*#__PURE__*/React.createElement("li", null, t("LANDMARK"))), /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      marginTop: "0",
+      marginBottom: "0"
+    }
+  }, t("WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS")), /*#__PURE__*/React.createElement("ul", {
+    style: {
+      listStyleType: "disc",
+      marginLeft: "20px",
+      marginBottom: "24px",
+      lineHeight: "2"
+    }
+  }, /*#__PURE__*/React.createElement("li", null, t("WS_CATEGORY_TYPE")), /*#__PURE__*/React.createElement("li", null, t("WS_PROPERTY_CATEGORY")), /*#__PURE__*/React.createElement("li", null, t("WS_PROPERTY_TYPE")), /*#__PURE__*/React.createElement("li", null, t("WS_WATER_CONNECTION_USAGE_TYPE")), /*#__PURE__*/React.createElement("li", null, t("WS_NUMBER_OF_FLOORS")), /*#__PURE__*/React.createElement("li", null, t("WS_PLOT_AREA")), /*#__PURE__*/React.createElement("li", null, t("WS_BUILT_UP_AREA")), /*#__PURE__*/React.createElement("li", null, t("WS_SELECT_YEAR_OF_CONSTRUCTION")), /*#__PURE__*/React.createElement("li", null, t("WS_NUMBER_OF_DWELLING_UNITS"))), /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      marginTop: "0",
+      marginBottom: "0"
+    }
+  }, t("WS_DJB_EMPLOYEE")), /*#__PURE__*/React.createElement("ul", {
+    style: {
+      listStyleType: "disc",
+      marginLeft: "20px",
+      marginBottom: "24px",
+      lineHeight: "2"
+    }
+  }, /*#__PURE__*/React.createElement("li", null, t("WS_EMPLOYEE_ID")), /*#__PURE__*/React.createElement("li", null, t("WS_DATE_OF_RETIREMENT")), /*#__PURE__*/React.createElement("li", null, t("WS_EMPLOYEE_DESIGNATION"))), /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      marginTop: "0",
+      marginBottom: "0"
+    }
+  }, t("WS_BANK_DETAILS")), /*#__PURE__*/React.createElement("ul", {
+    style: {
+      listStyleType: "disc",
+      marginLeft: "20px",
+      marginBottom: "24px",
+      lineHeight: "2"
+    }
+  }, /*#__PURE__*/React.createElement("li", null, t("WS_NAME_OF_BANK")), /*#__PURE__*/React.createElement("li", null, t("WS_NAME_OF_BRANCH")), /*#__PURE__*/React.createElement("li", null, t("WS_IFSC_CODE")), /*#__PURE__*/React.createElement("li", null, t("WS_BANK_ACCOUNT_NO"))), /*#__PURE__*/React.createElement(CardSubHeader, {
+    style: {
+      marginTop: "0",
+      marginBottom: "0"
+    }
+  }, t("WS_DOCUMENTS")), /*#__PURE__*/React.createElement("ul", {
+    style: {
+      listStyleType: "disc",
+      marginLeft: "20px",
+      marginBottom: "24px",
+      lineHeight: "2"
+    }
+  }, /*#__PURE__*/React.createElement("li", null, t("WS_DOC_IDENTITY_PROOF")), /*#__PURE__*/React.createElement("li", null, t("WS_DOC_ADDRESS_PROOF")), /*#__PURE__*/React.createElement("li", null, t("WS_DOC_ELECTRICITY_BILL")), /*#__PURE__*/React.createElement("li", null, t("WS_DOC_PLUMBER_REPORT")), /*#__PURE__*/React.createElement("li", null, t("WS_DOC_BUILDING_PLAN")), /*#__PURE__*/React.createElement("li", null, t("WS_DOC_PROPERTY_TAX_RECEIPT")), /*#__PURE__*/React.createElement("li", null, t("WS_DOC_APPLICANT_PHOTOGRAPH"))), !hasProperty || (hasProperty === null || hasProperty === void 0 ? void 0 : hasProperty.code) === "YES" && !selectedProperty ? /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("CS_COMMON_NEXT"),
+    onSubmit: () => {},
+    disabled: true
+  }) : /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("CS_COMMON_NEXT"),
+    onSubmit: handleNext
+  })));
+};
+
 const ApplicationBillAmendment = () => {
   var _data$BillingService, _data$BillingService$, _data$BillingService2, _data$BillingService3, _state, _state$data, _state$data$applicati, _state$data$applicati2, _state$data$applicati3, _billSearchData, _billSearchData$filte, _billSearchData2, _state9, _state9$data, _errors$WS_REDUCED_AM, _errors$WS_ADDITIONAL, _billSearchData3, _errors$effectiveTill, _errors$effectiveTill2, _state12, _state12$data;
   const [showToast, setShowToast] = useState(null);
@@ -39483,7 +39811,7 @@ function PropertyDocuments({
     }));
   };
   const renderDocumentRow = (value, index) => {
-    var _pdfFiles$value$fileS, _value$originalDoc, _value$originalDoc$ad;
+    var _pdfFiles$value$fileS, _value$originalDoc, _value$originalDoc2, _value$originalDoc3;
     const fileUrl = (_pdfFiles$value$fileS = pdfFiles[value.fileStoreId]) === null || _pdfFiles$value$fileS === void 0 ? void 0 : _pdfFiles$value$fileS.split(",")[0];
     const docSubType = getDocSubType(value === null || value === void 0 ? void 0 : value.documentType);
     const docUid = (value === null || value === void 0 ? void 0 : value.documentUid) || "";
@@ -39566,19 +39894,17 @@ function PropertyDocuments({
           margin: 0
         }
       }, /*#__PURE__*/React.createElement("input", {
+        key: `chk-${value === null || value === void 0 ? void 0 : (_value$originalDoc = value.originalDoc) === null || _value$originalDoc === void 0 ? void 0 : _value$originalDoc.id}-${value === null || value === void 0 ? void 0 : (_value$originalDoc2 = value.originalDoc) === null || _value$originalDoc2 === void 0 ? void 0 : _value$originalDoc2.isVerified}`,
         type: "checkbox",
         style: {
           width: "18px",
           height: "18px",
           accentColor: "#F47738"
         },
-        defaultChecked: value === null || value === void 0 ? void 0 : (_value$originalDoc = value.originalDoc) === null || _value$originalDoc === void 0 ? void 0 : (_value$originalDoc$ad = _value$originalDoc.additionalDetails) === null || _value$originalDoc$ad === void 0 ? void 0 : _value$originalDoc$ad.isDocumentVerified,
+        defaultChecked: value === null || value === void 0 ? void 0 : (_value$originalDoc3 = value.originalDoc) === null || _value$originalDoc3 === void 0 ? void 0 : _value$originalDoc3.isVerified,
         onChange: e => {
           if (value !== null && value !== void 0 && value.originalDoc) {
-            if (!value.originalDoc.additionalDetails) {
-              value.originalDoc.additionalDetails = {};
-            }
-            value.originalDoc.additionalDetails.isDocumentVerified = e.target.checked;
+            value.originalDoc.isVerified = e.target.checked;
           }
         }
       }), "Check Verified"))
@@ -39834,131 +40160,6 @@ function PropertyFloors({
   }));
 }
 
-function PropertyOwners({
-  owners
-}) {
-  let ownerSequences = {};
-  if (window.location.href.includes("/employee/pt/")) {
-    ownerSequences = owners.slice().reverse();
-  } else {
-    ownerSequences = owners;
-  }
-  const {
-    t
-  } = useTranslation();
-  const checkOwnerLength = (owners === null || owners === void 0 ? void 0 : owners.length) || 1;
-  let cardStyles = {
-    marginTop: "19px"
-  };
-  let statusTableStyles = {
-    position: "relative",
-    padding: "8px"
-  };
-  let rowContainerStyle = {
-    justifyContent: "space-between",
-    fontSize: "16px",
-    lineHeight: "19px",
-    color: "#0B0C0C"
-  };
-  if ( Number(checkOwnerLength) > 1) {
-    cardStyles = {
-      marginTop: "19px",
-      background: "#FAFAFA",
-      border: "1px solid #D6D5D4",
-      borderRadius: "4px",
-      padding: "8px",
-      lineHeight: "19px",
-      maxWidth: "600px",
-      minWidth: "280px"
-    };
-  } else if ( !(Number(checkOwnerLength) > 1)) {
-    cardStyles = {
-      marginTop: "19px",
-      lineHeight: "19px",
-      maxWidth: "600px",
-      minWidth: "280px"
-    };
-    statusTableStyles = {
-      position: "relative",
-      marginTop: "19px"
-    };
-  }
-  if (window.location.href.includes("obps")) {
-    cardStyles = {
-      ...cardStyles,
-      maxWidth: "950px"
-    };
-    cardStyles = {
-      ...cardStyles,
-      maxWidth: "950px"
-    };
-    rowContainerStyle = {};
-  }
-  let owners1 = owners.sort((item, item2) => {
-    var _item$additionalDetai, _item2$additionalDeta;
-    return (item === null || item === void 0 ? void 0 : (_item$additionalDetai = item.additionalDetails) === null || _item$additionalDetai === void 0 ? void 0 : _item$additionalDetai.ownerSequence) - (item2 === null || item2 === void 0 ? void 0 : (_item2$additionalDeta = item2.additionalDetails) === null || _item2$additionalDeta === void 0 ? void 0 : _item2$additionalDeta.ownerSequence);
-  });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "owner-details"
-  }, ownerSequences.map((owner, index) => {
-    var _owner$values;
-    return /*#__PURE__*/React.createElement("div", {
-      key: t(owner === null || owner === void 0 ? void 0 : owner.title),
-      style: cardStyles,
-      className: "owner-details-child"
-    }, /*#__PURE__*/React.createElement(CardSubHeader, {
-      style:  Number(checkOwnerLength) > 1 ? {
-        marginBottom: "8px",
-        paddingBottom: "9px",
-        color: "#0B0C0C",
-        fontSize: "16px",
-        lineHeight: "19px"
-      } : {
-        marginBottom: "8px",
-        color: "#505A5F",
-        fontSize: "24px"
-      }
-    },  Number(checkOwnerLength) > 1 ? `${t(owner === null || owner === void 0 ? void 0 : owner.title)} ${index + 1}` : t(owner === null || owner === void 0 ? void 0 : owner.title)), /*#__PURE__*/React.createElement(React.Fragment, {
-      key: index
-    }, /*#__PURE__*/React.createElement(StatusTable, {
-      style: statusTableStyles
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        maxWidth: "640px",
-        top: 0,
-        left: 0,
-        bottom: 0,
-        right: 0,
-        width: "auto"
-      }
-    }), owner === null || owner === void 0 ? void 0 : (_owner$values = owner.values) === null || _owner$values === void 0 ? void 0 : _owner$values.map((value, index) => {
-      var _value$values;
-      if (value.map === true && value.value !== "N/A") {
-        return /*#__PURE__*/React.createElement(Row, {
-          key: t(value.title),
-          label: t(value.title),
-          text: /*#__PURE__*/React.createElement("img", {
-            src: t(value.value),
-            alt: "",
-            privacy: value === null || value === void 0 ? void 0 : value.privacy
-          })
-        });
-      }
-      return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Row, {
-        key: t(value.title),
-        label:  `${t(value.title)}`,
-        text: t(value.value) || "N/A",
-        last: index === (value === null || value === void 0 ? void 0 : (_value$values = value.values) === null || _value$values === void 0 ? void 0 : _value$values.length) - 1,
-        caption: value.caption,
-        className: "border-none",
-        textStyle: value.textStyle,
-        privacy: value === null || value === void 0 ? void 0 : value.privacy,
-        rowContainerStyle: rowContainerStyle
-      }));
-    }))));
-  })));
-}
-
 const ScruntinyDetails = ({
   scrutinyDetails,
   paymentsList: _paymentsList = []
@@ -41752,7 +41953,7 @@ function ApplicationDetailsContent({
     infoClickInfoLabel: getClickInfoDetails(),
     infoClickInfoLabel1: getClickInfoDetails1()
   }) : null, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a = applicationDetails.applicationDetails) === null || _applicationDetails$a === void 0 ? void 0 : _applicationDetails$a.map((detail, index) => {
-    var _detail$title, _detail$values, _detail$additionalDet, _applicationDetails$a2, _applicationDetails$a3, _applicationDetails$a4, _detail$additionalDet2, _applicationDetails$a5, _applicationDetails$a6, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _detail$additionalDet0, _detail$additionalDet1, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet10, _detail$additionalDet11, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _detail$additionalDet20, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27, _detail$additionalDet28, _detail$additionalDet29;
+    var _detail$title, _detail$values, _detail$additionalDet, _applicationDetails$a2, _applicationDetails$a3, _applicationDetails$a4, _detail$additionalDet2, _applicationDetails$a5, _applicationDetails$a6, _detail$additionalDet3, _detail$additionalDet4, _detail$additionalDet5, _detail$additionalDet6, _detail$additionalDet7, _detail$additionalDet8, _detail$additionalDet9, _workflowDetails$data, _workflowDetails$data2, _detail$additionalDet0, _detail$additionalDet1, _detail$additionalDet10, _detail$additionalDet11, _detail$additionalDet12, _detail$additionalDet13, _detail$additionalDet14, _detail$additionalDet15, _detail$additionalDet16, _detail$additionalDet17, _detail$additionalDet18, _detail$additionalDet19, _detail$additionalDet20, _detail$additionalDet21, _detail$additionalDet22, _detail$additionalDet23, _detail$additionalDet24, _detail$additionalDet25, _detail$additionalDet26, _detail$additionalDet27;
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: index
     }, /*#__PURE__*/React.createElement("div", {
@@ -41950,53 +42151,51 @@ function ApplicationDetailsContent({
       fiReport: applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$a5 = applicationDetails.applicationData) === null || _applicationDetails$a5 === void 0 ? void 0 : (_applicationDetails$a6 = _applicationDetails$a5.additionalDetails) === null || _applicationDetails$a6 === void 0 ? void 0 : _applicationDetails$a6.fieldinspection_pending
     }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet3 = detail.additionalDetails) === null || _detail$additionalDet3 === void 0 ? void 0 : _detail$additionalDet3.floors) && /*#__PURE__*/React.createElement(PropertyFloors, {
       floors: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet4 = detail.additionalDetails) === null || _detail$additionalDet4 === void 0 ? void 0 : _detail$additionalDet4.floors
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet5 = detail.additionalDetails) === null || _detail$additionalDet5 === void 0 ? void 0 : _detail$additionalDet5.owners) && /*#__PURE__*/React.createElement(PropertyOwners, {
-      owners: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet6 = detail.additionalDetails) === null || _detail$additionalDet6 === void 0 ? void 0 : _detail$additionalDet6.owners
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet7 = detail.additionalDetails) === null || _detail$additionalDet7 === void 0 ? void 0 : _detail$additionalDet7.units) && /*#__PURE__*/React.createElement(TLTradeUnits, {
-      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet8 = detail.additionalDetails) === null || _detail$additionalDet8 === void 0 ? void 0 : _detail$additionalDet8.units
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet9 = detail.additionalDetails) === null || _detail$additionalDet9 === void 0 ? void 0 : _detail$additionalDet9.accessories) && /*#__PURE__*/React.createElement(TLTradeAccessories, {
-      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet0 = detail.additionalDetails) === null || _detail$additionalDet0 === void 0 ? void 0 : _detail$additionalDet0.accessories
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet1 = detail.additionalDetails) === null || _detail$additionalDet1 === void 0 ? void 0 : _detail$additionalDet1.permissions) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.nextActions) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.length) > 0 && /*#__PURE__*/React.createElement(PermissionCheck, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet5 = detail.additionalDetails) === null || _detail$additionalDet5 === void 0 ? void 0 : _detail$additionalDet5.units) && /*#__PURE__*/React.createElement(TLTradeUnits, {
+      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet6 = detail.additionalDetails) === null || _detail$additionalDet6 === void 0 ? void 0 : _detail$additionalDet6.units
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet7 = detail.additionalDetails) === null || _detail$additionalDet7 === void 0 ? void 0 : _detail$additionalDet7.accessories) && /*#__PURE__*/React.createElement(TLTradeAccessories, {
+      units: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet8 = detail.additionalDetails) === null || _detail$additionalDet8 === void 0 ? void 0 : _detail$additionalDet8.accessories
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet9 = detail.additionalDetails) === null || _detail$additionalDet9 === void 0 ? void 0 : _detail$additionalDet9.permissions) && (workflowDetails === null || workflowDetails === void 0 ? void 0 : (_workflowDetails$data = workflowDetails.data) === null || _workflowDetails$data === void 0 ? void 0 : (_workflowDetails$data2 = _workflowDetails$data.nextActions) === null || _workflowDetails$data2 === void 0 ? void 0 : _workflowDetails$data2.length) > 0 && /*#__PURE__*/React.createElement(PermissionCheck, {
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       t: t,
-      permissions: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet10 = detail.additionalDetails) === null || _detail$additionalDet10 === void 0 ? void 0 : _detail$additionalDet10.permissions
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet11 = detail.additionalDetails) === null || _detail$additionalDet11 === void 0 ? void 0 : _detail$additionalDet11.obpsDocuments) && /*#__PURE__*/React.createElement(BPADocuments, {
+      permissions: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet0 = detail.additionalDetails) === null || _detail$additionalDet0 === void 0 ? void 0 : _detail$additionalDet0.permissions
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet1 = detail.additionalDetails) === null || _detail$additionalDet1 === void 0 ? void 0 : _detail$additionalDet1.obpsDocuments) && /*#__PURE__*/React.createElement(BPADocuments, {
       t: t,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       docs: detail.additionalDetails.obpsDocuments,
       bpaActionsDetails: workflowDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet12 = detail.additionalDetails) === null || _detail$additionalDet12 === void 0 ? void 0 : _detail$additionalDet12.noc) && /*#__PURE__*/React.createElement(NOCDocuments, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet10 = detail.additionalDetails) === null || _detail$additionalDet10 === void 0 ? void 0 : _detail$additionalDet10.noc) && /*#__PURE__*/React.createElement(NOCDocuments, {
       t: t,
       isNoc: true,
       NOCdata: detail.values,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData,
       docs: detail.additionalDetails.noc,
-      noc: (_detail$additionalDet13 = detail.additionalDetails) === null || _detail$additionalDet13 === void 0 ? void 0 : _detail$additionalDet13.data,
+      noc: (_detail$additionalDet11 = detail.additionalDetails) === null || _detail$additionalDet11 === void 0 ? void 0 : _detail$additionalDet11.data,
       bpaActionsDetails: workflowDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet14 = detail.additionalDetails) === null || _detail$additionalDet14 === void 0 ? void 0 : _detail$additionalDet14.scruntinyDetails) && /*#__PURE__*/React.createElement(ScruntinyDetails, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet12 = detail.additionalDetails) === null || _detail$additionalDet12 === void 0 ? void 0 : _detail$additionalDet12.scruntinyDetails) && /*#__PURE__*/React.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet15 = detail.additionalDetails) === null || _detail$additionalDet15 === void 0 ? void 0 : _detail$additionalDet15.buildingExtractionDetails) && /*#__PURE__*/React.createElement(ScruntinyDetails, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet13 = detail.additionalDetails) === null || _detail$additionalDet13 === void 0 ? void 0 : _detail$additionalDet13.buildingExtractionDetails) && /*#__PURE__*/React.createElement(ScruntinyDetails, {
       scrutinyDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet16 = detail.additionalDetails) === null || _detail$additionalDet16 === void 0 ? void 0 : _detail$additionalDet16.subOccupancyTableDetails) && /*#__PURE__*/React.createElement(SubOccupancyTable, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet14 = detail.additionalDetails) === null || _detail$additionalDet14 === void 0 ? void 0 : _detail$additionalDet14.subOccupancyTableDetails) && /*#__PURE__*/React.createElement(SubOccupancyTable, {
       edcrDetails: detail === null || detail === void 0 ? void 0 : detail.additionalDetails,
       applicationData: applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.applicationData
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documentsWithUrl) && /*#__PURE__*/React.createElement(DocumentsPreview, {
-      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documentsWithUrl
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.documents) && /*#__PURE__*/React.createElement(PropertyDocuments, {
-      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.documents
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.taxHeadEstimatesCalculation) && /*#__PURE__*/React.createElement(PropertyEstimates, {
-      taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : _detail$additionalDet22.taxHeadEstimatesCalculation
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet15 = detail.additionalDetails) === null || _detail$additionalDet15 === void 0 ? void 0 : _detail$additionalDet15.documentsWithUrl) && /*#__PURE__*/React.createElement(DocumentsPreview, {
+      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet16 = detail.additionalDetails) === null || _detail$additionalDet16 === void 0 ? void 0 : _detail$additionalDet16.documentsWithUrl
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet17 = detail.additionalDetails) === null || _detail$additionalDet17 === void 0 ? void 0 : _detail$additionalDet17.documents) && /*#__PURE__*/React.createElement(PropertyDocuments, {
+      documents: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet18 = detail.additionalDetails) === null || _detail$additionalDet18 === void 0 ? void 0 : _detail$additionalDet18.documents
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet19 = detail.additionalDetails) === null || _detail$additionalDet19 === void 0 ? void 0 : _detail$additionalDet19.taxHeadEstimatesCalculation) && /*#__PURE__*/React.createElement(PropertyEstimates, {
+      taxHeadEstimatesCalculation: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet20 = detail.additionalDetails) === null || _detail$additionalDet20 === void 0 ? void 0 : _detail$additionalDet20.taxHeadEstimatesCalculation
     }), (detail === null || detail === void 0 ? void 0 : detail.isWaterConnectionDetails) && /*#__PURE__*/React.createElement(WSAdditonalDetails, {
       wsAdditionalDetails: detail,
       oldValue: oldValue
-    }), (detail === null || detail === void 0 ? void 0 : detail.isDueVerification) && (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION" && /*#__PURE__*/React.createElement(DueVerification, null), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet23 = detail.additionalDetails) === null || _detail$additionalDet23 === void 0 ? void 0 : _detail$additionalDet23.redirectUrl) && /*#__PURE__*/React.createElement(Link, {
-      to: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet24 = detail.additionalDetails) === null || _detail$additionalDet24 === void 0 ? void 0 : (_detail$additionalDet25 = _detail$additionalDet24.redirectUrl) === null || _detail$additionalDet25 === void 0 ? void 0 : _detail$additionalDet25.url
+    }), (detail === null || detail === void 0 ? void 0 : detail.isDueVerification) && (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_FOR_FIELD_INSPECTION" && /*#__PURE__*/React.createElement(DueVerification, null), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet21 = detail.additionalDetails) === null || _detail$additionalDet21 === void 0 ? void 0 : _detail$additionalDet21.redirectUrl) && /*#__PURE__*/React.createElement(Link, {
+      to: detail === null || detail === void 0 ? void 0 : (_detail$additionalDet22 = detail.additionalDetails) === null || _detail$additionalDet22 === void 0 ? void 0 : (_detail$additionalDet23 = _detail$additionalDet22.redirectUrl) === null || _detail$additionalDet23 === void 0 ? void 0 : _detail$additionalDet23.url
     }, /*#__PURE__*/React.createElement("span", {
       className: "add-details-link hover-button"
-    }, detail === null || detail === void 0 ? void 0 : (_detail$additionalDet26 = detail.additionalDetails) === null || _detail$additionalDet26 === void 0 ? void 0 : (_detail$additionalDet27 = _detail$additionalDet26.redirectUrl) === null || _detail$additionalDet27 === void 0 ? void 0 : _detail$additionalDet27.title)), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet28 = detail.additionalDetails) === null || _detail$additionalDet28 === void 0 ? void 0 : _detail$additionalDet28.estimationDetails) && /*#__PURE__*/React.createElement(WSFeeEstimation, {
+    }, detail === null || detail === void 0 ? void 0 : (_detail$additionalDet24 = detail.additionalDetails) === null || _detail$additionalDet24 === void 0 ? void 0 : (_detail$additionalDet25 = _detail$additionalDet24.redirectUrl) === null || _detail$additionalDet25 === void 0 ? void 0 : _detail$additionalDet25.title)), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet26 = detail.additionalDetails) === null || _detail$additionalDet26 === void 0 ? void 0 : _detail$additionalDet26.estimationDetails) && /*#__PURE__*/React.createElement(WSFeeEstimation, {
       wsAdditionalDetails: detail,
       workflowDetails: workflowDetails
-    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet29 = detail.additionalDetails) === null || _detail$additionalDet29 === void 0 ? void 0 : _detail$additionalDet29.estimationDetails) && /*#__PURE__*/React.createElement(ViewBreakup, {
+    }), (detail === null || detail === void 0 ? void 0 : (_detail$additionalDet27 = detail.additionalDetails) === null || _detail$additionalDet27 === void 0 ? void 0 : _detail$additionalDet27.estimationDetails) && /*#__PURE__*/React.createElement(ViewBreakup, {
       wsAdditionalDetails: detail,
       workflowDetails: workflowDetails
     }));
@@ -47166,9 +47365,17 @@ const OLDApplication = () => {
   }, {
     label: "WS_COMMON_CONNECTION_HOLDER_DETAILS_HEADER"
   }, {
-    label: "WS_COMMON_DOCS"
+    label: "PT_LOCATION_DETAILS"
+  }, {
+    label: "WS_PROPERTY_AND_WATER_CONNECTION_USE_DETAILS"
   }, {
-    label: "WS_COMMON_SUMMARY"
+    label: "WS_DJB_EMPLOYEE"
+  }, {
+    label: "WS_BANK_DETAILS"
+  }, {
+    label: "WS_DOCUMENTS"
+  }, {
+    label: "WS_DECLARATION"
   }].map((step, index) => ({
     route: `step-${index + 1}`,
     timeLine: [{
@@ -47228,7 +47435,8 @@ const OLDApplication = () => {
                 type: "component",
                 key: "propertyAddress",
                 component: "CPTPropertyLocationDetails",
-                withoutLabel: true
+                withoutLabel: true,
+                isAutomaticFill: true
               }]
             });
           } else if (compName === "PropertyWaterConnection") {
@@ -47238,7 +47446,8 @@ const OLDApplication = () => {
                 type: "component",
                 key: "useDetails",
                 component: "PropertyWaterConnection",
-                withoutLabel: true
+                withoutLabel: true,
+                isAutomaticFill: true
               }]
             });
           } else if (compName === "WSBankDetails") {
@@ -47292,21 +47501,6 @@ const OLDApplication = () => {
     var _sessionFormData$cpt, _sessionFormData$cpt$, _sessionFormData$cpt2, _sessionFormData$cpt3;
     !propertyId && (sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$cpt = sessionFormData.cpt) === null || _sessionFormData$cpt === void 0 ? void 0 : (_sessionFormData$cpt$ = _sessionFormData$cpt.details) === null || _sessionFormData$cpt$ === void 0 ? void 0 : _sessionFormData$cpt$.propertyId) && setPropertyId(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$cpt2 = sessionFormData.cpt) === null || _sessionFormData$cpt2 === void 0 ? void 0 : (_sessionFormData$cpt3 = _sessionFormData$cpt2.details) === null || _sessionFormData$cpt3 === void 0 ? void 0 : _sessionFormData$cpt3.propertyId);
   }, [sessionFormData === null || sessionFormData === void 0 ? void 0 : sessionFormData.cpt]);
-  useEffect(() => {
-    var _propertyDetails$Prop;
-    if (propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop = propertyDetails.Properties) !== null && _propertyDetails$Prop !== void 0 && _propertyDetails$Prop[0]) {
-      var _propertyDetails$Prop2, _sessionFormData$cpt4;
-      const newCptDetails = propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop2 = propertyDetails.Properties) === null || _propertyDetails$Prop2 === void 0 ? void 0 : _propertyDetails$Prop2[0];
-      if (!lodash.isEqual(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$cpt4 = sessionFormData.cpt) === null || _sessionFormData$cpt4 === void 0 ? void 0 : _sessionFormData$cpt4.details, newCptDetails)) {
-        setSessionFormData({
-          ...sessionFormData,
-          cpt: {
-            details: newCptDetails
-          }
-        });
-      }
-    }
-  }, [propertyDetails, sessionFormData]);
   const {
     isLoading: creatingWaterApplicationLoading,
     isError: createWaterApplicationError,
@@ -47341,8 +47535,9 @@ const OLDApplication = () => {
       ...sessionFormData,
       ...formData
     };
-    if (!lodash.isEqual(sessionFormData, updatedFormData)) {
-      setSessionFormData(updatedFormData);
+    const cleanedFormData = JSON.parse(JSON.stringify(updatedFormData));
+    if (!lodash.isEqual(sessionFormData, cleanedFormData)) {
+      setSessionFormData(cleanedFormData);
       sessionStorage.setItem("FORMSTATE_ERRORS", JSON.stringify(formState === null || formState === void 0 ? void 0 : formState.errors));
     }
     if (Object.keys(formState.errors).length > 0 && Object.keys(formState.errors).length == 1 && formState !== null && formState !== void 0 && (_formState$errors = formState.errors) !== null && _formState$errors !== void 0 && (_formState$errors$Con = _formState$errors["ConnectionHolderDetails"]) !== null && _formState$errors$Con !== void 0 && _formState$errors$Con.type && ((_Object$keys = Object.keys(formState === null || formState === void 0 ? void 0 : (_formState$errors2 = formState.errors) === null || _formState$errors2 === void 0 ? void 0 : (_formState$errors2$Co = _formState$errors2["ConnectionHolderDetails"]) === null || _formState$errors2$Co === void 0 ? void 0 : _formState$errors2$Co.type)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) == 1 && formState.errors["ConnectionHolderDetails"] && Object.values(formState.errors["ConnectionHolderDetails"].type).filter(ob => {
@@ -47354,8 +47549,8 @@ const OLDApplication = () => {
     setShowToast(null);
   };
   const onFormSubmit = data => {
-    var _data$cpt, _propertyDetails$Prop3, _formStateErros$Conne, _Object$keys2, _formStateErros$Conne2;
-    if (!(data !== null && data !== void 0 && (_data$cpt = data.cpt) !== null && _data$cpt !== void 0 && _data$cpt.id) && !(propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop3 = propertyDetails.Properties) !== null && _propertyDetails$Prop3 !== void 0 && _propertyDetails$Prop3[0])) {
+    var _data$cpt, _propertyDetails$Prop, _formStateErros$Conne, _Object$keys2, _formStateErros$Conne2;
+    if (!(data !== null && data !== void 0 && (_data$cpt = data.cpt) !== null && _data$cpt !== void 0 && _data$cpt.id) && !(propertyDetails !== null && propertyDetails !== void 0 && (_propertyDetails$Prop = propertyDetails.Properties) !== null && _propertyDetails$Prop !== void 0 && _propertyDetails$Prop[0])) {
       var _data$cpt2;
       if (!(data !== null && data !== void 0 && (_data$cpt2 = data.cpt) !== null && _data$cpt2 !== void 0 && _data$cpt2.details) || !propertyDetails) {
         console.warn("[WS] onSubmit EXIT: invalid property", {
@@ -47385,7 +47580,7 @@ const OLDApplication = () => {
     setShowCheckPage(true);
   };
   const processSubmission = async data => {
-    var _data$useDetails, _data$ConnectionDetai, _data$ConnectionDetai2, _data$DocumentsRequir, _data$cpt3, _Digit$UserService$ge, _data$ConnectionHolde, _data$ConnectionHolde2, _data$ConnectionHolde3, _data$ConnectionHolde4, _data$ConnectionHolde5, _propertyDetails$Prop5, _propertyDetails$Prop6, _propertyDetails$Prop7, _propertyDetails$Prop8, _data$ConnectionHolde6, _data$ConnectionHolde7, _data$cpt4, _data$cpt4$details, _data$cpt4$details$ow, _data$cpt4$details$ow2;
+    var _data$useDetails, _data$ConnectionDetai, _data$ConnectionDetai2, _data$DocumentsRequir, _data$cpt3, _Digit$UserService$ge, _data$ConnectionHolde, _data$ConnectionHolde2, _data$ConnectionHolde3, _data$ConnectionHolde4, _data$ConnectionHolde5, _propertyDetails$Prop3, _propertyDetails$Prop4, _propertyDetails$Prop5, _propertyDetails$Prop6, _data$ConnectionHolde6, _data$ConnectionHolde7, _data$cpt4, _data$cpt4$details, _data$cpt4$details$ow, _data$cpt4$details$ow2;
     const basePath = window.location.href.includes("/employee") ? "/digit-ui/employee/ws" : "/digit-ui/citizen/ws";
     if (data !== null && data !== void 0 && (_data$useDetails = data.useDetails) !== null && _data$useDetails !== void 0 && _data$useDetails.useDetails) {
       data.useDetails = {
@@ -47481,9 +47676,9 @@ const OLDApplication = () => {
       data.declarationData.declarations = data.declaration.declarations;
     }
     if (!(data !== null && data !== void 0 && (_data$cpt3 = data.cpt) !== null && _data$cpt3 !== void 0 && _data$cpt3.details)) {
-      var _propertyDetails$Prop4;
+      var _propertyDetails$Prop2;
       data.cpt = {
-        details: propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop4 = propertyDetails.Properties) === null || _propertyDetails$Prop4 === void 0 ? void 0 : _propertyDetails$Prop4[0]
+        details: propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop2 = propertyDetails.Properties) === null || _propertyDetails$Prop2 === void 0 ? void 0 : _propertyDetails$Prop2[0]
       };
     }
     data.channel = ((_Digit$UserService$ge = Digit.UserService.getType()) === null || _Digit$UserService$ge === void 0 ? void 0 : _Digit$UserService$ge.toUpperCase()) === "CITIZEN" ? "CITIZEN" : "CFC_COUNTER";
@@ -47498,7 +47693,7 @@ const OLDApplication = () => {
         code: "NONPTPRESSURE"
       },
       categoryType: (connDetail === null || connDetail === void 0 ? void 0 : connDetail.categoryType) || {
-        code: (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde = data.ConnectionHolderDetails) === null || _data$ConnectionHolde === void 0 ? void 0 : (_data$ConnectionHolde2 = _data$ConnectionHolde[0]) === null || _data$ConnectionHolde2 === void 0 ? void 0 : (_data$ConnectionHolde3 = _data$ConnectionHolde2.ownerType) === null || _data$ConnectionHolde3 === void 0 ? void 0 : _data$ConnectionHolde3.code) || (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde4 = data.ConnectionHolderDetails) === null || _data$ConnectionHolde4 === void 0 ? void 0 : (_data$ConnectionHolde5 = _data$ConnectionHolde4[0]) === null || _data$ConnectionHolde5 === void 0 ? void 0 : _data$ConnectionHolde5.ownerType) || (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop5 = propertyDetails.Properties) === null || _propertyDetails$Prop5 === void 0 ? void 0 : (_propertyDetails$Prop6 = _propertyDetails$Prop5[0]) === null || _propertyDetails$Prop6 === void 0 ? void 0 : (_propertyDetails$Prop7 = _propertyDetails$Prop6.owners) === null || _propertyDetails$Prop7 === void 0 ? void 0 : (_propertyDetails$Prop8 = _propertyDetails$Prop7[0]) === null || _propertyDetails$Prop8 === void 0 ? void 0 : _propertyDetails$Prop8.ownerType) || "NONE"
+        code: (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde = data.ConnectionHolderDetails) === null || _data$ConnectionHolde === void 0 ? void 0 : (_data$ConnectionHolde2 = _data$ConnectionHolde[0]) === null || _data$ConnectionHolde2 === void 0 ? void 0 : (_data$ConnectionHolde3 = _data$ConnectionHolde2.ownerType) === null || _data$ConnectionHolde3 === void 0 ? void 0 : _data$ConnectionHolde3.code) || (data === null || data === void 0 ? void 0 : (_data$ConnectionHolde4 = data.ConnectionHolderDetails) === null || _data$ConnectionHolde4 === void 0 ? void 0 : (_data$ConnectionHolde5 = _data$ConnectionHolde4[0]) === null || _data$ConnectionHolde5 === void 0 ? void 0 : _data$ConnectionHolde5.ownerType) || (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$Prop3 = propertyDetails.Properties) === null || _propertyDetails$Prop3 === void 0 ? void 0 : (_propertyDetails$Prop4 = _propertyDetails$Prop3[0]) === null || _propertyDetails$Prop4 === void 0 ? void 0 : (_propertyDetails$Prop5 = _propertyDetails$Prop4.owners) === null || _propertyDetails$Prop5 === void 0 ? void 0 : (_propertyDetails$Prop6 = _propertyDetails$Prop5[0]) === null || _propertyDetails$Prop6 === void 0 ? void 0 : _propertyDetails$Prop6.ownerType) || "NONE"
       },
       domesticType: connDetail === null || connDetail === void 0 ? void 0 : connDetail.domesticType,
       departmentType: connDetail === null || connDetail === void 0 ? void 0 : connDetail.departmentType,
@@ -47808,7 +48003,7 @@ const WSLinks = ({
     t
   } = useTranslation();
   const links = [{
-    link: `${matchPath}/old-application`,
+    link: `${matchPath}/info`,
     i18nKey: t("ACTION_TEST_APPLY_NEW_CONNECTION")
   }, {
     link: `${matchPath}/my-applications`,
@@ -47885,6 +48080,7 @@ const componentsToRegister = {
   WSCitizenEditApplication: EditApplication,
   WSReSubmitDisconnectionApplication: ReSubmitDisconnectionApplication,
   WNSMyBillsComponent: BillSearchResults,
+  WSInfoPage: WSInfoPage,
   WSCheckPage: CheckPage,
   WSAcknowledgement,
   WSDisconnectionCheckPage: CheckPage$1,